Skip to content

Commit

Permalink
add more tck
Browse files Browse the repository at this point in the history
  • Loading branch information
@jievince
jievince committed Jan 31, 2023
1 parent 2076ba1 commit 82bfcae
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/graph/planner/match/LabelIndexSeek.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ StatusOr<SubPlan> LabelIndexSeek::transformNode(NodeContext* nodeCtx) {
// refactored
auto* pool = nodeCtx->qctx->objPool();
if (nodeCtx->bindWhereClause != nullptr && nodeCtx->bindWhereClause->filter != nullptr) {
auto* filter = nodeCtx->bindWhereClause->filter;
auto* filter = ExpressionUtils::rewriteInnerInExpr(nodeCtx->bindWhereClause->filter);
const auto& nodeAlias = nodeCtx->info->alias;
const auto& schemaName = nodeCtx->scanInfo.schemaNames.back();

Expand Down
6 changes: 0 additions & 6 deletions src/graph/planner/match/MatchClausePlanner.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ StatusOr<SubPlan> MatchClausePlanner::transform(CypherClauseContextBase* clauseC
auto& nodeInfos = iter->nodeInfos;
SubPlan pathPlan;
if (iter->pathType == Path::PathType::kDefault) {
// This filter is just used for index scan module which embedded in planner, e.g.
// PropIndexSeek, LabelIndexSeek So we need to rewrite the in list expr to or expr.
if (matchClauseCtx->where && matchClauseCtx->where->filter) {
matchClauseCtx->where->filter =
ExpressionUtils::rewriteInnerInExpr(matchClauseCtx->where->filter);
}
MatchPathPlanner matchPathPlanner(matchClauseCtx, *iter);
auto result = matchPathPlanner.transform(matchClauseCtx->where.get(), nodeAliasesSeen);
NG_RETURN_IF_ERROR(result);
Expand Down
5 changes: 3 additions & 2 deletions src/graph/planner/match/PropIndexSeek.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ bool PropIndexSeek::matchNode(NodeContext* nodeCtx) {
Expression* filterInWhere = nullptr;
Expression* filterInPattern = nullptr;
if (nodeCtx->bindWhereClause != nullptr && nodeCtx->bindWhereClause->filter != nullptr) {
filterInWhere = MatchSolver::makeIndexFilter(
node.labels.back(), node.alias, nodeCtx->bindWhereClause->filter, nodeCtx->qctx);
auto* newFilter = ExpressionUtils::rewriteInnerInExpr(nodeCtx->bindWhereClause->filter);
filterInWhere =
MatchSolver::makeIndexFilter(node.labels.back(), node.alias, newFilter, nodeCtx->qctx);
}
if (!node.labelProps.empty()) {
auto props = node.labelProps.back();
Expand Down
3 changes: 1 addition & 2 deletions tests/tck/features/optimizer/CasesUsingTestSpace.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ Feature: Push Filter Down Cases Using the test Space
| 17 | project | 19 | |
| 19 | aggregate | 24 | |
| 24 | HashInnerJoin | 21,29 | |
| 21 | project | 20 | |
| 20 | filter | 6 | |
| 21 | project | 6 | |
| 6 | AppendVertices | 26 | |
| 26 | Traverse | 25 | |
| 25 | Traverse | 2 | |
Expand Down
54 changes: 42 additions & 12 deletions tests/tck/features/optimizer/PushFilterDownTraverseRule.feature
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright (c) 2022 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License.
@jie
Feature: Push Filter down Traverse rule

Background:
Expand Down Expand Up @@ -63,12 +64,12 @@ Feature: Push Filter down Traverse rule
| 80 | 42 |
| 95 | 42 |
And the execution plan should be:
| id | name | dependencies | operator info |
| 6 | Project | 5 | |
| 5 | AppendVertices | 10 | |
| 10 | Traverse | 9 | {"filter": "((like._dst==\"Tony Parker\") OR (like._dst==\"Tim Duncan\"))"} |
| 9 | IndexScan | 3 | |
| 3 | Start | | |
| id | name | dependencies | operator info |
| 6 | Project | 5 | |
| 5 | AppendVertices | 10 | |
| 10 | Traverse | 9 | {"filter": "(like._dst IN [\"Tony Parker\",\"Tim Duncan\"])"} |
| 9 | IndexScan | 3 | |
| 3 | Start | | |
# The following two match statements is equivalent, so the minus of them should be empty.
When executing query:
"""
Expand All @@ -90,12 +91,12 @@ Feature: Push Filter down Traverse rule
| 95 | 41 |
| 95 | 36 |
And the execution plan should be:
| id | name | dependencies | operator info |
| 6 | Project | 5 | |
| 5 | AppendVertices | 10 | |
| 10 | Traverse | 9 | {"filter": "((like._src==\"Tony Parker\") OR (like._src==\"Tim Duncan\"))"} |
| 9 | IndexScan | 3 | |
| 3 | Start | | |
| id | name | dependencies | operator info |
| 6 | Project | 5 | |
| 5 | AppendVertices | 10 | |
| 10 | Traverse | 9 | {"filter": "(like._src IN [\"Tony Parker\",\"Tim Duncan\"])"} |
| 9 | IndexScan | 3 | |
| 3 | Start | | |
# The following two match statements is equivalent, so the minus of them should be empty.
When executing query:
"""
Expand Down Expand Up @@ -149,6 +150,35 @@ Feature: Push Filter down Traverse rule
| 14 | Traverse | 12 | | |
| 12 | Traverse | 11 | | |
| 11 | Argument | | | |
When profiling query:
"""
MATCH (v)-[e1:like]->(v1) WHERE id(v) == "Tony Parker"
WITH DISTINCT v1, e1.degree AS strength
ORDER BY strength DESC LIMIT 20
MATCH (v1)<-[e2:like]-(v2)
WITH v1, e2, v2 WHERE none_direct_dst(e2) IN ["Yao Ming", "Tim Duncan"]
RETURN id(v2) AS candidate, count(*) AS cnt;
"""
Then the result should be, in any order, with relax comparison:
| candidate | cnt |
| "Tim Duncan" | 1 |
And the execution plan should be:
| id | name | dependencies | profiling data | operator info |
| 18 | Aggregate | 22 | | |
| 22 | Project | 25 | | |
| 25 | HashInnerJoin | 20,27 | | |
| 20 | TopN | 8 | | |
| 8 | Dedup | 19 | | |
| 19 | Project | 5 | | |
| 5 | AppendVertices | 4 | | |
| 4 | Traverse | 2 | | |
| 2 | Dedup | 1 | | |
| 1 | PassThrough | 3 | | |
| 3 | Start | | | |
| 27 | Project | 28 | | |
| 28 | AppendVertices | 30 | | |
| 30 | Traverse | 11 | | {"filter": "(like._dst IN [\"Yao Ming\",\"Tim Duncan\"])"} |
| 11 | Argument | | | |

Scenario: push filter down Traverse with complex filter
When profiling query:
Expand Down
4 changes: 2 additions & 2 deletions tests/tck/features/yield/parameter.feature
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright (c) 2021 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License
@jie
Feature: Parameter

Background:
Expand Down Expand Up @@ -93,8 +94,7 @@ Feature: Parameter
| "Tony Parker" |
And the execution plan should be:
| id | name | dependencies | operator info |
| 9 | Project | 7 | |
| 7 | Filter | 2 | |
| 9 | Project | 2 | |
| 2 | AppendVertices | 6 | |
| 6 | Dedup | 6 | |
| 6 | PassThrough | 0 | |
Expand Down

0 comments on commit 82bfcae

Please sign in to comment.