Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed build

This commit is contained in:
Simon Grätzer 2017-04-25 14:53:59 +02:00
parent 284d620c0b
commit 2f968d649a
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arangod/Replication/InitialSyncer.cpp
View File

@ -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,7 +1294,10 @@ int InitialSyncer::handleSyncKeysRocksDB(arangodb::LogicalCollection* col,
nextChunk = true;
}
if (rangeUneqal) {
TRI_ASSERT(!rangeUneqal || rangeUneqal && nextChunk); // A => B
if (nextChunk) {
if (rangeUneqal && !syncedRange) {
syncedRange = true;
int res = syncChunkRocksDB(&trx, keysId, currentChunkId,
lowKey, highKey,
markers, errorMsg);
@ -1302,15 +1305,19 @@ int InitialSyncer::handleSyncKeysRocksDB(arangodb::LogicalCollection* col,
THROW_ARANGO_EXCEPTION(res);
}
}
TRI_ASSERT(!rangeUneqal || rangeUneqal && nextChunk); // A => B
if (nextChunk && currentChunkId+1 < numChunks) {
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";
}
};