mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup: fix typo and remove some obsoleting definitions. (#9851)

This commit is contained in:
Huang Zhw 2021-11-28 06:47:51 +08:00 committed by GitHub
parent fa48fb2d0f
commit 596635fa0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cluster.c
View File

@ -5270,7 +5270,7 @@ void dumpCommand(client *c) {
return; return;
} }
/* RESTORE key ttl serialized-value [REPLACE] */ /* RESTORE key ttl serialized-value [REPLACE] [ABSTTL] [IDLETIME seconds] [FREQ frequency] */
void restoreCommand(client *c) { void restoreCommand(client *c) {
long long ttl, lfu_freq = -1, lru_idle = -1, lru_clock = -1; long long ttl, lfu_freq = -1, lru_idle = -1, lru_clock = -1;
rio payload; rio payload;

8
src/module.c
View File

@ -96,7 +96,7 @@ struct AutoMemEntry {
int type; int type;
}; };
/* AutMemEntry type field values. */ /* AutoMemEntry type field values. */
#define REDISMODULE_AM_KEY 0 #define REDISMODULE_AM_KEY 0
#define REDISMODULE_AM_STRING 1 #define REDISMODULE_AM_STRING 1
#define REDISMODULE_AM_REPLY 2 #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) * if (RedisModule_CreateCommand(ctx,"module.config",NULL,"",0,0,0) == REDISMODULE_ERR)
* return 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; * 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; * return REDISMODULE_ERR;
* *
*/ */
@ -9815,7 +9815,7 @@ void addReplyLoadedModules(client *c) {
} }
/* Helper for genModulesInfoString(): given a list of modules, return /* 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) { sds genModulesInfoStringRenderModulesList(list *l) {
listIter li; listIter li;
listNode *ln; listNode *ln;

27
src/sentinel.c
View File

@ -1481,33 +1481,6 @@ sentinelRedisInstance *sentinelGetMasterByName(char *name) {
return ri; 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: /* Reset the state of a monitored master:
* 1) Remove all slaves. * 1) Remove all slaves.
* 2) Remove all sentinels. * 2) Remove all sentinels.

1
src/server.h
View File

@ -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 ACLCheckAllUserCommandPerm(const user *u, struct redisCommand *cmd, robj **argv, int argc, int *idxptr);
int ACLCheckAllPerm(client *c, int *idxptr); int ACLCheckAllPerm(client *c, int *idxptr);
int ACLSetUser(user *u, const char *op, ssize_t oplen); int ACLSetUser(user *u, const char *op, ssize_t oplen);
sds ACLDefaultUserFirstPassword(void);
uint64_t ACLGetCommandCategoryFlagByName(const char *name); uint64_t ACLGetCommandCategoryFlagByName(const char *name);
int ACLAppendUserForLoading(sds *argv, int argc, int *argc_err); int ACLAppendUserForLoading(sds *argv, int argc, int *argc_err);
const char *ACLSetUserStringError(void); const char *ACLSetUserStringError(void);