remove unnecessary gtid converting in BinlogHistoryGtidChildUpdater

Author: kobi97

CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [1.0.1] - 2017-12-21
+
+### Changed
+- remove unnecessary gtid converting in `BinlogHistoryGtidChildUpdater`
+- Change tab to space
+
+## [1.0.0]

src/Binlog/Collector/Application/BinlogHistoryGtidUpdaterApplication.php

@@ -15,7 +15,6 @@
 class BinlogHistoryGtidUpdaterApplication
 {
     const PARTITION_COUNT = 10;
-    const CHILD_MAX_ALLOW_ERROR_COUNT = 10;
     const CHILD_ONCE_BINLOG_FETCH_LIMIT = 1000;
     const MAX_COUNT_PER_CHILD = 100000;
     const MIN_COUNT_PER_CHILD = 1000;

src/Binlog/Collector/BinlogHistoryGtidChildUpdater.php

@@ -3,17 +3,16 @@
 namespace Binlog\Collector;
 
 use Binlog\Collector\Interfaces\BinlogHistoryServiceInterface;
+use Binlog\Collector\Model\ReplicationDbModel;
 use Monolog\Logger;
 use MySQLReplication\Config\Config;
-use Binlog\Collector\Model\ReplicationDbModel;
 
 /**
  * Class BinlogHistoryGtidChildUpdater
  * @package Binlog\Collector
  */
 class BinlogHistoryGtidChildUpdater
 {
-    const CHILD_MAX_ALLOW_ERROR_COUNT = 10;
     const CHILD_ONCE_BINLOG_FETCH_LIMIT = 1000;
     const MAX_COUNT_PER_CHILD = 100000;
     const MIN_COUNT_PER_CHILD = 1000;
@@ -25,8 +24,6 @@ class BinlogHistoryGtidChildUpdater
     /** @var Logger */
     private $logger;
     /** @var int */
-    private $error_count;
-    /** @var int */
     private $remain_binlog_count;
     /** @var BinlogHistoryServiceInterface */
     private $binlog_history_service;
@@ -56,7 +53,6 @@ private function getFetchCount(): int
 
     public function execute(int $last_binlog_id, int $max_binlog_count)
     {
-        $this->error_count = 0;
         $this->remain_binlog_count = $max_binlog_count;
         $fetch_count = $this->getFetchCount();
         $is_first = true;
@@ -91,7 +87,9 @@ public function execute(int $last_binlog_id, int $max_binlog_count)
      */
     private function calculateGtidAndUpdate(array $dicts): bool
     {
-        foreach ($dicts as $dict) {
+        $new_dicts = self::sortDescendingByBinlogFileNameAndGtidEndPos($dicts);
+
+        foreach ($new_dicts as $dict) {
             $id = intval($dict['id']);
             $binlog_file_name = $dict['binlog_filename'];
             $binlog_position = intval($dict['gtid_end_pos']);
@@ -102,18 +100,35 @@ private function calculateGtidAndUpdate(array $dicts): bool
                 );
                 $this->binlog_history_service->updateBinlogGtid($id, $binlog_offset_dto->mariadb_gtid);
             } catch (\Exception $exception) {
-                $this->error_count++;
-                if ($this->error_count >= self::CHILD_MAX_ALLOW_ERROR_COUNT) {
-                    $this->logger->info('error 개수가 ' . $this->error_count . '개가 넘음');
+                $this->logger->info(
+                    "Gtid ({$id}:{$binlog_file_name},{$binlog_position}) " .
+                    "변환 실패(오래된 Binlog Offset인 경우 발생 할 수 있습니다.)"
+                );
 
-                    return false;
-                }
+                return false;
             }
         }
 
         return true;
     }
 
+    public static function sortDescendingByBinlogFileNameAndGtidEndPos(array $dicts): array
+    {
+        usort(
+            $dicts,
+            function ($a, $b) {
+                $ret_val = $b['binlog_filename'] <=> $a['binlog_filename'];
+                if ($ret_val === 0) {
+                    return $b['gtid_end_pos'] <=> $a['gtid_end_pos'];
+                }
+
+                return $ret_val;
+            }
+        );
+
+        return $dicts;
+    }
+
     public function close()
     {
         $this->replication_db_model->close();

tests/Binlog/BinlogCollectorTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BinLog\Tests\Utils;
+namespace BinLog\Tests;
 
 use PHPUnit\Framework\TestCase;
 
@@ -9,6 +9,6 @@ class BinlogCollectorTest extends TestCase
 
     public function test()
     {
-
+        $this->assertTrue(true);
     }
 }

tests/Binlog/BinlogHistoryGtidChildUpdaterTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace BinLog\Tests;
+
+use Binlog\Collector\BinlogHistoryGtidChildUpdater;
+use PHPUnit\Framework\TestCase;
+
+class BinlogHistoryGtidChildUpdaterTest extends TestCase
+{
+
+    public function testSortDescendingByBinlogFileNameAndGtidEndPos()
+    {
+        $dicts[] = $this->makeBinlogDict(4, 'mariadb-bin.007350', 10000001, '', '2017-09-14 17:14:42');
+        $dicts[] = $this->makeBinlogDict(2, 'mariadb-bin.007351', 20000001, '', '2017-09-14 17:14:47');
+        $dicts[] = $this->makeBinlogDict(3, 'mariadb-bin.007350', 10000002, '', '2017-09-14 17:14:45');
+        $dicts[] = $this->makeBinlogDict(1, 'mariadb-bin.007351', 20000002, '', '2017-09-14 17:14:48');
+
+        $dicts = BinlogHistoryGtidChildUpdater::sortDescendingByBinlogFileNameAndGtidEndPos($dicts);
+        $this->assertEquals(1, $dicts[0]['id']);
+        $this->assertEquals(2, $dicts[1]['id']);
+        $this->assertEquals(3, $dicts[2]['id']);
+        $this->assertEquals(4, $dicts[3]['id']);
+    }
+
+    public function makeBinlogDict(int $id, string $binlog_filename, int $gtid_end_pos, string $gtid, string $reg_date)
+    {
+        return [
+            'id' => $id,
+            'binlog_filename' => $binlog_filename,
+            'gtid_end_pos' => $gtid_end_pos,
+            'gtid' => $gtid,
+            'reg_date' => $reg_date,
+        ];
+    }
+}