This is an automated email from the ASF dual-hosted git repository.
binbin pushed a commit to branch unstable
in repository https://gitbox.apache.org/repos/asf/kvrocks.git
The following commit(s) were added to refs/heads/unstable by this push:
new e0965002 Remove redundant string contruction from Slice (#1745)
e0965002 is described below
commit e0965002589ce4295bdcca0c998c843efb598547
Author: Twice <[email protected]>
AuthorDate: Thu Sep 7 16:20:29 2023 +0900
Remove redundant string contruction from Slice (#1745)
We remove lots of redundant string contruction from Slice to improve
efficiency.
---
src/cluster/redis_slot.cc | 4 ++--
src/storage/batch_extractor.cc | 4 ++--
src/storage/compact_filter.cc | 9 +++------
src/storage/redis_db.cc | 8 +++-----
src/storage/redis_metadata.cc | 2 +-
src/storage/storage.cc | 2 +-
utils/kvrocks2redis/parser.cc | 2 +-
7 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/cluster/redis_slot.cc b/src/cluster/redis_slot.cc
index 0523f782..5934fd2d 100644
--- a/src/cluster/redis_slot.cc
+++ b/src/cluster/redis_slot.cc
@@ -65,11 +65,11 @@ uint16_t GetSlotIdFromKey(std::string_view key) {
std::string_view GetTagFromKey(std::string_view key) {
auto left_pos = key.find('{');
- if (left_pos == std::string::npos) return {};
+ if (left_pos == std::string_view::npos) return {};
auto right_pos = key.find('}', left_pos + 1);
// Note that we hash the whole key if there is nothing between {}.
- if (right_pos == std::string::npos || right_pos <= left_pos + 1) {
+ if (right_pos == std::string_view::npos || right_pos <= left_pos + 1) {
return {};
}
diff --git a/src/storage/batch_extractor.cc b/src/storage/batch_extractor.cc
index 61952832..7a5804f9 100644
--- a/src/storage/batch_extractor.cc
+++ b/src/storage/batch_extractor.cc
@@ -58,7 +58,7 @@ rocksdb::Status WriteBatchExtractor::PutCF(uint32_t
column_family_id, const Slic
}
Metadata metadata(kRedisNone);
- metadata.Decode(value.ToString());
+ metadata.Decode(value);
if (metadata.Type() == kRedisString) {
command_args = {"SET", user_key,
value.ToString().substr(Metadata::GetOffsetAfterExpire(value[0]))};
@@ -92,7 +92,7 @@ rocksdb::Status WriteBatchExtractor::PutCF(uint32_t
column_family_id, const Slic
}
StreamMetadata stream_metadata;
- auto s = stream_metadata.Decode(value.ToString());
+ auto s = stream_metadata.Decode(value);
if (!s.ok()) return s;
command_args = {"XSETID",
diff --git a/src/storage/compact_filter.cc b/src/storage/compact_filter.cc
index d7888089..6de34496 100644
--- a/src/storage/compact_filter.cc
+++ b/src/storage/compact_filter.cc
@@ -35,9 +35,8 @@ using rocksdb::Slice;
bool MetadataFilter::Filter(int level, const Slice &key, const Slice &value,
std::string *new_value,
bool *modified) const {
- std::string bytes = value.ToString();
Metadata metadata(kRedisNone, false);
- rocksdb::Status s = metadata.Decode(bytes);
+ rocksdb::Status s = metadata.Decode(value);
auto [ns, user_key] = ExtractNamespaceKey(key, stor_->IsSlotIdEncoded());
if (!s.ok()) {
LOG(WARNING) << "[compact_filter/metadata] Failed to decode,"
@@ -106,8 +105,7 @@ rocksdb::CompactionFilter::Decision
SubKeyFilter::FilterBlobByKey(int level, con
}
if (!s.IsOK()) {
LOG(ERROR) << "[compact_filter/subkey] Failed to get metadata"
- << ", namespace: " << ikey.GetNamespace().ToString() << ", key:
" << ikey.GetKey().ToString()
- << ", err: " << s.Msg();
+ << ", namespace: " << ikey.GetNamespace() << ", key: " <<
ikey.GetKey() << ", err: " << s.Msg();
return rocksdb::CompactionFilter::Decision::kKeep;
}
// bitmap will be checked in Filter
@@ -129,8 +127,7 @@ bool SubKeyFilter::Filter(int level, const Slice &key,
const Slice &value, std::
}
if (!s.IsOK()) {
LOG(ERROR) << "[compact_filter/subkey] Failed to get metadata"
- << ", namespace: " << ikey.GetNamespace().ToString() << ", key:
" << ikey.GetKey().ToString()
- << ", err: " << s.Msg();
+ << ", namespace: " << ikey.GetNamespace() << ", key: " <<
ikey.GetKey() << ", err: " << s.Msg();
return false;
}
diff --git a/src/storage/redis_db.cc b/src/storage/redis_db.cc
index 0c6d4228..f0fcea44 100644
--- a/src/storage/redis_db.cc
+++ b/src/storage/redis_db.cc
@@ -210,7 +210,7 @@ void Database::GetKeyNumStats(const std::string &prefix,
KeyNumStats *stats) { K
void Database::Keys(const std::string &prefix, std::vector<std::string> *keys,
KeyNumStats *stats) {
uint16_t slot_id = 0;
- std::string ns_prefix, value;
+ std::string ns_prefix;
if (namespace_ != kDefaultNamespace || keys != nullptr) {
if (storage_->IsSlotIdEncoded()) {
ns_prefix = ComposeNamespaceKey(namespace_, "", false);
@@ -236,8 +236,7 @@ void Database::Keys(const std::string &prefix,
std::vector<std::string> *keys, K
break;
}
Metadata metadata(kRedisNone, false);
- value = iter->value().ToString();
- metadata.Decode(value);
+ metadata.Decode(iter->value());
if (metadata.Expired()) {
if (stats) stats->n_expired++;
continue;
@@ -313,8 +312,7 @@ rocksdb::Status Database::Scan(const std::string &cursor,
uint64_t limit, const
break;
}
Metadata metadata(kRedisNone, false);
- std::string value = iter->value().ToString();
- metadata.Decode(value);
+ metadata.Decode(iter->value());
if (metadata.Expired()) continue;
std::tie(std::ignore, user_key) =
ExtractNamespaceKey<std::string>(iter->key(), storage_->IsSlotIdEncoded());
keys->emplace_back(user_key);
diff --git a/src/storage/redis_metadata.cc b/src/storage/redis_metadata.cc
index b3c2aab3..a40d769f 100644
--- a/src/storage/redis_metadata.cc
+++ b/src/storage/redis_metadata.cc
@@ -127,7 +127,7 @@ std::string ComposeNamespaceKey(const Slice &ns, const
Slice &key, bool slot_id_
ns_key.append(ns.data(), ns.size());
if (slot_id_encoded) {
- auto slot_id = GetSlotIdFromKey(key.ToString());
+ auto slot_id = GetSlotIdFromKey(key.ToStringView());
PutFixed16(&ns_key, slot_id);
}
diff --git a/src/storage/storage.cc b/src/storage/storage.cc
index 775ffe41..f5613673 100644
--- a/src/storage/storage.cc
+++ b/src/storage/storage.cc
@@ -1107,7 +1107,7 @@ bool Storage::ReplDataManager::FileExists(Storage
*storage, const std::string &d
if (slice.size() == 0) return false;
- tmp_crc = rocksdb::crc32c::Extend(0, slice.ToString().c_str(),
slice.size());
+ tmp_crc = rocksdb::crc32c::Extend(0, slice.data(), slice.size());
size -= slice.size();
}
diff --git a/utils/kvrocks2redis/parser.cc b/utils/kvrocks2redis/parser.cc
index a06acf8a..9d96f156 100644
--- a/utils/kvrocks2redis/parser.cc
+++ b/utils/kvrocks2redis/parser.cc
@@ -44,7 +44,7 @@ Status Parser::ParseFullDB() {
for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
Metadata metadata(kRedisNone);
- metadata.Decode(iter->value().ToString());
+ metadata.Decode(iter->value());
if (metadata.Expired()) { // ignore the expired key
continue;
}
