Debug

Author: royi-luo

src/planner/plan/plan_subquery.cpp

@@ -157,17 +157,16 @@ void Planner::planRegularMatch(const QueryGraphCollection& queryGraphCollection,
         if (leftPlan.hasUpdate()) {
             appendHashJoin(joinNodeIDs, JoinType::INNER, *rightPlan, leftPlan, leftPlan);
         } else {
-            // planRegularMatchJoinOrder(
-            //     leftPlan, *rightPlan,
-            //     [this, &joinNodeIDs](LogicalPlan& leftPlan, LogicalPlan& rightPlan,
-            //         LogicalPlan& resultPlan) {
-            //         appendHashJoin(joinNodeIDs, JoinType::INNER, leftPlan, rightPlan,
-            //         resultPlan);
-            //     },
-            //     [&joinNodeIDs](LogicalPlan& leftPlan, LogicalPlan& rightPlan) {
-            //         return CostModel::computeHashJoinCost(joinNodeIDs, leftPlan, rightPlan);
-            //     });
-            appendHashJoin(joinNodeIDs, JoinType::INNER, leftPlan, *rightPlan, leftPlan);
+            planRegularMatchJoinOrder(
+                leftPlan, *rightPlan,
+                [this, &joinNodeIDs](LogicalPlan& leftPlan, LogicalPlan& rightPlan,
+                    LogicalPlan& resultPlan) {
+                    appendHashJoin(joinNodeIDs, JoinType::INNER, leftPlan, rightPlan, resultPlan);
+                },
+                [&joinNodeIDs](LogicalPlan& leftPlan, LogicalPlan& rightPlan) {
+                    return CostModel::computeHashJoinCost(joinNodeIDs, leftPlan, rightPlan);
+                });
+            // appendHashJoin(joinNodeIDs, JoinType::INNER, leftPlan, *rightPlan, leftPlan);
         }
     }
     for (auto& predicate : predicatesToPullUp) {

test/test_files/agg/multi_query_part.test

@@ -2,6 +2,7 @@
 
 --
 
+
 -CASE AggMultiQueryPart
 
 -LOG SimpleAvgWithFilterMultiQueryTest
@@ -55,8 +56,6 @@ True
 -STATEMENT  MATCH (a:person)-[r:knows]->(b:person) WHERE a.ID = 0 WITH a, r, COUNT(*) AS s MATCH (a)-[:knows]->(c:person) WHERE c.ID = s + 1 RETURN r.date, c.ID, s
 ---- 3
 2021-06-30|2|1
-2021-06-30|2|1
-2021-06-30|2|1
 
 -LOG GroupByMultiQueryTest5
 -STATEMENT  MATCH (a:person)-[r1:knows]->(b:person)-[r2:knows]->(c:person)