fix test error

vesoft-inc · Nov 5, 2021 · dc7e184 · dc7e184
1 parent 9314898
commit dc7e184
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/graph/validator/MatchValidator.cpp b/src/graph/validator/MatchValidator.cpp
@@ -556,7 +556,7 @@ StatusOr<Expression *> MatchValidator::makeSubFilter(const std::string &alias,
       pool,
       LabelAttributeExpression::make(
           pool, LabelExpression::make(pool, alias), ConstantExpression::make(pool, items[0].first)),
-      items[0].second->clone());
+      foldExpr->clone());
   for (auto i = 1u; i < items.size(); i++) {
     foldStatus = ExpressionUtils::foldConstantExpr(items[i].second);
     NG_RETURN_IF_ERROR(foldStatus);
@@ -572,7 +572,7 @@ StatusOr<Expression *> MatchValidator::makeSubFilter(const std::string &alias,
         LabelAttributeExpression::make(pool,
                                        LabelExpression::make(pool, alias),
                                        ConstantExpression::make(pool, items[i].first)),
-        items[i].second->clone());
+        foldExpr->clone());
     root = LogicalExpression::makeAnd(pool, left, right);
   }
   return root;

diff --git a/tests/tck/features/match/Base.IntVid.feature b/tests/tck/features/match/Base.IntVid.feature
@@ -422,7 +422,7 @@ Feature: Basic match
       """
     Then the result should be, in any order, with relax comparison:
       | v                                          |
-      | ("Null1" :player{age: -1, name: __NULL__}) |
+      | ("Null1" :player{age: -1, name: NULL}) |
     When executing query:
       """
       match (v:player{age: +20}) return v

diff --git a/tests/tck/features/match/Base.feature b/tests/tck/features/match/Base.feature
@@ -525,7 +525,7 @@ Feature: Basic match
       """
     Then the result should be, in any order, with relax comparison:
       | v                                          |
-      | ("Null1" :player{age: -1, name: __NULL__}) |
+      | ("Null1" :player{age: -1, name: NULL}) |
     When executing query:
       """
       match (v:player{age: +20}) return v