Merge branch 'valkey-io:unstable' into unstable

PingXie · Jun 17, 2024 · 6933754 · 6933754
2 parents c0f1662 + 5a51bf5
commit 6933754
Show file tree

Hide file tree

Showing 29 changed files with 1,323 additions and 1,037 deletions.
diff --git a/.config/format.yml b/.config/format.yml
@@ -0,0 +1,7 @@
+formatter:
+  type: basic
+  indent: 2
+  retain_line_breaks_single: true
+
+exclude:
+  - "deps/"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -2,7 +2,6 @@
 # package ecosystems to update and where the package manifests are located.
 # Please see the documentation for all configuration options:
 # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
----
 version: 2
 updates:
   - package-ecosystem: github-actions

diff --git a/.github/workflows/build-release-packages.yml b/.github/workflows/build-release-packages.yml
@@ -3,7 +3,7 @@ name: Build Release Packages
 on:
   release:
     types: [published]
-  
+
   workflow_dispatch:
     inputs:
       version:
@@ -44,20 +44,20 @@ jobs:
           INPUT_VERSION: ${{ inputs.version || github.ref_name }}
 
   generate-build-matrix:
-      name: Generating build matrix
-      runs-on: ubuntu-latest
-      outputs:
-        x86_64-build-matrix: ${{ steps.set-matrix.outputs.x86_64-build-matrix }}
-        arm64-build-matrix: ${{ steps.set-matrix.outputs.arm64-build-matrix }}
-      steps:
-        - name: Checkout repository
-          uses: actions/checkout@v4
-        # Set up the list of target to build so we can pass the JSON to the reusable job
-        - uses: ./.github/actions/generate-package-build-matrix
-          id: set-matrix
-          with:
-            ref: ${{ inputs.version || github.ref_name }}
-  
+    name: Generating build matrix
+    runs-on: ubuntu-latest
+    outputs:
+      x86_64-build-matrix: ${{ steps.set-matrix.outputs.x86_64-build-matrix }}
+      arm64-build-matrix: ${{ steps.set-matrix.outputs.arm64-build-matrix }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      # Set up the list of target to build so we can pass the JSON to the reusable job
+      - uses: ./.github/actions/generate-package-build-matrix
+        id: set-matrix
+        with:
+          ref: ${{ inputs.version || github.ref_name }}
+
   release-build-linux-x86-packages:
     needs:
       - release-build-get-meta

diff --git a/.github/workflows/call-build-linux-arm-packages.yml b/.github/workflows/call-build-linux-arm-packages.yml
@@ -45,15 +45,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.version }}
-      
+
       - name: Make Valkey
         uses: uraimo/run-on-arch-action@v2
         with:
           arch: aarch64
           distro: ${{matrix.distro.target}}
           install: apt-get update && apt-get install -y build-essential libssl-dev
           run: make -C src all BUILD_TLS=yes
-      
+
       - name: Create Tarball and SHA256sums
         run: |
           TAR_FILE_NAME=valkey-${{inputs.version}}-${{matrix.distro.platform}}-${{ matrix.distro.arch}}
@@ -64,7 +64,7 @@ jobs:
           sha256sum $TAR_FILE_NAME.tar.gz > $TAR_FILE_NAME.tar.gz.sha256
           mkdir -p packages-files
           cp -rfv $TAR_FILE_NAME.tar* packages-files/
-      
+
       - name: Install AWS cli.
         run: |
           sudo apt-get install -y awscli

diff --git a/.github/workflows/call-build-linux-x86-packages.yml b/.github/workflows/call-build-linux-x86-packages.yml
@@ -51,7 +51,7 @@ jobs:
 
       - name: Make Valkey
         run: make -C src all BUILD_TLS=yes
-      
+
       - name: Create Tarball and SHA256sums
         run: |
           TAR_FILE_NAME=valkey-${{inputs.version}}-${{matrix.distro.platform}}-${{ matrix.distro.arch}}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,30 +6,29 @@ permissions:
   contents: read
 
 jobs:
-
   test-ubuntu-latest:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    - name: make
-      # Fail build if there are warnings
-      # build with TLS just for compilation coverage
-      run: make all-with-unit-tests SERVER_CFLAGS='-Werror' BUILD_TLS=yes
-    - name: test
-      run: |
-        sudo apt-get install tcl8.6 tclx
-        ./runtest --verbose --tags -slow --dump-logs
-    - name: module api test
-      run: CFLAGS='-Werror' ./runtest-moduleapi --verbose --dump-logs
-    - name: validate commands.def up to date
-      run: |
-        touch src/commands/ping.json
-        make commands.def
-        dirty=$(git diff)
-        if [[ ! -z  $dirty ]]; then echo $dirty; exit 1; fi
-    - name: unit tests
-      run: |
-        ./src/valkey-unit-tests
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: make
+        # Fail build if there are warnings
+        # build with TLS just for compilation coverage
+        run: make all-with-unit-tests SERVER_CFLAGS='-Werror' BUILD_TLS=yes
+      - name: test
+        run: |
+          sudo apt-get install tcl8.6 tclx
+          ./runtest --verbose --tags -slow --dump-logs
+      - name: module api test
+        run: CFLAGS='-Werror' ./runtest-moduleapi --verbose --dump-logs
+      - name: validate commands.def up to date
+        run: |
+          touch src/commands/ping.json
+          make commands.def
+          dirty=$(git diff)
+          if [[ ! -z  $dirty ]]; then echo $dirty; exit 1; fi
+      - name: unit tests
+        run: |
+          ./src/valkey-unit-tests
 
   test-sanitizer-address:
     runs-on: ubuntu-latest
@@ -49,43 +48,79 @@ jobs:
     runs-on: ubuntu-latest
     container: debian:buster
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    - name: make
-      run: |
-        apt-get update && apt-get install -y build-essential
-        make SERVER_CFLAGS='-Werror'
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: make
+        run: |
+          apt-get update && apt-get install -y build-essential
+          make SERVER_CFLAGS='-Werror'
 
   build-macos-latest:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    - name: make
-      run: make SERVER_CFLAGS='-Werror'
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: make
+        run: make SERVER_CFLAGS='-Werror'
 
   build-32bit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    - name: make
-      run: |
-        sudo apt-get update && sudo apt-get install libc6-dev-i386
-        make SERVER_CFLAGS='-Werror' 32bit
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: make
+        run: |
+          sudo apt-get update && sudo apt-get install libc6-dev-i386
+          make SERVER_CFLAGS='-Werror' 32bit
 
   build-libc-malloc:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-    - name: make
-      run: make SERVER_CFLAGS='-Werror' MALLOC=libc
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: make
+        run: make SERVER_CFLAGS='-Werror' MALLOC=libc
 
   build-almalinux8-jemalloc:
     runs-on: ubuntu-latest
     container: almalinux:8
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: make
+        run: |
+          dnf -y install epel-release gcc make procps-ng which
+          make -j SERVER_CFLAGS='-Werror'
+
+  format-yaml:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Set up Go
+        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+        with:
+          go-version: "1.22.4"
+
+      - name: Setup YAML formatter
+        run: |
+          go install github.com/google/yamlfmt/cmd/yamlfmt@latest
 
-    - name: make
-      run: |
-        dnf -y install epel-release gcc make procps-ng which
-        make -j SERVER_CFLAGS='-Werror'
+      - name: Run yamlfmt
+        id: yamlfmt
+        run: |
+          yamlfmt -lint -conf .config/format.yml .
+          # Capture the diff output
+          DIFF=$(git diff)
+          if [ ! -z "$DIFF" ]; then
+            # Encode the diff in Base64 to ensure it's handled as a single line
+            ENCODED_DIFF=$(echo "$DIFF" | base64 -w 0)
+            echo "diff=$ENCODED_DIFF" >> $GITHUB_OUTPUT
+          fi
+        shell: bash
 
+      - name: Check for formatting changes
+        if: ${{ steps.yamlfmt.outputs.diff }}
+        run: |
+          echo "ERROR: YAML file is not formatted properly. Here is the diff: "
+          # Decode the Base64 diff to display it
+          echo "${{ steps.clang-format.outputs.diff }}" | base64 --decode
+          exit 1
+        shell: bash
diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -10,39 +10,39 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Checkout code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    - name: Set up Clang
-      run: |
-        sudo apt-get update -y
-        sudo apt-get upgrade -y
-        sudo apt-get install software-properties-common -y
-        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo tee /usr/share/keyrings/llvm-toolchain.gpg > /dev/null
-        echo "deb [signed-by=/usr/share/keyrings/llvm-toolchain.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-18 main" | sudo tee /etc/apt/sources.list.d/llvm.list
-        sudo apt-get update -y
-        sudo apt-get install clang-format-18 -y
-    - name: Run clang-format
-      id: clang-format
-      run: |
-        # Run clang-format and capture the diff
-        cd src
-        shopt -s globstar
-        clang-format-18 -i **/*.c **/*.h
-        # Capture the diff output
-        DIFF=$(git diff)
-        if [ ! -z "$DIFF" ]; then
-          # Encode the diff in Base64 to ensure it's handled as a single line
-          ENCODED_DIFF=$(echo "$DIFF" | base64 -w 0)
-          echo "diff=$ENCODED_DIFF" >> $GITHUB_OUTPUT
-        fi
-      shell: bash
+      - name: Set up Clang
+        run: |
+          sudo apt-get update -y
+          sudo apt-get upgrade -y
+          sudo apt-get install software-properties-common -y
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo tee /usr/share/keyrings/llvm-toolchain.gpg > /dev/null
+          echo "deb [signed-by=/usr/share/keyrings/llvm-toolchain.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-18 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          sudo apt-get update -y
+          sudo apt-get install clang-format-18 -y
+      - name: Run clang-format
+        id: clang-format
+        run: |
+          # Run clang-format and capture the diff
+          cd src
+          shopt -s globstar
+          clang-format-18 -i **/*.c **/*.h
+          # Capture the diff output
+          DIFF=$(git diff)
+          if [ ! -z "$DIFF" ]; then
+            # Encode the diff in Base64 to ensure it's handled as a single line
+            ENCODED_DIFF=$(echo "$DIFF" | base64 -w 0)
+            echo "diff=$ENCODED_DIFF" >> $GITHUB_OUTPUT
+          fi
+        shell: bash
 
-    - name: Check for formatting changes
-      if: ${{ steps.clang-format.outputs.diff }}
-      run: |
-        echo "ERROR: Code is not formatted correctly. Here is the diff:"
-        # Decode the Base64 diff to display it
-        echo "${{ steps.clang-format.outputs.diff }}" | base64 --decode
-        exit 1
-      shell: bash
+      - name: Check for formatting changes
+        if: ${{ steps.clang-format.outputs.diff }}
+        run: |
+          echo "ERROR: Code is not formatted correctly. Here is the diff:"
+          # Decode the Base64 diff to display it
+          echo "${{ steps.clang-format.outputs.diff }}" | base64 --decode
+          exit 1
+        shell: bash
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -9,16 +9,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    - name: Install lcov and run test
-      run: |
-        sudo apt-get install lcov
-        make lcov
+      - name: Install lcov and run test
+        run: |
+          sudo apt-get install lcov
+          make lcov
 
-    - name: Upload code coverage
-      uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./src/valkey.info
+      - name: Upload code coverage
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./src/valkey.info
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -20,19 +20,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'cpp' ]
+        language: ['cpp']
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
-      with:
-        languages: ${{ matrix.language }}
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        with:
+          languages: ${{ matrix.language }}
 
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9