Merge remote-tracking branch 'origin/devel' into feature/zkd-index

arangodb · maierlars · Jan 5, 2022 · Mar 3, 2021 · Mar 4, 2021 · Mar 4, 2021
commit 10ed61ada5f13feff9de7887850af11235ef0da8
diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
@@ -805,6 +805,9 @@ include(RocksDBEngine/CMakeLists.txt)
 
 add_library(arango_zkd STATIC Zkd/ZkdHelper.cpp)
 
+add_library(arango_restart_action STATIC
+  RestServer/RestartAction.cpp
+)
 
 add_library(arango_graph STATIC
   ${LIB_ARANGO_GRAPH_SOURCES}

diff --git a/arangod/RocksDBEngine/RocksDBTypes.h b/arangod/RocksDBEngine/RocksDBTypes.h
@@ -52,9 +52,10 @@ enum class RocksDBEntryType : char {
   KeyGeneratorValue = '=',
   View = '>',
   GeoIndexValue = '?',
-  RevisionTreeValue = '@',
   ZkdIndexValue = 'z',
-  UniqueZkdIndexValue = 'Z'
+  UniqueZkdIndexValue = 'Z',
+  // RevisionTreeValue = '@', // pre-3.8 GA revision trees. do not use or reuse!
+  RevisionTreeValue = '/'
 };
 
 char const* rocksDBEntryTypeName(RocksDBEntryType);

diff --git a/arangod/RocksDBEngine/RocksDBZkdIndex.cpp b/arangod/RocksDBEngine/RocksDBZkdIndex.cpp
@@ -422,10 +422,13 @@ auto zkd::specializeCondition(arangodb::Index const* index, arangodb::aql::AstNo
 arangodb::Result arangodb::RocksDBZkdIndexBase::insert(
     arangodb::transaction::Methods& trx, arangodb::RocksDBMethods* methods,
     const arangodb::LocalDocumentId& documentId,
-    arangodb::velocypack::Slice doc, const arangodb::OperationOptions& options) {
+    arangodb::velocypack::Slice doc, const arangodb::OperationOptions& options,
+    bool performChecks) {
   TRI_ASSERT(_unique == false);
   TRI_ASSERT(_sparse == false);
 
+  // TODO what about performChecks?
+
   auto key_value = readDocumentKey(doc, _fields);
 
   RocksDBKey rocks_key;
@@ -511,14 +514,14 @@ std::unique_ptr<IndexIterator> arangodb::RocksDBUniqueZkdIndex::iteratorForCondi
                                                           fields().size());
 }
 
-
 arangodb::Result arangodb::RocksDBUniqueZkdIndex::insert(
     arangodb::transaction::Methods& trx, arangodb::RocksDBMethods* methods,
-    const arangodb::LocalDocumentId& documentId,
-    arangodb::velocypack::Slice doc, const arangodb::OperationOptions& options) {
+    const arangodb::LocalDocumentId& documentId, arangodb::velocypack::Slice doc,
+    const arangodb::OperationOptions& options, bool performChecks) {
   TRI_ASSERT(_unique == true);
   TRI_ASSERT(_sparse == false);
 
+  // TODO what about performChecks
   auto key_value = readDocumentKey(doc, _fields);
 
   RocksDBKey rocks_key;
@@ -543,10 +546,10 @@ arangodb::Result arangodb::RocksDBUniqueZkdIndex::insert(
   return Result();
 }
 
-arangodb::Result arangodb::RocksDBUniqueZkdIndex::remove(arangodb::transaction::Methods& trx,
-                                                       arangodb::RocksDBMethods* methods,
-                                                       const arangodb::LocalDocumentId& documentId,
-                                                       arangodb::velocypack::Slice doc) {
+arangodb::Result arangodb::RocksDBUniqueZkdIndex::remove(
+    arangodb::transaction::Methods& trx, arangodb::RocksDBMethods* methods,
+    const arangodb::LocalDocumentId& documentId,
+    arangodb::velocypack::Slice doc) {
   TRI_ASSERT(_unique == true);
   TRI_ASSERT(_sparse == false);
 

diff --git a/arangod/RocksDBEngine/RocksDBZkdIndex.h b/arangod/RocksDBEngine/RocksDBZkdIndex.h
@@ -43,7 +43,7 @@ class RocksDBZkdIndexBase : public RocksDBIndex {
   bool hasSelectivityEstimate() const override { return false; /* TODO */ }
   Result insert(transaction::Methods& trx, RocksDBMethods* methods,
                 const LocalDocumentId& documentId, arangodb::velocypack::Slice doc,
-                const OperationOptions& options) override;
+                const OperationOptions& options, bool performChecks) override;
   Result remove(transaction::Methods& trx, RocksDBMethods* methods,
                 const LocalDocumentId& documentId, arangodb::velocypack::Slice doc) override;
 
@@ -70,7 +70,7 @@ class RocksDBUniqueZkdIndex final : public RocksDBZkdIndexBase {
 
   Result insert(transaction::Methods& trx, RocksDBMethods* methods,
                 const LocalDocumentId& documentId, arangodb::velocypack::Slice doc,
-                const OperationOptions& options) override;
+                const OperationOptions& options, bool performChecks) override;
   Result remove(transaction::Methods& trx, RocksDBMethods* methods,
                 const LocalDocumentId& documentId, arangodb::velocypack::Slice doc) override;