tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor storage file structure

Browse Source 
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
This commit is contained in:
Vinko Kasljevic 2018-11-06 18:15:55 +01:00
parent f923e7f7cb
commit 7ba8228c46
121 changed files with 223 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitignore vendored
View File

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

30
src/CMakeLists.txt
View File

@ -42,9 +42,9 @@ set(mg_single_node_sources
query/repl.cpp query/repl.cpp
query/typed_value.cpp query/typed_value.cpp
storage/single_node/edge_accessor.cpp storage/single_node/edge_accessor.cpp
storage/locking/record_lock.cpp storage/common/locking/record_lock.cpp
storage/common/property_value.cpp storage/common/types/property_value.cpp
storage/common/property_value_store.cpp storage/common/types/property_value_store.cpp
storage/single_node/record_accessor.cpp storage/single_node/record_accessor.cpp
storage/single_node/vertex_accessor.cpp storage/single_node/vertex_accessor.cpp
transactions/single_node/engine.cpp transactions/single_node/engine.cpp
@ -146,13 +146,13 @@ set(mg_distributed_sources
query/repl.cpp query/repl.cpp
query/serialization.cpp query/serialization.cpp
query/typed_value.cpp query/typed_value.cpp
storage/common/property_value.cpp storage/common/locking/record_lock.cpp
storage/common/property_value_store.cpp storage/common/types/property_value.cpp
storage/common/types/property_value_store.cpp
storage/distributed/edge_accessor.cpp storage/distributed/edge_accessor.cpp
storage/distributed/record_accessor.cpp storage/distributed/record_accessor.cpp
storage/distributed/serialization.cpp storage/distributed/rpc/serialization.cpp
storage/distributed/vertex_accessor.cpp storage/distributed/vertex_accessor.cpp
storage/locking/record_lock.cpp
memgraph_init.cpp memgraph_init.cpp
transactions/distributed/engine_single_node.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) DEPENDS query/plan/operator.lcp)
add_capnp(query/plan/distributed_ops.capnp) add_capnp(query/plan/distributed_ops.capnp)
add_lcp_distributed(storage/distributed/concurrent_id_mapper_rpc_messages.lcp CAPNP_SCHEMA @0xa6068dae93d225dd) add_lcp_distributed(storage/distributed/rpc/concurrent_id_mapper_rpc_messages.lcp CAPNP_SCHEMA @0xa6068dae93d225dd)
add_capnp(storage/distributed/concurrent_id_mapper_rpc_messages.capnp) add_capnp(storage/distributed/rpc/concurrent_id_mapper_rpc_messages.capnp)
add_lcp_distributed(transactions/distributed/engine_rpc_messages.lcp CAPNP_SCHEMA @0xde02b7c49180cad5 add_lcp_distributed(transactions/distributed/engine_rpc_messages.lcp CAPNP_SCHEMA @0xde02b7c49180cad5
DEPENDS transactions/distributed/serialization.lcp) DEPENDS transactions/distributed/serialization.lcp)
add_capnp(transactions/distributed/engine_rpc_messages.capnp) 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(durability/distributed/serialization.capnp)
add_capnp(query/frontend/semantic/symbol.capnp) add_capnp(query/frontend/semantic/symbol.capnp)
add_capnp(query/serialization.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}) 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/plan/variable_start_planner.cpp
query/repl.cpp query/repl.cpp
query/typed_value.cpp query/typed_value.cpp
storage/common/property_value.cpp storage/common/types/property_value.cpp
storage/common/property_value_store.cpp storage/common/types/property_value_store.cpp
storage/locking/record_lock.cpp storage/common/locking/record_lock.cpp
storage/single_node_ha/edge_accessor.cpp storage/single_node_ha/edge_accessor.cpp
storage/single_node_ha/record_accessor.cpp storage/single_node_ha/record_accessor.cpp
storage/single_node_ha/vertex_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) string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build_type)
# STATIC library used to store key-value pairs # 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) target_link_libraries(kvstore_lib stdc++fs mg-utils rocksdb bzip2 zlib glog gflags)
# STATIC library for dummy key-value storage # 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) target_link_libraries(kvstore_dummy_lib mg-utils)
# Generate a version.hpp file # Generate a version.hpp file

2
src/auth/auth.hpp
View File

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

2
src/database/distributed/graph_db.hpp
View File

@ -9,7 +9,7 @@
#include "durability/distributed/recovery.hpp" #include "durability/distributed/recovery.hpp"
#include "durability/distributed/wal.hpp" #include "durability/distributed/wal.hpp"
#include "io/network/endpoint.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/concurrent_id_mapper.hpp"
#include "storage/distributed/storage.hpp" #include "storage/distributed/storage.hpp"
#include "storage/distributed/storage_gc.hpp" #include "storage/distributed/storage_gc.hpp"

2
src/database/distributed/graph_db_accessor.hpp
View File

@ -11,7 +11,7 @@
#include <cppitertools/imap.hpp> #include <cppitertools/imap.hpp>
#include "database/distributed/graph_db.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/address_types.hpp"
#include "storage/distributed/edge_accessor.hpp" #include "storage/distributed/edge_accessor.hpp"
#include "storage/distributed/vertex_accessor.hpp" #include "storage/distributed/vertex_accessor.hpp"

2
src/database/distributed/serialization.lcp
View File

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

2
src/database/single_node/graph_db.hpp
View File

@ -10,7 +10,7 @@
#include "durability/single_node/recovery.hpp" #include "durability/single_node/recovery.hpp"
#include "durability/single_node/wal.hpp" #include "durability/single_node/wal.hpp"
#include "io/network/endpoint.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/concurrent_id_mapper.hpp"
#include "storage/single_node/storage.hpp" #include "storage/single_node/storage.hpp"
#include "storage/single_node/storage_gc.hpp" #include "storage/single_node/storage_gc.hpp"

2
src/database/single_node/graph_db_accessor.hpp
View File

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

2
src/database/single_node_ha/graph_db.hpp
View File

@ -10,7 +10,7 @@
#include "durability/single_node_ha/recovery.hpp" #include "durability/single_node_ha/recovery.hpp"
#include "durability/single_node_ha/wal.hpp" #include "durability/single_node_ha/wal.hpp"
#include "io/network/endpoint.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/concurrent_id_mapper.hpp"
#include "storage/single_node_ha/storage.hpp" #include "storage/single_node_ha/storage.hpp"
#include "storage/single_node_ha/storage_gc.hpp" #include "storage/single_node_ha/storage_gc.hpp"

2
src/database/single_node_ha/graph_db_accessor.hpp
View File

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

4
src/distributed/bfs_rpc_messages.lcp
View File

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

4
src/distributed/data_rpc_messages.lcp
View File

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

6
src/distributed/index_rpc_messages.lcp
View File

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

2
src/distributed/pull_produce_rpc_messages.lcp
View File

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

2
src/distributed/updates_rpc_clients.hpp
View File

@ -7,7 +7,7 @@
#include "distributed/updates_rpc_messages.hpp" #include "distributed/updates_rpc_messages.hpp"
#include "durability/distributed/state_delta.hpp" #include "durability/distributed/state_delta.hpp"
#include "query/typed_value.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/address_types.hpp"
#include "storage/distributed/gid.hpp" #include "storage/distributed/gid.hpp"
#include "transactions/type.hpp" #include "transactions/type.hpp"

4
src/distributed/updates_rpc_messages.lcp
View File

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

2
src/distributed/updates_rpc_server.hpp
View File

@ -14,7 +14,7 @@
#include "distributed/updates_rpc_messages.hpp" #include "distributed/updates_rpc_messages.hpp"
#include "durability/distributed/state_delta.hpp" #include "durability/distributed/state_delta.hpp"
#include "query/typed_value.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/edge_accessor.hpp"
#include "storage/distributed/gid.hpp" #include "storage/distributed/gid.hpp"
#include "storage/distributed/vertex_accessor.hpp" #include "storage/distributed/vertex_accessor.hpp"

2
src/durability/distributed/snapshot_value.hpp
View File

@ -7,7 +7,7 @@
#include "communication/bolt/v1/value.hpp" #include "communication/bolt/v1/value.hpp"
// TODO: WTF is this doing here? // TODO: WTF is this doing here?
#include "query/typed_value.hpp" #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 "storage/distributed/address_types.hpp"
#include "utils/algorithm.hpp" #include "utils/algorithm.hpp"
#include "utils/exceptions.hpp" #include "utils/exceptions.hpp"

6
src/durability/distributed/state_delta.lcp
View File

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

4
src/durability/distributed/wal.hpp
View File

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

6
src/durability/single_node/state_delta.lcp
View File

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

4
src/durability/single_node/wal.hpp
View File

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

6
src/durability/single_node_ha/state_delta.lcp
View File

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

4
src/durability/single_node_ha/wal.hpp
View File

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

2
src/glue/communication.hpp
View File

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

2
src/integrations/kafka/streams.hpp
View File

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

2
src/query/common.hpp
View File

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

6
src/query/frontend/ast/ast.lcp
View File

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

2
src/query/frontend/ast/ast_serialization.lcp
View File

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

2
src/query/parameters.hpp
View File

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

2
src/query/plan/distributed_ops.lcp
View File

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

4
src/query/plan/operator.lcp
View File

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

4
src/query/plan/vertex_count_cache.hpp
View File

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

2
src/query/serialization.capnp
View File

@ -2,7 +2,7 @@
using Ast = import "/query/frontend/ast/ast_serialization.capnp"; using Ast = import "/query/frontend/ast/ast_serialization.capnp";
using Cxx = import "/capnp/c++.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"; using Utils = import "/utils/serialization.capnp";
$Cxx.namespace("query::capnp"); $Cxx.namespace("query::capnp");

2
src/query/serialization.hpp
View File

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

2
src/query/typed_value.hpp
View File

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

2
src/storage/kvstore/kvstore.cpp → src/storage/common/kvstore/kvstore.cpp
View File

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

0
src/storage/kvstore/kvstore.hpp → src/storage/common/kvstore/kvstore.hpp
View File

2
src/storage/kvstore/kvstore_dummy.cpp → src/storage/common/kvstore/kvstore_dummy.cpp
View File

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

0
src/storage/locking/lock_status.hpp → src/storage/common/locking/lock_status.hpp
View File

2
src/storage/locking/record_lock.cpp → src/storage/common/locking/record_lock.cpp
View File

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

2
src/storage/locking/record_lock.hpp → src/storage/common/locking/record_lock.hpp
View File

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

0
src/mvcc/common/version.hpp → src/storage/common/mvcc/version.hpp
View File

2
src/storage/common/property_value.cpp → src/storage/common/types/property_value.cpp
View File

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

0
src/storage/common/property_value.hpp → src/storage/common/types/property_value.hpp
View File

2
src/storage/common/property_value_store.cpp → src/storage/common/types/property_value_store.cpp
View File

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

6
src/storage/common/property_value_store.hpp → src/storage/common/types/property_value_store.hpp
View File

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

0
src/storage/common/types.hpp → src/storage/common/types/types.hpp
View File

2
src/storage/distributed/address_types.hpp
View File

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

4
src/storage/distributed/concurrent_id_mapper_master.cpp
View File

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

2
src/storage/distributed/concurrent_id_mapper_single_node.hpp
View File

@ -3,7 +3,7 @@
#include <mutex> #include <mutex>
#include "data_structures/concurrent/concurrent_map.hpp" #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 "storage/distributed/concurrent_id_mapper.hpp"
#include "utils/algorithm.hpp" #include "utils/algorithm.hpp"

4
src/storage/distributed/concurrent_id_mapper_worker.cpp
View File

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

2
src/storage/distributed/deferred_deleter.hpp
View File

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

8
src/storage/distributed/edge.hpp
View File

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

4
src/storage/distributed/edges.hpp
View File

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

2
src/storage/distributed/garbage_collector.hpp
View File

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

4
src/storage/distributed/indexes/key_index.hpp
View File

@ -3,9 +3,9 @@
#include "glog/logging.h" #include "glog/logging.h"
#include "data_structures/concurrent/concurrent_map.hpp" #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/index.hpp"
#include "storage/common/types.hpp" #include "storage/common/types/types.hpp"
#include "storage/distributed/edge.hpp" #include "storage/distributed/edge.hpp"
#include "storage/distributed/vertex.hpp" #include "storage/distributed/vertex.hpp"
#include "transactions/transaction.hpp" #include "transactions/transaction.hpp"

4
src/storage/distributed/indexes/label_property_index.hpp
View File

@ -4,9 +4,9 @@
#include "data_structures/concurrent/concurrent_map.hpp" #include "data_structures/concurrent/concurrent_map.hpp"
#include "data_structures/concurrent/skiplist.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/index.hpp"
#include "storage/common/types.hpp" #include "storage/common/types/types.hpp"
#include "storage/distributed/edge.hpp" #include "storage/distributed/edge.hpp"
#include "storage/distributed/vertex.hpp" #include "storage/distributed/vertex.hpp"
#include "transactions/transaction.hpp" #include "transactions/transaction.hpp"

4
src/mvcc/distributed/record.hpp → src/storage/distributed/mvcc/record.hpp
View File

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

2
src/mvcc/distributed/version_list.hpp → src/storage/distributed/mvcc/version_list.hpp
View File

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

8
src/storage/distributed/record_accessor.hpp
View File

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

8
src/storage/distributed/concurrent_id_mapper_rpc_messages.lcp → src/storage/distributed/rpc/concurrent_id_mapper_rpc_messages.lcp
View File

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

0
src/storage/distributed/serialization.capnp → src/storage/distributed/rpc/serialization.capnp
View File

2
src/storage/distributed/serialization.cpp → src/storage/distributed/rpc/serialization.cpp
View File

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

6
src/storage/distributed/serialization.hpp → src/storage/distributed/rpc/serialization.hpp
View File

@ -1,10 +1,10 @@
#pragma once #pragma once
#include "storage/common/property_value.hpp" #include "storage/common/types/property_value.hpp"
#include "storage/common/property_value_store.hpp" #include "storage/common/types/property_value_store.hpp"
#include "storage/distributed/edge.hpp" #include "storage/distributed/edge.hpp"
#include "storage/distributed/edge_accessor.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.hpp"
#include "storage/distributed/vertex_accessor.hpp" #include "storage/distributed/vertex_accessor.hpp"

6
src/storage/distributed/storage.hpp
View File

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

2
src/storage/distributed/storage_gc.hpp
View File

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

8
src/storage/distributed/vertex.hpp
View File

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

2
src/storage/single_node/concurrent_id_mapper.hpp
View File

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

2
src/storage/single_node/deferred_deleter.hpp
View File

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

8
src/storage/single_node/edge.hpp
View File

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

4
src/storage/single_node/edges.hpp
View File

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

2
src/storage/single_node/garbage_collector.hpp
View File

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

4
src/storage/single_node/indexes/key_index.hpp
View File

@ -3,9 +3,9 @@
#include "glog/logging.h" #include "glog/logging.h"
#include "data_structures/concurrent/concurrent_map.hpp" #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/index.hpp"
#include "storage/common/types.hpp" #include "storage/common/types/types.hpp"
#include "storage/single_node/edge.hpp" #include "storage/single_node/edge.hpp"
#include "storage/single_node/vertex.hpp" #include "storage/single_node/vertex.hpp"
#include "transactions/transaction.hpp" #include "transactions/transaction.hpp"

4
src/storage/single_node/indexes/label_property_index.hpp
View File

@ -4,9 +4,9 @@
#include "data_structures/concurrent/concurrent_map.hpp" #include "data_structures/concurrent/concurrent_map.hpp"
#include "data_structures/concurrent/skiplist.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/index.hpp"
#include "storage/common/types.hpp" #include "storage/common/types/types.hpp"
#include "storage/single_node/edge.hpp" #include "storage/single_node/edge.hpp"
#include "storage/single_node/vertex.hpp" #include "storage/single_node/vertex.hpp"
#include "transactions/transaction.hpp" #include "transactions/transaction.hpp"

4
src/mvcc/single_node/record.hpp → src/storage/single_node/mvcc/record.hpp
View File

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

2
src/mvcc/single_node/version_list.hpp → src/storage/single_node/mvcc/version_list.hpp
View File

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

8
src/storage/single_node/record_accessor.hpp
View File

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

6
src/storage/single_node/storage.hpp
View File

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

2
src/storage/single_node/storage_gc.hpp
View File

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

8
src/storage/single_node/vertex.hpp
View File

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

2
src/storage/single_node_ha/concurrent_id_mapper.hpp
View File

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

2
src/storage/single_node_ha/deferred_deleter.hpp
View File

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

8
src/storage/single_node_ha/edge.hpp
View File

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

4
src/storage/single_node_ha/edges.hpp
View File

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

2
src/storage/single_node_ha/garbage_collector.hpp
View File

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

4
src/storage/single_node_ha/indexes/key_index.hpp
View File

@ -3,9 +3,9 @@
#include "glog/logging.h" #include "glog/logging.h"
#include "data_structures/concurrent/concurrent_map.hpp" #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/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/edge.hpp"
#include "storage/single_node_ha/vertex.hpp" #include "storage/single_node_ha/vertex.hpp"
#include "transactions/transaction.hpp" #include "transactions/transaction.hpp"

4
src/storage/single_node_ha/indexes/label_property_index.hpp
View File

@ -4,9 +4,9 @@
#include "data_structures/concurrent/concurrent_map.hpp" #include "data_structures/concurrent/concurrent_map.hpp"
#include "data_structures/concurrent/skiplist.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/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/edge.hpp"
#include "storage/single_node_ha/vertex.hpp" #include "storage/single_node_ha/vertex.hpp"
#include "transactions/transaction.hpp" #include "transactions/transaction.hpp"

4
src/mvcc/single_node_ha/record.hpp → src/storage/single_node_ha/mvcc/record.hpp
View File

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

2
src/mvcc/single_node_ha/version_list.hpp → src/storage/single_node_ha/mvcc/version_list.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "storage/single_node_ha/gid.hpp" #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 "transactions/transaction.hpp"
#include "utils/cast.hpp" #include "utils/cast.hpp"
#include "utils/exceptions.hpp" #include "utils/exceptions.hpp"

8
src/storage/single_node_ha/record_accessor.hpp
View File

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

6
src/storage/single_node_ha/storage.hpp
View File

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

2
src/storage/single_node_ha/storage_gc.hpp
View File

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

8
src/storage/single_node_ha/vertex.hpp
View File

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

2
src/telemetry/telemetry.hpp
View File

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

4
src/transactions/lock_store.hpp
View File

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

2
src/transactions/transaction.hpp
View File

@ -9,7 +9,7 @@
#include <vector> #include <vector>
#include "data_structures/concurrent/concurrent_map.hpp" #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/lock_store.hpp"
#include "transactions/snapshot.hpp" #include "transactions/snapshot.hpp"
#include "transactions/type.hpp" #include "transactions/type.hpp"

6
src/utils/random_graph_generator.hpp
View File

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

4
tests/benchmark/mvcc.cpp
View File

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

2
tests/manual/kvstore_console.cpp
View File

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

Some files were not shown because too many files have changed in this diff Show More