Added prototype for condition finder.

arangodb · mchacki · Sep 10, 2021 · Mar 3, 2021 · Mar 4, 2021 · Mar 4, 2021
commit 60d6ceb85e15b450361312c9968c6adb6cbd1f79
diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
@@ -805,6 +805,9 @@ endif()
 include(ClusterEngine/CMakeLists.txt)
 include(RocksDBEngine/CMakeLists.txt)
 
+add_library(arango_zkd STATIC Zkd/ZkdHelper.cpp)
+
+
 add_library(arango_graph STATIC
   ${LIB_ARANGO_GRAPH_SOURCES}
   ${ADDITIONAL_LIB_ARANGO_GRAPH_SOURCES}
@@ -880,6 +883,7 @@ add_library(arango_rocksdb STATIC
   ${ROCKSDB_SOURCES}
   ${ADDITIONAL_LIB_ARANGO_ROCKSDB_SOURCES}
 )
+target_link_libraries(arango_rocksdb arango_zkd)
 
 add_dependencies(arango_rocksdb snappy-static)
 

diff --git a/arangod/RocksDBEngine/RocksDBKey.cpp b/arangod/RocksDBEngine/RocksDBKey.cpp
@@ -75,6 +75,18 @@ bool RocksDBKey::containsLocalDocumentId(LocalDocumentId const& documentId) cons
   return false;
 }
 
+void RocksDBKey::constructZkdIndexValue(uint64_t indexId, zkd::byte_string const& value, LocalDocumentId documentId) {
+  _type = RocksDBEntryType::ZkdIndexValue;
+  size_t keyLength = sizeof(uint64_t) + value.size() + sizeof(uint64_t);
+  _buffer->clear();
+  _buffer->reserve(keyLength);
+  uint64ToPersistent(*_buffer, indexId);
+  auto sv = value.as_string_view();
+  _buffer->append(sv.data(), sv.size());
+  uint64ToPersistent(*_buffer, documentId.id());
+  TRI_ASSERT(_buffer->size() == keyLength);
+}
+
 void RocksDBKey::constructDatabase(TRI_voc_tick_t databaseId) {
   TRI_ASSERT(databaseId != 0);
   _type = RocksDBEntryType::Database;

diff --git a/arangod/RocksDBEngine/RocksDBKey.h b/arangod/RocksDBEngine/RocksDBKey.h
@@ -31,6 +31,7 @@
 #include "VocBase/Identifiers/DataSourceId.h"
 #include "VocBase/Identifiers/LocalDocumentId.h"
 #include "VocBase/voc-types.h"
+#include "Zkd/ZkdHelper.h"
 
 #include <rocksdb/slice.h>
 
@@ -163,6 +164,8 @@ class RocksDBKey {
   //////////////////////////////////////////////////////////////////////////////
   void constructRevisionTreeValue(uint64_t objectId);
 
+  void constructZkdIndexValue(uint64_t objectId, const zkd::byte_string& value, LocalDocumentId documentId);
+
  public:
   //////////////////////////////////////////////////////////////////////////////
   /// @brief Extracts the type from a key

diff --git a/arangod/RocksDBEngine/RocksDBKeyBounds.cpp b/arangod/RocksDBEngine/RocksDBKeyBounds.cpp
@@ -224,6 +224,7 @@ rocksdb::ColumnFamilyHandle* RocksDBKeyBounds::columnFamily() const {
       return RocksDBColumnFamilyManager::get(RocksDBColumnFamilyManager::Family::FulltextIndex);
     case RocksDBEntryType::LegacyGeoIndexValue:
     case RocksDBEntryType::GeoIndexValue:
+    case RocksDBEntryType::ZkdIndexValue:
       return RocksDBColumnFamilyManager::get(RocksDBColumnFamilyManager::Family::GeoIndex);
     case RocksDBEntryType::Database:
     case RocksDBEntryType::Collection:

diff --git a/arangod/RocksDBEngine/RocksDBTypes.cpp b/arangod/RocksDBEngine/RocksDBTypes.cpp
@@ -101,6 +101,10 @@ static rocksdb::Slice KeyGeneratorValue(
 static RocksDBEntryType revisionTreeValue = RocksDBEntryType::RevisionTreeValue;
 static rocksdb::Slice RevisionTreeValue(
     reinterpret_cast<std::underlying_type<RocksDBEntryType>::type*>(&revisionTreeValue), 1);
+
+static RocksDBEntryType zkdIndexValu
6D4E
e = RocksDBEntryType::ZkdIndexValue;
+static rocksdb::Slice ZdkIndexValue(
+    reinterpret_cast<std::underlying_type<RocksDBEntryType>::type*>(&zkdIndexValue), 1);
 }  // namespace
 
 char const* arangodb::rocksDBEntryTypeName(arangodb::RocksDBEntryType type) {
@@ -141,6 +145,8 @@ char const* arangodb::rocksDBEntryTypeName(arangodb::RocksDBEntryType type) {
       return "KeyGeneratorValue";
     case arangodb::RocksDBEntryType::RevisionTreeValue:
       return "RevisionTreeValue";
+    case arangodb::RocksDBEntryType::ZkdIndexValue:
+      return "ZkdIndexValue";
   }
   return "Invalid";
 }
@@ -239,6 +245,8 @@ rocksdb::Slice const& arangodb::rocksDBSlice(RocksDBEntryType const& type) {
       return KeyGeneratorValue;
     case RocksDBEntryType::RevisionTreeValue:
       return RevisionTreeValue;
+    case RocksDBEntryType::ZkdIndexValue:
+      return ZdkIndexValue;
   }
 
   return Placeholder;  // avoids warning - errorslice instead ?!

diff --git a/arangod/RocksDBEngine/RocksDBTypes.h b/arangod/RocksDBEngine/RocksDBTypes.h
@@ -53,7 +53,8 @@ enum class RocksDBEntryType : char {
   KeyGeneratorValue = '=',
   View = '>',
   GeoIndexValue = '?',
-  RevisionTreeValue = '@'
+  RevisionTreeValue = '@',
+  ZkdIndexValue = 'Z'
 };
 
 char const* rocksDBEntryTypeName(RocksDBEntryType);

diff --git a/arangod/RocksDBEngine/RocksDBValue.cpp b/arangod/RocksDBEngine/RocksDBValue.cpp
@@ -54,6 +54,11 @@ RocksDBValue RocksDBValue::VPackIndexValue() {
   return RocksDBValue(RocksDBEntryType::VPackIndexValue);
 }
 
+
+RocksDBValue RocksDBValue::ZkdIndexValue() {
+  return RocksDBValue(RocksDBEntryType::ZkdIndexValue);
+}
+
 RocksDBValue RocksDBValue::UniqueVPackIndexValue(LocalDocumentId const& docId) {
   return RocksDBValue(RocksDBEntryType::UniqueVPackIndexValue, docId, RevisionId::none());
 }

diff --git a/arangod/RocksDBEngine/RocksDBValue.h b/arangod/RocksDBEngine/RocksDBValue.h
@@ -54,6 +54,7 @@ class RocksDBValue {
   static RocksDBValue PrimaryIndexValue(LocalDocumentId const& docId, RevisionId revision);
   static RocksDBValue EdgeIndexValue(arangodb::velocypack::StringRef const& vertexId);
   static RocksDBValue VPackIndexValue();
+  static RocksDBValue ZkdIndexValue();
   static RocksDBValue UniqueVPackIndexValue(LocalDocumentId const& docId);
   static RocksDBValue View(VPackSlice const& data);
   static RocksDBValue ReplicationApplierConfig(VPackSlice const& data);