address comment

vesoft-inc · Sep 22, 2021 · c75a184 · c75a184
1 parent be7db0d
commit c75a184
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/src/graph/validator/FetchVerticesValidator.cpp b/src/graph/validator/FetchVerticesValidator.cpp
@@ -70,8 +70,7 @@ Status FetchVerticesValidator::validateYield(YieldClause *yield) {
   auto pool = qctx_->objPool();
   bool noYield = false;
   if (yield == nullptr) {
-    // version 3.0: return Status::SemanticError("No YIELD Clause");
-    // compatible with previous versions
+    // TODO: compatible with previous version, this will be deprecated in version 3.0.
     auto *yieldColumns = new YieldColumns();
     auto *vertex = new YieldColumn(VertexExpression::make(pool), "vertices_");
     yieldColumns->addColumn(vertex);

diff --git a/src/graph/validator/MatchValidator.cpp b/src/graph/validator/MatchValidator.cpp
@@ -353,6 +353,10 @@ Status MatchValidator::validateReturn(MatchReturn *ret,
   }
   if (ret->returnItems()->columns()) {
     for (auto *column : ret->returnItems()->columns()->columns()) {
+      if (ExpressionUtils::hasAny(column->expr(),
+                                  {Expression::Kind::kVertex, Expression::Kind::kEdge})) {
+        return Status::SemanticError("illegal return clause `%s'", column->toString().c_str());
+      }
       columns->addColumn(column->clone().release());
     }
   }

diff --git a/src/graph/validator/test/MatchValidatorTest.cpp b/src/graph/validator/test/MatchValidatorTest.cpp
@@ -611,6 +611,26 @@ TEST_F(MatchValidatorTest, validateAlias) {
     EXPECT_EQ(std::string(result.message()),
               "SemanticError: Path `p' does not have the type attribute");
   }
+  {
+    std::string query = "MATCH  (v:person) return id(vertex)";
+    auto result = checkResult(query);
+    EXPECT_EQ(std::string(result.message()), "SemanticError: illegal return clause `id(VERTEX)'");
+  }
+  {
+    std::string query = "MATCH  (v:person) return vertex as a";
+    auto result = checkResult(query);
+    EXPECT_EQ(std::string(result.message()), "SemanticError: illegal return clause `VERTEX AS a'");
+  }
+  {
+    std::string query = "MATCH  (v:person)-[e]-(v2) return src(edge)";
+    auto result = checkResult(query);
+    EXPECT_EQ(std::string(result.message()), "SemanticError: illegal return clause `src(EDGE)'");
+  }
+  {
+    std::string query = "MATCH  (v:person)-[e]-(v2) return edge as b";
+    auto result = checkResult(query);
+    EXPECT_EQ(std::string(result.message()), "SemanticError: illegal return clause `EDGE AS b'");
+  }
 }
 
 }  // namespace graph

diff --git a/src/graph/validator/test/QueryValidatorTest.cpp b/src/graph/validator/test/QueryValidatorTest.cpp
@@ -950,6 +950,12 @@ TEST_F(QueryValidatorTest, GoInvalid) {
     auto result = checkResult(query);
     EXPECT_EQ(std::string(result.message()), "SemanticError: Duplicate Column Name : `id'");
   }
+  {
+    std::string query = "GO FROM id(vertex) OVER * ";
+    auto result = checkResult(query);
+    EXPECT_EQ(std::string(result.message()),
+              "SemanticError: `id(VERTEX)' is not an evaluable expression.");
+  }
 }
 
 TEST_F(QueryValidatorTest, Limit) {