From 8362b64e9fccdca074ecd829bb23eee6856d3e9e Mon Sep 17 00:00:00 2001 From: Marko Budiselic Date: Fri, 4 Nov 2016 12:05:35 +0100 Subject: [PATCH] DRESSIPI FIRST PILOT RELEASE (release script update) --- CMakeLists.txt | 42 +++++++++++++++++-- include/barrier/barrier.hpp | 4 ++ include/utils/iterator/composable.hpp | 2 +- release/alpha.dockerfile | 15 +++++++ release/alpha.sh | 2 + release/{Dockerfile => barrier.dockerfile} | 3 +- release/barrier.sh | 19 ++++----- src/barrier/barrier.cpp | 12 ++++++ src/memgraph_bolt.cpp | 2 +- .../template/barrier_template_code_cpu.cpp | 1 + 10 files changed, 85 insertions(+), 17 deletions(-) create mode 100644 release/alpha.dockerfile rename release/{Dockerfile => barrier.dockerfile} (79%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42cbf61ec..63ef6a027 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,6 +150,7 @@ FILE(COPY ${include_dir}/storage/common.hpp DESTINATION ${build_include_dir}/sto 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/vertex_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) @@ -163,6 +164,10 @@ FILE(COPY ${include_dir}/storage/edge_type/edge_type.hpp DESTINATION ${build_inc 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}/storage/model/properties/flags.hpp DESTINATION ${build_include_dir}/storage/model/properties) +FILE(COPY ${include_dir}/storage/model/properties/stored_property.hpp DESTINATION ${build_include_dir}/storage/model/properties) +FILE(COPY ${include_dir}/storage/model/properties/property_holder.hpp DESTINATION ${build_include_dir}/storage/model/properties) +FILE(COPY ${include_dir}/storage/type_group_edge.hpp DESTINATION ${build_include_dir}/storage) +FILE(COPY ${include_dir}/storage/type_group_vertex.hpp DESTINATION ${build_include_dir}/storage) FILE(COPY ${include_dir}/query/util.hpp DESTINATION ${build_include_dir}/query) FILE(COPY ${include_dir}/query/i_plan_cpu.hpp DESTINATION ${build_include_dir}/query) @@ -185,8 +190,7 @@ FILE(COPY ${include_dir}/threading/sync/futex.hpp DESTINATION ${build_include_di FILE(COPY ${include_dir}/threading/sync/lock_timeout_error.hpp DESTINATION ${build_include_dir}/threading/sync) FILE(COPY ${include_dir}/memory/freelist.hpp DESTINATION ${build_include_dir}/memory) -FILE(COPY ${include_dir}/memory/lazy_gc.hpp DESTINATION ${build_include_dir}/memory) - +FILE(COPY ${include_dir}/memory/lazy_gc.hpp DESTINATION ${build_include_dir}/garbage) FILE(COPY ${include_dir}/mvcc/cre_exp.hpp DESTINATION ${build_include_dir}/mvcc) FILE(COPY ${include_dir}/mvcc/hints.hpp DESTINATION ${build_include_dir}/mvcc) FILE(COPY ${include_dir}/mvcc/id.hpp DESTINATION ${build_include_dir}/mvcc) @@ -202,6 +206,7 @@ FILE(COPY ${include_dir}/transactions/snapshot.hpp DESTINATION ${build_include_d FILE(COPY ${include_dir}/transactions/commit_log.hpp DESTINATION ${build_include_dir}/transactions) FILE(COPY ${include_dir}/transactions/engine.hpp DESTINATION ${build_include_dir}/transactions) FILE(COPY ${include_dir}/transactions/transaction_store.hpp DESTINATION ${build_include_dir}/transactions) +FILE(COPY ${include_dir}/transactions/transaction_read.hpp DESTINATION ${build_include_dir}/transactions) FILE(COPY ${include_dir}/storage/model/properties/properties.hpp DESTINATION ${build_include_dir}/storage/model/properties) FILE(COPY ${include_dir}/storage/model/properties/property.hpp DESTINATION ${build_include_dir}/storage/model/properties) @@ -209,6 +214,7 @@ FILE(COPY ${include_dir}/storage/model/properties/traversers/consolewriter.hpp D FILE(COPY ${include_dir}/storage/model/properties/traversers/jsonwriter.hpp DESTINATION ${build_include_dir}/storage/model/properties/traversers) FILE(COPY ${include_dir}/storage/model/properties/all.hpp DESTINATION ${build_include_dir}/storage/model/properties) FILE(COPY ${include_dir}/storage/model/properties/bool.hpp DESTINATION ${build_include_dir}/storage/model/properties) +FILE(COPY ${include_dir}/storage/model/properties/null.hpp DESTINATION ${build_include_dir}/storage/model/properties) FILE(COPY ${include_dir}/storage/model/properties/float.hpp DESTINATION ${build_include_dir}/storage/model/properties) FILE(COPY ${include_dir}/storage/model/properties/double.hpp DESTINATION ${build_include_dir}/storage/model/properties) FILE(COPY ${include_dir}/storage/model/properties/int32.hpp DESTINATION ${build_include_dir}/storage/model/properties) @@ -236,8 +242,17 @@ FILE(COPY ${include_dir}/storage/label/label_store.hpp DESTINATION ${build_inclu FILE(COPY ${include_dir}/storage/indexes/index_record.hpp DESTINATION ${build_include_dir}/storage/indexes) FILE(COPY ${include_dir}/storage/indexes/index_base.hpp DESTINATION ${build_include_dir}/storage/indexes) FILE(COPY ${include_dir}/storage/indexes/impl/nonunique_unordered_index.hpp DESTINATION ${build_include_dir}/storage/indexes/impl) +FILE(COPY ${include_dir}/storage/indexes/index_holder.hpp DESTINATION ${build_include_dir}/storage/indexes) +FILE(COPY ${include_dir}/storage/indexes/index_definition.hpp DESTINATION ${build_include_dir}/storage/indexes) +FILE(COPY ${include_dir}/storage/indexes/index_update.hpp DESTINATION ${build_include_dir}/storage/indexes) + +FILE(COPY ${include_dir}/storage/garbage/delete_sensitive.hpp DESTINATION ${build_include_dir}/storage/garbage) +FILE(COPY ${include_dir}/storage/garbage/garbage.hpp DESTINATION ${build_include_dir}/storage/garbage) FILE(COPY ${include_dir}/utils/sys.hpp DESTINATION ${build_include_dir}/utils) +FILE(COPY ${include_dir}/utils/char_str.hpp DESTINATION ${build_include_dir}/utils) +FILE(COPY ${include_dir}/utils/void.hpp DESTINATION ${build_include_dir}/utils) +FILE(COPY ${include_dir}/utils/array_store.hpp DESTINATION ${build_include_dir}/utils) FILE(COPY ${include_dir}/utils/bswap.hpp DESTINATION ${build_include_dir}/utils) FILE(COPY ${include_dir}/utils/stacktrace.hpp DESTINATION ${build_include_dir}/utils) FILE(COPY ${include_dir}/utils/auto_scope.hpp DESTINATION ${build_include_dir}/utils) @@ -257,10 +272,29 @@ 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/iterator/iterator_base.hpp DESTINATION ${build_include_dir}/utils/iterator) FILE(COPY ${include_dir}/utils/option_ptr.hpp DESTINATION ${build_include_dir}/utils) FILE(COPY ${include_dir}/utils/option.hpp DESTINATION ${build_include_dir}/utils) FILE(COPY ${include_dir}/utils/border.hpp DESTINATION ${build_include_dir}/utils) +FILE(COPY ${include_dir}/utils/order.hpp DESTINATION ${build_include_dir}/utils) +FILE(COPY ${include_dir}/utils/numerics/saturate.hpp DESTINATION ${build_include_dir}/utils/numerics) + +FILE(COPY ${include_dir}/utils/iterator/iterator_base.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/virtual_iter.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/iterator.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/composable.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/count.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/accessor.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/combined.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/count.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/filter.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/flat_map.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/for_all.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/inspect.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/iterator_accessor.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/lambda_iterator.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/limited_map.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/map.hpp DESTINATION ${build_include_dir}/utils/iterator) +FILE(COPY ${include_dir}/utils/iterator/range_iterator.hpp DESTINATION ${build_include_dir}/utils/iterator) 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) @@ -283,6 +317,8 @@ FILE(COPY ${include_dir}/logging/default.hpp DESTINATION ${build_include_dir}/lo FILE(COPY ${include_dir}/logging/log.hpp DESTINATION ${build_include_dir}/logging) FILE(COPY ${include_dir}/logging/logger.hpp DESTINATION ${build_include_dir}/logging) FILE(COPY ${include_dir}/logging/levels.hpp DESTINATION ${build_include_dir}/logging) + +FILE(COPY ${include_dir}/snapshot/snapshot_engine.hpp DESTINATION ${build_include_dir}/snapshot) # ----------------------------------------------------------------------------- # add all cpp file recursive into sourceFiles varibale diff --git a/include/barrier/barrier.hpp b/include/barrier/barrier.hpp index 800909505..8d19a69e5 100644 --- a/include/barrier/barrier.hpp +++ b/include/barrier/barrier.hpp @@ -151,6 +151,9 @@ public: void remove() const; + // template + // bool contains(property_key &key) const; + const VertexStoredProperty &at(VertexPropertyFamily &key) const; const VertexStoredProperty &at(VertexPropertyKey &key) const; @@ -494,6 +497,7 @@ public: void write(const ArrayDouble &); void write(const ArrayString &); + void write_empty_fields(); void write_success(); void write_success_empty(); void write_ignored(); diff --git a/include/utils/iterator/composable.hpp b/include/utils/iterator/composable.hpp index 25ffb6de9..be3394ec0 100644 --- a/include/utils/iterator/composable.hpp +++ b/include/utils/iterator/composable.hpp @@ -190,7 +190,7 @@ public: auto property_key = t.vertex_property_key( name_value.first, name_value.second.key.flags()); - if (!element.contains(property_key)) + if (!element.properties().contains(property_key)) return false; auto vertex_property_value = element.at(property_key); if (!(vertex_property_value == name_value.second)) diff --git a/release/alpha.dockerfile b/release/alpha.dockerfile new file mode 100644 index 000000000..3654a0c4c --- /dev/null +++ b/release/alpha.dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu:16.04 + +RUN apt-get update \ + && apt-get install -y clang libssl-dev \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +ENV BINARY_NAME memgraph_414_dba2610_dev_debug +ENV MEMGRAPH_CONFIG /memgraph/config/memgraph.yaml + +COPY $BINARY_NAME /memgraph +COPY libs/fmt /libs/fmt + +WORKDIR /memgraph + +CMD ./memgraph diff --git a/release/alpha.sh b/release/alpha.sh index f0e3085bd..1459f91df 100755 --- a/release/alpha.sh +++ b/release/alpha.sh @@ -35,6 +35,8 @@ cp ${exe_name} ../release/${exe_name}/memgraph cp libmemgraph_pic.a ../release/${exe_name}/libmemgraph_pic.a cp -r include ../release/${exe_name}/include cp -r template ../release/${exe_name}/template +cp -r ../config ../release/${exe_name}/config + mkdir -p ../release/${exe_name}/compiled/cpu echo "Memgraph Release Building DONE" diff --git a/release/Dockerfile b/release/barrier.dockerfile similarity index 79% rename from release/Dockerfile rename to release/barrier.dockerfile index d2ffb51e0..17bac8105 100644 --- a/release/Dockerfile +++ b/release/barrier.dockerfile @@ -5,9 +5,8 @@ RUN apt-get update \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN mkdir -p /libs -RUN mkdir -p /memgraph -ENV BINARY_NAME memgraph_394_4616f32_demo_release +ENV BINARY_NAME memgraph_414_dba2610_dev_debug COPY barrier_$BINARY_NAME /memgraph COPY libs/fmt /libs/fmt diff --git a/release/barrier.sh b/release/barrier.sh index bb9668086..aa939d8af 100755 --- a/release/barrier.sh +++ b/release/barrier.sh @@ -8,15 +8,14 @@ release_folder="barrier_$binary_name" release_path="release/$release_folder" compile_template_path="template/barrier_template_code_cpu.cpp" -# MKDIR -mkdir -p $release_path/compiled/cpu/hardcode +mkdir -p $release_path/compiled/cpu mkdir -p $release_path/include/barrier -mkdir -p $release_path/include/cypher +mkdir -p $release_path/include/query/strip +mkdir -p $release_path/include/query/exception mkdir -p $release_path/include/io/network mkdir -p $release_path/include/logging mkdir -p $release_path/include/mvcc -mkdir -p $release_path/include/query_engine/exceptions mkdir -p $release_path/include/storage/indexes mkdir -p $release_path/include/storage/model/properties/traversers mkdir -p $release_path/include/storage/model/properties/utils @@ -31,15 +30,15 @@ mkdir -p $release_path/template # COPY # dressipi query # TODO: for loop -hardcoded_queries="135757557963690525.cpp" -for query in $hardcoded_queries -do - cp build/compiled/cpu/hardcode/$query $release_path/compiled/cpu/hardcode/$query -done +# hardcoded_queries="135757557963690525.cpp" +# for query in $hardcoded_queries +# do +# cp build/compiled/cpu/hardcode/$query $release_path/compiled/cpu/hardcode/$query +# done cp src/query_engine/$compile_template_path $release_path/$compile_template_path -paths="barrier/barrier.hpp barrier/common.hpp storage/model/properties/floating.hpp storage/model/properties/all.hpp storage/model/properties/bool.hpp storage/model/properties/traversers/consolewriter.hpp storage/model/properties/traversers/jsonwriter.hpp storage/model/properties/array.hpp storage/model/properties/property_family.hpp storage/model/properties/property.hpp storage/model/properties/properties.hpp storage/model/properties/integral.hpp storage/model/properties/double.hpp storage/model/properties/string.hpp storage/model/properties/utils/math_operations.hpp storage/model/properties/utils/unary_negation.hpp storage/model/properties/utils/modulo.hpp storage/model/properties/property_holder.hpp storage/model/properties/float.hpp storage/model/properties/null.hpp storage/model/properties/flags.hpp storage/model/properties/int32.hpp storage/model/properties/number.hpp storage/model/properties/int64.hpp logging/default.hpp logging/log.hpp logging/logger.hpp logging/levels.hpp io/network/addrinfo.hpp io/network/network_error.hpp io/network/socket.hpp mvcc/id.hpp utils/exceptions/basic_exception.hpp utils/border.hpp utils/total_ordering.hpp utils/auto_scope.hpp utils/crtp.hpp utils/order.hpp utils/likely.hpp utils/option.hpp utils/option_ptr.hpp utils/memory/block_allocator.hpp utils/memory/stack_allocator.hpp utils/iterator/query.hpp utils/iterator/composable.hpp utils/iterator/for_all.hpp utils/iterator/range_iterator.hpp utils/iterator/limited_map.hpp utils/iterator/iterator_accessor.hpp utils/iterator/count.hpp utils/iterator/iterator_base.hpp utils/iterator/filter.hpp utils/iterator/inspect.hpp utils/iterator/accessor.hpp utils/iterator/map.hpp utils/iterator/virtual_iter.hpp utils/iterator/flat_map.hpp utils/iterator/combined.hpp utils/iterator/lambda_iterator.hpp utils/iterator/iterator.hpp utils/array_store.hpp utils/void.hpp storage/indexes/index_definition.hpp utils/stacktrace.hpp utils/datetime/datetime_error.hpp utils/datetime/timestamp.hpp utils/reference_wrapper.hpp utils/underlying_cast.hpp utils/numerics/saturate.hpp query_engine/i_code_cpu.hpp query_engine/query_stripped.hpp query_engine/exceptions/exceptions.hpp" +paths="barrier/barrier.hpp barrier/common.hpp storage/model/properties/floating.hpp storage/model/properties/all.hpp storage/model/properties/bool.hpp storage/model/properties/traversers/consolewriter.hpp storage/model/properties/traversers/jsonwriter.hpp storage/model/properties/array.hpp storage/model/properties/property_family.hpp storage/model/properties/property.hpp storage/model/properties/properties.hpp storage/model/properties/integral.hpp storage/model/properties/double.hpp storage/model/properties/string.hpp storage/model/properties/utils/math_operations.hpp storage/model/properties/utils/unary_negation.hpp storage/model/properties/utils/modulo.hpp storage/model/properties/property_holder.hpp storage/model/properties/float.hpp storage/model/properties/null.hpp storage/model/properties/flags.hpp storage/model/properties/int32.hpp storage/model/properties/number.hpp storage/model/properties/int64.hpp logging/default.hpp logging/log.hpp logging/logger.hpp logging/levels.hpp io/network/addrinfo.hpp io/network/network_error.hpp io/network/socket.hpp mvcc/id.hpp utils/exceptions/basic_exception.hpp utils/border.hpp utils/total_ordering.hpp utils/auto_scope.hpp utils/crtp.hpp utils/order.hpp utils/likely.hpp utils/option.hpp utils/option_ptr.hpp utils/memory/block_allocator.hpp utils/memory/stack_allocator.hpp utils/iterator/query.hpp utils/iterator/composable.hpp utils/iterator/for_all.hpp utils/iterator/range_iterator.hpp utils/iterator/limited_map.hpp utils/iterator/iterator_accessor.hpp utils/iterator/count.hpp utils/iterator/iterator_base.hpp utils/iterator/filter.hpp utils/iterator/inspect.hpp utils/iterator/accessor.hpp utils/iterator/map.hpp utils/iterator/virtual_iter.hpp utils/iterator/flat_map.hpp utils/iterator/combined.hpp utils/iterator/lambda_iterator.hpp utils/iterator/iterator.hpp utils/array_store.hpp utils/void.hpp storage/indexes/index_definition.hpp utils/stacktrace.hpp utils/datetime/datetime_error.hpp utils/datetime/timestamp.hpp utils/reference_wrapper.hpp utils/underlying_cast.hpp utils/numerics/saturate.hpp query/i_plan_cpu.hpp query/property_util.hpp query/strip/stripped.hpp query/exception/cpp_code_generator.hpp query/exception/decoder_exception.hpp query/exception/out_of_memory.hpp query/exception/plan_compilation.hpp query/exception/plan_execution.hpp query/exception/query_engine.hpp" for path in $paths do diff --git a/src/barrier/barrier.cpp b/src/barrier/barrier.cpp index 3daa60d60..052d04447 100644 --- a/src/barrier/barrier.cpp +++ b/src/barrier/barrier.cpp @@ -272,6 +272,12 @@ const VertexStoredProperty &VertexAccessor::at(VertexPropertyKey &key) const return CALL(at(trans(key))); } +// template +// bool VertexAccessor::contains(property_key &key) const +// { +// return HALF_CALL(contains(key)); +// } + template OptionPtr VertexAccessor::at(VertexPropertyType &key) const { @@ -605,6 +611,12 @@ void RecordStream::write(const ArrayString &arr) HALF_CALL(write(arr)); } +template +void RecordStream::write_empty_fields() +{ + HALF_CALL(write_empty_fields()); +} + template void RecordStream::write_success() { diff --git a/src/memgraph_bolt.cpp b/src/memgraph_bolt.cpp index 07119974f..b5d67ea3b 100644 --- a/src/memgraph_bolt.cpp +++ b/src/memgraph_bolt.cpp @@ -73,7 +73,7 @@ int main(void) // TODO: N should be configurable auto N = std::thread::hardware_concurrency(); - logger.info("Starting {} workers", 1); + logger.info("Starting {} workers", N); server.start(N); logger.info("Shutting down..."); diff --git a/src/query_engine/template/barrier_template_code_cpu.cpp b/src/query_engine/template/barrier_template_code_cpu.cpp index d33aaa113..4a6ffe8f5 100644 --- a/src/query_engine/template/barrier_template_code_cpu.cpp +++ b/src/query_engine/template/barrier_template_code_cpu.cpp @@ -1,6 +1,7 @@ #include #include +#include "query/property_util.hpp" #include "query/i_plan_cpu.hpp" #include "storage/model/properties/all.hpp"