You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@kvrocks.apache.org by "Yangsx-1 (via GitHub)" <gi...@apache.org> on 2023/11/03 08:37:55 UTC
[PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Yangsx-1 opened a new pull request, #1870:
URL: https://github.com/apache/kvrocks/pull/1870
This close #1731
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "PragmaTwice (via GitHub)" <gi...@apache.org>.
PragmaTwice commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1807059415
Thank you for your contribution!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "git-hulk (via GitHub)" <gi...@apache.org>.
git-hulk commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1385877536
##########
src/types/redis_stream.cc:
##########
@@ -232,6 +241,34 @@ std::string Stream::encodeStreamConsumerMetadataValue(const StreamConsumerMetada
return dst;
}
+StreamConsumerMetadata Stream::decodeStreamConsumerMetadataValue(const std::string &value) {
+ StreamConsumerMetadata consumer_metadata;
+ rocksdb::Slice input(value);
+ GetFixed64(&input, &consumer_metadata.pending_number);
+ GetFixed64(&input, &consumer_metadata.last_idle);
+ GetFixed64(&input, &consumer_metadata.last_active);
+ return consumer_metadata;
+}
+
+StreamSubkeyType Stream::identifySubkeyType(const rocksdb::Slice &key) {
+ InternalKey ikey(key, storage_->IsSlotIdEncoded());
+ Slice subkey = ikey.GetSubKey();
+ if (subkey.size() <= 16) { // id.ms(uint64) + id.seq(uint64)
Review Comment:
That's cool.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "git-hulk (via GitHub)" <gi...@apache.org>.
git-hulk commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1382409890
##########
src/commands/cmd_stream.cc:
##########
@@ -472,6 +488,82 @@ class CommandXInfo : public Commander {
return Status::OK();
}
+
+ Status getGroupInfo(Server *srv, Connection *conn, std::string *output) {
+ redis::Stream stream_db(srv->storage, conn->GetNamespace());
+ std::vector<std::pair<std::string, StreamConsumerGroupMetadata>> result_vector;
+ auto s = stream_db.GetGroupInfo(args_[2], result_vector);
+ if (!s.ok() && !s.IsNotFound()) {
+ return {Status::RedisExecErr, s.ToString()};
+ }
+
+ if (s.IsNotFound()) {
+ return {Status::RedisExecErr, errNoSuchKey};
+ }
+
+ if (result_vector.empty()) {
+ output->append(redis::SimpleString("(empty array)"));
+ return Status::OK();
+ }
+
+ output->append(redis::MultiLen(result_vector.size()));
+ for (auto const &it : result_vector) {
+ output->append(redis::MultiLen(12));
+ output->append(redis::BulkString("name"));
+ output->append(redis::BulkString(it.first));
+ output->append(redis::BulkString("consumers"));
+ output->append(redis::Integer(it.second.consumer_number));
+ output->append(redis::BulkString("pending"));
+ output->append(redis::Integer(it.second.pending_number));
+ output->append(redis::BulkString("last-delivered-id"));
+ output->append(redis::BulkString(it.second.last_delivered_id.ToString()));
+ output->append(redis::BulkString("entries-read"));
+ if (it.second.entries_read == -1) {
+ output->append(redis::NilString());
+ } else {
+ output->append(redis::Integer(it.second.entries_read));
+ }
+ output->append(redis::BulkString("lag"));
+ output->append(redis::Integer(it.second.lag));
+ }
+
+ return Status::OK();
+ }
+
+ Status getConsumerInfo(Server *srv, Connection *conn, std::string *output) {
+ redis::Stream stream_db(srv->storage, conn->GetNamespace());
+ std::vector<std::pair<std::string, redis::StreamConsumerMetadata>> result_vector;
+ auto s = stream_db.GetConsumerInfo(args_[2], args_[3], result_vector);
+
+ if (!s.ok() && !s.IsNotFound()) {
+ return {Status::RedisExecErr, s.ToString()};
+ }
+
+ if (s.IsNotFound()) {
+ return {Status::RedisExecErr, errNoSuchKey};
+ }
+
+ if (result_vector.empty()) {
Review Comment:
Same as above
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1793706428
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [5 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [6.1% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarLint](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=sonarcloud-welcome)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "git-hulk (via GitHub)" <gi...@apache.org>.
git-hulk commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1382409113
##########
src/commands/cmd_stream.cc:
##########
@@ -472,6 +488,82 @@ class CommandXInfo : public Commander {
return Status::OK();
}
+
+ Status getGroupInfo(Server *srv, Connection *conn, std::string *output) {
+ redis::Stream stream_db(srv->storage, conn->GetNamespace());
+ std::vector<std::pair<std::string, StreamConsumerGroupMetadata>> result_vector;
+ auto s = stream_db.GetGroupInfo(args_[2], result_vector);
+ if (!s.ok() && !s.IsNotFound()) {
+ return {Status::RedisExecErr, s.ToString()};
+ }
+
+ if (s.IsNotFound()) {
+ return {Status::RedisExecErr, errNoSuchKey};
+ }
+
+ if (result_vector.empty()) {
+ output->append(redis::SimpleString("(empty array)"));
Review Comment:
For empty array should return the RESP empty array instead literal "(empty array)".
Refer: https://github.com/redis/redis/blob/15a048d4f0465dc58be21d7e46d527ccfcc34a64/src/t_stream.c#L3907
So Just remove this `if` block.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "PragmaTwice (via GitHub)" <gi...@apache.org>.
PragmaTwice merged PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1792077848
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [5 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [7.7% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarLint](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=sonarcloud-welcome)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "git-hulk (via GitHub)" <gi...@apache.org>.
git-hulk commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1382409113
##########
src/commands/cmd_stream.cc:
##########
@@ -472,6 +488,82 @@ class CommandXInfo : public Commander {
return Status::OK();
}
+
+ Status getGroupInfo(Server *srv, Connection *conn, std::string *output) {
+ redis::Stream stream_db(srv->storage, conn->GetNamespace());
+ std::vector<std::pair<std::string, StreamConsumerGroupMetadata>> result_vector;
+ auto s = stream_db.GetGroupInfo(args_[2], result_vector);
+ if (!s.ok() && !s.IsNotFound()) {
+ return {Status::RedisExecErr, s.ToString()};
+ }
+
+ if (s.IsNotFound()) {
+ return {Status::RedisExecErr, errNoSuchKey};
+ }
+
+ if (result_vector.empty()) {
+ output->append(redis::SimpleString("(empty array)"));
Review Comment:
For empty array should return the RESP empty array instead literal "(empty array)".
Refer https://github.com/redis/redis/blob/15a048d4f0465dc58be21d7e46d527ccfcc34a64/src/t_stream.c#L3907
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1800893401
Kudos, SonarCloud Quality Gate passed! [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [5 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [5.5% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "git-hulk (via GitHub)" <gi...@apache.org>.
git-hulk commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1382410095
##########
src/types/redis_stream.cc:
##########
@@ -737,6 +774,73 @@ rocksdb::Status Stream::GetStreamInfo(const rocksdb::Slice &stream_name, bool fu
return rocksdb::Status::OK();
}
+rocksdb::Status Stream::GetGroupInfo(const Slice &stream_name,
+ std::vector<std::pair<std::string, StreamConsumerGroupMetadata>> &group_metadata) {
+ std::string ns_key = AppendNamespacePrefix(stream_name);
+ LockGuard guard(storage_->GetLockManager(), ns_key);
+ StreamMetadata metadata(false);
+ rocksdb::Status s = GetMetadata(ns_key, &metadata);
+ if (!s.ok()) return s;
+
+ std::string next_version_prefix_key =
+ InternalKey(ns_key, "", metadata.version + 1, storage_->IsSlotIdEncoded()).Encode();
+ std::string prefix_key = InternalKey(ns_key, "", metadata.version, storage_->IsSlotIdEncoded()).Encode();
+
+ rocksdb::ReadOptions read_options = storage_->DefaultScanOptions();
+ LatestSnapShot ss(storage_);
+ read_options.snapshot = ss.GetSnapShot();
+ rocksdb::Slice upper_bound(next_version_prefix_key);
+ read_options.iterate_upper_bound = &upper_bound;
+ rocksdb::Slice lower_bound(prefix_key);
+ read_options.iterate_lower_bound = &lower_bound;
+
+ auto iter = util::UniqueIterator(storage_, read_options, stream_cf_handle_);
+ for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
+ if (identifySubkeyType(iter->key()) == StreamSubkeyType::StreamConsumerGroupMetadata) {
+ std::string group_name = groupNameFromInternalKey(iter->key());
+ StreamConsumerGroupMetadata cg_metadata = decodeStreamConsumerGroupMetadataValue(iter->value().ToString());
+ std::pair<std::string, StreamConsumerGroupMetadata> tmp_item(group_name, cg_metadata);
+ group_metadata.push_back(tmp_item);
+ }
+ }
+ return rocksdb::Status::OK();
+}
+
+rocksdb::Status Stream::GetConsumerInfo(
+ const Slice &stream_name, const std::string &group_name,
+ std::vector<std::pair<std::string, StreamConsumerMetadata>> &consumer_metadata) {
+ std::string ns_key = AppendNamespacePrefix(stream_name);
+ LockGuard guard(storage_->GetLockManager(), ns_key);
Review Comment:
I think we don't need to lock the key? because it's good to read the snapshot only.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1805094564
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [1 Security Hotspot](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [5 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [5.7% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarLint](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=sonarcloud-welcome)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "Yangsx-1 (via GitHub)" <gi...@apache.org>.
Yangsx-1 commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1383071746
##########
src/commands/cmd_stream.cc:
##########
@@ -472,6 +488,72 @@ class CommandXInfo : public Commander {
return Status::OK();
}
+
+ Status getGroupInfo(Server *srv, Connection *conn, std::string *output) {
+ redis::Stream stream_db(srv->storage, conn->GetNamespace());
+ std::vector<std::pair<std::string, StreamConsumerGroupMetadata>> result_vector;
+ auto s = stream_db.GetGroupInfo(args_[2], result_vector);
+ if (!s.ok() && !s.IsNotFound()) {
+ return {Status::RedisExecErr, s.ToString()};
+ }
+
+ if (s.IsNotFound()) {
+ return {Status::RedisExecErr, errNoSuchKey};
+ }
+
+ output->append(redis::MultiLen(result_vector.size()));
+ for (auto const &it : result_vector) {
+ output->append(redis::MultiLen(12));
+ output->append(redis::BulkString("name"));
+ output->append(redis::BulkString(it.first));
+ output->append(redis::BulkString("consumers"));
+ output->append(redis::Integer(it.second.consumer_number));
+ output->append(redis::BulkString("pending"));
+ output->append(redis::Integer(it.second.pending_number));
+ output->append(redis::BulkString("last-delivered-id"));
+ output->append(redis::BulkString(it.second.last_delivered_id.ToString()));
+ output->append(redis::BulkString("entries-read"));
+ if (it.second.entries_read == -1) {
+ output->append(redis::NilString());
+ } else {
+ output->append(redis::Integer(it.second.entries_read));
+ }
+ output->append(redis::BulkString("lag"));
+ output->append(redis::Integer(it.second.lag));
Review Comment:
We don't have these cases now, i'll add it later.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1805053484
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [1 Security Hotspot](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [5 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [5.7% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarLint](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=sonarcloud-welcome)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1807018892
Kudos, SonarCloud Quality Gate passed! [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [6 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [3.2% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "git-hulk (via GitHub)" <gi...@apache.org>.
git-hulk commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1385872369
##########
src/types/redis_stream.cc:
##########
@@ -232,6 +241,34 @@ std::string Stream::encodeStreamConsumerMetadataValue(const StreamConsumerMetada
return dst;
}
+StreamConsumerMetadata Stream::decodeStreamConsumerMetadataValue(const std::string &value) {
+ StreamConsumerMetadata consumer_metadata;
+ rocksdb::Slice input(value);
+ GetFixed64(&input, &consumer_metadata.pending_number);
+ GetFixed64(&input, &consumer_metadata.last_idle);
+ GetFixed64(&input, &consumer_metadata.last_active);
+ return consumer_metadata;
+}
+
+StreamSubkeyType Stream::identifySubkeyType(const rocksdb::Slice &key) {
+ InternalKey ikey(key, storage_->IsSlotIdEncoded());
+ Slice subkey = ikey.GetSubKey();
+ if (subkey.size() <= 16) { // id.ms(uint64) + id.seq(uint64)
Review Comment:
Hi @Yangsx-1, can you resolve this comment?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "Yangsx-1 (via GitHub)" <gi...@apache.org>.
Yangsx-1 commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1805055085
I've added some functions for the situation when lag can't be determined referring to redis, please have a look. @torwig @git-hulk
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1806813285
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [1 Security Hotspot](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [5 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [3.2% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarLint](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=sonarcloud-welcome)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1805169595
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [1 Security Hotspot](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [5 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [5.7% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarLint](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=sonarcloud-welcome)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1793650293
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [5 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [6.8% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarLint](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=sonarcloud-welcome)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1792052655
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [6 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [7.7% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarLint](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=sonarcloud-welcome)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "git-hulk (via GitHub)" <gi...@apache.org>.
git-hulk commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1382410095
##########
src/types/redis_stream.cc:
##########
@@ -737,6 +774,73 @@ rocksdb::Status Stream::GetStreamInfo(const rocksdb::Slice &stream_name, bool fu
return rocksdb::Status::OK();
}
+rocksdb::Status Stream::GetGroupInfo(const Slice &stream_name,
+ std::vector<std::pair<std::string, StreamConsumerGroupMetadata>> &group_metadata) {
+ std::string ns_key = AppendNamespacePrefix(stream_name);
+ LockGuard guard(storage_->GetLockManager(), ns_key);
+ StreamMetadata metadata(false);
+ rocksdb::Status s = GetMetadata(ns_key, &metadata);
+ if (!s.ok()) return s;
+
+ std::string next_version_prefix_key =
+ InternalKey(ns_key, "", metadata.version + 1, storage_->IsSlotIdEncoded()).Encode();
+ std::string prefix_key = InternalKey(ns_key, "", metadata.version, storage_->IsSlotIdEncoded()).Encode();
+
+ rocksdb::ReadOptions read_options = storage_->DefaultScanOptions();
+ LatestSnapShot ss(storage_);
+ read_options.snapshot = ss.GetSnapShot();
+ rocksdb::Slice upper_bound(next_version_prefix_key);
+ read_options.iterate_upper_bound = &upper_bound;
+ rocksdb::Slice lower_bound(prefix_key);
+ read_options.iterate_lower_bound = &lower_bound;
+
+ auto iter = util::UniqueIterator(storage_, read_options, stream_cf_handle_);
+ for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
+ if (identifySubkeyType(iter->key()) == StreamSubkeyType::StreamConsumerGroupMetadata) {
+ std::string group_name = groupNameFromInternalKey(iter->key());
+ StreamConsumerGroupMetadata cg_metadata = decodeStreamConsumerGroupMetadataValue(iter->value().ToString());
+ std::pair<std::string, StreamConsumerGroupMetadata> tmp_item(group_name, cg_metadata);
+ group_metadata.push_back(tmp_item);
+ }
+ }
+ return rocksdb::Status::OK();
+}
+
+rocksdb::Status Stream::GetConsumerInfo(
+ const Slice &stream_name, const std::string &group_name,
+ std::vector<std::pair<std::string, StreamConsumerMetadata>> &consumer_metadata) {
+ std::string ns_key = AppendNamespacePrefix(stream_name);
+ LockGuard guard(storage_->GetLockManager(), ns_key);
Review Comment:
ditto
##########
src/types/redis_stream.cc:
##########
@@ -737,6 +774,73 @@ rocksdb::Status Stream::GetStreamInfo(const rocksdb::Slice &stream_name, bool fu
return rocksdb::Status::OK();
}
+rocksdb::Status Stream::GetGroupInfo(const Slice &stream_name,
+ std::vector<std::pair<std::string, StreamConsumerGroupMetadata>> &group_metadata) {
+ std::string ns_key = AppendNamespacePrefix(stream_name);
Review Comment:
I think we don't need to lock the key? because it's good to read the snapshot only.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#issuecomment-1805069832
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_kvrocks&pullRequest=1870)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT) [1 Security Hotspot](https://sonarcloud.io/project/security_hotspots?id=apache_kvrocks&pullRequest=1870&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL) [5 Code Smells](https://sonarcloud.io/project/issues?id=apache_kvrocks&pullRequest=1870&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870) No Coverage information
[](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list) [5.7% Duplication](https://sonarcloud.io/component_measures?id=apache_kvrocks&pullRequest=1870&metric=new_duplicated_lines_density&view=list)
 Catch issues before they fail your Quality Gate with our IDE extension  [SonarLint](https://www.sonarsource.com/products/sonarlint/features/connected-mode/?referrer=sonarcloud-welcome)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "torwig (via GitHub)" <gi...@apache.org>.
torwig commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1382640463
##########
src/commands/cmd_stream.cc:
##########
@@ -472,6 +488,72 @@ class CommandXInfo : public Commander {
return Status::OK();
}
+
+ Status getGroupInfo(Server *srv, Connection *conn, std::string *output) {
+ redis::Stream stream_db(srv->storage, conn->GetNamespace());
+ std::vector<std::pair<std::string, StreamConsumerGroupMetadata>> result_vector;
+ auto s = stream_db.GetGroupInfo(args_[2], result_vector);
+ if (!s.ok() && !s.IsNotFound()) {
+ return {Status::RedisExecErr, s.ToString()};
+ }
+
+ if (s.IsNotFound()) {
+ return {Status::RedisExecErr, errNoSuchKey};
+ }
+
+ output->append(redis::MultiLen(result_vector.size()));
+ for (auto const &it : result_vector) {
+ output->append(redis::MultiLen(12));
+ output->append(redis::BulkString("name"));
+ output->append(redis::BulkString(it.first));
+ output->append(redis::BulkString("consumers"));
+ output->append(redis::Integer(it.second.consumer_number));
+ output->append(redis::BulkString("pending"));
+ output->append(redis::Integer(it.second.pending_number));
+ output->append(redis::BulkString("last-delivered-id"));
+ output->append(redis::BulkString(it.second.last_delivered_id.ToString()));
+ output->append(redis::BulkString("entries-read"));
+ if (it.second.entries_read == -1) {
+ output->append(redis::NilString());
+ } else {
+ output->append(redis::Integer(it.second.entries_read));
+ }
+ output->append(redis::BulkString("lag"));
+ output->append(redis::Integer(it.second.lag));
Review Comment:
Do we have any cases when the `lag` can't be determined? According to the Redis documentation, there are 2 such cases.
##########
src/types/redis_stream.cc:
##########
@@ -232,6 +241,34 @@ std::string Stream::encodeStreamConsumerMetadataValue(const StreamConsumerMetada
return dst;
}
+StreamConsumerMetadata Stream::decodeStreamConsumerMetadataValue(const std::string &value) {
+ StreamConsumerMetadata consumer_metadata;
+ rocksdb::Slice input(value);
+ GetFixed64(&input, &consumer_metadata.pending_number);
+ GetFixed64(&input, &consumer_metadata.last_idle);
+ GetFixed64(&input, &consumer_metadata.last_active);
+ return consumer_metadata;
+}
+
+StreamSubkeyType Stream::identifySubkeyType(const rocksdb::Slice &key) {
+ InternalKey ikey(key, storage_->IsSlotIdEncoded());
+ Slice subkey = ikey.GetSubKey();
+ if (subkey.size() <= 16) { // id.ms(uint64) + id.seq(uint64)
Review Comment:
If you can introduce constants with descriptive names for the values `8`, `16`, and another `8`, you will be able to get rid of explanation comments in the code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "PragmaTwice (via GitHub)" <gi...@apache.org>.
PragmaTwice commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1390229172
##########
src/types/redis_stream.cc:
##########
@@ -232,6 +241,35 @@ std::string Stream::encodeStreamConsumerMetadataValue(const StreamConsumerMetada
return dst;
}
+StreamConsumerMetadata Stream::decodeStreamConsumerMetadataValue(const std::string &value) {
+ StreamConsumerMetadata consumer_metadata;
+ rocksdb::Slice input(value);
+ GetFixed64(&input, &consumer_metadata.pending_number);
+ GetFixed64(&input, &consumer_metadata.last_idle);
+ GetFixed64(&input, &consumer_metadata.last_active);
+ return consumer_metadata;
+}
+
+StreamSubkeyType Stream::identifySubkeyType(const rocksdb::Slice &key) {
+ InternalKey ikey(key, storage_->IsSlotIdEncoded());
+ Slice subkey = ikey.GetSubKey();
+ const size_t entry_id_size = sizeof(StreamEntryID);
+ if (subkey.size() <= entry_id_size) {
+ return StreamSubkeyType::StreamEntry;
+ }
+ uint64_t group_name_len = 0;
+ GetFixed64(&subkey, &group_name_len);
+ std::string without_group_name = subkey.ToString().substr(group_name_len);
+ const size_t metadata_delimiter_size = strlen(consumerGroupMetadataDelimiter);
Review Comment:
You can make `consumerGroupMetadataDelimiter` a `string_view` and then remove this `strlen`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Add support of the XINFO GROUPS and CONSUMERS [kvrocks]
Posted by "Yangsx-1 (via GitHub)" <gi...@apache.org>.
Yangsx-1 commented on code in PR #1870:
URL: https://github.com/apache/kvrocks/pull/1870#discussion_r1385877176
##########
src/types/redis_stream.cc:
##########
@@ -232,6 +241,34 @@ std::string Stream::encodeStreamConsumerMetadataValue(const StreamConsumerMetada
return dst;
}
+StreamConsumerMetadata Stream::decodeStreamConsumerMetadataValue(const std::string &value) {
+ StreamConsumerMetadata consumer_metadata;
+ rocksdb::Slice input(value);
+ GetFixed64(&input, &consumer_metadata.pending_number);
+ GetFixed64(&input, &consumer_metadata.last_idle);
+ GetFixed64(&input, &consumer_metadata.last_active);
+ return consumer_metadata;
+}
+
+StreamSubkeyType Stream::identifySubkeyType(const rocksdb::Slice &key) {
+ InternalKey ikey(key, storage_->IsSlotIdEncoded());
+ Slice subkey = ikey.GetSubKey();
+ if (subkey.size() <= 16) { // id.ms(uint64) + id.seq(uint64)
Review Comment:
Yes, i'll remove these comments in the code and add some const variables.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@kvrocks.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org