Rocks to v2 storage

src/CMakeLists.txt

@@ -9,7 +9,6 @@ add_subdirectory(telemetry)
 add_subdirectory(communication)
 add_subdirectory(memory)
 add_subdirectory(storage/v2)
-add_subdirectory(storage/rocks)
 add_subdirectory(integrations)
 add_subdirectory(query)
 add_subdirectory(glue)

src/memgraph.cpp

@@ -99,7 +99,7 @@
 #include "audit/log.hpp"
 #endif
 // Disk storage includes
-#include "storage/rocks/storage.hpp"
+#include "storage/v2/disk/storage.hpp"
 
 constexpr const char *kMgUser = "MEMGRAPH_USER";
 constexpr const char *kMgPassword = "MEMGRAPH_PASSWORD";

src/query/context.hpp

@@ -20,7 +20,7 @@
 #include "query/parameters.hpp"
 #include "query/plan/profile.hpp"
 #include "query/trigger.hpp"
-#include "storage/rocks/storage.hpp"
+#include "storage/v2/disk/storage.hpp"
 #include "utils/async_timer.hpp"
 
 namespace memgraph::query {

src/query/interpreter.cpp

@@ -50,7 +50,7 @@
 #include "query/stream/common.hpp"
 #include "query/trigger.hpp"
 #include "query/typed_value.hpp"
-#include "storage/rocks/storage.hpp"
+#include "storage/v2/disk/storage.hpp"
 #include "storage/v2/edge.hpp"
 #include "storage/v2/id_types.hpp"
 #include "storage/v2/property_value.hpp"

src/query/interpreter.hpp

@@ -32,7 +32,7 @@
 #include "query/stream/streams.hpp"
 #include "query/trigger.hpp"
 #include "query/typed_value.hpp"
-#include "storage/rocks/storage.hpp"
+#include "storage/v2/disk/storage.hpp"
 #include "storage/v2/isolation_level.hpp"
 #include "utils/event_counter.hpp"
 #include "utils/logging.hpp"

src/storage/rocks/CMakeLists.txt

@@ -1,10 +0,0 @@
-set(storage_rocks_src_files
-    storage.hpp)
-
-find_package(Threads REQUIRED)
-find_package(gflags REQUIRED)
-find_package(BZip2 REQUIRED)
-find_package(ZLIB REQUIRED)
-
-add_library(mg-storage-rocks STATIC ${storage_rocks_src_files})
-target_link_libraries(mg-storage-rocks mg-utils Threads::Threads stdc++fs rocksdb BZip2::BZip2 ZLIB::ZLIB)

src/storage/v2/CMakeLists.txt

@@ -10,7 +10,9 @@ set(storage_v2_src_files
     indices.cpp
     property_store.cpp
     vertex_accessor.cpp
-    storage.cpp)
+    storage.cpp
+    disk/compaction_filter.cpp
+    disk/storage.hpp)
 
 
 set(storage_v2_src_files

tests/unit/query_streams.cpp

@@ -22,7 +22,7 @@
 #include "query/config.hpp"
 #include "query/interpreter.hpp"
 #include "query/stream/streams.hpp"
-#include "storage/rocks/storage.hpp"
+#include "storage/v2/disk/storage.hpp"
 #include "storage/v2/storage.hpp"
 #include "test_utils.hpp"
 

tests/unit/storage_rocks.cpp

@@ -16,8 +16,8 @@
 
 #include "query/common.hpp"
 #include "query/db_accessor.hpp"
-#include "storage/rocks/storage.hpp"
 #include "storage/v2/delta.hpp"
+#include "storage/v2/disk/storage.hpp"
 #include "storage/v2/id_types.hpp"
 #include "storage/v2/isolation_level.hpp"
 #include "storage/v2/property_value.hpp"