Skip to content

Fix scriptget and scriptscan #794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 27, 2021
Merged

Fix scriptget and scriptscan #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1e7e22
Fix bug in create command for scriptget, minor fix when trying to get…
alonre24 Jun 21, 2021
5b244cf
Merge branch 'master' into fix_script_bug
alonre24 Jun 24, 2021
afe0690
Merge branch 'master' into fix_script_bug
alonre24 Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/redis_ai_objects/model.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ int RAI_GetModelFromKeyspace(RedisModuleCtx *ctx, RedisModuleString *keyName, RA
RedisModule_Log(ctx, "warning", "could not load %s from keyspace, key doesn't exist",
RedisModule_StringPtrLen(keyName, NULL));
RAI_SetError(err, RAI_EKEYEMPTY, "ERR model key is empty");
return REDISMODULE_ERR;
#else
if (VerifyKeyInThisShard(ctx, keyName)) { // Relevant for enterprise cluster.
RAI_SetError(err, RAI_EKEYEMPTY, "ERR model key is empty");
Expand All @@ -232,6 +231,7 @@ int RAI_GetModelFromKeyspace(RedisModuleCtx *ctx, RedisModuleString *keyName, RA
"ERR CROSSSLOT Keys in request don't hash to the same slot");
}
#endif
return REDISMODULE_ERR;
}
if (RedisModule_ModuleTypeGetType(key) != RedisAI_ModelType) {
RedisModule_CloseKey(key);
Expand Down
1 change: 0 additions & 1 deletion src/redis_ai_objects/script.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ int RAI_GetScriptFromKeyspace(RedisModuleCtx *ctx, RedisModuleString *keyName, R
RedisModule_Log(ctx, "warning", "could not load %s from keyspace, key doesn't exist",
RedisModule_StringPtrLen(keyName, NULL));
RAI_SetError(err, RAI_EKEYEMPTY, "ERR script key is empty");
return REDISMODULE_ERR;
#else
if (VerifyKeyInThisShard(ctx, keyName)) { // Relevant for enterprise cluster.
RAI_SetError(err, RAI_EKEYEMPTY, "ERR script key is empty");
Expand Down
4 changes: 2 additions & 2 deletions src/redisai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,7 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
return REDISMODULE_ERR;

if (RedisModule_CreateCommand(ctx, "ai.scriptget", RedisAI_ScriptGet_RedisCommand, "readonly",
0, 0, 0) == REDISMODULE_ERR)
1, 1, 1) == REDISMODULE_ERR)
return REDISMODULE_ERR;

if (RedisModule_CreateCommand(ctx, "ai.scriptdel", RedisAI_ScriptDel_RedisCommand, "write", 1,
Expand All @@ -1403,7 +1403,7 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
return REDISMODULE_ERR;

if (RedisModule_CreateCommand(ctx, "ai._scriptscan", RedisAI_ScriptScan_RedisCommand,
"readonly", 1, 1, 1) == REDISMODULE_ERR)
"readonly", 0, 0, 0) == REDISMODULE_ERR)
return REDISMODULE_ERR;

if (RedisModule_CreateCommand(ctx, "ai.info", RedisAI_Info_RedisCommand, "readonly", 1, 1, 1) ==
Expand Down