You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@kvrocks.apache.org by GitBox <gi...@apache.org> on 2022/09/20 15:17:52 UTC
[GitHub] [incubator-kvrocks] PragmaTwice commented on a diff in pull request #895: Support hrange command
PragmaTwice commented on code in PR #895:
URL: https://github.com/apache/incubator-kvrocks/pull/895#discussion_r975506226
##########
src/redis_cmd.cc:
##########
@@ -1444,13 +1447,50 @@ class CommandHGetAll : public Commander {
if (!s.ok()) {
return Status(Status::RedisExecErr, s.ToString());
}
- *output = "*" + std::to_string(field_values.size() * 2) + CRLF;
- for (const auto &fv : field_values) {
- *output += Redis::BulkString(fv.field);
- *output += Redis::BulkString(fv.value);
+ std::vector<std::string> kv_pairs;
+ for (const auto &p : field_values) {
+ kv_pairs.emplace_back(p.field);
+ kv_pairs.emplace_back(p.value);
+ }
+ *output = MultiBulkString(kv_pairs);
+ return Status::OK();
+ }
+};
+
+class CommandHRange : public Commander {
+ public:
+ Status Parse(const std::vector<std::string> &args) override {
+ if (args.size() != 6 && args.size() != 4) {
+ return Status(Status::RedisParseErr, errWrongNumOfArguments);
+ }
+ if (args.size() == 6 && Util::ToLower(args[4]) != "limit") {
+ return Status(Status::RedisInvalidCmd, errInvalidSyntax);
}
+ if (args.size() == 6) {
+ auto parse_result = ParseInt<int64_t>(args_[5], 10);
+ if (!parse_result)return Status(Status::RedisParseErr, errValueNotInterger);
+ limit_ = *parse_result;
+ }
+ return Commander::Parse(args);
+ }
+ Status Execute(Server *svr, Connection *conn, std::string *output) override {
+ Redis::Hash hash_db(svr->storage_, conn->GetNamespace());
+ std::vector<FieldValue> field_values;
+ rocksdb::Status s = hash_db.Range(args_[1], args_[2], args_[3], limit_, &field_values);
+ if (!s.ok()) {
+ return Status(Status::RedisExecErr, s.ToString());
+ }
+ std::vector<std::string> kv_pairs;
+ for (const auto &p : field_values) {
+ kv_pairs.emplace_back(p.field);
+ kv_pairs.emplace_back(p.value);
+ }
+ *output = MultiBulkString(kv_pairs);
return Status::OK();
}
+
+ private:
+ int64_t limit_ = LONG_MAX;
Review Comment:
I think maybe `limit_` should be a unsigned integer?
##########
src/redis_cmd.cc:
##########
@@ -1444,13 +1447,50 @@ class CommandHGetAll : public Commander {
if (!s.ok()) {
return Status(Status::RedisExecErr, s.ToString());
}
- *output = "*" + std::to_string(field_values.size() * 2) + CRLF;
- for (const auto &fv : field_values) {
- *output += Redis::BulkString(fv.field);
- *output += Redis::BulkString(fv.value);
+ std::vector<std::string> kv_pairs;
+ for (const auto &p : field_values) {
+ kv_pairs.emplace_back(p.field);
+ kv_pairs.emplace_back(p.value);
+ }
+ *output = MultiBulkString(kv_pairs);
+ return Status::OK();
+ }
+};
+
+class CommandHRange : public Commander {
+ public:
+ Status Parse(const std::vector<std::string> &args) override {
+ if (args.size() != 6 && args.size() != 4) {
+ return Status(Status::RedisParseErr, errWrongNumOfArguments);
+ }
+ if (args.size() == 6 && Util::ToLower(args[4]) != "limit") {
+ return Status(Status::RedisInvalidCmd, errInvalidSyntax);
}
+ if (args.size() == 6) {
+ auto parse_result = ParseInt<int64_t>(args_[5], 10);
+ if (!parse_result)return Status(Status::RedisParseErr, errValueNotInterger);
+ limit_ = *parse_result;
+ }
+ return Commander::Parse(args);
+ }
+ Status Execute(Server *svr, Connection *conn, std::string *output) override {
+ Redis::Hash hash_db(svr->storage_, conn->GetNamespace());
+ std::vector<FieldValue> field_values;
+ rocksdb::Status s = hash_db.Range(args_[1], args_[2], args_[3], limit_, &field_values);
+ if (!s.ok()) {
+ return Status(Status::RedisExecErr, s.ToString());
+ }
+ std::vector<std::string> kv_pairs;
+ for (const auto &p : field_values) {
+ kv_pairs.emplace_back(p.field);
+ kv_pairs.emplace_back(p.value);
+ }
+ *output = MultiBulkString(kv_pairs);
return Status::OK();
}
+
+ private:
+ int64_t limit_ = LONG_MAX;
Review Comment:
I think maybe `limit_` should be an unsigned integer?
--
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