support intersect/minus for cypher

vesoft-inc · Dec 28, 2022 · fbd0fca · fbd0fca
1 parent 7a7470a
commit fbd0fca
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/src/graph/context/ast/CypherAstContext.h b/src/graph/context/ast/CypherAstContext.h
@@ -158,7 +158,7 @@ struct YieldClauseContext final : CypherClauseContextBase {
   std::vector<Path> paths;
 
   bool distinct{false};
-  const YieldColumns* yieldColumns{nullptr};
+  YieldColumns* yieldColumns{nullptr};
 
   bool hasAgg_{false};
   bool needGenProject_{false};

diff --git a/src/graph/validator/MatchValidator.cpp b/src/graph/validator/MatchValidator.cpp
@@ -1063,13 +1063,17 @@ Status MatchValidator::checkAlias(
 
 // Validate yield columns.
 // Fill outputs of whole sentence.
-Status MatchValidator::buildOutputs(const YieldColumns *yields) {
+Status MatchValidator::buildOutputs(YieldColumns *yields) {
   for (auto *col : yields->columns()) {
     auto colName = col->name();
     auto typeStatus = deduceExprType(col->expr());
     NG_RETURN_IF_ERROR(typeStatus);
     auto type = typeStatus.value();
     outputs_.emplace_back(colName, type);
+
+    auto foldStatus = ExpressionUtils::foldConstantExpr(col->expr());
+    NG_RETURN_IF_ERROR(foldStatus);
+    col->setExpr(foldStatus.value());
   }
   return Status::OK();
 }

diff --git a/src/graph/validator/MatchValidator.h b/src/graph/validator/MatchValidator.h
@@ -87,7 +87,7 @@ class MatchValidator final : public Validator {
   Status checkAlias(const Expression *refExpr,
                     const std::unordered_map<std::string, AliasType> &aliasesAvailable) const;
 
-  Status buildOutputs(const YieldColumns *yields);
+  Status buildOutputs(YieldColumns *yields);
 
   StatusOr<Expression *> makeEdgeSubFilter(MapExpression *map) const;
 

diff --git a/tests/tck/features/expression/Case.feature b/tests/tck/features/expression/Case.feature
@@ -298,7 +298,7 @@ Feature: Case Expression
   Scenario: Using the return value of case expr as an input
     When executing query:
       """
-      RETURN CASE WHEN true THEN "Tim Duncan" ELSE "ABC" END AS a | GO FROM $-.a OVER like YIELD like._dst;
+      YIELD CASE WHEN true THEN "Tim Duncan" ELSE "ABC" END AS a | GO FROM $-.a OVER like YIELD like._dst;
       """
     Then the result should be, in order:
       | like._dst       |

diff --git a/tests/tck/features/expression/function/Mathematical.feature b/tests/tck/features/expression/function/Mathematical.feature
@@ -3,6 +3,9 @@
 # This source code is licensed under Apache 2.0 License.
 Feature: Mathematical function Expression
 
+  Background:
+    Given a graph with space named "nba"
+
   Scenario: bit functions
     When executing query:
       """

diff --git a/tests/tck/features/function/coalesce.feature b/tests/tck/features/function/coalesce.feature
@@ -1,7 +1,10 @@
+# Copyright (c) 2022 vesoft inc. All rights reserved.
+#
+# This source code is licensed under Apache 2.0 License.
 Feature: Coalesce Function
 
   Background:
-    Test coalesce function
+    Given a graph with space named "nba"
 
   Scenario: test normal case
     When executing query:

diff --git a/tests/tck/features/yield/return.feature b/tests/tck/features/yield/return.feature
@@ -4,7 +4,7 @@
 Feature: Return
 
   Background:
-    Given an empty graph
+    Given a graph with space named "nba"
 
   Scenario: base
     When executing query:
@@ -79,4 +79,4 @@ Feature: Return
       """
       RETURN name
       """
-    Then a SemanticError should be raised at runtime: Invalid label identifiers: name
+    Then a SemanticError should be raised at runtime: Alias used but not defined: `name'