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
1a5c3a9a
Commit
1a5c3a9a
authored
Apr 29, 2020
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
d2a6c5ff
d4a29700
Changes
1
Show whitespace changes
Inline
Side-by-side
src/t_stream.c
View file @
1a5c3a9a
...
@@ -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;
}
}
}
}
...
@@ -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