check param in subgraph

vesoft-inc · Apr 14, 2023 · e8e6c18 · e8e6c18
1 parent f79c3b8
commit e8e6c18
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/src/graph/validator/GetSubgraphValidator.cpp b/src/graph/validator/GetSubgraphValidator.cpp
@@ -126,17 +126,29 @@ Status GetSubgraphValidator::validateWhere(WhereClause* where) {
   if (where == nullptr) {
     return Status::OK();
   }
-  auto* expr = where->filter();
-  if (ExpressionUtils::findAny(expr,
+  auto* filterExpr = where->filter();
+  if (ExpressionUtils::findAny(filterExpr,
                                {Expression::Kind::kAggregate,
                                 Expression::Kind::kSrcProperty,
                                 Expression::Kind::kVarProperty,
                                 Expression::Kind::kInputProperty,
                                 Expression::Kind::kLogicalOr})) {
-    return Status::SemanticError("Not support `%s' in where sentence.", expr->toString().c_str());
+    return Status::SemanticError("Not support `%s' in where sentence.",
+                                 filterExpr->toString().c_str());
   }
 
-  where->setFilter(ExpressionUtils::rewriteLabelAttr2EdgeProp(expr));
+  auto undefinedParams = graph::ExpressionUtils::ExtractInnerVars(filterExpr, 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(filterExpr, qctx_);
+
+  where->setFilter(ExpressionUtils::rewriteLabelAttr2EdgeProp(newFilter));
   auto filter = where->filter();
   auto typeStatus = deduceExprType(filter);
   NG_RETURN_IF_ERROR(typeStatus);
@@ -169,11 +181,11 @@ Status GetSubgraphValidator::validateWhere(WhereClause* where) {
   }
 
   auto condition = filter->clone();
-  if (ExpressionUtils::findAny(expr, {Expression::Kind::kDstProperty})) {
+  if (ExpressionUtils::findAny(filter, {Expression::Kind::kDstProperty})) {
     auto visitor = ExtractFilterExprVisitor::makePushGetVertices(qctx_->objPool());
     filter->accept(&visitor);
     if (!visitor.ok()) {
-      return Status::SemanticError("Push target vertices filter error: " + expr->toString());
+      return Status::SemanticError("Push target vertices filter error: " + filter->toString());
     }
     subgraphCtx_->edgeFilter = visitor.remainedExpr();
     auto tagFilter = visitor.extractedExpr() ? visitor.extractedExpr() : filter;

diff --git a/tests/tck/features/yield/parameter.feature b/tests/tck/features/yield/parameter.feature
@@ -6,7 +6,7 @@ Feature: Parameter
   Background:
     Given an empty graph
     And load "nba" csv data to a new space
-    Given parameters: {"p1":1,"p2":true,"p3":"Tim Duncan","p4":3.3,"p5":[1,true,3],"p6":{"a":3,"b":false,"c":"Tim Duncan"},"p7":{"a":{"b":{"c":"Tim Duncan","d":[1,2,3,true,"Tim Duncan"]}}},"p8":"Manu Ginobili", "p9":["Tim Duncan","Tony Parker"]}
+    Given parameters: {"p1":1,"p2":true,"p3":"Tim Duncan","p4":3.3,"p5":[1,true,3],"p6":{"a":3,"b":false,"c":"Tim Duncan"},"p7":{"a":{"b":{"c":"Tim Duncan","d":[1,2,3,true,"Tim Duncan"]}}},"p8":"Manu Ginobili", "p9":["Tim Duncan","Tony Parker"], "p10":90}
 
   Scenario: [param-test-001] without define param
     When executing query:
@@ -269,6 +269,11 @@ Feature: Parameter
       MATCH (v:player) where v.player.age < $unknown_distance RETURN v
       """
     Then a SemanticError should be raised at runtime: Undefined parameters: unknown_distance
+    When executing query:
+      """
+      GET SUBGRAPH FROM 'Tim Duncan' WHERE like.likeness < $unknown_distance YIELD edges as e
+      """
+    Then a SemanticError should be raised at runtime: Undefined parameters: unknown_distance
     When executing query:
       """
       MATCH (v:player) RETURN  v LIMIT $p6
@@ -345,6 +350,14 @@ Feature: Parameter
       | v        |
       | BAD_TYPE |
       | BAD_TYPE |
+    When executing query:
+      """
+      GET SUBGRAPH FROM 'Tim Duncan' WHERE like.likeness > $p10 YIELD edges AS e
+      """
+    Then the result should be, in any order:
+      | e                                                                                                                                                                                                                                  |
+      | [[:like "Tim Duncan"->"Manu Ginobili" @0 {likeness: 95}], [:like "Tim Duncan"->"Tony Parker" @0 {likeness: 95}], [:like "Dejounte Murray"->"Tim Duncan" @0 {likeness: 99}], [:like "Tony Parker"->"Tim Duncan" @0 {likeness: 95}]] |
+      | [[:like "Tony Parker"->"Manu Ginobili" @0 {likeness: 95}], [:like "Dejounte Murray"->"Manu Ginobili" @0 {likeness: 99}], [:like "Dejounte Murray"->"Tony Parker" @0 {likeness: 99}]]                                               |
 
   Scenario: [param-test-013] DML
     Given an empty graph