Merge pull request #1911 from kuzudb/merge-mark-fix

Fix merge operator mark
kuzudb · Aug 9, 2023 · 8f9cf3f · 8f9cf3f
2 parents 95d3ba3 + 44a70ab
commit 8f9cf3f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/src/binder/bind/bind_updating_clause.cpp b/src/binder/bind/bind_updating_clause.cpp
@@ -110,6 +110,9 @@ std::vector<std::unique_ptr<BoundCreateInfo>> Binder::bindCreateInfos(
             result.push_back(bindCreateRelInfo(rel, keyValCollection));
         }
     }
+    if (result.empty()) {
+        throw BinderException("Cannot resolve any node or relationship to create.");
+    }
     return result;
 }
 

diff --git a/src/planner/plan/plan_update.cpp b/src/planner/plan/plan_update.cpp
@@ -58,17 +58,27 @@ void QueryPlanner::planCreateClause(
 
 void QueryPlanner::planMergeClause(binder::BoundUpdatingClause& updatingClause, LogicalPlan& plan) {
     auto& mergeClause = (BoundMergeClause&)updatingClause;
-    auto queryGraphCollection = mergeClause.getQueryGraphCollection();
     binder::expression_vector predicates;
     if (mergeClause.hasPredicate()) {
         predicates = mergeClause.getPredicate()->splitOnAND();
     }
     planOptionalMatch(*mergeClause.getQueryGraphCollection(), predicates, plan);
-    // TODO(Xiyang): fix mark
-    auto rels = queryGraphCollection->getQueryRels();
-    auto nodes = queryGraphCollection->getQueryNodes();
-    auto mark =
-        !rels.empty() ? rels[0]->getInternalIDProperty() : nodes[0]->getInternalIDProperty();
+    std::shared_ptr<Expression> mark;
+    auto& createInfos = mergeClause.getCreateInfosRef();
+    assert(!createInfos.empty());
+    auto createInfo = createInfos[0].get();
+    switch (createInfo->updateTableType) {
+    case binder::UpdateTableType::NODE: {
+        auto node = (NodeExpression*)createInfo->nodeOrRel.get();
+        mark = node->getInternalIDProperty();
+    } break;
+    case binder::UpdateTableType::REL: {
+        auto rel = (RelExpression*)createInfo->nodeOrRel.get();
+        mark = rel->getInternalIDProperty();
+    } break;
+    default:
+        throw common::NotImplementedException("QueryPlanner::planMergeClause");
+    }
     std::vector<std::unique_ptr<LogicalCreateNodeInfo>> logicalCreateNodeInfos;
     std::vector<std::unique_ptr<LogicalSetPropertyInfo>> logicalCreateNodeSetInfos;
     if (mergeClause.hasCreateNodeInfo()) {

diff --git a/test/test_files/exceptions/binder/binder_error.test b/test/test_files/exceptions/binder/binder_error.test
@@ -5,6 +5,16 @@
 
 -CASE BinderError
 
+-LOG EmptyCreateClause
+-STATEMENT MATCH (a:person) CREATE (a);
+---- error
+Binder exception: Cannot resolve any node or relationship to create.
+
+-LOG EmptyMergeClause
+-STATEMENT MATCH (a:person) MERGE (a);
+---- error
+Binder exception: Cannot resolve any node or relationship to create.
+
 -LOG NodeTableNotExist
 -STATEMENT MATCH (a:PERSON) RETURN COUNT(*)
 ---- error