Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: keyspace error for stream type #2705

Merged
merged 3 commits into from
Jun 12, 2024
Merged

fix: keyspace error for stream type #2705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58251f2
fix keyspace error for stream type
Jun 7, 2024
7675bec
fix dbsize bug
Jun 7, 2024
681ab4f
fix keyscaninfo init error
wangshao1 Jun 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/pika_db.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ struct KeyScanInfo {
time_t start_time = 0;
std::string s_start_time;
int32_t duration = -3;
std::vector<storage::KeyInfo> key_infos; // the order is strings, hashes, lists, zsets, sets
std::vector<storage::KeyInfo> key_infos; // the order is strings, hashes, lists, zsets, sets, streams
bool key_scaning_ = false;
KeyScanInfo() :
s_start_time("0"),
key_infos({{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}})
key_infos({{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}})
{}
};

Expand Down
11 changes: 8 additions & 3 deletions src/pika_admin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ void InfoCmd::InfoKeyspace(std::string& info) {
key_scan_info = db_item.second->GetKeyScanInfo();
key_infos = key_scan_info.key_infos;
duration = key_scan_info.duration;
if (key_infos.size() != 5) {
if (key_infos.size() != (size_t)(storage::DataType::kNones)) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure correct handling of key_infos size.

The check for key_infos.size() against storage::DataType::kNones is crucial for ensuring that the array has the expected number of elements. However, this check should be moved to a more appropriate place where key_infos is populated or modified, to ensure that it always has the correct size before being accessed.

info.append("info keyspace error\r\n");
return;
}
Expand All @@ -1227,6 +1227,8 @@ void InfoCmd::InfoKeyspace(std::string& info) {
<< ", invalid_keys=" << key_infos[3].invaild_keys << "\r\n";
tmp_stream << db_name << " Sets_keys=" << key_infos[4].keys << ", expires=" << key_infos[4].expires
<< ", invalid_keys=" << key_infos[4].invaild_keys << "\r\n\r\n";
tmp_stream << db_name << " Streams_keys=" << key_infos[5].keys << ", expires=" << key_infos[5].expires
<< ", invalid_keys=" << key_infos[5].invaild_keys << "\r\n\r\n";
}
}
info.append(tmp_stream.str());
Expand Down Expand Up @@ -2840,11 +2842,14 @@ void DbsizeCmd::Do() {
}
KeyScanInfo key_scan_info = dbs->GetKeyScanInfo();
std::vector<storage::KeyInfo> key_infos = key_scan_info.key_infos;
if (key_infos.size() != 5) {
if (key_infos.size() != (size_t)(storage::DataType::kNones)) {
res_.SetRes(CmdRes::kErrOther, "keyspace error");
return;
}
uint64_t dbsize = key_infos[0].keys + key_infos[1].keys + key_infos[2].keys + key_infos[3].keys + key_infos[4].keys;
uint64_t dbsize = 0;
for (auto info : key_infos) {
dbsize += info.keys;
}
res_.AppendInteger(static_cast<int64_t>(dbsize));
}
}
Expand Down
13 changes: 2 additions & 11 deletions src/pika_db.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,11 @@ bool DB::IsKeyScaning() {

void DB::RunKeyScan() {
Status s;
std::vector<storage::KeyInfo> new_key_infos(5);
std::vector<storage::KeyInfo> new_key_infos;

InitKeyScan();
std::shared_lock l(dbs_rw_);
std::vector<storage::KeyInfo> tmp_key_infos;
s = GetKeyNum(&tmp_key_infos);
if (s.ok()) {
for (size_t idx = 0; idx < tmp_key_infos.size(); ++idx) {
new_key_infos[idx].keys += tmp_key_infos[idx].keys;
new_key_infos[idx].expires += tmp_key_infos[idx].expires;
new_key_infos[idx].avg_ttl += tmp_key_infos[idx].avg_ttl;
new_key_infos[idx].invaild_keys += tmp_key_infos[idx].invaild_keys;
}
}
s = GetKeyNum(&new_key_infos);
key_scan_info_.duration = static_cast<int32_t>(time(nullptr) - key_scan_info_.start_time);

std::lock_guard lm(key_scan_protector_);
Expand Down
2 changes: 1 addition & 1 deletion src/storage/src/redis.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ Status Redis::ScanKeyNum(std::vector<KeyInfo>* key_infos) {
if (!s.ok()) {
return s;
}
s = ScanSetsKeyNum(&((*key_infos)[5]));
s = ScanStreamsKeyNum(&((*key_infos)[5]));
if (!s.ok()) {
return s;
}
Expand Down
2 changes: 1 addition & 1 deletion src/storage/src/storage.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,7 +1823,7 @@ uint64_t Storage::GetProperty(const std::string& property) {

Status Storage::GetKeyNum(std::vector<KeyInfo>* key_infos) {
KeyInfo key_info;
key_infos->resize(5);
key_infos->resize(size_t(DataType::kNones));
for (const auto& db : insts_) {
std::vector<KeyInfo> db_key_infos;
// check the scanner was stopped or not, before scanning the next db
Expand Down
Loading