Skip to content

Fix use of key pos API, and point to first tensor key in command def #161

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
lantiga merged 2 commits into from
Jul 18, 2019
Merged

Fix use of key pos API, and point to first tensor key in command def #161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a422d85
Fix use of key pos API, and point to first tensor key in command def
lantiga Jul 18, 2019
a6a1f35
Fix offsets
lantiga Jul 18, 2019
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
28 changes: 22 additions & 6 deletions src/redisai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,14 +688,22 @@ int RedisAI_ModelRun_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv,
// be picked up on the next round. We also need to signal when it's time to dispose
// of the old model.
// The key is having a single thread looping for execution
if (argc < 3) return RedisModule_WrongArity(ctx);

if (RedisModule_IsKeysPositionRequest(ctx)) {
RedisModule_KeyAtPos(ctx, 1);
for (int i=2; i<argc; i++) {
const char* arg = RedisModule_StringPtrLen(argv[i], NULL);
if (strcasecmp(arg, "INPUTS") == 0 || strcasecmp(arg, "OUTPUTS") == 0) {
continue;
}
RedisModule_KeyAtPos(ctx, i);
}
return REDISMODULE_OK;
}

RedisModule_AutoMemory(ctx);

if (argc < 3) return RedisModule_WrongArity(ctx);

ArgsCursor ac;
ArgsCursor_InitRString(&ac, argv+1, argc-1);

Expand Down Expand Up @@ -848,14 +856,22 @@ int RedisAI_StartRunThread() {

// script key, fnname, INPUTS, key1, key2 ... OUTPUTS, key1, key2 ...
int RedisAI_ScriptRun_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
if (argc < 4) return RedisModule_WrongArity(ctx);

if (RedisModule_IsKeysPositionRequest(ctx)) {
RedisModule_KeyAtPos(ctx, 1);
for (int i=3; i<argc; i++) {
const char* arg = RedisModule_StringPtrLen(argv[i], NULL);
if (strcasecmp(arg, "INPUTS") == 0 || strcasecmp(arg, "OUTPUTS") == 0) {
continue;
}
RedisModule_KeyAtPos(ctx, i);
}
return REDISMODULE_OK;
}

RedisModule_AutoMemory(ctx);

if (argc < 4) return RedisModule_WrongArity(ctx);

ArgsCursor ac;
ArgsCursor_InitRString(&ac, argv+1, argc-1);

Expand Down Expand Up @@ -1187,7 +1203,7 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
== REDISMODULE_ERR)
return REDISMODULE_ERR;

if (RedisModule_CreateCommand(ctx, "ai.modelrun", RedisAI_ModelRun_RedisCommand, "write getkeys-api", 1, 1, 1)
if (RedisModule_CreateCommand(ctx, "ai.modelrun", RedisAI_ModelRun_RedisCommand, "write getkeys-api", 3, 3, 1)
== REDISMODULE_ERR)
return REDISMODULE_ERR;

Expand All @@ -1199,7 +1215,7 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
== REDISMODULE_ERR)
return REDISMODULE_ERR;

if (RedisModule_CreateCommand(ctx, "ai.scriptrun", RedisAI_ScriptRun_RedisCommand, "write getkeys-api", 1, 1, 1)
if (RedisModule_CreateCommand(ctx, "ai.scriptrun", RedisAI_ScriptRun_RedisCommand, "write getkeys-api", 4, 4, 1)
== REDISMODULE_ERR)
return REDISMODULE_ERR;

Expand Down