fix code review comments

redis · Jun 22, 2021 · f0097eb · f0097eb
1 parent 46618b0
commit f0097eb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/module.c b/src/module.c
@@ -2559,19 +2559,19 @@ int RM_StringTruncate(RedisModuleKey *key, size_t newlen) {
     } else {
         /* Unshare and resize. */
         key->value = dbUnshareStringValue(key->db, key->key, key->value);
-	if (newlen == 0) {
-	    sdsfree(key->value->ptr);
-	    key->value->ptr = sdsempty();
-	} else {
-	    size_t curlen = sdslen(key->value->ptr);
-	    if (newlen > curlen) {
+        if (newlen == 0) {
+            sdsfree(key->value->ptr);
+            key->value->ptr = sdsempty();
+        } else {
+            size_t curlen = sdslen(key->value->ptr);
+            if (newlen > curlen) {
                 key->value->ptr = sdsgrowzero(key->value->ptr,newlen);
-	    } else if (newlen < curlen) {
+            } else if (newlen < curlen) {
                 sdsrange(key->value->ptr,0,newlen-1);
                 /* If the string is too wasteful, reallocate it. */
                 if (sdslen(key->value->ptr) < sdsavail(key->value->ptr))
-	            key->value->ptr = sdsRemoveFreeSpace(key->value->ptr);
-	    }
+                    key->value->ptr = sdsRemoveFreeSpace(key->value->ptr);
+            }
         }
     }
     return REDISMODULE_OK;

diff --git a/tests/modules/basics.c b/tests/modules/basics.c
@@ -425,8 +425,11 @@ int TestAssertIntegerReply(RedisModuleCtx *ctx, RedisModuleCallReply *reply, lon
         reply = RedisModule_Call(ctx,name,__VA_ARGS__); \
     } while (0)
 
-/* TEST.IT -- Run all the tests. */
-int TestIt(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
+/* TEST.BASICS -- Run all the tests.
+ * Note: it is useful to run these tests from the module rather than TCL
+ * since it's easier to check the reply types like that (make a distinction
+ * between 0 and "0", etc. */
+int TestBasics(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
     REDISMODULE_NOT_USED(argv);
     REDISMODULE_NOT_USED(argc);
 
@@ -509,7 +512,7 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
         return REDISMODULE_ERR;
 
     if (RedisModule_CreateCommand(ctx,"test.basics",
-        TestIt,"readonly",1,1,1) == REDISMODULE_ERR)
+        TestBasics,"readonly",1,1,1) == REDISMODULE_ERR)
         return REDISMODULE_ERR;
 
     RedisModule_SubscribeToKeyspaceEvents(ctx,

diff --git a/tests/unit/moduleapi/commandfilter.tcl b/tests/unit/moduleapi/commandfilter.tcl
@@ -81,5 +81,4 @@ start_server {tags {"modules"}} {
         assert_equal {} [r lrange log-key 0 -1]
     }
 
-    r module unload commandfilter
-}
+}