Skip to content

Commit e300629

Browse files
MixficsolMixficsol
authored
Revert "feat:new big key count (#3009)" (#3055)
This reverts commit edacc5a.
1 parent 05d1c37 commit e300629

8 files changed

Lines changed: 0 additions & 130 deletions

File tree

‎src/pika_admin.cc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,7 +1406,6 @@ void InfoCmd::InfoData(std::string& info) {
14061406
uint64_t total_table_reader_usage = 0;
14071407
uint64_t memtable_usage = 0;
14081408
uint64_t table_reader_usage = 0;
1409-
uint64_t total_big_key_count = 0;
14101409
std::shared_lock db_rwl(g_pika_server->dbs_rw_);
14111410
for (const auto& db_item : g_pika_server->dbs_) {
14121411
if (!db_item.second) {
@@ -1418,9 +1417,6 @@ void InfoCmd::InfoData(std::string& info) {
14181417
db_item.second->storage()->GetUsage(storage::PROPERTY_TYPE_ROCKSDB_CUR_SIZE_ALL_MEM_TABLES, &memtable_usage);
14191418
db_item.second->storage()->GetUsage(storage::PROPERTY_TYPE_ROCKSDB_ESTIMATE_TABLE_READER_MEM, &table_reader_usage);
14201419
db_item.second->storage()->GetUsage(storage::PROPERTY_TYPE_ROCKSDB_BACKGROUND_ERRORS, &background_errors);
1421-
1422-
uint64_t big_key_count = db_item.second->storage()->GetBigKeyStatistics(db_item.first, "bigkey_property");
1423-
total_big_key_count += big_key_count;
14241420
db_item.second->DBUnlockShared();
14251421
total_memtable_usage += memtable_usage;
14261422
total_table_reader_usage += table_reader_usage;
@@ -1440,7 +1436,6 @@ void InfoCmd::InfoData(std::string& info) {
14401436
tmp_stream << "db_tablereader_usage:" << total_table_reader_usage << "\r\n";
14411437
tmp_stream << "db_fatal:" << (total_background_errors != 0 ? "1" : "0") << "\r\n";
14421438
tmp_stream << "db_fatal_msg:" << (total_background_errors != 0 ? db_fatal_msg_stream.str() : "nullptr") << "\r\n";
1443-
tmp_stream << "big_key_count:" << total_big_key_count << "\r\n";
14441439

14451440
info.append(tmp_stream.str());
14461441
}

‎src/storage/include/storage/storage.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,6 @@ class Storage {
11001100
Status EnableAutoCompaction(const OptionType& option_type,
11011101
const std::string& db_type, const std::unordered_map<std::string, std::string>& options);
11021102
void GetRocksDBInfo(std::string& info);
1103-
uint64_t GetBigKeyStatistics(const std::string& db_type, const std::string& property);
11041103

11051104
private:
11061105
std::unique_ptr<RedisStrings> strings_db_;

‎src/storage/src/redis.h‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <memory>
1010
#include <string>
1111
#include <vector>
12-
#include <iostream>
1312

1413
#include "rocksdb/db.h"
1514
#include "rocksdb/slice.h"
@@ -116,21 +115,6 @@ class Redis {
116115
Status SetSmallCompactionDurationThreshold(uint64_t small_compaction_duration_threshold);
117116
std::vector<rocksdb::ColumnFamilyHandle*> GetHandles(){ return handles_;};
118117
void GetRocksDBInfo(std::string &info, const char *prefix);
119-
void CheckBigKeyAndLog(const std::string& key, uint64_t size) {
120-
static const uint64_t kBigKeyThreshold = 10000;
121-
if (size > kBigKeyThreshold) {
122-
std::lock_guard<std::mutex> lock(big_key_access_mutex_);
123-
big_key_access_count_[key]++;
124-
std::cerr << "[BIGKEY DETECTED] Key: " << key
125-
<< ", Size: " << size
126-
<< ", Access Count: " << big_key_access_count_[key] << std::endl;
127-
}
128-
}
129-
130-
std::unordered_map<std::string, int> GetBigKeyStatistics() {
131-
std::lock_guard<std::mutex> lock(big_key_access_mutex_);
132-
return big_key_access_count_;
133-
}
134118

135119
protected:
136120
Storage* const storage_;
@@ -157,8 +141,6 @@ class Redis {
157141
Status UpdateSpecificKeyStatistics(const std::string& key, uint64_t count);
158142
Status UpdateSpecificKeyDuration(const std::string& key, uint64_t duration);
159143
Status AddCompactKeyTaskIfNeeded(const std::string& key, uint64_t count, uint64_t duration);
160-
std::unordered_map<std::string, int> big_key_access_count_;
161-
std::mutex big_key_access_mutex_;
162144
};
163145

164146
} // namespace storage

‎src/storage/src/redis_hashes.cc‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ Status RedisHashes::HDel(const Slice& key, const std::vector<std::string>& field
214214
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
215215
if (s.ok()) {
216216
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
217-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
218217
if (parsed_hashes_meta_value.IsStale() || parsed_hashes_meta_value.count() == 0) {
219218
*ret = 0;
220219
return Status::OK();
@@ -267,7 +266,6 @@ Status RedisHashes::HGet(const Slice& key, const Slice& field, std::string* valu
267266
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
268267
if (s.ok()) {
269268
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
270-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
271269
if (parsed_hashes_meta_value.IsStale()) {
272270
return Status::NotFound("Stale");
273271
} else if (parsed_hashes_meta_value.count() == 0) {
@@ -292,7 +290,6 @@ Status RedisHashes::HGetall(const Slice& key, std::vector<FieldValue>* fvs) {
292290
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
293291
if (s.ok()) {
294292
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
295-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
296293
if (parsed_hashes_meta_value.IsStale()) {
297294
return Status::NotFound("Stale");
298295
} else if (parsed_hashes_meta_value.count() == 0) {
@@ -324,7 +321,6 @@ Status RedisHashes::HGetallWithTTL(const Slice& key, std::vector<FieldValue>* fv
324321
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
325322
if (s.ok()) {
326323
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
327-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
328324
if (parsed_hashes_meta_value.count() == 0) {
329325
return Status::NotFound();
330326
} else if (parsed_hashes_meta_value.IsStale()) {
@@ -372,7 +368,6 @@ Status RedisHashes::HIncrby(const Slice& key, const Slice& field, int64_t value,
372368
char meta_value_buf[4] = {0};
373369
if (s.ok()) {
374370
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
375-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
376371
if (parsed_hashes_meta_value.IsStale() || parsed_hashes_meta_value.count() == 0) {
377372
version = parsed_hashes_meta_value.UpdateVersion();
378373
parsed_hashes_meta_value.set_count(1);
@@ -448,7 +443,6 @@ Status RedisHashes::HIncrbyfloat(const Slice& key, const Slice& field, const Sli
448443
char meta_value_buf[4] = {0};
449444
if (s.ok()) {
450445
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
451-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
452446
if (parsed_hashes_meta_value.IsStale() || parsed_hashes_meta_value.count() == 0) {
453447
version = parsed_hashes_meta_value.UpdateVersion();
454448
parsed_hashes_meta_value.set_count(1);
@@ -515,7 +509,6 @@ Status RedisHashes::HKeys(const Slice& key, std::vector<std::string>* fields) {
515509
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
516510
if (s.ok()) {
517511
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
518-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
519512
if (parsed_hashes_meta_value.IsStale()) {
520513
return Status::NotFound("Stale");
521514
} else if (parsed_hashes_meta_value.count() == 0) {
@@ -542,7 +535,6 @@ Status RedisHashes::HLen(const Slice& key, int32_t* ret) {
542535
Status s = db_->Get(default_read_options_, handles_[0], key, &meta_value);
543536
if (s.ok()) {
544537
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
545-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
546538
if (parsed_hashes_meta_value.IsStale()) {
547539
*ret = 0;
548540
return Status::NotFound("Stale");
@@ -571,7 +563,6 @@ Status RedisHashes::HMGet(const Slice& key, const std::vector<std::string>& fiel
571563
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
572564
if (s.ok()) {
573565
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
574-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
575566
if ((is_stale = parsed_hashes_meta_value.IsStale()) || parsed_hashes_meta_value.count() == 0) {
576567
for (size_t idx = 0; idx < fields.size(); ++idx) {
577568
vss->push_back({std::string(), Status::NotFound()});
@@ -622,7 +613,6 @@ Status RedisHashes::HMSet(const Slice& key, const std::vector<FieldValue>& fvs)
622613
char meta_value_buf[4] = {0};
623614
if (s.ok()) {
624615
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
625-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
626616
if (parsed_hashes_meta_value.IsStale() || parsed_hashes_meta_value.count() == 0) {
627617
version = parsed_hashes_meta_value.InitialMetaValue();
628618
if (!parsed_hashes_meta_value.check_set_count(static_cast<int32_t>(filtered_fvs.size()))) {
@@ -683,7 +673,6 @@ Status RedisHashes::HSet(const Slice& key, const Slice& field, const Slice& valu
683673
char meta_value_buf[4] = {0};
684674
if (s.ok()) {
685675
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
686-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
687676
if (parsed_hashes_meta_value.IsStale() || parsed_hashes_meta_value.count() == 0) {
688677
version = parsed_hashes_meta_value.InitialMetaValue();
689678
parsed_hashes_meta_value.set_count(1);
@@ -742,7 +731,6 @@ Status RedisHashes::HSetnx(const Slice& key, const Slice& field, const Slice& va
742731
char meta_value_buf[4] = {0};
743732
if (s.ok()) {
744733
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
745-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
746734
if (parsed_hashes_meta_value.IsStale() || parsed_hashes_meta_value.count() == 0) {
747735
version = parsed_hashes_meta_value.InitialMetaValue();
748736
parsed_hashes_meta_value.set_count(1);
@@ -794,7 +782,6 @@ Status RedisHashes::HVals(const Slice& key, std::vector<std::string>* values) {
794782
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
795783
if (s.ok()) {
796784
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
797-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
798785
if (parsed_hashes_meta_value.IsStale()) {
799786
return Status::NotFound("Stale");
800787
} else if (parsed_hashes_meta_value.count() == 0) {
@@ -845,7 +832,6 @@ Status RedisHashes::HScan(const Slice& key, int64_t cursor, const std::string& p
845832
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
846833
if (s.ok()) {
847834
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
848-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
849835
if (parsed_hashes_meta_value.IsStale() || parsed_hashes_meta_value.count() == 0) {
850836
*next_cursor = 0;
851837
return Status::NotFound();
@@ -910,7 +896,6 @@ Status RedisHashes::HScanx(const Slice& key, const std::string& start_field, con
910896
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
911897
if (s.ok()) {
912898
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
913-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
914899
if (parsed_hashes_meta_value.IsStale() || parsed_hashes_meta_value.count() == 0) {
915900
*next_field = "";
916901
return Status::NotFound();
@@ -969,7 +954,6 @@ Status RedisHashes::PKHScanRange(const Slice& key, const Slice& field_start, con
969954
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
970955
if (s.ok()) {
971956
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
972-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
973957
if (parsed_hashes_meta_value.IsStale() || parsed_hashes_meta_value.count() == 0) {
974958
return Status::NotFound();
975959
} else {
@@ -1029,7 +1013,6 @@ Status RedisHashes::PKHRScanRange(const Slice& key, const Slice& field_start, co
10291013
Status s = db_->Get(read_options, handles_[0], key, &meta_value);
10301014
if (s.ok()) {
10311015
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
1032-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
10331016
if (parsed_hashes_meta_value.IsStale() || parsed_hashes_meta_value.count() == 0) {
10341017
return Status::NotFound();
10351018
} else {
@@ -1180,7 +1163,6 @@ Status RedisHashes::Expire(const Slice& key, int32_t ttl) {
11801163
Status s = db_->Get(default_read_options_, handles_[0], key, &meta_value);
11811164
if (s.ok()) {
11821165
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
1183-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
11841166
if (parsed_hashes_meta_value.IsStale()) {
11851167
return Status::NotFound("Stale");
11861168
} else if (parsed_hashes_meta_value.count() == 0) {
@@ -1204,7 +1186,6 @@ Status RedisHashes::Del(const Slice& key) {
12041186
Status s = db_->Get(default_read_options_, handles_[0], key, &meta_value);
12051187
if (s.ok()) {
12061188
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
1207-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
12081189
if (parsed_hashes_meta_value.IsStale()) {
12091190
return Status::NotFound("Stale");
12101191
} else if (parsed_hashes_meta_value.count() == 0) {
@@ -1300,7 +1281,6 @@ Status RedisHashes::Expireat(const Slice& key, int32_t timestamp) {
13001281
Status s = db_->Get(default_read_options_, handles_[0], key, &meta_value);
13011282
if (s.ok()) {
13021283
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
1303-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
13041284
if (parsed_hashes_meta_value.IsStale()) {
13051285
return Status::NotFound("Stale");
13061286
} else if (parsed_hashes_meta_value.count() == 0) {
@@ -1323,7 +1303,6 @@ Status RedisHashes::Persist(const Slice& key) {
13231303
Status s = db_->Get(default_read_options_, handles_[0], key, &meta_value);
13241304
if (s.ok()) {
13251305
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
1326-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
13271306
if (parsed_hashes_meta_value.IsStale()) {
13281307
return Status::NotFound("Stale");
13291308
} else if (parsed_hashes_meta_value.count() == 0) {
@@ -1346,7 +1325,6 @@ Status RedisHashes::TTL(const Slice& key, int64_t* timestamp) {
13461325
Status s = db_->Get(default_read_options_, handles_[0], key, &meta_value);
13471326
if (s.ok()) {
13481327
ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
1349-
CheckBigKeyAndLog(key.ToString(), parsed_hashes_meta_value.count());
13501328
if (parsed_hashes_meta_value.IsStale()) {
13511329
*timestamp = -2;
13521330
return Status::NotFound("Stale");

0 commit comments

Comments
 (0)