Fix indentation and comment style in testmodule

This commit is contained in:
Dvir Volk 2017-12-07 17:19:04 +02:00
parent f27a64232e
commit 613831f820

View File

@ -125,6 +125,7 @@ int failTest(RedisModuleCtx *ctx, const char *msg) {
RedisModule_ReplyWithError(ctx, msg); RedisModule_ReplyWithError(ctx, msg);
return REDISMODULE_ERR; return REDISMODULE_ERR;
} }
int TestUnlink(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { int TestUnlink(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
RedisModule_AutoMemory(ctx); RedisModule_AutoMemory(ctx);
REDISMODULE_NOT_USED(argv); REDISMODULE_NOT_USED(argv);
@ -154,10 +155,12 @@ int TestUnlink(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
} }
int NotifyCallback(RedisModuleCtx *ctx, int type, const char *event, RedisModuleString *key) { int NotifyCallback(RedisModuleCtx *ctx, int type, const char *event,
// Increment a counter on the notifications: RedisModuleString *key) {
// for each key notified we increment a counter /* Increment a counter on the notifications: for each key notified we
RedisModule_Log(ctx, "notice", "Got event type %d, event %s, key %s", type, event, RedisModule_StringPtrLen(key, NULL)); * increment a counter */
RedisModule_Log(ctx, "notice", "Got event type %d, event %s, key %s", type,
event, RedisModule_StringPtrLen(key, NULL));
RedisModule_Call(ctx, "HINCRBY", "csc", "notifications", key, "1"); RedisModule_Call(ctx, "HINCRBY", "csc", "notifications", key, "1");
return REDISMODULE_OK; return REDISMODULE_OK;
@ -170,8 +173,7 @@ int TestNotifications(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
#define FAIL(msg, ...) \ #define FAIL(msg, ...) \
{ \ { \
RedisModule_Log(ctx, "warning", "Failed NOTIFY Test. Reason: " #msg, \ RedisModule_Log(ctx, "warning", "Failed NOTIFY Test. Reason: " #msg, ##__VA_ARGS__); \
##__VA_ARGS__); \
goto err; \ goto err; \
} }
RedisModule_Call(ctx, "FLUSHDB", ""); RedisModule_Call(ctx, "FLUSHDB", "");
@ -182,21 +184,19 @@ int TestNotifications(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
RedisModule_Call(ctx, "SADD", "cc", "bar", "y"); RedisModule_Call(ctx, "SADD", "cc", "bar", "y");
RedisModule_Call(ctx, "HSET", "ccc", "baz", "x", "y"); RedisModule_Call(ctx, "HSET", "ccc", "baz", "x", "y");
// LPUSH should be ignored and not increment any counters /* LPUSH should be ignored and not increment any counters */
RedisModule_Call(ctx, "LPUSH", "cc", "l", "y"); RedisModule_Call(ctx, "LPUSH", "cc", "l", "y");
RedisModule_Call(ctx, "LPUSH", "cc", "l", "y"); RedisModule_Call(ctx, "LPUSH", "cc", "l", "y");
size_t sz; size_t sz;
const char *rep; const char *rep;
RedisModuleCallReply *r = RedisModuleCallReply *r = RedisModule_Call(ctx, "HGET", "cc", "notifications", "foo");
RedisModule_Call(ctx, "HGET", "cc", "notifications", "foo");
if (r == NULL || RedisModule_CallReplyType(r) != REDISMODULE_REPLY_STRING) { if (r == NULL || RedisModule_CallReplyType(r) != REDISMODULE_REPLY_STRING) {
FAIL("Wrong or no reply for foo"); FAIL("Wrong or no reply for foo");
} else { } else {
rep = RedisModule_CallReplyStringPtr(r, &sz); rep = RedisModule_CallReplyStringPtr(r, &sz);
if (sz != 1 || *rep != '2') { if (sz != 1 || *rep != '2') {
FAIL("Got reply '%s'. expected '2'", FAIL("Got reply '%s'. expected '2'", RedisModule_CallReplyStringPtr(r, NULL));
RedisModule_CallReplyStringPtr(r, NULL));
} }
} }
@ -219,7 +219,7 @@ int TestNotifications(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
FAIL("Got reply '%.*s'. expected '1'", sz, rep); FAIL("Got reply '%.*s'. expected '1'", sz, rep);
} }
} }
// for l we expect nothing since we didn't subscribe to list events /* For l we expect nothing since we didn't subscribe to list events */
r = RedisModule_Call(ctx, "HGET", "cc", "notifications", "l"); r = RedisModule_Call(ctx, "HGET", "cc", "notifications", "l");
if (r == NULL || RedisModule_CallReplyType(r) != REDISMODULE_REPLY_NULL) { if (r == NULL || RedisModule_CallReplyType(r) != REDISMODULE_REPLY_NULL) {
FAIL("Wrong reply for l"); FAIL("Wrong reply for l");
@ -263,15 +263,13 @@ int TestCtxFlags(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
/* Enable AOF to test AOF flags */ /* Enable AOF to test AOF flags */
RedisModule_Call(ctx, "config", "ccc", "set", "appendonly", "yes"); RedisModule_Call(ctx, "config", "ccc", "set", "appendonly", "yes");
flags = RedisModule_GetContextFlags(ctx); flags = RedisModule_GetContextFlags(ctx);
if (!(flags & REDISMODULE_CTX_FLAGS_AOF)) if (!(flags & REDISMODULE_CTX_FLAGS_AOF)) FAIL("AOF Flag not set after config set");
FAIL("AOF Flag not set after config set");
if (flags & REDISMODULE_CTX_FLAGS_RDB) FAIL("RDB Flag was set"); if (flags & REDISMODULE_CTX_FLAGS_RDB) FAIL("RDB Flag was set");
/* Enable RDB to test RDB flags */ /* Enable RDB to test RDB flags */
RedisModule_Call(ctx, "config", "ccc", "set", "save", "900 1"); RedisModule_Call(ctx, "config", "ccc", "set", "save", "900 1");
flags = RedisModule_GetContextFlags(ctx); flags = RedisModule_GetContextFlags(ctx);
if (!(flags & REDISMODULE_CTX_FLAGS_RDB)) if (!(flags & REDISMODULE_CTX_FLAGS_RDB)) FAIL("RDB Flag was not set after config set");
FAIL("RDB Flag was not set after config set");
if (!(flags & REDISMODULE_CTX_FLAGS_MASTER)) FAIL("Master flag was not set"); if (!(flags & REDISMODULE_CTX_FLAGS_MASTER)) FAIL("Master flag was not set");
if (flags & REDISMODULE_CTX_FLAGS_SLAVE) FAIL("Slave flag was set"); if (flags & REDISMODULE_CTX_FLAGS_SLAVE) FAIL("Slave flag was set");
@ -279,18 +277,16 @@ int TestCtxFlags(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
if (flags & REDISMODULE_CTX_FLAGS_CLUSTER) FAIL("Cluster flag was set"); if (flags & REDISMODULE_CTX_FLAGS_CLUSTER) FAIL("Cluster flag was set");
if (flags & REDISMODULE_CTX_FLAGS_MAXMEMORY) FAIL("Maxmemory flag was set"); if (flags & REDISMODULE_CTX_FLAGS_MAXMEMORY) FAIL("Maxmemory flag was set");
;
RedisModule_Call(ctx, "config", "ccc", "set", "maxmemory", "100000000"); RedisModule_Call(ctx, "config", "ccc", "set", "maxmemory", "100000000");
flags = RedisModule_GetContextFlags(ctx); flags = RedisModule_GetContextFlags(ctx);
if (!(flags & REDISMODULE_CTX_FLAGS_MAXMEMORY)) if (!(flags & REDISMODULE_CTX_FLAGS_MAXMEMORY))
FAIL("Maxmemory flag was not set after config set"); FAIL("Maxmemory flag was not set after config set");
if (flags & REDISMODULE_CTX_FLAGS_EVICT) FAIL("Eviction flag was set"); if (flags & REDISMODULE_CTX_FLAGS_EVICT) FAIL("Eviction flag was set");
RedisModule_Call(ctx, "config", "ccc", "set", "maxmemory-policy", RedisModule_Call(ctx, "config", "ccc", "set", "maxmemory-policy", "allkeys-lru");
"allkeys-lru");
flags = RedisModule_GetContextFlags(ctx); flags = RedisModule_GetContextFlags(ctx);
if (!(flags & REDISMODULE_CTX_FLAGS_EVICT)) if (!(flags & REDISMODULE_CTX_FLAGS_EVICT)) FAIL("Eviction flag was not set after config set");
FAIL("Eviction flag was not set after config set");
end: end:
/* Revert config changes */ /* Revert config changes */
@ -300,15 +296,13 @@ int TestCtxFlags(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
RedisModule_Call(ctx, "config", "ccc", "set", "maxmemory-policy", "noeviction"); RedisModule_Call(ctx, "config", "ccc", "set", "maxmemory-policy", "noeviction");
if (!ok) { if (!ok) {
RedisModule_Log(ctx, "warning", "Failed CTXFLAGS Test. Reason: %s", RedisModule_Log(ctx, "warning", "Failed CTXFLAGS Test. Reason: %s", errString);
errString);
return RedisModule_ReplyWithSimpleString(ctx, "ERR"); return RedisModule_ReplyWithSimpleString(ctx, "ERR");
} }
return RedisModule_ReplyWithSimpleString(ctx, "OK"); return RedisModule_ReplyWithSimpleString(ctx, "OK");
} }
/* ----------------------------- Test framework ----------------------------- */ /* ----------------------------- Test framework ----------------------------- */
/* Return 1 if the reply matches the specified string, otherwise log errors /* Return 1 if the reply matches the specified string, otherwise log errors