fix filter bug (#5720)

* fix error * check error
vesoft-inc · Sep 19, 2023 · a6c163c · a6c163c
1 parent e84e236
commit a6c163c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 0 deletions.
diff --git a/src/graph/executor/query/AppendVerticesExecutor.cpp b/src/graph/executor/query/AppendVerticesExecutor.cpp
@@ -197,6 +197,7 @@ folly::Future<Status> AppendVerticesExecutor::handleRespMultiJobs(
           }
         }
         auto res = std::move(respVal).value();
+        NG_RETURN_IF_ERROR(res);
         auto &&rows = std::move(res).value();
         std::move(rows.begin(), rows.end(), std::back_inserter(result_.rows));
       }
@@ -242,6 +243,7 @@ folly::Future<Status> AppendVerticesExecutor::handleRespMultiJobs(
             }
           }
           auto res = std::move(respVal).value();
+          NG_RETURN_IF_ERROR(res);
           auto &&rows = std::move(res).value();
           std::move(rows.begin(), rows.end(), std::back_inserter(result_.rows));
         }

diff --git a/src/graph/executor/query/FilterExecutor.cpp b/src/graph/executor/query/FilterExecutor.cpp
@@ -48,6 +48,7 @@ folly::Future<Status> FilterExecutor::execute() {
           }
         }
         auto res = std::move(respVal).value();
+        NG_RETURN_IF_ERROR(res);
         auto &&rows = std::move(res).value();
         result.rows.insert(result.rows.end(),
                            std::make_move_iterator(rows.begin()),

diff --git a/src/graph/executor/query/InnerJoinExecutor.cpp b/src/graph/executor/query/InnerJoinExecutor.cpp
@@ -187,6 +187,7 @@ folly::Future<Status> InnerJoinExecutor::probe(const std::vector<Expression*>& p
         }
       }
       auto res = std::move(respVal).value();
+      NG_RETURN_IF_ERROR(res);
       auto&& rows = std::move(res).value();
       result.rows.insert(result.rows.end(),
                          std::make_move_iterator(rows.begin()),
@@ -228,6 +229,7 @@ folly::Future<Status> InnerJoinExecutor::singleKeyProbe(Expression* probeKey, It
         }
       }
       auto res = std::move(respVal).value();
+      NG_RETURN_IF_ERROR(res);
       auto&& rows = std::move(res).value();
       result.rows.insert(result.rows.end(),
                          std::make_move_iterator(rows.begin()),

diff --git a/src/graph/executor/query/LeftJoinExecutor.cpp b/src/graph/executor/query/LeftJoinExecutor.cpp
@@ -164,6 +164,7 @@ folly::Future<Status> LeftJoinExecutor::probe(const std::vector<Expression*>& pr
         }
       }
       auto res = std::move(respVal).value();
+      NG_RETURN_IF_ERROR(res);
       auto&& rows = std::move(res).value();
       result.rows.insert(result.rows.end(),
                          std::make_move_iterator(rows.begin()),
@@ -204,6 +205,7 @@ folly::Future<Status> LeftJoinExecutor::singleKeyProbe(Expression* probeKey, Ite
         }
       }
       auto res = std::move(respVal).value();
+      NG_RETURN_IF_ERROR(res);
       auto&& rows = std::move(res).value();
       result.rows.insert(result.rows.end(),
                          std::make_move_iterator(rows.begin()),

diff --git a/src/graph/executor/query/ProjectExecutor.cpp b/src/graph/executor/query/ProjectExecutor.cpp
@@ -42,6 +42,7 @@ folly::Future<Status> ProjectExecutor::execute() {
           }
         }
         auto res = std::move(respVal).value();
+        NG_RETURN_IF_ERROR(res);
         auto &&rows = std::move(res).value();
         result.rows.insert(result.rows.end(),
                            std::make_move_iterator(rows.begin()),

diff --git a/tests/tck/features/expression/StartsWith.feature b/tests/tck/features/expression/StartsWith.feature
@@ -141,3 +141,10 @@ Feature: Starts With Expression
     Then the result should be, in any order:
       | $^.player.name  | $$.player.name | like.likeness |
       | 'Manu Ginobili' | 'Tim Duncan'   | 90            |
+
+  Scenario: starts with wrong type
+    When executing query:
+      """
+      MATCH (v:player)-[]->() WHERE v.player.name STARTS WITH 1 RETURN v
+      """
+    Then a ExecutionError should be raised at runtime: Failed to evaluate condition: ($-.v.player.name STARTS WITH 1). For boolean conditions, please write in their full forms like <condition> == <true/false> or <condition> IS [NOT] NULL.