fix fetch vertex properties(vertex) bug (#3120)

* fix fetch vertex properties(vertex) bug

* address comment

Co-authored-by: Yee <2520865+yixinglu@users.noreply.github.com>

src/graph/validator/FetchVerticesValidator.cpp

@@ -26,21 +26,6 @@ Status FetchVerticesValidator::validateImpl() {
  return Status::OK();
 }
 
-Expression *FetchVerticesValidator::rewriteIDVertex2Vid(const Expression *expr) {
- auto *pool = qctx_->objPool();
- auto matcher = [](const Expression *e) -> bool {
- std::string lowerStr = e->toString();
- folly::toLowerAscii(lowerStr);
- return e->kind() == Expression::Kind::kFunctionCall && lowerStr == "id(vertex)";
- };
- auto rewriter = [pool](const Expression *e) -> Expression * {
- UNUSED(e);
- return InputPropertyExpression::make(pool, nebula::kVid);
- };
-
- return RewriteVisitor::transform(expr, std::move(matcher), std::move(rewriter));
-}
-
 Status FetchVerticesValidator::validateTag(const NameLabelList *nameLabels) {
  if (nameLabels == nullptr) {
  // all tag
@@ -89,27 +74,24 @@ Status FetchVerticesValidator::validateYield(YieldClause *yield) {
  }
 
  auto &exprProps = fetchCtx_->exprProps;
- for (const auto &col : yield->columns()) {
- if (col->expr()->kind() == Expression::Kind::kVertex) {
- extractVertexProp(exprProps);
- break;
- }
- }
-
  for (auto col : yield->columns()) {
  if (ExpressionUtils::hasAny(col->expr(),
  {Expression::Kind::kEdge, Expression::Kind::kPathBuild})) {
  return Status::SemanticError("illegal yield clauses `%s'", col->toString().c_str());
  }
  col->setExpr(ExpressionUtils::rewriteLabelAttr2TagProp(col->expr()));
  NG_RETURN_IF_ERROR(ValidateUtil::invalidLabelIdentifiers(col->expr()));
+
  auto colExpr = col->expr();
  auto typeStatus = deduceExprType(colExpr);
  NG_RETURN_IF_ERROR(typeStatus);
  outputs_.emplace_back(col->name(), typeStatus.value());
- if (colExpr->kind() == Expression::Kind::kFunctionCall) {
+ if (colExpr->toString() == "id(VERTEX)") {
  col->setAlias(col->name());
- col->setExpr(rewriteIDVertex2Vid(colExpr));
+ col->setExpr(InputPropertyExpression::make(pool, nebula::kVid));
+ }
+ if (ExpressionUtils::hasAny(colExpr, {Expression::Kind::kVertex})) {
+ extractVertexProp(exprProps);
  }
  newCols->addColumn(col->clone().release());
 

src/graph/validator/FetchVerticesValidator.h

@@ -30,8 +30,6 @@ class FetchVerticesValidator final : public Validator {
 
  void extractVertexProp(ExpressionProps& exprProps);
 
- Expression* rewriteIDVertex2Vid(const Expression* expr);
-
  private:
  std::map<TagID, std::shared_ptr<const meta::SchemaProviderIf>> tagsSchema_;
 

tests/tck/features/fetch/FetchVertices.intVid.feature

@@ -402,3 +402,17 @@ Feature: Fetch Int Vid Vertices
  Then the result should be, in any order, and the columns 0, 2 should be hashed:
  | VertexID | player.name | id(VERTEX) |
  | "Boris Diaw" | "Boris Diaw" | "Boris Diaw" |
+ When executing query:
+ """
+ FETCH PROP ON player hash('Tim Duncan') YIELD id(vertex), properties(vertex).name as name, properties(vertex)
+ """
+ Then the result should be, in any order, and the columns 0, 1 should be hashed:
+ | VertexID | id(VERTEX) | name | properties(VERTEX) |
+ | "Tim Duncan" | "Tim Duncan" | "Tim Duncan" | {age: 42, name: "Tim Duncan"} |
+ When executing query:
+ """
+ FETCH PROP ON * hash('Tim Duncan') YIELD id(vertex), keys(vertex) as keys, tags(vertex) as tagss, properties(vertex) as props
+ """
+ Then the result should be, in any order, and the columns 0, 1 should be hashed:
+ | VertexID | id(VERTEX) | keys | tagss | props |
+ | "Tim Duncan" | "Tim Duncan" | ["age", "name", "speciality"] | ["bachelor", "player"] | {age: 42, name: "Tim Duncan", speciality: "psychology"} |

tests/tck/features/fetch/FetchVertices.strVid.feature

@@ -513,3 +513,17 @@ Feature: Fetch String Vertices
  Then the result should be, in any order:
  | VertexID | player.name | id(VERTEX) |
  | "Boris Diaw" | "Boris Diaw" | "Boris Diaw" |
+ When executing query:
+ """
+ FETCH PROP ON player 'Tim Duncan' YIELD id(vertex), properties(vertex).name as name, properties(vertex)
+ """
+ Then the result should be, in any order:
+ | VertexID | id(VERTEX) | name | properties(VERTEX) |
+ | "Tim Duncan" | "Tim Duncan" | "Tim Duncan" | {age: 42, name: "Tim Duncan"} |
+ When executing query:
+ """
+ FETCH PROP ON * 'Tim Duncan' YIELD id(vertex), keys(vertex) as keys, tags(vertex) as tagss, properties(vertex) as props
+ """
+ Then the result should be, in any order:
+ | VertexID | id(VERTEX) | keys | tagss | props |
+ | "Tim Duncan" | "Tim Duncan" | ["age", "name", "speciality"] | ["bachelor", "player"] | {age: 42, name: "Tim Duncan", speciality: "psychology"} |