remove parsing refundant blocks and useless comments

apache · Jun 23, 2024 · 38bb795 · 38bb795
1 parent 15af758
commit 38bb795
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/src/commands/cmd_stream.cc b/src/commands/cmd_stream.cc
@@ -367,26 +367,23 @@ class CommandAutoClaim : public Commander {
     key_name_ = GET_OR_RET(parser.TakeStr());
     group_name_ = GET_OR_RET(parser.TakeStr());
     consumer_name_ = GET_OR_RET(parser.TakeStr());
-    {
-      auto s = parser.TakeInt<uint64_t>();
-      if (!s.IsOK()) {
-        return {Status::RedisParseErr, "Invalid min-idle-time argument for XAUTOCLAIM"};
-      }
-      options_.min_idle_time_ms = s.GetValue();
+    auto parse_int_status = parser.TakeInt<uint64_t>();
+    if (!parse_int_status.IsOK()) {
+      return {Status::RedisParseErr, "Invalid min-idle-time argument for XAUTOCLAIM"};
     }
-    {
-      auto start_str = GET_OR_RET(parser.TakeStr());
-      if (!start_str.empty() && start_str.front() == '(') {
-        options_.exclude_start = true;
-        start_str = start_str.substr(1);
-      }
-      if (!options_.exclude_start && start_str == "-") {
-        options_.start_id = StreamEntryID::Minimum();
-      } else {
-        auto s = ParseRangeStart(start_str, &options_.start_id);
-        if (!s.IsOK()) {
-          return s;
-        }
+    options_.min_idle_time_ms = parse_int_status.GetValue();
+
+    auto start_str = GET_OR_RET(parser.TakeStr());
+    if (!start_str.empty() && start_str.front() == '(') {
+      options_.exclude_start = true;
+      start_str = start_str.substr(1);
+    }
+    if (!options_.exclude_start && start_str == "-") {
+      options_.start_id = StreamEntryID::Minimum();
+    } else {
+      auto parse_range_status = ParseRangeStart(start_str, &options_.start_id);
+      if (!parse_range_status.IsOK()) {
+        return parse_range_status;
       }
     }
 
@@ -429,7 +426,6 @@ class CommandAutoClaim : public Commander {
     output->append(redis::MultiLen(result.entries.size()));
     for (const auto &item : result.entries) {
       if (options_.just_id) {
-        // output->append(redis::MultiLen(1));
         output->append(redis::BulkString(item.key));
       } else {
         output->append(redis::MultiLen(2));

diff --git a/src/types/redis_stream.cc b/src/types/redis_stream.cc
@@ -661,7 +661,8 @@ rocksdb::Status Stream::AutoClaim(const Slice &stream_name, const std::string &g
 
   result->entries = std::move(pending_entries);
   result->deleted_ids.clear();
-  std::transform(deleted_entries.begin(), deleted_entries.end(), std::back_inserter(result->deleted_ids),
+  result->deleted_ids.reserve(deleted_entries.size());
+  std::transform(deleted_entries.cbegin(), deleted_entries.cend(), std::back_inserter(result->deleted_ids),
                  [](const StreamEntryID &id) { return id.ToString(); });
 
   return storage_->Write(storage_->DefaultWriteOptions(), batch->GetWriteBatch());