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
d4a29700
Unverified
Commit
d4a29700
authored
Apr 28, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Apr 28, 2020
Browse files
Merge pull request #7161 from guybe7/xinfo_full_count
XINFO STREAM FULL should have a default COUNT of 10
parents
f95a88d9
057865a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/t_stream.c
View file @
d4a29700
...
@@ -2493,7 +2493,7 @@ void xtrimCommand(client *c) {
...
@@ -2493,7 +2493,7 @@ void xtrimCommand(client *c) {
* Handles the variants of XINFO STREAM */
* Handles the variants of XINFO STREAM */
void
xinfoReplyWithStreamInfo
(
client
*
c
,
stream
*
s
)
{
void
xinfoReplyWithStreamInfo
(
client
*
c
,
stream
*
s
)
{
int
full
=
1
;
int
full
=
1
;
long
long
count
=
0
;
long
long
count
=
1
0
;
/* Default COUNT is 10 so we don't block the server */
robj
**
optv
=
c
->
argv
+
3
;
/* Options start after XINFO STREAM <key> */
robj
**
optv
=
c
->
argv
+
3
;
/* Options start after XINFO STREAM <key> */
int
optc
=
c
->
argc
-
3
;
int
optc
=
c
->
argc
-
3
;
...
@@ -2521,7 +2521,7 @@ void xinfoReplyWithStreamInfo(client *c, stream *s) {
...
@@ -2521,7 +2521,7 @@ void xinfoReplyWithStreamInfo(client *c, stream *s) {
}
}
if
(
getLongLongFromObjectOrReply
(
c
,
optv
[
2
],
&
count
,
NULL
)
==
C_ERR
)
if
(
getLongLongFromObjectOrReply
(
c
,
optv
[
2
],
&
count
,
NULL
)
==
C_ERR
)
return
;
return
;
if
(
count
<
0
)
count
=
0
;
if
(
count
<
0
)
count
=
1
0
;
}
}
}
}
...
@@ -2548,11 +2548,11 @@ void xinfoReplyWithStreamInfo(client *c, stream *s) {
...
@@ -2548,11 +2548,11 @@ void xinfoReplyWithStreamInfo(client *c, stream *s) {
end
.
ms
=
end
.
seq
=
UINT64_MAX
;
end
.
ms
=
end
.
seq
=
UINT64_MAX
;
addReplyBulkCString
(
c
,
"first-entry"
);
addReplyBulkCString
(
c
,
"first-entry"
);
emitted
=
streamReplyWithRange
(
c
,
s
,
&
start
,
&
end
,
1
,
0
,
NULL
,
NULL
,
emitted
=
streamReplyWithRange
(
c
,
s
,
&
start
,
&
end
,
1
,
0
,
NULL
,
NULL
,
STREAM_RWR_RAWENTRIES
,
NULL
);
STREAM_RWR_RAWENTRIES
,
NULL
);
if
(
!
emitted
)
addReplyNull
(
c
);
if
(
!
emitted
)
addReplyNull
(
c
);
addReplyBulkCString
(
c
,
"last-entry"
);
addReplyBulkCString
(
c
,
"last-entry"
);
emitted
=
streamReplyWithRange
(
c
,
s
,
&
start
,
&
end
,
1
,
1
,
NULL
,
NULL
,
emitted
=
streamReplyWithRange
(
c
,
s
,
&
start
,
&
end
,
1
,
1
,
NULL
,
NULL
,
STREAM_RWR_RAWENTRIES
,
NULL
);
STREAM_RWR_RAWENTRIES
,
NULL
);
if
(
!
emitted
)
addReplyNull
(
c
);
if
(
!
emitted
)
addReplyNull
(
c
);
}
else
{
}
else
{
/* XINFO STREAM <key> FULL [COUNT <count>] */
/* XINFO STREAM <key> FULL [COUNT <count>] */
...
@@ -2682,6 +2682,10 @@ void xinfoCommand(client *c) {
...
@@ -2682,6 +2682,10 @@ void xinfoCommand(client *c) {
"CONSUMERS <key> <groupname> -- Show consumer groups of group <groupname>."
,
"CONSUMERS <key> <groupname> -- Show consumer groups of group <groupname>."
,
"GROUPS <key> -- Show the stream consumer groups."
,
"GROUPS <key> -- Show the stream consumer groups."
,
"STREAM <key> [FULL [COUNT <count>]] -- Show information about the stream."
,
"STREAM <key> [FULL [COUNT <count>]] -- Show information about the stream."
,
" FULL will return the full state of the stream,"
,
" including all entries, groups, consumers and PELs."
,
" It's possible to show only the first stream/PEL entries"
,
" by using the COUNT modifier (Default is 10)"
,
"HELP -- Print this help."
,
"HELP -- Print this help."
,
NULL
NULL
};
};
...
...
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