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
75f1a7bd
Commit
75f1a7bd
authored
Jun 28, 2018
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
4a70ff74
f7b21bc7
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/help.h
View file @
75f1a7bd
...
...
@@ -975,7 +975,7 @@ struct commandHelp {
"5.0.0"
},
{
"XPENDING"
,
"key group [start end count] [consumer]"
,
"Return information and entries from a stream con
u
smer group pending entries list, that are messages fetched but never acknowledged."
,
"Return information and entries from a stream cons
u
mer group pending entries list, that are messages fetched but never acknowledged."
,
14
,
"5.0.0"
},
{
"XRANGE"
,
...
...
src/t_stream.c
View file @
75f1a7bd
...
...
@@ -945,7 +945,7 @@ size_t streamReplyWithRange(client *c, stream *s, streamID *start, streamID *end
/* This is an helper function for streamReplyWithRange() when called with
* group and consumer arguments, but with a range that is referring to already
* delivered messages. In this case we just emit messages that are already
* in the history of the con
u
smer, fetching the IDs from its PEL.
* in the history of the cons
u
mer, fetching the IDs from its PEL.
*
* Note that this function does not have a 'rev' argument because it's not
* possible to iterate in reverse using a group. Basically this function
...
...
@@ -1571,7 +1571,7 @@ void xgroupCommand(client *c) {
"CREATE <key> <groupname> <id or $> -- Create a new consumer group."
,
"SETID <key> <groupname> <id or $> -- Set the current group ID."
,
"DESTROY <key> <groupname> -- Remove the specified group."
,
"DELCONSUMER <key> <groupname> <consumer> -- Remove the specified con
u
smer."
,
"DELCONSUMER <key> <groupname> <consumer> -- Remove the specified cons
u
mer."
,
"HELP -- Prints this help."
,
NULL
};
...
...
tests/integration/rdb.tcl
View file @
75f1a7bd
...
...
@@ -48,7 +48,7 @@ start_server [list overrides [list "dir" $server_path]] {
r xadd stream * bar $j
}
}
r xgroup create stream mygroup
$
r xgroup create stream mygroup
0
r xreadgroup GROUP mygroup Alice COUNT 1 STREAMS stream >
set digest
[
r debug digest
]
r debug reload
...
...
tests/unit/memefficiency.tcl
View file @
75f1a7bd
...
...
@@ -104,7 +104,7 @@ start_server {tags {"defrag"}} {
r sadd set a b c d
r xadd stream * item 1 value a
r xadd stream * item 2 value b
r xgroup create stream mygroup
$
r xgroup create stream mygroup
0
r xreadgroup GROUP mygroup Alice COUNT 1 STREAMS stream >
# create big keys with 10k items
...
...
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