This is an automated email from the ASF dual-hosted git repository.
twice 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 3c8725399 chore: remove unused `autoResizeBlockAndSST` method and
config (#3136)
3c8725399 is described below
commit 3c8725399bd944e47773859ce6ae25261ae13c96
Author: Jonah Gao <[email protected]>
AuthorDate: Fri Aug 22 12:33:02 2025 +0800
chore: remove unused `autoResizeBlockAndSST` method and config (#3136)
The usage of this function was removed in
https://github.com/apache/kvrocks/pull/395.
Co-authored-by: Twice <[email protected]>
---
src/config/config.cc | 1 -
src/config/config.h | 1 -
src/server/server.cc | 85 ----------------------------------------------------
src/server/server.h | 1 -
4 files changed, 88 deletions(-)
diff --git a/src/config/config.cc b/src/config/config.cc
index b8b54b32a..f17db7829 100644
--- a/src/config/config.cc
+++ b/src/config/config.cc
@@ -219,7 +219,6 @@ Config::Config() {
spdlog::level::off)},
{"purge-backup-on-fullsync", false, new
YesNoField(&purge_backup_on_fullsync, false)},
{"rename-command", true, new MultiStringField(&rename_command_,
std::vector<std::string>{})},
- {"auto-resize-block-and-sst", false, new
YesNoField(&auto_resize_block_and_sst, true)},
{"fullsync-recv-file-delay", false, new
IntField(&fullsync_recv_file_delay, 0, 0, INT_MAX)},
{"cluster-enabled", true, new YesNoField(&cluster_enabled, false)},
{"migrate-speed", false, new IntField(&migrate_speed, 4096, 0, INT_MAX)},
diff --git a/src/config/config.h b/src/config/config.h
index 871f13236..578843c39 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -129,7 +129,6 @@ struct Config {
int max_bitmap_to_string_mb = 16;
bool master_use_repl_port = false;
bool purge_backup_on_fullsync = false;
- bool auto_resize_block_and_sst = true;
int fullsync_recv_file_delay = 0;
bool use_rsid_psync = false;
bool replication_group_sync = false;
diff --git a/src/server/server.cc b/src/server/server.cc
index b6e10cbef..40fc79f75 100644
--- a/src/server/server.cc
+++ b/src/server/server.cc
@@ -1584,91 +1584,6 @@ Status Server::AsyncScanDBSize(const std::string &ns) {
});
}
-Status Server::autoResizeBlockAndSST() {
- auto total_size = storage->GetTotalSize(kDefaultNamespace);
- uint64_t total_keys = 0, estimate_keys = 0;
- for (const auto &cf_handle : *storage->GetCFHandles()) {
- storage->GetDB()->GetIntProperty(cf_handle,
rocksdb::DB::Properties::kEstimateNumKeys, &estimate_keys);
- total_keys += estimate_keys;
- }
-
- if (total_size == 0 || total_keys == 0) {
- return Status::OK();
- }
-
- auto average_kv_size = total_size / total_keys;
- int target_file_size_base = 0;
- int block_size = 0;
- if (average_kv_size > 512 * KiB) {
- target_file_size_base = 1024;
- block_size = 1 * MiB;
- } else if (average_kv_size > 256 * KiB) {
- target_file_size_base = 512;
- block_size = 512 * KiB;
- } else if (average_kv_size > 32 * KiB) {
- target_file_size_base = 256;
- block_size = 256 * KiB;
- } else if (average_kv_size > 1 * KiB) {
- target_file_size_base = 128;
- block_size = 32 * KiB;
- } else if (average_kv_size > 128) {
- target_file_size_base = 64;
- block_size = 8 * KiB;
- } else {
- target_file_size_base = 16;
- block_size = 2 * KiB;
- }
-
- if (target_file_size_base == config_->rocks_db.target_file_size_base &&
- target_file_size_base == config_->rocks_db.write_buffer_size &&
block_size == config_->rocks_db.block_size) {
- return Status::OK();
- }
-
- if (target_file_size_base != config_->rocks_db.target_file_size_base) {
- auto old_target_file_size_base = config_->rocks_db.target_file_size_base;
- auto s = config_->Set(this, "rocksdb.target_file_size_base",
std::to_string(target_file_size_base));
- info(
- "[server] Resize rocksdb.target_file_size_base from {} to {}, "
- "average_kv_size: {}, total_size: {}, total_keys: {}, result: {}",
- old_target_file_size_base, target_file_size_base, average_kv_size,
total_size, total_keys, s.Msg());
- if (!s.IsOK()) {
- return s;
- }
- }
-
- if (target_file_size_base != config_->rocks_db.write_buffer_size) {
- auto old_write_buffer_size = config_->rocks_db.write_buffer_size;
- auto s = config_->Set(this, "rocksdb.write_buffer_size",
std::to_string(target_file_size_base));
- info(
- "[server] Resize rocksdb.write_buffer_size from {} to {}, "
- "average_kv_size: {}, total_size: {}, "
- "total_keys: {}, result: {}",
- old_write_buffer_size, target_file_size_base, average_kv_size,
total_size, total_keys, s.Msg());
- if (!s.IsOK()) {
- return s;
- }
- }
-
- if (block_size != config_->rocks_db.block_size) {
- auto s =
storage->SetOptionForAllColumnFamilies("table_factory.block_size",
std::to_string(block_size));
- info(
- "[server] Resize rocksdb.block_size from {} to {}, "
- "average_kv_size: {}, total_size: {}, "
- "total_keys: {}, result: {}",
- config_->rocks_db.block_size, block_size, average_kv_size, total_size,
total_keys, s.Msg());
- if (!s.IsOK()) {
- return s;
- }
-
- config_->rocks_db.block_size = block_size;
- }
-
- auto s = config_->Rewrite(namespace_.List());
- info("[server] Rewrite config, result: {}", s.Msg());
-
- return Status::OK();
-}
-
void Server::GetLatestKeyNumStats(const std::string &ns, KeyNumStats *stats) {
auto iter = db_scan_infos_.find(ns);
if (iter != db_scan_infos_.end()) {
diff --git a/src/server/server.h b/src/server/server.h
index 37211c4f4..54f4c2cc4 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -357,7 +357,6 @@ class Server {
void cron();
void recordInstantaneousMetrics();
static void updateCachedTime();
- Status autoResizeBlockAndSST();
void updateWatchedKeysFromRange(const std::vector<std::string> &args, const
redis::CommandKeyRange &range);
void updateAllWatchedKeys();
void increaseWorkerThreads(size_t delta);
