Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wrong invoke of toEdgeName #5017

Merged
merged 3 commits into from
Dec 7, 2022
+56 −19
Merged

Fix wrong invoke of toEdgeName #5017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efcacb6
fix push efilter down
jievince Dec 7, 2022
11b6a55
fix to edge type
jievince Dec 7, 2022
80eb0d1
update tck
jievince Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/graph/optimizer/rule/PushEFilterDownRule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@ StatusOr<OptRule::TransformResult> PushEFilterDownRule::transform(
auto pool = qctx->objPool();
auto eFilter = traverse->eFilter()->clone();

eFilter = rewriteStarEdge(
eFilter, traverse->space(), *DCHECK_NOTNULL(traverse->edgeProps()), qctx->schemaMng(), pool);
eFilter = rewriteStarEdge(eFilter,
traverse->space(),
*DCHECK_NOTNULL(traverse->edgeProps()),
qctx->schemaMng(),
traverse->edgeDirection() == storage::cpp2::EdgeDirection::BOTH,
pool);
if (eFilter == nullptr) {
return TransformResult::noTransform();
}
Expand Down Expand Up @@ -93,6 +97,7 @@ std::string PushEFilterDownRule::toString() const {
GraphSpaceID spaceId,
const std::vector<storage::cpp2::EdgeProp> &edges,
meta::SchemaManager *schemaMng,
bool isBothDirection,
ObjectPool *pool) {
graph::RewriteVisitor::Matcher matcher = [](const Expression *exp) -> bool {
switch (exp->kind()) {
Expand All @@ -113,19 +118,22 @@ std::string PushEFilterDownRule::toString() const {
}
};
graph::RewriteVisitor::Rewriter rewriter =
[spaceId, &edges, schemaMng, pool](const Expression *exp) -> Expression * {
[spaceId, &edges, schemaMng, isBothDirection, pool](const Expression *exp) -> Expression * {
auto *propertyExpr = static_cast<const PropertyExpression *>(exp);
DCHECK_EQ(propertyExpr->sym(), "*");
DCHECK(!edges.empty());
Expression *ret = nullptr;
if (edges.size() == 1) {
if (edges.size() == 1 || (isBothDirection && edges.size() == 2)) {
ret = rewriteStarEdge(propertyExpr, spaceId, edges.front(), schemaMng, pool);
if (ret == nullptr) {
return nullptr;
}
} else {
auto args = ArgumentList::make(pool);
for (auto &edge : edges) {
if (isBothDirection && edge.get_type() < 0) {
continue;
}
auto reEdgeExp = rewriteStarEdge(propertyExpr, spaceId, edge, schemaMng, pool);
if (reEdgeExp == nullptr) {
return nullptr;
Expand All @@ -144,7 +152,7 @@ std::string PushEFilterDownRule::toString() const {
const storage::cpp2::EdgeProp &edge,
meta::SchemaManager *schemaMng,
ObjectPool *pool) {
auto edgeNameResult = schemaMng->toEdgeName(spaceId, edge.get_type());
auto edgeNameResult = schemaMng->toEdgeName(spaceId, std::abs(edge.get_type()));
if (!edgeNameResult.ok()) {
return nullptr;
}
Expand Down
1 change: 1 addition & 0 deletions src/graph/optimizer/rule/PushEFilterDownRule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class PushEFilterDownRule final : public OptRule {
GraphSpaceID spaceId,
const std::vector<storage::cpp2::EdgeProp> &edges,
meta::SchemaManager *schemaMng,
bool isBothDirection,
ObjectPool *pool);
static Expression *rewriteStarEdge(const PropertyExpression *exp,
GraphSpaceID spaceId,
Expand Down
28 changes: 28 additions & 0 deletions tests/tck/features/optimizer/PushEFilterDownRule.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,34 @@ Feature: Push EFilter down rule
| 8 | Traverse | 7 | {"edge filter": "", "filter": "(like.likeness==95)"} |
| 7 | IndexScan | 0 | |
| 0 | Start | | |
When profiling query:
"""
MATCH (v:player{name: 'Tim Duncan'})<-[e:like{likeness: 95}]-() return v.player.name AS name
"""
Then the result should be, in any order:
| name |
| "Tim Duncan" |
And the execution plan should be:
| id | name | dependencies | operator info |
| 5 | Project | 8 | |
| 8 | Traverse | 7 | {"edge filter": "", "filter": "(like.likeness==95)"} |
| 7 | IndexScan | 0 | |
| 0 | Start | | |
When profiling query:
"""
MATCH (v:player{name: 'Tim Duncan'})-[e:like|serve{likeness: 95}]-() return v.player.name AS name
"""
Then the result should be, in any order:
| name |
| "Tim Duncan" |
| "Tim Duncan" |
| "Tim Duncan" |
And the execution plan should be:
| id | name | dependencies | operator info |
| 5 | Project | 8 | |
| 8 | Traverse | 7 | {"edge filter": "", "filter": "(_any(like.likeness,serve.likeness)==95)"} |
| 7 | IndexScan | 0 | |
| 0 | Start | | |
When profiling query:
"""
MATCH (v:player{name: 'Tim Duncan'})-[e:like*1..2{likeness: 95}]->() return v.player.name AS name
Expand Down
28 changes: 14 additions & 14 deletions tests/tck/features/optimizer/PushFilterDownHashInnerJoinRule.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ Feature: Push Filter down HashInnerJoin rule
| [:like "Tony Parker"->"Tim Duncan" @0 {likeness: 95}] | ("Tony Parker" :player{age: 36, name: "Tony Parker"}) |
| [:like "Tim Duncan"->"Tony Parker" @0 {likeness: 95}] | ("Tony Parker" :player{age: 36, name: "Tony Parker"}) |
And the execution plan should be:
| id | name | dependencies | operator info |
| 30 | Sort | 14 | |
| 14 | Project | 19 | |
| 19 | HashInnerJoin | 6,22 | |
| 6 | Project | 20 | |
| 20 | AppendVertices | 2 | |
| 2 | Dedup | 1 | |
| 1 | PassThrough | 3 | |
| 3 | Start | | |
| 22 | Project | 10 | |
| 10 | AppendVertices | 9 | |
| 9 | Traverse | 7 | {"edge filter": "(*.likeness>0)"} |
| 7 | Argument | | |
| id | name | dependencies | operator info |
| 30 | Sort | 14 | |
| 14 | Project | 19 | |
| 19 | HashInnerJoin | 6,22 | |
| 6 | Project | 20 | |
| 20 | AppendVertices | 2 | |
| 2 | Dedup | 1 | |
| 1 | PassThrough | 3 | |
| 3 | Start | | |
| 22 | Project | 10 | |
| 10 | AppendVertices | 9 | |
| 9 | Traverse | 7 | {"filter": "(like.likeness>0)"} |
| 7 | Argument | | |
When profiling query:
"""
MATCH (v:player)
Expand Down Expand Up @@ -122,7 +122,7 @@ Feature: Push Filter down HashInnerJoin rule
| 3 | Start | | |
| 25 | Project | 10 | |
| 10 | AppendVertices | 9 | |
| 9 | Traverse | 7 | {"edge filter": "(*.likeness>0)"} |
| 9 | Traverse | 7 | {"filter": "(like.likeness>0)"} |
| 7 | Argument | | |
When profiling query:
"""
Expand Down