fix getneighbors edge direction (#5386)

Co-authored-by: Yichen Wang <18348405+Aiee@users.noreply.github.com>
vesoft-inc · Mar 9, 2023 · 8f800e4 · 8f800e4
1 parent 417f9ad
commit 8f800e4
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/src/graph/executor/test/JoinTest.cpp b/src/graph/executor/test/JoinTest.cpp
@@ -149,7 +149,6 @@ void JoinTest::testInnerJoin(std::string left, std::string right, DataSet& expec
   EXPECT_EQ(result.state(), Result::State::kSuccess) << "LINE: " << line;
 }
 
-
 TEST_F(JoinTest, InnerJoin) {
   DataSet expected;
   expected.colNames = {"src", "dst", kVid, "tag_prop", "edge_prop", kDst};

diff --git a/src/graph/planner/ngql/GoPlanner.cpp b/src/graph/planner/ngql/GoPlanner.cpp
@@ -340,6 +340,7 @@ PlanNode* GoPlanner::lastStep(PlanNode* dep, PlanNode* join) {
     gn->setVertexProps(buildVertexProps(goCtx_->exprProps.srcTagProps()));
     gn->setEdgeProps(buildEdgeProps(false));
     gn->setInputVar(goCtx_->vidsVar);
+    gn->setEdgeDirection(goCtx_->over.direction);
 
     const auto& steps = goCtx_->steps;
     auto* sampleLimit = buildSampleLimit(gn, steps.isMToN() ? steps.nSteps() : steps.steps());
@@ -446,6 +447,7 @@ SubPlan GoPlanner::oneStepPlan(SubPlan& startVidPlan) {
     gn->setEdgeProps(buildEdgeProps(false));
     gn->setSrc(goCtx_->from.src);
     gn->setInputVar(goCtx_->vidsVar);
+    gn->setEdgeDirection(goCtx_->over.direction);
     scan = gn;
 
     auto* sampleLimit = buildSampleLimit(gn, 1 /* one step */);
@@ -495,6 +497,7 @@ SubPlan GoPlanner::nStepsPlan(SubPlan& startVidPlan) {
     gn->setSrc(goCtx_->from.src);
     gn->setEdgeProps(buildEdgeProps(true));
     gn->setInputVar(goCtx_->vidsVar);
+    gn->setEdgeDirection(goCtx_->over.direction);
     auto* sampleLimit = buildSampleLimit(gn);
 
     getDst = PlannerUtil::extractDstFromGN(qctx, sampleLimit, goCtx_->vidsVar);
@@ -569,6 +572,7 @@ SubPlan GoPlanner::mToNStepsPlan(SubPlan& startVidPlan) {
     gn->setVertexProps(buildVertexProps(goCtx_->exprProps.srcTagProps()));
     gn->setEdgeProps(buildEdgeProps(false));
     gn->setInputVar(goCtx_->vidsVar);
+    gn->setEdgeDirection(goCtx_->over.direction);
     auto* sampleLimit = buildSampleLimit(gn);
 
     getDst = PlannerUtil::extractDstFromGN(qctx, sampleLimit, goCtx_->vidsVar);

diff --git a/src/graph/planner/ngql/PathPlanner.cpp b/src/graph/planner/ngql/PathPlanner.cpp
@@ -98,6 +98,8 @@ PlanNode* PathPlanner::getNeighbors(PlanNode* dep, bool reverse) {
   gn->setEdgeProps(buildEdgeProps(reverse));
   gn->setInputVar(gnInputVar);
   gn->setDedup();
+  gn->setEdgeDirection(pathCtx_->over.direction);
+
   PlanNode* result = gn;
   if (pathCtx_->filter != nullptr) {
     auto* filterExpr = pathCtx_->filter->clone();

diff --git a/tests/tck/features/go/GO.feature b/tests/tck/features/go/GO.feature
@@ -339,7 +339,7 @@ Feature: Go Sentence
       | serve._dst |
 
   Scenario: multi edges over all
-    When executing query:
+    When profiling query:
       """
       GO FROM "Russell Westbrook" OVER * REVERSELY YIELD serve._dst, like._dst
       """
@@ -348,15 +348,37 @@ Feature: Go Sentence
       | EMPTY      | "James Harden"    |
       | EMPTY      | "Dejounte Murray" |
       | EMPTY      | "Paul George"     |
+    And the execution plan should be:
+      | id | name         | dependencies | operator info                |
+      | 2  | Project      | 1            |                              |
+      | 1  | GetNeighbors | 0            | {"edgeDirection": "IN_EDGE"} |
+      | 0  | Start        |              |                              |
+    When profiling query:
+      """
+      GO FROM "Russell Westbrook" OVER * BIDIRECT YIELD serve._dst, like._dst
+      """
+    Then the result should be, in any order, with relax comparison:
+      | serve._dst | like._dst         |
+      |            | "Dejounte Murray" |
+      |            | "James Harden"    |
+      |            | "Paul George"     |
+      |            | "James Harden"    |
+      |            | "Paul George"     |
+      | "Thunders" |                   |
+    And the execution plan should be:
+      | id | name         | dependencies | operator info             |
+      | 2  | Project      | 1            |                           |
+      | 1  | GetNeighbors | 0            | {"edgeDirection": "BOTH"} |
+      | 0  | Start        |              |                           |
     When executing query:
       """
       GO FROM "Russell Westbrook" OVER * REVERSELY YIELD serve._src, like._src
       """
     Then the result should be, in any order, with relax comparison:
       | serve._src | like._src           |
-      | EMPTY      | "Russell Westbrook" |
-      | EMPTY      | "Russell Westbrook" |
-      | EMPTY      | "Russell Westbrook" |
+      |            | "Russell Westbrook" |
+      |            | "Russell Westbrook" |
+      |            | "Russell Westbrook" |
     When executing query:
       """
       GO FROM "Russell Westbrook" OVER * REVERSELY YIELD like._dst, serve._dst, teammate._dst