feat(streams): support entries_read and lag for XINFO GROUPS #1952
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chakaz
reviewed
Sep 27, 2023
src/server/rdb_test.cc
Outdated
| @@ -157,9 +157,9 @@ TEST_F(RdbTest, Stream) { | |||
| EXPECT_THAT(resp, ArrLen(2)); | |||
|
|
|||
| resp = Run({"xinfo", "groups", "key:1"}); // test dereferences array of size 1 | |||
| EXPECT_THAT(resp, ArrLen(8)); | |||
| EXPECT_THAT(resp.GetVec(), ElementsAre("name", "g2", "consumers", IntArg(0), "pending", IntArg(0), | |||
There was a problem hiding this comment.
While here, you could use the newer syntax:
EXPECT_THAT(resp, RespArray(ElementsAre(...)));
src/server/stream_family.cc
Outdated
Comment on lines
81
to
82
| long long entries_read; | ||
| long long lag; |
There was a problem hiding this comment.
In our (as opposed to Redis') code, we prefer strict types such as int64_t over unspecified long long
src/server/stream_family.cc
Outdated
| @@ -884,6 +888,7 @@ OpStatus OpCreate(const OpArgs& op_args, string_view key, const CreateOpts& opts | |||
| auto* shard = op_args.shard; | |||
| auto& db_slice = shard->db_slice(); | |||
| OpResult<PrimeIterator> res_it = db_slice.Find(op_args.db_cntx, key, OBJ_STREAM); | |||
| long entries_read = SCG_INVALID_ENTRIES_READ; | |||
src/server/stream_family_test.cc
Outdated
| TEST_F(StreamFamilyTest, XInfo) { | ||
| Run({"xgroup", "create", "foo", "cgroup", "0", "mkstream"}); | ||
| auto resp = Run({"xinfo", "groups", "foo"}); | ||
| EXPECT_THAT(resp.GetVec(), ElementsAre("name", "cgroup", "consumers", IntArg(0), "pending", |
There was a problem hiding this comment.
Same here, please use EXPECT_THAT(resp, RespArray(ElementsAre(...)))
It has the advantage of not crashing if the result is not an array (that's why in many cases we used to add a check that the result is an array)
chakaz
approved these changes
Sep 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
entries_read and lag have been added to the output of
XINFO GROUPSsince Redis 7.0. Also fixed a bug that incorrectly sets the initial value ofentries_readwhen a consumer group is created.fixes #1948
So now it prints: