diff options
| author | antirez <antirez@gmail.com> | 2018-06-28 00:17:21 +0200 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2018-06-28 00:17:21 +0200 |
| commit | 75f1a7bdfc114bf161d79e0a90e993122884d662 (patch) | |
| tree | a2573e123203b55f348018b65c577df1af917590 | |
| parent | 4a70ff74510a0f594232fd13682e358f851e1990 (diff) | |
| parent | f7b21bc71ef1d814932e01a2e03474377f1a27a9 (diff) | |
| download | redis-75f1a7bdfc114bf161d79e0a90e993122884d662.tar.gz | |
Merge branch 'unstable' of github.com:/antirez/redis into unstable
| -rw-r--r-- | src/help.h | 2 | ||||
| -rw-r--r-- | src/t_stream.c | 4 | ||||
| -rw-r--r-- | tests/integration/rdb.tcl | 2 | ||||
| -rw-r--r-- | tests/unit/memefficiency.tcl | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/help.h b/src/help.h index 005afd941..c89f1f44b 100644 --- a/src/help.h +++ b/src/help.h @@ -975,7 +975,7 @@ struct commandHelp { "5.0.0" }, { "XPENDING", "key group [start end count] [consumer]", - "Return information and entries from a stream conusmer group pending entries list, that are messages fetched but never acknowledged.", + "Return information and entries from a stream consumer group pending entries list, that are messages fetched but never acknowledged.", 14, "5.0.0" }, { "XRANGE", diff --git a/src/t_stream.c b/src/t_stream.c index 6d8fd92ce..16913f37e 100644 --- a/src/t_stream.c +++ b/src/t_stream.c @@ -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 conusmer, fetching the IDs from its PEL. + * in the history of the consumer, 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 conusmer.", +"DELCONSUMER <key> <groupname> <consumer> -- Remove the specified consumer.", "HELP -- Prints this help.", NULL }; diff --git a/tests/integration/rdb.tcl b/tests/integration/rdb.tcl index f51a3c13d..58a098edc 100644 --- a/tests/integration/rdb.tcl +++ b/tests/integration/rdb.tcl @@ -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 diff --git a/tests/unit/memefficiency.tcl b/tests/unit/memefficiency.tcl index ed37a68ed..c8e95de13 100644 --- a/tests/unit/memefficiency.tcl +++ b/tests/unit/memefficiency.tcl @@ -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 |