Fix regex expression (#5507)

vesoft-inc · Apr 19, 2023 · a0e8493 · a0e8493
1 parent 1ecbdba
commit a0e8493
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/common/expression/RelationalExpression.cpp b/src/common/expression/RelationalExpression.cpp
@@ -37,7 +37,8 @@ const Value& RelationalExpression::eval(ExpressionContext& ctx) {
     case Kind::kRelREG: {
       if (lhs.isBadNull() || rhs.isBadNull()) {
         result_ = Value::kNullBadType;
-      } else if ((!lhs.isNull() && !lhs.isStr()) || (!rhs.isNull() && !rhs.isStr())) {
+      } else if ((!lhs.isNull() && !lhs.empty() && !lhs.isStr()) ||
+                 (!rhs.isNull() && !rhs.empty() && !rhs.isStr())) {
         result_ = Value::kNullBadType;
       } else if (lhs.isStr() && rhs.isStr()) {
         try {

diff --git a/tests/tck/features/expression/RelationalExpr.feature b/tests/tck/features/expression/RelationalExpr.feature
@@ -233,3 +233,21 @@ Feature: RelationalExpression
       | 2  | AppendVertices | 6            |                                                    |
       | 6  | IndexScan      | 0            | {"indexCtx": {"columnHints":{"scanType":"RANGE"}}} |
       | 0  | Start          |              |                                                    |
+
+  Scenario: Transform Relational expr in MATCH clause
+    When profiling query:
+      """
+      MATCH (v:player{name: "Tim Duncan"})-[e]->(m) WHERE m.player.name =~ 'Tony.*' RETURN id(m) AS id
+      """
+    Then the result should be, in any order:
+      | id            |
+      | "Tony Parker" |
+      | "Tony Parker" |
+    And the execution plan should be:
+      | id | name           | dependencies | operator info |
+      | 13 | Project        | 12           |               |
+      | 12 | Filter         | 12           |               |
+      | 12 | AppendVertices | 11           |               |
+      | 11 | Traverse       | 8            |               |
+      | 8  | IndexScan      | 0            |               |
+      | 0  | Start          |              |               |