remove useless dc

vesoft-inc · Aug 17, 2022 · 3c39203 · 3c39203
1 parent 0f75120
commit 3c39203
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 132 deletions.
diff --git a/src/graph/planner/SequentialPlanner.cpp b/src/graph/planner/SequentialPlanner.cpp
@@ -19,10 +19,8 @@ bool SequentialPlanner::match(AstContext* astCtx) {
 StatusOr<SubPlan> SequentialPlanner::transform(AstContext* astCtx) {
   SubPlan subPlan;
   auto* seqCtx = static_cast<SequentialAstContext*>(astCtx);
-  auto* qctx = seqCtx->qctx;
   const auto& validators = seqCtx->validators;
   subPlan.root = validators.back()->root();
-  ifBuildDataCollect(subPlan, qctx);
   for (auto iter = validators.begin(); iter < validators.end() - 1; ++iter) {
     // Remove left tail kStart plannode before append plan.
     // It allows that kUse sentence to append kMatch Sentence.
@@ -40,30 +38,6 @@ StatusOr<SubPlan> SequentialPlanner::transform(AstContext* astCtx) {
   return subPlan;
 }
 
-void SequentialPlanner::ifBuildDataCollect(SubPlan& subPlan, QueryContext* qctx) {
-  switch (subPlan.root->kind()) {
-    case PlanNode::Kind::kSort:
-    case PlanNode::Kind::kLimit:
-    case PlanNode::Kind::kSample:
-    case PlanNode::Kind::kDedup:
-    case PlanNode::Kind::kUnion:
-    case PlanNode::Kind::kUnionAllVersionVar:
-    case PlanNode::Kind::kIntersect:
-    case PlanNode::Kind::kCartesianProduct:
-    case PlanNode::Kind::kMinus:
-    case PlanNode::Kind::kFilter: {
-      auto* dc = DataCollect::make(qctx, DataCollect::DCKind::kRowBasedMove);
-      dc->addDep(subPlan.root);
-      dc->setInputVars({subPlan.root->outputVar()});
-      dc->setColNames(subPlan.root->colNames());
-      subPlan.root = dc;
-      break;
-    }
-    default:
-      break;
-  }
-}
-
 // When appending plans, it need to remove left tail plannode.
 // Because the left tail plannode is StartNode which needs to be removed,
 // and remain one size for add dependency

diff --git a/src/graph/planner/SequentialPlanner.h b/src/graph/planner/SequentialPlanner.h
@@ -26,8 +26,6 @@ class SequentialPlanner final : public Planner {
    */
   StatusOr<SubPlan> transform(AstContext* astCtx) override;
 
-  void ifBuildDataCollect(SubPlan& subPlan, QueryContext* qctx);
-
   void rmLeftTailStartNode(Validator* validator, Sentence::Kind appendPlanKind);
 
  private:

diff --git a/src/graph/validator/test/FetchEdgesTest.cpp b/src/graph/validator/test/FetchEdgesTest.cpp
@@ -190,13 +190,7 @@ TEST_F(FetchEdgesValidatorTest, FetchEdgesProp) {
     auto *project = Project::make(qctx, filter, yieldColumns.get());
     auto *dedup = Dedup::make(qctx, project);
 
-    // data collect
-    auto *dataCollect = DataCollect::make(qctx, DataCollect::DCKind::kRowBasedMove);
-    dataCollect->addDep(dedup);
-    dataCollect->setInputVars({dedup->outputVar()});
-    dataCollect->setColNames({"like.start", "like.end"});
-
-    auto result = Eq(qctx->plan()->root(), dataCollect);
+    auto result = Eq(qctx->plan()->root(), dedup);
     ASSERT_TRUE(result.ok()) << result;
   }
 }

diff --git a/src/graph/validator/test/FetchVerticesTest.cpp b/src/graph/validator/test/FetchVerticesTest.cpp
@@ -364,13 +364,7 @@ TEST_F(FetchVerticesValidatorTest, FetchVerticesProp) {
 
     auto *dedup = Dedup::make(qctx, project);
 
-    // data collect
-    auto *dataCollect = DataCollect::make(qctx, DataCollect::DCKind::kRowBasedMove);
-    dataCollect->addDep(dedup);
-    dataCollect->setInputVars({dedup->outputVar()});
-    dataCollect->setColNames({"person.name", "person.age"});
-
-    auto result = Eq(qctx->plan()->root(), dataCollect);
+    auto result = Eq(qctx->plan()->root(), dedup);
     ASSERT_TRUE(result.ok()) << result;
   }
   // ON *

diff --git a/src/graph/validator/test/MatchValidatorTest.cpp b/src/graph/validator/test/MatchValidatorTest.cpp
@@ -118,8 +118,7 @@ TEST_F(MatchValidatorTest, groupby) {
         "avg(distinct n.person.age)+1 AS age,"
         "labels(n) AS lb "
         "ORDER BY id;";
-    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kDataCollect,
-                                            PlanNode::Kind::kSort,
+    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kSort,
                                             PlanNode::Kind::kProject,
                                             PlanNode::Kind::kAggregate,
                                             PlanNode::Kind::kProject,
@@ -140,8 +139,7 @@ TEST_F(MatchValidatorTest, groupby) {
         "labels(n) AS lb "
         "ORDER BY id "
         "SKIP 10 LIMIT 20;";
-    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kDataCollect,
-                                            PlanNode::Kind::kLimit,
+    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kLimit,
                                             PlanNode::Kind::kSort,
                                             PlanNode::Kind::kProject,
                                             PlanNode::Kind::kAggregate,
@@ -220,8 +218,7 @@ TEST_F(MatchValidatorTest, groupby) {
         "avg(distinct n.person.age) AS age,"
         "labels(m) AS lb "
         "SKIP 10 LIMIT 20;";
-    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kDataCollect,
-                                            PlanNode::Kind::kLimit,
+    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kLimit,
                                             PlanNode::Kind::kAggregate,
                                             PlanNode::Kind::kFilter,
                                             PlanNode::Kind::kProject,
@@ -242,8 +239,7 @@ TEST_F(MatchValidatorTest, groupby) {
         "min(n.person.age) AS min,"
         "avg(distinct n.person.age) AS age,"
         "labels(m) AS lb;";
-    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kDataCollect,
-                                            PlanNode::Kind::kDedup,
+    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kDedup,
                                             PlanNode::Kind::kAggregate,
                                             PlanNode::Kind::kFilter,
                                             PlanNode::Kind::kProject,
@@ -265,8 +261,7 @@ TEST_F(MatchValidatorTest, groupby) {
         "avg(distinct n.person.age)+1 AS age,"
         "labels(m) AS lb "
         "SKIP 10 LIMIT 20;";
-    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kDataCollect,
-                                            PlanNode::Kind::kLimit,
+    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kLimit,
                                             PlanNode::Kind::kProject,
                                             PlanNode::Kind::kAggregate,
                                             PlanNode::Kind::kFilter,
@@ -290,8 +285,7 @@ TEST_F(MatchValidatorTest, groupby) {
         "labels(m) AS lb "
         "ORDER BY id "
         "SKIP 10 LIMIT 20;";
-    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kDataCollect,
-                                            PlanNode::Kind::kLimit,
+    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kLimit,
                                             PlanNode::Kind::kSort,
                                             PlanNode::Kind::kDedup,
                                             PlanNode::Kind::kProject,
@@ -317,8 +311,7 @@ TEST_F(MatchValidatorTest, groupby) {
         "labels(m) AS lb "
         "ORDER BY id "
         "SKIP 10 LIMIT 20;";
-    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kDataCollect,
-                                            PlanNode::Kind::kLimit,
+    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kLimit,
                                             PlanNode::Kind::kSort,
                                             PlanNode::Kind::kDedup,
                                             PlanNode::Kind::kAggregate,
@@ -343,8 +336,7 @@ TEST_F(MatchValidatorTest, groupby) {
         "labels(m) AS lb "
         "ORDER BY id "
         "SKIP 10 LIMIT 20;";
-    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kDataCollect,
-                                            PlanNode::Kind::kLimit,
+    std::vector<PlanNode::Kind> expected = {PlanNode::Kind::kLimit,
                                             PlanNode::Kind::kSort,
                                             PlanNode::Kind::kDedup,
                                             PlanNode::Kind::kProject,

diff --git a/src/graph/validator/test/QueryValidatorTest.cpp b/src/graph/validator/test/QueryValidatorTest.cpp
@@ -107,7 +107,6 @@ TEST_F(QueryValidatorTest, GoNSteps) {
         "GO 3 steps FROM \"1\",\"2\",\"3\" OVER like WHERE $^.person.age > 20"
         "YIELD distinct $^.person.name";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect,
         PK::kDedup,
         PK::kProject,
         PK::kFilter,
@@ -125,8 +124,7 @@ TEST_F(QueryValidatorTest, GoNSteps) {
     std::string query =
         "GO 2 STEPS FROM \"1\",\"2\",\"3\" OVER like WHERE $^.person.age > 20"
         "YIELD distinct $^.person.name ";
-    std::vector<PlanNode::Kind> expected = {PK::kDataCollect,
-                                            PK::kDedup,
+    std::vector<PlanNode::Kind> expected = {PK::kDedup,
                                             PK::kProject,
                                             PK::kFilter,
                                             PK::kGetNeighbors,
@@ -239,8 +237,7 @@ TEST_F(QueryValidatorTest, GoWithPipe) {
         "GO 1 STEPS FROM \"1\" OVER like YIELD like._dst AS "
         "id | GO 1 STEPS FROM $-.id OVER like "
         "WHERE $-.id == \"2\" YIELD DISTINCT $-.id, like._dst";
-    std::vector<PlanNode::Kind> expected = {PK::kDataCollect,
-                                            PK::kDedup,
+    std::vector<PlanNode::Kind> expected = {PK::kDedup,
                                             PK::kProject,
                                             PK::kFilter,
                                             PK::kInnerJoin,
@@ -286,11 +283,11 @@ TEST_F(QueryValidatorTest, GoWithPipe) {
         "id | GO 2 STEPS FROM $-.id OVER like "
         "WHERE $-.id == \"2\" YIELD DISTINCT $-.id, like._dst";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect, PK::kDedup,   PK::kProject,      PK::kFilter,       PK::kInnerJoin,
-        PK::kInnerJoin,   PK::kProject, PK::kGetNeighbors, PK::kLoop,         PK::kDedup,
-        PK::kDedup,       PK::kProject, PK::kProject,      PK::kDedup,        PK::kInnerJoin,
-        PK::kProject,     PK::kDedup,   PK::kProject,      PK::kProject,      PK::kGetNeighbors,
-        PK::kDedup,       PK::kStart,   PK::kProject,      PK::kGetNeighbors, PK::kStart,
+        PK::kDedup,   PK::kProject,      PK::kFilter,       PK::kInnerJoin,    PK::kInnerJoin,
+        PK::kProject, PK::kGetNeighbors, PK::kLoop,         PK::kDedup,        PK::kDedup,
+        PK::kProject, PK::kProject,      PK::kDedup,        PK::kInnerJoin,    PK::kProject,
+        PK::kDedup,   PK::kProject,      PK::kProject,      PK::kGetNeighbors, PK::kDedup,
+        PK::kStart,   PK::kProject,      PK::kGetNeighbors, PK::kStart,
     };
     EXPECT_TRUE(checkResult(query, expected));
   }
@@ -327,7 +324,6 @@ TEST_F(QueryValidatorTest, GoWithPipe) {
         "YIELD DISTINCT $-.name, like.likeness + 1, $-.id, like._dst, "
         "$$.person.name";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect,
         PK::kDedup,
         PK::kProject,
         PK::kInnerJoin,
@@ -393,13 +389,12 @@ TEST_F(QueryValidatorTest, GoWithPipe) {
         "YIELD DISTINCT $-.name, like.likeness + 1, $-.id, like._dst, "
         "$$.person.name";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect, PK::kDedup,        PK::kProject,     PK::kInnerJoin, PK::kInnerJoin,
-        PK::kLeftJoin,    PK::kProject,      PK::kGetVertices, PK::kProject,   PK::kGetNeighbors,
-        PK::kLoop,        PK::kDedup,        PK::kDedup,       PK::kProject,   PK::kProject,
-        PK::kDedup,       PK::kInnerJoin,    PK::kProject,     PK::kDedup,     PK::kProject,
-        PK::kProject,     PK::kLeftJoin,     PK::kDedup,       PK::kProject,   PK::kProject,
-        PK::kGetVertices, PK::kGetNeighbors, PK::kProject,     PK::kStart,     PK::kGetNeighbors,
-        PK::kStart,
+        PK::kDedup,        PK::kProject,     PK::kInnerJoin, PK::kInnerJoin,    PK::kLeftJoin,
+        PK::kProject,      PK::kGetVertices, PK::kProject,   PK::kGetNeighbors, PK::kLoop,
+        PK::kDedup,        PK::kDedup,       PK::kProject,   PK::kProject,      PK::kDedup,
+        PK::kInnerJoin,    PK::kProject,     PK::kDedup,     PK::kProject,      PK::kProject,
+        PK::kLeftJoin,     PK::kDedup,       PK::kProject,   PK::kProject,      PK::kGetVertices,
+        PK::kGetNeighbors, PK::kProject,     PK::kStart,     PK::kGetNeighbors, PK::kStart,
     };
     EXPECT_TRUE(checkResult(query, expected));
   }
@@ -603,7 +598,6 @@ TEST_F(QueryValidatorTest, GoOneStep) {
         "YIELD DISTINCT $^.person.name, like._dst, "
         "$$.person.name, $$.person.age + 1";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect,
         PK::kDedup,
         PK::kProject,
         PK::kFilter,
@@ -641,7 +635,6 @@ TEST_F(QueryValidatorTest, GoOneStep) {
         "GO FROM \"1\",\"2\",\"3\" OVER like WHERE $^.person.age > 20"
         "YIELD distinct $^.person.name ";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect,
         PK::kDedup,
         PK::kProject,
         PK::kFilter,
@@ -1011,7 +1004,7 @@ TEST_F(QueryValidatorTest, Limit) {
   {
     std::string query = "GO FROM \"Ann\" OVER like YIELD like._dst AS like | LIMIT 1, 3";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect, PK::kLimit, PK::kProject, PK::kGetNeighbors, PK::kStart};
+        PK::kLimit, PK::kProject, PK::kGetNeighbors, PK::kStart};
     EXPECT_TRUE(checkResult(query, expected));
   }
 }
@@ -1021,8 +1014,7 @@ TEST_F(QueryValidatorTest, OrderBy) {
     std::string query =
         "GO FROM \"Ann\" OVER like YIELD $^.person.age AS age"
         " | ORDER BY $-.age";
-    std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect, PK::kSort, PK::kProject, PK::kGetNeighbors, PK::kStart};
+    std::vector<PlanNode::Kind> expected = {PK::kSort, PK::kProject, PK::kGetNeighbors, PK::kStart};
     EXPECT_TRUE(checkResult(query, expected));
   }
   // not exist factor
@@ -1040,7 +1032,7 @@ TEST_F(QueryValidatorTest, OrderByAndLimit) {
         "GO FROM \"Ann\" OVER like YIELD $^.person.age AS age"
         " | ORDER BY $-.age | LIMIT 1";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect, PK::kLimit, PK::kSort, PK::kProject, PK::kGetNeighbors, PK::kStart};
+        PK::kLimit, PK::kSort, PK::kProject, PK::kGetNeighbors, PK::kStart};
     EXPECT_TRUE(checkResult(query, expected));
   }
 }
@@ -1053,7 +1045,6 @@ TEST_F(QueryValidatorTest, TestSetValidator) {
         "\"2\" "
         "OVER like YIELD like.start AS start";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect,
         PK::kUnion,
         PK::kProject,
         PK::kProject,
@@ -1072,7 +1063,6 @@ TEST_F(QueryValidatorTest, TestSetValidator) {
         "YIELD "
         "like.start AS start";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect,
         PK::kDedup,
         PK::kUnion,
         PK::kDedup,
@@ -1096,7 +1086,6 @@ TEST_F(QueryValidatorTest, TestSetValidator) {
         "FROM \"2\" "
         "OVER like YIELD like.start AS start";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect,
         PK::kDedup,
         PK::kUnion,
         PK::kProject,
@@ -1121,7 +1110,6 @@ TEST_F(QueryValidatorTest, TestSetValidator) {
         "GO FROM \"1\" OVER like YIELD like.start AS start INTERSECT GO FROM "
         "\"2\" OVER like YIELD like.start AS start";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect,
         PK::kIntersect,
         PK::kProject,
         PK::kProject,
@@ -1138,7 +1126,6 @@ TEST_F(QueryValidatorTest, TestSetValidator) {
         "GO FROM \"1\" OVER like YIELD like.start AS start MINUS GO FROM "
         "\"2\" OVER like YIELD like.start AS start";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect,
         PK::kMinus,
         PK::kProject,
         PK::kProject,
@@ -1209,7 +1196,6 @@ TEST_F(QueryValidatorTest, TestMatch) {
         "MATCH (:person{name:'Dwyane Wade'}) -[:like]-> () -[:like]-> (v3) "
         "RETURN DISTINCT v3.person.name AS Name";
     std::vector<PlanNode::Kind> expected = {
-        PK::kDataCollect,
         PK::kDedup,
         PK::kProject,
         PK::kProject,

diff --git a/src/graph/validator/test/YieldValidatorTest.cpp b/src/graph/validator/test/YieldValidatorTest.cpp
@@ -523,7 +523,6 @@ TEST_F(YieldValidatorTest, AggCall) {
         "like.likeness AS like"
         "| YIELD DISTINCT AVG($-.age + 1), SUM($-.like), COUNT(*)";
     expected_ = {
-        PlanNode::Kind::kDataCollect,
         PlanNode::Kind::kDedup,
         PlanNode::Kind::kAggregate,
         PlanNode::Kind::kProject,

diff --git a/tests/tck/features/lookup/LookUpLimit.feature b/tests/tck/features/lookup/LookUpLimit.feature
@@ -17,7 +17,6 @@ Feature: Push Limit down IndexScan Rule
       | /[a-zA-Z ']+/ |
     And the execution plan should be:
       | id | name             | dependencies | operator info  |
-      | 4  | DataCollect      | 5            |                |
       | 5  | Sort             | 6            |                |
       | 6  | Project          | 7            |                |
       | 7  | Limit            | 8            | {"count": "2"} |
@@ -33,7 +32,6 @@ Feature: Push Limit down IndexScan Rule
       | /[a-zA-Z ']+/ | /[a-zA-Z ']+/ | /\d+/ |
     And the execution plan should be:
       | id | name              | dependencies | operator info  |
-      | 4  | DataCollect       | 5            |                |
       | 5  | Sort              | 6            |                |
       | 6  | Project           | 7            |                |
       | 7  | Limit             | 8            | {"count": "2"} |
@@ -49,7 +47,6 @@ Feature: Push Limit down IndexScan Rule
       | /[a-zA-Z ']+/ |
     And the execution plan should be:
       | id | name               | dependencies | operator info  |
-      | 4  | DataCollect        | 5            |                |
       | 5  | Sort               | 6            |                |
       | 6  | Project            | 7            |                |
       | 7  | Limit              | 8            | {"count": "2"} |
@@ -65,7 +62,6 @@ Feature: Push Limit down IndexScan Rule
       | /[a-zA-Z ']+/ | /[a-zA-Z ']+/ | /\d+/ |
     And the execution plan should be:
       | id | name                | dependencies | operator info  |
-      | 4  | DataCollect         | 5            |                |
       | 5  | Sort                | 6            |                |
       | 6  | Project             | 7            |                |
       | 7  | Limit               | 8            | {"count": "2"} |
@@ -84,7 +80,6 @@ Feature: Push Limit down IndexScan Rule
       | /[a-zA-Z ']+/ |
     And the execution plan should be:
       | id | name             | dependencies | operator info  |
-      | 3  | DataCollect      | 4            |                |
       | 4  | Sort             | 5            |                |
       | 5  | Project          | 7            |                |
       | 7  | Limit            | 8            |                |
@@ -101,7 +96,6 @@ Feature: Push Limit down IndexScan Rule
       | /[a-zA-Z ']+/ | /[a-zA-Z ']+/ | /\d+/ |
     And the execution plan should be:
       | id | name              | dependencies | operator info  |
-      | 3  | DataCollect       | 4            |                |
       | 4  | Sort              | 5            |                |
       | 5  | Project           | 7            |                |
       | 7  | Limit             | 8            |                |
@@ -118,7 +112,6 @@ Feature: Push Limit down IndexScan Rule
       | /[a-zA-Z ']+/ |
     And the execution plan should be:
       | id | name               | dependencies | operator info  |
-      | 3  | DataCollect        | 4            |                |
       | 4  | Sort               | 5            |                |
       | 5  | Project            | 7            |                |
       | 7  | Limit              | 8            |                |
@@ -135,7 +128,6 @@ Feature: Push Limit down IndexScan Rule
       | /[a-zA-Z ']+/ | /[a-zA-Z ']+/ | /\d+/ |
     And the execution plan should be:
       | id | name                | dependencies | operator info  |
-      | 3  | DataCollect         | 4            |                |
       | 4  | Sort                | 5            |                |
       | 5  | Project             | 7            |                |
       | 7  | Limit               | 8            |                |