Address comments

vesoft-inc · Jan 7, 2022 · 98ac865 · 98ac865
1 parent 34a66d2
commit 98ac865
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/graph/util/ExpressionUtils.cpp b/src/graph/util/ExpressionUtils.cpp
@@ -581,11 +581,11 @@ StatusOr<Expression *> ExpressionUtils::filterTransform(const Expression *filter
   }
 
   // Check if any overflow happen before filter tranform
-  auto initilConstFold = foldConstantExpr(filter);
-  NG_RETURN_IF_ERROR(initilConstFold);
+  auto initialConstFold = foldConstantExpr(filter);
+  NG_RETURN_IF_ERROR(initialConstFold);
 
   // Rewrite relational expression
-  auto rewrittenExpr = const_cast<Expression *>(filter);
+  auto rewrittenExpr = initialConstFold.value();
   rewrittenExpr = rewriteRelExpr(rewrittenExpr);
 
   // Fold constant expression

diff --git a/tests/tck/features/match/Base.IntVid.feature b/tests/tck/features/match/Base.IntVid.feature
@@ -586,4 +586,6 @@ Feature: Basic match
       """
       MATCH (v:player) WHERE v.player.name+'n'=="Tim Duncann" RETURN v
       """
-    Then the execution should be successful
+    Then the result should be, in any order:
+      | v                                                                                                          |
+      | ("Tim Duncan":bachelor{name: "Tim Duncan", speciality: "psychology"} :player{age: 42, name: "Tim Duncan"}) |
diff --git a/tests/tck/features/match/Base.feature b/tests/tck/features/match/Base.feature
@@ -696,4 +696,6 @@ Feature: Basic match
       """
       MATCH (v:player) WHERE v.player.name+'n'=="Tim Duncann" RETURN v
       """
-    Then the execution should be successful
+    Then the result should be, in any order:
+      | v                                                                                                          |
+      | ("Tim Duncan":bachelor{name: "Tim Duncan", speciality: "psychology"} :player{age: 42, name: "Tim Duncan"}) |