Merge branch 'master' into adjust-get-neighbor-plan

vesoft-inc · Dec 25, 2021 · f7b8726 · f7b8726
2 parents 7f533b5 + 5c9d3a4
commit f7b8726
Show file tree

Hide file tree

Showing 849 changed files with 25,052 additions and 10,695 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/pull_request_template.md b/.github/pull_request_template.md
@@ -12,16 +12,16 @@
 #### Special notes for your reviewer, ex. impact of this fix, etc:
 
 
-#### Additional context:
+#### Additional context/ Design document:
 
 
-#### Checklist：
-- [ ] Documentation affected （Please add the label if documentation needs to be modified.)
-- [ ] Incompatible （If it is incompatible, please describe it and add corresponding label.）
-- [ ] Need to cherry-pick （If need to cherry-pick to some branches, please label the destination version(s).)
+#### Checklist:
+- [ ] Documentation affected (Please add the label if documentation needs to be modified.)
+- [ ] Incompatibility (If it breaks the compatibility, please describe it and add the corresponding label.）
+- [ ] If it's needed to cherry-pick (If cherry-pick to some branches is required, please label the destination version(s).)
 - [ ] Performance impacted: Consumes more CPU/Memory
 
+#### Release notes:
 
-#### Release notes：
-Please confirm whether to reflect in release notes and how to describe:
+Please confirm whether to be reflected in release notes and how to describe:
 >                                                                 `
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/.linters/cpp/checkKeyword.py b/.linters/cpp/checkKeyword.py
@@ -111,6 +111,10 @@
     'KW_EXPLAIN',
     'KW_UNWIND',
     'KW_CASE',
+    'KW_HOSTS',
+    'KW_ZONE',
+    'KW_ZONES',
+    'KW_RENAME',
 ]
 
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,6 +26,8 @@ project("Nebula Graph" C CXX)
 option(ENABLE_PACK_ONE "Whether to package into one" ON)
 option(ENABLE_VERBOSE_BISON "Enable Bison to report state" OFF)
 option(ENABLE_PACKAGE_TAR "Enable package artifacts to tar." OFF)
+option(ENABLE_CREATE_GIT_HOOKS "Enable create git hooks." ON)
+option(ENABLE_INCLUDE_WHAT_YOU_USE "Enable include-what-you-use find  nouse include files" OFF)
 
 add_definitions(-DNEBULA_HOME=${CMAKE_SOURCE_DIR})
 
@@ -44,6 +46,7 @@ include(SanitizerConfig)
 include(GitHooksConfig)
 include(GitInfoConfig)
 include(NebulaCustomTargets)
+include(IncludeWhatYouUse)
 
 add_custom_target(
   clang-format
@@ -79,6 +82,7 @@ macro(nebula_add_library name type)
         # hbase_thrift_generator
         parser_target
         wkt_parser_target
+        datetime_parser_target
     )
 endmacro()
 

diff --git a/README-CN.md b/README-CN.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://nebula-graph.io/img/nav-nebula-logo.png"/>
+  <img src="https://nebula-website-cn.oss-cn-hangzhou.aliyuncs.com/nebula-website/images/nebulagraph-logo.png"/>
   <br>中文 | <a href="README.md">English</a>
   <br>世界上唯一能够容纳千亿个顶点和万亿条边，并提供毫秒级查询延时的图数据库解决方案<br>
 </p>

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://nebula-graph.io/img/nav-nebula-logo.png"/>
+  <img src="https://nebula-website-cn.oss-cn-hangzhou.aliyuncs.com/nebula-website/images/nebulagraph-logo.png"/>
   <br> English | <a href="README-CN.md">中文</a>
   <br>A distributed, scalable, lightning-fast graph database<br>
 </p>

diff --git a/cmake/nebula/GitHooksConfig.cmake b/cmake/nebula/GitHooksConfig.cmake
@@ -1,4 +1,4 @@
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/")
+if(ENABLE_CREATE_GIT_HOOKS AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/")
     # Create the pre-commit hook every time we run cmake
     message(STATUS "Create the pre-commit hook")
     set(PRE_COMMIT_HOOK ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks/pre-commit)

diff --git a/cmake/nebula/IncludeWhatYouUse.cmake b/cmake/nebula/IncludeWhatYouUse.cmake
@@ -0,0 +1,10 @@
+if(ENABLE_INCLUDE_WHAT_YOU_USE)
+  find_program(INCLUDE_WHAT_YOU_USE include-what-you-use)
+  if(INCLUDE_WHAT_YOU_USE)
+    message("use include-what-you-use")
+    set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "include-what-you-use;-Xiwyu;--transitive_includes_only")
+  else()
+    message(STATUS "iwyu requested but executable not found")
+  endif()
+endif()
+
diff --git a/cmake/nebula/LinkerConfig.cmake b/cmake/nebula/LinkerConfig.cmake
@@ -1,21 +1,20 @@
-execute_process(
-    COMMAND
-        ld --version
-    COMMAND
-        head -1
-    COMMAND
-        cut -d " " -f2
-    OUTPUT_VARIABLE default_linker_type
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+set(NEBULA_USE_LINKER
+  "bfd"
+  CACHE STRING "Linker to be used")
+set(USER_LINKER_OPTION_VALUES "lld" "gold" "bfd")
+set_property(CACHE NEBULA_USE_LINKER PROPERTY STRINGS ${USER_LINKER_OPTION_VALUES})
+list(
+  FIND
+  USER_LINKER_OPTION_VALUES
+  ${NEBULA_USE_LINKER}
+  USER_LINKER_OPTION_INDEX)
 
-if ("${default_linker_type}" STREQUAL "ld")
-    set(default_linker_type "bfd")
+if(${USER_LINKER_OPTION_INDEX} EQUAL -1)
+  message(
+    STATUS
+    "Using custom linker: '${NEBULA_USE_LINKER}', explicitly supported entries are ${USER_LINKER_OPTION_VALUES}")
 endif()
 
-if (NOT DEFINED NEBULA_USE_LINKER)
-    set(NEBULA_USE_LINKER ${default_linker_type})
-endif()
 print_config(NEBULA_USE_LINKER)
 
 nebula_add_exe_linker_flag(-fuse-ld=${NEBULA_USE_LINKER})

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)