Fix extract filter. (#4823)

* Fix extract filter. * Fail directly. * Revert "Fail directly." This reverts commit 671f729. Co-authored-by: Sophie <[email protected]> Co-authored-by: kyle.cao <[email protected]>
vesoft-inc · Nov 18, 2022 · 3e2d7b2 · 3e2d7b2
1 parent afaf442
commit 3e2d7b2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/graph/visitor/ExtractFilterExprVisitor.cpp b/src/graph/visitor/ExtractFilterExprVisitor.cpp
@@ -276,6 +276,7 @@ bool ExtractFilterExprVisitor::visitLogicalOr(LogicalExpression *expr) {
         if (canNotPushedIndex != -1 || !canBeSplit) {
           return false;
         }
+        canBePushed_ = true;  // reset when the LogicalAnd can be split
         canNotPushedIndex = i;
         flags = std::move(flag);
       }

diff --git a/tests/tck/features/bugfix/ExtractFilter.feature b/tests/tck/features/bugfix/ExtractFilter.feature
@@ -0,0 +1,17 @@
+# Copyright (c) 2022 vesoft inc. All rights reserved.
+#
+# This source code is licensed under Apache 2.0 License.
+Feature: Test extract filter
+
+  Background:
+    Given a graph with space named "nba"
+
+  Scenario: Extract filter bug
+    When executing query:
+      """
+      MATCH (v:player{name: 'Tim Duncan'})-[:like]->(t) WHERE ( (1 == 1 AND (NOT is_edge(t))) OR (v.player.name == 'Tim Duncan')) RETURN v.player.name
+      """
+    Then the result should be, in any order:
+      | v.player.name |
+      | 'Tim Duncan'  |
+      | 'Tim Duncan'  |