From a9419b559d724f2d94ea46c4a0e4efcd8f15f518 Mon Sep 17 00:00:00 2001 From: Marko Budiselic Date: Sun, 14 Aug 2016 13:45:47 +0100 Subject: [PATCH] Small fixes not done yet, first the whole DB interface has to be finished --- CMakeLists.txt | 6 ++++++ {src => include}/data_structures/map/hashmap.hpp | 0 {src => include}/data_structures/map/rh_common.hpp | 0 {src => include}/data_structures/map/rh_hashmap.hpp | 7 ++++--- {src => include}/data_structures/map/rh_hashmultimap.hpp | 9 ++++++--- {src => include}/utils/option_ptr.hpp | 0 6 files changed, 16 insertions(+), 6 deletions(-) rename {src => include}/data_structures/map/hashmap.hpp (100%) rename {src => include}/data_structures/map/rh_common.hpp (100%) rename {src => include}/data_structures/map/rh_hashmap.hpp (99%) rename {src => include}/data_structures/map/rh_hashmultimap.hpp (99%) rename {src => include}/utils/option_ptr.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9efec42c3..8bddd6850 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,10 +145,12 @@ endforeach() # COPY header files required by query engine (query compiler) # TODO: somehow automate (in destination dir should be only required include files) FILE(COPY ${include_dir}/database/db.hpp DESTINATION ${build_include_dir}/database) +FILE(COPY ${include_dir}/database/db_transaction.hpp DESTINATION ${build_include_dir}/database) FILE(COPY ${include_dir}/storage/common.hpp DESTINATION ${build_include_dir}/storage) FILE(COPY ${include_dir}/storage/graph.hpp DESTINATION ${build_include_dir}/storage) FILE(COPY ${include_dir}/storage/edge.hpp DESTINATION ${build_include_dir}/storage) +FILE(COPY ${include_dir}/storage/edge_record.hpp DESTINATION ${build_include_dir}/storage) FILE(COPY ${include_dir}/storage/edge_accessor.hpp DESTINATION ${build_include_dir}/storage) FILE(COPY ${include_dir}/storage/edges.hpp DESTINATION ${build_include_dir}/storage) FILE(COPY ${include_dir}/storage/vertices.hpp DESTINATION ${build_include_dir}/storage) @@ -160,6 +162,7 @@ FILE(COPY ${include_dir}/storage/locking/lock_status.hpp DESTINATION ${build_inc FILE(COPY ${include_dir}/storage/edge_type/edge_type_store.hpp DESTINATION ${build_include_dir}/storage/edge_type) FILE(COPY ${include_dir}/storage/edge_type/edge_type.hpp DESTINATION ${build_include_dir}/storage/edge_type) FILE(COPY ${include_dir}/storage/label/label_store.hpp DESTINATION ${build_include_dir}/storage/label) +FILE(COPY ${include_dir}/storage/model/edge_map.hpp DESTINATION ${build_include_dir}/storage/model) FILE(COPY ${include_dir}/query_engine/util.hpp DESTINATION ${build_include_dir}/query_engine) FILE(COPY ${include_dir}/query_engine/i_code_cpu.hpp DESTINATION ${build_include_dir}/query_engine) @@ -171,6 +174,8 @@ FILE(COPY ${include_dir}/data_structures/concurrent/concurrent_set.hpp DESTINATI FILE(COPY ${include_dir}/data_structures/concurrent/common.hpp DESTINATION ${build_include_dir}/data_structures/concurrent) FILE(COPY ${include_dir}/data_structures/concurrent/skiplist.hpp DESTINATION ${build_include_dir}/data_structures/concurrent) FILE(COPY ${include_dir}/data_structures/concurrent/skiplist_gc.hpp DESTINATION ${build_include_dir}/data_structures/concurrent) +FILE(COPY ${include_dir}/data_structures/map/rh_hashmultimap.hpp DESTINATION ${build_include_dir}/data_structures/map) +FILE(COPY ${include_dir}/data_structures/map/rh_common.hpp DESTINATION ${build_include_dir}/data_structures/map) FILE(COPY ${include_dir}/data_structures/bitset/dynamic_bitset.hpp DESTINATION ${build_include_dir}/data_structures/bitset) @@ -250,6 +255,7 @@ FILE(COPY ${include_dir}/utils/exceptions/basic_exception.hpp DESTINATION ${buil FILE(COPY ${include_dir}/utils/datetime/timestamp.hpp DESTINATION ${build_include_dir}/utils/datetime) FILE(COPY ${include_dir}/utils/datetime/datetime_error.hpp DESTINATION ${build_include_dir}/utils/datetime) FILE(COPY ${include_dir}/utils/types/byte.hpp DESTINATION ${build_include_dir}/utils/types) +FILE(COPY ${include_dir}/utils/option_ptr.hpp DESTINATION ${build_include_dir}/utils) FILE(COPY ${include_dir}/communication/communication.hpp DESTINATION ${build_include_dir}/communication) FILE(COPY ${include_dir}/communication/bolt/v1/config.hpp DESTINATION ${build_include_dir}/communication/bolt/v1) diff --git a/src/data_structures/map/hashmap.hpp b/include/data_structures/map/hashmap.hpp similarity index 100% rename from src/data_structures/map/hashmap.hpp rename to include/data_structures/map/hashmap.hpp diff --git a/src/data_structures/map/rh_common.hpp b/include/data_structures/map/rh_common.hpp similarity index 100% rename from src/data_structures/map/rh_common.hpp rename to include/data_structures/map/rh_common.hpp diff --git a/src/data_structures/map/rh_hashmap.hpp b/include/data_structures/map/rh_hashmap.hpp similarity index 99% rename from src/data_structures/map/rh_hashmap.hpp rename to include/data_structures/map/rh_hashmap.hpp index c0feaae2e..4bc8df942 100644 --- a/src/data_structures/map/rh_hashmap.hpp +++ b/include/data_structures/map/rh_hashmap.hpp @@ -1,8 +1,9 @@ -#include "rh_common.hpp" -#include "utils/crtp.hpp" -#include "utils/option_ptr.hpp" #include +#include "utils/crtp.hpp" +#include "data_structures/map/rh_common.hpp" +#include "utils/option_ptr.hpp" + // HashMap with RobinHood collision resolution policy. // Single threaded. // Entrys are saved as pointers alligned to 8B. diff --git a/src/data_structures/map/rh_hashmultimap.hpp b/include/data_structures/map/rh_hashmultimap.hpp similarity index 99% rename from src/data_structures/map/rh_hashmultimap.hpp rename to include/data_structures/map/rh_hashmultimap.hpp index e32a2f076..1c83244c1 100644 --- a/src/data_structures/map/rh_hashmultimap.hpp +++ b/include/data_structures/map/rh_hashmultimap.hpp @@ -1,9 +1,12 @@ -#include "rh_common.hpp" +#pragma mark + +#include +#include + #include "utils/crtp.hpp" #include "utils/likely.hpp" #include "utils/option_ptr.hpp" -#include -#include +#include "data_structures/map/rh_common.hpp" // HashMultiMap with RobinHood collision resolution policy. // Single threaded. diff --git a/src/utils/option_ptr.hpp b/include/utils/option_ptr.hpp similarity index 100% rename from src/utils/option_ptr.hpp rename to include/utils/option_ptr.hpp