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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 

# Conflicts:
#	arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
This commit is contained in:
Simon Grätzer 2017-04-28 17:12:50 +02:00
parent 3f645f85ff a99cc64bed
commit 97681ab32a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
View File

@ -183,13 +183,13 @@ class WALParser : public rocksdb::WriteBatch::Handler {
}
case RocksDBLogType::SingleRemove: {
_removeDocumentKey = RocksDBLogValue::documentKey(blob).toString();
// intentionall fall through
// intentional fall through
}
case RocksDBLogType::SinglePut: {
_singleOpTransaction = true;
_currentDbId = RocksDBLogValue::databaseId(blob);
_currentCollectionId = RocksDBLogValue::collectionId(blob);
_currentTrxId = RocksDBLogValue::collectionId(blob);
_currentTrxId = 0;
break;
}
@ -302,9 +302,9 @@ class WALParser : public rocksdb::WriteBatch::Handler {
_builder.add("database", VPackValue(std::to_string(_currentDbId)));
_builder.add("cid", VPackValue(std::to_string(_currentCollectionId)));
if (_singleOpTransaction) { // single op is defined to 0
_builder.add("tid", VPackValue(0));
_builder.add("tid", VPackValue("0"));
} else {
_builder.add("tid", VPackValue(_currentTrxId));
_builder.add("tid", VPackValue(std::to_string(_currentTrxId)));
}
_builder.add("data", VPackValue(VPackValueType::Object));
_builder.add(StaticStrings::KeyString, VPackValue(_removeDocumentKey));
@ -349,6 +349,7 @@ class WALParser : public rocksdb::WriteBatch::Handler {
_builder.close();
}
_seenBeginTransaction = false;
_singleOpTransaction = false;
}
private: