Merge branch 'master' into fix-format

vesoft-inc · Dec 25, 2021 · 3e970c3 · 3e970c3
2 parents 63f0357 + 3f2ac1d
commit 3e970c3
Show file tree

Hide file tree

Showing 656 changed files with 13,851 additions and 7,945 deletions.
diff --git a/.clang-format b/.clang-format
@@ -22,7 +22,7 @@ AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
+AllowShortFunctionsOnASingleLine: Empty
 AllowShortLambdasOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: WithoutElse
 AllowShortLoopsOnASingleLine: true

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -59,7 +59,7 @@ jobs:
           - centos7
           - ubuntu2004
         compiler:
-          - gcc-9.2
+          - gcc-9.3
           - clang-10
         exclude:
           - os: centos7
@@ -91,21 +91,23 @@ jobs:
             centos7)
               # build with Release type
               cmake \
-                  -DCMAKE_CXX_COMPILER=$TOOLSET_CLANG_DIR/bin/g++ \
-                  -DCMAKE_C_COMPILER=$TOOLSET_CLANG_DIR/bin/gcc \
+                  -DCMAKE_CXX_COMPILER=$TOOLSET_GCC_DIR/bin/g++ \
+                  -DCMAKE_C_COMPILER=$TOOLSET_GCC_DIR/bin/gcc \
                   -DCMAKE_BUILD_TYPE=Release \
                   -DENABLE_TESTING=on \
+                  -GNinja \
                   -B build
               echo "::set-output name=j::10"
               ;;
             ubuntu2004)
               # build with Debug type
               cmake \
-                  -DCMAKE_CXX_COMPILER=$TOOLSET_CLANG_DIR/bin/g++ \
-                  -DCMAKE_C_COMPILER=$TOOLSET_CLANG_DIR/bin/gcc \
+                  -DCMAKE_CXX_COMPILER=$TOOLSET_GCC_DIR/bin/g++ \
+                  -DCMAKE_C_COMPILER=$TOOLSET_GCC_DIR/bin/gcc \
                   -DCMAKE_BUILD_TYPE=Debug \
                   -DENABLE_TESTING=on \
                   -DENABLE_COVERAGE=on \
+                  -GNinja \
                   -B build
               echo "::set-output name=j::10"
               ;;
@@ -119,15 +121,17 @@ jobs:
                 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                 -DENABLE_ASAN=on \
                 -DENABLE_TESTING=on \
+                -GNinja \
                 -B build
             echo "::set-output name=j::6"
             ;;
           esac
       - name: Make
         run: |
           ccache -z
-          cmake --build build/ -j $(nproc)
+          ninja -j $(nproc)
           ccache -s
+        working-directory: build/
       - name: CTest
         env:
           ASAN_OPTIONS: fast_unwind_on_malloc=1

diff --git a/cmake/nebula/ThirdPartyConfig.cmake b/cmake/nebula/ThirdPartyConfig.cmake
@@ -6,7 +6,7 @@ message(">>>> Configuring third party for '${PROJECT_NAME}' <<<<")
 #   4. /opt/vesoft/third-party, if exists
 #   5. At last, one copy will be downloaded and installed to ${CMAKE_BINARY_DIR}/third-party/install
 
-set(NEBULA_THIRDPARTY_VERSION "2.0")
+set(NEBULA_THIRDPARTY_VERSION "3.0")
 
 if(${DISABLE_CXX11_ABI})
     SET(NEBULA_THIRDPARTY_ROOT ${CMAKE_BINARY_DIR}/third-party-98/install)
@@ -116,7 +116,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L ${NEBULA_THIRDPARTY_ROO
 # All thrift libraries
 set(THRIFT_LIBRARIES
     thriftcpp2
-    rocketupgrade
     async
     thriftprotocol
     transport

diff --git a/conf/nebula-graphd.conf.default b/conf/nebula-graphd.conf.default
@@ -86,3 +86,5 @@
 ########## experimental feature ##########
 # if use experimental features
 --enable_experimental_feature=false
+
+--enable_space_level_metrics=false
diff --git a/conf/nebula-graphd.conf.production b/conf/nebula-graphd.conf.production
@@ -84,3 +84,5 @@
 ########## experimental feature ##########
 # if use experimental features
 --enable_experimental_feature=false
+
+--enable_space_level_metrics=false
diff --git a/src/clients/meta/CMakeLists.txt b/src/clients/meta/CMakeLists.txt
@@ -12,4 +12,5 @@ nebula_add_library(
     FileBasedClusterIdMan.cpp
 )
 
+nebula_add_subdirectory(stats)
 nebula_add_subdirectory(test)