Merge branch 'master' into ci-improvements

vesoft-inc · Nov 22, 2021 · cb5f8e5 · cb5f8e5
2 parents 6f46a2c + c50145d
commit cb5f8e5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/graph/planner/match/MatchClausePlanner.cpp b/src/graph/planner/match/MatchClausePlanner.cpp
@@ -45,14 +45,12 @@ static Expression* genVertexFilter(const NodeInfo& node) { return node.filter; }
 
 static Expression* genEdgeFilter(const EdgeInfo& edge) { return edge.filter; }
 
-static std::unique_ptr<std::vector<VertexProp>> genVertexProps(const NodeInfo& node,
-                                                               QueryContext* qctx,
-                                                               GraphSpaceID spaceId) {
+static StatusOr<std::unique_ptr<std::vector<VertexProp>>> genVertexProps(const NodeInfo& node,
+                                                                         QueryContext* qctx,
+                                                                         GraphSpaceID spaceId) {
   // TODO
   UNUSED(node);
-  UNUSED(qctx);
-  UNUSED(spaceId);
-  return std::make_unique<std::vector<VertexProp>>();
+  return SchemaUtil::getAllVertexProp(qctx, spaceId, true);
 }
 
 static std::unique_ptr<std::vector<storage::cpp2::EdgeProp>> genEdgeProps(const EdgeInfo& edge,
@@ -239,7 +237,9 @@ Status MatchClausePlanner::leftExpandFromNode(const std::vector<NodeInfo>& nodeI
     auto& edge = edgeInfos[i - 1];
     auto traverse = Traverse::make(qctx, subplan.root, spaceId);
     traverse->setSrc(nextTraverseStart);
-    traverse->setVertexProps(genVertexProps(node, qctx, spaceId));
+    auto vertexProps = genVertexProps(node, qctx, spaceId);
+    NG_RETURN_IF_ERROR(vertexProps);
+    traverse->setVertexProps(std::move(vertexProps).value());
     traverse->setEdgeProps(genEdgeProps(edge, reversely, qctx, spaceId));
     traverse->setVertexFilter(genVertexFilter(node));
     traverse->setEdgeFilter(genEdgeFilter(edge));
@@ -283,7 +283,9 @@ Status MatchClausePlanner::rightExpandFromNode(const std::vector<NodeInfo>& node
     auto& edge = edgeInfos[i];
     auto traverse = Traverse::make(qctx, subplan.root, spaceId);
     traverse->setSrc(nextTraverseStart);
-    traverse->setVertexProps(genVertexProps(node, qctx, spaceId));
+    auto vertexProps = genVertexProps(node, qctx, spaceId);
+    NG_RETURN_IF_ERROR(vertexProps);
+    traverse->setVertexProps(std::move(vertexProps).value());
     traverse->setEdgeProps(genEdgeProps(edge, reversely, qctx, spaceId));
     traverse->setVertexFilter(genVertexFilter(node));
     traverse->setEdgeFilter(genEdgeFilter(edge));

diff --git a/src/graph/validator/MatchValidator.cpp b/src/graph/validator/MatchValidator.cpp
@@ -551,12 +551,9 @@ StatusOr<Expression *> MatchValidator::makeNodeSubFilter(const MapExpression *ma
   auto *pool = qctx_->objPool();
   // Node has tag without property
   if (!label.empty() && map == nullptr) {
-    auto *left = ConstantExpression::make(pool, label);
-
-    auto *args = ArgumentList::make(pool);
-    args->addArgument(VertexExpression::make(pool));
-    auto *right = FunctionCallExpression::make(pool, "tags", args);
-    Expression *root = RelationalExpression::makeIn(pool, left, right);
+    // label._tag IS NOT EMPTY
+    auto *tagExpr = TagPropertyExpression::make(pool, label, kTag);
+    auto *root = UnaryExpression::makeIsNotEmpty(pool, tagExpr);
 
     return root;
   }