diff --git a/src/cluster.c b/src/cluster.c index 2e3a53ddc..aaad17358 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -5270,7 +5270,7 @@ void dumpCommand(client *c) { return; } -/* RESTORE key ttl serialized-value [REPLACE] */ +/* RESTORE key ttl serialized-value [REPLACE] [ABSTTL] [IDLETIME seconds] [FREQ frequency] */ void restoreCommand(client *c) { long long ttl, lfu_freq = -1, lru_idle = -1, lru_clock = -1; rio payload; diff --git a/src/module.c b/src/module.c index fbcc0f1f3..c74cdfc90 100644 --- a/src/module.c +++ b/src/module.c @@ -96,7 +96,7 @@ struct AutoMemEntry { int type; }; -/* AutMemEntry type field values. */ +/* AutoMemEntry type field values. */ #define REDISMODULE_AM_KEY 0 #define REDISMODULE_AM_STRING 1 #define REDISMODULE_AM_REPLY 2 @@ -991,10 +991,10 @@ RedisModuleCommandProxy *moduleCreateCommandProxy(RedisModuleCtx *ctx, const cha * if (RedisModule_CreateCommand(ctx,"module.config",NULL,"",0,0,0) == REDISMODULE_ERR) * return REDISMODULE_ERR; * - * if (RedisModule_CreateSubcommand(ctx,"container.config","set",cmd_config_set,"",0,0,0) == REDISMODULE_ERR) + * if (RedisModule_CreateSubcommand(ctx,"module.config","set",cmd_config_set,"",0,0,0) == REDISMODULE_ERR) * return REDISMODULE_ERR; * - * if (RedisModule_CreateSubcommand(ctx,"container.config","get",cmd_config_get,"",0,0,0) == REDISMODULE_ERR) + * if (RedisModule_CreateSubcommand(ctx,"module.config","get",cmd_config_get,"",0,0,0) == REDISMODULE_ERR) * return REDISMODULE_ERR; * */ @@ -9815,7 +9815,7 @@ void addReplyLoadedModules(client *c) { } /* Helper for genModulesInfoString(): given a list of modules, return - * am SDS string in the form "[modulename|modulename2|...]" */ + * an SDS string in the form "[modulename|modulename2|...]" */ sds genModulesInfoStringRenderModulesList(list *l) { listIter li; listNode *ln; diff --git a/src/sentinel.c b/src/sentinel.c index 840090953..1db3bc261 100644 --- a/src/sentinel.c +++ b/src/sentinel.c @@ -1481,33 +1481,6 @@ sentinelRedisInstance *sentinelGetMasterByName(char *name) { return ri; } -/* Add the specified flags to all the instances in the specified dictionary. */ -void sentinelAddFlagsToDictOfRedisInstances(dict *instances, int flags) { - dictIterator *di; - dictEntry *de; - - di = dictGetIterator(instances); - while((de = dictNext(di)) != NULL) { - sentinelRedisInstance *ri = dictGetVal(de); - ri->flags |= flags; - } - dictReleaseIterator(di); -} - -/* Remove the specified flags to all the instances in the specified - * dictionary. */ -void sentinelDelFlagsToDictOfRedisInstances(dict *instances, int flags) { - dictIterator *di; - dictEntry *de; - - di = dictGetIterator(instances); - while((de = dictNext(di)) != NULL) { - sentinelRedisInstance *ri = dictGetVal(de); - ri->flags &= ~flags; - } - dictReleaseIterator(di); -} - /* Reset the state of a monitored master: * 1) Remove all slaves. * 2) Remove all sentinels. diff --git a/src/server.h b/src/server.h index 92abc391b..78d94c7a7 100644 --- a/src/server.h +++ b/src/server.h @@ -2411,7 +2411,6 @@ int ACLCheckPubsubChannelPerm(sds channel, list *allowed, int literal); int ACLCheckAllUserCommandPerm(const user *u, struct redisCommand *cmd, robj **argv, int argc, int *idxptr); int ACLCheckAllPerm(client *c, int *idxptr); int ACLSetUser(user *u, const char *op, ssize_t oplen); -sds ACLDefaultUserFirstPassword(void); uint64_t ACLGetCommandCategoryFlagByName(const char *name); int ACLAppendUserForLoading(sds *argv, int argc, int *argc_err); const char *ACLSetUserStringError(void);