fix IndexScan with label containing parameters (#5944)

* fix IndexScan with label containing parameters * chore: improve formatting in VariableExpression.h * Enable the TCK tests that were previously skipped due to bugs.
vesoft-inc · Nov 18, 2024 · 6e0f646 · 6e0f646
1 parent 6c59b79
commit 6e0f646
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/src/common/expression/VariableExpression.h b/src/common/expression/VariableExpression.h
@@ -30,6 +30,10 @@ class VariableExpression final : public Expression {
     return isInner_;
   }
 
+  void setInner(bool inner) {
+    isInner_ = inner;
+  }
+
   const Value& eval(ExpressionContext& ctx) override;
 
   bool operator==(const Expression& rhs) const override {

diff --git a/src/graph/util/ExpressionUtils.cpp b/src/graph/util/ExpressionUtils.cpp
@@ -249,7 +249,9 @@ Expression *ExpressionUtils::rewriteParameter(const Expression *expr, QueryConte
   };
   auto rewriter = [qctx](const Expression *e) -> Expression * {
     DCHECK_EQ(e->kind(), Expression::Kind::kVar);
-    auto &v = const_cast<Expression *>(e)->eval(graph::QueryExpressionContext(qctx->ectx())());
+    auto exp = static_cast<VariableExpression *>(const_cast<Expression *>(e));
+    exp->setInner(false);
+    auto &v = exp->eval(graph::QueryExpressionContext(qctx->ectx())());
     return ConstantExpression::make(qctx->objPool(), v);
   };
 

diff --git a/tests/tck/features/bugfix/ParameterQuery.feature b/tests/tck/features/bugfix/ParameterQuery.feature
@@ -0,0 +1,21 @@
+Feature: Test excute index scan with label which contains parameters
+
+  Background:
+    Given an empty graph
+    And load "nba" csv data to a new space
+    Given parameters: {"p1":"Tim Duncan"}
+
+  Scenario: execute index scan with label which contains parameters
+    When profiling query:
+      """
+      MATCH (v:player{name:$p1})  RETURN v.player.age
+      """
+    Then the result should be, in any order:
+      | v.player.age |
+      | 42           |
+    Then the execution plan should be:
+      | id | name           | dependencies | operator info                                       |
+      | 4  | Project        | 3            |                                                     |
+      | 3  | AppendVertices | 2            |                                                     |
+      | 2  | IndexScan      | 1            | {"indexCtx": {"columnHints":{"scanType":"PREFIX"}}} |
+      | 1  | Start          |              |                                                     |
diff --git a/tests/tck/features/match/Path.feature b/tests/tck/features/match/Path.feature
@@ -274,7 +274,6 @@ Feature: Matching paths
       | count(p) | count(p2) |
       | 94       | 94        |
 
-  @skip #bug to fix: https://github.com/vesoft-inc/nebula/issues/5187
   Scenario: edge directions in paths
     When executing query:
       """

diff --git a/tests/tck/features/yield/parameter.feature b/tests/tck/features/yield/parameter.feature
@@ -48,7 +48,6 @@ Feature: Parameter
       | v                                 |
       | {a: 3, b: false, c: "Tim Duncan"} |
 
-  @skip #bug to fix: https://github.com/vesoft-inc/nebula/issues/5939
   Scenario: [param-test-004] cypher with parameters
     # where clause
     When executing query: