From e3ae59f648b4f84ee031b5d27948c1bc73e37461 Mon Sep 17 00:00:00 2001 From: "kyle.cao" Date: Tue, 11 Apr 2023 11:24:59 +0800 Subject: [PATCH] Fix expression util function fmt --- src/graph/util/ExpressionUtils.cpp | 1 + .../EmbedEdgeAllPredIntoTraverseRule.feature | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/graph/util/ExpressionUtils.cpp b/src/graph/util/ExpressionUtils.cpp index 3217e6beee0..ad7fa5b3d56 100644 --- a/src/graph/util/ExpressionUtils.cpp +++ b/src/graph/util/ExpressionUtils.cpp @@ -1042,6 +1042,7 @@ void ExpressionUtils::splitFilter(const Expression *expr, // TODO(czp): If find any not, dont pick this operand for now if (ExpressionUtils::findAny(operand, {Expression::Kind::kUnaryNot})) { filterUnpickedPtr->addOperand(operand->clone()); + continue; } if (picker(operand)) { filterPickedPtr->addOperand(operand->clone()); diff --git a/tests/tck/features/optimizer/EmbedEdgeAllPredIntoTraverseRule.feature b/tests/tck/features/optimizer/EmbedEdgeAllPredIntoTraverseRule.feature index 80398fca974..e4e5c1abc09 100644 --- a/tests/tck/features/optimizer/EmbedEdgeAllPredIntoTraverseRule.feature +++ b/tests/tck/features/optimizer/EmbedEdgeAllPredIntoTraverseRule.feature @@ -1,7 +1,6 @@ # Copyright (c) 2023 vesoft inc. All rights reserved. # # This source code is licensed under Apache 2.0 License. -@czp Feature: Embed edge all predicate into Traverse Background: @@ -297,13 +296,13 @@ Feature: Embed edge all predicate into Traverse Then the result should be, in any order: | likeness | nage | And the execution plan should be: - | id | name | dependencies | profiling data | operator info | - | 7 | Project | 11 | | | - | 11 | AppendVertices | 14 | | | - | 14 | Filter | 13 | | {"condition": "(!(all(__VAR_1 IN $e WHERE ($__VAR_1.likeness>89))) AND !(all(__VAR_1 IN $e WHERE ($__VAR_1.likeness>89))) AND !(all(__VAR_1 IN $e WHERE ($__VAR_1.likeness>89))))"} | - | 13 | Traverse | 1 | | {"edge filter": "(*.likeness>90)"} | - | 1 | IndexScan | 2 | | | - | 2 | Start | | | | + | id | name | dependencies | profiling data | operator info | + | 7 | Project | 11 | | | + | 11 | AppendVertices | 14 | | | + | 14 | Filter | 13 | | {"condition": "!(all(__VAR_1 IN $e WHERE ($__VAR_1.likeness>89)))"} | + | 13 | Traverse | 1 | | {"edge filter": "(*.likeness>90)"} | + | 1 | IndexScan | 2 | | | + | 2 | Start | | | | When profiling query: """ MATCH (person:player)-[e1:like*1..2]-(friend:player)