fix: list rename cmd

.clang-tidy

@@ -58,8 +58,8 @@ Checks:     '
 #   - { key: readability-identifier-naming.VariableCase,        value: lower_case }
 
 WarningsAsErrors: '*'
-# HeaderFilterRegex: '(|/src|/src/net|/src/pstd|/src/storage)/include'
-# HeaderFilterRegex: '/src/(net|storage|pstd)/include'
+# HeaderFilterRegex: '(|/src|/src/net|/src/std|/src/storage)/include'
+# HeaderFilterRegex: '/src/(net|storage|std)/include'
 
 #### Disabled checks and why: #####
 #

.github/workflows/import_braft.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
-        run: bash ./etc/script/ci/build.sh
+        run: cmake -S . -B build
 
       - name: Check Format
         working-directory: ${{ github.workspace }}/build

.github/workflows/pikiwidb.yml → .github/workflows/kiwidb.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "unstable" ]
   pull_request:
-    branches: [ "unstable" ]
+    branches: [ "*" ]
 
 env:
   BUILD_DIR: cmake-build-release
@@ -17,7 +17,21 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
-        run: bash ./etc/script/ci/build.sh
+        run: cmake -S . -B build
+
+      - name: Add LLVM apt repository
+        run: |
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+          echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          sudo apt update
+
+      - name: Install clang-format-18
+        run: |
+          sudo apt install -y clang-format-18
+          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-18 200
+
+      - name: Verify clang-format version
+        run: clang-format --version
 
       - name: Check Format
         working-directory: ${{ github.workspace }}/build
@@ -26,43 +40,33 @@ jobs:
   build_on_macos:
     runs-on: macos-14
     needs: check_format
-    env:
-      CMAKE_C_COMPILER_LAUNCHER: "ccache"
-      CMAKE_CXX_COMPILER_LAUNCHER: "ccache"
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
           brew update
-          brew install ccache
           brew install autoconf
           brew install go
 
-      - name: Configure ccache
-        run: |
-          ccache --set-config=cache_dir=$HOME/.ccache
-          ccache --max-size=10G
-
-      - name: Restore ccache
-        uses: actions/cache@v3
+      - name: Restore cache
+        uses: actions/cache@v4
         with:
-          path: ~/.ccache
-          key: ${{ runner.os }}-ccache-${{ hashFiles('**/*.cpp','**/*.cc','**/*.c', '**/*.h') }}-clang
+          path: |
+            ${{ github.workspace }}/download
+            ${{ github.workspace }}/build-release
+            ${{ github.workspace }}/deps-release
+          key: ${{ runner.os }}-cache-${{ hashFiles('**/CMakeLists.txt') }}-clang
           restore-keys: |
-            ${{ runner.os }}-ccache-
-            ccache-
+            ${{ runner.os }}-cache-
 
       - name: Build
         run: |
           export LIBRARY_PATH=$(xcrun --show-sdk-path)/usr/lib
           export DYLD_LIBRARY_PATH=$(xcrun --show-sdk-path)/usr/lib
           bash ./etc/script/build.sh --verbose
 
-      - name: Save ccache stats
-        run: ccache -s
-
       - name: GTest
         working-directory: ${{ github.workspace }}/${{ env.BUILD_DIR }}
         # Execute tests defined by the CMake configuration.
@@ -86,37 +90,25 @@ jobs:
   build_on_ubuntu:
     runs-on: ubuntu-latest
     needs: check_format
-    env:
-      CMAKE_C_COMPILER_LAUNCHER: "ccache"
-      CMAKE_CXX_COMPILER_LAUNCHER: "ccache"
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install dependencies
-        run: sudo apt-get install -y ccache
-
-      - name: Configure ccache
-        run: |
-          ccache --set-config=cache_dir=$HOME/.ccache
-          ccache --max-size=10G
-
       - name: Restore ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
-          path: ~/.ccache
-          key: ${{ runner.os }}-ccache-${{ hashFiles('**/*.cpp','**/*.cc','**/*.c', '**/*.h') }}-${{ matrix.compiler || 'gcc' }}
+          path: |
+            ${{ github.workspace }}/download
+            ${{ github.workspace }}/build-release
+            ${{ github.workspace }}/deps-release
+          key: ${{ runner.os }}-cache-${{ hashFiles('**/CMakeLists.txt') }}-gcc
           restore-keys: |
-            ${{ runner.os }}-ccache-
-            ccache-
+            ${{ runner.os }}-cache-
 
       - name: Build
         run: |
           bash ./etc/script/build.sh --verbose
 
-      - name: Save ccache stats
-        run: ccache -s
-
       - name: GTest
         working-directory: ${{ github.workspace }}/${{ env.BUILD_DIR }}
         # Execute tests defined by the CMake configuration.

.gitignore

@@ -19,6 +19,9 @@ download/
 CMakeFiles/
 CMakeCache.txt
 
+# clang-format
+temp.txt
+
 # Precompiled Headers
 *.gch
 *.pch

CMakeLists.txt

@@ -43,6 +43,9 @@ EXECUTE_PROCESS(
 MESSAGE(STATUS "GIT_COMMIT_HASH: ${GIT_COMMIT_HASH}")
 MESSAGE(STATUS "GIT_COMMIT_DATE: ${BUILD_DATE}")
 
+ADD_DEFINITIONS(-DKIWI_GIT_COMMIT_ID="${GIT_COMMIT_HASH}")
+ADD_DEFINITIONS(-DKIWI_BUILD_DATE="${BUILD_DATE}")
+
 IF(CMAKE_BUILD_TYPE STREQUAL "Release")
     MESSAGE("Building in Release mode")
 ELSE()
@@ -116,6 +119,18 @@ ELSE ()
     SET(LIB_SUFFIX "deps-debug")
 ENDIF ()
 
+IF(CMAKE_GENERATOR STREQUAL "Ninja")
+    MESSAGE(STATUS "Ninja generator is being used.")
+    SET (EXTERNAL_GENERATOR "-G Ninja")
+    SET (EXTERNAL_BUILD "ninja")
+elseif (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+    MESSAGE(STATUS "Unix Makefiles generator is being used.")
+    SET (EXTERNAL_GENERATOR "-GUnix Makefiles")
+    SET (EXTERNAL_BUILD "make")
+else ()
+    MESSAGE(FATAL_ERROR "only support Ninja or Unix Makefiles")
+ENDIF()
+
 SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${CMAKE_CURRENT_SOURCE_DIR}/${EP_BASE_SUFFIX})
 SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/")
 SET(BUILD_SUPPORT_DIR ${PROJECT_SOURCE_DIR}/build_support)
@@ -183,6 +198,7 @@ ENDIF()
 SET(LIB ${LIB} CACHE INTERNAL "libs which should be linked for executable target")
 
 INCLUDE(ExternalProject)
+INCLUDE(cmake/precommit.cmake)
 INCLUDE(cmake/findTools.cmake)
 INCLUDE(cmake/openssl.cmake)
 INCLUDE(cmake/gflags.cmake)
@@ -204,9 +220,9 @@ FILE(MAKE_DIRECTORY "${PROTO_OUTPUT_DIR}")
 
 #INCLUDE(cmake/protogen.cmake)
 
-ADD_SUBDIRECTORY(src/pstd)
+ADD_SUBDIRECTORY(src/std)
 ADD_SUBDIRECTORY(src/net)
-ADD_SUBDIRECTORY(src/praft)
+ADD_SUBDIRECTORY(src/raft)
 ADD_SUBDIRECTORY(src/storage)
 ADD_SUBDIRECTORY(src/resp)
 
@@ -222,6 +238,15 @@ FOREACH(IGNORE_FILE ${CLANG_FORMAT_IGNORE_FILES})
     FILE(APPEND ${BUILD_SUPPORT_DIR}/clang_format_exclusions.txt "${IGNORE_FILE}\n")
 ENDFOREACH()
 
+# install git hooks when configure
+EXECUTE_PROCESS(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${GIT_HOOKS_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ${HOOKS_SOURCE_DIR}/precommit.sh
+        ${GIT_HOOKS_DIR}/pre-commit
+    COMMAND ${CMAKE_COMMAND} -E chmod 755 ${GIT_HOOKS_DIR}/pre-commit
+)
+
 STRING(CONCAT FORMAT_DIRS "${PROJECT_SOURCE_DIR}/src,")
 ADD_CUSTOM_TARGET(format
   COMMAND ${BUILD_SUPPORT_DIR}/run_clang_format.py

cmake/braft.cmake

@@ -5,7 +5,7 @@
 
 INCLUDE(ExternalProject)
 
-SET(BRAFT_SOURCES_DIR "${LIB_SOURCE_DIR}/extern_braft" CACHE PATH "Path to braft sources")
+SET(BRAFT_SOURCES_DIR "${LIB_SOURCE_DIR}/braft" CACHE PATH "Path to braft sources")
 SET(BRAFT_INSTALL_DIR ${LIB_INSTALL_PREFIX})
 SET(BRAFT_INCLUDE_DIR "${LIB_INCLUDE_DIR}" CACHE PATH "brpc include directory." FORCE)
 SET(BRAFT_LIBRARIES "${LIB_INSTALL_DIR}/libbraft.a" CACHE FILEPATH "brpc library." FORCE)
@@ -17,7 +17,7 @@ ELSE ()
 ENDIF ()
 
 ExternalProject_Add(
-        extern_braft
+        braft
         ${EXTERNAL_PROJECT_LOG_ARGS}
         DEPENDS brpc
         GIT_REPOSITORY "https://github.com/arana-db/braft.git"
@@ -51,11 +51,7 @@ ExternalProject_Add(
         -DPROTOBUF_PROTOC_EXECUTABLE=${PROTOBUF_PROTOC}
         -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-        BUILD_COMMAND make -j${CPU_CORE}
-        UPDATE_COMMAND ""
+        ${EXTERNAL_GENERATOR}
+        BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
+        BUILD_BYPRODUCTS ${BRAFT_LIBRARIES}
 )
-
-ADD_DEPENDENCIES(extern_braft brpc gflags)
-ADD_LIBRARY(braft STATIC IMPORTED GLOBAL)
-SET_PROPERTY(TARGET braft PROPERTY IMPORTED_LOCATION ${BRAFT_LIBRARIES})
-ADD_DEPENDENCIES(braft extern_braft)

cmake/brpc.cmake

@@ -3,7 +3,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-SET(BRPC_SOURCES_DIR "${LIB_SOURCE_DIR}/extern_brpc" CACHE PATH "Path to brpc sources")
+SET(BRPC_SOURCES_DIR "${LIB_SOURCE_DIR}/brpc" CACHE PATH "Path to brpc sources")
 SET(BRPC_INSTALL_DIR ${LIB_INSTALL_PREFIX})
 SET(BRPC_INCLUDE_DIR "${LIB_INCLUDE_DIR}" CACHE PATH "brpc include directory." FORCE)
 SET(BRPC_LIBRARIES "${LIB_INSTALL_DIR}/libbrpc.a" CACHE FILEPATH "brpc library." FORCE)
@@ -14,7 +14,7 @@ SET(CMAKE_FIND_LIBRARY_SUFFIXES ${LIB_INSTALL_PREFIX})
 SET(CMAKE_CPP_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
 # If minimal .a is need, you can set  WITH_DEBUG_SYMBOLS=OFF
 ExternalProject_Add(
-        extern_brpc
+        brpc
         ${EXTERNAL_PROJECT_LOG_ARGS}
         DEPENDS ssl crypto zlib protobuf leveldb gflags
         URL https://github.com/apache/brpc/archive/refs/tags/1.8.0.tar.gz
@@ -54,10 +54,7 @@ ExternalProject_Add(
         -DPROJECT_BINARY_DIR=${LIB_INSTALL_PREFIX}
         -DWITH_GLOG=OFF
         -DDOWNLOAD_GTEST=OFF
-        BUILD_COMMAND make -j${CPU_CORE}
-        UPDATE_COMMAND ""
+        ${EXTERNAL_GENERATOR}
+        BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
+        BUILD_BYPRODUCTS ${BRPC_LIBRARIES}
 )
-ADD_DEPENDENCIES(extern_brpc ssl crypto zlib protobuf leveldb gflags)
-ADD_LIBRARY(brpc STATIC IMPORTED GLOBAL)
-SET_PROPERTY(TARGET brpc PROPERTY IMPORTED_LOCATION ${BRPC_LIBRARIES})
-ADD_DEPENDENCIES(brpc extern_brpc)

cmake/fmt.cmake

@@ -10,12 +10,12 @@ ELSE ()
     SET(LIB_FMT libfmt.a)
 ENDIF ()
 
-SET(FMT_SOURCES_DIR "${LIB_SOURCE_DIR}/extern_fmt" CACHE PATH "Path to fmt sources")
+SET(FMT_SOURCES_DIR "${LIB_SOURCE_DIR}/fmt" CACHE PATH "Path to fmt sources")
 SET(FMT_INCLUDE_DIR "${LIB_INCLUDE_DIR}" CACHE PATH "fmt include directory." FORCE)
 SET(FMT_LIBRARIES "${LIB_INSTALL_DIR}/${LIB_FMT}" CACHE FILEPATH "fmt library directory." FORCE)
 
 ExternalProject_Add(
-        extern_fmt
+        fmt
         URL https://github.com/fmtlib/fmt/archive/10.1.1.zip
         URL_HASH SHA256=3c2e73019178ad72b0614a3124f25de454b9ca3a1afe81d5447b8d3cbdb6d322
         DOWNLOAD_NO_PROGRESS 1
@@ -33,11 +33,8 @@ ExternalProject_Add(
         -DFMT_DOC=FALSE
         -DFMT_TEST=FALSE
         -DSHARED_LIBS=FALSE
-        BUILD_COMMAND make -j${CPU_CORE}
+        ${EXTERNAL_GENERATOR}
+        BUILD_BYPRODUCTS ${FMT_LIBRARIES}
+        BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
         UPDATE_COMMAND ""
 )
-
-
-ADD_LIBRARY(fmt STATIC IMPORTED GLOBAL)
-SET_PROPERTY(TARGET fmt PROPERTY IMPORTED_LOCATION ${FMT_LIBRARIES})
-ADD_DEPENDENCIES(fmt extern_fmt)

cmake/gflags.cmake

@@ -9,22 +9,21 @@ ELSE ()
     SET(LIB_GFLAGS libgflags.a)
 ENDIF ()
 
-SET(GFLAGS_SOURCES_DIR "${LIB_SOURCE_DIR}/extern_gflags" CACHE PATH "Path to gflags sources")
+SET(GFLAGS_SOURCES_DIR "${LIB_SOURCE_DIR}/gflags" CACHE PATH "Path to gflags sources")
 SET(GFLAGS_INCLUDE_DIR ${LIB_INCLUDE_DIR} CACHE PATH "gflags include directory." FORCE)
 SET(GFLAGS_LIBRARIES ${LIB_INSTALL_DIR}/${LIB_GFLAGS} CACHE FILEPATH "gflags library." FORCE)
 SET(GFLAGS_LIBRARY ${LIB_INSTALL_DIR}/${LIB_GFLAGS} CACHE FILEPATH "gflags library." FORCE)
 
-# SET(GFLAGS_INCLUDE_PATH "${LIB_INCLUDE_DIR}/gflags" CACHE PATH "gflags include directory." FORCE)
-
 ExternalProject_Add(
-        extern_gflags
+        gflags
         URL https://github.com/gflags/gflags/archive/v2.2.2.zip
         URL_HASH SHA256=19713a36c9f32b33df59d1c79b4958434cb005b5b47dc5400a7a4b078111d9b5
         DOWNLOAD_NO_PROGRESS 1
         DOWNLOAD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/download"
         DOWNLOAD_NAME "gflags-2.2.2.zip"
         SOURCE_DIR ${GFLAGS_SOURCES_DIR}
         CMAKE_ARGS
+        ${EXTERNAL_GENERATOR}
         ${EXTERNAL_PROJECT_C}
         ${EXTERNAL_PROJECT_CXX}
         ${EXTERNAL_PROJECT_CXX_FLAGS}
@@ -39,10 +38,7 @@ ExternalProject_Add(
         -DGFLAGS_NAMESPACE=gflags
         -DGFLAGS_BUILD_TESTING=OFF
         -DCMAKE_INSTALL_PREFIX=${LIB_INSTALL_PREFIX}
-        BUILD_COMMAND make -j${CPU_CORE}
+        BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
         UPDATE_COMMAND ""
+        BUILD_BYPRODUCTS ${GFLAGS_LIBRARY}
 )
-
-ADD_LIBRARY(gflags STATIC IMPORTED GLOBAL)
-SET_PROPERTY(TARGET gflags PROPERTY IMPORTED_LOCATION ${GFLAGS_LIBRARIES})
-ADD_DEPENDENCIES(gflags extern_gflags)

cmake/gtest.cmake

@@ -3,31 +3,27 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-SET(GTEST_SOURCES_DIR "${LIB_SOURCE_DIR}/extern_gtest" CACHE PATH "Path to gtest sources")
+SET(GTEST_SOURCES_DIR "${LIB_SOURCE_DIR}/gtest" CACHE PATH "Path to gtest sources")
 SET(GTEST_INCLUDE_DIR "${LIB_INCLUDE_DIR}" CACHE PATH "gtest include directory." FORCE)
 SET(GTEST_LIBRARIES "${LIB_INSTALL_DIR}/libgtest.a" CACHE FILEPATH "gtest lib directory." FORCE)
 SET(GTEST_MAIN_LIBRARIES "${LIB_INSTALL_DIR}/libgtest_main.a" CACHE FILEPATH "gtest main include directory." FORCE)
 SET(GMOCK_LIBRARIES "${LIB_INSTALL_DIR}/libgmock.a" CACHE FILEPATH "gmock directory." FORCE)
 
 ExternalProject_Add(
-        extern_gtest
+        gtest
         GIT_REPOSITORY https://github.com/google/googletest.git
         GIT_TAG v1.14.0
         GIT_SHALLOW true
         SOURCE_DIR ${GTEST_SOURCES_DIR}
         CMAKE_ARGS
+        ${EXTERNAL_GENERATOR}
         -DCMAKE_INSTALL_PREFIX=${LIB_INSTALL_PREFIX}
         -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         ${EXTERNAL_PROJECT_C}
         ${EXTERNAL_PROJECT_CXX}
         ${EXTERNAL_PROJECT_CXX_FLAGS}
         ${EXTERNAL_PROJECT_CXX_LINK_FLAGS}
+        BUILD_COMMAND ${EXTERNAL_BUILD} -j${CPU_CORE}
+        BUILD_BYPRODUCTS ${GTEST_LIBRARIES}
 )
-
-ADD_DEPENDENCIES(extern_gtest snappy gflags zlib)
-ADD_LIBRARY(gtest STATIC IMPORTED GLOBAL)
-ADD_LIBRARY(gtest_main STATIC IMPORTED GLOBAL)
-SET_PROPERTY(TARGET gtest PROPERTY IMPORTED_LOCATION ${GTEST_LIBRARIES})
-SET_PROPERTY(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${GTEST_MAIN_LIBRARIES})
-ADD_DEPENDENCIES(gtest extern_gtest)