Skip to content

Minor: improve the style of zdiff #2027

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

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Minor: improve the style of zdiff #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/commands/cmd_zset.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,7 @@ class CommandZDiff : public Commander {
if (numkeys_ > args.size() - 2) return {Status::RedisParseErr, errInvalidSyntax};

size_t j = 0;
keys_.reserve(numkeys_);
while (j < numkeys_) {
keys_.emplace_back(args[j + 2]);
j++;
Expand Down
21 changes: 11 additions & 10 deletions src/types/redis_zset.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ rocksdb::Status ZSet::Pop(const Slice &user_key, int count, bool min, MemberScor

auto iter = util::UniqueIterator(storage_, read_options, score_cf_handle_);
iter->Seek(start_key);
// see comment in rangebyscore()
// see comment in RangeByScore()
if (!min && (!iter->Valid() || !iter->key().starts_with(prefix_key))) {
iter->SeekForPrev(start_key);
}
Expand Down Expand Up @@ -249,7 +249,7 @@ rocksdb::Status ZSet::RangeByRank(const Slice &user_key, const RangeRankSpec &sp
auto batch = storage_->GetWriteBatchBase();
auto iter = util::UniqueIterator(storage_, read_options, score_cf_handle_);
iter->Seek(start_key);
// see comment in rangebyscore()
// see comment in RangeByScore()
if (spec.reversed && (!iter->Valid() || !iter->key().starts_with(prefix_key))) {
iter->SeekForPrev(start_key);
}
Expand Down Expand Up @@ -583,7 +583,7 @@ rocksdb::Status ZSet::Rank(const Slice &user_key, const Slice &member, bool reve

auto iter = util::UniqueIterator(storage_, read_options, score_cf_handle_);
iter->Seek(start_key);
// see comment in rangebyscore()
// see comment in RangeByScore()
if (reversed && (!iter->Valid() || !iter->key().starts_with(prefix_key))) {
iter->SeekForPrev(start_key);
}
Expand Down Expand Up @@ -716,7 +716,7 @@ rocksdb::Status ZSet::InterCard(const std::vector<std::string> &user_keys, uint6
MemberScores mscores;
auto s = RangeByScore(user_key, spec, &mscores, nullptr);
if (!s.ok() || mscores.empty()) return s;
mscores_list.emplace_back(mscores);
mscores_list.emplace_back(std::move(mscores));
}
std::sort(mscores_list.begin(), mscores_list.end(),
[](const MemberScores &v1, const MemberScores &v2) { return v1.size() < v2.size(); });
Expand Down Expand Up @@ -935,23 +935,24 @@ rocksdb::Status ZSet::Diff(const std::vector<Slice> &keys, MemberScores *members
members->clear();
MemberScores source_member_scores;
RangeScoreSpec spec;
uint64_t size = 0;
auto s = RangeByScore(keys[0], spec, &source_member_scores, &size);
uint64_t first_element_size = 0;
auto s = RangeByScore(keys[0], spec, &source_member_scores, &first_element_size);
if (!s.ok()) return s;

if (size == 0) {
if (first_element_size == 0) {
return rocksdb::Status::OK();
}

std::map<std::string, bool> exclude_members;
std::set<std::string> exclude_members;
MemberScores target_member_scores;
for (size_t i = 1; i < keys.size(); i++) {
uint64_t size = 0;
s = RangeByScore(keys[i], spec, &target_member_scores, &size);
if (!s.ok()) return s;
for (const auto &member_score : target_member_scores) {
exclude_members[member_score.member] = true;
for (auto &member_score : target_member_scores) {
exclude_members.emplace(std::move(member_score.member));
}
target_member_scores.clear();
}
for (const auto &member_score : source_member_scores) {
if (exclude_members.find(member_score.member) == exclude_members.end()) {
Expand Down