Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
596635fa
Unverified
Commit
596635fa
authored
Nov 28, 2021
by
Huang Zhw
Committed by
GitHub
Nov 27, 2021
Browse files
Cleanup: fix typo and remove some obsoleting definitions. (#9851)
parent
fa48fb2d
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
596635fa
...
@@ -5270,7 +5270,7 @@ void dumpCommand(client *c) {
...
@@ -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
;
...
...
src/module.c
View file @
596635fa
...
@@ -96,7 +96,7 @@ struct AutoMemEntry {
...
@@ -96,7 +96,7 @@ struct AutoMemEntry {
int
type
;
int
type
;
};
};
/* AutMemEntry type field values. */
/* Aut
o
MemEntry 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
...
@@ -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) {
...
@@ -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
* a
m
SDS string in the form "[modulename|modulename2|...]" */
* a
n
SDS string in the form "[modulename|modulename2|...]" */
sds
genModulesInfoStringRenderModulesList
(
list
*
l
)
{
sds
genModulesInfoStringRenderModulesList
(
list
*
l
)
{
listIter
li
;
listIter
li
;
listNode
*
ln
;
listNode
*
ln
;
...
...
src/sentinel.c
View file @
596635fa
...
@@ -1481,33 +1481,6 @@ sentinelRedisInstance *sentinelGetMasterByName(char *name) {
...
@@ -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.
...
...
src/server.h
View file @
596635fa
...
@@ -2411,7 +2411,6 @@ int ACLCheckPubsubChannelPerm(sds channel, list *allowed, int literal);
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment