address comment

vesoft-inc · Feb 6, 2023 · b3768cd · b3768cd
1 parent 18e213f
commit b3768cd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/graph/validator/MatchValidator.cpp b/src/graph/validator/MatchValidator.cpp
@@ -1294,13 +1294,13 @@ Status MatchValidator::validatePathInWhere(
 /*static*/ Status MatchValidator::buildRollUpPathInfo(const MatchPath *path, Path &pathInfo) {
   for (const auto &node : path->nodes()) {
     // The inner variable of expression will be replaced by anno variable
-    if (!node->alias().empty() && node->alias()[0] != '_') {
+    if (!node->anonymous()) {
       pathInfo.compareVariables.emplace_back(node->alias());
     }
   }
   for (const auto &edge : path->edges()) {
     const auto &edgeAlias = edge->alias();
-    if (!edgeAlias.empty() && edgeAlias.front() != '_') {
+    if (!edge->anonymous()) {
       if (edge->range()) {
         return Status::SemanticError(
             "Variable '%s` 's type is list. not support used in multiple patterns "

diff --git a/src/parser/MatchPath.h b/src/parser/MatchPath.h
@@ -115,6 +115,10 @@ class MatchEdge final {
     return range_.get();
   }
 
+  bool anonymous() const {
+    return alias_.empty() || alias_.front() == '_';
+  }
+
   std::string toString() const;
 
   MatchEdge clone() const {
@@ -233,6 +237,10 @@ class MatchNode final {
     return alias_;
   }
 
+  bool anonymous() const {
+    return alias_.empty() || alias_.front() == '_';
+  }
+
   const auto* labels() const {
     return labels_.get();
   }