Merge branch 'master' into fix_empty_equal

vesoft-inc · Mar 24, 2023 · 215c016 · 215c016
2 parents af4d809 + 2f5a57d
commit 215c016
Show file tree

Hide file tree

Showing 19 changed files with 42 additions and 253 deletions.
diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
@@ -41,7 +41,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '^1.16.7'
+          go-version: 'stable'
+          cache-dependency-path: nebula-console/go.sum
       - id: tag
         run: echo tagnum=${{ github.event.inputs.version }}
       - name: package

diff --git a/src/common/expression/CMakeLists.txt b/src/common/expression/CMakeLists.txt
@@ -32,6 +32,7 @@ nebula_add_library(
     ListComprehensionExpression.cpp
     ReduceExpression.cpp
     MatchPathPatternExpression.cpp
+    ExprVisitorImpl.cpp
 )
 
 nebula_add_subdirectory(test)
diff --git a/src/graph/visitor/ExprVisitorImpl.cpp → src/common/expression/ExprVisitorImpl.cpp b/src/graph/visitor/ExprVisitorImpl.cpp → src/common/expression/ExprVisitorImpl.cpp
@@ -1,12 +1,11 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
+/* Copyright (c) 2023 vesoft inc. All rights reserved.
  *
  * This source code is licensed under Apache 2.0 License.
  */
 
-#include "graph/visitor/ExprVisitorImpl.h"
+#include "common/expression/ExprVisitorImpl.h"
 
 namespace nebula {
-namespace graph {
 
 void ExprVisitorImpl::visit(UnaryExpression *expr) {
   DCHECK(ok()) << expr->toString();
@@ -210,5 +209,4 @@ void ExprVisitorImpl::visit(MatchPathPatternExpression *expr) {
   }
 }
 
-}  // namespace graph
 }  // namespace nebula
diff --git a/src/graph/visitor/ExprVisitorImpl.h → src/common/expression/ExprVisitorImpl.h b/src/graph/visitor/ExprVisitorImpl.h → src/common/expression/ExprVisitorImpl.h
@@ -1,18 +1,34 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
+/* Copyright (c) 2023 vesoft inc. All rights reserved.
  *
  * This source code is licensed under Apache 2.0 License.
  */
 
-#ifndef GRAPH_VISITOR_EXPRVISITORIMPL_H_
-#define GRAPH_VISITOR_EXPRVISITORIMPL_H_
+#ifndef COMMON_VISITOR_EXPRVISITORIMPL_H_
+#define COMMON_VISITOR_EXPRVISITORIMPL_H_
 
+#include "common/expression/ColumnExpression.h"
 #include "common/expression/ExprVisitor.h"
+#include "common/expression/PropertyExpression.h"
+#include "common/expression/VertexExpression.h"
 
 namespace nebula {
-namespace graph {
 
 class ExprVisitorImpl : public ExprVisitor {
  public:
+  // leaf expression nodes
+  void visit(ConstantExpression *) override {}
+  void visit(LabelExpression *) override{};
+  void visit(UUIDExpression *) override{};
+  void visit(VariableExpression *) override{};
+  void visit(VersionedVariableExpression *) override{};
+  void visit(InputPropertyExpression *) override{};
+  void visit(VariablePropertyExpression *) override{};
+  void visit(DestPropertyExpression *) override{};
+  void visit(SourcePropertyExpression *) override{};
+  void visit(VertexExpression *) override{};
+  void visit(EdgeExpression *) override{};
+  void visit(ColumnExpression *) override{};
+  // unary expression
   void visit(UnaryExpression *expr) override;
   void visit(TypeCastingExpression *expr) override;
   void visit(LabelAttributeExpression *expr) override;
@@ -48,10 +64,11 @@ class ExprVisitorImpl : public ExprVisitor {
   using ExprVisitor::visit;
 
   virtual void visitBinaryExpr(BinaryExpression *expr);
-  virtual bool ok() const = 0;
+  virtual bool ok() const {
+    return true;
+  }
 };
 
-}  // namespace graph
 }  // namespace nebula
 
-#endif  // GRAPH_VISITOR_EXPRVISITORIMPL_H_
+#endif  // COMMON_VISITOR_EXPRVISITORIMPL_H_
diff --git a/src/graph/visitor/CMakeLists.txt b/src/graph/visitor/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 nebula_add_library(
     expr_visitor_obj OBJECT
-    ExprVisitorImpl.cpp
     DeducePropsVisitor.cpp
     PropertyTrackerVisitor.cpp
     DeduceTypeVisitor.cpp

diff --git a/src/graph/visitor/DeducePropsVisitor.h b/src/graph/visitor/DeducePropsVisitor.h
@@ -7,8 +7,8 @@
 #define GRAPH_VISITOR_DEDUCEPROPSVISITOR_H_
 
 #include "common/base/Status.h"
+#include "common/expression/ExprVisitorImpl.h"
 #include "common/thrift/ThriftTypes.h"
-#include "graph/visitor/ExprVisitorImpl.h"
 
 namespace nebula {
 

diff --git a/src/graph/visitor/EvaluableExprVisitor.h b/src/graph/visitor/EvaluableExprVisitor.h
@@ -6,7 +6,7 @@
 #ifndef GRAPH_VISITOR_EVALUABLEEXPRVISITOR_H_
 #define GRAPH_VISITOR_EVALUABLEEXPRVISITOR_H_
 
-#include "graph/visitor/ExprVisitorImpl.h"
+#include "common/expression/ExprVisitorImpl.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/visitor/ExtractFilterExprVisitor.h b/src/graph/visitor/ExtractFilterExprVisitor.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "graph/visitor/ExprVisitorImpl.h"
+#include "common/expression/ExprVisitorImpl.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/visitor/ExtractGroupSuiteVisitor.h b/src/graph/visitor/ExtractGroupSuiteVisitor.h
@@ -6,8 +6,8 @@
 #ifndef GRAPH_VISITOR_EXTRACTGROUPSUITEVISITOR_H_
 #define GRAPH_VISITOR_EXTRACTGROUPSUITEVISITOR_H_
 
+#include "common/expression/ExprVisitorImpl.h"
 #include "graph/context/ast/CypherAstContext.h"
-#include "graph/visitor/ExprVisitorImpl.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/visitor/ExtractPropExprVisitor.h b/src/graph/visitor/ExtractPropExprVisitor.h
@@ -5,8 +5,8 @@
 #ifndef GRAPH_VISITOR_EXTRACTPROPEXPRVISITOR_H_
 #define GRAPH_VISITOR_EXTRACTPROPEXPRVISITOR_H_
 
+#include "common/expression/ExprVisitorImpl.h"
 #include "graph/context/ValidateContext.h"
-#include "graph/visitor/ExprVisitorImpl.h"
 #include "parser/Clauses.h"
 
 namespace nebula {

diff --git a/src/graph/visitor/FindVisitor.h b/src/graph/visitor/FindVisitor.h
@@ -6,8 +6,8 @@
 #ifndef GRAPH_VISITOR_FINDVISITOR_H_
 #define GRAPH_VISITOR_FINDVISITOR_H_
 
+#include "common/expression/ExprVisitorImpl.h"
 #include "common/expression/Expression.h"
-#include "graph/visitor/ExprVisitorImpl.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/visitor/PropertyTrackerVisitor.h b/src/graph/visitor/PropertyTrackerVisitor.h
@@ -7,8 +7,8 @@
 #define GRAPH_VISITOR_PROPERTYTRACKERVISITOR_H
 
 #include "common/base/Status.h"
+#include "common/expression/ExprVisitorImpl.h"
 #include "common/thrift/ThriftTypes.h"
-#include "graph/visitor/ExprVisitorImpl.h"
 
 namespace nebula {
 

diff --git a/src/graph/visitor/RewriteVisitor.h b/src/graph/visitor/RewriteVisitor.h
@@ -8,7 +8,7 @@
 
 #include <functional>
 
-#include "graph/visitor/ExprVisitorImpl.h"
+#include "common/expression/ExprVisitorImpl.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/visitor/ValidatePatternExpressionVisitor.cpp b/src/graph/visitor/ValidatePatternExpressionVisitor.cpp
@@ -3,7 +3,7 @@
 // This source code is licensed under Apache 2.0 License.
 #include "graph/visitor/ValidatePatternExpressionVisitor.h"
 
-#include "ExprVisitorImpl.h"
+#include "common/expression/ExprVisitorImpl.h"
 #include "graph/context/ValidateContext.h"
 
 namespace nebula {

diff --git a/src/graph/visitor/ValidatePatternExpressionVisitor.h b/src/graph/visitor/ValidatePatternExpressionVisitor.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
+#include "common/expression/ExprVisitorImpl.h"
 #include "common/expression/Expression.h"
-#include "graph/visitor/ExprVisitorImpl.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt
@@ -34,7 +34,6 @@ nebula_add_library(
 nebula_add_library(
     graph_storage_service_handler OBJECT
     GraphStorageServiceHandler.cpp
-    ExprVisitorBase.cpp
     context/StorageExpressionContext.cpp
     mutate/AddVerticesProcessor.cpp
     mutate/DeleteVerticesProcessor.cpp

diff --git a/src/storage/ExprVisitorBase.cpp b/src/storage/ExprVisitorBase.cpp