Refactor storage file structure

Summary:
- Create types folder in storage/common
- Move locking and kvstore to storage/common
- Add storage/distributed/rpc folder

Reviewers: teon.banek, ipaljak, msantl

Reviewed By: msantl

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D1713

.gitignore

@@ -40,6 +40,13 @@ TAGS
 
 # LCP generated C++ & Cap'n Proto files
 *.lcp.cpp
+
+# TODO delete later
+src/storage/distributed/concurrent_id_mapper_rpc_messages.capnp
+src/storage/distributed/concurrent_id_mapper_rpc_messages.hpp
+#####
+
+
 src/database/distributed/counters_rpc_messages.capnp
 src/database/distributed/counters_rpc_messages.hpp
 src/database/distributed/serialization.capnp
@@ -78,7 +85,7 @@ src/query/plan/distributed_ops.hpp
 src/query/plan/operator.hpp
 src/stats/stats_rpc_messages.capnp
 src/stats/stats_rpc_messages.hpp
-src/storage/distributed/concurrent_id_mapper_rpc_messages.capnp
-src/storage/distributed/concurrent_id_mapper_rpc_messages.hpp
+src/storage/distributed/rpc/concurrent_id_mapper_rpc_messages.capnp
+src/storage/distributed/rpc/concurrent_id_mapper_rpc_messages.hpp
 src/transactions/distributed/engine_rpc_messages.capnp
 src/transactions/distributed/engine_rpc_messages.hpp

src/CMakeLists.txt

@@ -42,9 +42,9 @@ set(mg_single_node_sources
     query/repl.cpp
     query/typed_value.cpp
     storage/single_node/edge_accessor.cpp
-    storage/locking/record_lock.cpp
-    storage/common/property_value.cpp
-    storage/common/property_value_store.cpp
+    storage/common/locking/record_lock.cpp
+    storage/common/types/property_value.cpp
+    storage/common/types/property_value_store.cpp
     storage/single_node/record_accessor.cpp
     storage/single_node/vertex_accessor.cpp
     transactions/single_node/engine.cpp
@@ -146,13 +146,13 @@ set(mg_distributed_sources
     query/repl.cpp
     query/serialization.cpp
     query/typed_value.cpp
-    storage/common/property_value.cpp
-    storage/common/property_value_store.cpp
+    storage/common/locking/record_lock.cpp
+    storage/common/types/property_value.cpp
+    storage/common/types/property_value_store.cpp
     storage/distributed/edge_accessor.cpp
     storage/distributed/record_accessor.cpp
-    storage/distributed/serialization.cpp
+    storage/distributed/rpc/serialization.cpp
     storage/distributed/vertex_accessor.cpp
-    storage/locking/record_lock.cpp
     memgraph_init.cpp
     transactions/distributed/engine_single_node.cpp
 )
@@ -204,8 +204,8 @@ add_lcp_distributed(query/plan/distributed_ops.lcp CAPNP_SCHEMA @0xe5cae8d045d30
         DEPENDS query/plan/operator.lcp)
 add_capnp(query/plan/distributed_ops.capnp)
 
-add_lcp_distributed(storage/distributed/concurrent_id_mapper_rpc_messages.lcp CAPNP_SCHEMA @0xa6068dae93d225dd)
-add_capnp(storage/distributed/concurrent_id_mapper_rpc_messages.capnp)
+add_lcp_distributed(storage/distributed/rpc/concurrent_id_mapper_rpc_messages.lcp CAPNP_SCHEMA @0xa6068dae93d225dd)
+add_capnp(storage/distributed/rpc/concurrent_id_mapper_rpc_messages.capnp)
 add_lcp_distributed(transactions/distributed/engine_rpc_messages.lcp CAPNP_SCHEMA @0xde02b7c49180cad5
         DEPENDS transactions/distributed/serialization.lcp)
 add_capnp(transactions/distributed/engine_rpc_messages.capnp)
@@ -218,7 +218,7 @@ add_capnp(communication/rpc/messages.capnp)
 add_capnp(durability/distributed/serialization.capnp)
 add_capnp(query/frontend/semantic/symbol.capnp)
 add_capnp(query/serialization.capnp)
-add_capnp(storage/distributed/serialization.capnp)
+add_capnp(storage/distributed/rpc/serialization.capnp)
 
 add_custom_target(generate_capnp DEPENDS generate_lcp_distributed ${generated_capnp_files})
 
@@ -268,9 +268,9 @@ set(mg_single_node_ha_sources
     query/plan/variable_start_planner.cpp
     query/repl.cpp
     query/typed_value.cpp
-    storage/common/property_value.cpp
-    storage/common/property_value_store.cpp
-    storage/locking/record_lock.cpp
+    storage/common/types/property_value.cpp
+    storage/common/types/property_value_store.cpp
+    storage/common/locking/record_lock.cpp
     storage/single_node_ha/edge_accessor.cpp
     storage/single_node_ha/record_accessor.cpp
     storage/single_node_ha/vertex_accessor.cpp
@@ -313,11 +313,11 @@ target_compile_definitions(mg-single-node-ha PUBLIC MG_SINGLE_NODE_HA)
 string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build_type)
 
 # STATIC library used to store key-value pairs
-add_library(kvstore_lib STATIC storage/kvstore/kvstore.cpp)
+add_library(kvstore_lib STATIC storage/common/kvstore/kvstore.cpp)
 target_link_libraries(kvstore_lib stdc++fs mg-utils rocksdb bzip2 zlib glog gflags)
 
 # STATIC library for dummy key-value storage
-add_library(kvstore_dummy_lib STATIC storage/kvstore/kvstore_dummy.cpp)
+add_library(kvstore_dummy_lib STATIC storage/common/kvstore/kvstore_dummy.cpp)
 target_link_libraries(kvstore_dummy_lib mg-utils)
 
 # Generate a version.hpp file

src/auth/auth.hpp

@@ -6,7 +6,7 @@
 
 #include "auth/exceptions.hpp"
 #include "auth/models.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 
 namespace auth {
 

src/database/distributed/graph_db.hpp

@@ -9,7 +9,7 @@
 #include "durability/distributed/recovery.hpp"
 #include "durability/distributed/wal.hpp"
 #include "io/network/endpoint.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/concurrent_id_mapper.hpp"
 #include "storage/distributed/storage.hpp"
 #include "storage/distributed/storage_gc.hpp"

src/database/distributed/graph_db_accessor.hpp

@@ -11,7 +11,7 @@
 #include <cppitertools/imap.hpp>
 
 #include "database/distributed/graph_db.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "storage/distributed/edge_accessor.hpp"
 #include "storage/distributed/vertex_accessor.hpp"

src/database/distributed/serialization.lcp

@@ -3,7 +3,7 @@
 
 #include "database/distributed/serialization.capnp.h"
 #include "durability/distributed/state_delta.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 cpp<#
 
 ;; Generate serialization of state-delta

src/database/single_node/graph_db.hpp

@@ -10,7 +10,7 @@
 #include "durability/single_node/recovery.hpp"
 #include "durability/single_node/wal.hpp"
 #include "io/network/endpoint.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/concurrent_id_mapper.hpp"
 #include "storage/single_node/storage.hpp"
 #include "storage/single_node/storage_gc.hpp"

src/database/single_node/graph_db_accessor.hpp

@@ -11,7 +11,7 @@
 #include <cppitertools/imap.hpp>
 
 #include "database/single_node/graph_db.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/edge_accessor.hpp"
 #include "storage/single_node/vertex_accessor.hpp"
 #include "transactions/transaction.hpp"

src/database/single_node_ha/graph_db.hpp

@@ -10,7 +10,7 @@
 #include "durability/single_node_ha/recovery.hpp"
 #include "durability/single_node_ha/wal.hpp"
 #include "io/network/endpoint.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/concurrent_id_mapper.hpp"
 #include "storage/single_node_ha/storage.hpp"
 #include "storage/single_node_ha/storage_gc.hpp"

src/database/single_node_ha/graph_db_accessor.hpp

@@ -11,7 +11,7 @@
 #include <cppitertools/imap.hpp>
 
 #include "database/single_node_ha/graph_db.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/edge_accessor.hpp"
 #include "storage/single_node_ha/vertex_accessor.hpp"
 #include "transactions/transaction.hpp"

src/distributed/bfs_rpc_messages.lcp

@@ -9,7 +9,7 @@
 #include "query/frontend/semantic/symbol_table.hpp"
 #include "query/plan/distributed_ops.hpp"
 #include "query/serialization.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "transactions/type.hpp"
 #include "utils/serialization.hpp"
 cpp<#
@@ -21,7 +21,7 @@ cpp<#
 (lcp:capnp-import 'ast "/query/frontend/ast/ast_serialization.capnp")
 (lcp:capnp-import 'dist-ops "/query/plan/distributed_ops.capnp")
 (lcp:capnp-import 'query "/query/serialization.capnp")
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 (lcp:capnp-import 'symbol "/query/frontend/semantic/symbol.capnp")
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
 

src/distributed/data_rpc_messages.lcp

@@ -8,7 +8,7 @@
 #include "distributed/data_rpc_messages.capnp.h"
 #include "storage/distributed/edge.hpp"
 #include "storage/distributed/gid.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "storage/distributed/vertex.hpp"
 #include "transactions/type.hpp"
 cpp<#
@@ -18,7 +18,7 @@ cpp<#
 (lcp:capnp-namespace "distributed")
 
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 
 (lcp:define-struct tx-gid-pair ()
   ((tx-id "tx::TransactionId" :capnp-type "UInt64")

src/distributed/index_rpc_messages.lcp

@@ -6,8 +6,8 @@
 
 #include "communication/rpc/messages.hpp"
 #include "distributed/index_rpc_messages.capnp.h"
-#include "storage/common/types.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "transactions/transaction.hpp"
 cpp<#
 
@@ -15,7 +15,7 @@ cpp<#
 
 (lcp:capnp-namespace "distributed")
 
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 
 (lcp:define-rpc populate-index
     (:request

src/distributed/pull_produce_rpc_messages.lcp

@@ -29,7 +29,7 @@ cpp<#
 
 (lcp:capnp-namespace "distributed")
 
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 (lcp:capnp-import 'query "/query/serialization.capnp")
 (lcp:capnp-import 'sem "/query/frontend/semantic/symbol.capnp")
 (lcp:capnp-import 'utils "/utils/serialization.capnp")

src/distributed/updates_rpc_clients.hpp

@@ -7,7 +7,7 @@
 #include "distributed/updates_rpc_messages.hpp"
 #include "durability/distributed/state_delta.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "storage/distributed/gid.hpp"
 #include "transactions/type.hpp"

src/distributed/updates_rpc_messages.lcp

@@ -9,7 +9,7 @@
 #include "durability/distributed/state_delta.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "storage/distributed/gid.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "transactions/type.hpp"
 #include "utils/serialization.hpp"
 cpp<#
@@ -19,7 +19,7 @@ cpp<#
 (lcp:capnp-namespace "distributed")
 
 (lcp:capnp-import 'db "/database/distributed/serialization.capnp")
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
 
 (lcp:capnp-type-conversion "tx::TransactionId" "UInt64")

src/distributed/updates_rpc_server.hpp

@@ -14,7 +14,7 @@
 #include "distributed/updates_rpc_messages.hpp"
 #include "durability/distributed/state_delta.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/edge_accessor.hpp"
 #include "storage/distributed/gid.hpp"
 #include "storage/distributed/vertex_accessor.hpp"

src/durability/distributed/snapshot_value.hpp

@@ -7,7 +7,7 @@
 #include "communication/bolt/v1/value.hpp"
 // TODO: WTF is this doing here?
 #include "query/typed_value.hpp"
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "utils/algorithm.hpp"
 #include "utils/exceptions.hpp"

src/durability/distributed/state_delta.lcp

@@ -5,8 +5,8 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "durability/hashed_file_reader.hpp"
 #include "durability/hashed_file_writer.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "storage/distributed/gid.hpp"
 cpp<#
@@ -19,7 +19,7 @@ cpp<#
 
 (lcp:capnp-namespace "database")
 
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 
 (lcp:capnp-type-conversion "tx::TransactionId" "UInt64")
 (lcp:capnp-type-conversion "gid::Gid" "UInt64")

src/durability/distributed/wal.hpp

@@ -10,8 +10,8 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "data_structures/ring_buffer.hpp"
 #include "durability/distributed/state_delta.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/gid.hpp"
 #include "transactions/type.hpp"
 #include "utils/scheduler.hpp"

src/durability/single_node/state_delta.lcp

@@ -5,9 +5,9 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "durability/hashed_file_reader.hpp"
 #include "durability/hashed_file_writer.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/gid.hpp"
 
 class Vertex;

src/durability/single_node/wal.hpp

@@ -10,8 +10,8 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "data_structures/ring_buffer.hpp"
 #include "durability/single_node/state_delta.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/gid.hpp"
 #include "transactions/type.hpp"
 #include "utils/scheduler.hpp"

src/durability/single_node_ha/state_delta.lcp

@@ -5,9 +5,9 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "durability/hashed_file_reader.hpp"
 #include "durability/hashed_file_writer.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/gid.hpp"
 
 class Vertex;

src/durability/single_node_ha/wal.hpp

@@ -10,8 +10,8 @@
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 #include "data_structures/ring_buffer.hpp"
 #include "durability/single_node_ha/state_delta.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/gid.hpp"
 #include "transactions/type.hpp"
 #include "utils/scheduler.hpp"

src/glue/communication.hpp

@@ -3,7 +3,7 @@
 
 #include "communication/bolt/v1/value.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 
 namespace glue {
 

src/integrations/kafka/streams.hpp

@@ -6,7 +6,7 @@
 #include <unordered_map>
 
 #include "integrations/kafka/consumer.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 
 namespace integrations::kafka {
 

src/query/common.hpp

@@ -9,7 +9,7 @@
 #include "query/frontend/ast/ast.hpp"
 #include "query/frontend/semantic/symbol.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 
 namespace query {
 

src/query/frontend/ast/ast.lcp

@@ -9,8 +9,8 @@
 #include "query/frontend/semantic/symbol.hpp"
 #include "query/interpret/awesome_memgraph_functions.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 
 // Hash function for the key in pattern atom property maps.
 namespace std {
@@ -36,7 +36,7 @@ cpp<#
 (lcp:namespace query)
 (lcp:capnp-namespace "query")
 
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 (lcp:capnp-import 'symbol "/query/frontend/semantic/symbol.capnp")
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
 

src/query/frontend/ast/ast_serialization.lcp

@@ -4,7 +4,7 @@
 #include "query/frontend/ast/ast.hpp"
 #include "query/frontend/ast/ast_serialization.capnp.h"
 #include "query/serialization.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 cpp<#
 
 (load "query/frontend/ast/ast.lcp")

src/query/parameters.hpp

@@ -6,7 +6,7 @@
 #include <utility>
 #include <vector>
 
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 
 /**
  * Encapsulates user provided parameters (and stripped literals)

src/query/plan/distributed_ops.lcp

@@ -7,7 +7,7 @@
 #include "query/plan/distributed_ops.capnp.h"
 #include "query/plan/operator.hpp"
 #include "query/serialization.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 cpp<#
 
 (load "query/plan/operator.lcp")

src/query/plan/operator.lcp

@@ -14,7 +14,7 @@
 #include "query/frontend/ast/ast.hpp"
 #include "query/frontend/semantic/symbol.hpp"
 #include "query/typed_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/bound.hpp"
 #include "utils/future.hpp"
 #include "utils/hashing/fnv.hpp"
@@ -126,7 +126,7 @@ cpp<#
 (lcp:capnp-namespace "query::plan")
 
 (lcp:capnp-import 'utils "/utils/serialization.capnp")
-(lcp:capnp-import 'storage "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 'storage "/storage/distributed/rpc/serialization.capnp")
 (lcp:capnp-import 'ast "/query/frontend/ast/ast_serialization.capnp")
 (lcp:capnp-import 'semantic "/query/frontend/semantic/symbol.capnp")
 (lcp:capnp-import 'query "/query/serialization.capnp")

src/query/plan/vertex_count_cache.hpp

@@ -3,8 +3,8 @@
 
 #include <experimental/optional>
 
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/bound.hpp"
 #include "utils/hashing/fnv.hpp"
 

src/query/serialization.capnp

@@ -2,7 +2,7 @@
 
 using Ast = import "/query/frontend/ast/ast_serialization.capnp";
 using Cxx = import "/capnp/c++.capnp";
-using Storage = import "/storage/distributed/serialization.capnp";
+using Storage = import "/storage/distributed/rpc/serialization.capnp";
 using Utils = import "/utils/serialization.capnp";
 
 $Cxx.namespace("query::capnp");

src/query/serialization.hpp

@@ -7,7 +7,7 @@
 #include "query/frontend/semantic/symbol_table.hpp"
 #include "query/serialization.capnp.h"
 #include "query/typed_value.hpp"
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 
 namespace distributed {
 class DataManager;

src/query/typed_value.hpp

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "query/path.hpp"
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 #include "storage/edge_accessor.hpp"
 #include "storage/vertex_accessor.hpp"
 #include "utils/exceptions.hpp"

src/storage/common/kvstore/kvstore.cpp

@@ -1,7 +1,7 @@
 #include <rocksdb/db.h>
 #include <rocksdb/options.h>
 
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "utils/file.hpp"
 
 namespace storage {

src/storage/common/kvstore/kvstore_dummy.cpp

@@ -1,4 +1,4 @@
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 
 #include <glog/logging.h>
 

src/storage/common/locking/record_lock.cpp

@@ -1,4 +1,4 @@
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/record_lock.hpp"
 
 #include <fmt/format.h>
 #include <glog/logging.h>

src/storage/common/locking/record_lock.hpp

@@ -4,7 +4,7 @@
 #include <chrono>
 #include <unordered_set>
 
-#include "storage/locking/lock_status.hpp"
+#include "storage/common/locking/lock_status.hpp"
 #include "transactions/type.hpp"
 
 namespace tx {

src/storage/common/types/property_value.cpp

@@ -1,4 +1,4 @@
-#include "storage/common/property_value.hpp"
+#include "storage/common/types/property_value.hpp"
 
 // const value extraction template instantiations
 template <>

src/storage/common/types/property_value_store.cpp

@@ -1,4 +1,4 @@
-#include "storage/common/property_value_store.hpp"
+#include "storage/common/types/property_value_store.hpp"
 
 #include <experimental/filesystem>
 

src/storage/common/types/property_value_store.hpp

@@ -5,9 +5,9 @@
 #include <string>
 #include <vector>
 
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 
 /**
  * A collection of properties accessed in a map-like way using a key of type

src/storage/distributed/address_types.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "storage/distributed/address.hpp"
 
 class Edge;

src/storage/distributed/concurrent_id_mapper_master.cpp

@@ -2,8 +2,8 @@
 
 #include <glog/logging.h>
 
-#include "storage/common/types.hpp"
-#include "storage/distributed/concurrent_id_mapper_rpc_messages.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/distributed/rpc/concurrent_id_mapper_rpc_messages.hpp"
 
 namespace storage {
 

src/storage/distributed/concurrent_id_mapper_single_node.hpp

@@ -3,7 +3,7 @@
 #include <mutex>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/concurrent_id_mapper.hpp"
 #include "utils/algorithm.hpp"
 

src/storage/distributed/concurrent_id_mapper_worker.cpp

@@ -2,8 +2,8 @@
 
 #include <glog/logging.h>
 
-#include "storage/common/types.hpp"
-#include "storage/distributed/concurrent_id_mapper_rpc_messages.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/distributed/rpc/concurrent_id_mapper_rpc_messages.hpp"
 
 namespace storage {
 

src/storage/distributed/deferred_deleter.hpp

@@ -6,7 +6,7 @@
 #include <list>
 
 #include "glog/logging.h"
-#include "mvcc/distributed/record.hpp"
+#include "storage/distributed/mvcc/record.hpp"
 #include "transactions/transaction.hpp"
 
 /**

src/storage/distributed/edge.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/distributed/record.hpp"
-#include "mvcc/distributed/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/distributed/mvcc/record.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address.hpp"
 
 class Vertex;

src/storage/distributed/edges.hpp

@@ -6,8 +6,8 @@
 
 #include "glog/logging.h"
 
-#include "mvcc/distributed/version_list.hpp"
-#include "storage/common/types.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address.hpp"
 #include "storage/distributed/address_types.hpp"
 #include "utils/algorithm.hpp"

src/storage/distributed/garbage_collector.hpp

@@ -3,7 +3,7 @@
 #include <glog/logging.h>
 
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "storage/distributed/deferred_deleter.hpp"
 #include "transactions/distributed/engine.hpp"
 

src/storage/distributed/indexes/key_index.hpp

@@ -3,9 +3,9 @@
 #include "glog/logging.h"
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/edge.hpp"
 #include "storage/distributed/vertex.hpp"
 #include "transactions/transaction.hpp"

src/storage/distributed/indexes/label_property_index.hpp

@@ -4,9 +4,9 @@
 
 #include "data_structures/concurrent/concurrent_map.hpp"
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/edge.hpp"
 #include "storage/distributed/vertex.hpp"
 #include "transactions/transaction.hpp"

src/storage/distributed/mvcc/record.hpp

@@ -8,8 +8,8 @@
 #include "transactions/distributed/engine.hpp"
 #include "transactions/transaction.hpp"
 
-#include "mvcc/common/version.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/mvcc/version.hpp"
+#include "storage/common/locking/record_lock.hpp"
 
 // the mvcc implementation used here is very much like postgresql's
 // more info: https://momjian.us/main/writings/pgsql/mvcc.pdf

src/storage/distributed/mvcc/version_list.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storage/distributed/gid.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/record_lock.hpp"
 #include "transactions/transaction.hpp"
 #include "utils/exceptions.hpp"
 

src/storage/distributed/record_accessor.hpp

@@ -3,10 +3,10 @@
 
 #include <glog/logging.h>
 
-#include "mvcc/distributed/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address.hpp"
 #include "storage/distributed/gid.hpp"
 #include "utils/total_ordering.hpp"

src/storage/distributed/rpc/concurrent_id_mapper_rpc_messages.lcp

@@ -4,9 +4,9 @@
 #include <chrono>
 
 #include "communication/rpc/messages.hpp"
-#include "storage/common/types.hpp"
-#include "storage/distributed/concurrent_id_mapper_rpc_messages.capnp.h"
-#include "storage/distributed/serialization.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/distributed/rpc/concurrent_id_mapper_rpc_messages.capnp.h"
+#include "storage/distributed/rpc/serialization.hpp"
 #include "transactions/commit_log.hpp"
 #include "transactions/snapshot.hpp"
 #include "transactions/type.hpp"
@@ -16,7 +16,7 @@ cpp<#
 
 (lcp:capnp-namespace "storage")
 
-(lcp:capnp-import 's "/storage/distributed/serialization.capnp")
+(lcp:capnp-import 's "/storage/distributed/rpc/serialization.capnp")
 
 (lcp:define-rpc label-id
     (:request ((member "std::string")))

src/storage/distributed/rpc/serialization.cpp

@@ -1,4 +1,4 @@
-#include "storage/distributed/serialization.hpp"
+#include "storage/distributed/rpc/serialization.hpp"
 
 #include "database/distributed/graph_db_accessor.hpp"
 #include "distributed/data_manager.hpp"

src/storage/distributed/rpc/serialization.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "storage/common/property_value.hpp"
-#include "storage/common/property_value_store.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/property_value_store.hpp"
 #include "storage/distributed/edge.hpp"
 #include "storage/distributed/edge_accessor.hpp"
-#include "storage/distributed/serialization.capnp.h"
+#include "storage/distributed/rpc/serialization.capnp.h"
 #include "storage/distributed/vertex.hpp"
 #include "storage/distributed/vertex_accessor.hpp"
 

src/storage/distributed/storage.hpp

@@ -5,14 +5,14 @@
 
 #include "data_structures/concurrent/concurrent_map.hpp"
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/distributed/version_list.hpp"
-#include "storage/common/types.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address.hpp"
 #include "storage/distributed/edge.hpp"
 #include "storage/distributed/indexes/key_index.hpp"
 #include "storage/distributed/indexes/label_property_index.hpp"
 #include "storage/distributed/vertex.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "transactions/type.hpp"
 
 namespace distributed {

src/storage/distributed/storage_gc.hpp

@@ -4,7 +4,7 @@
 #include <queue>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/distributed/version_list.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
 #include "stats/metrics.hpp"
 #include "storage/distributed/deferred_deleter.hpp"
 #include "storage/distributed/edge.hpp"

src/storage/distributed/vertex.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/distributed/record.hpp"
-#include "mvcc/distributed/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/distributed/mvcc/record.hpp"
+#include "storage/distributed/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/distributed/address.hpp"
 #include "storage/distributed/edges.hpp"
 

src/storage/single_node/concurrent_id_mapper.hpp

@@ -3,7 +3,7 @@
 #include <mutex>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/algorithm.hpp"
 
 namespace storage {

src/storage/single_node/deferred_deleter.hpp

@@ -6,7 +6,7 @@
 #include <list>
 
 #include "glog/logging.h"
-#include "mvcc/single_node/record.hpp"
+#include "storage/single_node/mvcc/record.hpp"
 #include "transactions/transaction.hpp"
 
 /**

src/storage/single_node/edge.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/single_node/record.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/record.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 
 class Vertex;
 

src/storage/single_node/edges.hpp

@@ -6,8 +6,8 @@
 
 #include "glog/logging.h"
 
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/algorithm.hpp"
 
 /**

src/storage/single_node/garbage_collector.hpp

@@ -3,7 +3,7 @@
 #include <glog/logging.h>
 
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "storage/single_node/deferred_deleter.hpp"
 #include "transactions/single_node/engine.hpp"
 

src/storage/single_node/indexes/key_index.hpp

@@ -3,9 +3,9 @@
 #include "glog/logging.h"
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/edge.hpp"
 #include "storage/single_node/vertex.hpp"
 #include "transactions/transaction.hpp"

src/storage/single_node/indexes/label_property_index.hpp

@@ -4,9 +4,9 @@
 
 #include "data_structures/concurrent/concurrent_map.hpp"
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/edge.hpp"
 #include "storage/single_node/vertex.hpp"
 #include "transactions/transaction.hpp"

src/storage/single_node/mvcc/record.hpp

@@ -8,8 +8,8 @@
 #include "transactions/single_node/engine.hpp"
 #include "transactions/transaction.hpp"
 
-#include "mvcc/common/version.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/mvcc/version.hpp"
+#include "storage/common/locking/record_lock.hpp"
 
 // the mvcc implementation used here is very much like postgresql's
 // more info: https://momjian.us/main/writings/pgsql/mvcc.pdf

src/storage/single_node/mvcc/version_list.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storage/single_node/gid.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/record_lock.hpp"
 #include "transactions/transaction.hpp"
 #include "utils/cast.hpp"
 #include "utils/exceptions.hpp"

src/storage/single_node/record_accessor.hpp

@@ -3,10 +3,10 @@
 
 #include <glog/logging.h>
 
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/gid.hpp"
 #include "utils/total_ordering.hpp"
 

src/storage/single_node/storage.hpp

@@ -4,9 +4,9 @@
 #include <experimental/optional>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/types.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "storage/single_node/edge.hpp"
 #include "storage/single_node/indexes/key_index.hpp"
 #include "storage/single_node/indexes/label_property_index.hpp"

src/storage/single_node/storage_gc.hpp

@@ -4,7 +4,7 @@
 #include <queue>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "stats/metrics.hpp"
 #include "storage/single_node/deferred_deleter.hpp"
 #include "storage/single_node/edge.hpp"

src/storage/single_node/vertex.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/single_node/record.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/record.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/edges.hpp"
 
 class Vertex : public mvcc::Record<Vertex> {

src/storage/single_node_ha/concurrent_id_mapper.hpp

@@ -3,7 +3,7 @@
 #include <mutex>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/algorithm.hpp"
 
 namespace storage {

src/storage/single_node_ha/deferred_deleter.hpp

@@ -6,7 +6,7 @@
 #include <list>
 
 #include "glog/logging.h"
-#include "mvcc/single_node_ha/record.hpp"
+#include "storage/single_node_ha/mvcc/record.hpp"
 #include "transactions/transaction.hpp"
 
 /**

src/storage/single_node_ha/edge.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/single_node_ha/record.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node_ha/mvcc/record.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 
 class Vertex;
 

src/storage/single_node_ha/edges.hpp

@@ -6,8 +6,8 @@
 
 #include "glog/logging.h"
 
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
 #include "utils/algorithm.hpp"
 
 /**

src/storage/single_node_ha/garbage_collector.hpp

@@ -3,7 +3,7 @@
 #include <glog/logging.h>
 
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
 #include "storage/single_node_ha/deferred_deleter.hpp"
 #include "transactions/single_node_ha/engine.hpp"
 

src/storage/single_node_ha/indexes/key_index.hpp

@@ -3,9 +3,9 @@
 #include "glog/logging.h"
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/edge.hpp"
 #include "storage/single_node_ha/vertex.hpp"
 #include "transactions/transaction.hpp"

src/storage/single_node_ha/indexes/label_property_index.hpp

@@ -4,9 +4,9 @@
 
 #include "data_structures/concurrent/concurrent_map.hpp"
 #include "data_structures/concurrent/skiplist.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
 #include "storage/common/index.hpp"
-#include "storage/common/types.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/edge.hpp"
 #include "storage/single_node_ha/vertex.hpp"
 #include "transactions/transaction.hpp"

src/storage/single_node_ha/mvcc/record.hpp

@@ -8,8 +8,8 @@
 #include "transactions/single_node_ha/engine.hpp"
 #include "transactions/transaction.hpp"
 
-#include "mvcc/common/version.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/mvcc/version.hpp"
+#include "storage/common/locking/record_lock.hpp"
 
 // the mvcc implementation used here is very much like postgresql's
 // more info: https://momjian.us/main/writings/pgsql/mvcc.pdf

src/storage/single_node_ha/mvcc/version_list.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "storage/single_node_ha/gid.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/record_lock.hpp"
 #include "transactions/transaction.hpp"
 #include "utils/cast.hpp"
 #include "utils/exceptions.hpp"

src/storage/single_node_ha/record_accessor.hpp

@@ -3,10 +3,10 @@
 
 #include <glog/logging.h>
 
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/gid.hpp"
 #include "utils/total_ordering.hpp"
 

src/storage/single_node_ha/storage.hpp

@@ -4,9 +4,9 @@
 #include <experimental/optional>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/types.hpp"
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/types.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "storage/single_node_ha/edge.hpp"
 #include "storage/single_node_ha/indexes/key_index.hpp"
 #include "storage/single_node_ha/indexes/label_property_index.hpp"

src/storage/single_node_ha/storage_gc.hpp

@@ -4,7 +4,7 @@
 #include <queue>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
 #include "stats/metrics.hpp"
 #include "storage/single_node_ha/deferred_deleter.hpp"
 #include "storage/single_node_ha/edge.hpp"

src/storage/single_node_ha/vertex.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "mvcc/single_node_ha/record.hpp"
-#include "mvcc/single_node_ha/version_list.hpp"
-#include "storage/common/property_value_store.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node_ha/mvcc/record.hpp"
+#include "storage/single_node_ha/mvcc/version_list.hpp"
+#include "storage/common/types/property_value_store.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node_ha/edges.hpp"
 
 class Vertex : public mvcc::Record<Vertex> {

src/telemetry/telemetry.hpp

@@ -5,7 +5,7 @@
 
 #include <json/json.hpp>
 
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "utils/scheduler.hpp"
 #include "utils/timer.hpp"
 

src/transactions/lock_store.hpp

@@ -5,8 +5,8 @@
 #include <vector>
 
 #include "glog/logging.h"
-#include "storage/locking/lock_status.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/lock_status.hpp"
+#include "storage/common/locking/record_lock.hpp"
 #include "transactions/type.hpp"
 #include "utils/thread/sync.hpp"
 

src/transactions/transaction.hpp

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "data_structures/concurrent/concurrent_map.hpp"
-#include "storage/locking/record_lock.hpp"
+#include "storage/common/locking/record_lock.hpp"
 #include "transactions/lock_store.hpp"
 #include "transactions/snapshot.hpp"
 #include "transactions/type.hpp"

src/utils/random_graph_generator.hpp

@@ -9,9 +9,9 @@
 
 #include "data_structures/concurrent/skiplist.hpp"
 #include "database/single_node/graph_db_accessor.hpp"
-#include "mvcc/single_node/version_list.hpp"
-#include "storage/common/property_value.hpp"
-#include "storage/common/types.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
+#include "storage/common/types/property_value.hpp"
+#include "storage/common/types/types.hpp"
 #include "storage/single_node/vertex_accessor.hpp"
 
 // TODO: Why is this file here? It is used only in a test...

tests/benchmark/mvcc.cpp

@@ -2,8 +2,8 @@
 #include <benchmark/benchmark_api.h>
 #include <glog/logging.h>
 
-#include "mvcc/single_node/record.hpp"
-#include "mvcc/single_node/version_list.hpp"
+#include "storage/single_node/mvcc/record.hpp"
+#include "storage/single_node/mvcc/version_list.hpp"
 #include "transactions/single_node/engine.hpp"
 
 class Prop : public mvcc::Record<Prop> {

tests/manual/kvstore_console.cpp

@@ -1,7 +1,7 @@
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 
-#include "storage/kvstore/kvstore.hpp"
+#include "storage/common/kvstore/kvstore.hpp"
 #include "utils/string.hpp"
 
 DEFINE_string(path, "", "Path to the storage directory.");