From 3ad139bd08fa8db7ce8eaa76c21ecd223ee5d35b Mon Sep 17 00:00:00 2001 From: Sarthak Aggarwal Date: Tue, 14 Jan 2025 11:47:15 -0800 Subject: [PATCH 1/3] nit rename to valkey Signed-off-by: Sarthak Aggarwal --- src/lolwut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lolwut.c b/src/lolwut.c index d4b7031873..80a9fe78bb 100644 --- a/src/lolwut.c +++ b/src/lolwut.c @@ -43,7 +43,7 @@ void lolwut6Command(client *c); /* The default target for LOLWUT if no matching version was found. * This is what unstable versions of the server will display. */ void lolwutUnstableCommand(client *c) { - sds rendered = sdsnew("Redis ver. "); + sds rendered = sdsnew("Valkey ver. "); rendered = sdscat(rendered, VALKEY_VERSION); rendered = sdscatlen(rendered, "\n", 1); addReplyVerbatim(c, rendered, sdslen(rendered), "txt"); From a14f77ab11def56ac811053979afa93d1e254d0f Mon Sep 17 00:00:00 2001 From: Sarthak Aggarwal Date: Mon, 27 Jan 2025 12:42:04 -0800 Subject: [PATCH 2/3] depending on extended-redis-compat Signed-off-by: Sarthak Aggarwal --- src/lolwut.c | 2 +- src/script.c | 2 +- tests/unit/other.tcl | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lolwut.c b/src/lolwut.c index 80a9fe78bb..655bfa6072 100644 --- a/src/lolwut.c +++ b/src/lolwut.c @@ -43,7 +43,7 @@ void lolwut6Command(client *c); /* The default target for LOLWUT if no matching version was found. * This is what unstable versions of the server will display. */ void lolwutUnstableCommand(client *c) { - sds rendered = sdsnew("Valkey ver. "); + sds rendered = sdscatprintf(sdsempty(), "%s ver.", server.extended_redis_compat ? "Redis" : "Valkey"); rendered = sdscat(rendered, VALKEY_VERSION); rendered = sdscatlen(rendered, "\n", 1); addReplyVerbatim(c, rendered, sdslen(rendered), "txt"); diff --git a/src/script.c b/src/script.c index a8e5b18eb9..1691e25a69 100644 --- a/src/script.c +++ b/src/script.c @@ -548,7 +548,7 @@ void scriptCall(scriptRunCtx *run_ctx, sds *err) { /* There are commands that are not allowed inside scripts. */ if (!server.script_disable_deny_script && (cmd->flags & CMD_NOSCRIPT)) { - *err = sdsnew("This Redis command is not allowed from script"); + *err = sdscatprintf(sdsempty(), "This %s command is not allowed from script", server.extended_redis_compat ? "Redis" : "Valkey"); goto error; } diff --git a/tests/unit/other.tcl b/tests/unit/other.tcl index 0793283592..177fefa64a 100644 --- a/tests/unit/other.tcl +++ b/tests/unit/other.tcl @@ -385,6 +385,8 @@ start_server {tags {"other"}} { set info [r info server] assert_match "*redis_mode:*" $info assert_no_match "*server_mode:*" $info + set lolwut_output [r lolwut] + assert_match {*Redis ver.*} $lolwut_output r config set extended-redis-compatibility no set hello [r hello 3] assert_equal "valkey" [dict get $hello server] @@ -392,6 +394,8 @@ start_server {tags {"other"}} { set info [r info server] assert_no_match "*redis_mode:*" $info assert_match "*server_mode:*" $info + set lolwut_output [r lolwut] + assert_match {*Valkey ver.*} $lolwut_output } } } From cf8971dde3b7f7a76b65eaf4815c5067cfb47d76 Mon Sep 17 00:00:00 2001 From: Sarthak Aggarwal Date: Thu, 30 Jan 2025 10:25:01 -0800 Subject: [PATCH 3/3] keeping fixed redis version Signed-off-by: Sarthak Aggarwal --- src/lolwut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lolwut.c b/src/lolwut.c index 655bfa6072..adc64e1e0c 100644 --- a/src/lolwut.c +++ b/src/lolwut.c @@ -44,7 +44,7 @@ void lolwut6Command(client *c); * This is what unstable versions of the server will display. */ void lolwutUnstableCommand(client *c) { sds rendered = sdscatprintf(sdsempty(), "%s ver.", server.extended_redis_compat ? "Redis" : "Valkey"); - rendered = sdscat(rendered, VALKEY_VERSION); + rendered = sdscat(rendered, server.extended_redis_compat ? REDIS_VERSION : VALKEY_VERSION); rendered = sdscatlen(rendered, "\n", 1); addReplyVerbatim(c, rendered, sdslen(rendered), "txt"); sdsfree(rendered);