optimize rewrite visitor (#3053)

Co-authored-by: cpw <13495049+CPWstatic@users.noreply.github.com>
vesoft-inc · Nov 24, 2021 · b7c6901 · b7c6901
1 parent 6541438
commit b7c6901
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/graph/validator/GroupByValidator.cpp b/src/graph/validator/GroupByValidator.cpp
@@ -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;
       }

diff --git a/src/graph/validator/MatchValidator.cpp b/src/graph/validator/MatchValidator.cpp
@@ -732,8 +732,8 @@ Status MatchValidator::validateGroup(YieldClauseContext &yieldCtx) const {
         yieldCtx.aggOutputColumnNames_.emplace_back(agg->toString());
       }
       if (!aggs.empty()) {
-        auto *rewrittenExpr = ExpressionUtils::rewriteAgg2VarProp(colExpr);
-        yieldCtx.projCols_->addColumn(new YieldColumn(rewrittenExpr, colOldName));
+        auto *rewritedExpr = ExpressionUtils::rewriteAgg2VarProp(colExpr->clone());
+        yieldCtx.projCols_->addColumn(new YieldColumn(rewritedExpr, colOldName));
         yieldCtx.projOutputColumnNames_.emplace_back(colOldName);
         continue;
       }

diff --git a/src/graph/visitor/RewriteVisitor.cpp b/src/graph/visitor/RewriteVisitor.cpp
@@ -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;
   }
 }
 
@@ -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