Update MG version (#154)

* Bump MG version to 2.3.1
memgraph · Jul 14, 2022 · 157601a · 157601a
1 parent 5152624
commit 157601a
Show file tree

Hide file tree

Showing 29 changed files with 100 additions and 54 deletions.
diff --git a/README.md b/README.md
diff --git a/cpp/betweenness_centrality_module/algorithm_online/betweenness_centrality_online.cpp b/cpp/betweenness_centrality_module/algorithm_online/betweenness_centrality_online.cpp
@@ -87,12 +87,15 @@ std::tuple<std::unordered_set<std::uint64_t>, std::unordered_set<std::uint64_t>>
   std::unordered_set<std::uint64_t> affected_bcc_nodes;
   std::unordered_set<std::uint64_t> affected_bcc_articulation_points;
 
+  const std::pair<std::uint64_t, std::uint64_t> updated_edge_inner(
+      {graph.GetInnerNodeId(updated_edge.first), graph.GetInnerNodeId(updated_edge.second)});
+
   for (std::size_t i = 0; i < edges_by_bcc.size(); i++) {
-    if (std::any_of(edges_by_bcc[i].begin(), edges_by_bcc[i].end(), [updated_edge](auto &edge) {
-          return edge.from == updated_edge.first && edge.to == updated_edge.second;  // if edge in BCC
+    if (std::any_of(edges_by_bcc[i].begin(), edges_by_bcc[i].end(), [updated_edge_inner](auto &edge) {
+          return edge.from == updated_edge_inner.first && edge.to == updated_edge_inner.second;  // if edge in BCC
         })) {
       for (const auto node : nodes_by_bcc[i]) {
-        affected_bcc_nodes.insert(node);
+        affected_bcc_nodes.insert(graph.GetMemgraphNodeId(node));
       }
       for (const auto node : articulation_points_by_bcc) {
         if (affected_bcc_nodes.count(node)) affected_bcc_articulation_points.insert(node);
@@ -542,4 +545,10 @@ std::unordered_map<std::uint64_t, double> OnlineBC::NodeUpdate(const Operation o
 
   return this->node_bc_scores;
 }
+
+void OnlineBC::Reset() {
+  this->node_bc_scores.clear();
+  this->initialized = false;
+}
+
 }  // namespace online_bc
diff --git a/cpp/betweenness_centrality_module/algorithm_online/betweenness_centrality_online.hpp b/cpp/betweenness_centrality_module/algorithm_online/betweenness_centrality_online.hpp
@@ -250,5 +250,8 @@ class OnlineBC {
   ///@return {node ID, BC score} pairs
   std::unordered_map<std::uint64_t, double> NodeUpdate(const Operation operation, const std::uint64_t updated_node,
                                                        const bool normalize = true);
+
+  ///@brief Resets the state of the algorithm (initialization and previously calculated node_bc_scores).
+  void Reset();
 };
 }  // namespace online_bc
diff --git a/cpp/betweenness_centrality_module/betweenness_centrality_online_module.cpp b/cpp/betweenness_centrality_module/betweenness_centrality_online_module.cpp
@@ -126,7 +126,7 @@ void Update(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mgp_m
         auto prior_graph =
             mg_generate::BuildGraph(graph_nodes_ids, prior_edges_ids, mg_graph::GraphType::kUndirectedGraph);
 
-        node_bc_scores = algorithm.Set(*graph, normalize, threads);
+        node_bc_scores = algorithm.Get(*prior_graph, normalize);
 
         for (const auto created_edge : created_edges) {
           prior_edges_ids.push_back(created_edge);
@@ -260,6 +260,8 @@ extern "C" int mgp_init_module(struct mgp_module *module, struct mgp_memory *mem
     }
   }
 
+  algorithm.Reset();
+
   return 0;
 }
 

diff --git a/e2e/betweenness_centrality_online_test/test_online_get/input.cyp b/e2e/betweenness_centrality_online_test/test_online_get/input.cyp
@@ -7,6 +7,7 @@ queries:
         MERGE (a: Node {id: 3}) MERGE (b: Node {id: 4}) CREATE (a)-[:RELATION]->(b);
         MERGE (a: Node {id: 3}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
         MERGE (a: Node {id: 4}) MERGE (b: Node {id: 5}) CREATE (a)-[:RELATION]->(b);
+        CALL betweenness_centrality_online.set() YIELD *;
 
 cleanup: |-
     CALL mg.load('betweenness_centrality_online') YIELD *;
diff --git a/.../test_online_create&attach_node/input.cyp → .../test_online_create&attach_node/input.cyp b/.../test_online_create&attach_node/input.cyp → .../test_online_create&attach_node/input.cyp
diff --git a/...t/test_online_create&attach_node/test.yml → ...p/test_online_create&attach_node/test.yml b/...t/test_online_create&attach_node/test.yml → ...p/test_online_create&attach_node/test.yml
diff --git a/...ine_create&attach_node_to_chain/input.cyp → ...ine_create&attach_node_to_chain/input.cyp b/...ine_create&attach_node_to_chain/input.cyp → ...ine_create&attach_node_to_chain/input.cyp
diff --git a/...line_create&attach_node_to_chain/test.yml → ...line_create&attach_node_to_chain/test.yml b/...line_create&attach_node_to_chain/test.yml → ...line_create&attach_node_to_chain/test.yml
diff --git a/...e_create_edge_biconnected_graph/input.cyp → ...e_create_edge_biconnected_graph/input.cyp b/...e_create_edge_biconnected_graph/input.cyp → ...e_create_edge_biconnected_graph/input.cyp
diff --git a/...ne_create_edge_biconnected_graph/test.yml → ...ne_create_edge_biconnected_graph/test.yml b/...ne_create_edge_biconnected_graph/test.yml → ...ne_create_edge_biconnected_graph/test.yml
diff --git a/...eate_edge_non-biconnected_graph/input.cyp → ...eate_edge_non-biconnected_graph/input.cyp b/...eate_edge_non-biconnected_graph/input.cyp → ...eate_edge_non-biconnected_graph/input.cyp
diff --git a/...reate_edge_non-biconnected_graph/test.yml → ...reate_edge_non-biconnected_graph/test.yml b/...reate_edge_non-biconnected_graph/test.yml → ...reate_edge_non-biconnected_graph/test.yml
diff --git a/...ne_test/test_online_create_node/input.cyp → ...e_group/test_online_create_node/input.cyp b/...ne_test/test_online_create_node/input.cyp → ...e_group/test_online_create_node/input.cyp
diff --git a/...ine_test/test_online_create_node/test.yml → ...te_group/test_online_create_node/test.yml b/...ine_test/test_online_create_node/test.yml → ...te_group/test_online_create_node/test.yml
diff --git a/...e_delete_edge_biconnected_graph/input.cyp → ...e_delete_edge_biconnected_graph/input.cyp b/...e_delete_edge_biconnected_graph/input.cyp → ...e_delete_edge_biconnected_graph/input.cyp
diff --git a/...ne_delete_edge_biconnected_graph/test.yml → ...ne_delete_edge_biconnected_graph/test.yml b/...ne_delete_edge_biconnected_graph/test.yml → ...ne_delete_edge_biconnected_graph/test.yml
diff --git a/...lete_edge_non-biconnected graph/input.cyp → ...lete_edge_non-biconnected graph/input.cyp b/...lete_edge_non-biconnected graph/input.cyp → ...lete_edge_non-biconnected graph/input.cyp
diff --git a/...elete_edge_non-biconnected graph/test.yml → ...elete_edge_non-biconnected graph/test.yml b/...elete_edge_non-biconnected graph/test.yml → ...elete_edge_non-biconnected graph/test.yml
diff --git a/...ne_test/test_online_delete_node/input.cyp → ...e_group/test_online_delete_node/input.cyp b/...ne_test/test_online_delete_node/input.cyp → ...e_group/test_online_delete_node/input.cyp
diff --git a/...ine_test/test_online_delete_node/test.yml → ...te_group/test_online_delete_node/test.yml b/...ine_test/test_online_delete_node/test.yml → ...te_group/test_online_delete_node/test.yml
diff --git a/.../test_online_detach&delete_node/input.cyp → .../test_online_detach&delete_node/input.cyp b/.../test_online_detach&delete_node/input.cyp → .../test_online_detach&delete_node/input.cyp
diff --git a/...t/test_online_detach&delete_node/test.yml → ...p/test_online_detach&delete_node/test.yml b/...t/test_online_detach&delete_node/test.yml → ...p/test_online_detach&delete_node/test.yml
diff --git a/...e_detach&delete_node_from_chain/input.cyp → ...e_detach&delete_node_from_chain/input.cyp b/...e_detach&delete_node_from_chain/input.cyp → ...e_detach&delete_node_from_chain/input.cyp
diff --git a/...ne_detach&delete_node_from_chain/test.yml → ...ne_detach&delete_node_from_chain/test.yml b/...ne_detach&delete_node_from_chain/test.yml → ...ne_detach&delete_node_from_chain/test.yml
diff --git a/...est_online_update_uninitialized/input.cyp → ...est_online_update_uninitialized/input.cyp b/...est_online_update_uninitialized/input.cyp → ...est_online_update_uninitialized/input.cyp
diff --git a/...test_online_update_uninitialized/test.yml → ...test_online_update_uninitialized/test.yml b/...test_online_update_uninitialized/test.yml → ...test_online_update_uninitialized/test.yml
diff --git a/e2e/test_module.py b/e2e/test_module.py
@@ -20,14 +20,13 @@ class TestConstants:
     QUERY = "query"
     TEST_FILE = "test.yml"
     TEST_MODULE_DIR_SUFFIX = "_test"
+    TEST_GROUP_DIR_SUFFIX = "_group"
 
     ONLINE_TEST_E2E_SETUP = "setup"
     ONLINE_TEST_E2E_CLEANUP = "cleanup"
     ONLINE_TEST_E2E_INPUT_QUERIES = "queries"
     ONLINE_TEST_SUBDIR_PREFIX = "test_online"
 
-    ABSOLUTE_TOLERANCE = 1e-3
-
 
 def _node_to_dict(data):
     labels = data.labels if hasattr(data, "labels") else data._labels
@@ -53,18 +52,29 @@ def prepare_tests():
     tests = []
 
     test_path = Path().cwd()
+
     for module_test_dir in test_path.iterdir():
         if not module_test_dir.is_dir() or not module_test_dir.name.endswith(
             TestConstants.TEST_MODULE_DIR_SUFFIX
         ):
             continue
 
-        for test_dir in module_test_dir.iterdir():
-            if not test_dir.is_dir():
+        for test_or_group_dir in module_test_dir.iterdir():
+            if not test_or_group_dir.is_dir():
                 continue
-            tests.append(
-                pytest.param(test_dir, id=f"{module_test_dir.stem}-{test_dir.stem}")
-            )
+
+            if test_or_group_dir.name.endswith(TestConstants.TEST_GROUP_DIR_SUFFIX):
+                for test_dir in test_or_group_dir.iterdir():
+                    if not test_dir.is_dir():
+                        continue
+
+                    tests.append(
+                        pytest.param(test_dir, id=f"{module_test_dir.stem}-{test_or_group_dir.stem}-{test_dir.stem}")
+                    )
+            else:
+                tests.append(
+                    pytest.param(test_or_group_dir, id=f"{module_test_dir.stem}-{test_or_group_dir.stem}")
+                )
     return tests
 
 

diff --git a/setup b/setup
@@ -28,6 +28,7 @@ HELP_MESSAGE = """\
     For usage info run: python3 setup -h
     """
 
+
 class BuildType(Enum):
     DEBUG = "Debug"
     RELEASE = "Release"
@@ -42,20 +43,29 @@ def get_arguments():
     )
     subparsers = parser.add_subparsers(help="sub-command help", dest="action")
 
-    build_args_parser = argparse.ArgumentParser(description="Build arguments", add_help=False)
+    build_args_parser = argparse.ArgumentParser(
+        description="Build arguments", add_help=False
+    )
     build_args_parser.add_argument(
         "-p", "--path", help="Path to query modules directory", required=False
     )
     build_args_parser.add_argument(
-        "--type", help="Build type", type=BuildType, choices=list(BuildType), required=False
+        "--type",
+        help="Build type",
+        type=BuildType,
+        choices=list(BuildType),
+        required=False,
     )
+    build_args_parser.add_argument("--gpu", help="GPU Algorithms", action="store_true")
     build_args_parser.add_argument(
-        "--gpu", help="GPU Algorithms", action='store_true'
+        "--cpp-build-flags",
+        nargs="+",
+        help="CMake flags for the cpp part (without -D)",
+        required=False,
     )
-    build_args_parser.add_argument(
-        "--cpp-build-flags", nargs="+", help="CMake flags for the cpp part (without -D)", required=False
+    build_parser = subparsers.add_parser(
+        "build", help="Build memgraph-mage", parents=[build_args_parser]
     )
-    build_parser = subparsers.add_parser("build", help="Build memgraph-mage", parents=[build_args_parser])
 
     query_modules_parser = subparsers.add_parser(
         "modules_storage", help="Add path of mage/dist to memgraph.conf "
@@ -75,7 +85,9 @@ def get_arguments():
         default=MAGE_BUILD_DIRECTORY,
     )
 
-    subparsers.add_parser("all", help="Set up memgraph-mage for usage", parents=[build_args_parser])
+    subparsers.add_parser(
+        "all", help="Set up memgraph-mage for usage", parents=[build_args_parser]
+    )
 
     return parser.parse_args()
 
@@ -176,12 +188,20 @@ def build(args):
         os.chdir(project_dir)
         rs_build_mode = "release"
         if args.type is not None:
-            if args.type == BuildType.DEBUG: rs_build_mode = "debug"
-            if args.type == BuildType.RELEASE: rs_build_mode = "release"
+            if args.type == BuildType.DEBUG:
+                rs_build_mode = "debug"
+            if args.type == BuildType.RELEASE:
+                rs_build_mode = "release"
         rs_build_flags = ["--release"]
         if args.type is not None and args.type == BuildType.DEBUG:
             rs_build_flags = []
-        subprocess.run(["cargo", "build"] + rs_build_flags)
+
+        # Build Rust query modules    
+        subprocess.run(
+            ["cargo", "build"] + rs_build_flags,
+            check=True,
+            env=dict(os.environ, CARGO_NET_GIT_FETCH_WITH_CLI="true"),
+        )
 
         release_dir = os.path.join(project_dir, "target", "%s" % rs_build_mode)
         os.chdir(release_dir)