Merge unstable into 9.1

.github/workflows/benchmark-on-label.yml

@@ -5,8 +5,8 @@ on:
     types: [labeled]
 
 concurrency:
-  group: ec2-al-2023-pr-benchmarking-arm64
-  cancel-in-progress: false
+  group: benchmark-${{ github.event.pull_request.number }}-${{ github.event.label.name }}
+  cancel-in-progress: true
 
 defaults:
   run:
@@ -67,7 +67,7 @@ jobs:
               openssl-devel \
               bzip2-devel \
               libffi-devel
-          pip install -r requirements.txt
+          pip install --require-hashes -r requirements.txt
 
       - name: Build latest valkey_latest
         working-directory: valkey_latest
@@ -110,7 +110,7 @@ jobs:
             --target-ip ${{ secrets.EC2_ARM64_IP }}
             --valkey-path "../valkey"
             --results-dir "results"
-            --runs 5
+            --runs 3
           )
 
           # Run benchmark
@@ -132,8 +132,7 @@ jobs:
         with:
           name: ${{ github.event.label.name }}-results
           path: |
-            ./valkey-perf-benchmark/results/${{ github.event.pull_request.merge_commit_sha }}/metrics.json
-            ./valkey-perf-benchmark/results/${{ github.event.pull_request.base.ref }}/metrics.json
+            ./valkey-perf-benchmark/results/
             comparison.md
 
       - name: Comment PR with results

.github/workflows/benchmark-release.yml

@@ -106,7 +106,7 @@ jobs:
               openssl-devel \
               bzip2-devel \
               libffi-devel
-          pip install -r requirements.txt
+          pip install --require-hashes -r requirements.txt
 
       - name: Build latest valkey_latest
         working-directory: valkey_latest

.github/workflows/ci.yml

@@ -52,7 +52,7 @@ jobs:
           if [[ ! -z "$dirty" ]]; then echo "$dirty"; exit 1; fi
       - name: unit tests
         run: |
-          ./src/unit/valkey-unit-gtests
+          make test-unit
 
   test-ubuntu-latest-compatibility:
     runs-on: ubuntu-latest
@@ -116,8 +116,7 @@ jobs:
           ./utils/gen-test-certs.sh
           ./build-release/runtest --verbose --tags -slow --dump-logs --tls
       - name: unit tests
-        run: |
-          ./build-release/bin/valkey-unit-gtests
+        run: make -C build-release test-unit
 
   test-sanitizer-address:
     runs-on: ubuntu-latest
@@ -144,7 +143,7 @@ jobs:
         run: CFLAGS='-Werror' ./runtest-moduleapi --verbose --dump-logs
       - name: unit tests
         run: |
-          ./src/unit/valkey-unit-gtests
+          make test-unit
 
   test-rdma:
     runs-on: ubuntu-latest
@@ -168,6 +167,7 @@ jobs:
           make -j4 BUILD_RDMA=yes USE_LIBBACKTRACE=yes
       - name: clone-rxe-kmod
         run: |
+          uname -a
           mkdir -p tests/rdma/rxe
           git clone https://github.com/pizhenwei/rxe.git tests/rdma/rxe
           make -C tests/rdma/rxe
@@ -283,7 +283,9 @@ jobs:
             GTEST_LIBS="/usr/lib32/libgtest.a /usr/lib32/libgmock.a"
       - name: unit tests
         run: |
-          ./src/unit/valkey-unit-gtests
+          make test-unit \
+            GTEST_CFLAGS="-I/usr/src/googletest/googletest/include -I/usr/src/googletest/googlemock/include" \
+            GTEST_LIBS="/usr/lib32/libgtest.a /usr/lib32/libgmock.a"
 
   build-libc-malloc:
     runs-on: ubuntu-latest
@@ -332,7 +334,7 @@ jobs:
 
       - name: Setup YAML formatter
         run: |
-          go install github.com/google/yamlfmt/cmd/yamlfmt@latest
+          go install github.com/google/yamlfmt/cmd/yamlfmt@v0.21.0
 
       - name: Run yamlfmt
         id: yamlfmt

.github/workflows/codecov.yml

@@ -35,6 +35,12 @@ jobs:
       - run: cd libbacktrace && ./configure && make && sudo make install
       - name: Checkout Valkey
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Install gtest
+        run: |
+          git clone --depth 1 -b v1.17.x https://github.com/google/googletest.git
+          cmake -S googletest -B googletest/build
+          cmake --build googletest/build -- -j$(nproc)
+          sudo cmake --install googletest/build
       - name: Install lcov and run test
         run: |
           sudo apt-get install lcov tclx

.github/workflows/daily.yml

@@ -132,7 +132,7 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            ./src/unit/valkey-unit-gtests --accurate
+            make test-unit accurate=1
           elif [ -f ./src/valkey-unit-tests ]; then
             ./src/valkey-unit-tests --accurate
           fi
@@ -218,7 +218,7 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            ./src/unit/valkey-unit-gtests --accurate
+            make test-unit accurate=1
           elif [ -f ./src/valkey-unit-tests ]; then
             ./src/valkey-unit-tests --accurate
           fi
@@ -283,7 +283,7 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            ./src/unit/valkey-unit-gtests --accurate
+            make test-unit accurate=1
           elif [ -f ./src/valkey-unit-tests ]; then
             ./src/valkey-unit-tests --accurate
           fi
@@ -464,7 +464,9 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            ./src/unit/valkey-unit-gtests --accurate
+            make test-unit accurate=1 \
+              GTEST_CFLAGS="-I/usr/src/googletest/googletest/include -I/usr/src/googletest/googlemock/include" \
+              GTEST_LIBS="/usr/lib32/libgtest.a /usr/lib32/libgmock.a"
           elif [ -f ./src/valkey-unit-tests ]; then
             ./src/valkey-unit-tests --accurate
           fi
@@ -843,8 +845,8 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            valgrind --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.txt ./src/unit/valkey-unit-gtests --valgrind
-            if grep -q 0x err.txt; then cat err.txt; exit 1; fi
+            ./deps/gtest-parallel/gtest-parallel valgrind -- --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.%p.txt ./src/unit/valkey-unit-gtests --valgrind
+            if grep -qlE '0x[0-9A-Fa-f]+:' err.*.txt 2>/dev/null; then grep -lE '0x[0-9A-Fa-f]+:' err.*.txt | xargs cat; exit 1; fi
           elif [ -f ./src/valkey-unit-tests ]; then
             valgrind --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.txt ./src/valkey-unit-tests --valgrind
             if grep -q 0x err.txt; then cat err.txt; exit 1; fi
@@ -931,8 +933,8 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            valgrind --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.txt ./src/unit/valkey-unit-gtests --valgrind
-            if grep -q 0x err.txt; then cat err.txt; exit 1; fi
+            ./deps/gtest-parallel/gtest-parallel valgrind -- --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.%p.txt ./src/unit/valkey-unit-gtests --valgrind
+            if grep -qlE '0x[0-9A-Fa-f]+:' err.*.txt 2>/dev/null; then grep -lE '0x[0-9A-Fa-f]+:' err.*.txt | xargs cat; exit 1; fi
           elif [ -f ./src/valkey-unit-tests ]; then
             valgrind --track-origins=yes --suppressions=./src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full --log-file=err.txt ./src/valkey-unit-tests --valgrind
             if grep -q 0x err.txt; then cat err.txt; exit 1; fi
@@ -996,7 +998,7 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            ./src/unit/valkey-unit-gtests
+            make test-unit
           elif [ -f ./src/valkey-unit-tests ]; then
             ./src/valkey-unit-tests
           fi
@@ -1055,7 +1057,7 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            ./src/unit/valkey-unit-gtests --large-memory
+            make test-unit large_memory=1
           elif [ -f ./src/valkey-unit-tests ]; then
             ./src/valkey-unit-tests --large-memory
           fi
@@ -1134,7 +1136,7 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            ./src/unit/valkey-unit-gtests --accurate
+            make test-unit accurate=1
           elif [ -f ./src/valkey-unit-tests ]; then
             ./src/valkey-unit-tests --accurate
           fi
@@ -1193,7 +1195,7 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            ./src/unit/valkey-unit-gtests --accurate --large-memory
+            make test-unit accurate=1 large_memory=1
           elif [ -f ./src/valkey-unit-tests ]; then
             ./src/valkey-unit-tests --accurate --large-memory
           fi
@@ -1268,7 +1270,7 @@ jobs:
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: |
           if [ -f ./src/unit/valkey-unit-gtests ]; then
-            ./src/unit/valkey-unit-gtests
+            make test-unit
           elif [ -f ./src/valkey-unit-tests ]; then
             ./src/valkey-unit-tests
           fi

.github/workflows/reply-schemas-linter.yml

@@ -23,7 +23,8 @@ jobs:
       - name: Setup nodejs
         uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       - name: Install packages
-        run: npm install ajv
+        working-directory: utils/reply-schema-linter
+        run: npm ci --ignore-scripts
       - name: linter
-        run: node ./utils/reply_schema_linter.js
+        run: NODE_PATH=utils/reply-schema-linter/node_modules node ./utils/reply_schema_linter.js
 

AGENTS.md

@@ -0,0 +1,56 @@
+# AGENTS.md
+
+## Scope
+- These instructions apply to the entire repository unless a deeper `AGENTS.md` overrides them.
+
+## Repo overview
+- This is the Valkey server codebase.
+- The main implementation lives under `src/`.
+- Unit tests live under `src/unit`
+- Integration tests live under `tests/`.
+- Top-level `Makefile` forwards most targets into `src/Makefile`.
+
+## Working guidelines
+- Keep changes minimal and easy to backport.
+- Match the style of the surrounding code instead of introducing new patterns.
+- Avoid unrelated refactors in the same change.
+
+## Build
+- Default build: `make`
+- Clean rebuild when build settings or bundled deps change: `make distclean && make`
+
+## Unit tests
+- Unit tests live under `src/unit/` and use GoogleTest (gtest/gmock).
+- Build and run all unit tests: `make -C src test-unit`
+- Unit tests cover data-structure and low-level logic changes.
+- A single test filter can be run with: `make -C src test-unit && ./src/unit/valkey-unit-gtests --gtest_filter='<TestSuite>.<TestName>'`
+
+## Integration tests
+- Integration tests live under `tests/` and are written in Tcl.
+- Run the full integration suite: `make test` (from the repo root).
+- Run a single test file: `./runtest --single <path/to/test.tcl>`
+- Additional specialized suites:
+  - Cluster tests: `./runtest-cluster`
+  - Sentinel tests: `./runtest-sentinel`
+  - Module API tests: `./runtest-moduleapi`
+- For targeted validation, run the smallest relevant test scope first before broader suites.
+
+## Code style
+- Follow the repository conventions described in `DEVELOPMENT_GUIDE.md`.
+- Most formatting is enforced by `clang-format`.
+- CI uses `clang-format-18` across `*.c`, `*.h`, `*.cpp`, and `*.hpp` files.
+- When touching C/C++ sources or headers, run `clang-format-18 -i` on the modified files before finalizing when the tool is available.
+- Use comments for non-obvious behavior and rationale, not for restating code.
+
+## Tests
+- Code changes should include relevant tests when the repo already has a matching test location.
+- Data-structure and low-level logic changes usually belong in `src/unit/` (C++ gtest).
+- End-to-end behavior changes usually belong in `tests/` (Tcl integration tests).
+- If behavior or commands change, check whether related documentation also needs updating.
+
+## Files to avoid touching unless required
+- Do not commit local runtime artifacts such as `dump.rdb`, `nodes.conf`, `*.log`, or ad hoc cluster directories unless the task explicitly requires them.
+- Treat vendored dependency code under `deps/` as special-case changes; modify it only when the task clearly requires it.
+
+## Pull Requests
+Always push to the user's fork. Never push to the upstream valkey-io/valkey repository. Never push directly to unstable. If a user fork does not exist, ask the contributor to create one.

MAINTAINERS.md

@@ -16,7 +16,7 @@ Maintainers listed in alphabetical order by their github ID.
 | ------------------- | ------------- | ----------- |
 | Binbin Zhu          | @enjoy-binbin | Tencent     |
 | Harkrishn Patro     | @hpatro       | Amazon      |
-| Lucas Yang          | @lucasyonge   | -           |
+| Lucas Yang          | @lucasyonge   | Percona     |
 | Madelyn Olson       | @madolson     | Amazon      |
 | Jacob Murphy        | @murphyjacob4 | Google      |
 | Ping Xie            | @pingxie      | Oracle      |

cmake/Modules/SourceFiles.cmake

@@ -10,7 +10,6 @@ set(VALKEY_SERVER_SRCS
     ${CMAKE_SOURCE_DIR}/src/quicklist.c
     ${CMAKE_SOURCE_DIR}/src/ae.c
     ${CMAKE_SOURCE_DIR}/src/anet.c
-    ${CMAKE_SOURCE_DIR}/src/dict.c
     ${CMAKE_SOURCE_DIR}/src/hashtable.c
     ${CMAKE_SOURCE_DIR}/src/kvstore.c
     ${CMAKE_SOURCE_DIR}/src/sds.c
@@ -121,14 +120,15 @@ set(VALKEY_SERVER_SRCS
     ${CMAKE_SOURCE_DIR}/src/entry.c
     ${CMAKE_SOURCE_DIR}/src/vset.c
     ${CMAKE_SOURCE_DIR}/src/fifo.c
-    ${CMAKE_SOURCE_DIR}/src/mutexqueue.c)
+    ${CMAKE_SOURCE_DIR}/src/mutexqueue.c
+    ${CMAKE_SOURCE_DIR}/src/queues.c)
 
 
 # valkey-cli
 set(VALKEY_CLI_SRCS
     ${CMAKE_SOURCE_DIR}/src/anet.c
     ${CMAKE_SOURCE_DIR}/src/adlist.c
-    ${CMAKE_SOURCE_DIR}/src/dict.c
+    ${CMAKE_SOURCE_DIR}/src/hashtable.c
     ${CMAKE_SOURCE_DIR}/src/sds.c
     ${CMAKE_SOURCE_DIR}/src/sha256.c
     ${CMAKE_SOURCE_DIR}/src/util.c
@@ -159,7 +159,7 @@ set(VALKEY_BENCHMARK_SRCS
     ${CMAKE_SOURCE_DIR}/src/valkey-benchmark.c
     ${CMAKE_SOURCE_DIR}/src/valkey_strtod.c
     ${CMAKE_SOURCE_DIR}/src/adlist.c
-    ${CMAKE_SOURCE_DIR}/src/dict.c
+    ${CMAKE_SOURCE_DIR}/src/hashtable.c
     ${CMAKE_SOURCE_DIR}/src/zmalloc.c
     ${CMAKE_SOURCE_DIR}/src/serverassert.c
     ${CMAKE_SOURCE_DIR}/src/release.c

cmake/Modules/ValkeySetup.cmake

@@ -236,7 +236,7 @@ if (BUILDING_ARM64)
 endif ()
 
 if (APPLE)
-    add_valkey_server_linker_option("-rdynamic")
+    add_valkey_server_linker_option("-Wl,-export_dynamic")
     add_valkey_server_linker_option("-ldl")
 elseif (UNIX)
     add_valkey_server_linker_option("-rdynamic")

deps/CMakeLists.txt

@@ -25,8 +25,7 @@ if (USE_RDMA) # Module or no module
         set(ENABLE_DLOPEN_RDMA ON CACHE BOOL "Build valkey_rdma with dynamic loading")
     endif()
 endif ()
-# Let libvalkey use sds and dict provided by valkey.
-set(DICT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src)
+# Let libvalkey use sds provided by valkey.
 set(SDS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src)
 
 add_subdirectory(libvalkey)

deps/Makefile

@@ -46,7 +46,7 @@ distclean:
 
 .PHONY: distclean
 
-LIBVALKEY_MAKE_FLAGS = SDS_INCLUDE_DIR=../../src/ DICT_INCLUDE_DIR=../../src/
+LIBVALKEY_MAKE_FLAGS = SDS_INCLUDE_DIR=../../src/
 ifneq (,$(filter $(BUILD_TLS),yes module))
     LIBVALKEY_MAKE_FLAGS += USE_TLS=1
 endif