Preserve threadId in QUERY_EVENT. (#90)

krowinski · Jan 12, 2024 · 95f852a · 95f852a
1 parent 4ea690f
commit 95f852a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/MySQLReplication/Event/DTO/QueryDTO.php b/src/MySQLReplication/Event/DTO/QueryDTO.php
@@ -12,18 +12,21 @@ class QueryDTO extends EventDTO
     private $query;
     private $database;
     private $type = ConstEventsNames::QUERY;
+    private $threadId;
 
     public function __construct(
         EventInfo $eventInfo,
         string $database,
         int $executionTime,
-        string $query
+        string $query,
+        int $threadId
     ) {
         parent::__construct($eventInfo);
 
         $this->executionTime = $executionTime;
         $this->query = $query;
         $this->database = $database;
+        $this->threadId = $threadId;
     }
 
     public function getDatabase(): string
@@ -46,6 +49,11 @@ public function getType(): string
         return $this->type;
     }
 
+    public function getThreadId(): int
+    {
+        return $this->threadId;
+    }
+
     public function __toString(): string
     {
         return PHP_EOL .

diff --git a/src/MySQLReplication/Event/QueryEvent.php b/src/MySQLReplication/Event/QueryEvent.php
@@ -12,7 +12,7 @@ class QueryEvent extends EventCommon
 {
     public function makeQueryDTO(): QueryDTO
     {
-        $this->binaryDataReader->advance(4);
+        $threadId = $this->binaryDataReader->readUInt32();
         $executionTime = $this->binaryDataReader->readUInt32();
         $schemaLength = $this->binaryDataReader->readUInt8();
         $this->binaryDataReader->advance(2);
@@ -26,7 +26,8 @@ public function makeQueryDTO(): QueryDTO
             $this->eventInfo,
             $schema,
             $executionTime,
-            $query
+            $query,
+            $threadId
         );
     }
 }