attempt optimisation

mrjgreen · Jan 15, 2015 · 5818d0c · 5818d0c
1 parent 6d1289c
commit 5818d0c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/DbSync/Comparison/Hash.php b/src/DbSync/Comparison/Hash.php
@@ -26,6 +26,8 @@ class Hash extends HashAbstract {
 
     protected $start;
 
+    protected $lastComparisonEmpty = false;
+
     private static $intTypes = array(
         'tinyint',
         'smallint',
@@ -149,7 +151,12 @@ private function buildComparisonHash()
 
     public function nextValidIndex($block)
     {
-        return $this->limitKey ? ($this->getAggregateCount('MIN', $block) ?: $block) : $block;
+        if($this->limitKey && $this->lastComparisonEmpty)
+        {
+            return $this->getAggregateCount('MIN', $block) ?: $block;
+        }
+
+        return $block;
     }
 
     private function compareLimit($offset, $blockSize)
@@ -189,7 +196,13 @@ public function compare($offset, $blockSize)
     {      
         $query = $this->limitKey ? $this->compareIndex($offset, $blockSize) : $this->compareLimit($offset, $blockSize);
 
-        if($this->source->fetchOne(sprintf($query,$this->sourcetable)) === $this->destination->fetchOne(sprintf($query,$this->desttable)))
+        $sourceHash = $this->source->fetchOne(sprintf($query,$this->sourcetable));
+
+        $destHash = $this->destination->fetchOne(sprintf($query,$this->desttable));
+
+        $this->lastComparisonEmpty = $sourceHash ? false : true;
+
+        if($sourceHash === $destHash)
         {
             return false;
         }

diff --git a/tests/integration/config.php b/tests/integration/config.php
@@ -4,7 +4,7 @@
     'host'      => 'localhost',
     'driver'    => 'mysql',
     'username'  => 'root',
-    'password'  => '',
+    'password'  => 'password',
     'charset'   => 'utf8',
     'collation' => 'utf8_unicode_ci',
     'prefix'    => '',