Revert "Revert "Merge branch 'valkey-io:unstable' into unstable""

This reverts commit 654f516.

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     - name: make
       # Fail build if there are warnings
       # build with TLS just for compilation coverage
-      run: make SERVER_CFLAGS='-Werror' BUILD_TLS=yes
+      run: make all-with-unit-tests SERVER_CFLAGS='-Werror' BUILD_TLS=yes
     - name: test
       run: |
         sudo apt-get install tcl8.6 tclx
@@ -27,6 +27,9 @@ jobs:
         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

.github/workflows/daily.yml

@@ -54,7 +54,7 @@ jobs:
         repository: ${{ env.GITHUB_REPOSITORY }}
         ref: ${{ env.GITHUB_HEAD_REF }}
     - name: make
-      run: make SERVER_CFLAGS='-Werror -DSERVER_TEST'
+      run: make all-with-unit-tests SERVER_CFLAGS='-Werror -DSERVER_TEST'
     - name: testprep
       run: sudo apt-get install tcl8.6 tclx
     - name: test
@@ -69,9 +69,12 @@ jobs:
     - name: cluster tests
       if: true && !contains(github.event.inputs.skiptests, 'cluster')
       run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
-    - name: unittest
+    - name: legacy unit tests
       if: true && !contains(github.event.inputs.skiptests, 'unittest')
       run: ./src/valkey-server test all --accurate
+    - name: new unit tests
+      if: true && !contains(github.event.inputs.skiptests, 'unittest')
+      run: ./src/valkey-unit-tests --accurate
 
   test-ubuntu-jemalloc-fortify:
     runs-on: ubuntu-latest
@@ -113,9 +116,12 @@ jobs:
     - name: cluster tests
       if: true && !contains(github.event.inputs.skiptests, 'cluster')
       run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
-    - name: unittest
+    - name: legacy unit tests
       if: true && !contains(github.event.inputs.skiptests, 'unittest')
       run: ./src/valkey-server test all --accurate
+    - name: new unit tests
+      if: true && !contains(github.event.inputs.skiptests, 'unittest')
+      run: make valkey-unit-tests && ./src/valkey-unit-tests --accurate
 
   test-ubuntu-libc-malloc:
     runs-on: ubuntu-latest
@@ -231,9 +237,12 @@ jobs:
     - name: cluster tests
       if: true && !contains(github.event.inputs.skiptests, 'cluster')
       run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
-    - name: unittest
+    - name: legacy unit tests
       if: true && !contains(github.event.inputs.skiptests, 'unittest')
       run: ./src/valkey-server test all --accurate
+    - name: new unit tests
+      if: true && !contains(github.event.inputs.skiptests, 'unittest')
+      run: ./src/valkey-unit-tests --accurate
 
   test-ubuntu-tls:
     runs-on: ubuntu-latest
@@ -589,7 +598,7 @@ jobs:
           repository: ${{ env.GITHUB_REPOSITORY }}
           ref: ${{ env.GITHUB_HEAD_REF }}
       - name: make
-        run: make SANITIZER=address SERVER_CFLAGS='-DSERVER_TEST -Werror -DDEBUG_ASSERTIONS'
+        run: make all-with-unit-tests SANITIZER=address SERVER_CFLAGS='-DSERVER_TEST -Werror -DDEBUG_ASSERTIONS'
       - name: testprep
         # Work around ASAN issue, see https://github.com/google/sanitizers/issues/1716
         run: |
@@ -608,9 +617,12 @@ jobs:
       - name: cluster tests
         if: true && !contains(github.event.inputs.skiptests, 'cluster')
         run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
-      - name: unittest
+      - name: legacy unit tests
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: ./src/valkey-server test all
+      - name: new unit tests
+        if: true && !contains(github.event.inputs.skiptests, 'unittest')
+        run: ./src/valkey-unit-tests
 
   test-sanitizer-undefined:
     runs-on: ubuntu-latest
@@ -638,7 +650,7 @@ jobs:
           repository: ${{ env.GITHUB_REPOSITORY }}
           ref: ${{ env.GITHUB_HEAD_REF }}
       - name: make
-        run: make SANITIZER=undefined SERVER_CFLAGS='-DSERVER_TEST -Werror' LUA_DEBUG=yes # we (ab)use this flow to also check Lua C API violations
+        run: make all-with-unit-tests SANITIZER=undefined SERVER_CFLAGS='-DSERVER_TEST -Werror' LUA_DEBUG=yes # we (ab)use this flow to also check Lua C API violations
       - name: testprep
         run: |
           sudo apt-get update
@@ -655,9 +667,12 @@ jobs:
       - name: cluster tests
         if: true && !contains(github.event.inputs.skiptests, 'cluster')
         run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
-      - name: unittest
+      - name: legacy unit tests
         if: true && !contains(github.event.inputs.skiptests, 'unittest')
         run: ./src/valkey-server test all --accurate
+      - name: new unit tests
+        if: true && !contains(github.event.inputs.skiptests, 'unittest')
+        run: ./src/valkey-unit-tests --accurate
 
   test-centos7-jemalloc:
     runs-on: ubuntu-latest

.gitignore

@@ -1,5 +1,6 @@
 .*.swp
 *.o
+*.a
 *.xo
 *.so
 *.d
@@ -12,6 +13,7 @@ dump.rdb
 *-cli
 *-sentinel
 *-server
+*-unit-tests
 doc-tools
 release
 misc/*

00-RELEASENOTES

@@ -1,5 +1,5 @@
 Hello! This file is just a placeholder, since this is the "unstable" branch
-of Redis, the place where all the development happens.
+of Valkey, the place where all the development happens.
 
 There is no release notes for this branch, it gets forked into another branch
 every time there is a partial feature freeze in order to eventually create
@@ -9,8 +9,8 @@ Usually "unstable" is stable enough for you to use it in development environment
 however you should never use it in production environments. It is possible
 to download the latest stable release here:
 
-    https://download.redis.io/redis-stable.tar.gz
+    https://valkey.io/download/
 
-More information is available at https://redis.io
+More information is available at https://valkey.io
 
 Happy hacking!

CONTRIBUTING.md

@@ -3,6 +3,10 @@ Contributing to Valkey
 
 Welcome and thank you for wanting to contribute!
 
+# Project governance
+
+The Valkey project is led by a Technical Steering Committee, whose responsibilities are laid out in [GOVERNANCE.md](GOVERNANCE.md).
+
 ## Get started
 
 * Have a question? Ask it on

GOVERNANCE.md

@@ -0,0 +1,68 @@
+# Project Governance
+
+The Valkey project is managed by a Technical Steering Committee (TSC) composed of the maintainers of the Valkey repository.
+The Valkey project includes all of the current and future repositories under the Valkey-io organization.
+Maintainers are defined as individuals with full commit access to a repository, which shall be in sync with the MAINTAINERS.md file in a given projects repository.
+Maintainers of other repositories within the Valkey project are not members of the TSC unless explicitly added.
+
+## Technical Steering Committee
+
+The TSC is responsible for oversight of all technical, project, approval, and policy matters for Valkey.
+
+The TSC members are listed in the [MAINTAINERS.md](MAINTAINERS.md) file in the Valkey repository.
+Maintainers (and accordingly, TSC members) may be added or removed by no less than 2/3 affirmative vote of the current TSC.
+The TSC shall appoint a Chair responsible for organizing TSC meetings.
+If the TSC Chair is removed from the TSC (or the Chair steps down from that role), it is the responsibility of the TSC to appoint a new Chair.
+The TSC can amend this governance document by no less than a 2/3 affirmative vote.
+
+The TSC may, at its discretion, add or remove members who are not maintainers of the main Valkey repository.
+The TSC may, at its discretion, add or remove maintainers from other repositories within the Valkey project.
+
+## Voting
+
+The TSC shall strive for all decisions to be made by consensus.
+While explicit agreement of the entire TSC is preferred, it is not required for consensus.
+Rather, the TSC shall determine consensus based on their good faith consideration of a number of factors, including the dominant view of the TSC and nature of support and objections.
+The TSC shall document evidence of consensus in accordance with these requirements.
+If consensus cannot be reached, the TSC shall make the decision by a vote.
+
+A vote shall also be called when an issue or pull request is marked as a major decision, which are decisions that have a significant impact on the Valkey architecture or design.
+Examples of major decisions:
+    * Fundamental changes to the Valkey core datastructures
+    * Adding a new data structure or API
+    * Changes that affect backward compatibility
+    * New user visible fields that need to be maintained
+    * Modifications to the TSC or other governance documents
+    * Adding members to other roles within the Valkey project
+    * Delegation of maintainership for projects to other groups or individuals
+    * Adding or removing a new external library such as a client
+    or module to the project.
+
+Any member of the TSC can call a vote with reasonable notice to the TSC, setting out a discussion period and a separate voting period.
+Any discussion may be conducted in person or electronically by text, voice, or video.
+The discussion shall be open to the public, with the notable exception of discussions involving embargoed security issues or the addition or removal of maintainers, which will be private.
+In any vote, each voting TSC member will have one vote.
+The TSC shall give at least two weeks for all members to submit their vote.
+Except as specifically noted elsewhere in this document, decisions by vote require a simple majority vote of all voting members.
+It is the responsibility of the TSC chair to help facilitate the voting process as needed to make sure it completes within the voting period.
+
+## Termination of Membership
+
+A maintainer's access (and accordingly, their position on the TSC) will be removed if any of the following occur:
+
+* Resignation: Written notice of resignation to the TSC.
+* TSC Vote: 2/3 affirmative vote of the TSC to remove a member
+* Unreachable Member: If a member is unresponsive for more than six months, the remaining active members of the TSC may vote to remove the unreachable member by a simple majority.
+
+## Technical direction for other Valkey projects
+
+The TSC may delegate decision making for other projects within the Valkey organization to the maintainers responsible for those projects.
+Delegation of decision making for a project is considered a major decision, and shall happen with an explicit vote.
+Projects within the Valkey organization must indicate the individuals with commit permissions by updating the MAINTAINERS.md within their repositories.
+
+The TSC may, at its discretion, overrule the decisions made by other projects within the Valkey organization, although they should show restraint in doing so.
+
+## License of this document
+
+This document may be used, modified, and/or distributed under the terms of the
+[Creative Commons Attribution 4.0 International (CC-BY) license](https://creativecommons.org/licenses/by/4.0/legalcode).

MAINTAINERS.md

@@ -0,0 +1,23 @@
+## Overview
+
+This document contains a list of maintainers in this repo.
+See [GOVERNANCE.md](GOVERNANCE.md) that explains the function of this file.
+
+## Current Maintainers
+
+Maintainers listed in alphabetical order by their github ID.
+
+| Maintainer          | GitHub ID                                       | Affiliation |
+| ------------------- | ----------------------------------------------- | ----------- |
+| Zhu Binbin          | [enjoy-binbin](https://github.com/enjoy-binbin) | Tencent     |
+| Wen Hui             | [hwware](https://github.com/hwware)             | Huawei      |
+| Madelyn Olson       | [madolson](https://github.com/madolson)         | Amazon      |
+| Ping Xie            | [pingxie](https://github.com/pingxie)           | Google      |
+| Zhao Zhao           | [soloestoy](https://github.com/soloestoy)       | Alibaba     |
+| Viktor Söderqvist   | [zuiderkwast](https://github.com/zuiderkwast)   | Ericsson    |
+
+
+### Former Maintainers
+
+| Maintainer          | GitHub ID                                       | Affiliation |
+| ------------------- | ----------------------------------------------- | ----------- |

MANIFESTO

@@ -1,5 +1,5 @@
-[Note: this is the Redis manifesto, for general information about
-       installing and running Redis read the README file instead.]
+[Note: This was the manifesto of Redis. It does not represent the ideals of Valkey, but is
+       kept in remembrance for the ideals that Salvatore had for the project.] 
 
 Redis Manifesto
 ===============

deps/README.md

@@ -1,9 +1,9 @@
-This directory contains all Redis dependencies, except for the libc that
+This directory contains all Valkey dependencies, except for the libc that
 should be provided by the operating system.
 
 * **Jemalloc** is our memory allocator, used as replacement for libc malloc on Linux by default. It has good performances and excellent fragmentation behavior. This component is upgraded from time to time.
 * **hiredis** is the official C client library for Redis. It is used by redis-cli, redis-benchmark and Redis Sentinel. It is part of the Redis official ecosystem but is developed externally from the Redis repository, so we just upgrade it as needed.
-* **linenoise** is a readline replacement. It is developed by the same authors of Redis but is managed as a separated project and updated as needed.
+* **linenoise** is a readline replacement. It is developed by the same authors of Valkey but is managed as a separated project and updated as needed.
 * **lua** is Lua 5.1 with minor changes for security and additional libraries.
 * **hdr_histogram** Used for per-command latency tracking histograms.
 
@@ -13,10 +13,10 @@ How to upgrade the above dependencies
 Jemalloc
 ---
 
-Jemalloc is modified with changes that allow us to implement the Redis
-active defragmentation logic. However this feature of Redis is not mandatory
-and Redis is able to understand if the Jemalloc version it is compiled
-against supports such Redis-specific modifications. So in theory, if you
+Jemalloc is modified with changes that allow us to implement the Valkey
+active defragmentation logic. However this feature of Valkey is not mandatory
+and Valkey is able to understand if the Jemalloc version it is compiled
+against supports such Valkey-specific modifications. So in theory, if you
 are not interested in the active defragmentation, you can replace Jemalloc
 just following these steps:
 
@@ -28,7 +28,7 @@ just following these steps:
    Jemalloc configuration script is broken and will not work nested in another
    git repository.
 
-However note that we change Jemalloc settings via the `configure` script of Jemalloc using the `--with-lg-quantum` option, setting it to the value of 3 instead of 4. This provides us with more size classes that better suit the Redis data structures, in order to gain memory efficiency.
+However note that we change Jemalloc settings via the `configure` script of Jemalloc using the `--with-lg-quantum` option, setting it to the value of 3 instead of 4. This provides us with more size classes that better suit the Valkey data structures, in order to gain memory efficiency.
 
 If you want to upgrade Jemalloc while also providing support for
 active defragmentation, in addition to the above steps you need to perform
@@ -38,7 +38,7 @@ the following additional steps:
    to add `#define JEMALLOC_FRAG_HINT`.
 6. Implement the function `je_get_defrag_hint()` inside `src/jemalloc.c`. You
    can see how it is implemented in the current Jemalloc source tree shipped
-   with Redis, and rewrite it according to the new Jemalloc internals, if they
+   with Valkey, and rewrite it according to the new Jemalloc internals, if they
    changed, otherwise you could just copy the old implementation if you are
    upgrading just to a similar version of Jemalloc.
 
@@ -61,7 +61,7 @@ cd deps/jemalloc
 Hiredis
 ---
 
-Hiredis is used by Sentinel, `redis-cli` and `redis-benchmark`. Like Redis, uses the SDS string library, but not necessarily the same version. In order to avoid conflicts, this version has all SDS identifiers prefixed by `hi`.
+Hiredis is used by Sentinel, `valkey-cli` and `valkey-benchmark`. Like Valkey, uses the SDS string library, but not necessarily the same version. In order to avoid conflicts, this version has all SDS identifiers prefixed by `hi`.
 
 1. `git subtree pull --prefix deps/hiredis https://github.com/redis/hiredis.git <version-tag> --squash`<br>
 This should hopefully merge the local changes into the new version.
@@ -71,7 +71,7 @@ Linenoise
 ---
 
 Linenoise is rarely upgraded as needed. The upgrade process is trivial since
-Redis uses a non modified version of linenoise, so to upgrade just do the
+Valkey uses a non modified version of linenoise, so to upgrade just do the
 following:
 
 1. Remove the linenoise directory.
@@ -81,11 +81,11 @@ Lua
 ---
 
 We use Lua 5.1 and no upgrade is planned currently, since we don't want to break
-Lua scripts for new Lua features: in the context of Redis Lua scripts the
+Lua scripts for new Lua features: in the context of Valkey Lua scripts the
 capabilities of 5.1 are usually more than enough, the release is rock solid,
 and we definitely don't want to break old scripts.
 
-So upgrading of Lua is up to the Redis project maintainers and should be a
+So upgrading of Lua is up to the Valkey project maintainers and should be a
 manual procedure performed by taking a diff between the different versions.
 
 Currently we have at least the following differences between official Lua 5.1

deps/linenoise/README.markdown

@@ -17,7 +17,7 @@ Line editing with some support for history is a really important feature for com
 So what usually happens is either:
 
  * Large programs with configure scripts disabling line editing if readline is not present in the system, or not supporting it at all since readline is GPL licensed and libedit (the BSD clone) is not as known and available as readline is (Real world example of this problem: Tclsh).
- * Smaller programs not using a configure script not supporting line editing at all (A problem we had with Redis-cli for instance).
+ * Smaller programs not using a configure script not supporting line editing at all (A problem we had with Valkey-cli for instance).
 
 The result is a pollution of binaries without line editing support.