gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge cf8971dde3b7f7a76b65eaf4815c5067cfb47d76 into 26c6f1af9b29d525831c7fa9840ab3e47ed7b700

Browse Source
This commit is contained in:
Sarthak Aggarwal 2025-02-01 23:32:13 +08:00 committed by GitHub
commit 606bb4ccce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lolwut.c
View File

@ -43,8 +43,8 @@ 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. ");
rendered = sdscat(rendered, VALKEY_VERSION);
sds rendered = sdscatprintf(sdsempty(), "%s ver.", server.extended_redis_compat ? "Redis" : "Valkey");
rendered = sdscat(rendered, server.extended_redis_compat ? REDIS_VERSION : VALKEY_VERSION);
rendered = sdscatlen(rendered, "\n", 1);
addReplyVerbatim(c, rendered, sdslen(rendered), "txt");
sdsfree(rendered);

2
src/script.c
View File

@ -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;
}

4
tests/unit/other.tcl
View File

@ -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
}
}
}