From 2f968d649abace99aa6346e700aabab6268d12d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Gra=CC=88tzer?= <simon@graetzer.org>
Date: Tue, 25 Apr 2017 14:53:59 +0200
Subject: [PATCH] Fixed build

---
 arangod/Replication/InitialSyncer.cpp | 37 ++++++++++++++++-----------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/arangod/Replication/InitialSyncer.cpp b/arangod/Replication/InitialSyncer.cpp
index 938177157e..186a3e84ff 100644
--- a/arangod/Replication/InitialSyncer.cpp
+++ b/arangod/Replication/InitialSyncer.cpp
@@ -42,7 +42,7 @@
 #include "RestServer/DatabaseFeature.h"
 #include "SimpleHttpClient/SimpleHttpClient.h"
 #include "SimpleHttpClient/SimpleHttpResult.h"
-#include "StorageEngine/EngineSelectorFeature.h" b
+#include "StorageEngine/EngineSelectorFeature.h"
 #include "Indexes/IndexIterator.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Transaction/Helpers.h"
@@ -1211,6 +1211,7 @@ int InitialSyncer::handleSyncKeysRocksDB(arangodb::LogicalCollection* col,
     // chunk keys + revisionId
     std::vector<std::pair<std::string, uint64_t>> markers;
     bool foundLowKey = false;
+    bool syncedRange = false;
     
     auto resetChunk = [&] () -> void {
       sendExtendBatch();
@@ -1246,6 +1247,7 @@ int InitialSyncer::handleSyncKeysRocksDB(arangodb::LogicalCollection* col,
       hashString = hashSlice.copyString();
       localHash = 0x012345678;
       foundLowKey = false;
+      syncedRange = false;
     };
     // set to first chunk
     resetChunk();
@@ -1253,7 +1255,7 @@ int InitialSyncer::handleSyncKeysRocksDB(arangodb::LogicalCollection* col,
     std::function<void(VPackSlice, VPackSlice)> parseDoc =
       [&] (VPackSlice doc, VPackSlice key) {
       
-      bool rangeUneqal = false;
+      bool rangeUneqal = true;
       bool nextChunk = false;
       
       int cmp1 = key.compareString(lowKey.data(), lowKey.length());
@@ -1268,7 +1270,6 @@ int InitialSyncer::handleSyncKeysRocksDB(arangodb::LogicalCollection* col,
         if (cmp1 == 0) {
           foundLowKey = true;
         } else if (!foundLowKey && cmp1 > 0) {
-          rangeUneqal = true;
           nextChunk = true;
         }
         
@@ -1284,7 +1285,6 @@ int InitialSyncer::handleSyncKeysRocksDB(arangodb::LogicalCollection* col,
             nextChunk = true;
           }
         } else if (cmp2 == 0) {
-          rangeUneqal = true;
           nextChunk = true;
         }
       } else if (cmp2 > 0) { // higher than highKey
@@ -1294,23 +1294,30 @@ int InitialSyncer::handleSyncKeysRocksDB(arangodb::LogicalCollection* col,
         nextChunk = true;
       }
       
-      if (rangeUneqal) {
-        int res = syncChunkRocksDB(&trx, keysId, currentChunkId,
-                                   lowKey, highKey,
-                                   markers, errorMsg);
-        if (res != TRI_ERROR_NO_ERROR) {
-          THROW_ARANGO_EXCEPTION(res);
-        }
-      }
       TRI_ASSERT(!rangeUneqal || rangeUneqal && nextChunk); // A => B
-      if (nextChunk && currentChunkId+1 < numChunks) {
-        currentChunkId++;// we are out of range, see next chunk
-        resetChunk();
+      if (nextChunk) {
+        if (rangeUneqal && !syncedRange) {
+          syncedRange = true;
+          int res = syncChunkRocksDB(&trx, keysId, currentChunkId,
+                                     lowKey, highKey,
+                                     markers, errorMsg);
+          if (res != TRI_ERROR_NO_ERROR) {
+            THROW_ARANGO_EXCEPTION(res);
+          }
+        }
+        
+        if (currentChunkId+1 < numChunks) {
+          currentChunkId++;// we are out of range, see next chunk
+          resetChunk();
+        }
         
         // key is higher than upper bound, recheck the current document
         if (cmp2 > 0) {
           parseDoc(doc, key);
         }
+      } else {
+        LOG_TOPIC(ERR, Logger::FIXME) << "Did not expect keys higher"
+          << "than teh highest chunk";
       }
     };