Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,9 @@ set(LZ4_INCLUDE_DIR ${INSTALL_INCLUDEDIR})
ExternalProject_Add(zlib
DEPENDS
URL
https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz
URL_HASH
MD5=9b8aa094c4e5765dabf4da391f00d15c
MD5=9855b6d802d7fe5b7bd5b196a2271655
DOWNLOAD_NO_PROGRESS
1
UPDATE_COMMAND
Expand Down
4 changes: 2 additions & 2 deletions src/pika_admin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ static std::string ConstructPinginPubSubResp(const PikaCmdArgsType& argv) {
}

static double MethodofCommandStatistics(const uint64_t time_consuming, const uint64_t frequency) {
return (static_cast<double>(time_consuming) / 1000.0) / static_cast<double>(frequency);
return static_cast<double>(time_consuming) / static_cast<double>(frequency);
}

static double MethodofTotalTimeCalculation(const uint64_t time_consuming) {
return static_cast<double>(time_consuming) / 1000.0;
return static_cast<double>(time_consuming);
}

enum AuthResult {
Expand Down
14 changes: 9 additions & 5 deletions src/storage/src/redis_zsets.cc
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,17 @@ Status Redis::ZAdd(const Slice& key, const std::vector<ScoreMember>& score_membe
*ret = 0;
uint32_t statistic = 0;
std::unordered_set<std::string> unique;
std::vector<ScoreMember> filtered_score_members;
for (const auto& sm : score_members) {
if (unique.find(sm.member) == unique.end()) {
unique.insert(sm.member);
filtered_score_members.push_back(sm);
std::list<storage::ScoreMember> mid_score_members;
for (auto it = score_members.rbegin(); it != score_members.rend(); ++it) {
if (unique.find(it->member) == unique.end()) {
unique.insert(it->member);
mid_score_members.push_front(*it);
}
}
std::vector<ScoreMember> filtered_score_members;
for (auto &item : mid_score_members) {
filtered_score_members.push_back(std::move(item));
}

char score_buf[8];
uint64_t version = 0;
Expand Down
Loading