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
96e9dec4
Unverified
Commit
96e9dec4
authored
Sep 08, 2023
by
Binbin
Committed by
GitHub
Sep 08, 2023
Browse files
Bump codespell from 2.2.4 to 2.2.5 (#12557)
and adjustments.
parent
90e9fc38
Changes
10
Hide whitespace changes
Inline
Side-by-side
.codespell/requirements.txt
View file @
96e9dec4
codespell==2.2.
4
codespell==2.2.
5
src/acl.c
View file @
96e9dec4
...
@@ -309,7 +309,7 @@ void *ACLListDupSds(void *item) {
...
@@ -309,7 +309,7 @@ void *ACLListDupSds(void *item) {
/* Structure used for handling key patterns with different key
/* Structure used for handling key patterns with different key
* based permissions. */
* based permissions. */
typedef
struct
{
typedef
struct
{
int
flags
;
/* The
CMD_KEYS_* flag
s for this key pattern */
int
flags
;
/* The
ACL key permission type
s for this key pattern */
sds
pattern
;
/* The pattern to match keys against */
sds
pattern
;
/* The pattern to match keys against */
}
keyPattern
;
}
keyPattern
;
...
@@ -963,7 +963,7 @@ void ACLResetFirstArgs(aclSelector *selector) {
...
@@ -963,7 +963,7 @@ void ACLResetFirstArgs(aclSelector *selector) {
selector
->
allowed_firstargs
=
NULL
;
selector
->
allowed_firstargs
=
NULL
;
}
}
/* Add a first-ar
h
to the list of subcommands for the user 'u' and
/* Add a first-ar
g
to the list of subcommands for the user 'u' and
* the command id specified. */
* the command id specified. */
void
ACLAddAllowedFirstArg
(
aclSelector
*
selector
,
unsigned
long
id
,
const
char
*
sub
)
{
void
ACLAddAllowedFirstArg
(
aclSelector
*
selector
,
unsigned
long
id
,
const
char
*
sub
)
{
/* If this is the first first-arg to be configured for
/* If this is the first first-arg to be configured for
...
@@ -1458,7 +1458,7 @@ void ACLInit(void) {
...
@@ -1458,7 +1458,7 @@ void ACLInit(void) {
* otherwise C_ERR is returned and errno is set to:
* otherwise C_ERR is returned and errno is set to:
*
*
* EINVAL: if the username-password do not match.
* EINVAL: if the username-password do not match.
* ENO
N
ENT: if the specified user does not exist at all.
* ENOENT: if the specified user does not exist at all.
*/
*/
int
ACLCheckUserCredentials
(
robj
*
username
,
robj
*
password
)
{
int
ACLCheckUserCredentials
(
robj
*
username
,
robj
*
password
)
{
user
*
u
=
ACLGetUserByName
(
username
->
ptr
,
sdslen
(
username
->
ptr
));
user
*
u
=
ACLGetUserByName
(
username
->
ptr
,
sdslen
(
username
->
ptr
));
...
...
src/db.c
View file @
96e9dec4
...
@@ -188,8 +188,8 @@ robj *lookupKeyWriteOrReply(client *c, robj *key, robj *reply) {
...
@@ -188,8 +188,8 @@ robj *lookupKeyWriteOrReply(client *c, robj *key, robj *reply) {
/* Add the key to the DB. It's up to the caller to increment the reference
/* Add the key to the DB. It's up to the caller to increment the reference
* counter of the value if needed.
* counter of the value if needed.
*
*
* If the update_if_existing argument is false, the
the
program is aborted
* If the update_if_existing argument is false, the program is aborted
* if the key already exists, otherwise, it can fall back to dbOverwite. */
* if the key already exists, otherwise, it can fall back to dbOverw
r
ite. */
static
void
dbAddInternal
(
redisDb
*
db
,
robj
*
key
,
robj
*
val
,
int
update_if_existing
)
{
static
void
dbAddInternal
(
redisDb
*
db
,
robj
*
key
,
robj
*
val
,
int
update_if_existing
)
{
dictEntry
*
existing
;
dictEntry
*
existing
;
dictEntry
*
de
=
dictAddRaw
(
db
->
dict
,
key
->
ptr
,
&
existing
);
dictEntry
*
de
=
dictAddRaw
(
db
->
dict
,
key
->
ptr
,
&
existing
);
...
...
src/debug.c
View file @
96e9dec4
...
@@ -2260,7 +2260,7 @@ void bugReportEnd(int killViaSignal, int sig) {
...
@@ -2260,7 +2260,7 @@ void bugReportEnd(int killViaSignal, int sig) {
if
(
server
.
daemonize
&&
server
.
supervised
==
0
&&
server
.
pidfile
)
unlink
(
server
.
pidfile
);
if
(
server
.
daemonize
&&
server
.
supervised
==
0
&&
server
.
pidfile
)
unlink
(
server
.
pidfile
);
if
(
!
killViaSignal
)
{
if
(
!
killViaSignal
)
{
/* To avoid issues with valgrind, we may wanna exit ra
h
ter than generate a signal */
/* To avoid issues with valgrind, we may wanna exit rat
h
er than generate a signal */
if
(
server
.
use_exit_on_panic
)
{
if
(
server
.
use_exit_on_panic
)
{
/* Using _exit to bypass false leak reports by gcc ASAN */
/* Using _exit to bypass false leak reports by gcc ASAN */
fflush
(
stdout
);
fflush
(
stdout
);
...
...
src/sentinel.c
View file @
96e9dec4
...
@@ -4129,7 +4129,7 @@ NULL
...
@@ -4129,7 +4129,7 @@ NULL
else
if
(
!
strcasecmp
(
c
->
argv
[
2
]
->
ptr
,
"get"
)
&&
c
->
argc
>=
4
)
else
if
(
!
strcasecmp
(
c
->
argv
[
2
]
->
ptr
,
"get"
)
&&
c
->
argc
>=
4
)
sentinelConfigGetCommand
(
c
);
sentinelConfigGetCommand
(
c
);
else
else
addReplyError
(
c
,
"Only SENTINEL CONFIG GET <param> [<param> <param> ...]/ SET <param> <value> [<param> <value> ...] are supported."
);
addReplyError
(
c
,
"Only SENTINEL CONFIG GET <param> [<param> <param> ...]
/ SET <param> <value> [<param> <value> ...] are supported."
);
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"info-cache"
))
{
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"info-cache"
))
{
/* SENTINEL INFO-CACHE <name> */
/* SENTINEL INFO-CACHE <name> */
if
(
c
->
argc
<
2
)
goto
numargserr
;
if
(
c
->
argc
<
2
)
goto
numargserr
;
...
...
src/server.h
View file @
96e9dec4
...
@@ -2003,7 +2003,7 @@ struct redisServer {
...
@@ -2003,7 +2003,7 @@ struct redisServer {
/* Scripting */
/* Scripting */
mstime_t
busy_reply_threshold
;
/* Script / module timeout in milliseconds */
mstime_t
busy_reply_threshold
;
/* Script / module timeout in milliseconds */
int
pre_command_oom_state
;
/* OOM before command (script?) was started */
int
pre_command_oom_state
;
/* OOM before command (script?) was started */
int
script_disable_deny_script
;
/* Allow running commands marked "no
-
script" inside a script. */
int
script_disable_deny_script
;
/* Allow running commands marked "noscript" inside a script. */
/* Lazy free */
/* Lazy free */
int
lazyfree_lazy_eviction
;
int
lazyfree_lazy_eviction
;
int
lazyfree_lazy_expire
;
int
lazyfree_lazy_expire
;
...
...
tests/unit/expire.tcl
View file @
96e9dec4
...
@@ -350,7 +350,7 @@ start_server {tags {"expire"}} {
...
@@ -350,7 +350,7 @@ start_server {tags {"expire"}} {
r restore foo17 100000 $encoded
r restore foo17 100000 $encoded
r restore foo18
[
expr
[
clock milliseconds
]
+100000
]
$encoded absttl
r restore foo18
[
expr
[
clock milliseconds
]
+100000
]
$encoded absttl
# Assert that each TTL-relatd command are persisted with absolute timestamps in AOF
# Assert that each TTL-relat
e
d command are persisted with absolute timestamps in AOF
assert_aof_content $aof
{
assert_aof_content $aof
{
{
select *
}
{
select *
}
{
set foo1 bar PXAT *
}
{
set foo1 bar PXAT *
}
...
...
tests/unit/memefficiency.tcl
View file @
96e9dec4
...
@@ -493,7 +493,7 @@ start_server {tags {"defrag external:skip"} overrides {appendonly yes auto-aof-r
...
@@ -493,7 +493,7 @@ start_server {tags {"defrag external:skip"} overrides {appendonly yes auto-aof-r
set expected_frag 1.3
set expected_frag 1.3
r debug mallctl-str thread.tcache.flush VOID
r debug mallctl-str thread.tcache.flush VOID
# fill the first slab containin 32 regs of 640 bytes.
# fill the first slab containin
g
32 regs of 640 bytes.
for
{
set j 0
}
{
$j
< 32
}
{
incr j
}
{
for
{
set j 0
}
{
$j
< 32
}
{
incr j
}
{
r setrange
"_
$j
"
600 x
r setrange
"_
$j
"
600 x
r debug mallctl-str thread.tcache.flush VOID
r debug mallctl-str thread.tcache.flush VOID
...
...
tests/unit/tracking.tcl
View file @
96e9dec4
...
@@ -876,7 +876,7 @@ start_server {tags {"tracking network logreqres:skip"}} {
...
@@ -876,7 +876,7 @@ start_server {tags {"tracking network logreqres:skip"}} {
$rd close
$rd close
}
}
# Just some extra cover
g
ae for --log-req-res, because we do not
# Just some extra covera
g
e for --log-req-res, because we do not
# run the full tracking unit in that mode
# run the full tracking unit in that mode
start_server
{
tags
{
"tracking network"
}}
{
start_server
{
tags
{
"tracking network"
}}
{
test
{
Coverage: Basic CLIENT CACHING
}
{
test
{
Coverage: Basic CLIENT CACHING
}
{
...
...
tests/unit/type/list.tcl
View file @
96e9dec4
...
@@ -1120,7 +1120,7 @@ foreach {pop} {BLPOP BLMPOP_LEFT} {
...
@@ -1120,7 +1120,7 @@ foreach {pop} {BLPOP BLMPOP_LEFT} {
assert_equal
{}
[
$rd
read
]
assert_equal
{}
[
$rd
read
]
$rd deferred 0
$rd deferred 0
# We want to force key deletion to be propagated to the replica
# We want to force key deletion to be propagated to the replica
# in order to verify it was expi
e
red on the replication stream.
# in order to verify it was expired on the replication stream.
$rd set somekey1 someval1
$rd set somekey1 someval1
$rd exists k
$rd exists k
r set somekey2 someval2
r set somekey2 someval2
...
@@ -1168,7 +1168,7 @@ foreach {pop} {BLPOP BLMPOP_LEFT} {
...
@@ -1168,7 +1168,7 @@ foreach {pop} {BLPOP BLMPOP_LEFT} {
r client unblock $id
r client unblock $id
assert_equal
{}
[
$rd
read
]
assert_equal
{}
[
$rd
read
]
# We want to force key deletion to be propagated to the replica
# We want to force key deletion to be propagated to the replica
# in order to verify it was expi
e
red on the replication stream.
# in order to verify it was expired on the replication stream.
$rd exists k
$rd exists k
assert_equal
{
0
}
[
$rd
read
]
assert_equal
{
0
}
[
$rd
read
]
assert_replication_stream $repl
{
assert_replication_stream $repl
{
...
...
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