Merge branch 'master' into geo-spatial-data-and-index

vesoft-inc · Oct 20, 2021 · 66733c9 · 66733c9
2 parents 4674a48 + 4f48045
commit 66733c9
Show file tree

Hide file tree

Showing 28 changed files with 9 additions and 43 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -150,7 +150,10 @@ jobs:
       - name: coverage
         run: |
             ~/.local/bin/fastcov -d build -l -o fastcov.info -p --exclude /usr/include --exclude=/opt/vesoft --exclude scanner.lex
-            bash <(curl -s https://codecov.io/bash) -Z -f fastcov.info
+      - uses: codecov/codecov-action@v2
+        with:
+          files: fastcov.info
+          fail_ci_if_error: false
       - name: Upload logs
         uses: actions/upload-artifact@v2
         if: ${{ failure() }}

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -167,7 +167,11 @@ jobs:
         if: ${{ matrix.compiler == 'gcc-9.2' && matrix.os == 'ubuntu2004' }}
         run: |
             ~/.local/bin/fastcov -d build -l -o fastcov.info -p --exclude /usr/include --exclude=/opt/vesoft --exclude scanner.lex
-            bash <(curl -s https://codecov.io/bash) -Z -f fastcov.info
+      - uses: codecov/codecov-action@v2
+        if: ${{ matrix.compiler == 'gcc-9.2' && matrix.os == 'ubuntu2004' }}
+        with:
+          files: fastcov.info
+          fail_ci_if_error: false
       - name: Sanitizer
         if: ${{ always() }}
         run: |

diff --git a/src/graph/util/SchemaUtil.h b/src/graph/util/SchemaUtil.h
@@ -7,7 +7,6 @@
 #ifndef GRAPH_UTIL_SCHEMAUTIL_H_
 #define GRAPH_UTIL_SCHEMAUTIL_H_
 
-#include "common/base/Base.h"
 #include "common/base/StatusOr.h"
 #include "common/datatypes/DataSet.h"
 #include "common/expression/Expression.h"

diff --git a/src/graph/util/ToJson.h b/src/graph/util/ToJson.h
@@ -9,9 +9,7 @@
 #include <folly/dynamic.h>
 
 #include <iterator>
-#include <string>
 #include <utility>
-#include <vector>
 
 namespace nebula {
 

diff --git a/src/graph/util/ValidateUtil.h b/src/graph/util/ValidateUtil.h
@@ -6,7 +6,6 @@
 
 #ifndef GRAPH_UTIL_VALIDATE_UTIL_H_
 #define GRAPH_UTIL_VALIDATE_UTIL_H_
-#include "common/base/Base.h"
 #include "common/base/StatusOr.h"
 #include "common/expression/Expression.h"
 #include "parser/Clauses.h"

diff --git a/src/graph/validator/ACLValidator.cpp b/src/graph/validator/ACLValidator.cpp
@@ -6,11 +6,8 @@
 
 #include "graph/validator/ACLValidator.h"
 
-#include "clients/meta/MetaClient.h"
-#include "common/base/Base.h"
 #include "graph/planner/plan/Admin.h"
 #include "graph/service/PermissionManager.h"
-#include "graph/util/SchemaUtil.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/validator/ACLValidator.h b/src/graph/validator/ACLValidator.h
@@ -7,7 +7,6 @@
 #ifndef GRAPH_VALIDATOR_ACLVALIDATOR_H_
 #define GRAPH_VALIDATOR_ACLVALIDATOR_H_
 
-#include "common/base/Base.h"
 #include "graph/validator/Validator.h"
 #include "parser/UserSentences.h"
 

diff --git a/src/graph/validator/AdminValidator.cpp b/src/graph/validator/AdminValidator.cpp
@@ -8,14 +8,10 @@
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
 
-#include "common/base/Base.h"
 #include "common/charset/Charset.h"
 #include "graph/planner/plan/Admin.h"
 #include "graph/planner/plan/Query.h"
 #include "graph/service/GraphFlags.h"
-#include "graph/util/ExpressionUtils.h"
-#include "graph/util/SchemaUtil.h"
-#include "interface/gen-cpp2/meta_types.h"
 #include "parser/MaintainSentences.h"
 
 namespace nebula {

diff --git a/src/graph/validator/AdminValidator.h b/src/graph/validator/AdminValidator.h
@@ -8,7 +8,6 @@
 #define GRAPH_VALIDATOR_ADMINVALIDATOR_H_
 
 #include "clients/meta/MetaClient.h"
-#include "common/base/Base.h"
 #include "common/plugin/fulltext/elasticsearch/ESGraphAdapter.h"
 #include "graph/validator/Validator.h"
 #include "parser/AdminSentences.h"

diff --git a/src/graph/validator/BalanceValidator.cpp b/src/graph/validator/BalanceValidator.cpp
@@ -5,8 +5,6 @@
  */
 
 #include "graph/validator/BalanceValidator.h"
-
-#include "common/base/Base.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {

diff --git a/src/graph/validator/DownloadValidator.cpp b/src/graph/validator/DownloadValidator.cpp
@@ -6,7 +6,6 @@
 
 #include "graph/validator/DownloadValidator.h"
 
-#include "common/base/Base.h"
 #include "graph/planner/plan/Admin.h"
 #include "parser/MutateSentences.h"
 

diff --git a/src/graph/validator/DownloadValidator.h b/src/graph/validator/DownloadValidator.h
@@ -7,7 +7,6 @@
 #ifndef GRAPH_VALIDATOR_DOWNLOADVALIDATOR_H_
 #define GRAPH_VALIDATOR_DOWNLOADVALIDATOR_H_
 
-#include "common/base/Base.h"
 #include "graph/validator/Validator.h"
 #include "parser/AdminSentences.h"
 

diff --git a/src/graph/validator/FindPathValidator.h b/src/graph/validator/FindPathValidator.h
@@ -7,7 +7,6 @@
 #ifndef GRAPH_VALIDATOR_FINDPATHVALIDATOR_H_
 #define GRAPH_VALIDATOR_FINDPATHVALIDATOR_H_
 
-#include "common/base/Base.h"
 #include "graph/context/ast/QueryAstContext.h"
 #include "graph/validator/Validator.h"
 

diff --git a/src/graph/validator/GetSubgraphValidator.cpp b/src/graph/validator/GetSubgraphValidator.cpp
@@ -8,9 +8,6 @@
 
 #include <memory>
 
-#include "common/expression/UnaryExpression.h"
-#include "common/expression/VariableExpression.h"
-#include "common/expression/VertexExpression.h"
 #include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Logic.h"
 #include "graph/planner/plan/Query.h"

diff --git a/src/graph/validator/GoValidator.cpp b/src/graph/validator/GoValidator.cpp
@@ -6,7 +6,6 @@
 
 #include "graph/validator/GoValidator.h"
 
-#include "common/base/Base.h"
 #include "common/expression/VariableExpression.h"
 #include "graph/planner/plan/Logic.h"
 #include "graph/util/ExpressionUtils.h"

diff --git a/src/graph/validator/GroupByValidator.h b/src/graph/validator/GroupByValidator.h
@@ -7,7 +7,6 @@
 #ifndef GRAPH_VALIDATOR_GROUPBY_VALIDATOR_H_
 #define GRAPH_VALIDATOR_GROUPBY_VALIDATOR_H_
 
-#include "common/base/Base.h"
 #include "graph/planner/plan/Query.h"
 #include "graph/validator/Validator.h"
 

diff --git a/src/graph/validator/IngestValidator.cpp b/src/graph/validator/IngestValidator.cpp
@@ -5,10 +5,7 @@
  */
 
 #include "graph/validator/IngestValidator.h"
-
-#include "common/base/Base.h"
 #include "graph/planner/plan/Admin.h"
-#include "parser/MutateSentences.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/validator/IngestValidator.h b/src/graph/validator/IngestValidator.h
@@ -7,9 +7,7 @@
 #ifndef GRAPH_VALIDATOR_INGESTVALIDATOR_H_
 #define GRAPH_VALIDATOR_INGESTVALIDATOR_H_
 
-#include "common/base/Base.h"
 #include "graph/validator/Validator.h"
-#include "parser/AdminSentences.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/validator/LookupValidator.cpp b/src/graph/validator/LookupValidator.cpp
@@ -14,7 +14,6 @@
 #include "graph/util/FTIndexUtils.h"
 #include "graph/util/SchemaUtil.h"
 #include "graph/util/ValidateUtil.h"
-#include "interface/gen-cpp2/meta_types.h"
 #include "parser/TraverseSentences.h"
 
 using nebula::meta::NebulaSchemaProvider;

diff --git a/src/graph/validator/LookupValidator.h b/src/graph/validator/LookupValidator.h
@@ -6,9 +6,7 @@
 #ifndef _VALIDATOR_LOOKUP_VALIDATOR_H_
 #define _VALIDATOR_LOOKUP_VALIDATOR_H_
 
-#include "common/base/Base.h"
 #include "common/plugin/fulltext/elasticsearch/ESGraphAdapter.h"
-#include "graph/planner/plan/Query.h"
 #include "graph/validator/Validator.h"
 
 namespace nebula {

diff --git a/src/graph/validator/MaintainValidator.cpp b/src/graph/validator/MaintainValidator.cpp
@@ -6,7 +6,6 @@
 
 #include "graph/validator/MaintainValidator.h"
 
-#include "common/base/Base.h"
 #include "common/charset/Charset.h"
 #include "common/expression/ConstantExpression.h"
 #include "graph/planner/plan/Admin.h"

diff --git a/src/graph/validator/MaintainValidator.h b/src/graph/validator/MaintainValidator.h
@@ -11,7 +11,6 @@
 #include "graph/context/ast/QueryAstContext.h"
 #include "graph/validator/Validator.h"
 #include "parser/AdminSentences.h"
-#include "parser/MaintainSentences.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/validator/MatchValidator.h b/src/graph/validator/MatchValidator.h
@@ -7,7 +7,6 @@
 #ifndef GRAPH_VALIDATOR_MATCHVALIDATOR_H_
 #define GRAPH_VALIDATOR_MATCHVALIDATOR_H_
 
-#include "common/base/Base.h"
 #include "graph/context/ast/CypherAstContext.h"
 #include "graph/planner/plan/Query.h"
 #include "graph/util/AnonVarGenerator.h"

diff --git a/src/graph/validator/PipeValidator.h b/src/graph/validator/PipeValidator.h
@@ -7,7 +7,6 @@
 #ifndef GRAPH_VALIDATOR_PIPEVALIDATOR_H_
 #define GRAPH_VALIDATOR_PIPEVALIDATOR_H_
 
-#include "common/base/Base.h"
 #include "graph/validator/Validator.h"
 
 namespace nebula {

diff --git a/src/graph/validator/SequentialValidator.cpp b/src/graph/validator/SequentialValidator.cpp
@@ -6,7 +6,6 @@
 
 #include "graph/validator/SequentialValidator.h"
 
-#include "common/base/Base.h"
 #include "graph/planner/plan/Logic.h"
 #include "graph/planner/plan/Query.h"
 #include "graph/service/GraphFlags.h"

diff --git a/src/graph/validator/Validator.cpp b/src/graph/validator/Validator.cpp
@@ -38,7 +38,6 @@
 #include "graph/validator/SetValidator.h"
 #include "graph/validator/UseValidator.h"
 #include "graph/validator/YieldValidator.h"
-#include "graph/visitor/DeducePropsVisitor.h"
 #include "graph/visitor/DeduceTypeVisitor.h"
 #include "graph/visitor/EvaluableExprVisitor.h"
 #include "parser/Sentence.h"

diff --git a/src/graph/validator/YieldValidator.cpp b/src/graph/validator/YieldValidator.cpp
@@ -6,12 +6,10 @@
 
 #include "graph/validator/YieldValidator.h"
 
-#include "common/expression/Expression.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Query.h"
 #include "graph/util/ExpressionUtils.h"
 #include "graph/util/ValidateUtil.h"
-#include "parser/Clauses.h"
 #include "parser/TraverseSentences.h"
 
 namespace nebula {

diff --git a/src/graph/validator/YieldValidator.h b/src/graph/validator/YieldValidator.h
@@ -7,8 +7,6 @@
 #ifndef GRAPH_VALIDATOR_YIELDVALIDATOR_H_
 #define GRAPH_VALIDATOR_YIELDVALIDATOR_H_
 
-#include <vector>
-
 #include "common/base/Status.h"
 #include "graph/planner/plan/Query.h"
 #include "graph/validator/GroupByValidator.h"