diff --git a/arangod/RocksDBEngine/RocksDBEdgeIndex.cpp b/arangod/RocksDBEngine/RocksDBEdgeIndex.cpp index 34a6238c61..a868f9769b 100644 --- a/arangod/RocksDBEngine/RocksDBEdgeIndex.cpp +++ b/arangod/RocksDBEngine/RocksDBEdgeIndex.cpp @@ -267,7 +267,6 @@ bool RocksDBEdgeIndexIterator::nextExtra(ExtraCallback const& cb, _builderIterator = VPackArrayIterator( arangodb::basics::VelocyPackHelper::EmptyArrayValue()); } else { - _copyCounter++; // We need to copy it. // And then we just get back to beginning of the loop _builder.clear(); diff --git a/arangod/RocksDBEngine/RocksDBEdgeIndex.h b/arangod/RocksDBEngine/RocksDBEdgeIndex.h index 90b7a61723..ebe5d79288 100644 --- a/arangod/RocksDBEngine/RocksDBEdgeIndex.h +++ b/arangod/RocksDBEngine/RocksDBEdgeIndex.h @@ -77,8 +77,6 @@ class RocksDBEdgeIndexIterator final : public IndexIterator { std::shared_ptr _cache; arangodb::velocypack::ArrayIterator _builderIterator; arangodb::velocypack::Builder _builder; - size_t _copyCounter; - size_t _lookupCounter; }; class RocksDBEdgeIndex final : public RocksDBIndex { diff --git a/arangod/RocksDBEngine/RocksDBReplicationTailing.cpp b/arangod/RocksDBEngine/RocksDBReplicationTailing.cpp index 7bffc3a0e9..e4f0761dd4 100644 --- a/arangod/RocksDBEngine/RocksDBReplicationTailing.cpp +++ b/arangod/RocksDBEngine/RocksDBReplicationTailing.cpp @@ -80,8 +80,8 @@ class WALParser : public rocksdb::WriteBatch::Handler { _includeSystem(includeSystem), _onlyCollectionId(collectionId), _builder(builder), - _currentSequence(0) - {} + _startSequence(0), + _currentSequence(0) {} void LogData(rocksdb::Slice const& blob) override { RocksDBLogType type = RocksDBLogValue::type(blob); diff --git a/arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp b/arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp index b804de10ea..e7ae817daf 100644 --- a/arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp +++ b/arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp @@ -439,15 +439,7 @@ void RocksDBRestReplicationHandler::handleCommandBatch() { _vocbase->updateReplicationClient(serverId, ctx->lastTick()); - // now extend the blocker - // StorageEngine* engine = EngineSelectorFeature::ENGINE; - // res = engine->extendCompactionBlocker(_vocbase, id, expires); - - if (res == TRI_ERROR_NO_ERROR) { - resetResponse(rest::ResponseCode::NO_CONTENT); - } else { - generateError(GeneralResponse::responseCode(res), res); - } + resetResponse(rest::ResponseCode::NO_CONTENT); return; }