split new visitor

vesoft-inc · Dec 13, 2021 · 090a758 · 090a758
1 parent 80073ab
commit 090a758
Show file tree

Hide file tree

Showing 17 changed files with 377 additions and 101 deletions.
diff --git a/src/graph/validator/FetchEdgesValidator.cpp b/src/graph/validator/FetchEdgesValidator.cpp
@@ -176,6 +176,7 @@ Status FetchEdgesValidator::validateYield(const YieldClause *yield) {
     }
     col->setExpr(ExpressionUtils::rewriteLabelAttr2EdgeProp(col->expr()));
     NG_RETURN_IF_ERROR(ValidateUtil::invalidLabelIdentifiers(col->expr()));
+    NG_RETURN_IF_ERROR(checkExprDepth(col->expr()));
 
     auto colExpr = col->expr();
     auto typeStatus = deduceExprType(colExpr);

diff --git a/src/graph/validator/FetchVerticesValidator.cpp b/src/graph/validator/FetchVerticesValidator.cpp
@@ -67,6 +67,7 @@ Status FetchVerticesValidator::validateYield(YieldClause *yield) {
     }
     col->setExpr(ExpressionUtils::rewriteLabelAttr2TagProp(col->expr()));
     NG_RETURN_IF_ERROR(ValidateUtil::invalidLabelIdentifiers(col->expr()));
+    NG_RETURN_IF_ERROR(checkExprDepth(col->expr()));
 
     auto colExpr = col->expr();
     auto typeStatus = deduceExprType(colExpr);

diff --git a/src/graph/validator/FindPathValidator.cpp b/src/graph/validator/FindPathValidator.cpp
@@ -46,6 +46,7 @@ Status FindPathValidator::validateWhere(WhereClause* where) {
   }
   where->setFilter(ExpressionUtils::rewriteLabelAttr2EdgeProp(expr));
   auto filter = where->filter();
+  NG_RETURN_IF_ERROR(checkExprDepth(filter));
 
   auto typeStatus = deduceExprType(filter);
   NG_RETURN_IF_ERROR(typeStatus);

diff --git a/src/graph/validator/GoValidator.cpp b/src/graph/validator/GoValidator.cpp
@@ -65,6 +65,7 @@ Status GoValidator::validateWhere(WhereClause* where) {
   NG_RETURN_IF_ERROR(foldRes);
 
   auto filter = foldRes.value();
+  NG_RETURN_IF_ERROR(checkExprDepth(filter));
   auto typeStatus = deduceExprType(filter);
   NG_RETURN_IF_ERROR(typeStatus);
   auto type = typeStatus.value();
@@ -141,6 +142,7 @@ Status GoValidator::validateYield(YieldClause* yield) {
 
     col->setExpr(ExpressionUtils::rewriteLabelAttr2EdgeProp(col->expr()));
     NG_RETURN_IF_ERROR(ValidateUtil::invalidLabelIdentifiers(col->expr()));
+    NG_RETURN_IF_ERROR(checkExprDepth(col->expr()));
 
     auto* colExpr = col->expr();
     if (ExpressionUtils::hasAny(colExpr, {Expression::Kind::kEdge})) {

diff --git a/src/graph/validator/GroupByValidator.cpp b/src/graph/validator/GroupByValidator.cpp
@@ -108,6 +108,7 @@ Status GroupByValidator::validateGroup(const GroupClause* groupClause) {
       return Status::SemanticError("Group `%s' invalid", col->expr()->toString().c_str());
     }
 
+    NG_RETURN_IF_ERROR(checkExprDepth(col->expr()));
     NG_RETURN_IF_ERROR(deduceExprType(col->expr()));
     NG_RETURN_IF_ERROR(deduceProps(col->expr(), exprProps_));
 
@@ -145,6 +146,7 @@ Status GroupByValidator::groupClauseSemanticCheck() {
   // deduce group items and build outputs_
   DCHECK_EQ(aggOutputColNames_.size(), groupItems_.size());
   for (auto i = 0u; i < groupItems_.size(); ++i) {
+    NG_RETURN_IF_ERROR(checkExprDepth(groupItems_[i]));
     auto type = deduceExprType(groupItems_[i]);
     NG_RETURN_IF_ERROR(type);
     outputs_.emplace_back(aggOutputColNames_[i], std::move(type).value());

diff --git a/src/graph/validator/LookupValidator.cpp b/src/graph/validator/LookupValidator.cpp
@@ -118,6 +118,7 @@ Status LookupValidator::validateYieldEdge() {
     }
     col->setExpr(ExpressionUtils::rewriteLabelAttr2EdgeProp(col->expr()));
     NG_RETURN_IF_ERROR(ValidateUtil::invalidLabelIdentifiers(col->expr()));
+    NG_RETURN_IF_ERROR(checkExprDepth(col->expr()));
 
     auto colExpr = col->expr();
     auto typeStatus = deduceExprType(colExpr);
@@ -148,6 +149,7 @@ Status LookupValidator::validateYieldTag() {
     }
     col->setExpr(ExpressionUtils::rewriteLabelAttr2TagProp(col->expr()));
     NG_RETURN_IF_ERROR(ValidateUtil::invalidLabelIdentifiers(col->expr()));
+    NG_RETURN_IF_ERROR(checkExprDepth(col->expr()));
 
     auto colExpr = col->expr();
     auto typeStatus = deduceExprType(colExpr);
@@ -209,6 +211,7 @@ Status LookupValidator::validateFilter() {
     NG_RETURN_IF_ERROR(ret);
     lookupCtx_->filter = std::move(ret).value();
     // Make sure the type of the rewritted filter expr is right
+    NG_RETURN_IF_ERROR(checkExprDepth(lookupCtx_->filter));
     NG_RETURN_IF_ERROR(deduceExprType(lookupCtx_->filter));
   }
   NG_RETURN_IF_ERROR(deduceProps(lookupCtx_->filter, exprProps_));

diff --git a/src/graph/validator/MatchValidator.cpp b/src/graph/validator/MatchValidator.cpp
@@ -270,6 +270,7 @@ Status MatchValidator::validateFilter(const Expression *filter,
   auto transformRes = ExpressionUtils::filterTransform(filter);
   NG_RETURN_IF_ERROR(transformRes);
   whereClauseCtx.filter = transformRes.value();
+  NG_RETURN_IF_ERROR(checkExprDepth(whereClauseCtx.filter));
 
   auto typeStatus = deduceExprType(whereClauseCtx.filter);
   NG_RETURN_IF_ERROR(typeStatus);
@@ -899,6 +900,7 @@ Status MatchValidator::checkAlias(
 Status MatchValidator::buildOutputs(const YieldColumns *yields) {
   for (auto *col : yields->columns()) {
     auto colName = col->name();
+    NG_RETURN_IF_ERROR(checkExprDepth(col->expr()));
     auto typeStatus = deduceExprType(col->expr());
     NG_RETURN_IF_ERROR(typeStatus);
     auto type = typeStatus.value();

diff --git a/src/graph/validator/MutateValidator.cpp b/src/graph/validator/MutateValidator.cpp
@@ -613,6 +613,7 @@ Status UpdateValidator::getCondition() {
     if (symExpr != nullptr) {
       filter = symExpr;
     }
+    NG_RETURN_IF_ERROR(checkExprDepth(filter));
     auto typeStatus = deduceExprType(filter);
     NG_RETURN_IF_ERROR(typeStatus);
     auto type = typeStatus.value();

diff --git a/src/graph/validator/Validator.cpp b/src/graph/validator/Validator.cpp
@@ -36,6 +36,7 @@
 #include "graph/validator/SetValidator.h"
 #include "graph/validator/UseValidator.h"
 #include "graph/validator/YieldValidator.h"
+#include "graph/visitor/CheckDepthVisitor.h"
 #include "graph/visitor/DeduceTypeVisitor.h"
 #include "graph/visitor/EvaluableExprVisitor.h"
 #include "parser/Sentence.h"
@@ -352,6 +353,12 @@ StatusOr<Value::Type> Validator::deduceExprType(const Expression* expr) const {
   return visitor.type();
 }
 
+Status Validator::checkExprDepth(const Expression* expr) const {
+  CheckDepthVisitor visitor;
+  const_cast<Expression*>(expr)->accept(&visitor);
+  return std::move(visitor).status();
+}
+
 Status Validator::deduceProps(const Expression* expr, ExpressionProps& exprProps) {
   DeducePropsVisitor visitor(qctx_, space_.id, &exprProps, &userDefinedVarNameList_);
   const_cast<Expression*>(expr)->accept(&visitor);

diff --git a/src/graph/validator/Validator.h b/src/graph/validator/Validator.h
@@ -107,6 +107,8 @@ class Validator {
 
   StatusOr<Value::Type> deduceExprType(const Expression* expr) const;
 
+  Status checkExprDepth(const Expression* expr) const;
+
   Status deduceProps(const Expression* expr, ExpressionProps& exprProps);
 
   static StatusOr<size_t> checkPropNonexistOrDuplicate(const ColsDef& cols,

diff --git a/src/graph/validator/YieldValidator.cpp b/src/graph/validator/YieldValidator.cpp
@@ -65,6 +65,7 @@ Status YieldValidator::makeOutputColumn(YieldColumn *column) {
   DCHECK(colExpr != nullptr);
 
   auto expr = colExpr->clone();
+  NG_RETURN_IF_ERROR(checkExprDepth(expr));
   NG_RETURN_IF_ERROR(deduceProps(expr, exprProps_));
 
   auto status = deduceExprType(expr);

diff --git a/src/graph/visitor/CMakeLists.txt b/src/graph/visitor/CMakeLists.txt
@@ -14,6 +14,7 @@ nebula_add_library(
     RewriteVisitor.cpp
     FindVisitor.cpp
     VidExtractVisitor.cpp
+    CheckDepthVisitor.cpp
 )
 
 nebula_add_subdirectory(test)