Merge branch 'unstable' into bit_op1

Author: xuzifu666

.asf.yaml

@@ -29,10 +29,19 @@ github:
     - namespace
     - redis
     - redis-cluster
+  pull_requests:
+    allow_auto_merge: true
+    allow_update_branch: true
   enabled_merge_buttons:
     squash:  true
+    squash_commit_message: PR_TITLE_AND_DESC
     merge:   false
     rebase:  true
+  features:
+    wiki: false
+    issues: true
+    projects: true
+    discussions: true
   protected_branches:
     unstable:
       required_pull_request_reviews:
@@ -56,6 +65,9 @@ github:
     '2.10': {}
     '2.11': {}
     '2.12': {}
+    '2.13': {}
+    '2.14': {}
+    '2.15': {}
 
 notifications:
   commits:      commits@kvrocks.apache.org

.clang-tidy

@@ -1,5 +1,5 @@
 # refer to https://clang.llvm.org/extra/clang-tidy/checks/list.html
-Checks: -*, clang-analyzer-core.*, clang-analyzer-cplusplus.*, -clang-analyzer-cplusplus.InnerPointer, clang-analyzer-deadcode.*, clang-analyzer-nullability.*, clang-analyzer-security.*, clang-analyzer-unix.*, clang-analyzer-valist.*, cppcoreguidelines-init-variables, cppcoreguidelines-macro-usage, cppcoreguidelines-interfaces-global-init, cppcoreguidelines-narrowing-conversions, cppcoreguidelines-no-malloc, cppcoreguidelines-prefer-member-initializer, cppcoreguidelines-special-member-functions, cppcoreguidelines-slicing, google-build-explicit-make-pair, google-default-arguments, google-explicit-constructor, modernize-avoid-bind, modernize-loop-convert, modernize-macro-to-enum, modernize-make-shared, modernize-make-unique, modernize-pass-by-value, modernize-redundant-void-arg, modernize-return-braced-init-list, modernize-use-auto, modernize-use-bool-literals, modernize-use-emplace, modernize-use-equals-default, modernize-use-equals-delete, modernize-use-nullptr, modernize-use-override, modernize-use-using, performance-faster-string-find, performance-for-range-copy, performance-implicit-conversion-in-loop, performance-inefficient-algorithm, performance-inefficient-vector-operation, performance-move-const-arg, performance-move-constructor-init, performance-no-automatic-move, performance-trivially-destructible, performance-type-promotion-in-math-fn, performance-unnecessary-copy-initialization, performance-unnecessary-value-param, readability-avoid-const-params-in-decls, readability-const-return-type, readability-convert-member-functions-to-static, readability-make-member-function-const, readability-redundant-access-specifiers, readability-redundant-control-flow, readability-redundant-declaration, readability-redundant-member-init, readability-redundant-string-cstr, readability-redundant-string-init, readability-simplify-boolean-expr, readability-simplify-subscript-expr, readability-string-compare, readability-identifier-naming, cppcoreguidelines-avoid-goto, bugprone-use-after-move
+Checks: -*, clang-analyzer-core.*, clang-analyzer-cplusplus.*, -clang-analyzer-cplusplus.InnerPointer, clang-analyzer-deadcode.*, clang-analyzer-nullability.*, clang-analyzer-security.*, clang-analyzer-unix.*, clang-analyzer-valist.*, cppcoreguidelines-init-variables, cppcoreguidelines-macro-usage, cppcoreguidelines-interfaces-global-init, cppcoreguidelines-narrowing-conversions, cppcoreguidelines-no-malloc, cppcoreguidelines-prefer-member-initializer, cppcoreguidelines-special-member-functions, cppcoreguidelines-slicing, google-build-explicit-make-pair, google-default-arguments, google-explicit-constructor, modernize-avoid-bind, modernize-macro-to-enum, modernize-make-shared, modernize-make-unique, modernize-pass-by-value, modernize-redundant-void-arg, modernize-return-braced-init-list, modernize-use-auto, modernize-use-bool-literals, modernize-use-emplace, modernize-use-equals-default, modernize-use-equals-delete, modernize-use-nullptr, modernize-use-override, modernize-use-using, performance-faster-string-find, performance-for-range-copy, performance-implicit-conversion-in-loop, performance-inefficient-algorithm, performance-inefficient-vector-operation, performance-move-const-arg, performance-move-constructor-init, performance-no-automatic-move, performance-trivially-destructible, performance-type-promotion-in-math-fn, performance-unnecessary-copy-initialization, performance-unnecessary-value-param, readability-avoid-const-params-in-decls, readability-const-return-type, readability-convert-member-functions-to-static, readability-make-member-function-const, readability-redundant-access-specifiers, readability-redundant-control-flow, readability-redundant-declaration, readability-redundant-member-init, readability-redundant-string-cstr, readability-redundant-string-init, readability-simplify-boolean-expr, readability-simplify-subscript-expr, readability-string-compare, readability-identifier-naming, cppcoreguidelines-avoid-goto, bugprone-use-after-move
 
 WarningsAsErrors: clang-analyzer-*, -clang-analyzer-security.insecureAPI.rand, google-*, performance-*, cppcoreguidelines-*, modernize-*, readability-*, bugprone-*
 
@@ -50,3 +50,5 @@ CheckOptions:
     value:         lower_case
   - key:           readability-identifier-naming.FunctionCase
     value:         CamelCase
+  - key:           readability-simplify-boolean-expr.IgnoreMacros
+    value:         True

.github/config/typos.toml

@@ -44,3 +44,6 @@ ignore-hidden = false
 
 #Used as a short naming into tests
 "typ" = "typ"
+
+#Fix name (Yann Collet)
+"Collet" = "Collet"

.github/workflows/kvrocks.yaml

@@ -51,48 +51,48 @@ jobs:
           echo "docs_only=${{ fromJSON(steps.changes.outputs.all_count) == fromJSON(steps.changes.outputs.docs_count) && fromJSON(steps.changes.outputs.docs_count) > 0 }}" >> $GITHUB_OUTPUT
 
   check-typos:
-    name: Check typos
+    name: Check typos and licenses
     runs-on: ubuntu-22.04
     env:
       FORCE_COLOR: 1
     steps:
       - uses: actions/checkout@v4
       - name: Check typos
-        uses: crate-ci/typos@v1.35.1
+        uses: crate-ci/typos@v1.43.1
         with:
           config: .github/config/typos.toml
+      - uses: apache/skywalking-eyes/header@v0.7.0
+        with:
+          config: .github/config/licenserc.yml
 
   check-and-lint:
     name: Lint and check code
-    needs: [precondition]
+    needs: [precondition, check-typos]
     if: ${{ needs.precondition.outputs.docs_only != 'true' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: apache/skywalking-eyes/header@v0.7.0
-        with:
-          config: .github/config/licenserc.yml
       - uses: actions/setup-go@v5
         with:
           go-version-file: 'tests/gocase/go.mod'
           cache: false
       - name: Prepare Dependencies
         run: |
           sudo apt update
-          sudo apt install -y clang-format-14 clang-tidy-14
+          sudo apt install -y clang-format-18 clang-tidy-18
       - name: Check with clang-format
         id: check-format
-        run: ./x.py check format --clang-format-path clang-format-14
+        run: ./x.py check format --clang-format-path clang-format-18
       - name: Check with clang-tidy
         run: |
           ./x.py build --skip-build
-          ./x.py check tidy -j $(nproc) --clang-tidy-path clang-tidy-14 --run-clang-tidy-path run-clang-tidy-14
+          ./x.py check tidy -j $(nproc) --clang-tidy-path clang-tidy-18 --run-clang-tidy-path run-clang-tidy-18
       - name: Lint with golangci-lint
         run: ./x.py check golangci-lint
       - name: Prepare format patch
         if: always() && steps.check-format.outcome != 'success'
         run: |
-          ./x.py format --clang-format-path clang-format-14
+          ./x.py format --clang-format-path clang-format-18
           git diff -p > clang-format.patch
           cat clang-format.patch
       - name: Upload format patch
@@ -103,7 +103,7 @@ jobs:
 
   build-and-test:
     name: Build and test
-    needs: [precondition, check-and-lint, check-typos]
+    needs: [precondition, check-typos]
     if: ${{ needs.precondition.outputs.docs_only != 'true' }}
     strategy:
       fail-fast: false
@@ -150,13 +150,12 @@ jobs:
           - name: Ubuntu Clang
             os: ubuntu-22.04
             compiler: clang
-          # FIXME: https://github.com/apache/kvrocks/issues/2411
-          # - name: Ubuntu 24 GCC
-          #   os: ubuntu-24.04
-          #   compiler: gcc
-          # - name: Ubuntu 24 Clang
-          #   os: ubuntu-24.04
-          #   compiler: clang
+          - name: Ubuntu 24 GCC
+            os: ubuntu-24.04
+            compiler: gcc
+          - name: Ubuntu 24 Clang
+            os: ubuntu-24.04
+            compiler: clang
           - name: Ubuntu GCC ASan
             os: ubuntu-22.04
             without_jemalloc: -DDISABLE_JEMALLOC=ON
@@ -223,12 +222,33 @@ jobs:
             os: ubuntu-24.04-arm
             compiler: clang
             arm_linux: true
+          - name: Ubuntu RISC-V GCC without luaJIT (QEMU)
+            os: ubuntu-24.04
+            riscv_toolchain: true
+            toolchain_file: cmake/riscv64.cmake
+            riscv_toolchain_url: "https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2025.07.03/riscv64-glibc-ubuntu-24.04-gcc-nightly-2025.07.03-nightly.tar.xz"
+            cmake_crosscompiling: -DCMAKE_CROSSCOMPILING=TRUE
+            cmake_system_name: -DCMAKE_SYSTEM_NAME=Linux
+            cmake_system_processor: -DCMAKE_SYSTEM_PROCESSOR=riscv64
+            without_luajit: -DENABLE_LUAJIT=OFF
 
     runs-on: ${{ matrix.os }}
     env:
       SONARCLOUD_OUTPUT_DIR: sonarcloud-data
       FORCE_JAVASCRIPT_ACTIONS_TO_NODE20: true
+      RISCV_PATH: "/opt/riscv"
     steps:
+      - name: Maximize build space
+        if: ${{ startsWith(matrix.os, 'ubuntu') }}
+        run: |
+          # refer to https://github.com/easimon/maximize-build-space,
+          # we take some ideas from this action but don't use it directly.
+          sudo df -h
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          sudo df -h
+
       - name: Setup macOS
         if: ${{ startsWith(matrix.os, 'macos') }}
         run: |
@@ -253,6 +273,21 @@ jobs:
         if: ${{ matrix.arm_linux }}
         run: |
           sudo apt install -y git build-essential cmake libtool python3 python3-pip libssl-dev
+      - name: Setup RISC-V Toolchain
+        if: ${{ matrix.riscv_toolchain }}
+        run: |
+          sudo apt install -y wget build-essential cmake git python3 \
+            libgflags-dev libsnappy-dev zlib1g-dev liblz4-dev libzstd-dev \
+            qemu-user qemu-user-static
+          sudo mkdir -p $RISCV_PATH
+          wget "${{ matrix.riscv_toolchain_url }}" -O riscv-toolchain.tar.xz
+          sudo tar -xvf riscv-toolchain.tar.xz -C $RISCV_PATH --strip-components=1
+          rm riscv-toolchain.tar.xz
+          sudo sed -i "s|libdir='/mnt/riscv/riscv64-unknown-linux-gnu/lib'|libdir='$RISCV_PATH/riscv64-unknown-linux-gnu/lib'|g" \
+            $RISCV_PATH/riscv64-unknown-linux-gnu/lib/libatomic.la
+          echo "PATH=$RISCV_PATH/bin:$PATH" >> $GITHUB_ENV
+          echo "LD_LIBRARY_PATH=/opt/riscv/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+          echo "QEMU_LD_PREFIX=$RISCV_PATH/sysroot" >> $GITHUB_ENV
 
       - name: Cache redis
         id: cache-redis
@@ -293,12 +328,12 @@ jobs:
         run: pip install gcovr==5.0 # 5.1 is not supported
         if: ${{ matrix.sonarcloud }}
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v3
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v6.0.0
         if: ${{ matrix.sonarcloud }}
 
       - name: Build Kvrocks
-        if: ${{ !matrix.sonarcloud }}
+        if: ${{ !matrix.sonarcloud && !matrix.riscv_toolchain }}
         run: |
           ./x.py build -j$NPROC --unittest --compiler ${{ matrix.compiler }} ${{ matrix.without_jemalloc }} \
             ${{ matrix.without_luajit }} ${{ matrix.with_ninja }} ${{ matrix.with_sanitizer }} ${{ matrix.with_openssl }} \
@@ -311,6 +346,11 @@ jobs:
           cp -r build _build
           build-wrapper-linux-x86-64 --out-dir ${{ env.SONARCLOUD_OUTPUT_DIR }} ./x.py build -j$NPROC --unittest --compiler ${{ matrix.compiler }} ${{ matrix.sonarcloud }}
 
+      - name: Build Kvrocks (RISC-V)
+        if: ${{ matrix.riscv_toolchain }}
+        run: |
+          ./x.py build -j$NPROC --unittest --toolchain ${{ matrix.toolchain_file }}
+
       - name: Setup Coredump
         if: ${{ startsWith(matrix.os, 'ubuntu') }}
         run: |
@@ -416,7 +456,7 @@ jobs:
 
   check-docker:
     name: Check Docker image
-    needs: [precondition, check-and-lint, check-typos]
+    needs: [precondition, check-typos]
     if: ${{ needs.precondition.outputs.docs_only != 'true' }}
     runs-on: ${{ matrix.os }}
     strategy:
@@ -450,7 +490,7 @@ jobs:
 
   build-and-test-in-container:
     name: Build and test in container
-    needs: [precondition, check-and-lint, check-typos]
+    needs: [precondition, check-typos]
     if: ${{ needs.precondition.outputs.docs_only != 'true' }}
     strategy:
       fail-fast: false
@@ -472,14 +512,23 @@ jobs:
             image: debian:12
             compiler: gcc
           - name: Alpine 3
-            image: alpine:3
+            image: alpine:3.22
             compiler: gcc
             disable_jemalloc: -DDISABLE_JEMALLOC=ON
 
     runs-on: ubuntu-22.04
     container:
       image: ${{ matrix.image }}
+      volumes:
+        - /usr/local/lib/android:/usr-local-lib-android
+        - /usr/share/dotnet:/usr-share-dotnet
     steps:
+      - name: Maximize build space
+        run: |
+          df -h
+          rm -rf /usr-local-lib-android/*
+          rm -rf /usr-share-dotnet/*
+          df -h
       - name: Setup ArchLinux
         if: ${{ startsWith(matrix.image, 'archlinux') }}
         run: |
@@ -493,7 +542,7 @@ jobs:
       - name: Setup openSUSE
         if: ${{ startsWith(matrix.image, 'opensuse') }}
         run: |
-          zypper install -y gcc11 gcc11-c++ make wget git autoconf automake python3 python3-pip curl tar gzip cmake go
+          zypper install -y gcc11 gcc11-c++ make wget git autoconf automake python3 python3-pip curl tar gzip cmake go which
           update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-11 100
           update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-11 100
           update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
@@ -618,6 +667,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - precondition
+      - check-and-lint
       - build-and-test
       - build-and-test-in-container
       - check-docker

.github/workflows/sonar.yaml

@@ -33,8 +33,8 @@ jobs:
           repository: ${{ github.event.workflow_run.head_repository.full_name }}
           ref: ${{ github.event.workflow_run.head_sha }}
           fetch-depth: 0
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v3
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v6.0.0
       - name: 'Download code coverage'
         uses: actions/github-script@v7
         with:
@@ -66,18 +66,22 @@ jobs:
         with:
           python-version: 3.x
 
-      - name: Run sonar-scanner
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
+      - name: Extract PR number
         run: |
           PR_NUMBER=$(jq -r '.number | select (.!=null)' sonarcloud-data/github-event.json)
-          echo "The PR number is $PR_NUMBER"
+          echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_ENV"
+          echo "The PR number is ${PR_NUMBER:-<none>}"
 
-          sonar-scanner \
-            --define sonar.cfamily.build-wrapper-output="sonarcloud-data" \
-            --define sonar.coverageReportPaths=sonarcloud-data/coverage.xml \
-            --define sonar.projectKey=apache_kvrocks \
-            --define sonar.organization=apache \
-            --define sonar.scm.revision=${{ github.event.workflow_run.head_sha }} \
-            --define sonar.pullrequest.key=$PR_NUMBER
+      - name: SonarQube Scan
+        uses: SonarSource/sonarqube-scan-action@v6.0.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
+        with:
+          args: >
+            -Dsonar.cfamily.build-wrapper-output=sonarcloud-data
+            -Dsonar.coverageReportPaths=sonarcloud-data/coverage.xml
+            -Dsonar.projectKey=apache_kvrocks
+            -Dsonar.organization=apache
+            -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }}
+            -Dsonar.pullrequest.key=${{ env.PR_NUMBER }}

.gitignore

@@ -11,6 +11,12 @@
 *.gch
 *.pch
 
+# Linker files
+*.ilk
+
+# Debugger Files
+*.pdb
+
 # Compiled Dynamic libraries
 *.so
 *.dylib
@@ -31,19 +37,18 @@
 *.out
 *.app
 
-*.pyc
-*.swp
-*.swo
-.DS_Store
-version.h
+# debug information files
+*.dwo
 
-.idea
-.vscode
-.cache
+# for macOS
+.DS_Store
 
-compactdb
-testdb
+# for IDEs
+/.idea/
+/.vscode/
+/.cache/
 
-build
-cmake-build-*
-build-*
+# for build directories
+/build/
+/cmake-build-*/
+/build-*/