remove saved_cnt arg

apache · Sep 2, 2023 · f87a217 · f87a217
1 parent 91fee0a
commit f87a217
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/commands/cmd_zset.cc b/src/commands/cmd_zset.cc
@@ -1228,7 +1228,7 @@ class CommandZUnion : public Commander {
   Status Execute(Server *svr, Connection *conn, std::string *output) override {
     redis::ZSet zset_db(svr->storage, conn->GetNamespace());
     std::vector<MemberScore> member_scores;
-    auto s = zset_db.Union(keys_weights_, aggregate_method_, nullptr, &member_scores);
+    auto s = zset_db.Union(keys_weights_, aggregate_method_, &member_scores);
     if (!s.ok()) {
       return {Status::RedisExecErr, s.ToString()};
     }

diff --git a/src/types/redis_zset.cc b/src/types/redis_zset.cc
@@ -635,7 +635,7 @@ rocksdb::Status ZSet::InterStore(const Slice &dst, const std::vector<KeyWeight>
 }
 
 rocksdb::Status ZSet::Inter(const std::vector<KeyWeight> &keys_weights, AggregateMethod aggregate_method,
-                            uint64_t *saved_cnt, std::vector<MemberScore> *members) {
+                            std::vector<MemberScore> *members) {
   std::vector<std::string> lock_keys;
   lock_keys.reserve(keys_weights.size());
   for (const auto &key_weight : keys_weights) {
@@ -644,8 +644,6 @@ rocksdb::Status ZSet::Inter(const std::vector<KeyWeight> &keys_weights, Aggregat
   }
   MultiLockGuard guard(storage_->GetLockManager(), lock_keys);
 
-  if (saved_cnt) *saved_cnt = 0;
-
   std::map<std::string, double> dst_zset;
   std::map<std::string, size_t> member_counters;
   std::vector<MemberScore> target_mscores;
@@ -696,7 +694,6 @@ rocksdb::Status ZSet::Inter(const std::vector<KeyWeight> &keys_weights, Aggregat
       if (member_counters[iter.first] != keys_weights.size()) continue;
       members->emplace_back(MemberScore{iter.first, iter.second});
     }
-    if (saved_cnt) *saved_cnt = members->size();
   }
 
   return rocksdb::Status::OK();
@@ -706,14 +703,14 @@ rocksdb::Status ZSet::UnionStore(const Slice &dst, const std::vector<KeyWeight>
                                  AggregateMethod aggregate_method, uint64_t *saved_cnt) {
   *saved_cnt = 0;
   std::vector<MemberScore> members;
-  auto s = Union(keys_weights, aggregate_method, saved_cnt, &members);
+  auto s = Union(keys_weights, aggregate_method, &members);
   if (!s.ok()) return s;
   *saved_cnt = members.size();
   return Overwrite(dst, members);
 }
 
 rocksdb::Status ZSet::Union(const std::vector<KeyWeight> &keys_weights, AggregateMethod aggregate_method,
-                            uint64_t *saved_cnt, std::vector<MemberScore> *members) {
+                            std::vector<MemberScore> *members) {
   std::vector<std::string> lock_keys;
   lock_keys.reserve(keys_weights.size());
   for (const auto &key_weight : keys_weights) {
@@ -722,8 +719,6 @@ rocksdb::Status ZSet::Union(const std::vector<KeyWeight> &keys_weights, Aggregat
   }
   MultiLockGuard guard(storage_->GetLockManager(), lock_keys);
 
-  if (saved_cnt) *saved_cnt = 0;
-
   std::map<std::string, double> dst_zset;
   std::vector<MemberScore> target_mscores;
   uint64_t target_size = 0;
@@ -762,7 +757,6 @@ rocksdb::Status ZSet::Union(const std::vector<KeyWeight> &keys_weights, Aggregat
     for (const auto &iter : dst_zset) {
       members->emplace_back(MemberScore{iter.first, iter.second});
     }
-    if (saved_cnt) *saved_cnt = members->size();
   }
   return rocksdb::Status::OK();
 }

diff --git a/src/types/redis_zset.h b/src/types/redis_zset.h
@@ -110,11 +110,11 @@ class ZSet : public SubKeyScanner {
   rocksdb::Status InterStore(const Slice &dst, const std::vector<KeyWeight> &keys_weights,
                              AggregateMethod aggregate_method, uint64_t *saved_cnt);
   rocksdb::Status Inter(const std::vector<KeyWeight> &keys_weights, AggregateMethod aggregate_method,
-                        uint64_t *saved_cnt, std::vector<MemberScore> *members);
+                        std::vector<MemberScore> *members);
   rocksdb::Status UnionStore(const Slice &dst, const std::vector<KeyWeight> &keys_weights,
                              AggregateMethod aggregate_method, uint64_t *saved_cnt);
   rocksdb::Status Union(const std::vector<KeyWeight> &keys_weights, AggregateMethod aggregate_method,
-                        uint64_t *saved_cnt, std::vector<MemberScore> *members);
+                        std::vector<MemberScore> *members);
   rocksdb::Status MGet(const Slice &user_key, const std::vector<Slice> &members, std::map<std::string, double> *scores);
   rocksdb::Status GetMetadata(const Slice &ns_key, ZSetMetadata *metadata);