Refactor SegmentsConnector.

vesoft-inc · Dec 23, 2021 · 9f8aa44 · 9f8aa44
1 parent e8a298c
commit 9f8aa44
Show file tree

Hide file tree

Showing 18 changed files with 100 additions and 436 deletions.
diff --git a/src/graph/planner/CMakeLists.txt b/src/graph/planner/CMakeLists.txt
@@ -9,10 +9,6 @@ nebula_add_library(
     SequentialPlanner.cpp
     match/MatchSolver.cpp
     match/SegmentsConnector.cpp
-    match/InnerJoinStrategy.cpp
-    match/AddDependencyStrategy.cpp
-    match/AddInputStrategy.cpp
-    match/CartesianProductStrategy.cpp
     match/MatchPlanner.cpp
     match/MatchClausePlanner.cpp
     match/UnwindClausePlanner.cpp

diff --git a/src/graph/planner/match/AddDependencyStrategy.cpp b/src/graph/planner/match/AddDependencyStrategy.cpp
diff --git a/src/graph/planner/match/AddDependencyStrategy.h b/src/graph/planner/match/AddDependencyStrategy.h
diff --git a/src/graph/planner/match/AddInputStrategy.cpp b/src/graph/planner/match/AddInputStrategy.cpp
diff --git a/src/graph/planner/match/AddInputStrategy.h b/src/graph/planner/match/AddInputStrategy.h
diff --git a/src/graph/planner/match/CartesianProductStrategy.cpp b/src/graph/planner/match/CartesianProductStrategy.cpp
diff --git a/src/graph/planner/match/CartesianProductStrategy.h b/src/graph/planner/match/CartesianProductStrategy.h
diff --git a/src/graph/planner/match/InnerJoinStrategy.cpp b/src/graph/planner/match/InnerJoinStrategy.cpp
diff --git a/src/graph/planner/match/InnerJoinStrategy.h b/src/graph/planner/match/InnerJoinStrategy.h
diff --git a/src/graph/planner/match/LeftOuterJoinStrategy.h b/src/graph/planner/match/LeftOuterJoinStrategy.h
diff --git a/src/graph/planner/match/MatchClausePlanner.cpp b/src/graph/planner/match/MatchClausePlanner.cpp
@@ -17,8 +17,6 @@
 #include "graph/util/SchemaUtil.h"
 #include "graph/visitor/RewriteVisitor.h"
 
-using JoinStrategyPos = nebula::graph::InnerJoinStrategy::JoinPos;
-
 namespace nebula {
 namespace graph {
 static std::vector<std::string> genTraverseColNames(const std::vector<std::string>& inputCols,
@@ -458,8 +456,7 @@ Status MatchClausePlanner::appendFilterPlan(MatchClauseContext* matchClauseCtx,
   auto wherePlan = std::make_unique<WhereClausePlanner>()->transform(matchClauseCtx->where.get());
   NG_RETURN_IF_ERROR(wherePlan);
   auto plan = std::move(wherePlan).value();
-  SegmentsConnector::addInput(plan.tail, subplan.root, true);
-  subplan.root = plan.root;
+  subplan = SegmentsConnector::addInput(plan, subplan, true);
   VLOG(1) << subplan;
   return Status::OK();
 }
@@ -485,24 +482,12 @@ Status MatchClausePlanner::connectPathPlan(const std::vector<NodeInfo>& nodeInfo
     matchClausePlan = subplan;
   } else {
     if (intersectedAliases.empty()) {
-      matchClausePlan.root =
-          BiCartesianProduct::make(matchClauseCtx->qctx, matchClausePlan.root, subplan.root);
+      matchClausePlan =
+          SegmentsConnector::cartesianProduct(matchClauseCtx->qctx, matchClausePlan, subplan);
     } else {
       // TODO: Actually a natural join would be much easy use.
-      auto innerJoin = BiInnerJoin::make(matchClauseCtx->qctx, matchClausePlan.root, subplan.root);
-      std::vector<Expression*> hashKeys;
-      std::vector<Expression*> probeKeys;
-      auto pool = matchClauseCtx->qctx->objPool();
-      for (auto& alias : intersectedAliases) {
-        auto* args = ArgumentList::make(pool);
-        args->addArgument(InputPropertyExpression::make(pool, alias));
-        auto* expr = FunctionCallExpression::make(pool, "id", args);
-        hashKeys.emplace_back(expr);
-        probeKeys.emplace_back(expr->clone());
-      }
-      innerJoin->setHashKeys(std::move(hashKeys));
-      innerJoin->setProbeKeys(std::move(probeKeys));
-      matchClausePlan.root = innerJoin;
+      matchClausePlan = SegmentsConnector::innerJoin(
+          matchClauseCtx->qctx, matchClausePlan, subplan, intersectedAliases);
     }
   }
   return Status::OK();