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 get edges transform rule. #4328

Merged
merged 5 commits into from
Jun 21, 2022
Merged

Fix get edges transform rule. #4328

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1614a50
Fix get edges transform rule.
Shylock-Hg Jun 15, 2022
5d61546
Merge branch 'master' into fix/rule-get-edges-transform
Shylock-Hg Jun 15, 2022
89db82f
Merge branch 'master' into fix/rule-get-edges-transform
Sophie-Xie Jun 15, 2022
ce28e81
Merge branch 'master' into fix/rule-get-edges-transform
Sophie-Xie Jun 17, 2022
d8ed23d
Merge branch 'master' into fix/rule-get-edges-transform
Shylock-Hg Jun 21, 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
1 change: 1 addition & 0 deletions src/graph/optimizer/rule/CollapseProjectRule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ StatusOr<OptRule::TransformResult> CollapseProjectRule::transform(
// 2. find link according to propRefNames and colNames in ProjBelow
std::unordered_map<std::string, Expression*> rewriteMap;
auto colNames = projBelow->colNames();
DCHECK_EQ(colNames.size(), colsBelow.size());
for (size_t i = 0; i < colNames.size(); ++i) {
if (uniquePropRefNames.count(colNames[i])) {
auto colExpr = colsBelow[i]->expr();
Expand Down
7 changes: 3 additions & 4 deletions src/graph/optimizer/rule/GetEdgesTransformAppendVerticesLimitRule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ StatusOr<OptRule::TransformResult> GetEdgesTransformAppendVerticesLimitRule::tra
auto newLimit = limit->clone();
auto newLimitGroup = OptGroup::create(ctx);
auto newLimitGroupNode = newLimitGroup->makeGroupNode(newLimit);
newLimit->setOutputVar(limit->outputVar());
newProject->setInputVar(newLimit->outputVar());

newProjectGroupNode->dependsOn(newLimitGroup);
Expand All @@ -105,8 +104,8 @@ StatusOr<OptRule::TransformResult> GetEdgesTransformAppendVerticesLimitRule::tra
auto newAppendVertices = appendVertices->clone();
auto newAppendVerticesGroup = OptGroup::create(ctx);
auto colSize = appendVertices->colNames().size();
newAppendVertices->setOutputVar(appendVertices->outputVar());
newLimit->setInputVar(newAppendVertices->outputVar());
newLimit->setColNames(newAppendVertices->colNames()); // Limit keep column names same with input
newAppendVertices->setColNames(
{appendVertices->colNames()[colSize - 2], appendVertices->colNames()[colSize - 1]});
auto newAppendVerticesGroupNode = newAppendVerticesGroup->makeGroupNode(newAppendVertices);
Expand All @@ -123,19 +122,19 @@ StatusOr<OptRule::TransformResult> GetEdgesTransformAppendVerticesLimitRule::tra
auto *newProj =
GetEdgesTransformUtils::projectEdges(qctx, newScanEdges, traverse->colNames().back());
newProj->setInputVar(newScanEdges->outputVar());
newProj->setOutputVar(newAppendVertices->inputVar());
newProj->setColNames({traverse->colNames().back()});
auto newProjGroup = OptGroup::create(ctx);
auto newProjGroupNode = newProjGroup->makeGroupNode(newProj);

newAppendVerticesGroupNode->dependsOn(newProjGroup);
newAppendVertices->setInputVar(newProj->outputVar());
newProjGroupNode->dependsOn(newScanEdgesGroup);
for (auto dep : scanVerticesGroupNode->dependencies()) {
newScanEdgesGroupNode->dependsOn(dep);
}

TransformResult result;
result.eraseCurr = true;
result.eraseAll = true;
result.newGroupNodes.emplace_back(newProjectGroupNode);
return result;
}
Expand Down
9 changes: 5 additions & 4 deletions src/graph/optimizer/rule/GetEdgesTransformRule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ StatusOr<OptRule::TransformResult> GetEdgesTransformRule::transform(
auto project = static_cast<const Project *>(projectGroupNode->node());

auto newProject = project->clone();
auto newProjectGroupNode = OptGroupNode::create(ctx, newProject, projectGroupNode->group());
newProject->setOutputVar(project->outputVar());
auto newProjectGroupNode = OptGroupNode::create(ctx, newProject, projectGroupNode->group());

auto limitGroupNode = matched.dependencies.front().node;
auto limit = static_cast<const Limit *>(limitGroupNode->node());
Expand All @@ -85,11 +85,11 @@ StatusOr<OptRule::TransformResult> GetEdgesTransformRule::transform(

auto newLimit = limit->clone();
auto newLimitGroup = OptGroup::create(ctx);
newLimit->setOutputVar(limit->outputVar());

auto newLimitGroupNode = newLimitGroup->makeGroupNode(newLimit);

newProjectGroupNode->dependsOn(newLimitGroup);
newProject->setInputVar(newLimit->outputVar());

auto *newScanEdges = GetEdgesTransformUtils::traverseToScanEdges(traverse, limit->count(qctx));
if (newScanEdges == nullptr) {
Expand All @@ -100,14 +100,15 @@ StatusOr<OptRule::TransformResult> GetEdgesTransformRule::transform(

auto *newProj =
GetEdgesTransformUtils::projectEdges(qctx, newScanEdges, traverse->colNames().back());
newProj->setInputVar(newScanEdges->outputVar());
newProj->setOutputVar(traverse->outputVar());
newProj->setColNames({traverse->colNames().back()});
auto newProjGroup = OptGroup::create(ctx);
auto newProjGroupNode = newProjGroup->makeGroupNode(newProj);

newLimitGroupNode->dependsOn(newProjGroup);
newLimit->setInputVar(newProj->outputVar());
newLimit->setColNames(newProj->colNames()); // Limit keep column names same with input
newProjGroupNode->dependsOn(newScanEdgesGroup);
newProj->setInputVar(newScanEdges->outputVar());
newScanEdgesGroupNode->setDeps(scanVerticesGroupNode->dependencies());

TransformResult result;
Expand Down
1 change: 1 addition & 0 deletions src/graph/optimizer/rule/GetEdgesTransformUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class GetEdgesTransformUtils final {
return scanEdges;
}

// [EDGE] AS <e>
static graph::Project *projectEdges(graph::QueryContext *qctx,
PlanNode *input,
const std::string &colName) {
Expand Down