config is better now (yaml-cpp) + web::Client + web::Logger

.gitignore

@@ -15,6 +15,7 @@ tags
 .gdb_history
 Testing/
 ve/
+ve3/
 release/memgraph_*
 release/libs/
 release/barrier/

CMakeLists.txt

@@ -86,6 +86,9 @@ set(lexertl_dir ${libs_dir}/lexertl)
 # fmt
 set(fmt_source_dir ${libs_dir}/fmt)
 set(fmt_static_lib ${fmt_source_dir}/fmt/libfmt.a)
+# yaml-cpp
+set(yaml_source_dir ${libs_dir}/yaml-cpp)
+set(yaml_static_lib ${yaml_source_dir}/libyaml-cpp.a)
 # r3
 set(r3_source_dir ${libs_dir}/r3)
 set(r3_static_lib ${r3_source_dir}/.libs/libr3.a)
@@ -395,6 +398,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${src_dir})
 include_directories(${build_include_dir})
 include_directories(${fmt_source_dir})
+include_directories(${yaml_source_dir}/include)
 include_directories(${http_parser_source_dir})
 include_directories(${lexertl_dir})
 include_directories(${libuv_source_dir}/include)
@@ -413,6 +417,7 @@ EXECUTE_PROCESS(
 
 # TODO: create separate static library from bolt code
 set(memgraph_src_files
+    ${src_dir}/config/config.cpp
     ${src_dir}/dbms/dbms.cpp
     ${src_dir}/dbms/cleaner.cpp
     ${src_dir}/utils/string/transform.cpp
@@ -515,7 +520,7 @@ string(STRIP ${COMMIT_BRANCH} COMMIT_BRANCH)
 string(STRIP ${COMMIT_NO} COMMIT_NO)
 string(STRIP ${COMMIT_HASH} COMMIT_HASH)
 set(MEMGRAPH_BUILD_NAME
-    "memgraph_${COMMIT_BRANCH}_${COMMIT_HASH}_${COMMIT_NO}_${CMAKE_BUILD_TYPE}")
+    "memgraph_${COMMIT_NO}_${COMMIT_HASH}_${COMMIT_BRANCH}_${CMAKE_BUILD_TYPE}")
 
 # memgraph main executable
 if (MEMGRAPH)
@@ -533,6 +538,7 @@ if (MEMGRAPH)
         target_link_libraries(${MEMGRAPH_BUILD_NAME} crypto)
         # target_link_libraries(${MEMGRAPH_BUILD_NAME} ssl)
         target_link_libraries(${MEMGRAPH_BUILD_NAME} ${fmt_static_lib})
+        target_link_libraries(${MEMGRAPH_BUILD_NAME} ${yaml_static_lib})
         target_link_libraries(${MEMGRAPH_BUILD_NAME} dl)
     endif (UNIX)
 endif()

config/memgraph.yaml

@@ -0,0 +1,4 @@
+compile_cpu_path: "./compiled/cpu/"
+template_cpu_cpp_path: "./template/template_code_cpu.cpp"
+barrier_template_cpu_cpp_path: "./template/barrier_template_code_cpu.cpp"
+template_cpu_hpp_path: "./template/template_code_cpu.hpp"

include/config/config.hpp

@@ -5,8 +5,27 @@
 namespace config
 {
 
+// this class is used as a Definition class of config::Config class from utils
+// number of elements shoud be small,
+// it depends on implementation of config::Config class
+// in other words number of fields in Definition class should be related
+// to the number of config keys
+class MemgraphConfig
+{
+public:
+    static const char *env_config_key;
+    static const char *default_file_path;
+};
+
+// -- all possible Memgraph's keys --
 constexpr const char *COMPILE_CPU_PATH = "compile_cpu_path";
 constexpr const char *TEMPLATE_CPU_CPP_PATH = "template_cpu_cpp_path";
 constexpr const char *BARRIER_TEMPLATE_CPU_CPP_PATH =
     "barrier_template_cpu_cpp_path";
+// -- all possible Memgraph's keys --
+
 }
+
+// code uses this define for key access
+// _KEY_ is value from all possible keys that are listed above
+#define CONFIG(_KEY_) config::Config<config::MemgraphConfig>::instance()[_KEY_]

include/dbms/dbms.hpp

@@ -13,7 +13,7 @@ public:
     Db &active();
 
     // set active database
-    // if active database doesn't exist create one
+    // if active database doesn't exist creates one
     Db &active(const std::string &name);
 
     // TODO: DELETE action

include/query_engine/program_loader.hpp

@@ -48,7 +48,7 @@ public:
 
         // code has to be generated, compiled and loaded
         //  TODO load output path from config
-        auto base_path = config::Config::instance()[config::COMPILE_CPU_PATH];
+        auto base_path = CONFIG(config::COMPILE_CPU_PATH);
         auto path_cpp = base_path + hash_string + ".cpp";
         auto stripped_space = stripper.strip_space(query);
         code_generator.generate_cpp(stripped_space.query, stripped.hash,

include/utils/config/config.hpp

@@ -1,69 +1,59 @@
 #pragma once
 
-// #define YAML_CPP_DLL
-// there are some problems with the yaml-cpp linking, something is missing
-// cmake and make have passed fine
-// and it seems that everything is included and linked
-// the yaml-cpp lib is strange
-// TODO debug yaml-cpp installation or write own yaml parser like a boss
-// #include "yaml-cpp/yaml.h"
-
 #include <cstring>
 #include <string>
 #include <stdexcept>
 #include <cstdlib>
 
+// TODO: isolate from caller (caller should know that his dependency is
+// yaml-cpp
+#include "yaml-cpp/yaml.h"
+
 namespace config
 {
 
+template <class Definition>
 class Config
 {
 private:
-    // YAML::Node _config;
+    YAML::Node _config;
+
     Config()
     {
-        //  TODO: config places:       priority
+        // config places:             priority
-        //      1. default system         |
+        //     1. default system         |     (/etc/name/config)
-        //      2. default user           |
+        //     2. default user           |     (/home/user/.name/config)
-        //      3. ENV var                |
+        //     3. ENV var                |     (PATH)
-        //      4. program argument      \ /
+        //     4. program argument      \ /    (PATH)
-        // _config = YAML::LoadFile("config.yaml");
+       
-        
+        if (const char* env_path = std::getenv(Definition::env_config_key))
-        // env -> std::getenv("NAME")
+        {
-        // somehow inject (int argc, char* argv[])
+            _config = YAML::LoadFile(env_path);
+            // TODO: error handling
+        } 
+        else
+        {
+            _config = YAML::LoadFile(Definition::default_file_path);
+            // TODO: error handling
+        }
+
+        // TODO:
+        //     * default system
+        //     * default user
+        //     * program argument
     }
 
 public:
-    static Config& instance()
+    static Config<Definition>& instance()
     {
-        static Config config;
+        static Config<Definition> config;
         return config;
     }
 
     std::string operator[](const char* key)
     {
-        //  TODO write proper implementation, remove memgraph dependant
+        return _config[key].template as<std::string>();
-        //  stuff from here
- 
-        if (0 == std::strcmp(key, "compile_cpu_path"))
-            return "./compiled/cpu/";
-
-        if (std::strcmp(key, "template_cpu_cpp_path") == 0)
-            return "./template/template_code_cpu.cpp";
-
-        if (std::strcmp(key, "barrier_template_cpu_cpp_path") == 0)
-            return "./template/barrier_template_code_cpu.cpp";
-
-        if (std::strcmp(key, "template_cpu_hpp_path") == 0)
-            return "./template/template_code_cpu.hpp";
-
-        throw std::runtime_error("implement me");
-
-        //  TODO optimize access
-        // return _config[key].as<std::string>();
     }
 };
 
 }
-
-#define CONFIG(_KEY_) config::Config::instance()[_KEY_]

include/web/client.hpp

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <string>
+
+namespace web
+{
+
+class Client
+{
+    void post(const std::string& url, const std::string& body);
+};
+
+}

include/web/logger.hpp

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <string>
+
+namespace web
+{
+
+class Logger
+{
+public:
+
+    Logger() { /* create connection */ }
+
+    // TODO: singleton
+    
+    void up_ping();
+    void send(const std::string&);
+    void down_ping();
+};
+
+}

libs/setup.sh

@@ -16,6 +16,15 @@ cmake .
 make
 cd ..
 
+# yaml-cpp
+git clone https://github.com/jbeder/yaml-cpp
+yaml_cpp_tag="519d33fea3fbcbe7e1f89f97ee0fa539cec33eb7"
+cd yaml-cpp
+git checkout ${yaml_cpp_tag}
+cmake .
+make
+cd ..
+
 # http_parser
 git clone https://github.com/nodejs/http-parser
 http_parser_tag="4e382f96e6d3321538a78f2c7f9506d4e79b08d6"

src/config/config.cpp

@@ -0,0 +1,9 @@
+#include "config/config.hpp"
+
+namespace config
+{
+
+const char *MemgraphConfig::env_config_key = "MEMGRAPH_CONFIG";
+const char *MemgraphConfig::default_file_path = "config.yaml";
+
+}

src/examples/bolt_py_client/create_benchmark.py

@@ -0,0 +1,35 @@
+import time
+from neo4j.v1 import GraphDatabase, basic_auth, types
+from concurrent.futures import ProcessPoolExecutor
+
+# create session
+driver = GraphDatabase.driver("bolt://localhost",
+                              auth=basic_auth("neo4j", "neo4j"),
+                              encrypted=0)
+session = driver.session()
+
+queries_no = 10
+
+queries = ["CREATE (n {prop: 10}) RETURN n"] * queries_no
+
+def create_query(index):
+    '''
+    Task (process or thread)
+    Runs create query agains the database.
+
+    :param index: int -> number of task
+    :returns: (int, float) -> (task index, elapsed time)
+    '''
+    start = time.time()
+    for query in queries:
+        for record in session.run(query):
+            pass
+    end = time.time()
+    return time
+
+
+with ProcessPoolExecutor(processes=4) as executor:
+    results = []
+    print(results)
+
+# print(1.0 * queries_no / (end - start))

src/web/client.cpp

@@ -0,0 +1,10 @@
+#include "web/client.hpp"
+
+namespace web
+{
+
+void Client::post(const std::string&, const std::string&)
+{
+}
+
+}

src/web/logger.cpp

@@ -0,0 +1,18 @@
+#include "web/logger.hpp"
+
+namespace web
+{
+
+void Logger::up_ping()
+{
+}
+
+void Logger::send(const std::string&)
+{
+}
+
+void Logger::down_ping()
+{
+}
+
+}