Fix error message

vesoft-inc · Mar 17, 2023 · fee1898 · fee1898
1 parent 1764ec4
commit fee1898
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/src/graph/util/ExpressionUtils.cpp b/src/graph/util/ExpressionUtils.cpp
@@ -275,10 +275,11 @@ std::vector<std::string> ExpressionUtils::ExtractInnerVars(const Expression *exp
   if (finder(expr)) {
     return {static_cast<const VariableExpression *>(expr)->var()};
   }
-  FindVisitor visitor(finder);
+  FindVisitor visitor(finder, true);
   const_cast<Expression *>(expr)->accept(&visitor);
   auto varExprs = visitor.results();
   std::vector<std::string> vars;
+  vars.reserve(varExprs.size());
   for (const auto *varExpr : varExprs) {
     vars.emplace_back(static_cast<const VariableExpression *>(varExpr)->var());
   }

diff --git a/src/graph/validator/LookupValidator.cpp b/src/graph/validator/LookupValidator.cpp
@@ -193,11 +193,20 @@ Status LookupValidator::validateWhere() {
   auto* filter = whereClause->filter();
   if (filter != nullptr) {
     auto vars = graph::ExpressionUtils::ExtractInnerVars(filter, qctx_);
+    std::vector<std::string> undefinedParams;
     for (const auto& var : vars) {
       if (!vctx_->existVar(var)) {
-        return Status::SemanticError("Undefined parameter: " + var);
+        undefinedParams.emplace_back(var);
       }
     }
+    if (!undefinedParams.empty()) {
+      return Status::SemanticError(
+          "Undefined parameters: " +
+          std::accumulate(++undefinedParams.begin(),
+                          undefinedParams.end(),
+                          *undefinedParams.begin(),
+                          [](auto& lhs, auto& rhs) { return lhs + ", " + rhs; }));
+    }
     filter = graph::ExpressionUtils::rewriteParameter(filter, qctx_);
   }
   if (FTIndexUtils::needTextSearch(filter)) {

diff --git a/src/graph/validator/MatchValidator.cpp b/src/graph/validator/MatchValidator.cpp
@@ -334,10 +334,16 @@ Status MatchValidator::buildEdgeInfo(const MatchPath *path,
 // Rewrite expression to fit semantic, check type and check used aliases.
 Status MatchValidator::validateFilter(const Expression *filter,
                                       WhereClauseContext &whereClauseCtx) {
-  auto vars = graph::ExpressionUtils::ExtractInnerVars(filter, qctx_);
-  if (!vars.empty()) {
-    return Status::SemanticError("Undefined parameter: " + vars[0]);
+  auto undefinedParams = graph::ExpressionUtils::ExtractInnerVars(filter, qctx_);
+  if (!undefinedParams.empty()) {
+    return Status::SemanticError(
+        "Undefined parameters: " +
+        std::accumulate(++undefinedParams.begin(),
+                        undefinedParams.end(),
+                        *undefinedParams.begin(),
+                        [](auto &lhs, auto &rhs) { return lhs + ", " + rhs; }));
   }
+
   auto *newFilter = graph::ExpressionUtils::rewriteParameter(filter, qctx_);
   auto transformRes = ExpressionUtils::filterTransform(newFilter);
   NG_RETURN_IF_ERROR(transformRes);

diff --git a/tests/tck/features/yield/parameter.feature b/tests/tck/features/yield/parameter.feature
@@ -258,12 +258,17 @@ Feature: Parameter
       """
       LOOKUP ON player WHERE ST_Distance(player.age, ST_Point($p1,$p7.a.b.c.d[0])) < $unknown_distance YIELD id(vertex)
       """
-    Then a SemanticError should be raised at runtime: Undefined parameter: unknown_distance
+    Then a SemanticError should be raised at runtime: Undefined parameters: unknown_distance
+    When executing query:
+      """
+      LOOKUP ON player WHERE ST_Distance(player.age, ST_Point($p1,$p7.a.b.c.d[0])) < $unknown_distance+$unknown_factor YIELD id(vertex)
+      """
+    Then a SemanticError should be raised at runtime: Undefined parameters: unknown_distance, unknown_factor
     When executing query:
       """
       MATCH (v:player) where v.player.age < $unknown_distance RETURN v
       """
-    Then a SemanticError should be raised at runtime: Undefined parameter: unknown_distance
+    Then a SemanticError should be raised at runtime: Undefined parameters: unknown_distance
     When executing query:
       """
       MATCH (v:player) RETURN  v LIMIT $p6