From 2f336b5eb74ec24219b09ac8d23e75e3d41f56d7 Mon Sep 17 00:00:00 2001 From: Dvir Volk Date: Wed, 27 Sep 2017 11:56:40 +0300 Subject: [PATCH] Renamed GetCtxFlags to GetContextFlags --- src/module.c | 4 ++-- src/modules/testmodule.c | 12 ++++++------ src/redismodule.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/module.c b/src/module.c index f467c5a49..ab5e5518a 100644 --- a/src/module.c +++ b/src/module.c @@ -1290,7 +1290,7 @@ int RM_GetSelectedDb(RedisModuleCtx *ctx) { * * REDISMODULE_CTX_FLAGS_EVICT: Maxmemory is set and has an eviction * policy that may delete keys */ -int RM_GetCtxFlags(RedisModuleCtx *ctx) { +int RM_GetContextFlags(RedisModuleCtx *ctx) { int flags = 0; /* Client specific flags */ @@ -3959,7 +3959,7 @@ void moduleRegisterCoreAPI(void) { REGISTER_API(IsKeysPositionRequest); REGISTER_API(KeyAtPos); REGISTER_API(GetClientId); - REGISTER_API(GetCtxFlags); + REGISTER_API(GetContextFlags); REGISTER_API(PoolAlloc); REGISTER_API(CreateDataType); REGISTER_API(ModuleTypeSetValue); diff --git a/src/modules/testmodule.c b/src/modules/testmodule.c index 58e397790..a0d706fea 100644 --- a/src/modules/testmodule.c +++ b/src/modules/testmodule.c @@ -121,7 +121,7 @@ int TestStringPrintf(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { } -/* TEST.CTXFLAGS -- Test GetCtxFlags. */ +/* TEST.CTXFLAGS -- Test GetContextFlags. */ int TestCtxFlags(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { REDISMODULE_NOT_USED(argc); REDISMODULE_NOT_USED(argv); @@ -138,7 +138,7 @@ int TestCtxFlags(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { goto end; \ } - int flags = RedisModule_GetCtxFlags(ctx); + int flags = RedisModule_GetContextFlags(ctx); if (flags == 0) { FAIL("Got no flags"); } @@ -149,14 +149,14 @@ int TestCtxFlags(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { if (flags & REDISMODULE_CTX_FLAGS_AOF) FAIL("AOF Flag was set") /* Enable AOF to test AOF flags */ RedisModule_Call(ctx, "config", "ccc", "set", "appendonly", "yes"); - flags = RedisModule_GetCtxFlags(ctx); + flags = RedisModule_GetContextFlags(ctx); if (!(flags & REDISMODULE_CTX_FLAGS_AOF)) FAIL("AOF Flag not set after config set"); if (flags & REDISMODULE_CTX_FLAGS_RDB) FAIL("RDB Flag was set"); /* Enable RDB to test RDB flags */ RedisModule_Call(ctx, "config", "ccc", "set", "save", "900 1"); - flags = RedisModule_GetCtxFlags(ctx); + flags = RedisModule_GetContextFlags(ctx); if (!(flags & REDISMODULE_CTX_FLAGS_RDB)) FAIL("RDB Flag was not set after config set"); @@ -168,14 +168,14 @@ int TestCtxFlags(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { if (flags & REDISMODULE_CTX_FLAGS_MAXMEMORY) FAIL("Maxmemory flag was set"); ; RedisModule_Call(ctx, "config", "ccc", "set", "maxmemory", "100000000"); - flags = RedisModule_GetCtxFlags(ctx); + flags = RedisModule_GetContextFlags(ctx); if (!(flags & REDISMODULE_CTX_FLAGS_MAXMEMORY)) FAIL("Maxmemory flag was not set after config set"); if (flags & REDISMODULE_CTX_FLAGS_EVICT) FAIL("Eviction flag was set"); RedisModule_Call(ctx, "config", "ccc", "set", "maxmemory-policy", "allkeys-lru"); - flags = RedisModule_GetCtxFlags(ctx); + flags = RedisModule_GetContextFlags(ctx); if (!(flags & REDISMODULE_CTX_FLAGS_EVICT)) FAIL("Eviction flag was not set after config set"); diff --git a/src/redismodule.h b/src/redismodule.h index 4aa35190b..8df203aba 100644 --- a/src/redismodule.h +++ b/src/redismodule.h @@ -58,7 +58,7 @@ #define REDISMODULE_HASH_CFIELDS (1<<2) #define REDISMODULE_HASH_EXISTS (1<<3) -/* Context Flags: Info about the current context returned by RM_GetCtxFlags */ +/* Context Flags: Info about the current context returned by RM_GetContextFlags */ /* The command is running in the context of a Lua script */ #define REDISMODULE_CTX_FLAGS_LUA 0x0001 @@ -207,7 +207,7 @@ int REDISMODULE_API_FUNC(RedisModule_HashGet)(RedisModuleKey *key, int flags, .. int REDISMODULE_API_FUNC(RedisModule_IsKeysPositionRequest)(RedisModuleCtx *ctx); void REDISMODULE_API_FUNC(RedisModule_KeyAtPos)(RedisModuleCtx *ctx, int pos); unsigned long long REDISMODULE_API_FUNC(RedisModule_GetClientId)(RedisModuleCtx *ctx); -int REDISMODULE_API_FUNC(RedisModule_GetCtxFlags)(RedisModuleCtx *ctx); +int REDISMODULE_API_FUNC(RedisModule_GetContextFlags)(RedisModuleCtx *ctx); void *REDISMODULE_API_FUNC(RedisModule_PoolAlloc)(RedisModuleCtx *ctx, size_t bytes); RedisModuleType *REDISMODULE_API_FUNC(RedisModule_CreateDataType)(RedisModuleCtx *ctx, const char *name, int encver, RedisModuleTypeMethods *typemethods); int REDISMODULE_API_FUNC(RedisModule_ModuleTypeSetValue)(RedisModuleKey *key, RedisModuleType *mt, void *value); @@ -327,7 +327,7 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int REDISMODULE_GET_API(IsKeysPositionRequest); REDISMODULE_GET_API(KeyAtPos); REDISMODULE_GET_API(GetClientId); - REDISMODULE_GET_API(GetCtxFlags); + REDISMODULE_GET_API(GetContextFlags); REDISMODULE_GET_API(PoolAlloc); REDISMODULE_GET_API(CreateDataType); REDISMODULE_GET_API(ModuleTypeSetValue);