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.

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

optimize rewrite visitor #3053

Merged
merged 20 commits into from
Nov 24, 2021
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f9baa30
optimize rewrite visitor
czpmango Oct 13, 2021
07137d5
Merge branch 'master' into opt-rewrite-visitor
czpmango Oct 13, 2021
2bcae85
Merge branch 'master' into opt-rewrite-visitor
czpmango Oct 22, 2021
5d6b41b
Merge branch 'master' into opt-rewrite-visitor
czpmango Oct 29, 2021
4ce17ad
Merge branch 'master' into opt-rewrite-visitor
czpmango Nov 3, 2021
b291bc1
Merge branch 'master' into opt-rewrite-visitor
czpmango Nov 4, 2021
61de573
Merge branch 'master' into opt-rewrite-visitor
czpmango Nov 8, 2021
802a7f1
Merge branch 'master' into opt-rewrite-visitor
czpmango Nov 15, 2021
1937fe6
Merge branch 'master' into opt-rewrite-visitor
czpmango Nov 16, 2021
fa93782
Merge branch 'master' into opt-rewrite-visitor
czpmango Nov 17, 2021
e579b49
Merge branch 'master' into opt-rewrite-visitor
czpmango Nov 19, 2021
8fe7102
Merge branch 'master' into opt-rewrite-visitor
CPWstatic Nov 19, 2021
0d89e7c
Merge branch 'master' into opt-rewrite-visitor
czpmango Nov 19, 2021
35248c2
Merge branch 'master' into opt-rewrite-visitor
yixinglu Nov 22, 2021
bc922b8
Merge branch 'master' into opt-rewrite-visitor
CPWstatic Nov 23, 2021
7a47b0d
Merge branch 'master' into opt-rewrite-visitor
czpmango Nov 23, 2021
faef982
Merge branch 'master' into opt-rewrite-visitor
czpmango Nov 23, 2021
c386e1e
Merge branch 'master' into opt-rewrite-visitor
yixinglu Nov 23, 2021
420ddaa
Merge branch 'master' into opt-rewrite-visitor
yixinglu Nov 23, 2021
33da58e
Merge branch 'master' into opt-rewrite-visitor
yixinglu Nov 23, 2021
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
2 changes: 1 addition & 1 deletion src/graph/validator/GroupByValidator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Status GroupByValidator::validateYield(const YieldClause* yieldClause) {
needGenProject_ = true;
}
if (!aggs.empty()) {
auto* colRewrited = ExpressionUtils::rewriteAgg2VarProp(colExpr);
auto* colRewrited = ExpressionUtils::rewriteAgg2VarProp(colExpr->clone());
projCols_->addColumn(new YieldColumn(colRewrited, colOldName));
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion src/graph/validator/MatchValidator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ Status MatchValidator::validateGroup(YieldClauseContext &yieldCtx) const {
yieldCtx.aggOutputColumnNames_.emplace_back(agg->toString());
}
if (!aggs.empty()) {
auto *rewritedExpr = ExpressionUtils::rewriteAgg2VarProp(colExpr);
auto *rewritedExpr = ExpressionUtils::rewriteAgg2VarProp(colExpr->clone());
yieldCtx.projCols_->addColumn(new YieldColumn(rewritedExpr, colOldName));
yieldCtx.projOutputColumnNames_.emplace_back(colOldName);
continue;
Expand Down
12 changes: 6 additions & 6 deletions src/graph/visitor/RewriteVisitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,9 @@ Expression *RewriteVisitor::transform(const Expression *expr, Matcher matcher, R
return rewriter(expr);
} else {
RewriteVisitor visitor(std::move(matcher), std::move(rewriter));
auto exprCopy = expr->clone();
exprCopy->accept(&visitor);
return exprCopy;
auto *e = const_cast<Expression *>(expr);
e->accept(&visitor);
return e;
}
}

Expand All @@ -339,9 +339,9 @@ Expression *RewriteVisitor::transform(
return rewriter(expr);
} else {
RewriteVisitor visitor(std::move(matcher), std::move(rewriter), std::move(needVisitedTypes));
auto exprCopy = expr->clone();
exprCopy->accept(&visitor);
return exprCopy;
auto *e = const_cast<Expression *>(expr);
e->accept(&visitor);
return e;
}
}
} // namespace graph
Expand Down