mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix function load error message (#10964) 

Update error messages for function load

(cherry picked from commit beb9746a9f)
This commit is contained in:
Wen Hui 2022-08-02 21:19:53 -04:00 committed by Oran Agra
parent 631eb3837e
commit d1b3276b55
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/functions.c
View File

@ -245,7 +245,7 @@ functionsLibCtx* functionsLibCtxCreate() {
*/
int functionLibCreateFunction(sds name, void *function, functionLibInfo *li, sds desc, uint64_t f_flags, sds *err) {
if (functionsVerifyName(name) != C_OK) {
*err = sdsnew("Function names can only contain letters and numbers and must be at least one character long");
*err = sdsnew("Library names can only contain letters, numbers, or underscores(_) and must be at least one character long");
return C_ERR;
}
@ -819,7 +819,7 @@ void functionFlushCommand(client *c) {
/* FUNCTION HELP */
void functionHelpCommand(client *c) {
const char *help[] = {
"LOAD <ENGINE NAME> <LIBRARY NAME> [REPLACE] [DESCRIPTION <LIBRARY DESCRIPTION>] <LIBRARY CODE>",
"LOAD [REPLACE] <FUNCTION CODE>",
" Create a new library with the given library name and code.",
"DELETE <LIBRARY NAME>",
" Delete the given library.",
@ -847,7 +847,7 @@ void functionHelpCommand(client *c) {
" * ASYNC: Asynchronously flush the libraries.",
" * SYNC: Synchronously flush the libraries.",
"DUMP",
" Returns a serialized payload representing the current libraries, can be restored using FUNCTION RESTORE command",
" Return a serialized payload representing the current libraries, can be restored using FUNCTION RESTORE command",
"RESTORE <PAYLOAD> [FLUSH|APPEND|REPLACE]",
" Restore the libraries represented by the given payload, it is possible to give a restore policy to",
" control how to handle existing libraries (default APPEND):",
@ -961,7 +961,7 @@ sds functionsCreateWithLibraryCtx(sds code, int replace, sds* err, functionsLibC
}
if (functionsVerifyName(md.name)) {
*err = sdsnew("Library names can only contain letters and numbers and must be at least one character long");
*err = sdsnew("Library names can only contain letters, numbers, or underscores(_) and must be at least one character long");
goto error;
}

6
tests/unit/functions.tcl
View File

@ -38,7 +38,7 @@ start_server {tags {"scripting"}} {
r function load [get_function_code LUA {bad\0foramat} test {return 'hello1'}]
} e
set _ $e
} {*Library names can only contain letters and numbers*}
} {*Library names can only contain letters, numbers, or underscores(_)*}
test {FUNCTION - Create library with unexisting engine} {
catch {
@ -597,7 +597,7 @@ start_server {tags {"scripting"}} {
}
} e
set _ $e
} {*Function names can only contain letters and numbers and must be at least one character long*}
} {*Library names can only contain letters, numbers, or underscores(_) and must be at least one character long*}
test {LIBRARIES - test registration with empty name} {
catch {
@ -606,7 +606,7 @@ start_server {tags {"scripting"}} {
}
} e
set _ $e
} {*Function names can only contain letters and numbers and must be at least one character long*}
} {*Library names can only contain letters, numbers, or underscores(_) and must be at least one character long*}
test {LIBRARIES - math.random from function load} {
catch {