Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
21316d57
Unverified
Commit
21316d57
authored
Feb 24, 2021
by
guybe7
Committed by
GitHub
Feb 24, 2021
Browse files
XTRIM: Parse args before lookupKey (#8550)
This aligns better with other commands, specifically XADD
parent
aba61d9e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/t_stream.c
View file @
21316d57
...
@@ -3229,17 +3229,17 @@ cleanup:
...
@@ -3229,17 +3229,17 @@ cleanup:
void
xtrimCommand
(
client
*
c
)
{
void
xtrimCommand
(
client
*
c
)
{
robj
*
o
;
robj
*
o
;
/* Argument parsing. */
streamAddTrimArgs
parsed_args
;
if
(
streamParseAddOrTrimArgsOrReply
(
c
,
&
parsed_args
,
1
)
<
0
)
return
;
/* streamParseAddOrTrimArgsOrReply already replied. */
/* If the key does not exist, we are ok returning zero, that is, the
/* If the key does not exist, we are ok returning zero, that is, the
* number of elements removed from the stream. */
* number of elements removed from the stream. */
if
((
o
=
lookupKeyWriteOrReply
(
c
,
c
->
argv
[
1
],
shared
.
czero
))
==
NULL
if
((
o
=
lookupKeyWriteOrReply
(
c
,
c
->
argv
[
1
],
shared
.
czero
))
==
NULL
||
checkType
(
c
,
o
,
OBJ_STREAM
))
return
;
||
checkType
(
c
,
o
,
OBJ_STREAM
))
return
;
stream
*
s
=
o
->
ptr
;
stream
*
s
=
o
->
ptr
;
/* Argument parsing. */
streamAddTrimArgs
parsed_args
;
if
(
streamParseAddOrTrimArgsOrReply
(
c
,
&
parsed_args
,
1
)
<
0
)
return
;
/* streamParseAddOrTrimArgsOrReply already replied. */
/* Perform the trimming. */
/* Perform the trimming. */
int64_t
deleted
=
streamTrim
(
s
,
&
parsed_args
);
int64_t
deleted
=
streamTrim
(
s
,
&
parsed_args
);
if
(
deleted
)
{
if
(
deleted
)
{
...
...
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