fix bug

kuzudb · Mar 10, 2023 · 4b65e23 · 4b65e23
1 parent 05bd4af
commit 4b65e23
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/optimizer/asp_optimizer.cpp b/src/optimizer/asp_optimizer.cpp
@@ -35,10 +35,14 @@ void ASPOptimizer::visitHashJoin(planner::LogicalOperator* op) {
         // Probe side is not selective so we don't apply ASP.
         return;
     }
+    auto scanNodes = resolveScanNodesToApplySemiMask(op);
+    if (scanNodes.empty()) {
+        return;
+    }
     // apply ASP
     hashJoin->setInfoPassing(planner::HashJoinSideWayInfoPassing::LEFT_TO_RIGHT);
     auto currentChild = op->getChild(0);
-    for (auto& op_ : resolveScanNodesToApplySemiMask(op)) {
+    for (auto& op_ : scanNodes) {
         auto scanNode = (LogicalScanNode*)op_;
         auto semiMasker = std::make_shared<LogicalSemiMasker>(scanNode, currentChild);
         semiMasker->computeFlatSchema();

diff --git a/test/test_files/tinysnb/asp/asp.test b/test/test_files/tinysnb/asp/asp.test
@@ -7,16 +7,21 @@ Bob
 Dan
 
 -NAME AspMultiKey
--QUERY MATCH (a:person)-[e1:knows]->(b:person)-[e2:knows]->(c:person), (a)-[e3:knows]->(c) WHERE a.fName='Alice' AND e1.meetTime=timestamp('1986-10-21 21:08:31.521')  RETURN b.fName, c.fName
--ENCODED_JOIN HJ(c._id,b._id){E(b)E(c)S(a)}{HJ(b._id){S(b)}{E(b)S(c)}}
--PARALLELISM 1
----- 2
+-QUERY MATCH (a:person)-[e1:knows]->(b:person)-[e2:knows]->(c:person), (a)-[e3:knows]->(c) WHERE a.fName='Alice' RETURN b.fName, c.fName
+#-ENCODED_JOIN HJ(c._id,b._id){E(b)E(c)S(a)}{HJ(b._id){S(b)}{E(b)S(c)}}
+-ENUMERATE
+---- 6
 Bob|Carol
 Bob|Dan
+Carol|Bob
+Carol|Dan
+Dan|Bob
+Dan|Carol
 
 -NAME AspMultiMaskToOneScan
 -QUERY MATCH (a:person)<-[e1:knows]-(b:person)-[e2:knows]->(c:person) WHERE a.fName='Alice' AND c.fName='Bob' RETURN b.fName
--ENCODED_JOIN HJ(b._id){E(b)S(a)}{HJ(b._id){E(b)S(c)}{S(b)}}
+#-ENCODED_JOIN HJ(b._id){E(b)S(a)}{HJ(b._id){E(b)S(c)}{S(b)}}
+-ENUMERATE
 ---- 2
 Carol
 Dan