bin position as string

Author: krowinski

CHANGELOG.md

@@ -5,13 +5,15 @@
 - Change: drop support for < 8.2
 - Change: moved to enums, promoted properties
 - Added: logger for more socket info
-- Added: slave_uuid support
-- Change: config no longer static
+- Added: slave_uuid support (#99)
+- Change: EventInfo->id is now EventInfo->serverId (#83)
+- Change: config no longer static (#94)
 - Chore: typos in README/code
-- Chore: replace/remove old urls from code
-- Chore: changed variables to underscore
-- Added: support caching_sha2_password
+- Chore: replace/remove old dead doc urls from code
+- Chore: changed variables to underscore 
+- Added: support caching_sha2_password (#102)
 - Change: BinLogServerInfo static calls removed also added method getServerInfo to MySQLReplicationFactory 
+- Change: type of bin log position is now string as it can be bigger then php can hande 2^64-1 (#84) 
 
 ## v7.0.1 (2021-03-09)
 

src/MySQLReplication/BinLog/BinLogCurrent.php

@@ -8,20 +8,20 @@
 
 class BinLogCurrent implements JsonSerializable
 {
-    private int $binLogPosition;
+    private string $binLogPosition;
 
     private string $binFileName;
 
     private string $gtid;
 
     private string $mariaDbGtid;
 
-    public function getBinLogPosition(): int
+    public function getBinLogPosition(): string
     {
         return $this->binLogPosition;
     }
 
-    public function setBinLogPosition(int $binLogPosition): void
+    public function setBinLogPosition(string $binLogPosition): void
     {
         $this->binLogPosition = $binLogPosition;
     }

src/MySQLReplication/BinLog/BinLogSocketConnect.php

@@ -296,7 +296,7 @@ private function setBinLogDump(): void
         $binFilePos = $this->config->binLogPosition;
         $binFileName = $this->config->binLogFileName;
         // if not set start from newest binlog
-        if ($binFilePos === 0 && $binFileName === '') {
+        if ($binFilePos === '' && $binFileName === '') {
             $masterStatusDTO = $this->repository->getMasterStatus();
             $binFilePos = $masterStatusDTO->position;
             $binFileName = $masterStatusDTO->file;

src/MySQLReplication/Config/Config.php

@@ -18,7 +18,7 @@ public function __construct(
         public string $mariaDbGtid,
         public int $slaveId,
         public string $binLogFileName,
-        public int $binLogPosition,
+        public string $binLogPosition,
         public array $eventsOnly,
         public array $eventsIgnore,
         public array $tablesOnly,
@@ -74,11 +74,7 @@ public function validate(): void
                 ConfigException::SLAVE_ID_ERROR_CODE
             );
         }
-        if (filter_var($this->binLogPosition, FILTER_VALIDATE_INT, [
-            'options' => [
-                'min_range' => 0,
-            ],
-        ]) === false) {
+        if (bccomp($this->binLogPosition, '0') === -1) {
             throw new ConfigException(
                 ConfigException::BIN_LOG_FILE_POSITION_ERROR_MESSAGE,
                 ConfigException::BIN_LOG_FILE_POSITION_ERROR_CODE

src/MySQLReplication/Config/ConfigBuilder.php

@@ -22,7 +22,7 @@ class ConfigBuilder
 
     private string $binLogFileName = '';
 
-    private int $binLogPosition = 0;
+    private string $binLogPosition = '';
 
     private array $eventsOnly = [];
 
@@ -105,7 +105,7 @@ public function withBinLogFileName(string $binLogFileName): self
         return $this;
     }
 
-    public function withBinLogPosition(int $binLogPosition): self
+    public function withBinLogPosition(string $binLogPosition): self
     {
         $this->binLogPosition = $binLogPosition;
 

src/MySQLReplication/Event/DTO/RotateDTO.php

@@ -13,7 +13,7 @@ class RotateDTO extends EventDTO
 
     public function __construct(
         EventInfo $eventInfo,
-        public readonly int $position,
+        public readonly string $position,
         public readonly string $nextBinlog
     ) {
         parent::__construct($eventInfo);

src/MySQLReplication/Event/Event.php

@@ -134,7 +134,7 @@ private function createEventInfo(BinaryDataReader $binaryDataReader): EventInfo
             $binaryDataReader->readUInt8(),
             $binaryDataReader->readInt32(),
             $binaryDataReader->readInt32(),
-            $binaryDataReader->readInt32(),
+            (string)$binaryDataReader->readInt32(),
             $binaryDataReader->readUInt16(),
             $this->binLogSocketConnect->getCheckSum(),
             $this->binLogSocketConnect->getBinLogCurrent()

src/MySQLReplication/Event/EventInfo.php

@@ -17,9 +17,9 @@ class EventInfo implements JsonSerializable
     public function __construct(
         public readonly int $timestamp,
         public readonly int $type,
-        public readonly int $id,
+        public readonly int $serverId,
         public readonly int $size,
-        public readonly int $pos,
+        public readonly string $pos,
         public readonly int $flag,
         public readonly bool $checkSum,
         public readonly BinLogCurrent $binLogCurrent

src/MySQLReplication/Event/RotateEvent.php

@@ -13,7 +13,7 @@ class RotateEvent extends EventCommon
 {
     public function makeRotateEventDTO(): RotateDTO
     {
-        $binFilePos = (int)$this->binaryDataReader->readUInt64();
+        $binFilePos = $this->binaryDataReader->readUInt64();
         $binFileName = $this->binaryDataReader->read(
             $this->eventInfo->getSizeNoHeader() - $this->getSizeToRemoveByVersion()
         );

src/MySQLReplication/Repository/MasterStatusDTO.php

@@ -7,13 +7,13 @@
 readonly class MasterStatusDTO
 {
     public function __construct(
-        public int $position,
+        public string $position,
         public string $file
     ) {
     }
 
     public static function makeFromArray(array $data): self
     {
-        return new self((int)$data['Position'], (string)$data['File']);
+        return new self((string)$data['Position'], (string)$data['File']);
     }
 }