Merge branch 'unstable' into slot_migration

deps/Makefile

@@ -1,4 +1,4 @@
-# Redis dependency Makefile
+# Dependency Makefile
 
 uname_S:= $(shell sh -c 'uname -s 2>/dev/null || echo not')
 

src/.gitignore

@@ -1,5 +1,5 @@
 *.gcda
 *.gcno
 *.gcov
-redis.info
+valkey.info
 lcov-html

src/Makefile

@@ -342,7 +342,7 @@ else
     endef
 endif
 
-# Determine install/unstall Redis symlinks for compatibility when 
+# Determine install/uninstall Redis symlinks for compatibility when 
 # installing/uninstalling Valkey binaries (defaulting to `yes`)
 USE_REDIS_SYMLINKS?=yes
 ifeq ($(USE_REDIS_SYMLINKS),yes)
@@ -518,8 +518,8 @@ check: test
 lcov:
 	$(MAKE) gcov
 	@(set -e; cd ..; ./runtest --clients 1)
-	@geninfo -o redis.info .
-	@genhtml --legend -o lcov-html redis.info
+	@geninfo -o valkey.info .
+	@genhtml --legend -o lcov-html valkey.info
 
 .PHONY: lcov
 

src/acl.c

@@ -168,7 +168,7 @@ typedef struct {
      * execute this command.
      *
      * If the bit for a given command is NOT set and the command has
-     * allowed first-args, Redis will also check allowed_firstargs in order to
+     * allowed first-args, the server will also check allowed_firstargs in order to
      * understand if the command can be executed. */
     uint64_t allowed_commands[USER_COMMAND_BITS_COUNT/64];
     /* allowed_firstargs is used by ACL rules to block access to a command unless a
@@ -502,7 +502,7 @@ void ACLFreeUserAndKillClients(user *u) {
         if (c->user == u) {
             /* We'll free the connection asynchronously, so
              * in theory to set a different user is not needed.
-             * However if there are bugs in Redis, soon or later
+             * However if there are bugs in the server, soon or later
              * this may result in some security hole: it's much
              * more defensive to set the default user and put
              * it in non authenticated mode. */
@@ -1023,7 +1023,7 @@ aclSelector *aclCreateSelectorFromOpSet(const char *opset, size_t opsetlen) {
  * +@<category> Allow the execution of all the commands in such category
  *              with valid categories are like @admin, @set, @sortedset, ...
  *              and so forth, see the full list in the server.c file where
- *              the Redis command table is described and defined.
+ *              the command table is described and defined.
  *              The special category @all means all the commands, but currently
  *              present in the server, and that will be loaded in the future
  *              via modules.
@@ -3204,7 +3204,7 @@ void addReplyCommandCategories(client *c, struct serverCommand *cmd) {
 }
 
 /* AUTH <password>
- * AUTH <username> <password> (Redis >= 6.0 form)
+ * AUTH <username> <password> (Redis OSS >= 6.0 form)
  *
  * When the user is omitted it means that we are trying to authenticate
  * against the default user. */

src/ae.c

@@ -258,7 +258,7 @@ int aeDeleteTimeEvent(aeEventLoop *eventLoop, long long id)
  * If there are no timers, -1 is returned.
  *
  * Note that's O(N) since time events are unsorted.
- * Possible optimizations (not needed by Redis so far, but...):
+ * Possible optimizations (not needed so far, but...):
  * 1) Insert the event in order, so that the nearest is just the head.
  *    Much better but still insertion or deletion of timers is O(N).
  * 2) Use a skiplist to have this operation as O(1) and insertion as O(log(N)).

src/anet.c

@@ -372,7 +372,7 @@ int anetResolve(char *err, char *host, char *ipbuf, size_t ipbuf_len,
 
 static int anetSetReuseAddr(char *err, int fd) {
     int yes = 1;
-    /* Make sure connection-intensive things like the redis benchmark
+    /* Make sure connection-intensive things like the benchmark tool
      * will be able to close/open sockets a zillion of times */
     if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) == -1) {
         anetSetError(err, "setsockopt SO_REUSEADDR: %s", strerror(errno));
@@ -388,7 +388,7 @@ static int anetCreateSocket(char *err, int domain) {
         return ANET_ERR;
     }
 
-    /* Make sure connection-intensive things like the redis benchmark
+    /* Make sure connection-intensive things like the benchmark tool
      * will be able to close/open sockets a zillion of times */
     if (anetSetReuseAddr(err,s) == ANET_ERR) {
         close(s);
@@ -501,7 +501,7 @@ int anetUnixGenericConnect(char *err, const char *path, int flags)
         return ANET_ERR;
 
     sa.sun_family = AF_LOCAL;
-    redis_strlcpy(sa.sun_path,path,sizeof(sa.sun_path));
+    valkey_strlcpy(sa.sun_path,path,sizeof(sa.sun_path));
     if (flags & ANET_CONNECT_NONBLOCK) {
         if (anetNonBlock(err,s) != ANET_OK) {
             close(s);
@@ -613,7 +613,7 @@ int anetUnixServer(char *err, char *path, mode_t perm, int backlog)
 
     memset(&sa,0,sizeof(sa));
     sa.sun_family = AF_LOCAL;
-    redis_strlcpy(sa.sun_path,path,sizeof(sa.sun_path));
+    valkey_strlcpy(sa.sun_path,path,sizeof(sa.sun_path));
     if (anetListen(err,s,(struct sockaddr*)&sa,sizeof(sa),backlog,perm) == ANET_ERR)
         return ANET_ERR;
     return s;

src/aof.c

@@ -59,11 +59,11 @@ void aof_background_fsync_and_close(int fd);
  *
  * Append-only files consist of three types:
  *
- * BASE: Represents a Redis snapshot from the time of last AOF rewrite. The manifest
+ * BASE: Represents a server snapshot from the time of last AOF rewrite. The manifest
  * file contains at most a single BASE file, which will always be the first file in the
  * list.
  *
- * INCR: Represents all write commands executed by Redis following the last successful
+ * INCR: Represents all write commands executed by the server following the last successful
  * AOF rewrite. In some cases it is possible to have several ordered INCR files. For
  * example:
  *   - During an on-going AOF rewrite
@@ -119,7 +119,7 @@ aofInfo *aofInfoDup(aofInfo *orig) {
 
 /* Format aofInfo as a string and it will be a line in the manifest.
  *
- * When update this format, make sure to update redis-check-aof as well. */
+ * When update this format, make sure to update valkey-check-aof as well. */
 sds aofInfoFormat(sds buf, aofInfo *ai) {
     sds filename_repr = NULL;
 
@@ -222,10 +222,10 @@ sds getAofManifestAsString(aofManifest *am) {
 }
 
 /* Load the manifest information from the disk to `server.aof_manifest`
- * when the Redis server start.
+ * when the server starts.
  *
  * During loading, this function does strict error checking and will abort
- * the entire Redis server process on error (I/O error, invalid format, etc.)
+ * the entire server process on error (I/O error, invalid format, etc.)
  *
  * If the AOF directory or manifest file do not exist, this will be ignored
  * in order to support seamless upgrades from previous versions which did not
@@ -253,7 +253,7 @@ void aofLoadManifestFromDisk(void) {
     sdsfree(am_filepath);
 }
 
-/* Generic manifest loading function, used in `aofLoadManifestFromDisk` and redis-check-aof tool. */
+/* Generic manifest loading function, used in `aofLoadManifestFromDisk` and valkey-check-aof tool. */
 #define MANIFEST_MAX_LINE 1024
 aofManifest *aofLoadManifestFromFile(sds am_filepath) {
     const char *err = NULL;
@@ -609,15 +609,15 @@ int persistAofManifest(aofManifest *am) {
     return ret;
 }
 
-/* Called in `loadAppendOnlyFiles` when we upgrade from a old version redis.
+/* Called in `loadAppendOnlyFiles` when we upgrade from a old version of the server.
  *
  * 1) Create AOF directory use 'server.aof_dirname' as the name.
  * 2) Use 'server.aof_filename' to construct a BASE type aofInfo and add it to
  *    aofManifest, then persist the manifest file to AOF directory.
  * 3) Move the old AOF file (server.aof_filename) to AOF directory.
  *
  * If any of the above steps fails or crash occurs, this will not cause any
- * problems, and redis will retry the upgrade process when it restarts.
+ * problems, and the server will retry the upgrade process when it restarts.
  */
 void aofUpgradePrepare(aofManifest *am) {
     serverAssert(!aofFileExist(server.aof_filename));
@@ -704,13 +704,13 @@ void aofDelTempIncrAofFile(void) {
     return;
 }
 
-/* Called after `loadDataFromDisk` when redis start. If `server.aof_state` is
+/* Called after `loadDataFromDisk` when the server starts. If `server.aof_state` is
  * 'AOF_ON', It will do three things:
- * 1. Force create a BASE file when redis starts with an empty dataset
+ * 1. Force create a BASE file when the server starts with an empty dataset
  * 2. Open the last opened INCR type AOF for writing, If not, create a new one
  * 3. Synchronously update the manifest file to the disk
  *
- * If any of the above steps fails, the redis process will exit.
+ * If any of the above steps fails, the server process will exit.
  */
 void aofOpenIfNeededOnServerStart(void) {
     if (server.aof_state != AOF_ON) {
@@ -856,7 +856,7 @@ int openNewIncrAofForAppend(void) {
 
 /* Whether to limit the execution of Background AOF rewrite.
  *
- * At present, if AOFRW fails, redis will automatically retry. If it continues
+ * At present, if AOFRW fails, the server will automatically retry. If it continues
  * to fail, we may get a lot of very small INCR files. so we need an AOFRW
  * limiting measure.
  *
@@ -1371,7 +1371,7 @@ void feedAppendOnlyFile(int dictid, robj **argv, int argc) {
  * AOF loading
  * ------------------------------------------------------------------------- */
 
-/* In Redis commands are always executed in the context of a client, so in
+/* Commands are always executed in the context of a client, so in
  * order to load the append only file we need to create a fake client. */
 struct client *createAOFClient(void) {
     struct client *c = createClient(NULL);
@@ -1390,7 +1390,7 @@ struct client *createAOFClient(void) {
     c->flags = CLIENT_DENY_BLOCKING;
 
     /* We set the fake client as a slave waiting for the synchronization
-     * so that Redis will not try to send replies to this client. */
+     * so that the server will not try to send replies to this client. */
     c->replstate = SLAVE_STATE_WAIT_BGSAVE_START;
     return c;
 }
@@ -1664,7 +1664,7 @@ int loadAppendOnlyFiles(aofManifest *am) {
     int total_num, aof_num = 0, last_file;
 
     /* If the 'server.aof_filename' file exists in dir, we may be starting
-     * from an old redis version. We will use enter upgrade mode in three situations.
+     * from an old server version. We will use enter upgrade mode in three situations.
      *
      * 1. If the 'server.aof_dirname' directory not exist
      * 2. If the 'server.aof_dirname' directory exists but the manifest file is missing
@@ -1954,7 +1954,7 @@ int rewriteSortedSetObject(rio *r, robj *key, robj *o) {
 }
 
 /* Write either the key or the value of the currently selected item of a hash.
- * The 'hi' argument passes a valid Redis hash iterator.
+ * The 'hi' argument passes a valid hash iterator.
  * The 'what' filed specifies if to write a key or a value and can be
  * either OBJ_HASH_KEY or OBJ_HASH_VALUE.
  *
@@ -2208,7 +2208,7 @@ int rewriteStreamObject(rio *r, robj *key, robj *o) {
 }
 
 /* Call the module type callback in order to rewrite a data type
- * that is exported by a module and is not handled by Redis itself.
+ * that is exported by a module and is not handled by the server itself.
  * The function returns 0 on error, 1 on success. */
 int rewriteModuleObject(rio *r, robj *key, robj *o, int dbid) {
     ValkeyModuleIO io;
@@ -2347,7 +2347,7 @@ int rewriteAppendOnlyFileRio(rio *aof) {
  * "filename". Used both by REWRITEAOF and BGREWRITEAOF.
  *
  * In order to minimize the number of commands needed in the rewritten
- * log Redis uses variadic commands when possible, such as RPUSH, SADD
+ * log, the server uses variadic commands when possible, such as RPUSH, SADD
  * and ZADD. However at max AOF_REWRITE_ITEMS_PER_CMD items per time
  * are inserted using a single command. */
 int rewriteAppendOnlyFile(char *filename) {
@@ -2419,7 +2419,7 @@ int rewriteAppendOnlyFile(char *filename) {
 /* This is how rewriting of the append only file in background works:
  *
  * 1) The user calls BGREWRITEAOF
- * 2) Redis calls this function, that forks():
+ * 2) The server calls this function, that forks():
  *    2a) the child rewrite the append only file in a temp file.
  *    2b) the parent open a new INCR AOF file to continue writing.
  * 3) When the child finished '2a' exists.

src/asciilogo.h

@@ -28,20 +28,22 @@
  */
 
 const char *ascii_logo =
-"                     ___   ___                                                           \n"
-"                    (   ) (   )                                                         \n"
-" ___  ___    .---.   | |   | |   ___     .--.    ___  ___                               \n"
-"(   )(   )  / .-, \\  | |   | |  (   )   /    \\  (   )(   )   Valkey %s (%s/%d) %s bit  \n"
-" | |  | |  (__) ; |  | |   | |  ' /    |  .-. ;  | |  | |                               \n"
-" | |  | |    .'`  |  | |   | |,' /     |  | | |  | |  | |    Running in %s mode         \n"
-" | |  | |   / .'| |  | |   | .  '.     |  |/  |  | '  | |    Port: %d                   \n"
-" | |  | |  | /  | |  | |   | | `. \\    |  ' _.'  '  `-' |    PID: %ld                 \n"
-" ' '  ; '  ; |  ; |  | |   | |   \\ \\   |  .'.-.   `.__. |                            \n"
-"  \\ `' /   ' `-'  |  | |   | |    \\ .  '  `-' /   ___ | |                             \n"
-"   \\__/    `.__.'_. (___) (___ )  (___) `.__.'   (   )' |    https://valkey.io\n"
-"                                                  ; `-' '                               \n"
-"                                                   .__.'                                \n"
-"                                                                                        \n"
-"                                                                                        \n\n";
-
-
+"                .+^+.                                                \n"
+"            .+#########+.                                            \n"
+"        .+########+########+.           Valkey %s (%s/%d) %s bit\n"
+"    .+########+'     '+########+.                                    \n"
+" .########+'     .+.     '+########.    Running in %s mode\n"
+" |####+'     .+#######+.     '+####|    Port: %d\n"
+" |###|   .+###############+.   |###|    PID: %ld                     \n"
+" |###|   |#####*'' ''*#####|   |###|                                 \n"
+" |###|   |####'  .-.  '####|   |###|                                 \n"
+" |###|   |###(  (@@@)  )###|   |###|          https://valkey.io      \n"
+" |###|   |####.  '-'  .####|   |###|                                 \n"
+" |###|   |#####*.   .*#####|   |###|                                 \n"
+" |###|   '+#####|   |#####+'   |###|                                 \n"
+" |####+.     +##|   |#+'     .+####|                                 \n"
+" '#######+   |##|        .+########'                                 \n"
+"    '+###|   |##|    .+########+'                                    \n"
+"        '|   |####+########+'                                        \n"
+"             +#########+'                                            \n"
+"                '+v+'                                                \n\n";

src/atomicvar.h

@@ -83,13 +83,13 @@
 /* Define serverAtomic for atomic variable. */
 #define serverAtomic
 
-/* To test Redis with Helgrind (a Valgrind tool) it is useful to define
+/* To test the server with Helgrind (a Valgrind tool) it is useful to define
  * the following macro, so that __sync macros are used: those can be detected
  * by Helgrind (even if they are less efficient) so that no false positive
  * is reported. */
 // #define __ATOMIC_VAR_FORCE_SYNC_MACROS
 
-/* There will be many false positives if we test Redis with Helgrind, since
+/* There will be many false positives if we test the server with Helgrind, since
  * Helgrind can't understand we have imposed ordering on the program, so
  * we use macros in helgrind.h to tell Helgrind inter-thread happens-before
  * relationship explicitly for avoiding false positives.

src/bio.c

@@ -1,4 +1,4 @@
-/* Background I/O service for Redis.
+/* Background I/O service for the server.
  *
  * This file implements operations that we need to perform in the background.
  * Currently there is only a single operation, that is a background close(2)
@@ -8,7 +8,7 @@
  *
  * In the future we'll either continue implementing new things we need or
  * we'll switch to libeio. However there are probably long term uses for this
- * file as we may want to put here Redis specific background tasks (for instance
+ * file as we may want to put here server specific background tasks (for instance
  * it is not impossible that we'll need a non blocking FLUSHDB/FLUSHALL
  * implementation).
  *
@@ -323,7 +323,7 @@ void bioDrainWorker(int job_type) {
 
 /* Kill the running bio threads in an unclean way. This function should be
  * used only when it's critical to stop the threads for some reason.
- * Currently Redis does this only on crash (for instance on SIGSEGV) in order
+ * Currently the server does this only on crash (for instance on SIGSEGV) in order
  * to perform a fast memory check without other threads messing with memory. */
 void bioKillThreads(void) {
     int err;

src/bitops.c

@@ -406,7 +406,7 @@ void printBits(unsigned char *p, unsigned long count) {
 
 /* This helper function used by GETBIT / SETBIT parses the bit offset argument
  * making sure an error is returned if it is negative or if it overflows
- * Redis 512 MB limit for the string value or more (server.proto_max_bulk_len).
+ * the server's 512 MB limit for the string value or more (server.proto_max_bulk_len).
  *
  * If the 'hash' argument is true, and 'bits is positive, then the command
  * will also parse bit offsets prefixed by "#". In such a case the offset
@@ -443,7 +443,7 @@ int getBitOffsetFromArgument(client *c, robj *o, uint64_t *offset, int hash, int
 /* This helper function for BITFIELD parses a bitfield type in the form
  * <sign><bits> where sign is 'u' or 'i' for unsigned and signed, and
  * the bits is a value between 1 and 64. However 64 bits unsigned integers
- * are reported as an error because of current limitations of Redis protocol
+ * are reported as an error because of current limitations of RESP
  * to return unsigned integer values greater than INT64_MAX.
  *
  * On error C_ERR is returned and an error is sent to the client. */

src/blocked.c

@@ -292,7 +292,7 @@ void disconnectAllBlockedClients(void) {
     }
 }
 
-/* This function should be called by Redis every time a single command,
+/* This function should be called by the server every time a single command,
  * a MULTI/EXEC block, or a Lua script, terminated its execution after
  * being called by a client. It handles serving clients blocked in all scenarios
  * where a specific key access requires to block until that key is available.
@@ -310,7 +310,7 @@ void disconnectAllBlockedClients(void) {
  * do client side, indeed!). Because mismatching clients (blocking for
  * a different type compared to the current key type) are moved in the
  * other side of the linked list. However as long as the key starts to
- * be used only for a single type, like virtually any Redis application will
+ * be used only for a single type, like virtually any application will
  * do, the function is already fair. */
 void handleClientsBlockedOnKeys(void) {
 

src/call_reply.c

@@ -525,7 +525,7 @@ list *callReplyDeferredErrorList(CallReply *rep) {
  * callReplyGetPrivateData().
  *
  * NOTE: The parser used for parsing the reply and producing CallReply is
- * designed to handle valid replies created by Redis itself. IT IS NOT
+ * designed to handle valid replies created by the server itself. IT IS NOT
  * DESIGNED TO HANDLE USER INPUT and using it to parse invalid replies is
  * unsafe.
  */

src/cli_commands.h

@@ -1,6 +1,6 @@
-/* This file is used by redis-cli in place of server.h when including commands.c
+/* This file is used by valkey-cli in place of server.h when including commands.c
  * It contains alternative structs which omit the parts of the commands table
- * that are not suitable for redis-cli, e.g. the command proc. */
+ * that are not suitable for valkey-cli, e.g. the command proc. */
 
 #ifndef VALKEY_CLI_COMMANDS_H
 #define VALKEY_CLI_COMMANDS_H