diff --git a/.gitignore b/.gitignore
index 8ef20bb2944..9d6bddfb6de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ out/
 
 # Vscode files
 .vscode/**
+.devcontainer/
 
 target
 dist
diff --git a/Cargo.lock b/Cargo.lock
index d48e3ea81dd..61e2e9edb42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,16 +36,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c80b57a86234ee3e9238f5f2d33d37f8fd5c7ff168c07f2d5147d410e86db33"
 dependencies = [
  "home",
- "libc 0.2.151",
+ "libc 0.2.176",
  "rustc_version 0.4.0",
  "xdg",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom 0.2.11",
  "once_cell",
@@ -94,7 +94,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -207,16 +207,16 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
 dependencies = [
- "concurrent-queue",
- "event-listener",
+ "concurrent-queue 1.2.2",
+ "event-listener 2.5.1",
  "futures-core",
 ]
 
 [[package]]
 name = "async-compression"
-version = "0.4.12"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
+checksum = "ddb939d66e4ae03cee6091612804ba446b12878410cfa17f785f4dd67d4014e8"
 dependencies = [
  "futures-core",
  "futures-io",
@@ -229,11 +229,13 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "2.7.0"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
 dependencies = [
- "event-listener",
+ "event-listener 5.4.1",
+ "event-listener-strategy",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -277,7 +279,7 @@ checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -295,7 +297,7 @@ version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "winapi 0.3.9",
 ]
 
@@ -341,7 +343,7 @@ dependencies = [
  "prometheus",
  "slog",
  "slog-global",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_util",
  "tokio",
  "tokio-util",
@@ -368,7 +370,7 @@ dependencies = [
  "bytes",
  "fastrand 2.0.1",
  "http 0.2.12",
- "time 0.3.20",
+ "time 0.3.41",
  "tokio",
  "tracing",
  "url",
@@ -463,7 +465,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "regex-lite",
- "sha2 0.10.8",
+ "sha2",
  "tracing",
  "url",
 ]
@@ -510,8 +512,8 @@ dependencies = [
  "http 1.1.0",
  "once_cell",
  "percent-encoding",
- "sha2 0.10.8",
- "time 0.3.20",
+ "sha2",
+ "time 0.3.41",
  "tracing",
 ]
 
@@ -543,7 +545,7 @@ dependencies = [
  "md-5",
  "pin-project-lite",
  "sha1",
- "sha2 0.10.8",
+ "sha2",
  "tracing",
 ]
 
@@ -604,7 +606,7 @@ dependencies = [
  "regex-lite",
  "roxmltree",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.40",
 ]
 
 [[package]]
@@ -679,13 +681,14 @@ dependencies = [
  "http-body 0.4.5",
  "http-body 1.0.0",
  "http-body-util",
+ "hyper",
  "itoa 1.0.1",
  "num-integer",
  "pin-project-lite",
  "pin-utils",
  "ryu",
  "serde",
- "time 0.3.20",
+ "time 0.3.41",
  "tokio",
  "tokio-util",
 ]
@@ -735,7 +738,7 @@ dependencies = [
  "slog",
  "slog-global",
  "tikv_util",
- "time 0.3.20",
+ "time 0.3.41",
  "tokio",
  "url",
  "uuid 1.7.0",
@@ -743,105 +746,123 @@ dependencies = [
 
 [[package]]
 name = "azure_core"
-version = "0.12.0"
-source = "git+https://github.com/tikv/azure-sdk-for-rust?branch=release-7.5-fips#e3dc3e02573e60e70f00418255c417aa80b8e26b"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6218987c374650fdad0b476bfc675729762c28dfb35f58608a38a2b1ea337dd"
 dependencies = [
  "async-trait",
- "base64 0.21.0",
+ "base64 0.21.7",
  "bytes",
  "dyn-clone",
  "futures 0.3.15",
  "getrandom 0.2.11",
  "http-types",
  "log",
+ "once_cell",
+ "openssl",
  "paste",
  "pin-project",
- "quick-xml 0.29.0",
+ "quick-xml 0.31.0",
  "rand 0.8.5",
  "reqwest",
  "rustc_version 0.4.0",
  "serde",
  "serde_json",
- "time 0.3.20",
+ "time 0.3.41",
  "url",
  "uuid 1.7.0",
 ]
 
 [[package]]
 name = "azure_identity"
-version = "0.12.0"
-source = "git+https://github.com/tikv/azure-sdk-for-rust?branch=release-7.5-fips#e3dc3e02573e60e70f00418255c417aa80b8e26b"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1eacc4f7fb2a73d57c39139d0fc3aed78435606055779ddaef4b43cdf919a8"
 dependencies = [
  "async-lock",
  "async-trait",
  "azure_core",
- "fix-hidden-lifetime-bug",
  "futures 0.3.15",
  "log",
  "oauth2",
  "pin-project",
  "serde",
- "serde_json",
- "time 0.3.20",
+ "time 0.3.41",
+ "tz-rs",
  "url",
  "uuid 1.7.0",
 ]
 
 [[package]]
 name = "azure_security_keyvault"
-version = "0.12.0"
-source = "git+https://github.com/tikv/azure-sdk-for-rust?branch=release-7.5-fips#e3dc3e02573e60e70f00418255c417aa80b8e26b"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7b31bc2b045f0fe1fe377960df975fcf578a22277268c1565fb2b239d9a7ffa"
 dependencies = [
  "async-trait",
  "azure_core",
- "const_format",
  "futures 0.3.15",
  "serde",
  "serde_json",
- "time 0.3.20",
- "url",
+ "time 0.3.41",
 ]
 
 [[package]]
 name = "azure_storage"
-version = "0.12.0"
-source = "git+https://github.com/tikv/azure-sdk-for-rust?branch=release-7.5-fips#e3dc3e02573e60e70f00418255c417aa80b8e26b"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade8f2653e408de88b9eafec9f48c3c26b94026375e88adbd34523a7dd9795a1"
 dependencies = [
  "RustyXML",
+ "async-lock",
  "async-trait",
  "azure_core",
  "bytes",
- "futures 0.3.15",
  "log",
- "once_cell",
- "openssl",
  "serde",
  "serde_derive",
- "serde_json",
- "time 0.3.20",
+ "time 0.3.41",
  "url",
  "uuid 1.7.0",
 ]
 
 [[package]]
 name = "azure_storage_blobs"
-version = "0.12.0"
-source = "git+https://github.com/tikv/azure-sdk-for-rust?branch=release-7.5-fips#e3dc3e02573e60e70f00418255c417aa80b8e26b"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "025701c7cc5b523100f0f3b2b01723564ec5a86c03236521c06826337047e872"
 dependencies = [
  "RustyXML",
  "azure_core",
  "azure_storage",
+ "azure_svc_blobstorage",
  "bytes",
  "futures 0.3.15",
  "log",
  "serde",
  "serde_derive",
  "serde_json",
- "time 0.3.20",
+ "time 0.3.41",
  "url",
  "uuid 1.7.0",
 ]
 
+[[package]]
+name = "azure_svc_blobstorage"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76051e5bb67cea1055abe5e530a0878feac7e0ab4cbbcb4a6adc953a58993389"
+dependencies = [
+ "azure_core",
+ "bytes",
+ "futures 0.3.15",
+ "log",
+ "once_cell",
+ "serde",
+ "serde_json",
+ "time 0.3.41",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.61"
@@ -850,7 +871,7 @@ dependencies = [
  "addr2line",
  "cc",
  "cfg-if 1.0.0",
- "libc 0.2.151",
+ "libc 0.2.176",
  "miniz_oxide 0.4.4",
  "object",
  "rustc-demangle",
@@ -890,7 +911,7 @@ dependencies = [
  "slog",
  "slog-global",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv",
  "tikv_alloc",
  "tikv_util",
@@ -910,7 +931,7 @@ dependencies = [
  "concurrency_manager",
  "crc64fast",
  "dashmap",
- "derive_more",
+ "derive_more 0.99.3",
  "encryption",
  "encryption_export",
  "engine_panic",
@@ -933,7 +954,7 @@ dependencies = [
  "pin-project",
  "prometheus",
  "prometheus-static-metric",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raftstore",
  "rand 0.8.5",
@@ -948,7 +969,7 @@ dependencies = [
  "test_pd_client",
  "test_raftstore",
  "test_util",
- "thiserror",
+ "thiserror 1.0.40",
  "tidb_query_datatype",
  "tikv",
  "tikv_kv",
@@ -972,9 +993,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "base64"
-version = "0.21.0"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64-simd"
@@ -993,7 +1014,7 @@ dependencies = [
  "criterion 0.3.5",
  "crossbeam",
  "dashmap",
- "derive_more",
+ "derive_more 0.99.3",
  "fail",
  "file_system",
  "kvproto",
@@ -1018,9 +1039,9 @@ dependencies = [
  "bcc-sys",
  "bitflags 1.3.2",
  "byteorder",
- "libc 0.2.151",
+ "libc 0.2.176",
  "regex",
- "thiserror",
+ "thiserror 1.0.40",
 ]
 
 [[package]]
@@ -1093,7 +1114,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex 1.3.0",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -1135,15 +1156,6 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -1221,7 +1233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
 dependencies = [
  "cc",
- "libc 0.2.151",
+ "libc 0.2.176",
  "pkg-config",
 ]
 
@@ -1247,7 +1259,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7f788eaf239475a3c1e1acf89951255a46c4b9b46cf3e866fc4d0707b4b9e36"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "valgrind_request",
 ]
 
@@ -1294,7 +1306,7 @@ dependencies = [
  "slog",
  "slog-global",
  "test_pd_client",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_util",
  "tokio",
  "txn_types",
@@ -1326,7 +1338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
 dependencies = [
  "jobserver",
- "libc 0.2.151",
+ "libc 0.2.176",
  "shlex 1.3.0",
 ]
 
@@ -1355,7 +1367,7 @@ dependencies = [
  "pd_client",
  "prometheus",
  "prometheus-static-metric",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raftstore",
  "resolved_ts",
@@ -1366,7 +1378,7 @@ dependencies = [
  "test_pd_client",
  "test_raftstore",
  "test_util",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv",
  "tikv_kv",
  "tikv_util",
@@ -1464,7 +1476,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f54d78e30b388d4815220c8dd03fea5656b6c6d32adb59e89061552a102f8da1"
 dependencies = [
  "glob",
- "libc 0.2.151",
+ "libc 0.2.176",
  "libloading",
 ]
 
@@ -1500,7 +1512,7 @@ name = "cloud"
 version = "0.0.1"
 dependencies = [
  "async-trait",
- "derive_more",
+ "derive_more 0.99.3",
  "error_code",
  "futures 0.3.15",
  "futures-io",
@@ -1508,8 +1520,8 @@ dependencies = [
  "lazy_static",
  "pin-project",
  "prometheus",
- "protobuf",
- "thiserror",
+ "protobuf 2.8.0",
+ "thiserror 1.0.40",
  "tikv_util",
  "tokio",
  "url",
@@ -1530,7 +1542,7 @@ version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71367d3385c716342014ad17e3d19f7788ae514885a1f4c24f500260fb365e1a"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "once_cell",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
@@ -1543,12 +1555,12 @@ dependencies = [
  "byteorder",
  "bytes",
  "error_code",
- "libc 0.2.151",
+ "libc 0.2.176",
  "panic_hook",
- "protobuf",
+ "protobuf 2.8.0",
  "rand 0.8.5",
  "static_assertions",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_alloc",
 ]
 
@@ -1567,10 +1579,11 @@ dependencies = [
  "async-compression",
  "bytes",
  "chrono",
+ "cloud",
  "codec",
  "crc64fast",
  "dashmap",
- "derive_more",
+ "derive_more 0.99.3",
  "encryption",
  "engine_rocks",
  "engine_traits",
@@ -1584,16 +1597,16 @@ dependencies = [
  "kvproto",
  "lazy_static",
  "pin-project",
- "pprof",
+ "pprof 0.15.0",
  "prometheus",
- "protobuf",
+ "protobuf 2.8.0",
  "serde",
  "serde_json",
  "slog",
  "slog-global",
  "tempdir",
  "test_util",
- "thiserror",
+ "thiserror 1.0.40",
  "tidb_query_datatype",
  "tikv_alloc",
  "tikv_util",
@@ -1627,7 +1640,7 @@ dependencies = [
  "serde",
  "slog",
  "slog-global",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_alloc",
  "tikv_util",
  "tokio",
@@ -1644,24 +1657,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "const_format"
-version = "0.2.30"
+name = "concurrent-queue"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
- "const_format_proc_macros",
+ "crossbeam-utils",
 ]
 
 [[package]]
-name = "const_format_proc_macros"
-version = "0.2.29"
+name = "const_fn"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
+checksum = "2f8a2ca5ac02d09563609681103aada9e1777d54fc57a5acd7a41404f9c93b6e"
 
 [[package]]
 name = "coprocessor_plugin_api"
@@ -1679,7 +1687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
 dependencies = [
  "core-foundation-sys",
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -1690,9 +1698,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpp_demangle"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d"
+checksum = "f2bb79cb74d735044c972aae58ed0aaa9a837e85b01106a54c39e42e97f62253"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1703,7 +1711,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "winapi 0.3.9",
 ]
 
@@ -1713,15 +1721,9 @@ version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
-[[package]]
-name = "cpuid-bool"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
-
 [[package]]
 name = "crc32c"
 version = "0.6.8"
@@ -1805,7 +1807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63aaaf47e457badbcb376c65a49d0f182c317ebd97dc6d1ced94c8e1d09c0f3a"
 dependencies = [
  "criterion 0.3.5",
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -2025,6 +2027,16 @@ dependencies = [
  "uuid 1.7.0",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
 [[package]]
 name = "derivative"
 version = "2.2.0"
@@ -2048,27 +2060,39 @@ dependencies = [
 ]
 
 [[package]]
-name = "diff"
-version = "0.1.13"
+name = "derive_more"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl",
+]
 
 [[package]]
-name = "digest"
-version = "0.9.0"
+name = "derive_more-impl"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
- "generic-array",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+ "unicode-xid",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.4",
+ "block-buffer",
  "crypto-common",
  "subtle",
 ]
@@ -2089,7 +2113,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "redox_users",
  "winapi 0.3.9",
 ]
@@ -2102,7 +2126,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2162,7 +2186,7 @@ dependencies = [
  "online_config",
  "openssl",
  "prometheus",
- "protobuf",
+ "protobuf 2.8.0",
  "rand 0.8.5",
  "serde",
  "serde_derive",
@@ -2170,7 +2194,7 @@ dependencies = [
  "slog-global",
  "tempfile",
  "test_util",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_util",
  "tokio",
  "toml",
@@ -2188,7 +2212,7 @@ dependencies = [
  "file_system",
  "gcp",
  "kvproto",
- "protobuf",
+ "protobuf 2.8.0",
  "rust-ini",
  "slog",
  "slog-global",
@@ -2215,7 +2239,7 @@ version = "0.0.1"
 dependencies = [
  "api_version",
  "collections",
- "derive_more",
+ "derive_more 0.99.3",
  "encryption",
  "engine_traits",
  "fail",
@@ -2229,7 +2253,7 @@ dependencies = [
  "prometheus",
  "prometheus-static-metric",
  "proptest",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "rand 0.8.5",
  "regex",
@@ -2307,7 +2331,7 @@ dependencies = [
  "portable-atomic 0.3.20",
  "prometheus",
  "prometheus-static-metric",
- "protobuf",
+ "protobuf 2.8.0",
  "proxy_ffi",
  "raft",
  "raft-proto",
@@ -2322,7 +2346,7 @@ dependencies = [
  "sst_importer",
  "tempfile",
  "test_sst_importer",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_alloc",
  "tikv_util",
  "time 0.1.43",
@@ -2352,7 +2376,7 @@ version = "0.0.1"
 dependencies = [
  "api_version",
  "collections",
- "derive_more",
+ "derive_more 0.99.3",
  "encryption",
  "engine_panic",
  "engine_rocks",
@@ -2363,7 +2387,7 @@ dependencies = [
  "keys",
  "kvproto",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log_wrappers",
  "num_cpus",
  "online_config",
@@ -2371,7 +2395,7 @@ dependencies = [
  "portable-atomic 0.3.20",
  "prometheus",
  "prometheus-static-metric",
- "protobuf",
+ "protobuf 2.8.0",
  "proxy_ffi",
  "raft",
  "rand 0.8.5",
@@ -2404,13 +2428,13 @@ dependencies = [
  "keys",
  "kvproto",
  "log_wrappers",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "rand 0.8.5",
  "serde",
  "slog",
  "slog-global",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_util",
  "toml",
  "tracker",
@@ -2484,7 +2508,7 @@ checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2495,12 +2519,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
- "libc 0.2.151",
- "windows-sys 0.52.0",
+ "libc 0.2.176",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -2529,6 +2553,27 @@ version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
 
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue 2.5.0",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.1",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "example_coprocessor_plugin"
 version = "0.1.0"
@@ -2629,7 +2674,7 @@ dependencies = [
  "fail",
  "fs2",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "online_config",
  "openssl",
  "parking_lot 0.12.1",
@@ -2651,8 +2696,8 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed3d8a5e20435ff00469e51a0d82049bae66504b5c429920dadf9bb54d47b3f"
 dependencies = [
- "libc 0.2.151",
- "thiserror",
+ "libc 0.2.176",
+ "thiserror 1.0.40",
  "winapi 0.3.9",
 ]
 
@@ -2663,7 +2708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
 dependencies = [
  "cfg-if 1.0.0",
- "libc 0.2.151",
+ "libc 0.2.176",
  "redox_syscall 0.2.11",
  "winapi 0.3.9",
 ]
@@ -2676,30 +2721,10 @@ checksum = "d691fdb3f817632d259d09220d4cf0991dbb2c9e59e044a02a59194bf6e14484"
 dependencies = [
  "cc",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "fix-hidden-lifetime-bug"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4ae9c2016a663983d4e40a9ff967d6dcac59819672f0b47f2b17574e99c33c8"
-dependencies = [
- "fix-hidden-lifetime-bug-proc_macros",
-]
-
-[[package]]
-name = "fix-hidden-lifetime-bug-proc_macros"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c81935e123ab0741c4c4f0d9b8377e5fb21d3de7e062fa4b1263b1fbcba1ea"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.103",
-]
-
 [[package]]
 name = "flatbuffers"
 version = "2.1.2"
@@ -2708,7 +2733,7 @@ checksum = "86b428b715fdbdd1c364b84573b5fdc0f84f8e423661b9f398735278bc7f2b6a"
 dependencies = [
  "bitflags 1.3.2",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.40",
 ]
 
 [[package]]
@@ -2718,7 +2743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682"
 dependencies = [
  "crc32fast",
- "libc 0.2.151",
+ "libc 0.2.176",
  "libz-sys",
  "miniz_oxide 0.3.7",
 ]
@@ -2770,7 +2795,7 @@ name = "fs2"
 version = "0.4.3"
 source = "git+https://github.com/tikv/fs2-rs?branch=tikv#cd503764a19a99d74c1ab424dd13d6bcd093fcae"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "winapi 0.3.9",
 ]
 
@@ -2796,7 +2821,7 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -2899,7 +2924,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3056,7 +3081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
 dependencies = [
  "cfg-if 0.1.10",
- "libc 0.2.151",
+ "libc 0.2.176",
  "wasi 0.7.0",
 ]
 
@@ -3068,7 +3093,7 @@ checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
- "libc 0.2.151",
+ "libc 0.2.176",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
@@ -3117,10 +3142,10 @@ dependencies = [
  "futures-executor",
  "futures-util",
  "grpcio-sys",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log",
  "parking_lot 0.11.1",
- "protobuf",
+ "protobuf 2.8.0",
 ]
 
 [[package]]
@@ -3129,7 +3154,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed97a17310fd00ff4109357584a00244e2a785d05b7ee0ef4d1e8fb1d84266df"
 dependencies = [
- "protobuf",
+ "protobuf 2.8.0",
 ]
 
 [[package]]
@@ -3142,7 +3167,7 @@ dependencies = [
  "futures-util",
  "grpcio",
  "log",
- "protobuf",
+ "protobuf 2.8.0",
 ]
 
 [[package]]
@@ -3154,7 +3179,7 @@ dependencies = [
  "bindgen 0.59.2",
  "cc",
  "cmake",
- "libc 0.2.151",
+ "libc 0.2.176",
  "libz-sys",
  "openssl-sys",
  "pkg-config",
@@ -3227,6 +3252,7 @@ dependencies = [
 name = "health_controller"
 version = "0.1.0"
 dependencies = [
+ "collections",
  "grpcio-health",
  "kvproto",
  "ordered-float",
@@ -3276,7 +3302,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -3409,7 +3435,7 @@ dependencies = [
  "online_config",
  "prometheus",
  "prometheus-static-metric",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raftstore",
  "slog",
@@ -3613,7 +3639,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3667,7 +3693,7 @@ dependencies = [
  "keys",
  "kvproto",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log_wrappers",
  "online_config",
  "parking_lot 0.12.1",
@@ -3687,7 +3713,7 @@ dependencies = [
  "tempfile",
  "test_pd",
  "test_util",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_alloc",
  "tikv_util",
  "tokio",
@@ -3734,7 +3760,7 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16d4bde3a7105e59c66a4104cfe9606453af1c7a0eac78cb7d5bc263eb762a70"
 dependencies = [
- "ahash 0.7.7",
+ "ahash 0.7.8",
  "atty",
  "indexmap 1.6.2",
  "itoa 1.0.1",
@@ -3754,7 +3780,7 @@ checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
 dependencies = [
  "bitflags 1.3.2",
  "inotify-sys",
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -3763,7 +3789,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -3811,7 +3837,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -3856,15 +3882,16 @@ version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.56"
+version = "0.3.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -3895,7 +3922,7 @@ dependencies = [
  "kvproto",
  "log_wrappers",
  "panic_hook",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_alloc",
  "tikv_util",
 ]
@@ -3903,11 +3930,12 @@ dependencies = [
 [[package]]
 name = "kvproto"
 version = "0.0.2"
-source = "git+https://github.com/pingcap/kvproto.git#e89bec5a53cc25bc13bc3d4b75af97c95cdedb3d"
+source = "git+https://github.com/pingcap/kvproto.git#0503050094661a00e390e3c235966791d1c59eb0"
 dependencies = [
+ "bytes",
  "futures 0.3.15",
  "grpcio",
- "protobuf",
+ "protobuf 2.8.0",
  "protobuf-build",
  "raft-proto",
 ]
@@ -3996,9 +4024,9 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.176"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -4038,13 +4066,13 @@ dependencies = [
 [[package]]
 name = "librocksdb_sys"
 version = "0.1.0"
-source = "git+https://github.com/tikv/rust-rocksdb.git#489433e1cbaba553500c5c9145bf7290f58d9e73"
+source = "git+https://github.com/tikv/rust-rocksdb.git#995b1f22af7a252ac35c2f90d007ddeee201aca6"
 dependencies = [
  "bindgen 0.65.1",
  "bzip2-sys",
  "cc",
  "cmake",
- "libc 0.2.151",
+ "libc 0.2.176",
  "libtitan_sys",
  "libz-sys",
  "lz4-sys",
@@ -4057,12 +4085,12 @@ dependencies = [
 [[package]]
 name = "libtitan_sys"
 version = "0.0.1"
-source = "git+https://github.com/tikv/rust-rocksdb.git#489433e1cbaba553500c5c9145bf7290f58d9e73"
+source = "git+https://github.com/tikv/rust-rocksdb.git#995b1f22af7a252ac35c2f90d007ddeee201aca6"
 dependencies = [
  "bzip2-sys",
  "cc",
  "cmake",
- "libc 0.2.151",
+ "libc 0.2.176",
  "libz-sys",
  "lz4-sys",
  "snappy-sys",
@@ -4076,7 +4104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
 dependencies = [
  "cc",
- "libc 0.2.151",
+ "libc 0.2.176",
  "pkg-config",
  "vcpkg",
 ]
@@ -4130,7 +4158,7 @@ dependencies = [
  "atomic",
  "hex 0.4.3",
  "online_config",
- "protobuf",
+ "protobuf 2.8.0",
  "serde",
  "slog",
  "slog-term",
@@ -4154,7 +4182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9764018d143cc854c9f17f0b907de70f14393b1f502da6375dce70f00514eb3"
 dependencies = [
  "cc",
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -4170,11 +4198,11 @@ dependencies = [
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.8",
+ "regex-automata 0.4.3",
 ]
 
 [[package]]
@@ -4190,7 +4218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
  "cfg-if 1.0.0",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -4211,7 +4239,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "winapi 0.3.9",
 ]
 
@@ -4221,7 +4249,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -4301,7 +4329,7 @@ dependencies = [
  "fuchsia-zircon-sys",
  "iovec",
  "kernel32-sys",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log",
  "miow",
  "net2",
@@ -4315,7 +4343,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
@@ -4384,7 +4412,7 @@ dependencies = [
  "log_wrappers",
  "openssl",
  "pd_client",
- "protobuf",
+ "protobuf 2.8.0",
  "proxy_server",
  "raft",
  "raft_log_engine",
@@ -4434,7 +4462,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -4480,12 +4508,11 @@ checksum = "97af489e1e21b68de4c390ecca6703318bc1aa16e9733bcb62c089b73c6fbb1b"
 
 [[package]]
 name = "native-tls"
-version = "0.2.7"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
 dependencies = [
- "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log",
  "openssl",
  "openssl-probe",
@@ -4503,7 +4530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
 dependencies = [
  "cfg-if 0.1.10",
- "libc 0.2.151",
+ "libc 0.2.176",
  "winapi 0.3.9",
 ]
 
@@ -4516,7 +4543,7 @@ dependencies = [
  "bitflags 1.3.2",
  "cc",
  "cfg-if 0.1.10",
- "libc 0.2.151",
+ "libc 0.2.176",
  "void",
 ]
 
@@ -4529,7 +4556,7 @@ dependencies = [
  "bitflags 1.3.2",
  "cc",
  "cfg-if 1.0.0",
- "libc 0.2.151",
+ "libc 0.2.176",
  "memoffset 0.6.4",
 ]
 
@@ -4541,7 +4568,7 @@ checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
- "libc 0.2.151",
+ "libc 0.2.176",
  "memoffset 0.6.4",
 ]
 
@@ -4553,7 +4580,7 @@ checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
- "libc 0.2.151",
+ "libc 0.2.176",
  "memoffset 0.7.1",
  "pin-utils",
  "static_assertions",
@@ -4612,7 +4639,7 @@ dependencies = [
  "fsevent",
  "fsevent-sys",
  "inotify",
- "libc 0.2.151",
+ "libc 0.2.176",
  "mio 0.6.23",
  "mio-extras",
  "walkdir",
@@ -4630,12 +4657,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
 dependencies = [
- "overload",
- "winapi 0.3.9",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4694,15 +4720,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "num-derive"
-version = "0.3.0"
+name = "num-conv"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8b15b261814f992e33760b1fca9fe8b693d8a65299f20c9901688636cfb746"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.103",
-]
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
 [[package]]
 name = "num-derive"
@@ -4712,7 +4733,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -4784,7 +4805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
  "hermit-abi",
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -4793,14 +4814,14 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
 name = "oauth2"
-version = "4.1.0"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e47cfc4c0a1a519d9a025ebfbac3a2439d1b5cdf397d72dcb79b11d9920dab"
+checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f"
 dependencies = [
  "base64 0.13.0",
  "chrono",
@@ -4810,8 +4831,8 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_path_to_error",
- "sha2 0.9.1",
- "thiserror",
+ "sha2",
+ "thiserror 1.0.40",
  "url",
 ]
 
@@ -4855,22 +4876,16 @@ version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
 [[package]]
 name = "openssl"
-version = "0.10.57"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
  "bitflags 2.4.1",
  "cfg-if 1.0.0",
  "foreign-types",
- "libc 0.2.151",
+ "libc 0.2.176",
  "once_cell",
  "openssl-macros",
  "openssl-sys",
@@ -4878,13 +4893,13 @@ dependencies = [
 
 [[package]]
 name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.103",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -4895,21 +4910,21 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 
 [[package]]
 name = "openssl-src"
-version = "111.25.0+1.1.1t"
+version = "300.5.2+3.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6"
+checksum = "d270b79e2926f5150189d475bc7e9d2c69f9c4697b185fa917d5a32b792d21b4"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.92"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
- "libc 0.2.151",
+ "libc 0.2.176",
  "openssl-src",
  "pkg-config",
  "vcpkg",
@@ -4939,19 +4954,13 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "page_size"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eebde548fbbf1ea81a99b128872779c437752fb99f217c45245e1a61dcd9edcd"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "winapi 0.3.9",
 ]
 
@@ -4994,7 +5003,7 @@ checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
 dependencies = [
  "cfg-if 1.0.0",
  "instant",
- "libc 0.2.151",
+ "libc 0.2.176",
  "redox_syscall 0.2.11",
  "smallvec",
  "winapi 0.3.9",
@@ -5007,7 +5016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
 dependencies = [
  "cfg-if 1.0.0",
- "libc 0.2.151",
+ "libc 0.2.176",
  "redox_syscall 0.2.11",
  "smallvec",
  "windows-sys 0.32.0",
@@ -5048,7 +5057,7 @@ dependencies = [
  "serde_derive",
  "slog",
  "slog-global",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_alloc",
  "tikv_util",
  "tokio",
@@ -5083,7 +5092,7 @@ checksum = "b8f94885300e262ef461aa9fd1afbf7df3caf9e84e271a74925d1c6c8b24830f"
 dependencies = [
  "bitflags 1.3.2",
  "byteorder",
- "libc 0.2.151",
+ "libc 0.2.176",
  "mmap",
  "nom 4.2.3",
  "phf",
@@ -5216,7 +5225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d27361d7578b410d0eb5fe815c2b2105b01ab770a7c738cb9a231457a809fcc7"
 dependencies = [
  "ipnetwork",
- "libc 0.2.151",
+ "libc 0.2.176",
  "pnet_base",
  "pnet_sys",
  "winapi 0.2.8",
@@ -5228,7 +5237,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82f881a6d75ac98c5541db6144682d1773bb14c6fc50c6ebac7086c8f7f23c29"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "winapi 0.2.8",
  "ws2_32-sys",
 ]
@@ -5239,37 +5248,67 @@ version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e30165d31df606f5726b090ec7592c308a0eaf61721ff64c9a3018e344a8753e"
 dependencies = [
- "portable-atomic 1.11.0",
+ "portable-atomic 1.11.1",
 ]
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "pprof"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebbe2f8898beba44815fdc9e5a4ae9c929e21c5dc29b0c774a15555f7f58d6d0"
+checksum = "afad4d4df7b31280028245f152d5a575083e2abb822d05736f5e47653e77689f"
 dependencies = [
  "aligned-vec",
  "backtrace",
  "cfg-if 1.0.0",
  "findshlibs",
  "inferno",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log",
  "nix 0.26.2",
  "once_cell",
- "parking_lot 0.12.1",
- "protobuf",
+ "protobuf 2.8.0",
  "protobuf-codegen-pure",
  "smallvec",
+ "spin",
  "symbolic-demangle",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.40",
+]
+
+[[package]]
+name = "pprof"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38a01da47675efa7673b032bf8efd8214f1917d89685e07e395ab125ea42b187"
+dependencies = [
+ "aligned-vec",
+ "backtrace",
+ "cfg-if 1.0.0",
+ "findshlibs",
+ "inferno",
+ "libc 0.2.176",
+ "log",
+ "nix 0.26.2",
+ "once_cell",
+ "protobuf 3.7.2",
+ "protobuf-codegen 3.7.2",
+ "smallvec",
+ "spin",
+ "symbolic-demangle",
+ "tempfile",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -5321,7 +5360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b69d39aab54d069e7f2fe8cb970493e7834601ca2d8c65fd7bbd183578080d1"
 dependencies = [
  "proc-macro2",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -5360,9 +5399,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.87"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -5377,7 +5416,7 @@ dependencies = [
  "byteorder",
  "hex 0.4.3",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -5386,7 +5425,7 @@ version = "0.4.2"
 source = "git+https://github.com/tikv/procinfo-rs?rev=6599eb9dca74229b2c1fcc44118bef7eff127128#6599eb9dca74229b2c1fcc44118bef7eff127128"
 dependencies = [
  "byteorder",
- "libc 0.2.151",
+ "libc 0.2.176",
  "nom 2.2.1",
  "rustc_version 0.2.3",
 ]
@@ -5397,7 +5436,7 @@ version = "0.4.2"
 source = "git+https://github.com/tikv/procinfo-rs?rev=7693954bd1dd86eb1709572fd7b62fd5f7ff2ea1#7693954bd1dd86eb1709572fd7b62fd5f7ff2ea1"
 dependencies = [
  "byteorder",
- "libc 0.2.151",
+ "libc 0.2.176",
  "nom 2.2.1",
  "rustc_version 0.2.3",
 ]
@@ -5421,12 +5460,12 @@ dependencies = [
  "cfg-if 1.0.0",
  "fnv",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "memchr",
  "parking_lot 0.11.1",
- "protobuf",
+ "protobuf 2.8.0",
  "reqwest",
- "thiserror",
+ "thiserror 1.0.40",
 ]
 
 [[package]]
@@ -5455,7 +5494,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.0",
  "rand_xorshift",
- "regex-syntax 0.8.2",
+ "regex-syntax",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -5464,7 +5503,7 @@ dependencies = [
 [[package]]
 name = "protobuf"
 version = "2.8.0"
-source = "git+https://github.com/pingcap/rust-protobuf?branch=v2.8#6d445fe5ff4e99621a800be0f2c54dc96f056bac"
+source = "git+https://github.com/pingcap/rust-protobuf?branch=v2.8#de31a47f395c2f46dbfea2545517ea1b27ad0096"
 dependencies = [
  "atomic",
  "bytes",
@@ -5472,6 +5511,17 @@ dependencies = [
  "hex 0.3.2",
 ]
 
+[[package]]
+name = "protobuf"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4"
+dependencies = [
+ "once_cell",
+ "protobuf-support",
+ "thiserror 1.0.40",
+]
+
 [[package]]
 name = "protobuf-build"
 version = "0.15.1"
@@ -5480,8 +5530,8 @@ checksum = "c852d9625b912c3e50480cdc701f60f49890b5d7ad46198dd583600f15e7c6ec"
 dependencies = [
  "bitflags 1.3.2",
  "grpcio-compiler",
- "protobuf",
- "protobuf-codegen",
+ "protobuf 2.8.0",
+ "protobuf-codegen 2.8.0",
  "protobuf-src",
  "regex",
 ]
@@ -5489,10 +5539,25 @@ dependencies = [
 [[package]]
 name = "protobuf-codegen"
 version = "2.8.0"
-source = "git+https://github.com/pingcap/rust-protobuf?branch=v2.8#6d445fe5ff4e99621a800be0f2c54dc96f056bac"
+source = "git+https://github.com/pingcap/rust-protobuf?branch=v2.8#de31a47f395c2f46dbfea2545517ea1b27ad0096"
 dependencies = [
  "heck 0.3.1",
- "protobuf",
+ "protobuf 2.8.0",
+]
+
+[[package]]
+name = "protobuf-codegen"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d3976825c0014bbd2f3b34f0001876604fe87e0c86cd8fa54251530f1544ace"
+dependencies = [
+ "anyhow",
+ "once_cell",
+ "protobuf 3.7.2",
+ "protobuf-parse",
+ "regex",
+ "tempfile",
+ "thiserror 1.0.40",
 ]
 
 [[package]]
@@ -5501,8 +5566,24 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00993dc5fbbfcf9d8a005f6b6c29fd29fd6d86deba3ae3f41fd20c624c414616"
 dependencies = [
- "protobuf",
- "protobuf-codegen",
+ "protobuf 2.8.0",
+ "protobuf-codegen 2.8.0",
+]
+
+[[package]]
+name = "protobuf-parse"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4aeaa1f2460f1d348eeaeed86aea999ce98c1bded6f089ff8514c9d9dbdc973"
+dependencies = [
+ "anyhow",
+ "indexmap 2.0.1",
+ "log",
+ "protobuf 3.7.2",
+ "protobuf-support",
+ "tempfile",
+ "thiserror 1.0.40",
+ "which 4.2.4",
 ]
 
 [[package]]
@@ -5514,6 +5595,15 @@ dependencies = [
  "autotools",
 ]
 
+[[package]]
+name = "protobuf-support"
+version = "3.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6"
+dependencies = [
+ "thiserror 1.0.40",
+]
+
 [[package]]
 name = "proxy_ffi"
 version = "0.0.1"
@@ -5532,7 +5622,7 @@ dependencies = [
  "lazy_static",
  "openssl",
  "pd_client",
- "protobuf",
+ "protobuf 2.8.0",
  "raftstore",
  "reqwest",
  "rocksdb",
@@ -5583,7 +5673,7 @@ dependencies = [
  "keys",
  "kvproto",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log",
  "log_wrappers",
  "mime",
@@ -5592,9 +5682,9 @@ dependencies = [
  "openssl",
  "pd_client",
  "pin-project",
- "pprof",
+ "pprof 0.14.1",
  "prometheus",
- "protobuf",
+ "protobuf 2.8.0",
  "proxy_ffi",
  "raft",
  "raft_log_engine",
@@ -5664,7 +5754,7 @@ dependencies = [
  "hyper",
  "keys",
  "kvproto",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log_wrappers",
  "mock-engine-store",
  "more-asserts",
@@ -5675,7 +5765,7 @@ dependencies = [
  "perfcnt",
  "procinfo 0.4.2 (git+https://github.com/tikv/procinfo-rs?rev=6599eb9dca74229b2c1fcc44118bef7eff127128)",
  "profiler",
- "protobuf",
+ "protobuf 2.8.0",
  "proxy_ffi",
  "proxy_server",
  "raft",
@@ -5735,9 +5825,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.29.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
 dependencies = [
  "memchr",
  "serde",
@@ -5760,17 +5850,17 @@ dependencies = [
  "bytes",
  "fxhash",
  "getset",
- "protobuf",
+ "protobuf 2.8.0",
  "raft-proto",
  "rand 0.8.5",
  "slog",
- "thiserror",
+ "thiserror 1.0.40",
 ]
 
 [[package]]
 name = "raft-engine"
 version = "0.4.2"
-source = "git+https://github.com/tikv/raft-engine.git#de1ec937529e3a88e093db0cf0d403522565fe64"
+source = "git+https://github.com/tikv/raft-engine.git#03f77d90c09793a6f79411ff5f88233715eb23da"
 dependencies = [
  "byteorder",
  "crc32fast",
@@ -5781,24 +5871,24 @@ dependencies = [
  "hex 0.4.3",
  "if_chain",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log",
  "lz4-sys",
  "memmap2",
  "nix 0.26.2",
- "num-derive 0.4.2",
+ "num-derive",
  "num-traits",
  "parking_lot 0.12.1",
  "prometheus",
  "prometheus-static-metric",
- "protobuf",
+ "protobuf 2.8.0",
  "rayon",
  "rhai",
  "scopeguard",
  "serde",
  "serde_repr",
  "strum 0.26.3",
- "thiserror",
+ "thiserror 1.0.40",
 ]
 
 [[package]]
@@ -5807,7 +5897,7 @@ version = "0.7.0"
 source = "git+https://github.com/tikv/raft-rs?branch=master#0d01b20312f74889a5e44ad4180aade5da2f16fa"
 dependencies = [
  "bytes",
- "protobuf",
+ "protobuf 2.8.0",
  "protobuf-build",
 ]
 
@@ -5844,7 +5934,7 @@ dependencies = [
  "concurrency_manager",
  "crc32fast",
  "crossbeam",
- "derivative",
+ "derive_more 2.0.1",
  "encryption",
  "encryption_export",
  "engine_panic",
@@ -5872,7 +5962,7 @@ dependencies = [
  "pd_client",
  "prometheus",
  "prometheus-static-metric",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raft-proto",
  "rand 0.8.5",
@@ -5889,7 +5979,7 @@ dependencies = [
  "strum 0.20.0",
  "tempfile",
  "test_sst_importer",
- "thiserror",
+ "thiserror 1.0.40",
  "tidb_query_datatype",
  "tikv_alloc",
  "tikv_util",
@@ -5943,7 +6033,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "pd_client",
  "prometheus",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raft-proto",
  "raftstore",
@@ -5957,7 +6047,7 @@ dependencies = [
  "tempfile",
  "test_pd",
  "test_util",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_util",
  "time 0.1.43",
  "tracker",
@@ -5973,7 +6063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
 dependencies = [
  "fuchsia-cprng",
- "libc 0.2.151",
+ "libc 0.2.176",
  "rand_core 0.3.1",
  "rdrand",
  "winapi 0.3.9",
@@ -5986,7 +6076,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
  "getrandom 0.1.12",
- "libc 0.2.151",
+ "libc 0.2.176",
  "rand_chacha 0.2.1",
  "rand_core 0.5.1",
  "rand_hc",
@@ -5998,7 +6088,7 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "rand_chacha 0.3.0",
  "rand_core 0.6.4",
 ]
@@ -6162,7 +6252,7 @@ dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -6172,8 +6262,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
 dependencies = [
  "byteorder",
- "regex-syntax 0.6.29",
- "utf8-ranges",
 ]
 
 [[package]]
@@ -6184,7 +6272,7 @@ checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -6193,12 +6281,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e"
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
@@ -6216,34 +6298,40 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.1"
+version = "0.11.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0460542b551950620a3648c6aa23318ac6b3cd779114bd873209e6e8b5eb1c34"
+checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
 dependencies = [
- "base64 0.13.0",
+ "base64 0.21.7",
  "bytes",
  "encoding_rs 0.8.33",
  "futures-core",
  "futures-util",
+ "h2",
  "http 0.2.12",
  "http-body 0.4.5",
  "hyper",
  "hyper-tls",
  "ipnet",
  "js-sys",
- "lazy_static",
  "log",
  "mime",
  "native-tls",
+ "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "serde",
+ "serde_json",
  "serde_urlencoded",
+ "system-configuration",
  "tokio",
  "tokio-native-tls",
+ "tokio-util",
+ "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wasm-streams",
  "web-sys",
  "winreg",
 ]
@@ -6265,7 +6353,7 @@ dependencies = [
  "online_config",
  "pd_client",
  "prometheus",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raftstore",
  "security",
@@ -6275,7 +6363,7 @@ dependencies = [
  "test_raftstore",
  "test_sst_importer",
  "test_util",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv",
  "tikv_kv",
  "tikv_util",
@@ -6300,7 +6388,7 @@ dependencies = [
  "pd_client",
  "pin-project",
  "prometheus",
- "protobuf",
+ "protobuf 2.8.0",
  "rand 0.8.5",
  "serde",
  "serde_json",
@@ -6356,7 +6444,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f06953bb8b9e4307cb7ccc0d9d018e2ddd25a30d32831f631ce4fe8f17671f7"
 dependencies = [
- "ahash 0.7.7",
+ "ahash 0.7.8",
  "bitflags 1.3.2",
  "instant",
  "num-traits",
@@ -6379,9 +6467,9 @@ dependencies = [
 [[package]]
 name = "rocksdb"
 version = "0.3.0"
-source = "git+https://github.com/tikv/rust-rocksdb.git#489433e1cbaba553500c5c9145bf7290f58d9e73"
+source = "git+https://github.com/tikv/rust-rocksdb.git#995b1f22af7a252ac35c2f90d007ddeee201aca6"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "librocksdb_sys",
 ]
 
@@ -6453,7 +6541,7 @@ checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4"
 dependencies = [
  "bitflags 2.4.1",
  "errno",
- "libc 0.2.151",
+ "libc 0.2.176",
  "linux-raw-sys",
  "windows-sys 0.48.0",
 ]
@@ -6482,12 +6570,6 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
-[[package]]
-name = "safemem"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
-
 [[package]]
 name = "same-file"
 version = "1.0.5"
@@ -6499,12 +6581,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.16"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
 dependencies = [
- "lazy_static",
- "winapi 0.3.9",
+ "windows-sys 0.61.0",
 ]
 
 [[package]]
@@ -6545,7 +6626,7 @@ dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
- "libc 0.2.151",
+ "libc 0.2.176",
  "security-framework-sys",
 ]
 
@@ -6556,7 +6637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339"
 dependencies = [
  "core-foundation-sys",
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -6641,7 +6722,7 @@ checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -6682,7 +6763,7 @@ checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6"
 dependencies = [
  "percent-encoding",
  "serde",
- "thiserror",
+ "thiserror 1.0.40",
 ]
 
 [[package]]
@@ -6698,12 +6779,12 @@ dependencies = [
 
 [[package]]
 name = "serde_urlencoded"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 0.4.4",
+ "itoa 1.0.1",
  "ryu",
  "serde",
 ]
@@ -6758,11 +6839,11 @@ dependencies = [
  "in_memory_engine",
  "keys",
  "kvproto",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log_wrappers",
  "pd_client",
  "prometheus",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raft_log_engine",
  "raftstore",
@@ -6802,20 +6883,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest 0.10.7",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 0.1.10",
- "cpuid-bool",
- "digest 0.9.0",
- "opaque-debug",
+ "digest",
 ]
 
 [[package]]
@@ -6826,7 +6894,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -6856,7 +6924,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "106428d9d96840ecdec5208c13ab8a4e28c38da1e0ccf2909fb44e41b992f897"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "nix 0.11.1",
 ]
 
@@ -6866,7 +6934,7 @@ version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "signal-hook-registry",
 ]
 
@@ -6876,16 +6944,7 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
 dependencies = [
- "libc 0.2.151",
-]
-
-[[package]]
-name = "simsimd"
-version = "6.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56838e1a0aceaef39fc1327227033efa84a294f54a39b356eefa5c60c885e9f0"
-dependencies = [
- "cc",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -6896,9 +6955,9 @@ checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7"
 
 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "slog"
@@ -7003,7 +7062,7 @@ dependencies = [
  "slog",
  "slog-global",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv",
  "tikv_util",
  "tokio",
@@ -7016,7 +7075,7 @@ version = "0.1.0"
 source = "git+https://github.com/tikv/rust-snappy.git?branch=static-link#8c12738bad811397600455d6982aff754ea2ac44"
 dependencies = [
  "cmake",
- "libc 0.2.151",
+ "libc 0.2.176",
  "pkg-config",
 ]
 
@@ -7044,10 +7103,19 @@ version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "spin"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "sst_importer"
 version = "0.1.0"
@@ -7064,6 +7132,7 @@ dependencies = [
  "engine_traits",
  "error_code",
  "external_storage",
+ "fail",
  "file_system",
  "futures 0.3.15",
  "futures-util",
@@ -7075,7 +7144,7 @@ dependencies = [
  "online_config",
  "openssl",
  "prometheus",
- "protobuf",
+ "protobuf 2.8.0",
  "rand 0.8.5",
  "serde",
  "serde_derive",
@@ -7084,7 +7153,7 @@ dependencies = [
  "tempfile",
  "test_sst_importer",
  "test_util",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_alloc",
  "tikv_util",
  "tokio",
@@ -7187,7 +7256,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7232,9 +7301,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7255,7 +7324,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7265,13 +7334,34 @@ source = "git+https://github.com/tikv/sysinfo?branch=0.26-fix-cpu#5a1bcf08816979
 dependencies = [
  "cfg-if 1.0.0",
  "core-foundation-sys",
- "libc 0.2.151",
+ "libc 0.2.176",
  "ntapi",
  "once_cell",
  "rayon",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc 0.2.176",
+]
+
 [[package]]
 name = "take_mut"
 version = "0.2.2"
@@ -7294,7 +7384,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "thiserror",
+ "thiserror 1.0.40",
  "url",
 ]
 
@@ -7394,7 +7484,7 @@ dependencies = [
  "futures-util",
  "grpcio",
  "kvproto",
- "protobuf",
+ "protobuf 2.8.0",
  "raftstore",
  "rand 0.8.5",
  "test_raftstore",
@@ -7414,7 +7504,7 @@ dependencies = [
  "futures 0.3.15",
  "kvproto",
  "pd_client",
- "protobuf",
+ "protobuf 2.8.0",
  "resource_metering",
  "test_storage",
  "tidb_query_common",
@@ -7490,7 +7580,7 @@ dependencies = [
  "lazy_static",
  "log_wrappers",
  "pd_client",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raftstore",
  "rand 0.8.5",
@@ -7532,7 +7622,7 @@ dependencies = [
  "kvproto",
  "log_wrappers",
  "pd_client",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raftstore",
  "raftstore-v2",
@@ -7662,7 +7752,7 @@ dependencies = [
  "pd_client",
  "perfcnt",
  "profiler",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raft_log_engine",
  "raftstore",
@@ -7725,7 +7815,16 @@ version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.40",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+dependencies = [
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -7736,7 +7835,18 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -7780,8 +7890,9 @@ version = "0.0.1"
 dependencies = [
  "anyhow",
  "api_version",
+ "async-trait",
  "byteorder",
- "derive_more",
+ "derive_more 0.99.3",
  "error_code",
  "futures 0.3.15",
  "kvproto",
@@ -7789,8 +7900,9 @@ dependencies = [
  "log_wrappers",
  "prometheus",
  "prometheus-static-metric",
+ "raft",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_util",
  "time 0.1.43",
  "yatp",
@@ -7822,18 +7934,17 @@ dependencies = [
  "match-template",
  "nom 7.1.3",
  "num 0.3.0",
- "num-derive 0.3.0",
+ "num-derive",
  "num-traits",
  "ordered-float",
- "protobuf",
+ "protobuf 2.8.0",
  "regex",
  "serde",
  "serde_json",
- "simsimd",
  "slog",
  "slog-global",
  "static_assertions",
- "thiserror",
+ "thiserror 1.0.40",
  "tidb_query_common",
  "tikv_alloc",
  "tikv_util",
@@ -7855,7 +7966,7 @@ dependencies = [
  "kvproto",
  "log_wrappers",
  "match-template",
- "protobuf",
+ "protobuf 2.8.0",
  "slog",
  "slog-global",
  "smallvec",
@@ -7867,6 +7978,7 @@ dependencies = [
  "tikv_util",
  "tipb",
  "tipb_helper",
+ "txn_types",
 ]
 
 [[package]]
@@ -7885,14 +7997,14 @@ dependencies = [
  "hex 0.4.3",
  "log_wrappers",
  "match-template",
+ "memchr",
  "num 0.3.0",
  "num-traits",
  "openssl",
  "panic_hook",
  "profiler",
- "protobuf",
+ "protobuf 2.8.0",
  "regex",
- "safemem",
  "serde",
  "serde_json",
  "static_assertions",
@@ -7903,13 +8015,12 @@ dependencies = [
  "time 0.1.43",
  "tipb",
  "tipb_helper",
- "twoway",
  "uuid 0.8.2",
 ]
 
 [[package]]
 name = "tikv"
-version = "9.0.0-beta.1"
+version = "9.0.0-beta.2"
 dependencies = [
  "anyhow",
  "api_version",
@@ -7958,7 +8069,7 @@ dependencies = [
  "keys",
  "kvproto",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "libloading",
  "log",
  "log_wrappers",
@@ -7978,10 +8089,10 @@ dependencies = [
  "pd_client",
  "pin-project",
  "pnet_datalink",
- "pprof",
+ "pprof 0.15.0",
  "prometheus",
  "prometheus-static-metric",
- "protobuf",
+ "protobuf 2.8.0",
  "raft",
  "raft_log_engine",
  "raftstore",
@@ -8009,7 +8120,7 @@ dependencies = [
  "sysinfo",
  "tempfile",
  "test_util",
- "thiserror",
+ "thiserror 1.0.40",
  "tidb_query_common",
  "tidb_query_datatype",
  "tidb_query_executors",
@@ -8039,7 +8150,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "paste",
  "tikv-jemalloc-sys",
 ]
@@ -8052,7 +8163,7 @@ checksum = "aeab4310214fe0226df8bfeb893a291a58b19682e8a07e1e1d4483ad4200d315"
 dependencies = [
  "cc",
  "fs_extra",
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -8061,7 +8172,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "tikv-jemalloc-sys",
 ]
 
@@ -8071,7 +8182,7 @@ version = "0.1.0"
 dependencies = [
  "fxhash",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "mimalloc",
  "snmalloc-rs",
  "tcmalloc",
@@ -8107,7 +8218,7 @@ dependencies = [
  "slog-global",
  "slog_derive",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_util",
  "tracker",
  "txn_types",
@@ -8127,7 +8238,7 @@ dependencies = [
  "cpu-time",
  "crossbeam",
  "crossbeam-skiplist 0.1.3",
- "derive_more",
+ "derive_more 0.99.3",
  "error_code",
  "fail",
  "fs2",
@@ -8139,7 +8250,7 @@ dependencies = [
  "http 0.2.12",
  "kvproto",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
  "log",
  "log_wrappers",
  "nix 0.24.1",
@@ -8154,7 +8265,7 @@ dependencies = [
  "procinfo 0.4.2 (git+https://github.com/tikv/procinfo-rs?rev=7693954bd1dd86eb1709572fd7b62fd5f7ff2ea1)",
  "prometheus",
  "prometheus-static-metric",
- "protobuf",
+ "protobuf 2.8.0",
  "rand 0.8.5",
  "regex",
  "serde",
@@ -8167,7 +8278,7 @@ dependencies = [
  "strum 0.20.0",
  "sysinfo",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_alloc",
  "time 0.1.43",
  "tokio",
@@ -8186,19 +8297,23 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.20"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
+ "deranged",
  "itoa 1.0.1",
- "libc 0.2.151",
+ "js-sys",
+ "libc 0.2.176",
+ "num-conv",
  "num_threads",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -8206,16 +8321,17 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.0"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.8"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -8257,11 +8373,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 [[package]]
 name = "tipb"
 version = "0.0.1"
-source = "git+https://github.com/pingcap/tipb.git#cf70966bef25e205cb845c19265301542d1238d1"
+source = "git+https://github.com/pingcap/tipb.git#85a019a5df23fa11f93c53ebf7fc05462813df1e"
 dependencies = [
  "futures 0.3.15",
  "grpcio",
- "protobuf",
+ "protobuf 2.8.0",
  "protobuf-build",
 ]
 
@@ -8282,7 +8398,7 @@ checksum = "68722da18b0fc4a05fdc1120b302b82051265792a1e1b399086e9b204b10ad3d"
 dependencies = [
  "backtrace",
  "bytes",
- "libc 0.2.151",
+ "libc 0.2.176",
  "mio 0.8.11",
  "num_cpus",
  "parking_lot 0.12.1",
@@ -8310,7 +8426,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -8384,9 +8500,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.9"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 
 [[package]]
 name = "toml_edit"
@@ -8413,9 +8529,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -8438,20 +8554,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
  "valuable",
@@ -8470,9 +8586,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-serde"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
+checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1"
 dependencies = [
  "serde",
  "tracing-core",
@@ -8480,14 +8596,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata 0.4.3",
  "serde",
  "serde_json",
  "sharded-slab",
@@ -8519,16 +8635,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 
-[[package]]
-name = "twoway"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "766345ed3891b291d01af307cd3ad2992a4261cb6c0c7e665cd3e01cf379dd24"
-dependencies = [
- "memchr",
- "unchecked-index",
-]
-
 [[package]]
 name = "twox-hash"
 version = "1.6.3"
@@ -8555,7 +8661,7 @@ dependencies = [
  "panic_hook",
  "rand 0.8.5",
  "slog",
- "thiserror",
+ "thiserror 1.0.40",
  "tikv_alloc",
  "tikv_util",
 ]
@@ -8566,6 +8672,15 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
+[[package]]
+name = "tz-rs"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33851b15c848fad2cf4b105c6bb66eb9512b6f6c44a4b13f57c53c73c707e2b4"
+dependencies = [
+ "const_fn",
+]
+
 [[package]]
 name = "ucd-trie"
 version = "0.1.3"
@@ -8578,12 +8693,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
-[[package]]
-name = "unchecked-index"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.5"
@@ -8632,12 +8741,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
 
-[[package]]
-name = "utf8-ranges"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -8661,6 +8764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
 dependencies = [
  "getrandom 0.2.11",
+ "serde",
 ]
 
 [[package]]
@@ -8717,7 +8821,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -8761,48 +8865,49 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.79"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
 dependencies = [
  "cfg-if 1.0.0",
- "serde",
- "serde_json",
+ "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.79"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
 dependencies = [
  "bumpalo",
- "lazy_static",
  "log",
  "proc-macro2",
  "quote",
- "syn 1.0.103",
+ "syn 2.0.101",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.20"
+version = "0.4.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3de431a2910c86679c34283a33f66f4e4abd7e0aec27b6669060148872aadf94"
+checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.79"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -8810,28 +8915,44 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.79"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.103",
+ "syn 2.0.101",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.79"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-streams"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
+checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
 
 [[package]]
 name = "web-sys"
-version = "0.3.56"
+version = "0.3.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8843,7 +8964,7 @@ version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -8854,7 +8975,7 @@ checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2"
 dependencies = [
  "either",
  "lazy_static",
- "libc 0.2.151",
+ "libc 0.2.176",
 ]
 
 [[package]]
@@ -8909,6 +9030,12 @@ dependencies = [
  "windows-targets 0.52.0",
 ]
 
+[[package]]
+name = "windows-link"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+
 [[package]]
 name = "windows-sys"
 version = "0.32.0"
@@ -8940,6 +9067,15 @@ dependencies = [
  "windows-targets 0.52.0",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -9095,11 +9231,12 @@ dependencies = [
 
 [[package]]
 name = "winreg"
-version = "0.7.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "winapi 0.3.9",
+ "cfg-if 1.0.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -9194,7 +9331,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
  "synstructure",
 ]
 
@@ -9215,7 +9352,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -9235,7 +9372,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
  "synstructure",
 ]
 
@@ -9264,7 +9401,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -9300,7 +9437,7 @@ version = "5.0.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
 dependencies = [
- "libc 0.2.151",
+ "libc 0.2.176",
  "zstd-sys",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 22781004153..8b24634fb09 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tikv"
-version = "9.0.0-beta.1"
+version = "9.0.0-beta.2"
 authors = ["The TiKV Authors"]
 description = "A distributed transactional key-value database powered by Rust and Raft"
 license = "Apache-2.0"
@@ -58,7 +58,7 @@ openssl-vendored = [
 # for testing configure propegate to other crates
 # https://stackoverflow.com/questions/41700543/can-we-share-test-utilites-between-crates
 testing = []
-docker_test = []  # Feature flag for Docker-specific tests
+docker_test = [] # Feature flag for Docker-specific tests
 
 [lib]
 name = "tikv"
@@ -133,7 +133,7 @@ paste = "1.0"
 pd_client = { workspace = true }
 pin-project = "1.0"
 pnet_datalink = "0.23"
-pprof = { version = "0.14", default-features = false, features = [
+pprof = { version = "0.15", default-features = false, features = [
   "flamegraph",
   "protobuf-codec",
 ] }
diff --git a/OWNERS b/OWNERS
index af3aca17ee3..b3321b31e9f 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,14 +1,22 @@
-# See the OWNERS docs at https://go.k8s.io/owners
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/#owners
+# The members of 'sig-community-*' are synced from memberships defined in repository: https://github.com/tikv/community.
 approvers:
   - 5kbpers
   - AndreMouche
+  - BusyJay
+  - Connor1996
+  - Little-Wallace
+  - LykxSassinator
+  - MyonKeminta
+  - NingLin-P
+  - SpadeA-Tang
+  - TennyZhuang
+  - YuJuncen
   - andylokandy
   - breezewish
   - brson
   - bufferflies
-  - BusyJay
   - cfzjywxk
-  - Connor1996
   - coocood
   - crazycs520
   - disksing
@@ -22,30 +30,23 @@ approvers:
   - iosmanthus
   - jackysp
   - kennytm
-  - Little-Wallace
   - liuzix
   - lonng
-  - LykxSassinator
   - lysu
   - marsishandsome
-  - MyonKeminta
   - niedhui
-  - NingLin-P
   - nrc
   - overvenus
   - pingyu
   - skyzh
-  - SpadeA-Tang
   - sticnarf
   - sunxiaoguang
   - tabokie
-  - TennyZhuang
   - tonyxuqqi
   - v01dstar
   - yiwu-arbug
   - you06
   - youjiali1995
-  - YuJuncen
   - zhangjinpeng87
   - zhongzc
   - zhouqiang-cl
@@ -54,27 +55,27 @@ reviewers:
   - 3AceShowHand
   - 3pointer
   - CalvinNeo
+  - Fullstop000
+  - HuSharp
+  - Jibbow
+  - JmPotato
+  - Leavrth
+  - Mossaka
+  - MrCroxx
+  - Rustin170506
+  - Xuanwo
   - ethercflow
   - fredchenbj
-  - Fullstop000
   - gozssky
   - haojinming
   - hbisheng
   - hhwyt
-  - HuSharp
   - jayzhan211
-  - Jibbow
-  - JmPotato
-  - Leavrth
   - lhy1024
   - longfangsong
   - lzmhhh123
-  - Mossaka
-  - MrCroxx
   - nolouch
   - rleungx
-  - Rustin170506
   - tier-cap
   - wjhuang2016
   - wshwsh12
-  - Xuanwo
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 49fdc25e4ee..0c2bb301242 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -1,4 +1,5 @@
-# Sort the member alphabetically.
+# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/#owners_aliases
+# The members of 'sig-community-*' are synced from memberships defined in repository: https://github.com/tikv/community.
 aliases:
   sig-critical-approvers-config-components:
     - BenMeadowcroft
diff --git a/README.md b/README.md
index 0e0203c9f57..dab1dc4c2b4 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,78 @@ To use this library, please follow the steps below:
 
 ## Contact
 
+<<<<<<< HEAD
 [Rongzhen Luo](http://github.com/CalvinNeo) ([luorongzhen@pingcap.com](mailto:luorongzhen@pingcap.com))
+=======
+4. Install TiKV Client(Python) and verify the deployment, required Python 3.5+.
+
+```bash
+$ pip3 install -i https://test.pypi.org/simple/ tikv-client
+```
+
+```python
+from tikv_client import RawClient
+
+client = RawClient.connect(["127.0.0.1:2379"])
+
+client.put(b'foo', b'bar')
+print(client.get(b'foo')) # b'bar'
+
+client.put(b'foo', b'baz')
+print(client.get(b'foo')) # b'baz'
+```
+
+### Deploy a cluster with TiUP
+
+You can see [this manual](./doc/deploy.md) of production-like cluster deployment presented by @c4pt0r.
+
+### Build from source
+
+See [CONTRIBUTING.md](./CONTRIBUTING.md).
+
+## Client drivers
+
+- [Go](https://github.com/tikv/client-go) (The most stable and widely used)
+- [Java](https://github.com/tikv/client-java)
+- [Rust](https://github.com/tikv/client-rust)
+- [C](https://github.com/tikv/client-c)
+
+If you want to try the Go client, see [Go Client](https://tikv.org/docs/4.0/reference/clients/go/).
+
+## Security
+
+### Security audit
+
+A third-party security auditing was performed by Cure53. See the full report [here](./security/Security-Audit.pdf).
+
+### Reporting Security Vulnerabilities
+
+To report a security vulnerability, please send an email to [TiKV-security](mailto:tikv-security@lists.cncf.io) group.
+
+See [Security](SECURITY.md) for the process and policy followed by the TiKV project.
+
+## Communication
+
+Communication within the TiKV community abides by [TiKV Code of Conduct](./CODE_OF_CONDUCT.md). Here is an excerpt:
+
+> In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+### Social Media
+
+- [Twitter](https://twitter.com/tikvproject)
+- [Blog](https://tikv.org/blog/)
+- [Reddit](https://www.reddit.com/r/TiKV)
+- Post questions or help answer them on [Stack Overflow](https://stackoverflow.com/questions/tagged/tikv)
+
+### Slack
+
+Join the TiKV community on [Slack](https://slack.tidb.io/invite?team=tikv-wg&channel=general) - Sign up and join channels on TiKV topics that interest you.
+>>>>>>> tikv/master
 
 ## License
 
diff --git a/cmd/tikv-ctl/src/cmd.rs b/cmd/tikv-ctl/src/cmd.rs
index a42e1781383..436c73176b5 100644
--- a/cmd/tikv-ctl/src/cmd.rs
+++ b/cmd/tikv-ctl/src/cmd.rs
@@ -1,9 +1,9 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{borrow::ToOwned, str, string::ToString, sync::LazyLock, u64};
+use std::{borrow::ToOwned, str, string::ToString, sync::LazyLock};
 
-use clap::{crate_authors, AppSettings};
-use engine_traits::{SstCompressionType, CF_DEFAULT};
+use clap::{AppSettings, crate_authors};
+use engine_traits::{CF_DEFAULT, SstCompressionType};
 use raft_engine::ReadableSize;
 use structopt::StructOpt;
 
@@ -705,6 +705,20 @@ pub enum Cmd {
             )
         )]
         minimal_compaction_size: ReadableSize,
+
+        #[structopt(
+            long,
+            default_value = "128",
+            help("specify the maximum count of running tasks to download a metadata")
+        )]
+        prefetch_running_count: u64,
+
+        #[structopt(
+            long,
+            default_value = "1024",
+            help("specify the maximum count of spawning tasks to download a metadata")
+        )]
+        prefetch_buffer_count: u64,
     },
     /// Get the state of a region's RegionReadProgress.
     GetRegionReadProgress {
diff --git a/cmd/tikv-ctl/src/executor.rs b/cmd/tikv-ctl/src/executor.rs
index 30d4aa192ac..adcfd5c0010 100644
--- a/cmd/tikv-ctl/src/executor.rs
+++ b/cmd/tikv-ctl/src/executor.rs
@@ -9,15 +9,15 @@ use api_version::{ApiV1, KvFormat};
 use encryption_export::data_key_manager_from_config;
 use engine_rocks::util::{db_exist, new_engine_opt};
 use engine_traits::{
-    Engines, Error as EngineError, RaftEngine, TabletRegistry, ALL_CFS, CF_DEFAULT, CF_LOCK,
-    CF_WRITE, DATA_CFS,
+    ALL_CFS, CF_DEFAULT, CF_LOCK, CF_WRITE, DATA_CFS, Engines, Error as EngineError, RaftEngine,
+    TabletRegistry,
 };
 use file_system::read_dir;
 use futures::{
+    StreamExt, TryStreamExt,
     executor::block_on,
     future,
     stream::{self, BoxStream},
-    StreamExt, TryStreamExt,
 };
 use grpcio::{ChannelBuilder, Environment};
 use kvproto::{
@@ -31,7 +31,7 @@ use pd_client::{Config as PdConfig, PdClient, RpcClient};
 use protobuf::Message;
 use raft::eraftpb::{ConfChange, ConfChangeV2, Entry, EntryType};
 use raft_log_engine::RaftLogEngine;
-use raftstore::store::{util::build_key_range, INIT_EPOCH_CONF_VER};
+use raftstore::store::{INIT_EPOCH_CONF_VER, util::build_key_range};
 use security::SecurityManager;
 use serde_json::json;
 use server::fatal;
@@ -39,15 +39,15 @@ use slog_global::crit;
 use tikv::{
     config::{ConfigController, TikvConfig},
     server::{
+        KvEngineFactoryBuilder,
         debug::{BottommostLevelCompaction, Debugger, DebuggerImpl, RegionInfo},
         debug2::DebuggerImplV2,
-        KvEngineFactoryBuilder,
     },
     storage::{
+        Engine,
         config::EngineType,
         kv::MockEngine,
         lock_manager::{LockManager, MockLockManager},
-        Engine,
     },
 };
 use tikv_util::escape;
@@ -108,9 +108,15 @@ pub fn new_debug_executor(
         .build_shared_rocks_env(key_manager.clone(), None /* io_rate_limiter */)
         .unwrap();
 
-    let factory = KvEngineFactoryBuilder::new(env.clone(), cfg, cache, key_manager.clone())
-        .lite(true)
-        .build();
+    let factory = KvEngineFactoryBuilder::new(
+        env.clone(),
+        cfg,
+        cache,
+        key_manager.clone(),
+        Default::default(),
+    )
+    .lite(true)
+    .build();
 
     let cfg_controller = ConfigController::default();
     if !cfg.raft_engine.enable {
@@ -223,7 +229,7 @@ pub trait DebugExecutor {
             let r = self.get_region_info(region_id);
             if skip_tombstone {
                 let region_state = r.region_local_state.as_ref();
-                if region_state.map_or(false, |s| s.get_state() == PeerState::Tombstone) {
+                if region_state.is_some_and(|s| s.get_state() == PeerState::Tombstone) {
                     continue;
                 }
             }
@@ -386,21 +392,21 @@ pub trait DebugExecutor {
                     println!("key: {}", escape(&key));
                     if cfs.contains(&CF_LOCK) && mvcc.has_lock() {
                         let lock_info = mvcc.get_lock();
-                        if start_ts.map_or(true, |ts| lock_info.get_start_ts() == ts) {
+                        if start_ts.is_none_or(|ts| lock_info.get_start_ts() == ts) {
                             println!("\tlock cf value: {:?}", lock_info);
                         }
                     }
                     if cfs.contains(&CF_DEFAULT) {
                         for value_info in mvcc.get_values() {
-                            if commit_ts.map_or(true, |ts| value_info.get_start_ts() == ts) {
+                            if commit_ts.is_none_or(|ts| value_info.get_start_ts() == ts) {
                                 println!("\tdefault cf value: {:?}", value_info);
                             }
                         }
                     }
                     if cfs.contains(&CF_WRITE) {
                         for write_info in mvcc.get_writes() {
-                            if start_ts.map_or(true, |ts| write_info.get_start_ts() == ts)
-                                && commit_ts.map_or(true, |ts| write_info.get_commit_ts() == ts)
+                            if start_ts.is_none_or(|ts| write_info.get_start_ts() == ts)
+                                && commit_ts.is_none_or(|ts| write_info.get_commit_ts() == ts)
                             {
                                 println!("\t write cf value: {:?}", write_info);
                             }
diff --git a/cmd/tikv-ctl/src/fork_readonly_tikv.rs b/cmd/tikv-ctl/src/fork_readonly_tikv.rs
index 934ef173a67..4d16f1e382f 100644
--- a/cmd/tikv-ctl/src/fork_readonly_tikv.rs
+++ b/cmd/tikv-ctl/src/fork_readonly_tikv.rs
@@ -8,7 +8,7 @@ use std::{
 };
 
 use encryption_export::data_key_manager_from_config;
-use raft_engine::{env::DefaultFileSystem, Engine as RaftEngine};
+use raft_engine::{Engine as RaftEngine, env::DefaultFileSystem};
 use regex::Regex;
 use tikv::config::TikvConfig;
 
diff --git a/cmd/tikv-ctl/src/main.rs b/cmd/tikv-ctl/src/main.rs
index bb73f55810a..8ddf98a9be5 100644
--- a/cmd/tikv-ctl/src/main.rs
+++ b/cmd/tikv-ctl/src/main.rs
@@ -1,6 +1,5 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
-#![feature(lazy_cell)]
 #![feature(let_chains)]
 
 #[macro_use]
@@ -16,19 +15,19 @@ use std::{
     sync::{Arc, Mutex, RwLock},
     thread,
     time::Duration,
-    u64,
 };
 
 use collections::HashMap;
 use compact_log_backup::{
+    TraceResultExt,
     exec_hooks::{self as compact_log_hooks, skip_small_compaction::SkipSmallCompaction},
-    execute as compact_log, TraceResultExt,
+    execute as compact_log,
 };
 use crypto::fips;
 use encryption_export::{
-    create_backend, data_key_manager_from_config, DataKeyManager, DecrypterReader, Iv,
+    DataKeyManager, DecrypterReader, Iv, create_backend, data_key_manager_from_config,
 };
-use engine_rocks::{get_env, util::new_engine_opt, RocksEngine};
+use engine_rocks::{RocksEngine, get_env, util::new_engine_opt};
 use engine_traits::Peekable;
 use file_system::calc_crc32;
 use futures::{executor::block_on, future::try_join_all};
@@ -49,16 +48,16 @@ use raft_log_engine::ManagedFileSystem;
 use raftstore::store::util::build_key_range;
 use regex::Regex;
 use security::{SecurityConfig, SecurityManager};
-use structopt::{clap::ErrorKind, StructOpt};
+use structopt::{StructOpt, clap::ErrorKind};
 use tempfile::TempDir;
 use tikv::{
     config::TikvConfig,
-    server::{debug::BottommostLevelCompaction, KvEngineFactoryBuilder},
+    server::{KvEngineFactoryBuilder, debug::BottommostLevelCompaction},
     storage::config::EngineType,
 };
 use tikv_util::{
     escape,
-    logger::{get_log_level, Level},
+    logger::{Level, get_log_level},
     run_and_wait_child_process,
     sys::thread::StdThreadBuildWrapper,
     unescape, warn,
@@ -407,6 +406,8 @@ fn main() {
             name,
             force_regenerate,
             minimal_compaction_size,
+            prefetch_running_count,
+            prefetch_buffer_count,
         } => {
             let tmp_engine =
                 TemporaryRocks::new(&cfg).expect("failed to create temp engine for writing SSTs.");
@@ -433,6 +434,8 @@ fn main() {
             let ccfg = compact_log::ExecutionConfig {
                 from_ts,
                 until_ts,
+                prefetch_running_count,
+                prefetch_buffer_count,
                 compression,
                 compression_level,
             };
@@ -1208,8 +1211,10 @@ impl TemporaryRocks {
         let tmp = TempDir::new().map_err(|v| format!("failed to create tmp dir: {}", v))?;
         let opt = build_rocks_opts(cfg);
         let cf_opts = cfg.rocksdb.build_cf_opts(
-            &cfg.rocksdb
-                .build_cf_resources(cfg.storage.block_cache.build_shared_cache()),
+            &cfg.rocksdb.build_cf_resources(
+                cfg.storage.block_cache.build_shared_cache(),
+                Default::default(),
+            ),
             None,
             cfg.storage.api_version(),
             None,
@@ -1292,6 +1297,9 @@ fn print_bad_ssts(data_dir: &str, manifest: Option<&str>, pd_client: RpcClient,
     stderr_buf.read_to_end(&mut buffer).unwrap();
     let corruptions = unsafe { String::from_utf8_unchecked(buffer) };
 
+    let r = Regex::new(r"/\w*\.sst").unwrap();
+    let column_r = Regex::new(r"--------------- (.*) --------------\n(.*)").unwrap();
+    let sst_stat_r = Regex::new(r".*\n\d+:\d+\[\d+ .. \d+\]\['(\w*)' seq:\d+, type:\d+ .. '(\w*)' seq:\d+, type:\d+\] at level \d+").unwrap();
     for line in corruptions.lines() {
         println!("--------------------------------------------------------");
         // The corruption format may like this:
@@ -1300,7 +1308,6 @@ fn print_bad_ssts(data_dir: &str, manifest: Option<&str>, pd_client: RpcClient,
         // ```
         println!("corruption info:\n{}", line);
 
-        let r = Regex::new(r"/\w*\.sst").unwrap();
         let sst_file_number = match r.captures(line) {
             None => {
                 println!("skip bad line format");
@@ -1361,15 +1368,13 @@ fn print_bad_ssts(data_dir: &str, manifest: Option<&str>, pd_client: RpcClient,
         // --------------- Column family "write"  (ID 2) --------------
         // 63:132906243[3555338 .. 3555338]['7A311B40EFCC2CB4C5911ECF3937D728DED26AE53FA5E61BE04F23F2BE54EACC73' seq:3555338, type:1 .. '7A313030302E25CD5F57252E' seq:3555338, type:1] at level 0
         // ```
-        let column_r = Regex::new(r"--------------- (.*) --------------\n(.*)").unwrap();
         if let Some(m) = column_r.captures(&output) {
             println!(
                 "{} for {}",
                 m.get(2).unwrap().as_str(),
                 m.get(1).unwrap().as_str()
             );
-            let r = Regex::new(r".*\n\d+:\d+\[\d+ .. \d+\]\['(\w*)' seq:\d+, type:\d+ .. '(\w*)' seq:\d+, type:\d+\] at level \d+").unwrap();
-            let matches = match r.captures(&output) {
+            let matches = match sst_stat_r.captures(&output) {
                 None => {
                     println!("sst start key format is not correct: {}", output);
                     continue;
@@ -1487,10 +1492,11 @@ fn read_cluster_id(config: &TikvConfig) -> Result<u64, String> {
             .map(Arc::new);
     let env = get_env(key_manager.clone(), None /* io_rate_limiter */).unwrap();
     let cache = config.storage.block_cache.build_shared_cache();
-    let kv_engine = KvEngineFactoryBuilder::new(env, config, cache, key_manager)
-        .build()
-        .create_shared_db(&config.storage.data_dir)
-        .map_err(|e| format!("create_shared_db fail: {}", e))?;
+    let kv_engine =
+        KvEngineFactoryBuilder::new(env, config, cache, key_manager, Default::default())
+            .build()
+            .create_shared_db(&config.storage.data_dir)
+            .map_err(|e| format!("create_shared_db fail: {}", e))?;
     let ident = kv_engine
         .get_msg::<StoreIdent>(keys::STORE_IDENT_KEY)
         .unwrap()
diff --git a/cmd/tikv-ctl/src/util.rs b/cmd/tikv-ctl/src/util.rs
index 90322b6000d..913df27675b 100644
--- a/cmd/tikv-ctl/src/util.rs
+++ b/cmd/tikv-ctl/src/util.rs
@@ -1,6 +1,6 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{borrow::ToOwned, error::Error, str, str::FromStr, u64};
+use std::{borrow::ToOwned, error::Error, str, str::FromStr};
 
 use kvproto::kvrpcpb::KeyRange;
 use server::setup::initial_logger;
diff --git a/cmd/tikv-server/Cargo.toml b/cmd/tikv-server/Cargo.toml
index bdb8af9e4f5..521d26c7fea 100644
--- a/cmd/tikv-server/Cargo.toml
+++ b/cmd/tikv-server/Cargo.toml
@@ -40,7 +40,7 @@ tikv = { workspace = true }
 tikv_util = { workspace = true }
 toml = "0.5"
 tracing-active-tree = { workspace = true, optional = true }
-tracing-subscriber = { version = "0.3.17", default-features = false, features = [ "registry", "smallvec" ], optional = true }
+tracing-subscriber = { version = "0.3.20", default-features = false, features = [ "registry", "smallvec" ], optional = true }
 
 [build-dependencies]
 cc = "1.0"
diff --git a/cmd/tikv-server/src/main.rs b/cmd/tikv-server/src/main.rs
index 9fe7f6986d0..e9f6fe8ab64 100644
--- a/cmd/tikv-server/src/main.rs
+++ b/cmd/tikv-server/src/main.rs
@@ -4,12 +4,12 @@
 
 use std::{path::Path, process};
 
-use clap::{crate_authors, App, Arg};
+use clap::{App, Arg, crate_authors};
 use crypto::fips;
 use serde_json::{Map, Value};
 use server::setup::{ensure_no_unrecognized_config, validate_and_persist_config};
 use tikv::{
-    config::{to_flatten_config_info, TikvConfig},
+    config::{TikvConfig, to_flatten_config_info},
     storage::config::EngineType,
 };
 
diff --git a/components/api_version/src/api_v1ttl.rs b/components/api_version/src/api_v1ttl.rs
index 2a2df6bfb33..bd66e0c4523 100644
--- a/components/api_version/src/api_v1ttl.rs
+++ b/components/api_version/src/api_v1ttl.rs
@@ -4,8 +4,8 @@ use engine_traits::Result;
 use tikv_util::{
     box_err,
     codec::{
-        number::{self, NumberEncoder},
         Error,
+        number::{self, NumberEncoder},
     },
 };
 
diff --git a/components/api_version/src/api_v2.rs b/components/api_version/src/api_v2.rs
index a56d5deac30..9096e8a18fa 100644
--- a/components/api_version/src/api_v2.rs
+++ b/components/api_version/src/api_v2.rs
@@ -3,9 +3,8 @@
 use codec::byte::MemComparableByteCodec;
 use engine_traits::Result;
 use tikv_util::codec::{
-    bytes,
+    Error, bytes,
     number::{self, NumberEncoder},
-    Error,
 };
 use txn_types::{Key, TimeStamp};
 
diff --git a/components/api_version/src/lib.rs b/components/api_version/src/lib.rs
index 879751e7b62..18de8148228 100644
--- a/components/api_version/src/lib.rs
+++ b/components/api_version/src/lib.rs
@@ -259,7 +259,7 @@ impl<T: AsRef<[u8]>> RawValue<T> {
     #[inline]
     pub fn is_ttl_expired(&self, current_ts: u64) -> bool {
         self.expire_ts
-            .map_or(false, |expire_ts| expire_ts <= current_ts)
+            .is_some_and(|expire_ts| expire_ts <= current_ts)
     }
 }
 
diff --git a/components/backup-stream/Cargo.toml b/components/backup-stream/Cargo.toml
index 50262898e3b..42f658e8bed 100644
--- a/components/backup-stream/Cargo.toml
+++ b/components/backup-stream/Cargo.toml
@@ -26,7 +26,7 @@ test = true
 harness = true
 
 [dependencies]
-async-compression = { version = "0.4.12", features = ["tokio", "zstd"] }
+async-compression = { version = "0.4.27", features = ["tokio", "zstd"] }
 async-trait = { version = "0.1" }
 base64 = "0.13.0"
 chrono = { workspace = true }
diff --git a/components/backup-stream/src/checkpoint_manager.rs b/components/backup-stream/src/checkpoint_manager.rs
index 9896ea99b69..0e7addb32fe 100644
--- a/components/backup-stream/src/checkpoint_manager.rs
+++ b/components/backup-stream/src/checkpoint_manager.rs
@@ -3,9 +3,9 @@
 use std::{cell::RefCell, collections::HashMap, sync::Arc, time::Duration};
 
 use futures::{
+    FutureExt, SinkExt, StreamExt,
     channel::mpsc::{self as async_mpsc, Receiver, Sender},
     future::BoxFuture,
-    FutureExt, SinkExt, StreamExt,
 };
 use grpcio::{RpcStatus, RpcStatusCode, WriteFlags};
 use kvproto::{
@@ -20,13 +20,13 @@ use txn_types::TimeStamp;
 use uuid::Uuid;
 
 use crate::{
-    annotate,
+    RegionCheckpointOperation, Task, annotate,
     errors::{Error, Result},
     future,
-    metadata::{store::MetaStore, Checkpoint, CheckpointProvider, MetadataClient},
+    metadata::{Checkpoint, CheckpointProvider, MetadataClient, store::MetaStore},
     metrics,
     subscription_track::ResolveResult,
-    try_send, RegionCheckpointOperation, Task,
+    try_send,
 };
 
 /// A manager for maintaining the last flush ts.
@@ -66,6 +66,7 @@ impl SubscriptionManager {
         info!("subscription manager started!");
         defer! { info!("subscription manager exit.") }
         while let Some(msg) = self.input.next().await {
+            metrics::ACTIVE_SUBSCRIPTION_NUMBER.set(self.subscribers.len() as _);
             match msg {
                 SubscriptionOp::Add(sub) => {
                     let uid = Uuid::new_v4();
@@ -609,7 +610,7 @@ pub mod tests {
         time::Duration,
     };
 
-    use futures::{future::ok, Sink};
+    use futures::{Sink, future::ok};
     use grpcio::{RpcStatus, RpcStatusCode};
     use kvproto::{logbackuppb::SubscribeFlushEventResponse, metapb::*};
     use pd_client::{PdClient, PdFuture};
@@ -617,8 +618,8 @@ pub mod tests {
 
     use super::{BasicFlushObserver, FlushObserver, RegionIdWithVersion};
     use crate::{
-        subscription_track::{CheckpointType, ResolveResult},
         GetCheckpointResult,
+        subscription_track::{CheckpointType, ResolveResult},
     };
 
     fn region(id: u64, version: u64, conf_version: u64) -> Region {
diff --git a/components/backup-stream/src/endpoint.rs b/components/backup-stream/src/endpoint.rs
index b81279ed186..f1110bc4334 100644
--- a/components/backup-stream/src/endpoint.rs
+++ b/components/backup-stream/src/endpoint.rs
@@ -15,7 +15,7 @@ use dashmap::DashMap;
 use encryption::BackupEncryptionManager;
 use engine_traits::KvEngine;
 use error_code::ErrorCodeExt;
-use futures::{stream::AbortHandle, FutureExt, TryFutureExt};
+use futures::{FutureExt, TryFutureExt, stream::AbortHandle};
 use kvproto::{
     brpb::{StreamBackupError, StreamBackupTaskInfo},
     metapb::{Region, RegionEpoch},
@@ -26,13 +26,13 @@ use raftstore::{
     coprocessor::{CmdBatch, ObserveHandle, RegionInfoProvider},
     router::CdcHandle,
 };
-use resolved_ts::{resolve_by_raft, LeadershipResolver};
+use resolved_ts::{LeadershipResolver, resolve_by_raft};
 use tikv::{
     config::{BackupStreamConfig, ResolvedTsConfig},
     storage::txn::txn_status_cache::TxnStatusCache,
 };
 use tikv_util::{
-    box_err,
+    HandyRwLock, box_err,
     config::ReadableDuration,
     debug, defer, error, info,
     memory::MemoryQuota,
@@ -40,12 +40,11 @@ use tikv_util::{
     time::{Instant, Limiter},
     warn,
     worker::{Runnable, Scheduler},
-    HandyRwLock,
 };
 use tokio::{
     io::Result as TokioResult,
     runtime::{Handle, Runtime},
-    sync::{mpsc::Sender, Semaphore},
+    sync::{Semaphore, mpsc::Sender},
 };
 use tokio_stream::StreamExt;
 use tracing::instrument;
@@ -62,7 +61,7 @@ use crate::{
     errors::{Error, ReportableResult, Result},
     event_loader::InitialDataLoader,
     future,
-    metadata::{store::MetaStore, MetadataClient, MetadataEvent, StreamTask},
+    metadata::{MetadataClient, MetadataEvent, StreamTask, store::MetaStore},
     metrics::{self, TaskStatus},
     observer::BackupStreamObserver,
     router::{self, ApplyEvents, FlushContext, Router, TaskSelector, TaskSelectorRef},
@@ -186,7 +185,7 @@ where
             ),
             accessor.clone(),
             meta_client.clone(),
-            ((config.num_threads + 1) / 2).max(1),
+            (config.num_threads.div_ceil(2)).max(1),
             resolver,
             resolved_ts_config.advance_ts_interval.0,
         );
@@ -834,7 +833,7 @@ where
         router.unregister_task(task)
     }
 
-    fn prepare_min_ts(&self) -> future![TimeStamp] {
+    fn prepare_min_ts(&self) -> future![(TimeStamp, TimeStamp)] {
         let pd_cli = self.pd_client.clone();
         let cm = self.concurrency_manager.clone();
         async move {
@@ -845,11 +844,16 @@ where
                 .unwrap_or_default();
             cm.update_max_ts(pd_tso, "backup-stream").unwrap();
             let min_ts = cm.global_min_lock_ts().unwrap_or(TimeStamp::max());
-            Ord::min(pd_tso, min_ts)
+            (Ord::min(pd_tso, min_ts), pd_tso)
         }
     }
 
-    fn do_flush(&self, task: String, resolved: ResolvedRegions) -> future![Result<()>] {
+    fn do_flush(
+        &self,
+        task: String,
+        resolved: ResolvedRegions,
+        flush_ts: TimeStamp,
+    ) -> future![Result<()>] {
         let router = self.range_router.clone();
         let store_id = self.store_id;
         let mut flush_ob = self.flush_observer();
@@ -866,6 +870,7 @@ where
                 store_id,
                 resolved_regions: &resolved,
                 resolved_ts: new_rts,
+                flush_ts,
             };
             if let Some(rts) = router.do_flush(cx).await {
                 info!("flushing and refreshing checkpoint ts.";
@@ -900,7 +905,7 @@ where
             info!("Triggering force flush."; "selector" => ?task);
             let handlers = self.range_router.select_task_handler(task);
             for hnd in handlers {
-                let mts = self.prepare_min_ts().await;
+                let (mts, fts) = self.prepare_min_ts().await;
                 let sched = self.scheduler.clone();
                 let sender = sender.clone();
                 self.subscribe_flush_done(&hnd.task.info.name, sender);
@@ -910,7 +915,7 @@ where
                             callback: Box::new(move |res| {
                                 try_send!(
                                     sched,
-                                    Task::ExecFlush(hnd.task.info.name.to_owned(), res)
+                                    Task::ExecFlush(hnd.task.info.name.to_owned(), res, fts)
                                 );
                             }),
                             min_ts: mts,
@@ -927,12 +932,12 @@ where
 
     pub fn on_flush(&self, task: String) {
         self.pool.block_on(async move {
-            let mts = self.prepare_min_ts().await;
+            let (mts, flush_ts) = self.prepare_min_ts().await;
             let sched = self.scheduler.clone();
-            info!("min_ts prepared for flushing"; "min_ts" => %mts);
+            info!("min_ts prepared for flushing"; "min_ts" => %mts, "flush_ts" => %flush_ts);
             self.region_op(ObserveOp::ResolveRegions {
                 callback: Box::new(move |res| {
-                    try_send!(sched, Task::ExecFlush(task, res));
+                    try_send!(sched, Task::ExecFlush(task, res, flush_ts));
                 }),
                 min_ts: mts,
             })
@@ -940,9 +945,9 @@ where
         })
     }
 
-    fn on_exec_flush(&mut self, task: String, resolved: ResolvedRegions) {
+    fn on_exec_flush(&mut self, task: String, resolved: ResolvedRegions, flush_ts: TimeStamp) {
         self.checkpoint_mgr.freeze();
-        let fut = self.do_flush(task.clone(), resolved);
+        let fut = self.do_flush(task.clone(), resolved, flush_ts);
         let sched = self.scheduler.clone();
         self.pool.spawn(root!("flush"; async move {
             let res = fut.await;
@@ -1096,7 +1101,7 @@ where
                 }
             }
             Task::MarkFailover(t) => self.failover_time = Some(t),
-            Task::ExecFlush(task, min_ts) => self.on_exec_flush(task, min_ts),
+            Task::ExecFlush(task, min_ts, flush_ts) => self.on_exec_flush(task, min_ts, flush_ts),
             Task::RegionCheckpointsOp(s) => self.handle_region_checkpoints_op(s),
             Task::UpdateGlobalCheckpoint(task) => self.on_update_global_checkpoint(task),
             Task::Flushed(result) => self.on_flushed(result),
@@ -1178,7 +1183,7 @@ where
                     metrics::MISC_EVENTS.skip_resolve_no_subscription.inc();
                     return;
                 }
-                let min_ts = self.pool.block_on(self.prepare_min_ts());
+                let (min_ts, _) = self.pool.block_on(self.prepare_min_ts());
                 let start_time = Instant::now();
                 // We need to reschedule the `Resolve` task to queue, because the subscription
                 // is asynchronous -- there may be transactions committed before
@@ -1350,7 +1355,7 @@ pub enum Task {
     Flushed(FlushResult),
     /// Execute the flush with the calculated resolved result.
     /// This is an internal command only issued by the `Flush` task.
-    ExecFlush(String, ResolvedRegions),
+    ExecFlush(String, ResolvedRegions, TimeStamp),
     /// The command for getting region checkpoints.
     RegionCheckpointsOp(RegionCheckpointOperation),
     /// update global-checkpoint-ts to storage.
@@ -1464,10 +1469,11 @@ impl fmt::Debug for Task {
                 .debug_tuple("MarkFailover")
                 .field(&format_args!("{:?} ago", t.saturating_elapsed()))
                 .finish(),
-            Self::ExecFlush(arg0, arg1) => f
+            Self::ExecFlush(arg0, arg1, arg2) => f
                 .debug_tuple("ExecFlush")
                 .field(arg0)
                 .field(&arg1.global_checkpoint())
+                .field(&arg2)
                 .finish(),
             Self::RegionCheckpointsOp(s) => f.debug_tuple("GetRegionCheckpoints").field(s).finish(),
             Self::UpdateGlobalCheckpoint(task) => {
diff --git a/components/backup-stream/src/errors.rs b/components/backup-stream/src/errors.rs
index 657fab840fa..f19016fcd38 100644
--- a/components/backup-stream/src/errors.rs
+++ b/components/backup-stream/src/errors.rs
@@ -79,7 +79,7 @@ impl ErrorCodeExt for Error {
     }
 }
 
-impl<'a> ErrorCodeExt for &'a Error {
+impl ErrorCodeExt for &Error {
     fn error_code(&self) -> error_code::ErrorCode {
         Error::error_code(*self)
     }
@@ -198,7 +198,7 @@ impl Error {
 mod test {
     extern crate test;
 
-    use std::io::{self, ErrorKind};
+    use std::io;
 
     use error_code::ErrorCodeExt;
 
@@ -206,8 +206,7 @@ mod test {
 
     #[test]
     fn test_contextual_error() {
-        let err = Error::Io(io::Error::new(
-            ErrorKind::Other,
+        let err = Error::Io(io::Error::other(
             "the absence of error messages, is also a kind of error message",
         ));
         let result: Result<()> = Err(err);
@@ -232,8 +231,7 @@ mod test {
     // 2,685 ns/iter (+/- 194)
     fn contextual_add_format_strings_directly(b: &mut test::Bencher) {
         b.iter(|| {
-            let err = Error::Io(io::Error::new(
-                ErrorKind::Other,
+            let err = Error::Io(io::Error::other(
                 "basement, it is the fundamental basement.",
             ));
             let result: Result<()> = Err(err);
@@ -253,8 +251,7 @@ mod test {
     // 1,922 ns/iter (+/- 273)
     fn contextual_add_format_strings(b: &mut test::Bencher) {
         b.iter(|| {
-            let err = Error::Io(io::Error::new(
-                ErrorKind::Other,
+            let err = Error::Io(io::Error::other(
                 "basement, it is the fundamental basement.",
             ));
             let result: Result<()> = Err(err);
@@ -274,8 +271,7 @@ mod test {
     // 1,988 ns/iter (+/- 89)
     fn contextual_add_closure(b: &mut test::Bencher) {
         b.iter(|| {
-            let err = Error::Io(io::Error::new(
-                ErrorKind::Other,
+            let err = Error::Io(io::Error::other(
                 "basement, it is the fundamental basement.",
             ));
             let result: Result<()> = Err(err);
@@ -296,8 +292,7 @@ mod test {
     // 773 ns/iter (+/- 8)
     fn baseline(b: &mut test::Bencher) {
         b.iter(|| {
-            let err = Error::Io(io::Error::new(
-                ErrorKind::Other,
+            let err = Error::Io(io::Error::other(
                 "basement, it is the fundamental basement.",
             ));
             let result: Result<()> = Err(err);
diff --git a/components/backup-stream/src/event_loader.rs b/components/backup-stream/src/event_loader.rs
index a990ea2a82b..f7f18d18ea4 100644
--- a/components/backup-stream/src/event_loader.rs
+++ b/components/backup-stream/src/event_loader.rs
@@ -2,18 +2,18 @@
 
 use std::{marker::PhantomData, sync::Arc, time::Duration};
 
-use engine_traits::{KvEngine, CF_DEFAULT, CF_WRITE};
+use engine_traits::{CF_DEFAULT, CF_WRITE, KvEngine};
 use kvproto::{kvrpcpb::ExtraOp, metapb::Region, raft_cmdpb::CmdType};
 use raftstore::{
     coprocessor::ObserveHandle,
     router::CdcHandle,
-    store::{fsm::ChangeObserver, Callback},
+    store::{Callback, fsm::ChangeObserver},
 };
 use tikv::storage::{
+    Snapshot, Statistics,
     kv::StatisticsSummary,
     mvcc::{DeltaScanner, ScannerBuilder},
     txn::{TxnEntry, TxnEntryScanner},
-    Snapshot, Statistics,
 };
 use tikv_util::{
     box_err,
@@ -27,12 +27,12 @@ use tracing_active_tree::frame;
 use txn_types::{Key, Lock, TimeStamp};
 
 use crate::{
-    annotate, debug,
+    Task, annotate, debug,
     errors::{ContextualResultExt, Error, Result},
     metrics,
     router::{ApplyEvent, ApplyEvents, Router},
     subscription_track::{Ref, RefMut, SubscriptionTracer, TwoPhaseResolver},
-    utils, Task,
+    utils,
 };
 
 const MAX_GET_SNAPSHOT_RETRY: usize = 5;
@@ -484,8 +484,8 @@ mod tests {
     use futures::executor::block_on;
     use kvproto::metapb::*;
     use tikv::storage::{
-        txn::{tests::*, txn_status_cache::TxnStatusCache},
         TestEngineBuilder,
+        txn::{tests::*, txn_status_cache::TxnStatusCache},
     };
     use tikv_kv::SnapContext;
     use tikv_util::memory::{MemoryQuota, OwnedAllocated};
diff --git a/components/backup-stream/src/lib.rs b/components/backup-stream/src/lib.rs
index 6d7afa334c9..97467fc169c 100644
--- a/components/backup-stream/src/lib.rs
+++ b/components/backup-stream/src/lib.rs
@@ -1,5 +1,4 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
-#![feature(slice_group_by)]
 #![feature(trait_alias)]
 #![feature(result_flattening)]
 #![feature(assert_matches)]
diff --git a/components/backup-stream/src/metadata/store/pd.rs b/components/backup-stream/src/metadata/store/pd.rs
index 5b2e2b466e5..6ed5f693f2e 100644
--- a/components/backup-stream/src/metadata/store/pd.rs
+++ b/components/backup-stream/src/metadata/store/pd.rs
@@ -3,7 +3,7 @@
 use std::{collections::VecDeque, fmt::Display, pin::Pin, task::ready};
 
 use async_trait::async_trait;
-use futures::{stream, Stream};
+use futures::{Stream, stream};
 use kvproto::meta_storagepb::{self as mpb, WatchResponse};
 use pd_client::meta_storage::{Get, MetaStorageClient, Put, Watch};
 use pin_project::pin_project;
@@ -200,10 +200,10 @@ mod tests {
 
     use futures::{Future, StreamExt};
     use pd_client::{
-        meta_storage::{Checked, Source, Sourced},
         RpcClient,
+        meta_storage::{Checked, Source, Sourced},
     };
-    use test_pd::{mocker::MetaStorage, util::*, Server as PdServer};
+    use test_pd::{Server as PdServer, mocker::MetaStorage, util::*};
     use tikv_util::config::ReadableDuration;
 
     use super::PdStore;
diff --git a/components/backup-stream/src/metadata/store/slash_etc.rs b/components/backup-stream/src/metadata/store/slash_etc.rs
index a564d069d14..1afb387e596 100644
--- a/components/backup-stream/src/metadata/store/slash_etc.rs
+++ b/components/backup-stream/src/metadata/store/slash_etc.rs
@@ -9,8 +9,8 @@ use std::{
 
 use async_trait::async_trait;
 use tokio::sync::{
-    mpsc::{self, Sender},
     Mutex,
+    mpsc::{self, Sender},
 };
 use tokio_stream::StreamExt;
 
@@ -113,7 +113,7 @@ impl SlashEtc {
             .collect::<Vec<_>>();
         let kvs = mvccs
             .as_slice()
-            .group_by(|k1, k2| k1.0.0 == k2.0.0)
+            .chunk_by(|k1, k2| k1.0.0 == k2.0.0)
             .filter_map(|k| {
                 let (k, v) = k.last()?;
                 match v {
diff --git a/components/backup-stream/src/metadata/test.rs b/components/backup-stream/src/metadata/test.rs
index bb2b7fe1577..c7343e86754 100644
--- a/components/backup-stream/src/metadata/test.rs
+++ b/components/backup-stream/src/metadata/test.rs
@@ -3,17 +3,17 @@
 #![cfg(test)]
 
 use std::{
-    collections::{hash_map::RandomState, HashSet},
+    collections::{HashSet, hash_map::RandomState},
     iter::FromIterator,
 };
 
 use kvproto::brpb::{Noop, StorageBackend};
 use tokio_stream::StreamExt;
 
-use super::{keys::MetaKey, MetadataClient, StreamTask};
+use super::{MetadataClient, StreamTask, keys::MetaKey};
 use crate::{
     errors::Result,
-    metadata::{store::SlashEtcStore, MetadataEvent},
+    metadata::{MetadataEvent, store::SlashEtcStore},
 };
 
 pub fn test_meta_cli() -> MetadataClient<SlashEtcStore> {
diff --git a/components/backup-stream/src/metrics.rs b/components/backup-stream/src/metrics.rs
index 90296b3baf0..a096c9f6139 100644
--- a/components/backup-stream/src/metrics.rs
+++ b/components/backup-stream/src/metrics.rs
@@ -197,6 +197,21 @@ lazy_static! {
         "The duration of polling read temp file.",
         exponential_buckets(0.001, 2.0, 10).unwrap()
     ).unwrap();
+
+    pub static ref STORE_SMALLEST_CHECKPOINT_REGION_ID: IntGauge = register_int_gauge!(
+        "tikv_log_backup_store_last_checkpoint_region_id",
+        "ID of the region with the smallest checkpoint ts in the store."
+    ).unwrap();
+
+    pub static ref STORE_SMALLEST_CHECKPOINT_TS: IntGauge = register_int_gauge!(
+        "tikv_log_backup_store_last_checkpoint_ts",
+        "The smallest checkpoint ts in the store."
+    ).unwrap();
+
+    pub static ref ACTIVE_SUBSCRIPTION_NUMBER: IntGauge = register_int_gauge!(
+        "tikv_log_backup_active_subscription_number",
+        "The number of active subscriptions from advancer in the store."
+    ).unwrap();
 }
 
 make_static_metric! {
diff --git a/components/backup-stream/src/observer.rs b/components/backup-stream/src/observer.rs
index f808e582e3c..ce6d8f130f8 100644
--- a/components/backup-stream/src/observer.rs
+++ b/components/backup-stream/src/observer.rs
@@ -6,7 +6,7 @@ use engine_traits::KvEngine;
 use kvproto::metapb::Region;
 use raft::StateRole;
 use raftstore::coprocessor::*;
-use tikv_util::{worker::Scheduler, HandyRwLock};
+use tikv_util::{HandyRwLock, worker::Scheduler};
 
 use crate::{
     debug,
@@ -185,7 +185,6 @@ impl RegionChangeObserver for BackupStreamObserver {
 }
 
 #[cfg(test)]
-
 mod tests {
     use std::{assert_matches::assert_matches, sync::Arc, time::Duration};
 
@@ -198,7 +197,7 @@ mod tests {
         RegionChangeEvent, RegionChangeObserver, RegionChangeReason, RoleChange, RoleObserver,
     };
     use tikv::storage::txn::txn_status_cache::TxnStatusCache;
-    use tikv_util::{worker::dummy_scheduler, HandyRwLock};
+    use tikv_util::{HandyRwLock, worker::dummy_scheduler};
 
     use super::BackupStreamObserver;
     use crate::{
diff --git a/components/backup-stream/src/router.rs b/components/backup-stream/src/router.rs
index ed307871a46..523252b13aa 100644
--- a/components/backup-stream/src/router.rs
+++ b/components/backup-stream/src/router.rs
@@ -7,8 +7,8 @@ use std::{
     path::{Path, PathBuf},
     result,
     sync::{
-        atomic::{AtomicBool, AtomicPtr, AtomicU64, AtomicUsize, Ordering},
         Arc, RwLock as SyncRwLock,
+        atomic::{AtomicBool, AtomicPtr, AtomicU64, AtomicUsize, Ordering},
     },
     time::Duration,
 };
@@ -16,8 +16,8 @@ use std::{
 use dashmap::DashMap;
 use encryption::{BackupEncryptionManager, EncrypterReader, Iv, MultiMasterKeyBackend};
 use encryption_export::create_async_backend;
-use engine_traits::{CfName, CF_DEFAULT, CF_LOCK, CF_WRITE};
-use external_storage::{create_storage, BackendConfig, ExternalStorage, UnpinReader};
+use engine_traits::{CF_DEFAULT, CF_LOCK, CF_WRITE, CfName};
+use external_storage::{BackendConfig, ExternalStorage, UnpinReader, create_storage};
 use file_system::Sha256Reader;
 use futures::io::Cursor;
 use kvproto::{
@@ -36,14 +36,13 @@ use slog_global::debug;
 use tidb_query_datatype::codec::table::decode_table_id;
 use tikv::config::BackupStreamConfig;
 use tikv_util::{
-    box_err,
+    Either, HandyRwLock, box_err,
     codec::stream_event::EventEncoder,
     config::ReadableSize,
     error, info,
     time::{Instant, Limiter},
     warn,
     worker::Scheduler,
-    Either, HandyRwLock,
 };
 use tokio::{
     io::AsyncWriteExt,
@@ -103,7 +102,7 @@ pub enum TaskSelectorRef<'a> {
     All,
 }
 
-impl<'a> std::fmt::Debug for TaskSelectorRef<'a> {
+impl std::fmt::Debug for TaskSelectorRef<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::ByName(name) => f.debug_tuple("ByName").field(name).finish(),
@@ -121,7 +120,7 @@ impl<'a> std::fmt::Debug for TaskSelectorRef<'a> {
     }
 }
 
-impl<'a> TaskSelectorRef<'a> {
+impl TaskSelectorRef<'_> {
     fn matches<'c, 'd>(
         self,
         task_name: &str,
@@ -160,6 +159,7 @@ pub struct FlushContext<'a> {
     pub store_id: u64,
     pub resolved_regions: &'a ResolvedRegions,
     pub resolved_ts: TimeStamp,
+    pub flush_ts: TimeStamp,
 }
 
 impl ApplyEvents {
@@ -1150,7 +1150,6 @@ impl StreamTaskHandler {
         )
         .await
         .into_iter()
-        .map(|r| r.map_err(Error::from))
         .fold(Ok(()), Result::and)?;
 
         let mut metadata = MetadataInfo::with_capacity(w.len() + wm.len());
@@ -1182,8 +1181,8 @@ impl StreamTaskHandler {
             for f in fg.data_files_info.iter_mut() {
                 if let Some((epoches, start_key, end_key)) = rmap.get(&(f.region_id as _)) {
                     f.set_region_epoch(epoches.iter().copied().cloned().collect::<Vec<_>>().into());
-                    f.set_region_start_key(start_key.to_vec());
-                    f.set_region_end_key(end_key.to_vec());
+                    f.set_region_start_key(start_key.to_vec().into());
+                    f.set_region_end_key(end_key.to_vec().into());
                 }
             }
         }
@@ -1312,12 +1311,8 @@ impl StreamTaskHandler {
         }
         let min_ts = min_ts.unwrap_or_default();
         let max_ts = max_ts.unwrap_or_default();
-        merged_file_info.set_path(TempFileKey::file_name(
-            metadata.store_id,
-            min_ts,
-            max_ts,
-            is_meta,
-        ));
+        merged_file_info
+            .set_path(TempFileKey::file_name(metadata.store_id, min_ts, max_ts, is_meta).into());
         merged_file_info.set_data_files_info(data_file_infos.into());
         merged_file_info.set_length(stat_length);
         merged_file_info.set_max_ts(max_ts);
@@ -1414,9 +1409,21 @@ impl StreamTaskHandler {
     }
 
     #[instrument(skip_all)]
-    pub async fn flush_backup_metadata(&self, metadata_info: MetadataInfo) -> Result<()> {
+    pub async fn flush_backup_metadata(
+        &self,
+        metadata_info: MetadataInfo,
+        flush_ts: TimeStamp,
+    ) -> Result<()> {
         if !metadata_info.file_groups.is_empty() {
-            let meta_path = metadata_info.path_to_meta();
+            let mut min_begin_ts = u64::MAX;
+            for file_group in metadata_info.file_groups.as_slice() {
+                assert!(!file_group.data_files_info.is_empty());
+                for d in file_group.data_files_info.as_slice() {
+                    assert_ne!(d.min_begin_ts_in_default_cf, 0);
+                    min_begin_ts = min_begin_ts.min(d.min_begin_ts_in_default_cf)
+                }
+            }
+            let meta_path = metadata_info.path_to_meta(min_begin_ts, flush_ts.into_inner());
             let meta_buff = metadata_info.marshal_to()?;
             let buflen = meta_buff.len();
 
@@ -1483,7 +1490,8 @@ impl StreamTaskHandler {
             // flush meta file to storage.
             self.fill_region_info(cx, &mut backup_metadata);
             // flush backup metadata to external storage.
-            self.flush_backup_metadata(backup_metadata).await?;
+            self.flush_backup_metadata(backup_metadata, cx.flush_ts)
+                .await?;
             crate::metrics::FLUSH_DURATION
                 .with_label_values(&["save_files"])
                 .observe(sw.lap().as_secs_f64());
@@ -1740,6 +1748,7 @@ pub struct MetadataInfo {
     // the field files is deprecated in v6.3.0
     // pub files: Vec<DataFileInfo>,
     pub file_groups: Vec<DataFileGroup>,
+    // deprecated
     pub min_resolved_ts: Option<u64>,
     pub min_ts: Option<u64>,
     pub max_ts: Option<u64>,
@@ -1787,11 +1796,13 @@ impl MetadataInfo {
             .map_err(|err| Error::Other(box_err!("failed to marshal proto: {}", err)))
     }
 
-    fn path_to_meta(&self) -> String {
+    fn path_to_meta(&self, min_begin_ts: u64, flush_ts: u64) -> String {
         format!(
-            "v1/backupmeta/{}-{}.meta",
-            self.min_resolved_ts.unwrap_or_default(),
-            uuid::Uuid::new_v4()
+            "v1/backupmeta/{:016X}-{:016X}-{:016X}-{:016X}.meta",
+            flush_ts,
+            min_begin_ts,
+            self.min_ts.unwrap_or_default(),
+            self.max_ts.unwrap_or_default(),
         )
     }
 }
@@ -1902,7 +1913,8 @@ impl DataFile {
             self.sha256
                 .finish()
                 .map(|bytes| bytes.to_vec())
-                .map_err(|err| Error::Other(box_err!("openssl hasher failed to init: {}", err)))?,
+                .map_err(|err| Error::Other(box_err!("openssl hasher failed to init: {}", err)))?
+                .into(),
         );
         meta.set_crc64xor(self.crc64xor);
         meta.set_number_of_entries(self.number_of_entries as _);
@@ -1913,13 +1925,13 @@ impl DataFile {
             self.min_begin_ts
                 .map_or(self.min_ts.into_inner(), |ts| ts.into_inner()),
         );
-        meta.set_start_key(std::mem::take(&mut self.start_key));
-        meta.set_end_key(std::mem::take(&mut self.end_key));
+        meta.set_start_key(std::mem::take(&mut self.start_key).into());
+        meta.set_end_key(std::mem::take(&mut self.end_key).into());
         meta.set_length(self.file_size as _);
 
         meta.set_is_meta(file_key.is_meta);
         meta.set_table_id(file_key.table_id);
-        meta.set_cf(file_key.cf.to_owned());
+        meta.set_cf(file_key.cf.to_owned().into());
         meta.set_region_id(file_key.region_id as i64);
         meta.set_type(file_key.get_file_type());
 
@@ -1940,9 +1952,6 @@ impl std::fmt::Debug for DataFile {
     }
 }
 
-#[derive(Clone, Ord, PartialOrd, PartialEq, Eq, Debug)]
-struct KeyRange(Vec<u8>);
-
 #[derive(Clone, Debug)]
 #[allow(dead_code)]
 struct TaskRange {
@@ -1957,7 +1966,7 @@ mod tests {
     use async_compression::tokio::bufread::ZstdDecoder;
     use encryption::{DecrypterReader, FileConfig, MasterKeyConfig, MultiMasterKeyBackend};
     use external_storage::{BlobObject, ExternalData, NoopStorage};
-    use futures::{future::LocalBoxFuture, stream::LocalBoxStream, AsyncReadExt};
+    use futures::{AsyncReadExt, future::LocalBoxFuture, stream::LocalBoxStream};
     use kvproto::{
         brpb::{CipherInfo, Noop, StorageBackend, StreamBackupTaskInfo},
         encryptionpb::EncryptionMethod,
@@ -1971,7 +1980,7 @@ mod tests {
             stream_event::{EventIterator, Iterator},
         },
         config::ReadableDuration,
-        worker::{dummy_scheduler, ReceiverWrapper},
+        worker::{ReceiverWrapper, dummy_scheduler},
     };
     use tokio::{fs::File, io::BufReader};
     use txn_types::{Write, WriteType};
@@ -2254,7 +2263,10 @@ mod tests {
             }
         }
 
-        task_handler.flush_backup_metadata(meta).await.unwrap();
+        task_handler
+            .flush_backup_metadata(meta, TimeStamp::new(1))
+            .await
+            .unwrap();
         task_handler.clear_flushing_files().await;
 
         drop(router);
@@ -2267,10 +2279,34 @@ mod tests {
 
         let mut meta_count = 0;
         let mut log_count = 0;
+
         for entry in walkdir::WalkDir::new(storage_path) {
             let entry = entry.unwrap();
-            let filename = entry.file_name();
             if entry.path().extension() == Some(OsStr::new("meta")) {
+                let filename = entry.path().file_stem().unwrap().to_os_string();
+                let parts: Vec<&str> = filename.to_str().unwrap().split('-').collect();
+
+                assert!(
+                    parts.len() >= 4,
+                    "Invalid meta file name format: expected at least 4 parts, got {}, file: {:?}",
+                    parts.len(),
+                    entry.file_name(),
+                );
+
+                for (i, label) in ["flushTs", "minDefaultTs", "minTs", "maxTs"]
+                    .iter()
+                    .enumerate()
+                {
+                    let val = u64::from_str_radix(parts[i], 16);
+                    assert!(
+                        val.is_ok(),
+                        "Failed to parse '{}' as u64 (hex) for {} in file name: {:?}",
+                        parts[i],
+                        label,
+                        entry.file_name(),
+                    );
+                }
+
                 meta_count += 1;
             } else if entry.path().extension() == Some(OsStr::new("log")) {
                 log_count += 1;
@@ -2278,7 +2314,7 @@ mod tests {
                 assert!(
                     f.len() > 10,
                     "the log file {:?} is too small (size = {}B)",
-                    filename,
+                    entry.file_name(),
                     f.len()
                 );
             }
@@ -2334,6 +2370,7 @@ mod tests {
             store_id: 1,
             resolved_regions: &EMPTY_RESOLVE,
             resolved_ts: TimeStamp::new(1),
+            flush_ts: TimeStamp::new(1),
         };
         task_handler.do_flush(cx).await.unwrap();
         assert_eq!(task_handler.flush_failure_count(), 0);
@@ -2358,8 +2395,7 @@ mod tests {
                     let mut fst = first_time.lock().unwrap();
                     if *fst {
                         *fst = false;
-                        return Err(io::Error::new(
-                            io::ErrorKind::Other,
+                        return Err(io::Error::other(
                             "the absence of the result, is also a kind of result",
                         ));
                     }
@@ -2453,6 +2489,7 @@ mod tests {
             store_id: 42,
             resolved_regions: &EMPTY_RESOLVE,
             resolved_ts: TimeStamp::max(),
+            flush_ts: TimeStamp::max(),
         };
         let (task, _path) = task_handler("error_prone".to_owned()).await?;
         must_register_table(router.as_ref(), task, 1).await;
@@ -2509,6 +2546,7 @@ mod tests {
             store_id: 1,
             resolved_regions: &EMPTY_RESOLVE,
             resolved_ts: ts,
+            flush_ts: ts,
         };
         let rts = router.do_flush(cx).await.unwrap();
         assert_eq!(ts.into_inner(), rts);
@@ -2593,6 +2631,7 @@ mod tests {
             store_id: 42,
             resolved_regions: &EMPTY_RESOLVE,
             resolved_ts: TimeStamp::zero(),
+            flush_ts: TimeStamp::new(1),
         };
         for i in 0..=FLUSH_FAILURE_BECOME_FATAL_THRESHOLD {
             check_on_events_result(&router.on_events(build_kv_event((i * 10) as _, 10)).await);
@@ -2787,8 +2826,7 @@ mod tests {
             if data_len == content_length {
                 Ok(())
             } else {
-                Err(io::Error::new(
-                    io::ErrorKind::Other,
+                Err(io::Error::other(
                     "the length of content in reader is not equal with content_length",
                 ))
             }
@@ -2985,6 +3023,7 @@ mod tests {
             store_id: 42,
             resolved_regions: &EMPTY_RESOLVE,
             resolved_ts: TimeStamp::max(),
+            flush_ts: TimeStamp::new(1),
         };
         // set flush status to true, because we disabled the auto flush.
         t.set_flushing_status(true);
@@ -3096,6 +3135,7 @@ mod tests {
             store_id: 1,
             resolved_regions: &EMPTY_RESOLVE,
             resolved_ts: TimeStamp::new(1),
+            flush_ts: TimeStamp::new(1),
         };
         task_handler.do_flush(cx).await?;
         let duration = start.saturating_elapsed();
@@ -3167,7 +3207,22 @@ mod tests {
         for entry in walkdir::WalkDir::new(path) {
             let entry = entry.unwrap();
             if entry.path().extension() == Some(OsStr::new("meta")) {
-                meta_files.push(entry.path().to_path_buf());
+                if let Some(filename) = entry.path().file_stem().and_then(OsStr::to_str) {
+                    // v1/backupmeta/{a}-{b}-{c}-{d}.meta
+                    let parts: Vec<&str> = filename.split('-').collect();
+                    if parts.len() == 4 {
+                        for p in parts {
+                            assert!(
+                                u64::from_str_radix(p, 16).is_ok(),
+                                "Part '{}' is not a valid hex u64",
+                                p
+                            );
+                        }
+                        meta_files.push(entry.path().to_path_buf());
+                    } else {
+                        panic!("backup meta file format changed")
+                    }
+                }
             }
         }
         meta_files
diff --git a/components/backup-stream/src/service.rs b/components/backup-stream/src/service.rs
index 3e1db6f1d0d..1dc38416468 100644
--- a/components/backup-stream/src/service.rs
+++ b/components/backup-stream/src/service.rs
@@ -8,10 +8,11 @@ use kvproto::{logbackuppb::*, metapb::Region};
 use tikv_util::{info, warn, worker::Scheduler};
 
 use crate::{
+    Task,
     checkpoint_manager::{GetCheckpointResult, RegionIdWithVersion},
     endpoint::{RegionCheckpointOperation, RegionSet},
     router::TaskSelector,
-    try_send, Task,
+    try_send,
 };
 
 #[derive(Clone)]
diff --git a/components/backup-stream/src/subscription_manager.rs b/components/backup-stream/src/subscription_manager.rs
index 4eae7b7ee11..fef9b7852e4 100644
--- a/components/backup-stream/src/subscription_manager.rs
+++ b/components/backup-stream/src/subscription_manager.rs
@@ -17,24 +17,23 @@ use tikv_util::{
     box_err, debug, info, memory::MemoryQuota, sys::thread::ThreadBuildWrapper, time::Instant,
     warn, worker::Scheduler,
 };
-use tokio::sync::mpsc::{channel, error::SendError, Receiver, Sender, WeakSender};
+use tokio::sync::mpsc::{Receiver, Sender, WeakSender, channel, error::SendError};
 use tracing::instrument;
 use tracing_active_tree::root;
 use txn_types::TimeStamp;
 
 use crate::{
-    annotate,
+    Task, annotate,
     endpoint::{BackupStreamResolver, ObserveOp},
     errors::{Error, ReportableResult, Result},
     event_loader::InitialDataLoader,
     future,
-    metadata::{store::MetaStore, CheckpointProvider, MetadataClient},
+    metadata::{CheckpointProvider, MetadataClient, store::MetaStore},
     metrics,
     router::{Router, TaskSelector},
     subscription_track::{CheckpointType, Ref, RefMut, ResolveResult, SubscriptionTracer},
     try_send,
     utils::{self, FutureWaitGroup, Work},
-    Task,
 };
 
 type ScanPool = tokio::runtime::Runtime;
@@ -236,7 +235,7 @@ async fn scan_executor_loop(init: impl InitialScan, mut cmds: Receiver<ScanCmd>)
 /// spawn the executors to some runtime.
 #[cfg(test)]
 fn spawn_executors_to(
-    init: impl InitialScan + Send + Sync + 'static,
+    init: impl InitialScan + 'static,
     handle: &tokio::runtime::Handle,
 ) -> ScanPoolHandle {
     let (tx, rx) = tokio::sync::mpsc::channel(MESSAGE_BUFFER_SIZE);
@@ -247,10 +246,7 @@ fn spawn_executors_to(
 }
 
 /// spawn the executors in the scan pool.
-fn spawn_executors(
-    init: impl InitialScan + Send + Sync + 'static,
-    number: usize,
-) -> ScanPoolHandle {
+fn spawn_executors(init: impl InitialScan + 'static, number: usize) -> ScanPoolHandle {
     let (tx, rx) = tokio::sync::mpsc::channel(MESSAGE_BUFFER_SIZE);
     let pool = create_scan_pool(number);
     let handle = pool.handle().clone();
@@ -451,6 +447,10 @@ where
                     // If there isn't any region observed, the `min_ts` can be used as resolved ts
                     // safely.
                     let rts = min_region.map(|rs| rs.checkpoint).unwrap_or(min_ts);
+                    if let Some(mr) = min_region.as_ref() {
+                        metrics::STORE_SMALLEST_CHECKPOINT_REGION_ID.set(mr.region.id as _);
+                        metrics::STORE_SMALLEST_CHECKPOINT_TS.set(rts.into_inner() as _);
+                    }
                     if min_region
                         .map(|mr| mr.checkpoint_type != CheckpointType::MinTs)
                         .unwrap_or(false)
@@ -819,8 +819,8 @@ mod test {
     use std::{
         collections::HashMap,
         sync::{
-            atomic::{AtomicBool, Ordering},
             Arc, Mutex,
+            atomic::{AtomicBool, Ordering},
         },
         time::Duration,
     };
@@ -833,27 +833,27 @@ mod test {
         metapb::{Region, RegionEpoch},
     };
     use raftstore::{
+        RegionInfo,
         coprocessor::{ObserveHandle, RegionInfoCallback, RegionInfoProvider},
         router::{CdcRaftRouter, ServerRaftStoreRouter},
-        RegionInfo,
     };
     use tikv::{
         config::BackupStreamConfig,
-        storage::{txn::txn_status_cache::TxnStatusCache, Statistics},
+        storage::{Statistics, txn::txn_status_cache::TxnStatusCache},
     };
     use tikv_util::{box_err, info, memory::MemoryQuota, worker::dummy_scheduler};
     use tokio::{sync::mpsc::Sender, task::JoinHandle};
     use txn_types::TimeStamp;
 
-    use super::{spawn_executors_to, InitialScan, RegionSubscriptionManager};
+    use super::{InitialScan, RegionSubscriptionManager, spawn_executors_to};
     use crate::{
+        BackupStreamResolver, ObserveOp, Task,
         errors::Error,
-        metadata::{store::SlashEtcStore, MetadataClient, StreamTask},
+        metadata::{MetadataClient, StreamTask, store::SlashEtcStore},
         router::{Router, RouterInner},
         subscription_manager::{OOM_BACKOFF_BASE, OOM_BACKOFF_JITTER_SECS},
         subscription_track::{CheckpointType, SubscriptionTracer},
         utils::FutureWaitGroup,
-        BackupStreamResolver, ObserveOp, Task,
     };
 
     #[derive(Clone, Copy)]
diff --git a/components/backup-stream/src/subscription_track.rs b/components/backup-stream/src/subscription_track.rs
index e0b10418bd9..4e3f4622a23 100644
--- a/components/backup-stream/src/subscription_track.rs
+++ b/components/backup-stream/src/subscription_track.rs
@@ -3,8 +3,8 @@
 use std::{collections::HashSet, result::Result, sync::Arc};
 
 use dashmap::{
-    mapref::{entry::Entry, one::RefMut as DashRefMut},
     DashMap,
+    mapref::{entry::Entry, one::RefMut as DashRefMut},
 };
 use kvproto::metapb::Region;
 use raftstore::coprocessor::*;
@@ -405,6 +405,7 @@ pub trait Ref {
     type Key;
     type Value;
 
+    #[allow(dead_code)]
     fn key(&self) -> &Self::Key;
     fn value(&self) -> &Self::Value;
 }
@@ -413,7 +414,7 @@ pub trait RefMut: Ref {
     fn value_mut(&mut self) -> &mut <Self as Ref>::Value;
 }
 
-impl<'a> Ref for ActiveSubscriptionRef<'a> {
+impl Ref for ActiveSubscriptionRef<'_> {
     type Key = u64;
     type Value = ActiveSubscription;
 
@@ -426,7 +427,7 @@ impl<'a> Ref for ActiveSubscriptionRef<'a> {
     }
 }
 
-impl<'a> RefMut for ActiveSubscriptionRef<'a> {
+impl RefMut for ActiveSubscriptionRef<'_> {
     fn value_mut(&mut self) -> &mut <Self as Ref>::Value {
         self.sub_mut()
     }
@@ -605,7 +606,7 @@ impl TwoPhaseResolver {
         txn_status_cache: Arc<TxnStatusCache>,
     ) -> Self {
         // TODO: limit the memory usage of the resolver.
-        let memory_quota = Arc::new(MemoryQuota::new(std::usize::MAX));
+        let memory_quota = Arc::new(MemoryQuota::new(usize::MAX));
         Self {
             resolver: Resolver::new(region_id, memory_quota, txn_status_cache),
             future_locks: Default::default(),
diff --git a/components/backup-stream/src/tempfiles.rs b/components/backup-stream/src/tempfiles.rs
index 612ba4f9e5f..a8d6d330e8f 100644
--- a/components/backup-stream/src/tempfiles.rs
+++ b/components/backup-stream/src/tempfiles.rs
@@ -22,10 +22,10 @@ use std::{
     path::{Path, PathBuf},
     pin::Pin,
     sync::{
-        atomic::{AtomicU8, AtomicUsize, Ordering},
         Arc, Mutex as BlockMutex,
+        atomic::{AtomicU8, AtomicUsize, Ordering},
     },
-    task::{ready, Context, Poll},
+    task::{Context, Poll, ready},
     time::Instant,
 };
 
@@ -234,8 +234,7 @@ impl TempFilePool {
             }
         });
         if f.reader_count.load(Ordering::SeqCst) > 0 {
-            return Err(Error::new(
-                ErrorKind::Other,
+            return Err(Error::other(
                 "open_for_write isn't allowed when there are concurrent reading.",
             ));
         }
@@ -288,8 +287,7 @@ impl TempFilePool {
             // like cursors to allow the reader be able to access consistent
             // File snapshot even there are writers appending contents
             // to the file. But that isn't needed for now.
-            return Err(IoErr::new(
-                ErrorKind::Other,
+            return Err(IoErr::other(
                 format!(
                     "open_for_read isn't allowed when there are concurrent writing (there are still {} reads for file {}.).",
                     refc,
@@ -339,11 +337,11 @@ impl TempFilePool {
     fn create_relative(&self, p: &Path) -> std::io::Result<SwappedOut> {
         let abs_path = self.cfg.swap_files.join(p);
         #[cfg(test)]
-        match &self.override_swapout {
-            Some(f) => return Ok(SwappedOut::Dynamic(f(&abs_path))),
-            None => {}
+        if let Some(f) = &self.override_swapout {
+            return Ok(SwappedOut::Dynamic(f(&abs_path)));
         }
-        let file = OsFile::from_std(SyncOsFile::create(&abs_path)?);
+        let mut file = OsFile::from_std(SyncOsFile::create(&abs_path)?);
+        file.set_max_buf_size(self.config().write_buffer_size);
 
         let pfile = match &self.backup_encryption_manager.opt_data_key_manager() {
             Some(enc) => SwappedOut::Encrypted(
@@ -788,15 +786,15 @@ mod test {
         path::Path,
         pin::Pin,
         sync::{
-            atomic::{AtomicUsize, Ordering},
             Arc,
+            atomic::{AtomicUsize, Ordering},
         },
     };
 
     use async_compression::tokio::bufread::ZstdDecoder;
     use encryption::{BackupEncryptionManager, DataKeyManager, MultiMasterKeyBackend};
     use kvproto::{brpb::CompressionType, encryptionpb::EncryptionMethod};
-    use tempfile::{tempdir, TempDir};
+    use tempfile::{TempDir, tempdir};
     use test_util::new_test_key_manager;
     use tokio::io::{AsyncReadExt, AsyncWrite, AsyncWriteExt, BufReader};
     use walkdir::WalkDir;
diff --git a/components/backup-stream/src/utils.rs b/components/backup-stream/src/utils.rs
index 051a3be033c..343c341c1bb 100644
--- a/components/backup-stream/src/utils.rs
+++ b/components/backup-stream/src/utils.rs
@@ -4,21 +4,21 @@ use core::pin::Pin;
 use std::{
     borrow::Borrow,
     cell::RefCell,
-    collections::{hash_map::RandomState, BTreeMap, HashMap},
+    collections::{BTreeMap, HashMap, hash_map::RandomState},
     future::Future,
     ops::{Bound, RangeBounds},
     path::Path,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
     task::{Context, Waker},
     time::Duration,
 };
 
-use async_compression::{tokio::write::ZstdEncoder, Level};
+use async_compression::{Level, tokio::write::ZstdEncoder};
 use engine_rocks::ReadPerfInstant;
-use engine_traits::{CfName, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE};
+use engine_traits::{CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, CfName};
 use futures::{ready, task::Poll};
 use kvproto::{
     brpb::CompressionType,
@@ -27,13 +27,12 @@ use kvproto::{
 };
 use tikv::storage::CfStatistics;
 use tikv_util::{
-    box_err,
+    Either, box_err,
     sys::inspector::{
-        self_thread_inspector, IoStat, ThreadInspector, ThreadInspectorImpl as OsInspector,
+        IoStat, ThreadInspector, ThreadInspectorImpl as OsInspector, self_thread_inspector,
     },
     time::Instant,
     worker::Scheduler,
-    Either,
 };
 use tokio::{
     fs::File,
@@ -43,9 +42,9 @@ use tokio::{
 use txn_types::{Key, Lock, LockType};
 
 use crate::{
+    Task,
     errors::{Error, Result},
     router::TaskSelector,
-    Task,
 };
 
 /// wrap a user key with encoded data key.
@@ -105,7 +104,7 @@ pub type SlotMap<K, V, S = RandomState> = RwLock<HashMap<K, Slot<V>, S>>;
 /// to DSTs.
 struct RangeToInclusiveRef<'a, T: ?Sized>(&'a T);
 
-impl<'a, T: ?Sized> RangeBounds<T> for RangeToInclusiveRef<'a, T> {
+impl<T: ?Sized> RangeBounds<T> for RangeToInclusiveRef<'_, T> {
     fn start_bound(&self) -> Bound<&T> {
         Bound::Unbounded
     }
@@ -117,7 +116,7 @@ impl<'a, T: ?Sized> RangeBounds<T> for RangeToInclusiveRef<'a, T> {
 
 struct RangeToExclusiveRef<'a, T: ?Sized>(&'a T);
 
-impl<'a, T: ?Sized> RangeBounds<T> for RangeToExclusiveRef<'a, T> {
+impl<T: ?Sized> RangeBounds<T> for RangeToExclusiveRef<'_, T> {
     fn start_bound(&self) -> Bound<&T> {
         Bound::Unbounded
     }
@@ -394,7 +393,7 @@ impl Drop for Work {
 
 pub struct WaitAll<'a>(&'a FutureWaitGroup);
 
-impl<'a> Future for WaitAll<'a> {
+impl Future for WaitAll<'_> {
     type Output = ();
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
@@ -706,7 +705,7 @@ pub fn debug_key_range<'ret, 'a: 'ret, 'b: 'ret>(
 
 struct DebugKeyRange<'start, 'end>(&'start [u8], &'end [u8]);
 
-impl<'start, 'end> std::fmt::Debug for DebugKeyRange<'start, 'end> {
+impl std::fmt::Debug for DebugKeyRange<'_, '_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let end_key = if self.1.is_empty() {
             Either::Left("inf")
@@ -735,7 +734,7 @@ pub fn debug_region(r: &Region) -> impl std::fmt::Debug + '_ {
 
 struct DebugRegion<'a>(&'a Region);
 
-impl<'a> std::fmt::Debug for DebugRegion<'a> {
+impl std::fmt::Debug for DebugRegion<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let r = self.0;
         f.debug_struct("Region")
@@ -756,7 +755,7 @@ impl<'a> std::fmt::Debug for DebugRegion<'a> {
 
 struct SlogRegion<'a>(&'a Region);
 
-impl<'a> slog::KV for SlogRegion<'a> {
+impl slog::KV for SlogRegion<'_> {
     fn serialize(
         &self,
         _record: &slog::Record<'_>,
@@ -812,8 +811,8 @@ impl<D: std::fmt::Debug, T: Iterator<Item = D>> std::fmt::Debug for DebugIter<D,
 mod test {
     use std::{
         sync::{
-            atomic::{AtomicUsize, Ordering},
             Arc,
+            atomic::{AtomicUsize, Ordering},
         },
         time::Duration,
     };
@@ -824,7 +823,7 @@ mod test {
     use log_wrappers::RedactOption;
     use tokio::io::{AsyncWriteExt, BufReader};
 
-    use crate::utils::{is_in_range, FutureWaitGroup, SegmentMap};
+    use crate::utils::{FutureWaitGroup, SegmentMap, is_in_range};
 
     #[test]
     fn test_redact() {
@@ -993,7 +992,7 @@ mod test {
 
     #[test]
     fn test_recorder() {
-        use engine_traits::{Iterable, KvEngine, Mutable, WriteBatch, WriteBatchExt, CF_DEFAULT};
+        use engine_traits::{CF_DEFAULT, Iterable, KvEngine, Mutable, WriteBatch, WriteBatchExt};
         use tempfile::TempDir;
 
         let p = TempDir::new().unwrap();
diff --git a/components/backup-stream/tests/failpoints/mod.rs b/components/backup-stream/tests/failpoints/mod.rs
index 7e538a4bad4..891e21d4493 100644
--- a/components/backup-stream/tests/failpoints/mod.rs
+++ b/components/backup-stream/tests/failpoints/mod.rs
@@ -12,21 +12,21 @@ mod all {
     use core::panic;
     use std::{
         sync::{
-            atomic::{AtomicBool, Ordering},
             Arc,
+            atomic::{AtomicBool, Ordering},
         },
         time::Duration,
     };
 
     use backup_stream::{
+        GetCheckpointResult, RegionCheckpointOperation, RegionSet, Task,
         errors::Error,
         metadata::{
+            PauseStatus,
             keys::MetaKey,
             store::{Keys, MetaStore},
-            PauseStatus,
         },
         router::TaskSelector,
-        GetCheckpointResult, RegionCheckpointOperation, RegionSet, Task,
     };
     use encryption::{FileConfig, MasterKeyConfig};
     use futures::executor::block_on;
@@ -34,17 +34,17 @@ mod all {
     use serde_json::Value;
     use tempfile::TempDir;
     use tikv_util::{
-        box_err,
+        HandyRwLock, box_err,
         config::{ReadableDuration, ReadableSize},
-        defer, HandyRwLock,
+        defer,
     };
     use txn_types::Key;
     use walkdir::WalkDir;
 
     use super::{
-        make_record_key, make_split_key_at_record, mutation, run_async_test, SuiteBuilder,
+        SuiteBuilder, make_record_key, make_split_key_at_record, mutation, run_async_test,
     };
-    use crate::{make_table_key, Suite};
+    use crate::{Suite, make_table_key};
 
     #[test]
     fn failed_register_task() {
diff --git a/components/backup-stream/tests/integration/mod.rs b/components/backup-stream/tests/integration/mod.rs
index 62b07646e37..0200a464ca0 100644
--- a/components/backup-stream/tests/integration/mod.rs
+++ b/components/backup-stream/tests/integration/mod.rs
@@ -13,7 +13,7 @@ mod all {
     };
 
     use backup_stream::{
-        router::TaskSelector, GetCheckpointResult, RegionCheckpointOperation, RegionSet, Task,
+        GetCheckpointResult, RegionCheckpointOperation, RegionSet, Task, router::TaskSelector,
     };
     use futures::{Stream, StreamExt};
     use kvproto::metapb::RegionEpoch;
@@ -26,7 +26,7 @@ mod all {
     use walkdir::WalkDir;
 
     use super::suite::{
-        make_record_key, make_split_key_at_record, mutation, run_async_test, SuiteBuilder,
+        SuiteBuilder, make_record_key, make_split_key_at_record, mutation, run_async_test,
     };
 
     #[test]
@@ -88,7 +88,7 @@ mod all {
             e.set_conf_ver(conf_ver);
             e
         };
-        assert_eq!(dfs[0].region_start_key, b"");
+        assert!(dfs[0].region_start_key.is_empty());
         assert_eq!(dfs[0].region_end_key, hnd_key(42));
         assert_eq!(dfs[0].region_epoch.len(), 1, "{:?}", dfs[0]);
         assert_eq!(dfs[0].region_epoch[0], epoch(2, 1), "{:?}", dfs[0]);
@@ -99,7 +99,7 @@ mod all {
         assert_eq!(dfs[2].region_epoch[0], epoch(3, 1), "{:?}", dfs[2]);
 
         assert_eq!(dfs[4].region_start_key, hnd_key(86));
-        assert_eq!(dfs[4].region_end_key, b"");
+        assert!(dfs[4].region_end_key.is_empty());
         assert_eq!(dfs[4].region_epoch.len(), 1, "{:?}", dfs[4]);
         assert_eq!(dfs[4].region_epoch[0], epoch(3, 1), "{:?}", dfs[4]);
 
diff --git a/components/backup-stream/tests/suite.rs b/components/backup-stream/tests/suite.rs
index a828ddee83c..bec5b8e4d94 100644
--- a/components/backup-stream/tests/suite.rs
+++ b/components/backup-stream/tests/suite.rs
@@ -10,47 +10,48 @@ use std::{
 
 use async_compression::futures::write::ZstdDecoder;
 use backup_stream::{
+    BackupStreamGrpcService, BackupStreamResolver, Endpoint, GetCheckpointResult,
+    RegionCheckpointOperation, RegionSet, Task,
     errors::Result,
     metadata::{
+        MetadataClient, StreamTask,
         keys::{KeyValue, MetaKey},
         store::{MetaStore, SlashEtcStore},
-        MetadataClient, StreamTask,
     },
     observer::BackupStreamObserver,
     router::{Router, TaskSelector},
-    utils, BackupStreamGrpcService, BackupStreamResolver, Endpoint, GetCheckpointResult,
-    RegionCheckpointOperation, RegionSet, Task,
+    utils,
 };
 use encryption::{BackupEncryptionManager, MultiMasterKeyBackend};
-use futures::{executor::block_on, AsyncWriteExt, Future, Stream, StreamExt};
+use futures::{AsyncWriteExt, Future, Stream, StreamExt, executor::block_on};
 use grpcio::{ChannelBuilder, Server, ServerBuilder};
 use kvproto::{
     brpb::{CompressionType, Local, Metadata, StorageBackend},
     encryptionpb::EncryptionMethod,
     kvrpcpb::*,
     logbackuppb::{SubscribeFlushEventRequest, SubscribeFlushEventResponse},
-    logbackuppb_grpc::{create_log_backup, LogBackupClient},
+    logbackuppb_grpc::{LogBackupClient, create_log_backup},
     tikvpb::*,
 };
 use pd_client::PdClient;
-use raftstore::{router::CdcRaftRouter, RegionInfoAccessor};
+use raftstore::{RegionInfoAccessor, router::CdcRaftRouter};
 use resolved_ts::LeadershipResolver;
 use tempfile::TempDir;
 use test_pd_client::TestPdClient;
-use test_raftstore::{new_server_cluster, Cluster, Config, ServerCluster};
+use test_raftstore::{Cluster, Config, ServerCluster, new_server_cluster};
 use test_util::retry;
 use tikv::{
     config::{BackupStreamConfig, ResolvedTsConfig},
     storage::txn::txn_status_cache::TxnStatusCache,
 };
 use tikv_util::{
+    HandyRwLock,
     codec::{
         number::NumberEncoder,
         stream_event::{EventIterator, Iterator},
     },
     debug, info,
     worker::LazyWorker,
-    HandyRwLock,
 };
 use txn_types::{Key, TimeStamp, WriteRef};
 use walkdir::WalkDir;
@@ -641,9 +642,9 @@ impl Suite {
                     let mut default_segs = vec![];
                     let mut write_segs = vec![];
                     for file in fg.get_data_files_info() {
-                        let v = if file.cf == "default" || file.cf.is_empty() {
+                        let v = if file.cf == "default".into() || file.cf.is_empty() {
                             Some(&mut default_segs)
-                        } else if file.cf == "write" {
+                        } else if file.cf == "write".into() {
                             Some(&mut write_segs)
                         } else {
                             None
diff --git a/components/backup/src/disk_snap.rs b/components/backup/src/disk_snap.rs
index 94d956cc11c..de329e995a7 100644
--- a/components/backup/src/disk_snap.rs
+++ b/components/backup/src/disk_snap.rs
@@ -4,8 +4,8 @@
 use std::{
     future::Pending,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicU64, Ordering},
     },
     task::Poll,
     time::Duration,
@@ -27,12 +27,12 @@ use kvproto::{
     metapb::Region,
 };
 use raftstore::store::{
+    SnapshotBrWaitApplySyncer,
     snapshot_backup::{
         AbortReason, PrepareDiskSnapObserver, SnapshotBrHandle, SnapshotBrWaitApplyRequest,
     },
-    SnapshotBrWaitApplySyncer,
 };
-use tikv_util::{sys::thread::ThreadBuildWrapper, warn, Either};
+use tikv_util::{Either, sys::thread::ThreadBuildWrapper, warn};
 use tokio::{
     runtime::{Handle, Runtime},
     sync::oneshot,
diff --git a/components/backup/src/endpoint.rs b/components/backup/src/endpoint.rs
index 8bd082b4b98..73a2f7eb0a5 100644
--- a/components/backup/src/endpoint.rs
+++ b/components/backup/src/endpoint.rs
@@ -4,15 +4,15 @@ use std::{
     borrow::Cow,
     cell::RefCell,
     fmt,
-    sync::{atomic::*, mpsc, Arc, Mutex, RwLock},
+    sync::{Arc, Mutex, RwLock, atomic::*, mpsc},
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
 
 use async_channel::SendError;
 use causal_ts::{CausalTsProvider, CausalTsProviderImpl};
 use concurrency_manager::ConcurrencyManager;
-use engine_traits::{name_to_cf, raw_ttl::ttl_current_ts, CfName, KvEngine, SstCompressionType};
-use external_storage::{create_storage, BackendConfig, ExternalStorage, HdfsConfig};
+use engine_traits::{CfName, KvEngine, SstCompressionType, name_to_cf, raw_ttl::ttl_current_ts};
+use external_storage::{BackendConfig, ExternalStorage, HdfsConfig, create_storage};
 use futures::{channel::mpsc::*, executor::block_on};
 use kvproto::{
     brpb::*,
@@ -23,15 +23,15 @@ use kvproto::{
 use online_config::OnlineConfig;
 use raft::StateRole;
 use raftstore::coprocessor::RegionInfoProvider;
-use resource_control::{with_resource_limiter, ResourceGroupManager, ResourceLimiter};
+use resource_control::{ResourceGroupManager, ResourceLimiter, with_resource_limiter};
 use tikv::{
     config::BackupConfig,
     storage::{
+        Snapshot, Statistics,
         kv::{CursorBuilder, Engine, LocalTablets, ScanMode, SnapContext},
         mvcc::Error as MvccError,
         raw::raw_mvcc::RawMvccSnapshot,
         txn::{EntryBatch, Error as TxnError, SnapshotStore, TxnEntryScanner, TxnEntryStore},
-        Snapshot, Statistics,
     },
 };
 use tikv_util::{
@@ -48,11 +48,12 @@ use tokio::runtime::{Handle, Runtime};
 use txn_types::{Key, Lock, TimeStamp, TsSet};
 
 use crate::{
+    Error,
     metrics::*,
     softlimit::{CpuStatistics, SoftLimit, SoftLimitByCpu},
     utils::KeyValueCodec,
     writer::{BackupWriterBuilder, CfNameWrap},
-    Error, *,
+    *,
 };
 
 const BACKUP_BATCH_LIMIT: usize = 1024;
@@ -381,7 +382,7 @@ impl BackupRange {
         let snapshot = match engine.snapshot(snap_ctx) {
             Ok(s) => s,
             Err(e) => {
-                error!(?e; "backup snapshot failed");
+                warn!("backup snapshot failed"; "err" => ?e, "ctx" => ?ctx);
                 return Err(e.into());
             }
         };
@@ -417,7 +418,7 @@ impl BackupRange {
             RescheduleChecker::new(tokio::task::yield_now, TASK_YIELD_DURATION);
         loop {
             if let Err(e) = scanner.scan_entries(&mut batch) {
-                error!(?e; "backup scan entries failed");
+                warn!("backup scan entries failed"; "err" => ?e, "ctx" => ?ctx);
                 return Err(e.into());
             };
             if batch.is_empty() {
@@ -458,7 +459,7 @@ impl BackupRange {
 
             // Build sst files.
             if let Err(e) = writer.write(entries, true) {
-                error_unknown!(?e; "backup build sst failed");
+                warn!("backup build sst failed"; "err" => ?e, "ctx" => ?ctx);
                 return Err(e);
             }
             if resource_limiter.is_some() {
@@ -583,7 +584,7 @@ impl BackupRange {
         ) {
             Ok(w) => w,
             Err(e) => {
-                error_unknown!(?e; "backup writer failed");
+                warn!("backup writer failed"; "err" => ?e, "region" => ?self.region);
                 return Err(e);
             }
         };
@@ -600,7 +601,7 @@ impl BackupRange {
         let engine_snapshot = match engine.snapshot(snap_ctx) {
             Ok(s) => s,
             Err(e) => {
-                error!(?e; "backup raw kv snapshot failed");
+                warn!("backup raw kv snapshot failed"; "err" => ?e, "ctx" => ?ctx);
                 return Err(e.into());
             }
         };
@@ -862,7 +863,6 @@ impl<R: RegionInfoProvider> Progress<R> {
             }),
         );
         if let Err(e) = res {
-            // TODO: handle error.
             error!(?e; "backup seek region failed");
         }
 
@@ -970,7 +970,8 @@ impl<E: Engine, R: RegionInfoProvider + Clone + 'static> Endpoint<E, R> {
             loop {
                 // when get the guard, release it until we finish scanning a batch,
                 // because if we were suspended during scanning,
-                // the region info have higher possibility to change (then we must compensate that by the fine-grained backup).
+                // the region info have higher possibility to change (then we must compensate
+                // that by the fine-grained backup).
                 let guard = soft_limit_keeper.guard().await;
                 if let Err(e) = guard {
                     warn!("failed to retrieve limit guard, omitting."; "err" => %e);
@@ -980,14 +981,16 @@ impl<E: Engine, R: RegionInfoProvider + Clone + 'static> Endpoint<E, R> {
                     // It is critical to speed up backup, otherwise workers are
                     // blocked by each other.
                     //
-                    // If we use [tokio::sync::Mutex] here, until we give back the control flow to the scheduler
-                    // or tasks waiting for the lock won't be waked up due to the characteristic of the runtime...
+                    // If we use [tokio::sync::Mutex] here, until we give back the control flow to
+                    // the scheduler or tasks waiting for the lock won't be
+                    // waked up due to the characteristic of the runtime...
                     //
                     // The worst case is when using `noop` backend:
-                    // the task seems never yielding and in fact the backup would executing sequentially.
+                    // the task seems never yielding and in fact the backup would executing
+                    // sequentially.
                     //
-                    // Anyway, even tokio itself doesn't recommend to use it unless the lock guard needs to be `Send`.
-                    // (See https://tokio.rs/tokio/tutorial/shared-state)
+                    // Anyway, even tokio itself doesn't recommend to use it unless the lock guard
+                    // needs to be `Send`. (See https://tokio.rs/tokio/tutorial/shared-state)
                     // Use &mut and mark the type for making rust-analyzer happy.
                     let progress: &mut Progress<_> = &mut prs.lock().unwrap();
                     match progress.forward(batch_size, request.replica_read) {
@@ -997,8 +1000,9 @@ impl<E: Engine, R: RegionInfoProvider + Clone + 'static> Endpoint<E, R> {
                 };
 
                 for brange in batch {
-                    // wake up the scheduler for each loop for awaking tasks waiting for some lock or channels.
-                    // because the softlimit permit is held by current task, there isn't risk of being suspended for long time.
+                    // wake up the scheduler for each loop for awaking tasks waiting for some lock
+                    // or channels. because the softlimit permit is held by
+                    // current task, there isn't risk of being suspended for long time.
                     tokio::task::yield_now().await;
                     let engine = engine.clone();
                     if request.cancel.load(Ordering::SeqCst) {
@@ -1007,7 +1011,8 @@ impl<E: Engine, R: RegionInfoProvider + Clone + 'static> Endpoint<E, R> {
                     }
                     // TODO: make file_name unique and short
                     let key = brange.start_key.clone().and_then(|k| {
-                        // use start_key sha256 instead of start_key to avoid file name too long os error
+                        // use start_key sha256 instead of start_key to avoid file name too long os
+                        // error
                         let input = brange.codec.decode_backup_key(Some(k)).unwrap_or_default();
                         file_system::sha256(&input).ok().map(hex::encode)
                     });
@@ -1046,7 +1051,8 @@ impl<E: Engine, R: RegionInfoProvider + Clone + 'static> Endpoint<E, R> {
                             sst_max_size,
                             request.cipher.clone(),
                         );
-                        with_resource_limiter(brange.backup(
+                        with_resource_limiter(
+                            brange.backup(
                                 writer_builder,
                                 engine,
                                 concurrency_manager.clone(),
@@ -1057,15 +1063,17 @@ impl<E: Engine, R: RegionInfoProvider + Clone + 'static> Endpoint<E, R> {
                                 saver_tx.clone(),
                                 _backend.name(),
                                 resource_limiter.clone(),
-                            ), resource_limiter.clone())
-                            .await
+                            ),
+                            resource_limiter.clone(),
+                        )
+                        .await
                     };
                     match stat {
                         Err(err) => {
-                            error_unknown!(%err; "error during backup"; "region" => ?brange.region,);
+                            warn!("error during backup"; "region" => ?brange.region, "err" => %err);
                             let mut resp = BackupResponse::new();
                             resp.set_error(err.into());
-                            if let Err(err) =  resp_tx.unbounded_send(resp) {
+                            if let Err(err) = resp_tx.unbounded_send(resp) {
                                 warn!("failed to send response"; "err" => ?err)
                             }
                         }
@@ -1339,7 +1347,7 @@ pub mod tests {
         time::Duration,
     };
 
-    use api_version::{api_v2::RAW_KEY_PREFIX, dispatch_api_version, KvFormat, RawValue};
+    use api_version::{KvFormat, RawValue, api_v2::RAW_KEY_PREFIX, dispatch_api_version};
     use collections::HashSet;
     use engine_rocks::RocksSstReader;
     use engine_traits::{IterOptions, Iterator, MiscExt, RefIterable, SstReader};
@@ -1354,9 +1362,9 @@ pub mod tests {
     use tikv::{
         coprocessor::checksum_crc64_xor,
         storage::{
+            RocksEngine, TestEngineBuilder,
             kv::LocalTablets,
             txn::tests::{must_commit, must_prewrite_put},
-            RocksEngine, TestEngineBuilder,
         },
     };
     use tikv_util::{config::ReadableSize, info, store::new_peer};
diff --git a/components/backup/src/lib.rs b/components/backup/src/lib.rs
index 30345665369..54be9e5256a 100644
--- a/components/backup/src/lib.rs
+++ b/components/backup/src/lib.rs
@@ -14,7 +14,7 @@ mod softlimit;
 mod utils;
 mod writer;
 
-pub use endpoint::{backup_file_name, Endpoint, Task};
+pub use endpoint::{Endpoint, Task, backup_file_name};
 pub use errors::{Error, Result};
 pub use service::Service;
 pub use writer::{BackupRawKvWriter, BackupWriter};
diff --git a/components/backup/src/service.rs b/components/backup/src/service.rs
index 7e38093df53..2e8cf44dd81 100644
--- a/components/backup/src/service.rs
+++ b/components/backup/src/service.rs
@@ -1,8 +1,8 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::sync::{atomic::*, Arc, Mutex};
+use std::sync::{Arc, Mutex, atomic::*};
 
-use futures::{channel::mpsc, FutureExt, SinkExt, StreamExt, TryFutureExt};
+use futures::{FutureExt, SinkExt, StreamExt, TryFutureExt, channel::mpsc};
 use futures_util::stream::AbortHandle;
 use grpcio::{self, *};
 use kvproto::brpb::*;
@@ -139,10 +139,10 @@ where
     /// Generally there will be some steps for the client to do:
     /// 1. Establish a `prepare_snapshot_backup` connection.
     /// 2. Send a initial `UpdateLease`. And we should update the lease
-    /// periodically.
+    ///    periodically.
     /// 3. Send `WaitApply` to each leader peer in this store.
     /// 4. Once `WaitApply` for all regions have done, we can take disk
-    /// snapshot.
+    ///    snapshot.
     /// 5. Once all snapshots have been taken, send `Finalize` to stop.
     fn prepare_snapshot_backup(
         &mut self,
@@ -180,7 +180,7 @@ mod tests {
 
     use external_storage::make_local_backend;
     use tikv::storage::txn::tests::{must_commit, must_prewrite_put};
-    use tikv_util::worker::{dummy_scheduler, ReceiverWrapper};
+    use tikv_util::worker::{ReceiverWrapper, dummy_scheduler};
     use txn_types::TimeStamp;
 
     use super::*;
diff --git a/components/backup/src/softlimit.rs b/components/backup/src/softlimit.rs
index a3de91bb403..42d5accb042 100644
--- a/components/backup/src/softlimit.rs
+++ b/components/backup/src/softlimit.rs
@@ -3,8 +3,8 @@
 use std::{
     cmp::Ordering as CmpOrder,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
 };
 
@@ -181,8 +181,8 @@ impl SoftLimitByCpu<ThreadInfoStatistics> {
 mod softlimit_test {
     use std::{
         sync::{
-            atomic::{AtomicU8, Ordering},
             Arc,
+            atomic::{AtomicU8, Ordering},
         },
         time::Duration,
     };
diff --git a/components/backup/src/utils.rs b/components/backup/src/utils.rs
index b13e51466f9..358a61e65b0 100644
--- a/components/backup/src/utils.rs
+++ b/components/backup/src/utils.rs
@@ -1,6 +1,6 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use api_version::{dispatch_api_version, ApiV2, KeyMode, KvFormat};
+use api_version::{ApiV2, KeyMode, KvFormat, dispatch_api_version};
 use file_system::IoType;
 use kvproto::kvrpcpb::ApiVersion;
 use tikv_util::{error, sys::thread::ThreadBuildWrapper};
diff --git a/components/backup/src/writer.rs b/components/backup/src/writer.rs
index 4e77f20350d..9e2e3301015 100644
--- a/components/backup/src/writer.rs
+++ b/components/backup/src/writer.rs
@@ -4,8 +4,8 @@ use std::{fmt::Display, io::Read};
 
 use encryption::{EncrypterReader, Iv};
 use engine_traits::{
-    CfName, ExternalSstFileInfo, KvEngine, SstCompressionType, SstExt, SstWriter, SstWriterBuilder,
-    CF_DEFAULT, CF_WRITE,
+    CF_DEFAULT, CF_WRITE, CfName, ExternalSstFileInfo, KvEngine, SstCompressionType, SstExt,
+    SstWriter, SstWriterBuilder,
 };
 use external_storage::{ExternalStorage, UnpinReader};
 use file_system::Sha256Reader;
@@ -21,7 +21,7 @@ use tikv_util::{
 };
 use txn_types::KvPair;
 
-use crate::{backup_file_name, metrics::*, utils::KeyValueCodec, Error, Result};
+use crate::{Error, Result, backup_file_name, metrics::*, utils::KeyValueCodec};
 
 #[derive(Debug, Clone, Copy)]
 /// CfNameWrap wraps the CfName type.
@@ -467,7 +467,7 @@ mod tests {
             .unwrap();
             assert_eq!(map.len(), kv.len(), "{} {:?} {:?}", cf, map, kv);
             for (k, v) in *kv {
-                assert_eq!(&v.to_vec(), map.get(&k.to_vec()).unwrap());
+                assert_eq!(&v.to_vec(), map.get(*k).unwrap());
             }
         }
     }
@@ -542,10 +542,7 @@ mod tests {
                 engine_traits::CF_WRITE,
                 &temp.path().join(files[0].get_name()),
             )],
-            &[(
-                engine_traits::CF_WRITE,
-                &[(&keys::data_key(&[b'a']), &[b'a'])],
-            )],
+            &[(engine_traits::CF_WRITE, &[(&keys::data_key(b"a"), b"a")])],
         );
 
         // Test write and default.
@@ -595,16 +592,10 @@ mod tests {
                 ),
             ],
             &[
-                (
-                    engine_traits::CF_DEFAULT,
-                    &[(&keys::data_key(&[b'a']), &[b'a'])],
-                ),
+                (engine_traits::CF_DEFAULT, &[(&keys::data_key(b"a"), b"a")]),
                 (
                     engine_traits::CF_WRITE,
-                    &[
-                        (&keys::data_key(&[b'a']), &[b'a']),
-                        (&keys::data_key(&[b'b']), &[]),
-                    ],
+                    &[(&keys::data_key(b"a"), b"a"), (&keys::data_key(b"b"), &[])],
                 ),
             ],
         );
diff --git a/components/batch-system/benches/batch-system.rs b/components/batch-system/benches/batch-system.rs
index 9edf72f0ff9..d849d2460dc 100644
--- a/components/batch-system/benches/batch-system.rs
+++ b/components/batch-system/benches/batch-system.rs
@@ -2,7 +2,7 @@
 
 #![feature(test)]
 
-use std::sync::{atomic::*, Arc};
+use std::sync::{Arc, atomic::*};
 
 use batch_system::{test_runner::*, *};
 use criterion::*;
diff --git a/components/batch-system/src/batch.rs b/components/batch-system/src/batch.rs
index 0b7f9f45489..4791d2d02aa 100644
--- a/components/batch-system/src/batch.rs
+++ b/components/batch-system/src/batch.rs
@@ -10,16 +10,16 @@
 use std::{
     borrow::Cow,
     ops::{Deref, DerefMut},
-    sync::{atomic::AtomicUsize, Arc, Mutex},
-    thread::{self, current, JoinHandle, ThreadId},
+    sync::{Arc, Mutex, atomic::AtomicUsize},
+    thread::{self, JoinHandle, ThreadId, current},
     time::Duration,
 };
 
 use fail::fail_point;
-use file_system::{set_io_type, IoType};
+use file_system::{IoType, set_io_type};
 use resource_control::{
-    channel::{unbounded, Receiver, Sender},
     ResourceController,
+    channel::{Receiver, Sender, unbounded},
 };
 use tikv_util::{
     debug, error, info, mpsc, safe_panic, sys::thread::StdThreadBuildWrapper, thd_name,
diff --git a/components/batch-system/src/fsm.rs b/components/batch-system/src/fsm.rs
index 9002e16e0a2..427e37e1015 100644
--- a/components/batch-system/src/fsm.rs
+++ b/components/batch-system/src/fsm.rs
@@ -4,10 +4,9 @@ use std::{
     borrow::Cow,
     ptr,
     sync::{
-        atomic::{AtomicPtr, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicPtr, AtomicUsize, Ordering},
     },
-    usize,
 };
 
 use resource_control::ResourceMetered;
diff --git a/components/batch-system/src/lib.rs b/components/batch-system/src/lib.rs
index 1a45f2c5cdf..1f6f3ba4a60 100644
--- a/components/batch-system/src/lib.rs
+++ b/components/batch-system/src/lib.rs
@@ -13,8 +13,8 @@ pub mod test_runner;
 
 pub use self::{
     batch::{
-        create_system, BatchRouter, BatchSystem, FsmTypes, HandleResult, HandlerBuilder,
-        PollHandler, Poller, PoolState,
+        BatchRouter, BatchSystem, FsmTypes, HandleResult, HandlerBuilder, PollHandler, Poller,
+        PoolState, create_system,
     },
     config::Config,
     fsm::{Fsm, FsmScheduler, Priority},
diff --git a/components/batch-system/src/mailbox.rs b/components/batch-system/src/mailbox.rs
index 869031392af..024a275cd49 100644
--- a/components/batch-system/src/mailbox.rs
+++ b/components/batch-system/src/mailbox.rs
@@ -3,7 +3,7 @@
 // #[PerformanceCriticalPath]
 use std::{
     borrow::Cow,
-    sync::{atomic::AtomicUsize, Arc},
+    sync::{Arc, atomic::AtomicUsize},
 };
 
 use crossbeam::channel::{SendError, TrySendError};
diff --git a/components/batch-system/src/router.rs b/components/batch-system/src/router.rs
index 4f886fe3b3d..5c1cb92d7ca 100644
--- a/components/batch-system/src/router.rs
+++ b/components/batch-system/src/router.rs
@@ -2,13 +2,13 @@
 
 // #[PerformanceCriticalPath]
 use std::sync::{
-    atomic::{AtomicBool, AtomicUsize, Ordering},
     Arc,
+    atomic::{AtomicBool, AtomicUsize, Ordering},
 };
 
 use crossbeam::channel::{SendError, TrySendError};
 use dashmap::DashMap;
-use tikv_util::{debug, info, time::Instant, Either};
+use tikv_util::{Either, debug, info, time::Instant};
 
 use crate::{
     fsm::{Fsm, FsmScheduler},
@@ -102,7 +102,7 @@ where
     where
         F: FnMut(&BasicMailbox<N>) -> Option<R>,
     {
-        let mailbox = match self.normals.get_mut(&addr) {
+        let mailbox = match self.normals.get(&addr) {
             Some(mailbox) => mailbox,
             None => {
                 return CheckDoResult::NotExist;
diff --git a/components/batch-system/src/scheduler.rs b/components/batch-system/src/scheduler.rs
index 12db92b8fa7..a9289cfbd34 100644
--- a/components/batch-system/src/scheduler.rs
+++ b/components/batch-system/src/scheduler.rs
@@ -5,8 +5,8 @@ use resource_control::channel::Sender;
 use tikv_util::{time::Instant, warn};
 
 use crate::{
-    fsm::{Fsm, FsmScheduler, Priority},
     FsmTypes,
+    fsm::{Fsm, FsmScheduler, Priority},
 };
 pub struct NormalScheduler<N: Fsm, C: Fsm> {
     pub(crate) sender: Sender<FsmTypes<N, C>>,
diff --git a/components/batch-system/src/test_runner.rs b/components/batch-system/src/test_runner.rs
index 7723fa88882..bcbdfbc2a27 100644
--- a/components/batch-system/src/test_runner.rs
+++ b/components/batch-system/src/test_runner.rs
@@ -6,8 +6,8 @@ use std::{
     borrow::Cow,
     ops::DerefMut,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc, Mutex,
+        atomic::{AtomicUsize, Ordering},
     },
 };
 
diff --git a/components/batch-system/tests/cases/batch.rs b/components/batch-system/tests/cases/batch.rs
index dc13affc363..9246edffe0f 100644
--- a/components/batch-system/tests/cases/batch.rs
+++ b/components/batch-system/tests/cases/batch.rs
@@ -1,7 +1,7 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::AtomicUsize, Arc},
+    sync::{Arc, atomic::AtomicUsize},
     thread::sleep,
     time::Duration,
 };
diff --git a/components/batch-system/tests/cases/router.rs b/components/batch-system/tests/cases/router.rs
index 66d0770d544..b5dc0688d77 100644
--- a/components/batch-system/tests/cases/router.rs
+++ b/components/batch-system/tests/cases/router.rs
@@ -1,7 +1,7 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::*, Arc},
+    sync::{Arc, atomic::*},
     time::Duration,
 };
 
diff --git a/components/causal_ts/src/lib.rs b/components/causal_ts/src/lib.rs
index ab57fbf734f..fa34b032f14 100644
--- a/components/causal_ts/src/lib.rs
+++ b/components/causal_ts/src/lib.rs
@@ -1,7 +1,5 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
-#![feature(div_duration)]
-
 #[macro_use]
 extern crate tikv_util;
 
@@ -42,8 +40,8 @@ pub enum CausalTsProviderImpl {
 
 pub mod tests {
     use std::sync::{
-        atomic::{AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicU64, Ordering},
     };
 
     use super::*;
diff --git a/components/causal_ts/src/tso.rs b/components/causal_ts/src/tso.rs
index 51f1824f7a6..b4527bd95b7 100644
--- a/components/causal_ts/src/tso.rs
+++ b/components/causal_ts/src/tso.rs
@@ -2,8 +2,8 @@
 
 //! ## The algorithm to make the TSO cache tolerate failure of TSO service
 //!
-//! 1. The expected total size (in duration) of TSO cache is specified by
-//! config item `causal-ts.alloc-ahead-buffer`.
+//! 1. The expected total size (in duration) of TSO cache is specified by config
+//!    item `causal-ts.alloc-ahead-buffer`.
 //!
 //! 2. Count usage of TSO on every renew interval.
 //!
@@ -11,10 +11,10 @@
 //! causal-ts.renew-interval`.
 //!
 //! 4. Then `tso_usage x cache_multiplier` is the expected number of TSO should
-//! be cached.
+//!    be cached.
 //!
 //! 5. And `tso_usage x cache_multiplier - tso_remain` is the expected number of
-//! TSO to be requested from TSO service (if it's not a flush).
+//!    TSO to be requested from TSO service (if it's not a flush).
 //!
 //! Others:
 //! * `cache_multiplier` is also used as capacity of TSO batch list, as we
@@ -25,8 +25,8 @@ use std::{
     collections::BTreeMap,
     error, result,
     sync::{
-        atomic::{AtomicI32, AtomicU32, AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicI32, AtomicU32, AtomicU64, Ordering},
     },
 };
 
@@ -47,9 +47,9 @@ use tokio::sync::{
 use txn_types::TimeStamp;
 
 use crate::{
+    CausalTsProvider,
     errors::{Error, Result},
     metrics::*,
-    CausalTsProvider,
 };
 
 /// Renew on every 100ms, to adjust batch size rapidly enough.
@@ -131,11 +131,11 @@ impl TsoBatch {
 /// `TsoBatchList` is a ordered list of `TsoBatch`. It aims to:
 ///
 /// 1. Cache more number of TSO to improve high availability. See issue #12794.
-/// `TsoBatch` can only cache at most 262144 TSO as logical clock is 18 bits.
+///    `TsoBatch` can only cache at most 262144 TSO as logical clock is 18 bits.
 ///
 /// 2. Fully utilize cached TSO when some regions require latest TSO (e.g. in
-/// the scenario of leader transfer). Other regions without the requirement can
-/// still use older TSO cache.
+///    the scenario of leader transfer). Other regions without the requirement
+///    can still use older TSO cache.
 #[derive(Default, Debug)]
 pub struct TsoBatchList {
     inner: RwLock<TsoBatchListInner>,
@@ -157,11 +157,11 @@ pub struct TsoBatchList {
 /// The reasons why `crossbeam_skiplist::SkipMap` is not chosen:
 ///
 /// 1. In `flush()` procedure, a reader of `SkipMap` can still acquire a batch
-/// after the it is removed, which would violate the causality requirement.
-/// The `RwLock<BTreeMap>` avoid this scenario by lock synchronization.
+///    after the it is removed, which would violate the causality requirement.
+///    The `RwLock<BTreeMap>` avoid this scenario by lock synchronization.
 ///
 /// 2. It is a scenario with much more reads than writes. The `RwLock` would not
-/// be less efficient than lock free implementation.
+///    be less efficient than lock free implementation.
 type TsoBatchListInner = BTreeMap<u64, TsoBatch>;
 
 impl TsoBatchList {
@@ -423,11 +423,10 @@ impl<C: PdClient + 'static> BatchTsoProvider<C> {
             Ok(ts) => {
                 tso_batch_list
                     .push(new_batch_size, ts, need_flush)
-                    .map_err(|e| {
+                    .inspect_err(|_e| {
                         if need_flush {
                             tso_batch_list.flush();
                         }
-                        e
                     })?;
                 debug!("BatchTsoProvider::renew_tso_batch";
                     "tso_batch_list.remain" => tso_batch_list.remain(), "ts" => ?ts);
diff --git a/components/cdc/benches/cdc_event.rs b/components/cdc/benches/cdc_event.rs
index 1ea57f5c703..c23852149b1 100644
--- a/components/cdc/benches/cdc_event.rs
+++ b/components/cdc/benches/cdc_event.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
 use cdc::CdcEvent;
-use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{BenchmarkId, Criterion, black_box, criterion_group, criterion_main};
 use kvproto::cdcpb::ResolvedTs;
 use protobuf::Message;
 
diff --git a/components/cdc/src/channel.rs b/components/cdc/src/channel.rs
index 98520dc7b02..521fb90527b 100644
--- a/components/cdc/src/channel.rs
+++ b/components/cdc/src/channel.rs
@@ -3,19 +3,20 @@
 use std::{
     fmt,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     },
     time::Duration,
 };
 
 use futures::{
+    SinkExt, Stream, StreamExt,
     channel::mpsc::{
-        channel as bounded, unbounded, Receiver, SendError as FuturesSendError, Sender,
-        TrySendError, UnboundedReceiver, UnboundedSender,
+        Receiver, SendError as FuturesSendError, Sender, TrySendError, UnboundedReceiver,
+        UnboundedSender, channel as bounded, unbounded,
     },
     executor::block_on,
-    stream, SinkExt, Stream, StreamExt,
+    stream,
 };
 use grpcio::WriteFlags;
 use kvproto::cdcpb::{ChangeDataEvent, Event, ResolvedTs};
@@ -386,8 +387,13 @@ impl<'a> Drain {
         })
     }
 
-    // Forwards contents to the sink, simulates StreamExt::forward.
-    pub async fn forward<S, E>(&'a mut self, sink: &mut S) -> Result<(), E>
+    // Forwards contents to the sink with time tracking, simulates
+    // StreamExt::forward.
+    pub async fn forward<S, E>(
+        &'a mut self,
+        sink: &mut S,
+        last_flush_time: Option<&crossbeam::atomic::AtomicCell<std::time::Instant>>,
+    ) -> Result<(), E>
     where
         S: futures::Sink<(ChangeDataEvent, WriteFlags), Error = E> + Unpin,
     {
@@ -415,6 +421,12 @@ impl<'a> Drain {
                 sink.feed((e, write_flags)).await?;
             }
             sink.flush().await?;
+            #[cfg(feature = "failpoints")]
+            sleep_after_sink_flush().await;
+            // Update last flush time if provided
+            if let Some(time_tracker) = last_flush_time {
+                time_tracker.store(std::time::Instant::now());
+            }
             total_event_bytes.inc_by(event_bytes as u64);
             total_resolved_ts_bytes.inc_by(resolved_ts_bytes as u64);
         }
@@ -422,6 +434,21 @@ impl<'a> Drain {
     }
 }
 
+#[cfg(feature = "failpoints")]
+async fn sleep_after_sink_flush() {
+    let should_sleep = || {
+        fail::fail_point!("cdc_sleep_after_sink_flush", |_| true);
+        false
+    };
+    if !should_sleep() {
+        return;
+    }
+    info!("inside sleep_after_sink_flush failpoint, sleep 30 seconds!");
+    let dur = Duration::from_secs(30);
+    let timer = tikv_util::timer::GLOBAL_TIMER_HANDLE.delay(std::time::Instant::now() + dur);
+    let _ = futures::compat::Compat01As03::new(timer).await;
+}
+
 impl Drop for Drain {
     fn drop(&mut self) {
         self.bounded_receiver.close();
@@ -459,13 +486,13 @@ where
 mod tests {
     use std::{
         assert_matches::assert_matches,
-        sync::{mpsc, Arc},
+        sync::{Arc, mpsc},
         time::Duration,
     };
 
     use futures::executor::block_on;
     use kvproto::cdcpb::{
-        ChangeDataEvent, Event, EventEntries, EventRow, Event_oneof_event, ResolvedTs,
+        ChangeDataEvent, Event, Event_oneof_event, EventEntries, EventRow, ResolvedTs,
     };
 
     use super::*;
@@ -567,7 +594,7 @@ mod tests {
             let (mut tx, mut rx) = unbounded();
             let runtime = tokio::runtime::Runtime::new().unwrap();
             runtime.spawn(async move {
-                drain.forward(&mut tx).await.unwrap();
+                drain.forward(&mut tx, None).await.unwrap();
             });
             let timeout = Duration::from_millis(100);
             assert!(recv_timeout(&mut rx, timeout).unwrap().is_some());
diff --git a/components/cdc/src/delegate.rs b/components/cdc/src/delegate.rs
index db5d67f5887..d0bc075d525 100644
--- a/components/cdc/src/delegate.rs
+++ b/components/cdc/src/delegate.rs
@@ -7,8 +7,8 @@ use std::{
     result::Result as StdResult,
     string::String,
     sync::{
-        atomic::{AtomicBool, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicUsize, Ordering},
     },
     time::Duration,
 };
@@ -18,21 +18,21 @@ use collections::HashMap;
 use crossbeam::atomic::AtomicCell;
 use kvproto::{
     cdcpb::{
-        ChangeDataRequestKvApi, Error as EventError, Event, EventEntries, EventLogType, EventRow,
-        EventRowOpType, Event_oneof_event,
+        ChangeDataRequestKvApi, Error as EventError, Event, Event_oneof_event, EventEntries,
+        EventLogType, EventRow, EventRowOpType,
     },
     kvrpcpb::ExtraOp as TxnExtraOp,
     metapb::{Region, RegionEpoch},
     raft_cmdpb::{AdminCmdType, AdminRequest, AdminResponse, CmdType, PutRequest, Request},
 };
 use raftstore::{
+    Error as RaftStoreError,
     coprocessor::{Cmd, CmdBatch, ObserveHandle},
     store::util::compare_region_epoch,
-    Error as RaftStoreError,
 };
-use tikv::storage::{txn::TxnEntry, Statistics};
+use tikv::storage::{Statistics, txn::TxnEntry};
 use tikv_util::{
-    debug, info,
+    debug, error, info,
     memory::{HeapSize, MemoryQuota},
     time::Instant,
     warn,
@@ -40,14 +40,14 @@ use tikv_util::{
 use txn_types::{Key, Lock, LockType, TimeStamp, WriteBatchFlags, WriteRef, WriteType};
 
 use crate::{
-    channel::{CdcEvent, SendError, Sink, CDC_EVENT_MAX_BYTES},
+    Error, Result,
+    channel::{CDC_EVENT_MAX_BYTES, CdcEvent, SendError, Sink},
     endpoint::Advance,
     initializer::KvEntry,
     metrics::*,
     old_value::{OldValueCache, OldValueCallback},
     service::{Conn, ConnId, FeatureGate, RequestId},
     txn_source::TxnSource,
-    Error, Result,
 };
 
 static DOWNSTREAM_ID_ALLOC: AtomicUsize = AtomicUsize::new(0);
@@ -369,10 +369,25 @@ impl Delegate {
                 CDC_PENDING_BYTES_GAUGE.add(bytes as _);
                 locks.push(PendingLock::Track { key, start_ts });
             }
-            LockTracker::Prepared { locks, .. } => match locks.entry(key) {
+            LockTracker::Prepared { locks, .. } => match locks.entry(key.clone()) {
                 BTreeMapEntry::Occupied(mut x) => {
-                    assert_eq!(x.get().ts, start_ts.ts);
+                    if x.get().ts != start_ts.ts {
+                        error!("[for debug] cdc push_lock found lock with same key but different start_ts";
+                            "old_generation" => ?x.get().generation,
+                            "new_generation" => ?start_ts.generation,
+                            "old_start_ts" => ?x.get().ts,
+                            "new_start_ts" => ?start_ts.ts,
+                            "key" => ?key,
+                            "region_id" => self.region_id,
+                        );
+                    }
+                    // There could be stale locks in the lock_tracker due to scenarios such as the
+                    // overlapped write/rollback issue (#18498). We can safely
+                    // ignore such stale locks, while keeping the invariant of
+                    // monotonically increasing start_ts and generation.
+                    assert!(x.get().ts <= start_ts.ts);
                     assert!(x.get().generation <= start_ts.generation);
+                    x.get_mut().ts = start_ts.ts;
                     x.get_mut().generation = start_ts.generation;
                 }
                 BTreeMapEntry::Vacant(x) => {
@@ -397,13 +412,21 @@ impl Delegate {
                 locks.push(PendingLock::Untrack { key, start_ts });
             }
             LockTracker::Prepared { locks, .. } => {
-                if let BTreeMapEntry::Occupied(x) = locks.entry(key) {
+                if let BTreeMapEntry::Occupied(x) = locks.entry(key.clone()) {
                     if x.get().ts == start_ts {
                         let (key, _) = x.remove_entry();
                         let bytes = key.approximate_heap_size();
                         self.memory_quota.free(bytes);
                         CDC_PENDING_BYTES_GAUGE.sub(bytes as _);
                         lock_count_modify = -1;
+                    } else {
+                        info!("[for debug] cdc pop_lock found lock with same key but different start_ts";
+                            "generation" => ?x.get().generation,
+                            "old_start_ts" => ?x.get().ts,
+                            "new_start_ts" => ?start_ts,
+                            "key" => ?key,
+                            "region_id" => self.region_id,
+                        );
                     }
                 }
             }
@@ -437,9 +460,11 @@ impl Delegate {
                     BTreeMapEntry::Vacant(x) => {
                         x.insert(start_ts);
                     }
-                    BTreeMapEntry::Occupied(x) => {
-                        assert_eq!(x.get().ts, start_ts.ts);
+                    BTreeMapEntry::Occupied(mut x) => {
+                        assert!(x.get().ts <= start_ts.ts);
                         assert!(x.get().generation <= start_ts.generation);
+                        x.get_mut().ts = start_ts.ts;
+                        x.get_mut().generation = start_ts.generation;
                     }
                 },
                 PendingLock::Untrack { key, start_ts } => {
@@ -1742,7 +1767,7 @@ mod tests {
         let (mut tx, mut rx) = futures::channel::mpsc::unbounded();
         let runtime = tokio::runtime::Runtime::new().unwrap();
         runtime.spawn(async move {
-            drain.forward(&mut tx).await.unwrap();
+            drain.forward(&mut tx, None).await.unwrap();
         });
         let (e, _) = recv_timeout(&mut rx, std::time::Duration::from_secs(5))
             .unwrap()
@@ -1809,7 +1834,7 @@ mod tests {
         let (mut tx, mut rx) = futures::channel::mpsc::unbounded();
         let runtime = tokio::runtime::Runtime::new().unwrap();
         runtime.spawn(async move {
-            drain.forward(&mut tx).await.unwrap();
+            drain.forward(&mut tx, None).await.unwrap();
         });
         let (e, _) = recv_timeout(&mut rx, std::time::Duration::from_secs(5))
             .unwrap()
diff --git a/components/cdc/src/endpoint.rs b/components/cdc/src/endpoint.rs
index 0100fd1e35c..07878aab667 100644
--- a/components/cdc/src/endpoint.rs
+++ b/components/cdc/src/endpoint.rs
@@ -5,8 +5,8 @@ use std::{
     collections::{BTreeMap, BinaryHeap},
     fmt,
     sync::{
-        atomic::{AtomicBool, AtomicIsize, Ordering},
         Arc, Mutex as StdMutex,
+        atomic::{AtomicBool, AtomicIsize, Ordering},
     },
     time::Duration,
 };
@@ -35,11 +35,11 @@ use raftstore::{
     router::CdcHandle,
     store::fsm::store::StoreRegionMeta,
 };
-use resolved_ts::{resolve_by_raft, LeadershipResolver};
+use resolved_ts::{LeadershipResolver, resolve_by_raft};
 use security::SecurityManager;
 use tikv::{
     config::{CdcConfig, ResolvedTsConfig},
-    storage::{kv::LocalTablets, Statistics},
+    storage::{Statistics, kv::LocalTablets},
 };
 use tikv_util::{
     debug, defer, error, impl_display_as_debug, info,
@@ -59,13 +59,13 @@ use tokio::{
 use txn_types::{Key, TimeStamp, TxnExtra, TxnExtraScheduler};
 
 use crate::{
+    CdcObserver, Error,
     channel::{CdcEvent, SendError},
-    delegate::{on_init_downstream, Delegate, Downstream, DownstreamId, DownstreamState, MiniLock},
+    delegate::{Delegate, Downstream, DownstreamId, DownstreamState, MiniLock, on_init_downstream},
     initializer::Initializer,
     metrics::*,
     old_value::{OldValueCache, OldValueCallback},
-    service::{validate_kv_api, Conn, ConnId, FeatureGate, RequestId},
-    CdcObserver, Error,
+    service::{Conn, ConnId, FeatureGate, RequestId, validate_kv_api},
 };
 
 const FEATURE_RESOLVED_TS_STORE: Feature = Feature::require(5, 0, 0);
@@ -640,25 +640,25 @@ impl<T: 'static + CdcHandle<E>, E: KvEngine, S: StoreRegionMeta> Endpoint<T, E,
 
         // Maybe the cache will be lost due to smaller capacity,
         // but it is acceptable.
-        if change.get("old_value_cache_memory_quota").is_some() {
+        if change.contains_key("old_value_cache_memory_quota") {
             self.old_value_cache
                 .resize(self.config.old_value_cache_memory_quota);
         }
 
         // Maybe the limit will be exceeded for a while after the concurrency becomes
         // smaller, but it is acceptable.
-        if change.get("incremental_scan_concurrency").is_some() {
+        if change.contains_key("incremental_scan_concurrency") {
             self.scan_concurrency_semaphore =
                 Arc::new(Semaphore::new(self.config.incremental_scan_concurrency))
         }
 
-        if change.get("sink_memory_quota").is_some() {
+        if change.contains_key("sink_memory_quota") {
             self.sink_memory_quota
                 .set_capacity(self.config.sink_memory_quota.0 as usize);
             CDC_SINK_CAP.set(self.sink_memory_quota.capacity() as i64);
         }
 
-        if change.get("incremental_scan_speed_limit").is_some() {
+        if change.contains_key("incremental_scan_speed_limit") {
             let new_speed_limit = if self.config.incremental_scan_speed_limit.0 > 0 {
                 self.config.incremental_scan_speed_limit.0 as f64
             } else {
@@ -667,7 +667,7 @@ impl<T: 'static + CdcHandle<E>, E: KvEngine, S: StoreRegionMeta> Endpoint<T, E,
 
             self.scan_speed_limiter.set_speed_limit(new_speed_limit);
         }
-        if change.get("incremental_fetch_speed_limit").is_some() {
+        if change.contains_key("incremental_fetch_speed_limit") {
             let new_speed_limit = if self.config.incremental_fetch_speed_limit.0 > 0 {
                 self.config.incremental_fetch_speed_limit.0 as f64
             } else {
@@ -714,19 +714,26 @@ impl<T: 'static + CdcHandle<E>, E: KvEngine, S: StoreRegionMeta> Endpoint<T, E,
         fail_point!("cdc_before_handle_deregister", |_| {});
         match deregister {
             Deregister::Conn(conn_id) => {
-                let conn = self.connections.remove(&conn_id).unwrap();
-                conn.iter_downstreams(|_, region_id, downstream_id, _| {
-                    self.deregister_downstream(region_id, downstream_id, None);
-                });
+                if let Some(conn) = self.connections.remove(&conn_id) {
+                    conn.iter_downstreams(|_, region_id, downstream_id, _| {
+                        self.deregister_downstream(region_id, downstream_id, None);
+                    });
+                } else {
+                    info!("cdc connection already deregistered"; "conn_id" => ?conn_id);
+                }
             }
             Deregister::Request {
                 conn_id,
                 request_id,
             } => {
-                let conn = self.connections.get_mut(&conn_id).unwrap();
-                for (region_id, downstream) in conn.unsubscribe_request(request_id) {
-                    let err = Some(Error::Other("region not found".into()));
-                    self.deregister_downstream(region_id, downstream, err);
+                if let Some(conn) = self.connections.get_mut(&conn_id) {
+                    for (region_id, downstream) in conn.unsubscribe_request(request_id) {
+                        let err = Some(Error::Other("region not found".into()));
+                        self.deregister_downstream(region_id, downstream, err);
+                    }
+                } else {
+                    info!("cdc connection already deregistered for request deregister"; 
+                    "request_id" => ?request_id, "conn_id" => ?conn_id);
                 }
             }
             Deregister::Region {
@@ -734,10 +741,14 @@ impl<T: 'static + CdcHandle<E>, E: KvEngine, S: StoreRegionMeta> Endpoint<T, E,
                 request_id,
                 region_id,
             } => {
-                let conn = self.connections.get_mut(&conn_id).unwrap();
-                if let Some(downstream) = conn.unsubscribe(request_id, region_id) {
-                    let err = Some(Error::Other("region not found".into()));
-                    self.deregister_downstream(region_id, downstream, err);
+                if let Some(conn) = self.connections.get_mut(&conn_id) {
+                    if let Some(downstream) = conn.unsubscribe(request_id, region_id) {
+                        let err = Some(Error::Other("region not found".into()));
+                        self.deregister_downstream(region_id, downstream, err);
+                    }
+                } else {
+                    info!("cdc connection already deregistered for region deregister";
+                      "request_id" => ?request_id, "region_id" => region_id, "conn_id" => ?conn_id);
                 }
             }
             Deregister::Downstream {
@@ -863,7 +874,7 @@ impl<T: 'static + CdcHandle<E>, E: KvEngine, S: StoreRegionMeta> Endpoint<T, E,
         let txn_extra_op = match self.store_meta.lock().unwrap().reader(region_id) {
             Some(reader) => reader.txn_extra_op.clone(),
             None => {
-                error!("cdc register for a not found region"; "region_id" => region_id);
+                warn!("cdc register for a not found region"; "region_id" => region_id);
                 let mut err_event = EventError::default();
                 err_event.mut_region_not_found().region_id = region_id;
                 let _ = downstream.sink_error_event(region_id, err_event);
@@ -974,7 +985,7 @@ impl<T: 'static + CdcHandle<E>, E: KvEngine, S: StoreRegionMeta> Endpoint<T, E,
                 }
                 Err(e) => {
                     CDC_SCAN_TASKS.with_label_values(&["abort"]).inc();
-                    error!(
+                    warn!(
                         "cdc initialize fail: {}", e; "region_id" => region_id,
                         "conn_id" => ?init.conn_id, "request_id" => ?init.request_id,
                     );
@@ -1256,7 +1267,7 @@ impl<T: 'static + CdcHandle<E>, E: KvEngine, S: StoreRegionMeta + Send> Runnable
                     _ => return,
                 }
                 if let Err(e) = sink.unbounded_send(incremental_scan_barrier, true) {
-                    error!("cdc failed to schedule barrier for delta before delta scan";
+                    warn!("cdc failed to schedule barrier for delta before delta scan";
                         "region_id" => region_id,
                         "observe_id" => ?observe_id,
                         "downstream_id" => ?downstream_id,
@@ -1383,23 +1394,23 @@ mod tests {
     use raftstore::{
         errors::{DiscardReason, Error as RaftStoreError},
         router::{CdcRaftRouter, RaftStoreRouter},
-        store::{fsm::StoreMeta, msg::CasualMessage, PeerMsg, ReadDelegate},
+        store::{PeerMsg, ReadDelegate, fsm::StoreMeta, msg::CasualMessage},
     };
     use test_pd_client::TestPdClient;
     use test_raftstore::MockRaftStoreRouter;
     use tikv::{
         server::DEFAULT_CLUSTER_ID,
-        storage::{kv::Engine, TestEngineBuilder},
+        storage::{TestEngineBuilder, kv::Engine},
     };
     use tikv_util::{
         config::{ReadableDuration, ReadableSize},
-        worker::{dummy_scheduler, ReceiverWrapper},
+        worker::{ReceiverWrapper, dummy_scheduler},
     };
 
     use super::*;
     use crate::{
         channel,
-        delegate::{post_init_downstream, ObservedRange},
+        delegate::{ObservedRange, post_init_downstream},
         recv_timeout,
     };
 
diff --git a/components/cdc/src/initializer.rs b/components/cdc/src/initializer.rs
index 7017cf36ba3..f575ef3fab4 100644
--- a/components/cdc/src/initializer.rs
+++ b/components/cdc/src/initializer.rs
@@ -2,18 +2,19 @@
 use std::{
     collections::BTreeMap,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     },
     time::Duration,
 };
 
 use api_version::ApiV2;
 use crossbeam::atomic::AtomicCell;
-use engine_rocks::{ReadPerfContext, ReadPerfInstant, PROP_MAX_TS};
+use engine_rocks::{PROP_MAX_TS, ReadPerfContext, ReadPerfInstant};
 use engine_traits::{
-    IterOptions, KvEngine, Range, Snapshot as EngineSnapshot, TablePropertiesCollection,
-    TablePropertiesExt, UserCollectedProperties, CF_DEFAULT, CF_WRITE, DATA_KEY_PREFIX_LEN,
+    CF_DEFAULT, CF_WRITE, DATA_KEY_PREFIX_LEN, IterOptions, KvEngine, Range,
+    Snapshot as EngineSnapshot, TableProperties, TablePropertiesCollection,
+    UserCollectedProperties,
 };
 use fail::fail_point;
 use keys::{data_end_key, data_key};
@@ -31,36 +32,35 @@ use raftstore::{
     },
 };
 use tikv::storage::{
+    Statistics,
     kv::Snapshot,
     mvcc::{DeltaScanner, MvccReader, ScannerBuilder},
     raw::raw_mvcc::{RawMvccIterator, RawMvccSnapshot},
     txn::{TxnEntry, TxnEntryScanner},
-    Statistics,
 };
 use tikv_kv::{Iterator, ScanMode};
 use tikv_util::{
-    box_err,
+    Either, box_err,
     codec::number,
     debug, defer, error, info,
-    sys::inspector::{self_thread_inspector, ThreadInspector},
-    time::{duration_to_sec, Instant, Limiter},
+    sys::inspector::{ThreadInspector, self_thread_inspector},
+    time::{Instant, Limiter, duration_to_sec},
     warn,
     worker::Scheduler,
-    Either,
 };
 use tokio::sync::Semaphore;
 use txn_types::{Key, KvPair, LockType, OldValue, TimeStamp};
 
 use crate::{
+    Error, Result, Task,
     channel::CdcEvent,
     delegate::{
-        post_init_downstream, Delegate, DownstreamId, DownstreamState, MiniLock, ObservedRange,
+        Delegate, DownstreamId, DownstreamState, MiniLock, ObservedRange, post_init_downstream,
     },
     endpoint::Deregister,
     metrics::*,
-    old_value::{near_seek_old_value, OldValueCursors},
+    old_value::{OldValueCursors, near_seek_old_value},
     service::{ConnId, RequestId},
-    Error, Result, Task,
 };
 
 #[derive(Copy, Clone, Debug, Default)]
@@ -523,7 +523,7 @@ impl<E: KvEngine> Initializer<E> {
             .send_all(events, self.scan_truncated.clone())
             .await
         {
-            error!("cdc send scan event failed"; "req_id" => ?self.request_id);
+            warn!("cdc send scan event failed"; "err" => ?e, "req_id" => ?self.request_id);
             return Err(Error::Sink(e));
         }
 
@@ -606,12 +606,16 @@ impl<E: KvEngine> Initializer<E> {
 
         let hint_min_ts = self.checkpoint_ts.into_inner();
         let (mut total_count, mut filtered_count, mut tables) = (0, 0, 0);
-        collection.iter_user_collected_properties(|prop| {
+        collection.iter_table_properties(|table_prop| {
+            let prop = table_prop.get_user_collected_properties();
             tables += 1;
             if let Some((_, keys)) = prop.approximate_size_and_keys(&start_key, &end_key) {
                 total_count += keys;
-                if Self::parse_u64_prop(prop, PROP_MAX_TS)
-                    .map_or(false, |max_ts| max_ts < hint_min_ts)
+
+                if prop
+                    .get(PROP_MAX_TS.as_bytes())
+                    .and_then(|mut x| number::decode_u64(&mut x).ok())
+                    .is_some_and(|max_ts| max_ts < hint_min_ts)
                 {
                     filtered_count += keys;
                 }
@@ -629,14 +633,6 @@ impl<E: KvEngine> Initializer<E> {
             "tables" => tables);
         use_ts_filter
     }
-
-    fn parse_u64_prop(
-        prop: &<<E as TablePropertiesExt>::TablePropertiesCollection as TablePropertiesCollection>::UserCollectedProperties,
-        field: &str,
-    ) -> Option<u64> {
-        prop.get(field.as_bytes())
-            .and_then(|mut x| number::decode_u64(&mut x).ok())
-    }
 }
 
 #[cfg(test)]
@@ -645,18 +641,18 @@ mod tests {
         collections::BTreeMap,
         fmt::Display,
         sync::{
-            atomic::AtomicBool,
-            mpsc::{channel, sync_channel, Receiver, RecvTimeoutError, Sender},
             Arc,
+            atomic::AtomicBool,
+            mpsc::{Receiver, RecvTimeoutError, Sender, channel, sync_channel},
         },
         time::Duration,
     };
 
     use engine_rocks::{BlobRunMode, RocksEngine};
-    use engine_traits::{MiscExt, CF_WRITE};
-    use futures::{executor::block_on, StreamExt};
+    use engine_traits::{CF_WRITE, MiscExt};
+    use futures::{StreamExt, executor::block_on};
     use kvproto::{
-        cdcpb::{EventLogType, Event_oneof_event},
+        cdcpb::{Event_oneof_event, EventLogType},
         errorpb::Error as ErrorHeader,
     };
     use raftstore::{coprocessor::ObserveHandle, router::CdcRaftRouter};
@@ -664,12 +660,12 @@ mod tests {
     use tikv::{
         config::DbConfig,
         storage::{
+            TestEngineBuilder,
             kv::Engine,
             txn::tests::{
                 must_acquire_pessimistic_lock, must_commit, must_prewrite_delete,
                 must_prewrite_put, must_prewrite_put_with_txn_soucre,
             },
-            TestEngineBuilder,
         },
     };
     use tikv_util::{
diff --git a/components/cdc/src/lib.rs b/components/cdc/src/lib.rs
index 64f110f5c45..3498fbdba00 100644
--- a/components/cdc/src/lib.rs
+++ b/components/cdc/src/lib.rs
@@ -15,7 +15,7 @@ mod old_value;
 mod service;
 mod txn_source;
 
-pub use channel::{recv_timeout, CdcEvent};
+pub use channel::{CdcEvent, recv_timeout};
 pub use config::CdcConfigManager;
 pub use delegate::Delegate;
 pub use endpoint::{CdcTxnExtraScheduler, Endpoint, Task, Validate};
diff --git a/components/cdc/src/metrics.rs b/components/cdc/src/metrics.rs
index de13f29fa44..49df95533dc 100644
--- a/components/cdc/src/metrics.rs
+++ b/components/cdc/src/metrics.rs
@@ -236,6 +236,11 @@ lazy_static! {
         exponential_buckets(0.01, 2.0, 17).unwrap(),
     )
     .unwrap();
+
+    pub static ref CDC_ABORTED_CONNECTIONS: IntCounter = register_int_counter!(
+        "tikv_cdc_aborted_connections",
+        "Total number of aborted connections"
+    ).unwrap();
 }
 
 thread_local! {
diff --git a/components/cdc/src/observer.rs b/components/cdc/src/observer.rs
index de898a8ae72..7a3e0d63685 100644
--- a/components/cdc/src/observer.rs
+++ b/components/cdc/src/observer.rs
@@ -7,14 +7,14 @@ use engine_traits::KvEngine;
 use fail::fail_point;
 use kvproto::metapb::{Peer, Region};
 use raft::StateRole;
-use raftstore::{coprocessor::*, store::RegionSnapshot, Error as RaftStoreError};
+use raftstore::{Error as RaftStoreError, coprocessor::*, store::RegionSnapshot};
 use tikv::storage::Statistics;
 use tikv_util::{error, memory::MemoryQuota, warn, worker::Scheduler};
 
 use crate::{
+    Error as CdcError,
     endpoint::{Deregister, Task},
     old_value::{self, OldValueCache},
-    Error as CdcError,
 };
 
 /// An Observer for CDC.
diff --git a/components/cdc/src/old_value.rs b/components/cdc/src/old_value.rs
index 1ab5a3a7510..bbb5de229a6 100644
--- a/components/cdc/src/old_value.rs
+++ b/components/cdc/src/old_value.rs
@@ -2,22 +2,22 @@
 
 use std::ops::{Bound, Deref};
 
-use engine_traits::{ReadOptions, CF_DEFAULT, CF_WRITE};
+use engine_traits::{CF_DEFAULT, CF_WRITE, ReadOptions};
 use getset::CopyGetters;
 use tikv::storage::{
-    mvcc::near_load_data_by_write, Cursor, CursorBuilder, ScanMode, Snapshot as EngineSnapshot,
-    Statistics,
+    Cursor, CursorBuilder, ScanMode, Snapshot as EngineSnapshot, Statistics,
+    mvcc::near_load_data_by_write,
 };
 use tikv_kv::Snapshot;
 use tikv_util::{
+    Either,
     config::ReadableSize,
     lru::{LruCache, SizePolicy},
     time::Instant,
-    Either,
 };
 use txn_types::{Key, MutationType, OldValue, TimeStamp, Value, WriteRef, WriteType};
 
-use crate::{metrics::*, Result};
+use crate::{Result, metrics::*};
 
 pub(crate) type OldValueCallback = Box<
     dyn Fn(Key, TimeStamp, &mut OldValueCache, &mut Statistics) -> Result<Option<Vec<u8>>> + Send,
@@ -534,7 +534,10 @@ mod tests {
         let mut default_cursor = new_old_value_cursor(&snapshot, CF_DEFAULT);
         let mut load_default = |use_default_cursor: bool| {
             if use_default_cursor {
-                let x = unsafe { std::mem::transmute::<_, &'static mut _>(&mut default_cursor) };
+                let x = unsafe {
+                    #[allow(clippy::missing_transmute_annotations)]
+                    std::mem::transmute::<_, &'static mut _>(&mut default_cursor)
+                };
                 Either::Right(x)
             } else {
                 Either::Left(&snapshot)
@@ -548,7 +551,7 @@ mod tests {
                 let key = Key::from_raw(&raw_key).append_ts(150.into());
                 let ld = load_default(use_default_cursor);
                 let v = near_seek_old_value(&key, &mut cursor, ld, &mut stats).unwrap();
-                assert!(v.map_or(false, |x| x == value()));
+                assert!(v.is_some_and(|x| x == value()));
             }
             assert_eq!(stats.write.seek, 1);
             assert_eq!(stats.write.next, 58);
@@ -567,7 +570,7 @@ mod tests {
                 let key = Key::from_raw(&raw_key).append_ts(150.into());
                 let ld = load_default(use_default_cursor);
                 let v = near_seek_old_value(&key, &mut cursor, ld, &mut stats).unwrap();
-                assert!(v.map_or(false, |x| x == value()));
+                assert!(v.is_some_and(|x| x == value()));
             }
             assert_eq!(stats.write.seek, 2);
             assert_eq!(stats.write.next, 144);
diff --git a/components/cdc/src/service.rs b/components/cdc/src/service.rs
index 6f1a7c08d08..c41c30c51a7 100644
--- a/components/cdc/src/service.rs
+++ b/components/cdc/src/service.rs
@@ -1,31 +1,44 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::sync::{
-    atomic::{AtomicUsize, Ordering},
-    Arc,
+use std::{
+    sync::{
+        Arc,
+        atomic::{AtomicUsize, Ordering},
+    },
+    time::{Duration, Instant},
 };
 
 use collections::{HashMap, HashMapEntry};
 use crossbeam::atomic::AtomicCell;
-use futures::stream::TryStreamExt;
+use futures::{
+    compat::Stream01CompatExt,
+    stream::{StreamExt, TryStreamExt},
+};
 use grpcio::{DuplexSink, RequestStream, RpcContext, RpcStatus, RpcStatusCode};
 use kvproto::{
     cdcpb::{
-        ChangeData, ChangeDataEvent, ChangeDataRequest, ChangeDataRequestKvApi,
-        ChangeDataRequest_oneof_request,
+        ChangeData, ChangeDataEvent, ChangeDataRequest, ChangeDataRequest_oneof_request,
+        ChangeDataRequestKvApi,
     },
     kvrpcpb::ApiVersion,
 };
-use tikv_util::{error, info, memory::MemoryQuota, warn, worker::*};
+use tikv_util::{error, info, memory::MemoryQuota, timer::GLOBAL_TIMER_HANDLE, warn, worker::*};
 
 use crate::{
-    channel::{channel, Sink, CDC_CHANNLE_CAPACITY},
+    channel::{CDC_CHANNLE_CAPACITY, Sink, channel},
     delegate::{Downstream, DownstreamId, DownstreamState, ObservedRange},
     endpoint::{Deregister, Task},
+    metrics::CDC_ABORTED_CONNECTIONS,
 };
 
 static CONNECTION_ID_ALLOC: AtomicUsize = AtomicUsize::new(0);
 
+// CDC connection monitoring constants in seconds
+const CDC_WATCHDOG_CHECK_INTERVAL_SECS: u64 = 2;
+const CDC_IDLE_WARNING_THRESHOLD_SECS: u64 = 60;
+const CDC_IDLE_DEREGISTER_THRESHOLD_SECS: u64 = 60 * 20; // 20 minutes
+const CDC_MEMORY_QUOTA_ABORT_THRESHOLD: f64 = 0.999;
+
 pub fn validate_kv_api(kv_api: ChangeDataRequestKvApi, api_version: ApiVersion) -> bool {
     kv_api == ChangeDataRequestKvApi::TiDb
         || (kv_api == ChangeDataRequestKvApi::RawKv && api_version == ApiVersion::V2)
@@ -248,16 +261,22 @@ impl EventFeedHeaders {
 pub struct Service {
     scheduler: Scheduler<Task>,
     memory_quota: Arc<MemoryQuota>,
+    pool: Arc<Worker>,
 }
 
 impl Service {
     /// Create a ChangeData service.
     ///
     /// It requires a scheduler of an `Endpoint` in order to schedule tasks.
-    pub fn new(scheduler: Scheduler<Task>, memory_quota: Arc<MemoryQuota>) -> Service {
+    pub fn new(
+        scheduler: Scheduler<Task>,
+        memory_quota: Arc<MemoryQuota>,
+        pool: Arc<Worker>,
+    ) -> Service {
         Service {
             scheduler,
             memory_quota,
+            pool,
         }
     }
 
@@ -428,7 +447,8 @@ impl Service {
             };
             explicit_features = headers.features;
         }
-        info!("cdc connection created"; "downstream" => ctx.peer(), "features" => ?explicit_features);
+        info!("cdc connection created"; "downstream" => ctx.peer(),
+         "conn_id" => ?conn_id,"features" => ?explicit_features);
 
         if let Err(e) = self.scheduler.schedule(Task::OpenConn { conn }) {
             let peer = ctx.peer();
@@ -473,14 +493,125 @@ impl Service {
             }
         });
 
+        let last_flush_time = Arc::new(AtomicCell::new(Instant::now()));
+        let last_flush_time_for_forward = last_flush_time.clone();
+        let last_flush_time_for_watchdog = last_flush_time.clone();
+        let peer_for_watchdog = ctx.peer().to_string();
+
         let peer = ctx.peer();
+        let (cancel_tx, mut cancel_rx) = tokio::sync::oneshot::channel::<()>();
+
+        // Create cancelCh for eventDrain.forward exit signal
+        let (forward_exit_tx, forward_exit_rx) = tokio::sync::oneshot::channel::<()>();
+
         ctx.spawn(async move {
             #[cfg(feature = "failpoints")]
             sleep_before_drain_change_event().await;
-            if let Err(e) = event_drain.forward(&mut sink).await {
-                warn!("cdc send failed"; "error" => ?e, "downstream" => peer, "conn_id" => ?conn_id);
-            } else {
-                info!("cdc send closed"; "downstream" => peer, "conn_id" => ?conn_id);
+            tokio::select! {
+                _ = &mut cancel_rx => {
+                    warn!("cdc send cancelled"; "downstream" => peer, "conn_id" => ?conn_id);
+                    let status = RpcStatus::with_message(RpcStatusCode::UNKNOWN, "connection cancelled".to_string());
+                    let _ = sink.fail(status).await;
+                    CDC_ABORTED_CONNECTIONS.inc();
+                }
+                result = event_drain.forward(&mut sink, Some(&last_flush_time_for_forward)) => {
+                    if let Err(e) = result {
+                        warn!("cdc send failed"; "error" => ?e, "downstream" => peer, "conn_id" => ?conn_id);
+                    } else {
+                        info!("cdc send closed"; "downstream" => peer, "conn_id" => ?conn_id);
+                    }
+                    // Send signal when eventDrain.forward exits
+                    let _ = forward_exit_tx.send(());
+                }
+            }
+        });
+
+        // Start watchdog to monitor connection activity
+        Self::start_connection_watchdog(
+            self.pool.clone(),
+            last_flush_time_for_watchdog.clone(),
+            peer_for_watchdog.clone(),
+            conn_id,
+            cancel_tx,
+            forward_exit_rx,
+            self.memory_quota.clone(),
+        );
+    }
+
+    /// Start a watchdog to monitor CDC connection activity.
+    ///
+    /// This function creates a background task that periodically checks if the
+    /// connection has been idle for too long and takes appropriate action
+    /// (warning or aborting).
+    fn start_connection_watchdog(
+        pool: Arc<Worker>,
+        last_flush_time: Arc<AtomicCell<Instant>>,
+        peer: String,
+        conn_id: ConnId,
+        cancel_tx: tokio::sync::oneshot::Sender<()>,
+        mut forward_exit_rx: tokio::sync::oneshot::Receiver<()>,
+        memory_quota: Arc<MemoryQuota>,
+    ) {
+        let last_flush_time_clone = last_flush_time.clone();
+        let peer_clone = peer.clone();
+
+        // Create a custom interval task that can be stopped
+        let _ = pool.pool().spawn(async move {
+            let mut interval = GLOBAL_TIMER_HANDLE
+                .interval(
+                    Instant::now(),
+                    Duration::from_secs(CDC_WATCHDOG_CHECK_INTERVAL_SECS),
+                )
+                .compat();
+
+            loop {
+                tokio::select! {
+                    _ = &mut forward_exit_rx => {
+                        info!("cdc connection forward exit signal received, stopping watchdog");
+                        break;
+                    }
+                    _ = interval.next() => {
+                        let elapsed = last_flush_time_clone.load().elapsed();
+
+                        // Check if last flush was more than the warning threshold
+                        if elapsed > Duration::from_secs(CDC_IDLE_WARNING_THRESHOLD_SECS) {
+                            warn!("cdc connection idle too long";
+                                  "downstream" => peer_clone.clone(),
+                                  "conn_id" => ?conn_id,
+                                  "seconds_since_last_flush" => elapsed.as_secs());
+                        }
+
+                        let _idle_threshold = CDC_IDLE_DEREGISTER_THRESHOLD_SECS;
+
+                        #[cfg(feature = "failpoints")]
+                        let _idle_threshold = {
+                            let should_adjust = || {
+                                fail::fail_point!("cdc_idle_deregister_threshold", |_| true);
+                                false
+                            };
+                            if should_adjust() {
+                                5
+                            } else {
+                                CDC_IDLE_DEREGISTER_THRESHOLD_SECS
+                            }
+                        };
+
+                        // Check if last flush was more than the deregister threshold
+                        // To prevent the case that the connection idle since there are a lot of
+                        // incremental scan tasks queueing so won't send events, also check on the
+                        // memory usage, if the memory quota is almost used up, we abort the connection.
+                        if elapsed > Duration::from_secs(_idle_threshold)
+                            && memory_quota.used_ratio() >= CDC_MEMORY_QUOTA_ABORT_THRESHOLD {
+                            error!("cdc connection idle for too long, aborting connection";
+                                   "downstream" => peer_clone.clone(),
+                                   "conn_id" => ?conn_id,
+                                   "seconds_since_last_flush" => elapsed.as_secs());
+                            // Cancel the gRPC connection
+                            let _ = cancel_tx.send(());
+                            break;
+                        }
+                    }
+                }
             }
         });
     }
@@ -526,18 +657,19 @@ async fn sleep_before_drain_change_event() {
 mod tests {
     use std::{sync::Arc, time::Duration};
 
-    use futures::{executor::block_on, SinkExt};
+    use futures::{SinkExt, executor::block_on};
     use grpcio::{self, ChannelBuilder, EnvBuilder, Server, ServerBuilder, WriteFlags};
-    use kvproto::cdcpb::{create_change_data, ChangeDataClient, ResolvedTs};
+    use kvproto::cdcpb::{ChangeDataClient, ResolvedTs, create_change_data};
     use tikv_util::future::block_on_timeout;
 
     use super::*;
-    use crate::channel::{recv_timeout, CdcEvent};
+    use crate::channel::{CdcEvent, recv_timeout};
 
     fn new_rpc_suite(capacity: usize) -> (Server, ChangeDataClient, ReceiverWrapper<Task>) {
         let memory_quota = Arc::new(MemoryQuota::new(capacity));
+        let pool = Arc::new(Builder::new("cdc-watchdog-test").thread_count(1).create());
         let (scheduler, rx) = dummy_scheduler();
-        let cdc_service = Service::new(scheduler, memory_quota);
+        let cdc_service = Service::new(scheduler, memory_quota, pool);
         let env = Arc::new(EnvBuilder::new().build());
         let builder =
             ServerBuilder::new(env.clone()).register_service(create_change_data(cdc_service));
diff --git a/components/cdc/tests/failpoints/test_endpoint.rs b/components/cdc/tests/failpoints/test_endpoint.rs
index 018946fd89b..84c4b0b56cc 100644
--- a/components/cdc/tests/failpoints/test_endpoint.rs
+++ b/components/cdc/tests/failpoints/test_endpoint.rs
@@ -1,23 +1,23 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc, Arc},
+    sync::{Arc, mpsc},
     thread,
     time::{Duration, Instant},
 };
 
-use api_version::{test_kv_format_impl, KvFormat};
+use api_version::{KvFormat, test_kv_format_impl};
 use causal_ts::CausalTsProvider;
-use cdc::{recv_timeout, Delegate, OldValueCache, Task, Validate};
+use cdc::{Delegate, OldValueCache, Task, Validate, recv_timeout};
 use futures::{executor::block_on, sink::SinkExt};
 use grpcio::{ChannelBuilder, Environment, WriteFlags};
 use kvproto::{cdcpb::*, kvrpcpb::*, tikvpb_grpc::TikvClient};
 use pd_client::PdClient;
 use test_raftstore::*;
-use tikv_util::{debug, worker::Scheduler, HandyRwLock};
+use tikv_util::{HandyRwLock, debug, worker::Scheduler};
 use txn_types::{Key, TimeStamp};
 
-use crate::{new_event_feed, new_event_feed_v2, ClientReceiver, TestSuite, TestSuiteBuilder};
+use crate::{ClientReceiver, TestSuite, TestSuiteBuilder, new_event_feed, new_event_feed_v2};
 
 #[test]
 fn test_cdc_double_scan_deregister() {
@@ -811,3 +811,94 @@ fn test_cdc_unresolved_region_count_before_finish_scan_lock() {
     }
     suite.stop();
 }
+
+#[test]
+fn test_cdc_watchdog_idle_timeout() {
+    let cluster = new_server_cluster(0, 1);
+    cluster.pd_client.disable_default_operator();
+    let mut suite = TestSuiteBuilder::new().cluster(cluster).build();
+    let region = suite.cluster.get_region(b"");
+
+    // Enable failpoints to control the watchdog behavior
+    // cdc_idle_deregister_threshold will make the threshold 20 seconds instead of
+    // 20 minutes cdc_sleep_after_sink_flush will make the sink sleep for 30
+    // seconds after each flush
+    fail::cfg("cdc_idle_deregister_threshold", "return(true)").unwrap();
+    fail::cfg("cdc_sleep_after_sink_flush", "return(true)").unwrap(); // Remove the "1*" to make it trigger continuously
+
+    // Create event feed connection
+    let (mut req_tx, event_feed, _) = new_event_feed(suite.get_region_cdc_client(region.id));
+    let mut req = suite.new_changedata_request(region.id);
+    req.mut_header().set_ticdc_version("7.5.0".into());
+    block_on(req_tx.send((req, WriteFlags::default()))).unwrap();
+
+    // Wait for the connection to be established and initialized
+    thread::sleep(Duration::from_millis(1000));
+
+    debug!("Starting watchdog test - waiting for connection to be cancelled");
+
+    // Wait for the watchdog to trigger and cancel the connection
+    // The watchdog should trigger after 5 seconds due to
+    // cdc_idle_deregister_threshold failpoint and cdc_sleep_after_sink_flush
+    // failpoint will make the sink sleep for 6 seconds
+    thread::sleep(Duration::from_secs(6));
+
+    debug!("Finished waiting, now checking if connection was cancelled");
+
+    // Try to detect if the connection was cancelled by watchdog
+    // We can do this by trying to receive from the underlying receiver
+    // If the connection is closed, recv_timeout should return an error
+    let mut connection_cancelled = false;
+    let start_time = Instant::now();
+
+    // Try to detect connection closure for up to 5 seconds (shorter timeout for
+    // testing)
+    while start_time.elapsed() < Duration::from_secs(5) {
+        // Get the underlying receiver
+        let mut rx = event_feed.replace(None).unwrap();
+
+        // Try to receive with a short timeout
+        match recv_timeout(&mut rx, Duration::from_millis(100)) {
+            Ok(Some(Ok(_))) => {
+                // Still receiving data, connection is alive
+                debug!("Connection still alive, received data");
+                // Put the receiver back
+                event_feed.replace(Some(rx));
+            }
+            Ok(Some(Err(_))) => {
+                // Received an error, connection was cancelled
+                debug!("Connection cancelled with error");
+                connection_cancelled = true;
+                break;
+            }
+            Ok(None) => {
+                // No data available, but connection might still be alive
+                debug!("No data available, connection might still be alive");
+                // Put the receiver back
+                event_feed.replace(Some(rx));
+            }
+            Err(_) => {
+                // Connection is closed
+                debug!("Connection closed");
+                connection_cancelled = true;
+                break;
+            }
+        }
+
+        // Small delay before next check
+        thread::sleep(Duration::from_millis(100));
+    }
+
+    // Verify that the connection was cancelled due to watchdog timeout
+    assert!(
+        connection_cancelled,
+        "Connection should have been cancelled by watchdog after idle timeout"
+    );
+
+    // Clean up
+    fail::remove("cdc_idle_deregister_threshold");
+    fail::remove("cdc_sleep_after_sink_flush");
+
+    drop(event_feed);
+    suite.stop();
+}
diff --git a/components/cdc/tests/failpoints/test_memory_quota.rs b/components/cdc/tests/failpoints/test_memory_quota.rs
index 3d331deda3d..07184993336 100644
--- a/components/cdc/tests/failpoints/test_memory_quota.rs
+++ b/components/cdc/tests/failpoints/test_memory_quota.rs
@@ -3,13 +3,13 @@
 use std::{sync::*, time::Duration};
 
 use cdc::{Task, Validate};
-use futures::{executor::block_on, SinkExt};
+use futures::{SinkExt, executor::block_on};
 use grpcio::WriteFlags;
 use kvproto::{cdcpb::*, kvrpcpb::*};
 use pd_client::PdClient;
 use test_raftstore::*;
 
-use crate::{new_event_feed, TestSuiteBuilder};
+use crate::{TestSuiteBuilder, new_event_feed};
 
 #[test]
 fn test_resolver_track_lock_memory_quota_exceeded() {
diff --git a/components/cdc/tests/failpoints/test_observe.rs b/components/cdc/tests/failpoints/test_observe.rs
index 4a34185de76..1b350fe3493 100644
--- a/components/cdc/tests/failpoints/test_observe.rs
+++ b/components/cdc/tests/failpoints/test_observe.rs
@@ -2,22 +2,23 @@
 
 use std::{
     sync::{
+        Arc,
         atomic::{AtomicBool, Ordering},
-        mpsc, Arc,
+        mpsc,
     },
     time::Duration,
 };
 
-use api_version::{test_kv_format_impl, KvFormat};
+use api_version::{KvFormat, test_kv_format_impl};
 use futures::{executor::block_on, sink::SinkExt};
 use grpcio::WriteFlags;
 use kvproto::{cdcpb::*, kvrpcpb::*, raft_serverpb::RaftMessage};
 use pd_client::PdClient;
 use raft::eraftpb::MessageType;
 use test_raftstore::*;
-use tikv_util::{config::ReadableDuration, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration};
 
-use crate::{new_event_feed, TestSuite, TestSuiteBuilder};
+use crate::{TestSuite, TestSuiteBuilder, new_event_feed};
 
 #[test]
 fn test_observe_duplicate_cmd() {
diff --git a/components/cdc/tests/failpoints/test_register.rs b/components/cdc/tests/failpoints/test_register.rs
index 2128dff08e1..0ad85de1a6b 100644
--- a/components/cdc/tests/failpoints/test_register.rs
+++ b/components/cdc/tests/failpoints/test_register.rs
@@ -1,7 +1,7 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 use std::{thread, time::Duration};
 
-use api_version::{test_kv_format_impl, KvFormat};
+use api_version::{KvFormat, test_kv_format_impl};
 use futures::{executor::block_on, sink::SinkExt};
 use grpcio::WriteFlags;
 use kvproto::{cdcpb::*, kvrpcpb::*, metapb::RegionEpoch};
@@ -10,7 +10,7 @@ use raft::StateRole;
 use raftstore::coprocessor::{ObserverContext, RoleChange, RoleObserver};
 use test_raftstore::sleep_ms;
 
-use crate::{new_event_feed, TestSuite};
+use crate::{TestSuite, new_event_feed};
 
 #[test]
 fn test_failed_pending_batch() {
diff --git a/components/cdc/tests/failpoints/test_resolve.rs b/components/cdc/tests/failpoints/test_resolve.rs
index 560eb68ba44..6f1e63f2d6c 100644
--- a/components/cdc/tests/failpoints/test_resolve.rs
+++ b/components/cdc/tests/failpoints/test_resolve.rs
@@ -1,7 +1,7 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 use std::time::Duration;
 
-use api_version::{test_kv_format_impl, KvFormat};
+use api_version::{KvFormat, test_kv_format_impl};
 use futures::{executor::block_on, sink::SinkExt};
 use grpcio::WriteFlags;
 use kvproto::{cdcpb::*, kvrpcpb::*};
@@ -10,7 +10,7 @@ use raft::eraftpb::ConfChangeType;
 use test_raftstore::*;
 use tikv_util::config::*;
 
-use crate::{new_event_feed, TestSuite, TestSuiteBuilder};
+use crate::{TestSuite, TestSuiteBuilder, new_event_feed};
 
 #[test]
 fn test_stale_resolver() {
diff --git a/components/cdc/tests/integrations/test_cdc.rs b/components/cdc/tests/integrations/test_cdc.rs
index c89bdcbb55a..942c41ce3e4 100644
--- a/components/cdc/tests/integrations/test_cdc.rs
+++ b/components/cdc/tests/integrations/test_cdc.rs
@@ -2,20 +2,20 @@
 
 use std::{sync::*, time::Duration};
 
-use api_version::{test_kv_format_impl, KvFormat};
-use cdc::{metrics::CDC_RESOLVED_TS_ADVANCE_METHOD, Task, Validate};
+use api_version::{KvFormat, test_kv_format_impl};
+use cdc::{Task, Validate, metrics::CDC_RESOLVED_TS_ADVANCE_METHOD};
 use concurrency_manager::ConcurrencyManager;
-use futures::{executor::block_on, SinkExt};
+use futures::{SinkExt, executor::block_on};
 use grpcio::WriteFlags;
 use kvproto::{cdcpb::*, kvrpcpb::*};
 use pd_client::PdClient;
 use raft::eraftpb::MessageType;
 use test_raftstore::*;
 use tikv::server::DEFAULT_CLUSTER_ID;
-use tikv_util::{config::ReadableDuration, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration, debug, error};
 use txn_types::{Key, Lock, LockType, TimeStamp};
 
-use crate::{new_event_feed, new_event_feed_v2, TestSuite, TestSuiteBuilder};
+use crate::{TestSuite, TestSuiteBuilder, new_event_feed, new_event_feed_v2};
 
 #[test]
 fn test_cdc_basic() {
@@ -2906,3 +2906,313 @@ fn test_cdc_pessimistic_lock_unlock() {
     suite.must_release_pessimistic_lock(rid, k.clone(), start_tso, for_update_tso);
     std::thread::sleep(Duration::from_millis(500));
 }
+
+#[test]
+fn test_cdc_overlapped_write_bug() {
+    // This test is to verify the overlapped write bug (#18498).
+    let cluster = new_server_cluster(1, 1);
+    let mut suite = TestSuiteBuilder::new().cluster(cluster).build();
+    let region = suite.cluster.get_region(&[]);
+    let region_id = region.get_id();
+
+    debug!("region:"; "region_id" => region_id);
+
+    let test_key = b"test_key";
+    let primary_key_t2 = b"t2_primary"; // t2's primary (different from test_key)
+    let value1 = b"value1";
+    let value2 = b"value2";
+    let value3 = b"value3";
+
+    // Phase 1: t1 prewrites and commits test_key
+    // CRITICAL: We need t2's start_ts to equal t1's commit_ts for overlapped write
+    // detection!
+    let t1_start_ts = block_on(suite.cluster.pd_client.get_tso()).unwrap();
+    debug!("t1:"; "start_ts" => t1_start_ts);
+
+    let mut mutation1 = Mutation::default();
+    mutation1.set_op(Op::Put);
+    mutation1.set_key(test_key.to_vec());
+    mutation1.set_value(value1.to_vec());
+
+    suite.must_kv_prewrite(region_id, vec![mutation1], test_key.to_vec(), t1_start_ts);
+    // t1: Prewrite completed
+
+    // Get t1's commit_ts, which will become t2's start_ts
+    let t1_commit_ts = block_on(suite.cluster.pd_client.get_tso()).unwrap();
+    let mut commit_req = CommitRequest::default();
+    commit_req.set_context(suite.get_context(region_id));
+    commit_req.set_start_version(t1_start_ts.into_inner());
+    commit_req.set_keys(vec![test_key.to_vec()].into());
+    commit_req.set_commit_version(t1_commit_ts.into_inner());
+
+    suite
+        .get_tikv_client(region_id)
+        .kv_commit(&commit_req)
+        .unwrap();
+    debug!("t1:"; "commit_ts" => t1_commit_ts);
+    // CF_WRITE now has t1's committed write
+
+    // Set up CDC AFTER t1 commits
+    let req = suite.new_changedata_request(region_id);
+    let (mut req_tx, event_feed_wrap, receive_event) =
+        new_event_feed(suite.get_region_cdc_client(region_id));
+    block_on(req_tx.send((req.clone(), WriteFlags::default()))).unwrap();
+
+    let events = receive_event(false).events.to_vec();
+    debug!("cdc: initialized with "; "events" => events.len());
+
+    // Wait for stream to be registered
+    let scheduler = suite.endpoints.values().next().unwrap().scheduler();
+    let (tx, rx) = mpsc::channel();
+    scheduler
+        .schedule(Task::Validate(Validate::Region(
+            region_id,
+            Box::new(move |delegate| {
+                if let Some(d) = delegate {
+                    assert_eq!(d.downstreams().len(), 1);
+                }
+                tx.send(()).unwrap();
+            }),
+        )))
+        .unwrap();
+    rx.recv_timeout(Duration::from_secs(1)).unwrap();
+
+    // Phase 2: t2 prewrites test_key as a SECONDARY key
+    // CRITICAL: Use t1's commit_ts as t2's start_ts to trigger overlapped write!
+    let t2_start_ts = t1_commit_ts; // This is the key: start_ts == commit_ts of t1!
+    debug!("t2: start_ts is the same as t1's commit_ts!"; "start_ts" => t2_start_ts);
+    // t2: primary_key is different from the test_key
+
+    // Prewrite both primary and secondary
+    let mut mutation_t2_primary = Mutation::default();
+    mutation_t2_primary.set_op(Op::Put);
+    mutation_t2_primary.set_key(primary_key_t2.to_vec());
+    mutation_t2_primary.set_value(value2.to_vec());
+
+    let mut mutation_t2_secondary = Mutation::default();
+    mutation_t2_secondary.set_op(Op::Put);
+    mutation_t2_secondary.set_key(test_key.to_vec());
+    mutation_t2_secondary.set_value(value2.to_vec());
+
+    // Prewrite with primary_key_t2 as primary
+    suite.must_kv_prewrite(
+        region_id,
+        vec![mutation_t2_primary, mutation_t2_secondary],
+        primary_key_t2.to_vec(),
+        t2_start_ts,
+    );
+    // t2: Prewrite completed
+    debug!("cf_lock now has t2's lock"; "test_key" => t2_start_ts);
+    debug!("cdc should call push_lock for t2");
+
+    // Wait for t2 prewrite events to be received
+    let mut t2_prewrite_received = false;
+    for _ in 0..5 {
+        let events = receive_event(true).events.to_vec();
+        for event in events {
+            if let Some(Event_oneof_event::Entries(entries)) = event.event {
+                for entry in &entries.entries {
+                    if entry.get_type() == EventLogType::Prewrite
+                        && entry.start_ts == t2_start_ts.into_inner()
+                    {
+                        t2_prewrite_received = true;
+                        break;
+                    }
+                }
+            }
+        }
+        if t2_prewrite_received {
+            break;
+        }
+    }
+
+    // Phase 3: t2 rolls back ONLY the secondary key (test_key)
+    let ctx = suite.get_context(region_id);
+    let tikv_client = suite.get_tikv_client(region_id);
+
+    let mut rollback_req = BatchRollbackRequest::default();
+    rollback_req.set_context(ctx.clone());
+    rollback_req.set_keys(vec![test_key.to_vec()].into()); // Only rollback test_key
+    rollback_req.set_start_version(t2_start_ts.into_inner());
+
+    tikv_client.kv_batch_rollback(&rollback_req).unwrap();
+    // t2: Rollback completed on test_key (secondary)
+    debug!("get_txn_commit_record finds t1's write where"; "commit_ts" => t1_commit_ts, "== t2's start_ts" => t2_start_ts);
+    // get_txn_commit_record returns overlapped_write!
+    // test_key is NOT t2's primary → protected=false
+    // make_rollback(protected=false, overlapped_write=Some) returns None
+    // NO CF_WRITE ENTRY!
+    // Only DELETE from CF_LOCK (CDC ignores this)
+    // CDC's lock_tracker still has t2's lock (stale)
+
+    // Phase 4: t3 prewrites test_key
+    // This will trigger resolve_lock to clean up t2's stale lock
+    let t3_start_ts = block_on(suite.cluster.pd_client.get_tso()).unwrap();
+    debug!("t3:"; "start_ts" => t3_start_ts);
+    debug!("note:"; "t2's start_ts" => t2_start_ts, "t3's start_ts" => t3_start_ts);
+
+    let mut mutation3 = Mutation::default();
+    mutation3.set_op(Op::Put);
+    mutation3.set_key(test_key.to_vec());
+    mutation3.set_value(value3.to_vec());
+
+    // t3: Attempting prewrite...
+    // Will encounter t2's stale lock in CF_LOCK
+    // Triggers resolve_lock_lite to clean it up
+    // resolve_lock removes lock from CF_LOCK (no CDC notification)
+    // CDC processes t3's prewrite
+    debug!("cdc calls push_lock(test_key)"; "start_ts" => t3_start_ts);
+    debug!("cdc finds t2's stale lock in the lock_tracker"; "start_ts" => t2_start_ts);
+    // EXPECTED: Assertion failure or warning!
+
+    suite.must_kv_prewrite(region_id, vec![mutation3], test_key.to_vec(), t3_start_ts);
+    // t3: Prewrite completed
+
+    // Phase 5: Wait for CDC to process t3 prewrite event
+    let mut t3_prewrite_received = false;
+    for _ in 0..10 {
+        let events_result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
+            receive_event(true).events.to_vec()
+        }));
+
+        if let Ok(events) = events_result {
+            for event in events {
+                if let Some(Event_oneof_event::Entries(entries)) = event.event {
+                    for entry in &entries.entries {
+                        if entry.get_type() == EventLogType::Prewrite
+                            && entry.start_ts == t3_start_ts.into_inner()
+                        {
+                            t3_prewrite_received = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            if t3_prewrite_received {
+                break;
+            }
+        } else {
+            // If panic occurred, break to handle it below
+            break;
+        }
+    }
+
+    // Try to receive events (will panic if assertion fails)
+    let events = receive_event(true).events.to_vec();
+    debug!("cdc:"; "received" => events.len());
+    for (i, event) in events.iter().enumerate() {
+        debug!("event"; "index" => i, "event" => ?event);
+    }
+
+    // Check delegate status
+    let scheduler = suite.endpoints.values().next().unwrap().scheduler();
+    let (tx, rx) = mpsc::channel();
+    scheduler
+        .schedule(Task::Validate(Validate::Region(
+            region_id,
+            Box::new(move |delegate| {
+                let status = match delegate {
+                    Some(d) => {
+                        if d.has_failed() {
+                            "FAILED".to_string()
+                        } else {
+                            "ACTIVE".to_string()
+                        }
+                    }
+                    None => "REMOVED".to_string(),
+                };
+                tx.send(status).unwrap();
+            }),
+        )))
+        .unwrap();
+
+    match rx.recv_timeout(Duration::from_secs(1)) {
+        Ok(status) => {
+            assert_eq!(status, "ACTIVE");
+        }
+        Err(e) => {
+            error!("Failed to check delegate status"; "error" => ?e);
+            panic!("Failed to check delegate status");
+        }
+    }
+
+    event_feed_wrap.replace(None);
+    suite.stop();
+}
+
+#[test]
+fn test_verify_overlapped_write_skips_cf_write() {
+    // This is a simpler test to verify that rollback indeed skips CF_WRITE
+    // when there's an overlapped write and the key is not primary
+    // CRITICAL: Overlapped write requires t2.start_ts == t1.commit_ts
+
+    let cluster = new_server_cluster(1, 1);
+    let mut suite = TestSuiteBuilder::new().cluster(cluster).build();
+    let region = suite.cluster.get_region(&[]);
+    let region_id = region.get_id();
+
+    let test_key = b"test_key";
+    let primary_key = b"primary_key";
+    let value1 = b"value1";
+    let value2 = b"value2";
+
+    // t1: Commit a write
+    let t1_start_ts = block_on(suite.cluster.pd_client.get_tso()).unwrap();
+    let mut mutation1 = Mutation::default();
+    mutation1.set_op(Op::Put);
+    mutation1.set_key(test_key.to_vec());
+    mutation1.set_value(value1.to_vec());
+    suite.must_kv_prewrite(region_id, vec![mutation1], test_key.to_vec(), t1_start_ts);
+
+    let t1_commit_ts = block_on(suite.cluster.pd_client.get_tso()).unwrap();
+    let mut commit_req = CommitRequest::default();
+    commit_req.set_context(suite.get_context(region_id));
+    commit_req.set_start_version(t1_start_ts.into_inner());
+    commit_req.set_keys(vec![test_key.to_vec()].into());
+    commit_req.set_commit_version(t1_commit_ts.into_inner());
+    suite
+        .get_tikv_client(region_id)
+        .kv_commit(&commit_req)
+        .unwrap();
+
+    // t2: Prewrite with test_key as SECONDARY (primary is different)
+    // CRITICAL: Use t1's commit_ts as t2's start_ts!
+    let t2_start_ts = t1_commit_ts;
+    let mut mutation_primary = Mutation::default();
+    mutation_primary.set_op(Op::Put);
+    mutation_primary.set_key(primary_key.to_vec());
+    mutation_primary.set_value(value2.to_vec());
+
+    let mut mutation_secondary = Mutation::default();
+    mutation_secondary.set_op(Op::Put);
+    mutation_secondary.set_key(test_key.to_vec());
+    mutation_secondary.set_value(value2.to_vec());
+
+    suite.must_kv_prewrite(
+        region_id,
+        vec![mutation_primary, mutation_secondary],
+        primary_key.to_vec(),
+        t2_start_ts,
+    );
+
+    // t2: Rollback the secondary key
+    let ctx = suite.get_context(region_id);
+    let tikv_client = suite.get_tikv_client(region_id);
+    let mut rollback_req = BatchRollbackRequest::default();
+    rollback_req.set_context(ctx);
+    rollback_req.set_keys(vec![test_key.to_vec()].into());
+    rollback_req.set_start_version(t2_start_ts.into_inner());
+
+    tikv_client.kv_batch_rollback(&rollback_req).unwrap();
+
+    // t2: Rolled back test_key (secondary)
+    // Expected behavior:
+    //   - get_txn_commit_record finds: commit_ts={t1_commit_ts} ==
+    //     start_ts={t2_start_ts}
+    //   - Overlapped write detected!
+    //   - test_key is NOT primary → protected=false
+    //   - make_rollback(protected=false, overlapped_write=Some) returns None
+    //   - NO CF_WRITE entry created
+    // If this test passes, the overlapped write behavior is confirmed
+    suite.stop();
+}
diff --git a/components/cdc/tests/integrations/test_flow_control.rs b/components/cdc/tests/integrations/test_flow_control.rs
index 77edbcc7e2d..854f4e82ea8 100644
--- a/components/cdc/tests/integrations/test_flow_control.rs
+++ b/components/cdc/tests/integrations/test_flow_control.rs
@@ -3,13 +3,13 @@
 use std::{sync::*, time::Duration};
 
 use cdc::{Task, Validate};
-use futures::{executor::block_on, SinkExt};
+use futures::{SinkExt, executor::block_on};
 use grpcio::WriteFlags;
 use kvproto::{cdcpb::*, kvrpcpb::*};
 use pd_client::PdClient;
 use test_raftstore::*;
 
-use crate::{new_event_feed, TestSuiteBuilder};
+use crate::{TestSuiteBuilder, new_event_feed};
 
 #[test]
 fn test_cdc_congest() {
diff --git a/components/cdc/tests/mod.rs b/components/cdc/tests/mod.rs
index 56fa39720ab..e264f52a6be 100644
--- a/components/cdc/tests/mod.rs
+++ b/components/cdc/tests/mod.rs
@@ -6,7 +6,7 @@ use std::{
 };
 
 use causal_ts::CausalTsProvider;
-use cdc::{recv_timeout, CdcObserver, Delegate, FeatureGate, Task, Validate};
+use cdc::{CdcObserver, Delegate, FeatureGate, Task, Validate, recv_timeout};
 use collections::HashMap;
 use concurrency_manager::ConcurrencyManager;
 use engine_rocks::RocksEngine;
@@ -16,7 +16,7 @@ use grpcio::{
     Environment, MetadataBuilder,
 };
 use kvproto::{
-    cdcpb::{create_change_data, ChangeDataClient, ChangeDataEvent, ChangeDataRequest},
+    cdcpb::{ChangeDataClient, ChangeDataEvent, ChangeDataRequest, create_change_data},
     kvrpcpb::{PrewriteRequestPessimisticAction::*, *},
     tikvpb::TikvClient,
 };
@@ -29,10 +29,10 @@ use tikv::{
     storage::kv::LocalTablets,
 };
 use tikv_util::{
+    HandyRwLock,
     config::ReadableDuration,
     memory::MemoryQuota,
-    worker::{LazyWorker, Runnable},
-    HandyRwLock,
+    worker::{Builder, LazyWorker, Runnable},
 };
 use txn_types::TimeStamp;
 static INIT: Once = Once::new();
@@ -185,11 +185,16 @@ impl TestSuiteBuilder {
             let memory_quota = Arc::new(MemoryQuota::new(memory_quota));
             let memory_quota_ = memory_quota.clone();
             let scheduler = worker.scheduler();
+            let pool = Arc::new(Builder::new("cdc-watchdog-test").thread_count(1).create());
             sim.pending_services
                 .entry(id)
                 .or_default()
                 .push(Box::new(move || {
-                    create_change_data(cdc::Service::new(scheduler.clone(), memory_quota_.clone()))
+                    create_change_data(cdc::Service::new(
+                        scheduler.clone(),
+                        memory_quota_.clone(),
+                        pool.clone(),
+                    ))
                 }));
             sim.txn_extra_schedulers.insert(
                 id,
diff --git a/components/cloud/aws/Cargo.toml b/components/cloud/aws/Cargo.toml
index ce7e15d13c4..e985ea50d3d 100644
--- a/components/cloud/aws/Cargo.toml
+++ b/components/cloud/aws/Cargo.toml
@@ -50,6 +50,7 @@ uuid = { version = "0.8", features = ["v4"] }
 
 [dev-dependencies]
 aws-smithy-runtime = { version = "1.4.0", features = ["test-util", "client"] }
+aws-smithy-types = { version = "1", features = ["hyper-0-14-x", "http-body-0-4-x"] }
 base64 = "0.13"
 futures = "0.3"
 tokio = { version = "1.5", features = ["macros"] }
diff --git a/components/cloud/aws/src/kms.rs b/components/cloud/aws/src/kms.rs
index f877d159778..08bfe67aa81 100644
--- a/components/cloud/aws/src/kms.rs
+++ b/components/cloud/aws/src/kms.rs
@@ -4,12 +4,12 @@ use std::ops::Deref;
 
 use async_trait::async_trait;
 use aws_config::BehaviorVersion;
-use aws_credential_types::provider::{error::CredentialsError, ProvideCredentials};
+use aws_credential_types::provider::{ProvideCredentials, error::CredentialsError};
 use aws_sdk_kms::{
+    Client,
     operation::{decrypt::DecryptError, generate_data_key::GenerateDataKeyError},
     primitives::Blob,
     types::DataKeySpec,
-    Client,
 };
 use aws_sdk_s3::config::HttpClient;
 use cloud::{
@@ -18,7 +18,7 @@ use cloud::{
 };
 use futures::executor::block_on;
 
-use crate::util::{self, is_retryable, SdkError};
+use crate::util::{self, SdkError, is_retryable};
 
 const AWS_KMS_DATA_KEY_SPEC: DataKeySpec = DataKeySpec::Aes256;
 
@@ -352,8 +352,8 @@ mod tests {
         client.assert_requests_match(&[]);
     }
 
+    #[ignore = "no available aws ksm backend for the test env."]
     #[tokio::test]
-    #[cfg(FALSE)]
     // FIXME: enable this (or move this to an integration test)
     async fn test_aws_kms_localstack() {
         let config = Config {
@@ -365,6 +365,7 @@ mod tests {
             },
             azure: None,
             gcp: None,
+            aws: None,
         };
 
         let creds =
diff --git a/components/cloud/aws/src/s3.rs b/components/cloud/aws/src/s3.rs
index 0c2092bc2bc..706057df14e 100644
--- a/components/cloud/aws/src/s3.rs
+++ b/components/cloud/aws/src/s3.rs
@@ -7,41 +7,41 @@ use std::{
 };
 
 use async_trait::async_trait;
-use aws_config::{sts::AssumeRoleProvider, BehaviorVersion, Region, SdkConfig};
-use aws_credential_types::{provider::ProvideCredentials, Credentials};
+use aws_config::{BehaviorVersion, Region, SdkConfig, sts::AssumeRoleProvider};
+use aws_credential_types::{Credentials, provider::ProvideCredentials};
 use aws_sdk_s3::{
-    config::HttpClient,
+    Client,
+    config::{HttpClient, StalledStreamProtectionConfig},
     operation::get_object::GetObjectError,
     types::{CompletedMultipartUpload, CompletedPart},
-    Client,
 };
 use bytes::Bytes;
 use cloud::{
     blob::{
-        none_to_empty, BlobConfig, BlobObject, BlobStorage, BucketConf, DeletableStorage,
-        IterableStorage, PutResource, StringNonEmpty,
+        BlobConfig, BlobObject, BlobStorage, BucketConf, DeletableStorage, IterableStorage,
+        PutResource, StringNonEmpty, none_to_empty,
     },
     metrics::CLOUD_REQUEST_HISTOGRAM_VEC,
 };
 use fail::fail_point;
 use futures::{executor::block_on, stream::Stream};
 use futures_util::{
+    StreamExt,
     future::{FutureExt, LocalBoxFuture},
     io::{AsyncRead, AsyncReadExt},
     stream::TryStreamExt,
-    StreamExt,
 };
 pub use kvproto::brpb::S3 as InputConfig;
 use thiserror::Error;
 use tikv_util::{
     debug,
-    stream::{error_stream, RetryError},
+    stream::{RetryError, error_stream},
     time::Instant,
 };
 use tokio::time::{sleep, timeout};
 use tokio_util::io::ReaderStream;
 
-use crate::util::{self, retry_and_count, SdkError};
+use crate::util::{self, SdkError, retry_and_count};
 
 const CONNECTION_TIMEOUT: Duration = Duration::from_secs(900);
 pub const STORAGE_VENDOR_NAME_AWS: &str = "aws";
@@ -143,12 +143,9 @@ impl BlobConfig for Config {
     }
 
     fn url(&self) -> io::Result<url::Url> {
-        self.bucket.url("s3").map_err(|s| {
-            io::Error::new(
-                io::ErrorKind::Other,
-                format!("error creating bucket url: {}", s),
-            )
-        })
+        self.bucket
+            .url("s3")
+            .map_err(|s| io::Error::other(format!("error creating bucket url: {}", s)))
     }
 }
 
@@ -255,8 +252,9 @@ impl S3Storage {
         let bucket_region = none_to_empty(config.bucket.region.clone());
         let bucket_endpoint = none_to_empty(config.bucket.endpoint.clone());
 
-        let mut loader =
-            aws_config::defaults(BehaviorVersion::latest()).credentials_provider(creds);
+        let mut loader = aws_config::defaults(BehaviorVersion::latest())
+            .stalled_stream_protection(StalledStreamProtectionConfig::disabled())
+            .credentials_provider(creds);
 
         loader = util::configure_region(loader, &bucket_region)?;
         loader = util::configure_endpoint(loader, &bucket_endpoint);
@@ -775,10 +773,7 @@ impl DeletableStorage for S3Storage {
                 .observe(now.saturating_elapsed().as_secs_f64());
             match res {
                 Ok(_) => Ok(()),
-                Err(e) => Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    format!("failed to delete object {}", e),
-                )),
+                Err(e) => Err(io::Error::other(format!("failed to delete object {}", e))),
             }
         }
         .boxed_local()
@@ -819,10 +814,7 @@ impl IterableStorage for S3Storage {
                     .unwrap_or_else(|| futures::stream::empty().right_stream())
             })
             .map_err(|err| {
-                io::Error::new(
-                    io::ErrorKind::Other,
-                    format!("sdk encounters an unexpected error: {:?}", err),
-                )
+                io::Error::other(format!("sdk encounters an unexpected error: {:?}", err))
             })
             .try_flatten()
             .boxed_local()
@@ -1145,8 +1137,62 @@ mod tests {
         client.assert_requests_match(&[]);
     }
 
+    /// Ensures that stalled stream protection does not kick in to kill a
+    /// rate-limited connection.
+    ///
+    /// This test simulates a GetObject response with 7s delay, which will cause
+    /// a StreamingError(ThroughputBelowMinimum) error if stalled stream
+    /// protection is enabled.
+    #[tokio::test]
+    async fn test_s3_storage_without_stalled_stream_protection() {
+        let bucket_name = StringNonEmpty::required("mybucket".to_string()).unwrap();
+        let mut bucket = BucketConf::default(bucket_name);
+        bucket.region = StringNonEmpty::opt("ap-southeast-2".to_string());
+        bucket.prefix = StringNonEmpty::opt("myprefix".to_string());
+        let config = Config::default(bucket);
+
+        let (mut delayed_response_sender, delayed_response_body) = hyper::body::Body::channel();
+        let client = StaticReplayClient::new(vec![
+            ReplayEvent::new(
+                http::Request::builder()
+                    .method("GET")
+                    .uri(Uri::from_static(
+                        "https://mybucket.s3.ap-southeast-2.amazonaws.com/myprefix/mykey?x-id=GetObject",
+                    ))
+                    .body(SdkBody::empty())
+                    .unwrap(),
+                http::Response::builder()
+                    .status(200)
+                    .body(delayed_response_body.into())
+                    .unwrap(),
+            ),
+        ]);
+
+        let creds = Credentials::from_keys("abc".to_string(), "xyz".to_string(), None);
+        let s = S3Storage::new_with_creds_client(config.clone(), client.clone(), creds).unwrap();
+
+        let mut reader = s.get("mykey");
+        let mut buf = Vec::new();
+        let send_delayed_response_task = tokio::spawn(async move {
+            // The sleep cannot be less than 6s. We need to ensure the throughput is 0 B/s
+            // for over 6s to trigger stalled stream protection.
+            tokio::time::sleep(Duration::from_secs(7)).await;
+            delayed_response_sender
+                .send_data("abcd".into())
+                .await
+                .unwrap();
+        });
+
+        let ret = reader.read_to_end(&mut buf).await.unwrap();
+        send_delayed_response_task.await.unwrap();
+        assert_eq!(ret, 4);
+        assert_eq!(buf, b"abcd");
+
+        client.assert_requests_match(&[]);
+    }
+
+    #[ignore = "s3 test env is unavailable"]
     #[tokio::test]
-    #[cfg(FALSE)]
     // FIXME: enable this (or move this to an integration test) if we've got a
     // reliable way to test s3 (aws test_util requires custom logic to verify the
     // body stream which itself can have bug)
diff --git a/components/cloud/aws/src/util.rs b/components/cloud/aws/src/util.rs
index 8938cdf607b..eb3ff93bb6e 100644
--- a/components/cloud/aws/src/util.rs
+++ b/components/cloud/aws/src/util.rs
@@ -3,14 +3,14 @@ use std::{error::Error as StdError, io};
 
 use ::aws_smithy_runtime_api::client::orchestrator::HttpResponse;
 use aws_config::{
+    ConfigLoader, Region,
     default_provider::credentials::DefaultCredentialsChain,
     environment::EnvironmentVariableRegionProvider,
     meta::region::{self, ProvideRegion, RegionProviderChain},
     profile::ProfileFileRegionProvider,
     provider_config::ProviderConfig,
-    ConfigLoader, Region,
 };
-use aws_credential_types::provider::{error::CredentialsError, ProvideCredentials};
+use aws_credential_types::provider::{ProvideCredentials, error::CredentialsError};
 use aws_sdk_kms::config::SharedHttpClient;
 use aws_sdk_s3::config::HttpClient;
 use aws_smithy_runtime::client::http::hyper_014::HyperClientBuilder;
@@ -19,12 +19,10 @@ use futures::{Future, TryFutureExt};
 use hyper::Client;
 use hyper_tls::HttpsConnector;
 use tikv_util::{
-    stream::{block_on_external_io, retry_ext, RetryError, RetryExt},
+    stream::{RetryError, RetryExt, block_on_external_io, retry_ext},
     warn,
 };
 
-const READ_BUF_SIZE: usize = 1024 * 1024 * 2;
-
 const DEFAULT_REGION: &str = "us-east-1";
 
 pub(crate) type SdkError<E, R = HttpResponse> =
@@ -52,8 +50,7 @@ impl RetryError for CredentialsErrorWrapper {
 }
 
 pub fn new_http_client() -> SharedHttpClient {
-    let mut hyper_builder = Client::builder();
-    hyper_builder.http1_read_buf_exact_size(READ_BUF_SIZE);
+    let hyper_builder = Client::builder();
 
     HyperClientBuilder::new()
         .hyper_builder(hyper_builder)
diff --git a/components/cloud/azure/Cargo.toml b/components/cloud/azure/Cargo.toml
index a9aaf2244c6..910c62f17fe 100644
--- a/components/cloud/azure/Cargo.toml
+++ b/components/cloud/azure/Cargo.toml
@@ -7,19 +7,17 @@ license = "Apache-2.0"
 
 [dependencies]
 async-trait = "0.1"
-# TODO: The azure sdk with the newest version needs the rustc v1.70, but current version of rustc in TiKV is v1.67.
-#     Therefore use the patch to update sdk to support fips 140.
-azure_core = { git = "https://github.com/tikv/azure-sdk-for-rust", branch = "release-7.5-fips" }
-azure_identity = { git = "https://github.com/tikv/azure-sdk-for-rust", branch = "release-7.5-fips" }
-azure_security_keyvault = { git = "https://github.com/tikv/azure-sdk-for-rust", branch = "release-7.5-fips", default-features = false }
-azure_storage = { git = "https://github.com/tikv/azure-sdk-for-rust", branch = "release-7.5-fips", default-features = false }
-azure_storage_blobs = { git = "https://github.com/tikv/azure-sdk-for-rust", branch = "release-7.5-fips" }
+azure_core = { version = "0.18", default-features = false, features = ["hmac_openssl"]}
+azure_identity = "0.18"
+azure_security_keyvault = { version = "0.18", default-features = false }
+azure_storage = { version = "0.18", default-features = false }
+azure_storage_blobs = { version = "0.18", default-features = false }
 base64 = "0.13"
 cloud = { workspace = true }
 futures = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["io"] }
 kvproto = { workspace = true }
-oauth2 = { version = "4.0.0", default-features = false }
+oauth2 = { version = "4.4", default-features = false }
 openssl = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/components/cloud/azure/src/azblob.rs b/components/cloud/azure/src/azblob.rs
index 04398c935e1..39b5b152492 100644
--- a/components/cloud/azure/src/azblob.rs
+++ b/components/cloud/azure/src/azblob.rs
@@ -7,36 +7,30 @@ use std::{
 };
 
 use async_trait::async_trait;
-use azure_core::{
-    auth::{TokenCredential, TokenResponse},
-    new_http_client,
-};
-use azure_identity::{
-    AutoRefreshingTokenCredential, ClientSecretCredential, DefaultAzureCredential,
-    TokenCredentialOptions,
-};
-use azure_storage::{prelude::*, ConnectionString, ConnectionStringBuilder};
+use azure_core::auth::{AccessToken, TokenCredential};
+use azure_identity::{ClientSecretCredential, DefaultAzureCredential};
+use azure_storage::{ConnectionString, ConnectionStringBuilder, prelude::*};
 use azure_storage_blobs::{blob::operations::PutBlockBlobBuilder, prelude::*};
 use cloud::{
     blob::{
-        none_to_empty, read_to_end, unimplemented, BlobConfig, BlobObject, BlobStorage, BucketConf,
-        DeletableStorage, IterableStorage, PutResource, StringNonEmpty,
+        BlobConfig, BlobObject, BlobStorage, BucketConf, DeletableStorage, IterableStorage,
+        PutResource, StringNonEmpty, none_to_empty, read_to_end, unimplemented,
     },
     metrics::AZBLOB_UPLOAD_DURATION,
 };
 use futures::TryFutureExt;
-use futures_util::{future::FutureExt, io::AsyncRead, stream, stream::StreamExt, TryStreamExt};
+use futures_util::{TryStreamExt, future::FutureExt, io::AsyncRead, stream, stream::StreamExt};
 pub use kvproto::brpb::{AzureBlobStorage as InputConfig, AzureCustomerKey};
 use oauth2::{ClientId, ClientSecret};
 use tikv_util::{
     debug, defer,
-    stream::{retry, RetryError},
+    stream::{RetryError, retry},
     time::Instant,
 };
 use time::OffsetDateTime;
 use tokio::{
     sync::Mutex,
-    time::{timeout, Duration},
+    time::{Duration, timeout},
 };
 
 const ENV_CLIENT_ID: &str = "AZURE_CLIENT_ID";
@@ -239,12 +233,9 @@ impl BlobConfig for Config {
     }
 
     fn url(&self) -> io::Result<url::Url> {
-        self.bucket.url("azure").map_err(|s| {
-            io::Error::new(
-                io::ErrorKind::Other,
-                format!("error creating bucket url: {}", s),
-            )
-        })
+        self.bucket
+            .url("azure")
+            .map_err(|s| io::Error::other(format!("error creating bucket url: {}", s)))
     }
 }
 
@@ -391,14 +382,14 @@ trait ContainerBuilder: 'static + Send + Sync {
 /// Also see [`DefaultAzureCredential`].
 struct DefaultContainerBuilder {
     config: Config,
-    cred: AutoRefreshingTokenCredential,
+    cred: Arc<DefaultAzureCredential>,
 }
 
 impl DefaultContainerBuilder {
     fn new(config: Config) -> Self {
         Self {
             config,
-            cred: AutoRefreshingTokenCredential::new(Arc::<DefaultAzureCredential>::default()),
+            cred: Arc::<DefaultAzureCredential>::default(),
         }
     }
 }
@@ -410,9 +401,10 @@ impl ContainerBuilder for DefaultContainerBuilder {
         let bucket = (*self.config.bucket.bucket).to_owned();
 
         let token_resource = format!("https://{}.blob.core.windows.net", &account_name);
+        let scopes = vec![&token_resource as &str];
         let token = self
             .cred
-            .get_token(&token_resource)
+            .get_token(&scopes)
             .await
             .map_err(|e| {
                 io::Error::new(
@@ -424,7 +416,7 @@ impl ContainerBuilder for DefaultContainerBuilder {
 
         let client = BlobServiceClient::new(
             account_name,
-            StorageCredentials::bearer_token(token.secret()),
+            StorageCredentials::bearer_token(token.secret().to_string()),
         )
         .container_client(bucket);
         Ok(Arc::new(client))
@@ -442,7 +434,7 @@ impl ContainerBuilder for SharedKeyContainerBuilder {
     }
 }
 
-type TokenCacheType = Arc<RwLock<Option<(TokenResponse, Arc<ContainerClient>)>>>;
+type TokenCacheType = Arc<RwLock<Option<(AccessToken, Arc<ContainerClient>)>>>;
 struct TokenCredContainerBuilder {
     account_name: String,
     container_name: String,
@@ -528,14 +520,14 @@ impl ContainerBuilder for TokenCredContainerBuilder {
             }
             // release read lock, the thread still have modify lock,
             // so no other threads can write the token_cache, so read lock is not blocked.
-            let token = self
-                .token_cred
-                .get_token(&self.token_resource)
-                .await
-                .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, format!("{:?}", &e)))?;
+            let scopes = vec![&self.token_resource as &str];
+            let token =
+                self.token_cred.get_token(&scopes).await.map_err(|e| {
+                    io::Error::new(io::ErrorKind::InvalidInput, format!("{:?}", &e))
+                })?;
             let blob_service = BlobServiceClient::new(
                 self.account_name.clone(),
-                StorageCredentials::BearerToken(token.token.secret().into()),
+                StorageCredentials::bearer_token(token.token.secret().to_string()),
             );
             let storage_client =
                 Arc::new(blob_service.container_client(self.container_name.clone()));
@@ -640,11 +632,11 @@ impl AzureStorage {
         } else if let Some(credential_info) = config.credential_info.as_ref() {
             let token_resource = format!("https://{}.blob.core.windows.net", &account_name);
             let cred = ClientSecretCredential::new(
-                new_http_client(),
-                credential_info.tenant_id.clone(),
+                azure_core::new_http_client(),
                 credential_info.client_id.to_string(),
                 credential_info.client_secret.secret().clone(),
-                TokenCredentialOptions::default(),
+                credential_info.tenant_id.clone(),
+                Default::default(),
             );
 
             let client_builder = Arc::new(TokenCredContainerBuilder::new(
@@ -818,6 +810,8 @@ impl DeletableStorage for AzureStorage {
 
 #[cfg(test)]
 mod tests {
+    use futures::AsyncReadExt;
+
     use super::*;
 
     #[test]
@@ -895,8 +889,8 @@ mod tests {
         env::remove_var(ENV_CLIENT_SECRET);
     }
 
+    #[ignore = "no available azure cloud service for the test env."]
     #[tokio::test]
-    #[cfg(feature = "azurite")]
     // test in Azurite emulator
     async fn test_azblob_storage() {
         use futures_util::stream;
diff --git a/components/cloud/azure/src/kms.rs b/components/cloud/azure/src/kms.rs
index a7d72c2afa4..e0e9fd850d8 100644
--- a/components/cloud/azure/src/kms.rs
+++ b/components/cloud/azure/src/kms.rs
@@ -3,11 +3,9 @@
 use std::{ops::Deref, sync::Arc};
 
 use async_trait::async_trait;
-use azure_core::{auth::TokenCredential, new_http_client, Error as AzureError};
-use azure_identity::{
-    AutoRefreshingTokenCredential, ClientSecretCredential, TokenCredentialOptions,
-};
-use azure_security_keyvault::{prelude::*, KeyClient};
+use azure_core::{Error as AzureError, auth::TokenCredential};
+use azure_identity::ClientSecretCredential;
+use azure_security_keyvault::{KeyClient, prelude::*};
 use cloud::{
     error::{Error as CloudError, KmsError, OtherError, Result},
     kms::{Config, CryptographyType, DataKeyPair, EncryptedKey, KeyId, KmsProvider, PlainKey},
@@ -123,18 +121,18 @@ impl AzureKms {
             // Client secret to access KeyVault.
             let (keyvault_credential, hsm_credential) = (
                 ClientSecretCredential::new(
-                    new_http_client(),
-                    azure_cfg.tenant_id.clone(),
+                    azure_core::new_http_client(),
                     azure_cfg.client_id.clone(),
                     client_secret.clone(),
-                    TokenCredentialOptions::default(),
+                    azure_cfg.tenant_id.clone(),
+                    Default::default(),
                 ),
                 ClientSecretCredential::new(
-                    new_http_client(),
-                    azure_cfg.tenant_id.clone(),
+                    azure_core::new_http_client(),
                     azure_cfg.client_id,
                     client_secret,
-                    TokenCredentialOptions::default(),
+                    azure_cfg.tenant_id.clone(),
+                    Default::default(),
                 ),
             );
             Self::new_with_credentials(config, keyvault_credential, hsm_credential)
@@ -190,7 +188,7 @@ impl KmsProvider for AzureKms {
             ),
         };
         self.client
-            .encrypt(&self.current_key_id.clone().into_inner(), encrypt_params)
+            .encrypt(self.current_key_id.clone().into_inner(), encrypt_params)
             .await
             .map_err(convert_azure_error)
             .and_then(|response| {
@@ -237,10 +235,7 @@ fn convert_azure_error(err: AzureError) -> CloudError {
     let err_msg = if let Ok(e) = err.into_inner() {
         e
     } else {
-        Box::new(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            "unknown error",
-        ))
+        Box::new(std::io::Error::other("unknown error"))
     };
     CloudError::KmsError(KmsError::Other(OtherError::from_box(err_msg)))
 }
@@ -250,11 +245,7 @@ fn new_key_client<Creds>(url: &str, credentials: Creds) -> Result<KeyClient>
 where
     Creds: TokenCredential + Send + Sync + 'static,
 {
-    KeyClient::new(
-        url,
-        Arc::new(AutoRefreshingTokenCredential::new(Arc::new(credentials))),
-    )
-    .map_err(|e| CloudError::Other(Box::new(e)))
+    KeyClient::new(url, Arc::new(credentials)).map_err(|e| CloudError::Other(Box::new(e)))
 }
 
 #[cfg(test)]
diff --git a/components/cloud/azure/src/token_credentials/certificate_credentials.rs b/components/cloud/azure/src/token_credentials/certificate_credentials.rs
index af39e7be5fa..24e960ca610 100644
--- a/components/cloud/azure/src/token_credentials/certificate_credentials.rs
+++ b/components/cloud/azure/src/token_credentials/certificate_credentials.rs
@@ -3,15 +3,15 @@
 use std::{str, sync::Arc, time::Duration};
 
 use azure_core::{
-    auth::{AccessToken, TokenCredential, TokenResponse},
+    HttpClient, Method, Request,
+    auth::{AccessToken, TokenCredential},
     base64, content_type,
     error::{Error, ErrorKind},
-    headers, new_http_client, HttpClient, Method, Request,
+    headers, new_http_client,
 };
-use azure_identity::authority_hosts::AZURE_PUBLIC_CLOUD;
 use openssl::{
     error::ErrorStack,
-    hash::{hash, DigestBytes, MessageDigest},
+    hash::{DigestBytes, MessageDigest, hash},
     pkcs12::Pkcs12,
     pkey::{PKey, Private},
     sign::Signer,
@@ -19,7 +19,7 @@ use openssl::{
 };
 use serde::Deserialize;
 use time::OffsetDateTime;
-use url::{form_urlencoded, Url};
+use url::{Url, form_urlencoded};
 
 /// Refresh time to use in seconds
 const DEFAULT_REFRESH_TIME: i64 = 300;
@@ -35,7 +35,7 @@ struct CertificateCredentialOptions {
 impl Default for CertificateCredentialOptions {
     fn default() -> Self {
         Self {
-            authority_host: AZURE_PUBLIC_CLOUD.to_owned(),
+            authority_host: "https://login.microsoftonline.com/".to_owned(),
             send_certificate_chain: true,
         }
     }
@@ -66,6 +66,7 @@ struct AadTokenResponse {
 /// TODO: make `ClientCertificateCredentialExt` directly extended from
 /// `ClientCertificateCredential` if `ClientCertificateCredential` is nightly
 /// released.
+#[derive(Debug)]
 pub struct ClientCertificateCredentialExt {
     http_client: Arc<dyn HttpClient>,
 
@@ -150,11 +151,14 @@ fn openssl_error(err: ErrorStack) -> azure_core::error::Error {
 #[cfg_attr(target_arch = "wasm32", async_trait::async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
 impl TokenCredential for ClientCertificateCredentialExt {
+    async fn clear_cache(&self) -> azure_core::Result<()> {
+        Ok(())
+    }
     // As previous [TODO] shows, following operations in `get_token` is just
     // extended from `ClientCertificateCredential::get_token()` as a special
     // version with caching feature and stable feature.
     // Reference of the REST API: https://learn.microsoft.com/en-us/azure/key-vault/general/common-parameters-and-headers.
-    async fn get_token(&self, resource: &str) -> azure_core::Result<TokenResponse> {
+    async fn get_token(&self, scopes: &[&str]) -> azure_core::Result<AccessToken> {
         let options = self.options();
         let url = &format!(
             "{}/{}/oauth2/v2.0/token",
@@ -231,7 +235,7 @@ impl TokenCredential for ClientCertificateCredentialExt {
             let mut encoded = &mut form_urlencoded::Serializer::new(String::new());
             encoded = encoded
                 .append_pair("client_id", self.client_id.as_str())
-                .append_pair("scope", format!("{}/.default", resource).as_str())
+                .append_pair("scope", &scopes.join(" "))
                 .append_pair(
                     "client_assertion_type",
                     "urn:ietf:params:oauth:client-assertion-type:jwt-bearer",
@@ -258,8 +262,8 @@ impl TokenCredential for ClientCertificateCredentialExt {
         }
 
         let response: AadTokenResponse = serde_json::from_slice(&rsp_body)?;
-        let token = TokenResponse::new(
-            AccessToken::new(response.access_token.to_string()),
+        let token = AccessToken::new(
+            response.access_token.to_string(),
             OffsetDateTime::now_utc() + Duration::from_secs(response.expires_in),
         );
         Ok(token)
diff --git a/components/cloud/gcp/src/client.rs b/components/cloud/gcp/src/client.rs
index 7dc99c0e1f2..b6bca3529a0 100644
--- a/components/cloud/gcp/src/client.rs
+++ b/components/cloud/gcp/src/client.rs
@@ -8,13 +8,13 @@ use std::{
     sync::Arc,
 };
 
-use hyper::{client::HttpConnector, Body, Client, Request, Response, StatusCode};
+use hyper::{Body, Client, Request, Response, StatusCode, client::HttpConnector};
 use hyper_tls::HttpsConnector;
 use serde::Deserialize;
 use tame_oauth::gcp::{
-    end_user::EndUserCredentialsInner, service_account::ServiceAccountProviderInner,
     EndUserCredentialsInfo, ServiceAccountInfo, TokenOrRequest, TokenProvider,
-    TokenProviderWrapper, TokenProviderWrapperInner,
+    TokenProviderWrapper, TokenProviderWrapperInner, end_user::EndUserCredentialsInner,
+    service_account::ServiceAccountProviderInner,
 };
 use tikv_util::stream::RetryError;
 
@@ -166,6 +166,7 @@ trait ResultExt {
 
     // Maps the error of this result as an `std::io::Error` with `Other` error
     // kind.
+    #[allow(dead_code)]
     fn or_io_error<D: Display>(self, msg: D) -> io::Result<Self::Ok>;
 
     // Maps the error of this result as an `std::io::Error` with `InvalidInput`
@@ -176,7 +177,7 @@ trait ResultExt {
 impl<T, E: Display> ResultExt for StdResult<T, E> {
     type Ok = T;
     fn or_io_error<D: Display>(self, msg: D) -> io::Result<T> {
-        self.map_err(|e| io::Error::new(io::ErrorKind::Other, format!("{}: {}", msg, e)))
+        self.map_err(|e| io::Error::other(format!("{}: {}", msg, e)))
     }
     fn or_invalid_input<D: Display>(self, msg: D) -> io::Result<T> {
         self.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, format!("{}: {}", msg, e)))
diff --git a/components/cloud/gcp/src/gcs.rs b/components/cloud/gcp/src/gcs.rs
index 794367e43e7..13b56e77efa 100644
--- a/components/cloud/gcp/src/gcs.rs
+++ b/components/cloud/gcp/src/gcs.rs
@@ -4,8 +4,8 @@ use std::{fmt::Display, io};
 use async_trait::async_trait;
 use cloud::{
     blob::{
-        none_to_empty, read_to_end, BlobConfig, BlobObject, BlobStorage, BucketConf,
-        DeletableStorage, IterableStorage, PutResource, StringNonEmpty,
+        BlobConfig, BlobObject, BlobStorage, BucketConf, DeletableStorage, IterableStorage,
+        PutResource, StringNonEmpty, none_to_empty, read_to_end,
     },
     metrics,
 };
@@ -24,12 +24,12 @@ use tame_gcs::{
 };
 use tame_oauth::gcp::ServiceAccountInfo;
 use tikv_util::{
-    stream::{error_stream, AsyncReadAsSyncStreamOfBytes},
+    stream::{AsyncReadAsSyncStreamOfBytes, error_stream},
     time::Instant,
 };
 
 use crate::{
-    client::{status_code_error, GcpClient, RequestError},
+    client::{GcpClient, RequestError, status_code_error},
     utils::{self, retry},
 };
 
@@ -100,12 +100,9 @@ impl BlobConfig for Config {
     }
 
     fn url(&self) -> io::Result<url::Url> {
-        self.bucket.url("gcs").map_err(|s| {
-            io::Error::new(
-                io::ErrorKind::Other,
-                format!("error creating bucket url: {}", s),
-            )
-        })
+        self.bucket
+            .url("gcs")
+            .map_err(|s| io::Error::other(format!("error creating bucket url: {}", s)))
     }
 }
 
@@ -131,7 +128,7 @@ pub trait ResultExt {
 impl<T, E: Display> ResultExt for Result<T, E> {
     type Ok = T;
     fn or_io_error<D: Display>(self, msg: D) -> io::Result<T> {
-        self.map_err(|e| io::Error::new(io::ErrorKind::Other, format!("{}: {}", msg, e)))
+        self.map_err(|e| io::Error::other(format!("{}: {}", msg, e)))
     }
     fn or_invalid_input<D: Display>(self, msg: D) -> io::Result<T> {
         self.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, format!("{}: {}", msg, e)))
@@ -415,7 +412,7 @@ struct GcsPrefixIter<'cli> {
     finished: bool,
 }
 
-impl<'cli> GcsPrefixIter<'cli> {
+impl GcsPrefixIter<'_> {
     async fn one_page(&mut self) -> io::Result<Option<Vec<BlobObject>>> {
         if self.finished {
             return Ok(None);
@@ -438,7 +435,7 @@ impl<'cli> GcsPrefixIter<'cli> {
             .cli
             .make_request(req.map(|_e| Body::empty()), tame_gcs::Scopes::ReadOnly)
             .await
-            .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
+            .map_err(|err| io::Error::other(err))?;
         let resp = utils::read_from_http_body::<ListResponse>(res).await?;
         metrics::CLOUD_REQUEST_HISTOGRAM_VEC
             .with_label_values(&["gcp", "list"])
diff --git a/components/cloud/gcp/src/kms.rs b/components/cloud/gcp/src/kms.rs
index 3d4c84d06a1..9a83851e411 100644
--- a/components/cloud/gcp/src/kms.rs
+++ b/components/cloud/gcp/src/kms.rs
@@ -4,9 +4,10 @@ use std::{fmt, result::Result as StdResult};
 
 use async_trait::async_trait;
 use cloud::{
+    KeyId,
     error::{Error as CloudError, KmsError, Result},
     kms::{Config, CryptographyType, DataKeyPair, EncryptedKey, KmsProvider, PlainKey},
-    metrics, KeyId,
+    metrics,
 };
 use futures_util::stream::StreamExt;
 use http::Method;
@@ -18,8 +19,8 @@ use tame_gcs::error::HttpStatusError;
 use tikv_util::{box_err, stream::RetryError, time::Instant};
 
 use crate::{
-    client::{GcpClient, RequestError},
     STORAGE_VENDOR_NAME_GCP,
+    client::{GcpClient, RequestError},
 };
 
 // generated random encryption data key length.
diff --git a/components/cloud/gcp/src/lib.rs b/components/cloud/gcp/src/lib.rs
index 81ab327f724..69ebc4bd32c 100644
--- a/components/cloud/gcp/src/lib.rs
+++ b/components/cloud/gcp/src/lib.rs
@@ -16,9 +16,9 @@ pub mod utils {
     use std::{future::Future, io};
 
     use cloud::metrics;
-    use hyper::{body::Bytes, Body};
+    use hyper::{Body, body::Bytes};
     use tame_gcs::ApiResponse;
-    use tikv_util::stream::{retry_ext, RetryError, RetryExt};
+    use tikv_util::stream::{RetryError, RetryExt, retry_ext};
     pub async fn retry<G, T, F, E>(action: G, name: &'static str) -> Result<T, E>
     where
         G: FnMut() -> F,
diff --git a/components/cloud/src/blob.rs b/components/cloud/src/blob.rs
index 18c7c81a594..dd86f8ac996 100644
--- a/components/cloud/src/blob.rs
+++ b/components/cloud/src/blob.rs
@@ -21,7 +21,7 @@ pub struct PutResource<'a>(pub Box<dyn AsyncRead + Send + Unpin + 'a>);
 
 pub type BlobStream<'a> = Box<dyn AsyncRead + Unpin + Send + 'a>;
 
-impl<'a> AsyncRead for PutResource<'a> {
+impl AsyncRead for PutResource<'_> {
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut std::task::Context<'_>,
diff --git a/components/cloud/src/error.rs b/components/cloud/src/error.rs
index 8fd1dda3e8e..ea400d95466 100644
--- a/components/cloud/src/error.rs
+++ b/components/cloud/src/error.rs
@@ -3,7 +3,7 @@
 use std::{
     error,
     fmt::{self, Debug, Display},
-    io::{Error as IoError, ErrorKind},
+    io::Error as IoError,
     result,
 };
 
@@ -59,7 +59,7 @@ impl From<Error> for IoError {
     fn from(err: Error) -> IoError {
         match err {
             Error::Io(e) => e,
-            other => IoError::new(ErrorKind::Other, format!("{}", other)),
+            other => IoError::other(format!("{}", other)),
         }
     }
 }
diff --git a/components/cloud/src/lib.rs b/components/cloud/src/lib.rs
index 28debed51b9..978a1558a3e 100644
--- a/components/cloud/src/lib.rs
+++ b/components/cloud/src/lib.rs
@@ -13,6 +13,6 @@ pub mod kms;
 pub use kms::{Config, DataKeyPair, EncryptedKey, KeyId, KmsProvider, PlainKey, SubConfigAzure};
 
 pub mod blob;
-pub use blob::{none_to_empty, BucketConf, StringNonEmpty};
+pub use blob::{BucketConf, StringNonEmpty, none_to_empty};
 
 pub mod metrics;
diff --git a/components/codec/src/buffer.rs b/components/codec/src/buffer.rs
index f40ee1fae4f..e47249e05ae 100644
--- a/components/codec/src/buffer.rs
+++ b/components/codec/src/buffer.rs
@@ -65,7 +65,7 @@ impl<T: AsRef<[u8]>> BufferReader for std::io::Cursor<T> {
     }
 }
 
-impl<'a> BufferReader for &'a [u8] {
+impl BufferReader for &[u8] {
     #[inline]
     fn bytes(&self) -> &[u8] {
         self
@@ -86,7 +86,7 @@ impl<'a> BufferReader for &'a [u8] {
     }
 }
 
-impl<'a, T: BufferReader + ?Sized> BufferReader for &'a mut T {
+impl<T: BufferReader + ?Sized> BufferReader for &mut T {
     #[inline]
     fn bytes(&self) -> &[u8] {
         (**self).bytes()
@@ -204,7 +204,7 @@ impl<T: AsMut<[u8]>> BufferWriter for std::io::Cursor<T> {
     }
 }
 
-impl<'a> BufferWriter for &'a mut [u8] {
+impl BufferWriter for &mut [u8] {
     #[inline]
     unsafe fn bytes_mut(&mut self, _size: usize) -> &mut [u8] {
         self
@@ -252,7 +252,7 @@ impl BufferWriter for Vec<u8> {
     }
 }
 
-impl<'a, T: BufferWriter + ?Sized> BufferWriter for &'a mut T {
+impl<T: BufferWriter + ?Sized> BufferWriter for &mut T {
     #[inline]
     unsafe fn bytes_mut(&mut self, size: usize) -> &mut [u8] {
         (**self).bytes_mut(size)
@@ -635,7 +635,7 @@ mod tests {
             // Re-allocate the vector space and ensure that the address is changed.
             vec.reserve(::std::cmp::max(payload_len * 3, 32));
 
-            if vec_ptr == vec.as_ptr() {
+            if std::ptr::eq(vec_ptr, vec.as_ptr()) {
                 in_place_reallocs += 1;
             }
 
diff --git a/components/codec/src/byte.rs b/components/codec/src/byte.rs
index 8b5fd928edf..5489002dfac 100644
--- a/components/codec/src/byte.rs
+++ b/components/codec/src/byte.rs
@@ -3,9 +3,9 @@
 use std::{intrinsics::unlikely, io::Read};
 
 use crate::{
+    ErrorInner, Result,
     buffer::BufferReader,
     number::{self, NumberCodec, NumberDecoder, NumberEncoder},
-    ErrorInner, Result,
 };
 
 const MEMCMP_GROUP_SIZE: usize = 8;
@@ -1374,6 +1374,9 @@ mod benches {
             }
 
             if desc {
+                // SEE: https://github.com/rust-lang/rust-clippy/issues/14685
+                // We can remove this after upgrading to a newer toolchain.
+                #[allow(clippy::manual_slice_fill)]
                 for k in &mut key {
                     *k = !*k;
                 }
diff --git a/components/codec/src/number.rs b/components/codec/src/number.rs
index af47905334d..7422573588f 100644
--- a/components/codec/src/number.rs
+++ b/components/codec/src/number.rs
@@ -1,12 +1,15 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::intrinsics::{likely, unlikely};
+use std::{
+    intrinsics::{likely, unlikely},
+    ptr,
+};
 
 use byteorder::{BigEndian, ByteOrder, LittleEndian};
 
 use crate::{
-    buffer::{BufferReader, BufferWriter},
     ErrorInner, Result,
+    buffer::{BufferReader, BufferWriter},
 };
 
 pub const MAX_VARINT64_LENGTH: usize = 10;
@@ -466,12 +469,12 @@ impl NumberCodec {
                 let ptr_end = buf.as_ptr().add(len);
                 // Slow path
                 let mut shift = 0;
-                while ptr != ptr_end && *ptr >= 0x80 {
+                while !ptr::eq(ptr, ptr_end) && *ptr >= 0x80 {
                     val |= ((*ptr & 0x7f) as u64) << shift;
                     shift += 7;
                     ptr = ptr.add(1);
                 }
-                if unlikely(ptr == ptr_end) {
+                if unlikely(ptr::eq(ptr, ptr_end)) {
                     return Err(ErrorInner::eof().into());
                 }
                 val |= (*ptr as u64) << shift;
@@ -541,7 +544,7 @@ impl NumberCodec {
             } else {
                 let ptr_end = buf.as_ptr().add(len);
                 // Slow path
-                while ptr != ptr_end && *ptr >= 0x80 {
+                while !ptr::eq(ptr, ptr_end) && *ptr >= 0x80 {
                     ptr = ptr.add(1);
                 }
                 // When we got here, we are either `ptr == ptr_end`, or `*ptr < 0x80`.
@@ -549,7 +552,7 @@ impl NumberCodec {
                 //      but meet EOF, so only `len` is returned.
                 // For `*ptr < 0x80` case, it means currently it is pointing to the last byte
                 //      of the VarInt, so we return `delta + 1` as length.
-                if unlikely(ptr == ptr_end) {
+                if unlikely(ptr::eq(ptr, ptr_end)) {
                     return len;
                 }
                 ptr.offset_from(buf.as_ptr()) as usize + 1
diff --git a/components/compact-log-backup/Cargo.toml b/components/compact-log-backup/Cargo.toml
index 8f3bf8f1445..ca181e407ee 100644
--- a/components/compact-log-backup/Cargo.toml
+++ b/components/compact-log-backup/Cargo.toml
@@ -8,13 +8,14 @@ edition = "2021"
 failpoints = ["fail/failpoints"]
 
 [dependencies]
-async-compression = { version = "0.4.12", features = [
+async-compression = { version = "0.4.27", features = [
   "tokio",
   "futures-io",
   "zstd",
 ] }
 bytes = "1"
 chrono = { workspace = true }
+cloud = { workspace = true }
 codec = { workspace = true }
 crc64fast = "0.1"
 dashmap = "5"
@@ -62,7 +63,7 @@ uuid = { version = "0.8", features = ["v4", "serde"] }
 zstd = "0.11"
 
 [dev-dependencies]
-pprof = { version = "0.14", default-features = false, features = [
+pprof = { version = "0.15", default-features = false, features = [
   "flamegraph",
   "protobuf-codec",
 ] }
diff --git a/components/compact-log-backup/src/compaction/collector.rs b/components/compact-log-backup/src/compaction/collector.rs
index 6113a82bccd..4b4f514fbdf 100644
--- a/components/compact-log-backup/src/compaction/collector.rs
+++ b/components/compact-log-backup/src/compaction/collector.rs
@@ -12,7 +12,7 @@ use crate::{
 };
 
 /// A collecting subcompaction.
-
+///
 /// Collecting a stream of [`LogFile`], and generate a stream of compactions.
 #[pin_project::pin_project]
 pub struct CollectSubcompaction<S: Stream<Item = Result<LogFile>>> {
@@ -163,9 +163,11 @@ impl<S: Stream<Item = Result<LogFile>>> Stream for CollectSubcompaction<S> {
 mod test {
     use std::sync::Arc;
 
+    use bytes::Bytes;
     use engine_traits::CF_WRITE;
     use futures::stream::{self, StreamExt, TryStreamExt};
     use kvproto::brpb;
+    use protobuf::Chars;
 
     use super::{CollectSubcompaction, CollectSubcompactionConfig, SubcompactionCollectKey};
     use crate::{
@@ -177,7 +179,7 @@ mod test {
     fn log_file(name: &str, len: u64, key: SubcompactionCollectKey) -> LogFile {
         LogFile {
             id: LogFileId {
-                name: Arc::from(name.to_owned().into_boxed_str()),
+                name: Chars::from(name),
                 offset: 0,
                 length: len,
             },
@@ -187,8 +189,8 @@ mod test {
             file_real_size: len,
             min_ts: 0,
             max_ts: 0,
-            min_key: Arc::from([]),
-            max_key: Arc::from([]),
+            min_key: Bytes::new(),
+            max_key: Bytes::new(),
             is_meta: key.is_meta,
             region_id: key.region_id,
             cf: key.cf,
@@ -196,7 +198,7 @@ mod test {
             min_start_ts: 0,
             table_id: 0,
             resolved_ts: 0,
-            sha256: Arc::from([]),
+            sha256: Bytes::new(),
             region_start_key: None,
             region_end_key: None,
             region_epoches: None,
diff --git a/components/compact-log-backup/src/compaction/exec.rs b/components/compact-log-backup/src/compaction/exec.rs
index 481c2340048..a4ff62a1812 100644
--- a/components/compact-log-backup/src/compaction/exec.rs
+++ b/components/compact-log-backup/src/compaction/exec.rs
@@ -6,8 +6,8 @@ use std::{
 
 use engine_rocks::RocksEngine;
 use engine_traits::{
-    ExternalSstFileInfo, SstCompressionType, SstExt, SstWriter, SstWriterBuilder,
-    DATA_KEY_PREFIX_LEN,
+    DATA_KEY_PREFIX_LEN, ExternalSstFileInfo, SstCompressionType, SstExt, SstWriter,
+    SstWriterBuilder,
 };
 use external_storage::{ExternalStorage, UnpinReader};
 use file_system::Sha256Reader;
@@ -22,7 +22,7 @@ use crate::{
     compaction::SST_OUT_REL,
     errors::{OtherErrExt, Result, TraceResultExt},
     source::{Record, Source},
-    statistic::{prom::*, LoadStatistic, SubcompactStatistic},
+    statistic::{LoadStatistic, SubcompactStatistic, prom::*},
     storage::DEFAULT_COMPACTION_OUT_PREFIX,
     util::{self, Cooperate, ExecuteAllExt},
 };
@@ -410,7 +410,7 @@ mod test {
         compaction::Subcompaction,
         storage::{Epoch, MetaFile},
         test_util::{
-            gen_step, save_many_log_files, CompactInMem, KvGen, LogFileBuilder, TmpStorage,
+            CompactInMem, KvGen, LogFileBuilder, TmpStorage, gen_step, save_many_log_files,
         },
     };
 
diff --git a/components/compact-log-backup/src/compaction/meta.rs b/components/compact-log-backup/src/compaction/meta.rs
index a54c35e70d1..18e602817eb 100644
--- a/components/compact-log-backup/src/compaction/meta.rs
+++ b/components/compact-log-backup/src/compaction/meta.rs
@@ -7,10 +7,11 @@ use std::{
 use external_storage::ExternalStorage;
 use futures::stream::TryStreamExt;
 use kvproto::brpb::{self, DeleteSpansOfFile};
+use protobuf::Chars;
 
 use super::{
-    collector::CollectSubcompactionConfig, EpochHint, Subcompaction, SubcompactionCollectKey,
-    SubcompactionResult, UnformedSubcompaction,
+    EpochHint, Subcompaction, SubcompactionCollectKey, SubcompactionResult, UnformedSubcompaction,
+    collector::CollectSubcompactionConfig,
 };
 use crate::{
     errors::Result,
@@ -164,7 +165,7 @@ impl Ord for SortByOffset {
 /// Finally, it calculates which files can be deleted.
 #[derive(Debug)]
 pub struct CompactionRunInfoBuilder {
-    files: HashMap<Arc<str>, BTreeSet<SortByOffset>>,
+    files: HashMap<Chars, BTreeSet<SortByOffset>>,
     compaction: brpb::LogFileCompaction,
 }
 
@@ -182,14 +183,18 @@ impl Default for CompactionRunInfoBuilder {
 /// A set of deletable log files from the same metadata.
 pub struct ExpiringFilesOfMeta {
     meta_path: Arc<str>,
-    logs: Vec<Arc<str>>,
+    logs: Vec<Chars>,
     /// Whether the log file is still needed.
     ///
     /// When we are going to delete every log files recoreded in a log file, the
     /// logfile itself can also be removed.
     destruct_self: bool,
+
+    // Whether the data kv files has been compcated before. so we can skip it quickly.
+    // Since we are not handle meta kv files. the destruct_self may not work here.
+    all_data_files_compacted: bool,
     /// The logical log files that can be removed.
-    spans_of_file: HashMap<Arc<str>, (Vec<brpb::Span>, /* physical file size */ u64)>,
+    spans_of_file: HashMap<Chars, (Vec<brpb::Span>, /* physical file size */ u64)>,
 }
 
 impl ExpiringFilesOfMeta {
@@ -199,13 +204,17 @@ impl ExpiringFilesOfMeta {
             meta_path: Arc::clone(path),
             logs: vec![],
             destruct_self: false,
+            all_data_files_compacted: false,
             spans_of_file: Default::default(),
         }
     }
 
     /// Whether we are going to delete nothing.
     pub fn is_empty(&self) -> bool {
-        self.logs.is_empty() && self.spans_of_file.is_empty() && !self.destruct_self
+        self.logs.is_empty()
+            && self.spans_of_file.is_empty()
+            && !self.destruct_self
+            && !self.all_data_files_compacted
     }
 
     /// Get the list of physical files that can be deleted.
@@ -232,8 +241,7 @@ impl CompactionRunInfoBuilder {
     pub fn add_subcompaction(&mut self, c: &SubcompactionResult) {
         for file in &c.origin.inputs {
             if !self.files.contains_key(&file.id.name) {
-                self.files
-                    .insert(Arc::clone(&file.id.name), Default::default());
+                self.files.insert(file.id.name.clone(), Default::default());
             }
             self.files
                 .get_mut(&file.id.name)
@@ -249,9 +257,9 @@ impl CompactionRunInfoBuilder {
         &mut self.compaction
     }
 
-    pub async fn write_migration(&self, s: &dyn ExternalStorage) -> Result<()> {
-        let migration = self.migration_of(self.find_expiring_files(s).await?);
-        let wrapped_storage = MigrationStorageWrapper::new(s);
+    pub async fn write_migration(&self, s: Arc<dyn ExternalStorage>) -> Result<()> {
+        let migration = self.migration_of(self.find_expiring_files(s.clone()).await?);
+        let wrapped_storage = MigrationStorageWrapper::new(s.as_ref());
         wrapped_storage.write(migration.into()).await?;
         Ok(())
     }
@@ -268,6 +276,7 @@ impl CompactionRunInfoBuilder {
                 medit.delete_logical_files.push(span)
             }
             medit.destruct_self = files.destruct_self;
+            medit.all_data_files_compacted = files.all_data_files_compacted;
             migration.edit_meta.push(medit);
         }
         migration.mut_compactions().push(self.compaction.clone());
@@ -276,10 +285,10 @@ impl CompactionRunInfoBuilder {
 
     async fn find_expiring_files(
         &self,
-        s: &dyn ExternalStorage,
+        s: Arc<dyn ExternalStorage>,
     ) -> Result<Vec<ExpiringFilesOfMeta>> {
         let ext = LoadFromExt::default();
-        let mut storage = StreamMetaStorage::load_from_ext(s, ext).await?;
+        let mut storage = StreamMetaStorage::load_from_ext(&s, ext).await?;
 
         let mut result = vec![];
         while let Some(item) = storage.try_next().await? {
@@ -317,26 +326,34 @@ impl CompactionRunInfoBuilder {
     fn expiring(&self, file: &MetaFile) -> ExpiringFilesOfMeta {
         let mut result = ExpiringFilesOfMeta::of(&file.name);
         let mut all_full_covers = true;
+        let mut all_data_files_compacted = true;
         for p in &file.physical_files {
             let full_covers = self.full_covers(p);
             if full_covers {
-                result.logs.push(Arc::clone(&p.name))
+                result.logs.push(p.name.clone());
             } else {
                 if let Some(vs) = self.files.get(&p.name) {
                     let segs = result
                         .spans_of_file
-                        .entry(Arc::clone(&p.name))
+                        .entry(p.name.clone())
                         .or_insert_with(|| (vec![], p.size));
                     for f in vs {
                         segs.0.push(f.0.span());
                     }
                 }
                 all_full_covers = false;
+
+                // Meta KV files and data KV files belong to different physical files.
+                // Therefore, only if this physical file contains no `is_meta` entries
+                // should `all_data_files_full_covers` be set to false.
+                if p.files.iter().any(|f| !f.is_meta) {
+                    all_data_files_compacted = false;
+                }
             }
         }
-        if all_full_covers {
-            result.destruct_self = true;
-        }
+        result.destruct_self = all_full_covers;
+        result.all_data_files_compacted = all_data_files_compacted;
+
         result
     }
 }
@@ -353,21 +370,85 @@ impl EpochHint {
 
 #[cfg(test)]
 mod test {
+    use std::sync::Arc;
+
     use external_storage::ExternalStorage;
     use kvproto::brpb;
 
     use super::CompactionRunInfoBuilder;
     use crate::{
-        compaction::{exec::SubcompactionExec, Subcompaction, SubcompactionResult},
-        test_util::{gen_min_max, KvGen, LogFileBuilder, TmpStorage},
+        compaction::{Subcompaction, SubcompactionResult, exec::SubcompactionExec},
+        test_util::{KvGen, LogFileBuilder, TmpStorage, gen_min_max},
     };
 
     impl CompactionRunInfoBuilder {
-        async fn mig(&self, s: &dyn ExternalStorage) -> crate::Result<brpb::Migration> {
+        async fn mig(&self, s: Arc<dyn ExternalStorage>) -> crate::Result<brpb::Migration> {
             Ok(self.migration_of(self.find_expiring_files(s).await?))
         }
     }
 
+    #[tokio::test]
+    async fn test_ignore_small_files() {
+        let const_val = |_| b"fiolvit".to_vec();
+        let g11 =
+            LogFileBuilder::from_iter(KvGen::new(gen_min_max(1, 1, 2, 10, 20), const_val), |_| {});
+        let g12 =
+            LogFileBuilder::from_iter(KvGen::new(gen_min_max(1, 3, 4, 15, 25), const_val), |_| {});
+        let g21 =
+            LogFileBuilder::from_iter(KvGen::new(gen_min_max(3, 5, 6, 30, 40), const_val), |_| {});
+        let g22 =
+            LogFileBuilder::from_iter(KvGen::new(gen_min_max(4, 7, 8, 45, 55), const_val), |_| {});
+        let st = TmpStorage::create();
+        let m = st
+            .build_flush_logs("v1/1", "v1/backupmeta/1.meta", [[g11, g12], [g21, g22]])
+            .await;
+
+        let mut coll1 = CompactionRunInfoBuilder::default();
+        let cr = SubcompactionExec::default_config(st.storage().clone());
+        let subc = Subcompaction::singleton(m.physical_files[0].files[0].clone());
+        let res = cr.run(subc, Default::default()).await.unwrap();
+        coll1.add_subcompaction(&res);
+        let mig = coll1.mig(st.storage().clone()).await.unwrap();
+        assert_eq!(mig.edit_meta.len(), 1);
+        assert!(!mig.edit_meta[0].destruct_self);
+        assert!(!mig.edit_meta[0].all_data_files_compacted);
+        assert_eq!(mig.edit_meta[0].delete_physical_files.len(), 0);
+        assert_eq!(mig.edit_meta[0].delete_logical_files.len(), 1);
+
+        let subc = Subcompaction::singleton(m.physical_files[0].files[1].clone());
+        let cr = SubcompactionExec::default_config(st.storage().clone());
+        let res2 = cr.run(subc, Default::default()).await.unwrap();
+        coll1.add_subcompaction(&res2);
+        let mig = coll1.mig(st.storage().clone()).await.unwrap();
+        assert_eq!(mig.edit_meta.len(), 1);
+        assert!(!mig.edit_meta[0].destruct_self);
+        assert!(!mig.edit_meta[0].all_data_files_compacted);
+        assert_eq!(mig.edit_meta[0].delete_physical_files.len(), 1);
+        assert_eq!(mig.edit_meta[0].delete_logical_files.len(), 0);
+
+        let subc = Subcompaction::singleton(m.physical_files[1].files[0].clone());
+        let cr = SubcompactionExec::default_config(st.storage().clone());
+        let res3 = cr.run(subc, Default::default()).await.unwrap();
+        coll1.add_subcompaction(&res3);
+        let mig = coll1.mig(st.storage().clone()).await.unwrap();
+        assert_eq!(mig.edit_meta.len(), 1);
+        assert!(!mig.edit_meta[0].destruct_self);
+        assert!(!mig.edit_meta[0].all_data_files_compacted);
+        assert_eq!(mig.edit_meta[0].delete_physical_files.len(), 1);
+        assert_eq!(mig.edit_meta[0].delete_logical_files.len(), 1);
+
+        let subc = Subcompaction::singleton(m.physical_files[1].files[1].clone());
+        let cr = SubcompactionExec::default_config(st.storage().clone());
+        let res4 = cr.run(subc, Default::default()).await.unwrap();
+        coll1.add_subcompaction(&res4);
+        let mig = coll1.mig(st.storage().clone()).await.unwrap();
+        assert_eq!(mig.edit_meta.len(), 1);
+        assert!(mig.edit_meta[0].destruct_self);
+        assert!(mig.edit_meta[0].all_data_files_compacted);
+        assert_eq!(mig.edit_meta[0].delete_physical_files.len(), 2);
+        assert_eq!(mig.edit_meta[0].delete_logical_files.len(), 0);
+    }
+
     #[tokio::test]
     async fn test_collect_single() {
         let const_val = |_| b"fiolvit".to_vec();
@@ -385,14 +466,14 @@ mod test {
         let subc = Subcompaction::singleton(m.physical_files[0].files[0].clone());
         let res = cr.run(subc, Default::default()).await.unwrap();
         coll.add_subcompaction(&res);
-        let mig = coll.mig(st.storage().as_ref()).await.unwrap();
+        let mig = coll.mig(st.storage().clone()).await.unwrap();
         assert_eq!(mig.edit_meta.len(), 1);
         assert!(!mig.edit_meta[0].destruct_self);
 
         let mut coll = CompactionRunInfoBuilder::default();
         let subc = Subcompaction::of_many(m.physical_files[0].files.iter().cloned());
         coll.add_subcompaction(&SubcompactionResult::of(subc));
-        let mig = coll.mig(st.storage().as_ref()).await.unwrap();
+        let mig = coll.mig(st.storage().clone()).await.unwrap();
         assert_eq!(mig.edit_meta.len(), 1);
         assert!(mig.edit_meta[0].destruct_self);
 
@@ -412,6 +493,15 @@ mod test {
                 |v| v.region_id = region as u64,
             )
         };
+        let of_region_meta = |region, is_meta| {
+            LogFileBuilder::from_iter(
+                KvGen::new(gen_min_max(region, 1, 2, 10, 20), const_val),
+                |v| {
+                    v.region_id = region as u64;
+                    v.is_meta = is_meta;
+                },
+            )
+        };
         let f1 = st
             .build_flush(
                 "1.log",
@@ -420,10 +510,11 @@ mod test {
             )
             .await;
         let f2 = st
-            .build_flush(
+            .build_flush_with_meta(
                 "2.log",
                 "v1/backupmeta/2.meta",
                 [of_region(1), of_region(2), of_region(3)],
+                Some([of_region_meta(4, true)]),
             )
             .await;
 
@@ -441,16 +532,21 @@ mod test {
         coll.add_subcompaction(&SubcompactionResult::of(subc1));
         coll.add_subcompaction(&SubcompactionResult::of(subc2));
         coll.add_subcompaction(&SubcompactionResult::of(subc3));
-        let mig = coll.mig(st.storage().as_ref()).await.unwrap();
+        let mig = coll.mig(st.storage().clone()).await.unwrap();
         assert_eq!(mig.edit_meta.len(), 2);
         let check = |me: &brpb::MetaEdit| match me.get_path() {
             "v1/backupmeta/1.meta" => {
                 assert!(!me.destruct_self);
+                // file 3 not compacted
+                assert!(!me.all_data_files_compacted);
                 assert_eq!(me.delete_logical_files.len(), 1);
                 assert_eq!(me.delete_logical_files[0].spans.len(), 2);
             }
             "v1/backupmeta/2.meta" => {
-                assert!(me.destruct_self);
+                // file 4 not compacted
+                assert!(!me.destruct_self);
+                // but file 4 is meta kv file
+                assert!(me.all_data_files_compacted);
                 assert_eq!(me.delete_physical_files.len(), 1, "{:?}", me);
                 assert_eq!(me.delete_logical_files.len(), 0, "{:?}", me);
             }
diff --git a/components/compact-log-backup/src/compaction/mod.rs b/components/compact-log-backup/src/compaction/mod.rs
index 3365fb0499f..9588d7b9d6b 100644
--- a/components/compact-log-backup/src/compaction/mod.rs
+++ b/components/compact-log-backup/src/compaction/mod.rs
@@ -1,6 +1,7 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
-use std::{collections::HashSet, ops::Deref, sync::Arc};
+use std::{collections::HashSet, ops::Deref};
 
+use bytes::Bytes;
 use derive_more::Display;
 use kvproto::brpb::{self, FileType};
 
@@ -53,15 +54,15 @@ pub struct Subcompaction {
     pub input_min_ts: u64,
     pub compact_from_ts: u64,
     pub compact_to_ts: u64,
-    pub min_key: Arc<[u8]>,
-    pub max_key: Arc<[u8]>,
+    pub min_key: Bytes,
+    pub max_key: Bytes,
     pub epoch_hints: Vec<EpochHint>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct EpochHint {
-    pub start_key: Arc<[u8]>,
-    pub end_key: Arc<[u8]>,
+    pub start_key: Bytes,
+    pub end_key: Bytes,
     pub region_epoch: Epoch,
 }
 
@@ -112,8 +113,8 @@ struct UnformedSubcompaction {
     inputs: Vec<Input>,
     min_ts: u64,
     max_ts: u64,
-    min_key: Arc<[u8]>,
-    max_key: Arc<[u8]>,
+    min_key: Bytes,
+    max_key: Bytes,
     epoch_hints: HashSet<EpochHint>,
 }
 
@@ -143,8 +144,8 @@ impl UnformedSubcompaction {
             size: self.size,
             input_min_ts: self.min_ts,
             input_max_ts: self.max_ts,
-            min_key: self.min_key.clone(),
-            max_key: self.max_key.clone(),
+            min_key: self.min_key,
+            max_key: self.max_key,
             compact_from_ts: cfg.compact_from_ts,
             compact_to_ts: cfg.compact_to_ts,
             subc_key: *key,
diff --git a/components/compact-log-backup/src/exec_hooks/checkpoint.rs b/components/compact-log-backup/src/exec_hooks/checkpoint.rs
index 6bbfe42422b..ff1e85c3b61 100644
--- a/components/compact-log-backup/src/exec_hooks/checkpoint.rs
+++ b/components/compact-log-backup/src/exec_hooks/checkpoint.rs
@@ -7,9 +7,9 @@ use futures::stream::TryStreamExt;
 use tikv_util::{info, time::Instant, warn};
 
 use crate::{
+    ErrorKind, OtherErrExt, Result, TraceResultExt,
     compaction::META_OUT_REL,
     execute::hooking::{BeforeStartCtx, CId, ExecHooks, SubcompactionStartCtx},
-    ErrorKind, OtherErrExt, Result, TraceResultExt,
 };
 
 #[derive(Default)]
diff --git a/components/compact-log-backup/src/exec_hooks/consistency.rs b/components/compact-log-backup/src/exec_hooks/consistency.rs
index c22a49c9719..3b3cef912bf 100644
--- a/components/compact-log-backup/src/exec_hooks/consistency.rs
+++ b/components/compact-log-backup/src/exec_hooks/consistency.rs
@@ -1,16 +1,16 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
 pub use engine_traits::SstCompressionType;
-use external_storage::{locking::RemoteLock, ExternalStorage};
+use external_storage::{ExternalStorage, locking::RemoteLock};
 use futures::{io::AsyncReadExt, stream::TryStreamExt};
 use tikv_util::warn;
 
 use crate::{
+    ErrorKind, TraceResultExt,
     errors::Result,
     execute::hooking::{AbortedCtx, AfterFinishCtx, BeforeStartCtx, ExecHooks},
     storage::LOCK_PREFIX,
     util::storage_url,
-    ErrorKind, TraceResultExt,
 };
 
 #[derive(Default)]
@@ -39,7 +39,9 @@ async fn load_storage_checkpoint(storage: &dyn ExternalStorage) -> Result<Option
             };
             let res = match i {
                 None => Some(ts),
-                Some(ts0) => Some(ts.min(ts0)),
+                // Any checkpoint stored in storage is a verified checkpoint TS.
+                // Choose the max value among them is still safe.
+                Some(ts0) => Some(ts.max(ts0)),
             };
             Ok(res)
         })
diff --git a/components/compact-log-backup/src/exec_hooks/observability.rs b/components/compact-log-backup/src/exec_hooks/observability.rs
index 1a24e869529..1b628d4637b 100644
--- a/components/compact-log-backup/src/exec_hooks/observability.rs
+++ b/components/compact-log-backup/src/exec_hooks/observability.rs
@@ -6,6 +6,7 @@ use tokio::{io::AsyncWriteExt, signal::unix::SignalKind};
 
 use super::CollectStatistic;
 use crate::{
+    ErrorKind,
     errors::Result,
     execute::hooking::{
         AbortedCtx, AfterFinishCtx, BeforeStartCtx, CId, ExecHooks, SubcompactionFinishCtx,
@@ -14,7 +15,6 @@ use crate::{
     statistic::prom,
     storage::StreamMetaStorage,
     util::storage_url,
-    ErrorKind,
 };
 
 /// The hooks that used for an execution from a TTY. Providing the basic
diff --git a/components/compact-log-backup/src/exec_hooks/save_meta.rs b/components/compact-log-backup/src/exec_hooks/save_meta.rs
index adfc7225ec4..67681971d6b 100644
--- a/components/compact-log-backup/src/exec_hooks/save_meta.rs
+++ b/components/compact-log-backup/src/exec_hooks/save_meta.rs
@@ -1,3 +1,5 @@
+use std::{sync::Arc, time::Instant};
+
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 use chrono::Local;
 pub use engine_traits::SstCompressionType;
@@ -5,13 +7,14 @@ use external_storage::UnpinReader;
 use futures::{future::TryFutureExt, io::Cursor};
 use kvproto::brpb;
 use tikv_util::{
-    stream::{retry, JustRetry},
+    info,
+    stream::{JustRetry, retry},
     warn,
 };
 
 use super::CollectStatistic;
 use crate::{
-    compaction::{meta::CompactionRunInfoBuilder, META_OUT_REL, SST_OUT_REL},
+    compaction::{META_OUT_REL, SST_OUT_REL, meta::CompactionRunInfoBuilder},
     errors::Result,
     execute::hooking::{
         AfterFinishCtx, BeforeStartCtx, CId, ExecHooks, SubcompactionFinishCtx,
@@ -158,6 +161,11 @@ impl ExecHooks for SaveMeta {
         }
         let comments = self.comments();
         self.collector.mut_meta().set_comments(comments);
-        self.collector.write_migration(cx.storage).await
+        let begin = Instant::now();
+        self.collector
+            .write_migration(Arc::clone(cx.storage))
+            .await?;
+        info!("Migration written."; "duration" => ?begin.elapsed());
+        Ok(())
     }
 }
diff --git a/components/compact-log-backup/src/exec_hooks/skip_small_compaction.rs b/components/compact-log-backup/src/exec_hooks/skip_small_compaction.rs
index c16bc3cfd38..17df361ad3e 100644
--- a/components/compact-log-backup/src/exec_hooks/skip_small_compaction.rs
+++ b/components/compact-log-backup/src/exec_hooks/skip_small_compaction.rs
@@ -22,7 +22,7 @@ impl SkipSmallCompaction {
 impl ExecHooks for SkipSmallCompaction {
     fn before_a_subcompaction_start(&mut self, _cid: CId, cx: SubcompactionStartCtx<'_>) {
         if cx.subc.size < self.size_threshold {
-            info!("Skipped a small compaction."; 
+            info!("Skipped a small compaction.";
                 "size" => cx.subc.size, "threshold" => self.size_threshold);
             cx.skip();
         }
diff --git a/components/compact-log-backup/src/execute/hooking.rs b/components/compact-log-backup/src/execute/hooking.rs
index c0443dc968f..451802b9f88 100644
--- a/components/compact-log-backup/src/execute/hooking.rs
+++ b/components/compact-log-backup/src/execute/hooking.rs
@@ -1,17 +1,17 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::cell::Cell;
+use std::{cell::Cell, sync::Arc};
 
 pub use engine_traits::SstCompressionType;
 use external_storage::ExternalStorage;
 use tokio::runtime::Handle;
 
 use crate::{
+    Error,
     compaction::{Subcompaction, SubcompactionResult},
     errors::Result,
     execute::Execution,
     statistic::{CollectSubcompactionStatistic, LoadMetaStatistic},
-    Error,
 };
 
 pub struct NoHooks;
@@ -44,7 +44,7 @@ pub struct AfterFinishCtx<'a> {
     /// The target external storage of this compaction.
     ///
     /// For now, it is always the same as the source storage.
-    pub storage: &'a dyn ExternalStorage,
+    pub storage: &'a Arc<dyn ExternalStorage>,
 }
 
 #[derive(Clone, Copy)]
@@ -78,7 +78,7 @@ pub struct SubcompactionStartCtx<'a> {
     pub(super) skip: &'a Cell<bool>,
 }
 
-impl<'a> SubcompactionStartCtx<'a> {
+impl SubcompactionStartCtx<'_> {
     pub fn skip(&self) {
         self.skip.set(true);
     }
diff --git a/components/compact-log-backup/src/execute/mod.rs b/components/compact-log-backup/src/execute/mod.rs
index b9f2cbc71c5..568ac7f5f7b 100644
--- a/components/compact-log-backup/src/execute/mod.rs
+++ b/components/compact-log-backup/src/execute/mod.rs
@@ -18,7 +18,7 @@ use hooking::{
 use kvproto::brpb::StorageBackend;
 use tikv_util::config::ReadableSize;
 use tokio::runtime::Handle;
-use tracing::{trace_span, Instrument};
+use tracing::{Instrument, trace_span};
 use tracing_active_tree::{frame, root};
 use txn_types::TimeStamp;
 
@@ -31,9 +31,10 @@ use super::{
     storage::{LoadFromExt, StreamMetaStorage},
 };
 use crate::{
-    compaction::{exec::SubcompactionExecArg, SubcompactionResult},
+    ErrorKind,
+    compaction::{SubcompactionResult, exec::SubcompactionExecArg},
     errors::{Result, TraceResultExt},
-    util, ErrorKind,
+    util,
 };
 
 const COMPACTION_V1_PREFIX: &str = "v1/compactions";
@@ -50,6 +51,10 @@ pub struct ExecutionConfig {
     pub from_ts: u64,
     /// Filter out files doesn't contain any record with TS less than this.
     pub until_ts: u64,
+    /// The max count of running prefetch tasks.
+    pub prefetch_running_count: u64,
+    /// The max count of saved prefetch tasks in the queue.
+    pub prefetch_buffer_count: u64,
     /// The compress algorithm we are going to use for output.
     pub compression: SstCompressionType,
     /// The compress level we are going to use.
@@ -129,7 +134,7 @@ pub struct Execution<DB: SstExt = RocksEngine> {
 }
 
 struct ExecuteCtx<'a, H: ExecHooks> {
-    storage: &'a Arc<dyn ExternalStorage>,
+    storage: &'a Arc<dyn ExternalStorage + 'static>,
     hooks: &'a mut H,
 }
 
@@ -152,11 +157,12 @@ impl Execution {
     async fn run_prepared(&self, cx: &mut ExecuteCtx<'_, impl ExecHooks>) -> Result<()> {
         let mut ext = LoadFromExt::default();
         let next_compaction = trace_span!("next_compaction");
-        ext.max_concurrent_fetch = 128;
         ext.loading_content_span = Some(trace_span!(
             parent: next_compaction.clone(),
             "load_meta_file_names"
         ));
+        ext.prefetch_running_count = self.cfg.prefetch_running_count as usize;
+        ext.prefetch_buffer_count = self.cfg.prefetch_buffer_count as usize;
 
         let ExecuteCtx {
             ref storage,
@@ -171,7 +177,8 @@ impl Execution {
         };
         hooks.before_execution_started(cx).await?;
 
-        let meta = StreamMetaStorage::load_from_ext(storage.as_ref(), ext).await?;
+        let storage = Arc::clone(storage);
+        let meta = StreamMetaStorage::load_from_ext(&storage, ext).await?;
         let stream = meta.flat_map(|file| match file {
             Ok(file) => stream::iter(file.into_logs()).map(Ok).left_stream(),
             Err(err) => stream::once(futures::future::err(err)).right_stream(),
@@ -214,7 +221,7 @@ impl Execution {
             let compact_args = SubcompactionExecArg {
                 out_prefix: Some(Path::new(&self.out_prefix).to_owned()),
                 db: self.db.clone(),
-                storage: Arc::clone(storage) as _,
+                storage: Arc::clone(&storage),
             };
             let compact_worker = SubcompactionExec::from(compact_args);
             let mut ext = SubcompactExt::default();
@@ -247,7 +254,7 @@ impl Execution {
         }
         let cx = AfterFinishCtx {
             async_rt: &Handle::current(),
-            storage: storage.as_ref(),
+            storage: &storage,
         };
         hooks.after_execution_finished(cx).await?;
 
diff --git a/components/compact-log-backup/src/execute/test.rs b/components/compact-log-backup/src/execute/test.rs
index 743316cdf69..4e4734e9fac 100644
--- a/components/compact-log-backup/src/execute/test.rs
+++ b/components/compact-log-backup/src/execute/test.rs
@@ -4,8 +4,8 @@ use std::{
     collections::HashMap,
     future::Future,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicU64, Ordering},
     },
 };
 
@@ -17,6 +17,7 @@ use tokio::sync::mpsc::Sender;
 
 use super::{Execution, ExecutionConfig};
 use crate::{
+    ErrorKind,
     compaction::SubcompactionResult,
     errors::OtherErrExt,
     exec_hooks::{
@@ -25,8 +26,7 @@ use crate::{
     },
     execute::hooking::{CId, ExecHooks, SubcompactionFinishCtx},
     storage::LOCK_PREFIX,
-    test_util::{gen_step, CompactInMem, KvGen, LogFileBuilder, TmpStorage},
-    ErrorKind,
+    test_util::{CompactInMem, KvGen, LogFileBuilder, TmpStorage, gen_step},
 };
 
 #[derive(Clone)]
@@ -71,6 +71,8 @@ pub fn create_compaction(st: StorageBackend) -> Execution {
             until_ts: u64::MAX,
             compression: engine_traits::SstCompressionType::Lz4,
             compression_level: None,
+            prefetch_buffer_count: 128,
+            prefetch_running_count: 128,
         },
         max_concurrent_subcompaction: 3,
         external_storage: st,
@@ -230,12 +232,18 @@ async fn test_consistency_guard() {
     let mut exec = create_compaction(st.backend());
     exec.cfg.until_ts = 41;
     let c = StorageConsistencyGuard::default();
-    tokio::task::block_in_place(|| exec.run(c).unwrap_err());
+    tokio::task::block_in_place(|| exec.run(c).unwrap());
 
     let mut exec = create_compaction(st.backend());
     exec.cfg.until_ts = 39;
     let c = StorageConsistencyGuard::default();
     tokio::task::block_in_place(|| exec.run(c).unwrap());
+
+    put_checkpoint(strg, 2, 49).await;
+    let mut exec = create_compaction(st.backend());
+    exec.cfg.until_ts = 43;
+    let c = StorageConsistencyGuard::default();
+    tokio::task::block_in_place(|| exec.run(c).unwrap());
 }
 
 #[tokio::test]
diff --git a/components/compact-log-backup/src/source.rs b/components/compact-log-backup/src/source.rs
index 44a6c75745b..a82fd1dc8a6 100644
--- a/components/compact-log-backup/src/source.rs
+++ b/components/compact-log-backup/src/source.rs
@@ -1,6 +1,6 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 use std::{
-    pin::{pin, Pin},
+    pin::{Pin, pin},
     sync::Arc,
 };
 
@@ -12,7 +12,7 @@ use kvproto::brpb;
 use prometheus::core::{Atomic, AtomicU64};
 use tikv_util::{
     codec::stream_event::{self, Iterator},
-    stream::{retry_all_ext, JustRetry, RetryExt},
+    stream::{JustRetry, RetryExt, retry_all_ext},
 };
 use txn_types::Key;
 
@@ -133,7 +133,7 @@ mod tests {
         compaction::{Input, Subcompaction},
         statistic::LoadStatistic,
         storage::{LogFile, MetaFile},
-        test_util::{gen_adjacent_with_ts, KvGen, LogFileBuilder, TmpStorage},
+        test_util::{KvGen, LogFileBuilder, TmpStorage, gen_adjacent_with_ts},
     };
 
     const NUM_FLUSH: usize = 2;
diff --git a/components/compact-log-backup/src/statistic.rs b/components/compact-log-backup/src/statistic.rs
index 347b1f25342..4d1c4d3f3af 100644
--- a/components/compact-log-backup/src/statistic.rs
+++ b/components/compact-log-backup/src/statistic.rs
@@ -58,7 +58,6 @@ pub struct LoadMetaStatistic {
 /// The statistic of loading data files for a subcompaction.
 #[derive(Default, Debug, Add, AddAssign, Clone, Serialize)]
 #[serde(rename_all = "kebab-case")]
-
 pub struct LoadStatistic {
     /// How many logical "files" we have loaded?
     pub files_in: u64,
@@ -119,11 +118,11 @@ pub struct CollectSubcompactionStatistic {
 
 pub mod prom {
     use prometheus::*;
-    use serde::{ser::SerializeMap, Serialize};
+    use serde::{Serialize, ser::SerializeMap};
 
     struct ShowPromHist<'a>(&'a Histogram);
 
-    impl<'a> Serialize for ShowPromHist<'a> {
+    impl Serialize for ShowPromHist<'_> {
         fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
         where
             S: serde::Serializer,
diff --git a/components/compact-log-backup/src/storage.rs b/components/compact-log-backup/src/storage.rs
index a4692f1f986..8bf04999538 100644
--- a/components/compact-log-backup/src/storage.rs
+++ b/components/compact-log-backup/src/storage.rs
@@ -1,41 +1,42 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 use std::{
-    collections::{BTreeSet, HashMap, HashSet, VecDeque},
+    collections::{BTreeSet, HashMap, HashSet, VecDeque, hash_map::Entry},
     future::Future,
-    ops::Not,
+    ops::{Deref, Not},
     path::Path,
     pin::Pin,
     sync::Arc,
-    task::{ready, Context, Poll},
+    task::{Context, Poll, ready},
 };
 
+use cloud::blob::read_to_end;
 use derive_more::Display;
 use external_storage::{BlobObject, ExternalStorage, UnpinReader};
 use futures::{
     future::{FusedFuture, FutureExt, TryFutureExt},
-    io::{AsyncReadExt, Cursor},
+    io::Cursor,
     stream::{Fuse, FusedStream, StreamExt, TryStreamExt},
 };
 use kvproto::{
-    brpb::{self, FileType, MetaEdit, Migration},
+    brpb::{self, DataFileInfo, FileType, MetaEdit, Metadata, Migration},
     metapb::RegionEpoch,
 };
 use prometheus::core::{Atomic, AtomicU64};
-use protobuf::ProtobufEnum;
+use protobuf::{Chars, ProtobufEnum};
 use tikv_util::{
     info, retry_expr,
     stream::{JustRetry, RetryExt},
-    time::Instant,
 };
+use tokio::time::Instant;
 use tokio_stream::Stream;
-use tracing::{span::Entered, Span};
+use tracing::{Span, span::Entered};
 use tracing_active_tree::frame;
 
 use super::{
     errors::{Error, Result},
     statistic::LoadMetaStatistic,
 };
-use crate::{compaction::EpochHint, errors::ErrorKind, util, OtherErrExt};
+use crate::{OtherErrExt, compaction::EpochHint, errors::ErrorKind, util};
 
 pub const METADATA_PREFIX: &str = "v1/backupmeta";
 pub const DEFAULT_COMPACTION_OUT_PREFIX: &str = "v1/compaction_out";
@@ -51,28 +52,27 @@ pub struct MetaFile {
     pub max_ts: u64,
 }
 
-impl From<brpb::Metadata> for MetaFile {
-    fn from(value: brpb::Metadata) -> Self {
+impl From<Metadata> for MetaFile {
+    fn from(value: Metadata) -> Self {
         Self::from_file(Arc::from(":memory:"), value)
     }
 }
 
 impl MetaFile {
-    pub fn from_file(name: Arc<str>, mut meta_file: brpb::Metadata) -> Self {
+    pub fn from_file(name: Arc<str>, mut meta_file: Metadata) -> Self {
         let mut log_files = vec![];
         let min_ts = meta_file.min_ts;
         let max_ts = meta_file.max_ts;
 
         // NOTE: perhaps we also need consider non-grouped backup meta here?
         for mut group in meta_file.take_file_groups().into_iter() {
-            let name = Arc::from(group.path.clone().into_boxed_str());
             let mut g = PhysicalLogFile {
                 size: group.length,
-                name: Arc::clone(&name),
-                files: vec![],
+                name: group.path.clone(),
+                files: Vec::with_capacity(group.data_files_info.len()),
             };
             for log_file in group.take_data_files_info().into_iter() {
-                g.files.push(LogFile::from_pb(Arc::clone(&name), log_file))
+                g.files.push(LogFile::from_pb(group.path.clone(), log_file))
             }
             log_files.push(g);
         }
@@ -98,7 +98,7 @@ impl MetaFile {
 #[derive(Debug, PartialEq, Eq)]
 pub struct PhysicalLogFile {
     pub size: u64,
-    pub name: Arc<str>,
+    pub name: Chars,
     pub files: Vec<LogFile>,
 }
 
@@ -142,17 +142,17 @@ pub struct LogFile {
     pub min_ts: u64,
     pub max_ts: u64,
     pub min_start_ts: u64,
-    pub min_key: Arc<[u8]>,
-    pub max_key: Arc<[u8]>,
-    pub region_start_key: Option<Arc<[u8]>>,
-    pub region_end_key: Option<Arc<[u8]>>,
+    pub min_key: bytes::Bytes,
+    pub max_key: bytes::Bytes,
+    pub region_start_key: Option<bytes::Bytes>,
+    pub region_end_key: Option<bytes::Bytes>,
     pub region_epoches: Option<Arc<[Epoch]>>,
     pub is_meta: bool,
     pub ty: FileType,
     pub compression: brpb::CompressionType,
     pub table_id: i64,
     pub resolved_ts: u64,
-    pub sha256: Arc<[u8]>,
+    pub sha256: bytes::Bytes,
 }
 
 impl LogFile {
@@ -167,8 +167,8 @@ impl LogFile {
                 self.region_end_key.iter().flat_map(|ek| {
                     epoches.iter().map(|v| EpochHint {
                         region_epoch: *v,
-                        start_key: Arc::clone(sk),
-                        end_key: Arc::clone(ek),
+                        start_key: sk.clone(),
+                        end_key: ek.clone(),
                     })
                 })
             })
@@ -181,7 +181,7 @@ impl LogFile {
 #[derive(Clone, Display, Eq, PartialEq, Hash)]
 #[display(fmt = "{}@{}+{}", name, offset, length)]
 pub struct LogFileId {
-    pub name: Arc<str>,
+    pub name: Chars,
     pub offset: u64,
     pub length: u64,
 }
@@ -197,8 +197,6 @@ impl std::fmt::Debug for LogFileId {
 
 /// Extra config for loading metadata.
 pub struct LoadFromExt<'a> {
-    /// Max number of concurrent fetching from remote tasks.
-    pub max_concurrent_fetch: usize,
     /// The [`tracing::Span`] of loading remote tasks.
     /// This span will be entered when fetching the remote tasks.
     /// This span will be closed when all metadata loaded.
@@ -206,20 +204,25 @@ pub struct LoadFromExt<'a> {
     /// The prefix of metadata in the external storage.
     /// By default it is `v1/backupmeta`.
     pub meta_prefix: &'a str,
+    /// Max number of running tasks to fetch metadatas
+    pub prefetch_running_count: usize,
+    /// Max number of spawning tasks to fetch metadatas
+    pub prefetch_buffer_count: usize,
 }
 
-impl<'a> LoadFromExt<'a> {
+impl LoadFromExt<'_> {
     fn enter_load_span(&self) -> Option<Entered<'_>> {
         self.loading_content_span.as_ref().map(|span| span.enter())
     }
 }
 
-impl<'a> Default for LoadFromExt<'a> {
+impl Default for LoadFromExt<'_> {
     fn default() -> Self {
         Self {
-            max_concurrent_fetch: 16,
             loading_content_span: None,
             meta_prefix: METADATA_PREFIX,
+            prefetch_running_count: 128,
+            prefetch_buffer_count: 1024,
         }
     }
 }
@@ -232,15 +235,19 @@ pub struct StreamMetaStorage<'a> {
     // NOTE: we want to keep the order of incoming meta files, so calls with the same argument can
     // generate the same compactions.
     prefetch: VecDeque<
-        Prefetch<Pin<Box<dyn Future<Output = Result<(MetaFile, LoadMetaStatistic)>> + 'a>>>,
+        Prefetch<
+            Pin<Box<dyn Future<Output = Result<(MetaFile, LoadMetaStatistic)>> + Send + 'static>>,
+        >,
     >,
-    ext_storage: &'a dyn ExternalStorage,
+    ext_storage: Arc<dyn ExternalStorage>,
     ext: LoadFromExt<'a>,
     stat: LoadMetaStatistic,
 
     files: Fuse<Pin<Box<dyn Stream<Item = std::io::Result<BlobObject>> + 'a>>>,
 
     skip_map: MetaEditFilters,
+
+    running_fetch_tasks: usize,
 }
 
 /// A future that stores its result for future use when completed.
@@ -297,7 +304,7 @@ impl<F: Future> FusedFuture for Prefetch<F> {
     }
 }
 
-impl<'a> Stream for StreamMetaStorage<'a> {
+impl Stream for StreamMetaStorage<'_> {
     type Item = Result<MetaFile>;
 
     fn poll_next(
@@ -310,12 +317,16 @@ impl<'a> Stream for StreamMetaStorage<'a> {
 
         let first_result = self.poll_first_prefetch(cx);
         match first_result {
-            Poll::Ready(item) => Poll::Ready(Some(item.map(|mut meta| {
-                let sm = &self.skip_map;
-                let skipped = sm.apply_to(&mut meta);
-                self.stat.log_filtered_out_by_migration += skipped as u64;
-                meta
-            }))),
+            Poll::Ready(item) => {
+                let result = item.map(|mut meta| {
+                    let sm = &self.skip_map;
+                    let skipped = sm.apply_to(&mut meta);
+                    self.stat.log_filtered_out_by_migration += skipped as u64;
+                    meta
+                });
+                let _ = self.poll_fetch_or_finish(cx);
+                Poll::Ready(Some(result))
+            }
             Poll::Pending => self.poll_fetch_or_finish(cx),
         }
     }
@@ -326,7 +337,9 @@ impl<'a> StreamMetaStorage<'a> {
     fn poll_fetch_or_finish(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<MetaFile>>> {
         loop {
             // No more space for prefetching.
-            if self.prefetch.len() >= self.ext.max_concurrent_fetch {
+            if self.running_fetch_tasks >= self.ext.prefetch_running_count
+                || self.prefetch.len() >= self.ext.prefetch_buffer_count
+            {
                 return Poll::Pending;
             }
             if self.files.is_terminated() {
@@ -349,9 +362,9 @@ impl<'a> StreamMetaStorage<'a> {
                         self.stat.meta_filtered_out_by_migration += 1;
                         continue;
                     }
-
-                    let mut fut =
-                        Prefetch::new(MetaFile::load_from(self.ext_storage, load).boxed_local());
+                    let storage = Arc::clone(&self.ext_storage);
+                    let handle = tokio::spawn(MetaFile::load_from_owned(storage, load));
+                    let mut fut = Prefetch::new(async move { handle.await.unwrap() }.boxed());
                     // start the execution of this future.
                     let poll = fut.poll_unpin(cx);
                     if poll.is_ready() {
@@ -360,6 +373,7 @@ impl<'a> StreamMetaStorage<'a> {
                     }
                     self.stat.prefetch_task_emitted += 1;
                     self.prefetch.push_back(fut);
+                    self.running_fetch_tasks += 1;
                 }
                 Poll::Ready(None) => continue,
                 Poll::Pending => return Poll::Pending,
@@ -368,9 +382,10 @@ impl<'a> StreamMetaStorage<'a> {
     }
 
     fn poll_first_prefetch(&mut self, cx: &mut Context<'_>) -> Poll<Result<MetaFile>> {
+        self.running_fetch_tasks = 0;
         for fut in &mut self.prefetch {
-            if !fut.is_terminated() {
-                let _ = fut.poll_unpin(cx);
+            if !fut.is_terminated() && fut.poll_unpin(cx) == Poll::Pending {
+                self.running_fetch_tasks += 1;
             }
         }
         if self.prefetch[0].is_terminated() {
@@ -396,17 +411,21 @@ impl<'a> StreamMetaStorage<'a> {
     /// Streaming metadata from an external storage.
     /// Defaultly this will fetch metadata from `v1/backupmeta`, you may
     /// override this in `ext`.
-    pub async fn load_from_ext(s: &'a dyn ExternalStorage, ext: LoadFromExt<'a>) -> Result<Self> {
+    pub async fn load_from_ext(
+        s: &'a Arc<dyn ExternalStorage>,
+        ext: LoadFromExt<'a>,
+    ) -> Result<Self> {
         let files = s.iter_prefix(ext.meta_prefix).fuse();
         let mig_ext = MigrationStorageWrapper::new(s);
         let skip_map = MetaEditFilters::from_migrations(mig_ext.load().await?);
         Ok(Self {
             prefetch: VecDeque::new(),
             files,
-            ext_storage: s,
+            ext_storage: Arc::clone(s),
             ext,
             stat: LoadMetaStatistic::default(),
             skip_map,
+            running_fetch_tasks: 0,
         })
     }
 
@@ -423,12 +442,19 @@ impl<'a> StreamMetaStorage<'a> {
 }
 
 impl MetaFile {
+    async fn load_from_owned(
+        s: Arc<dyn ExternalStorage>,
+        blob: BlobObject,
+    ) -> Result<(Self, LoadMetaStatistic)> {
+        Self::load_from(s.as_ref(), blob).await
+    }
+
     #[tracing::instrument(skip_all, fields(blob=%blob))]
     async fn load_from(
         s: &dyn ExternalStorage,
         blob: BlobObject,
     ) -> Result<(Self, LoadMetaStatistic)> {
-        use protobuf::Message;
+        use protobuf::{CodedInputStream, Message};
 
         let _t = crate::statistic::prom::COMPACT_LOG_BACKUP_READ_META_DURATION.start_coarse_timer();
 
@@ -444,19 +470,19 @@ impl MetaFile {
         let loading_file = tikv_util::stream::retry_all_ext(
             || async {
                 let mut content = vec![];
-                let n = s.read(&blob.key).read_to_end(&mut content).await?;
-                std::io::Result::Ok((n, content))
+                let n = read_to_end(s.read(&blob.key), &mut content).await?;
+                std::io::Result::Ok((n, bytes::Bytes::from(content)))
             },
             ext,
         );
         let (n, content) = frame!(loading_file)
             .await
             .map_err(|err| Error::from(err).message(format_args!("reading {}", blob.key)))?;
-        stat.physical_bytes_loaded += n as u64;
+        stat.physical_bytes_loaded += n;
         stat.error_during_downloading += error_cnt2.get();
 
-        let mut meta_file = kvproto::brpb::Metadata::new();
-        meta_file.merge_from_bytes(&content)?;
+        let mut meta_file = Metadata::new();
+        meta_file.merge_from(&mut CodedInputStream::from_carllerche_bytes(&content))?;
         let name = Arc::from(blob.key.into_boxed_str());
         let result = Self::from_file(name, meta_file);
 
@@ -466,14 +492,14 @@ impl MetaFile {
             .iter()
             .map(|v| v.files.len() as u64)
             .sum::<u64>();
-        stat.load_file_duration += begin.saturating_elapsed();
+        stat.load_file_duration += begin.elapsed();
 
         Ok((result, stat))
     }
 }
 
 impl LogFile {
-    fn from_pb(host_file: Arc<str>, mut pb_info: brpb::DataFileInfo) -> Self {
+    fn from_pb(host_file: Chars, mut pb_info: DataFileInfo) -> Self {
         let region_epoches = pb_info.region_epoch.is_empty().not().then(|| {
             pb_info
                 .region_epoch
@@ -493,24 +519,24 @@ impl LogFile {
             cf: util::cf_name(&pb_info.cf),
             max_ts: pb_info.max_ts,
             min_ts: pb_info.min_ts,
-            max_key: Arc::from(pb_info.take_end_key().into_boxed_slice()),
-            min_key: Arc::from(pb_info.take_start_key().into_boxed_slice()),
+            max_key: pb_info.take_end_key(),
+            min_key: pb_info.take_start_key(),
             region_start_key: pb_info
                 .region_epoch
                 .is_empty()
                 .not()
-                .then(|| Arc::from(pb_info.take_region_start_key().into_boxed_slice())),
+                .then(|| pb_info.take_region_start_key()),
             region_end_key: pb_info
                 .region_epoch
                 .is_empty()
                 .not()
-                .then(|| Arc::from(pb_info.take_region_end_key().into_boxed_slice())),
+                .then(|| pb_info.take_region_end_key()),
             is_meta: pb_info.is_meta,
             min_start_ts: pb_info.min_begin_ts_in_default_cf,
             ty: pb_info.r_type,
             crc64xor: pb_info.crc64xor,
             number_of_entries: pb_info.number_of_entries,
-            sha256: Arc::from(pb_info.take_sha256().into_boxed_slice()),
+            sha256: pb_info.take_sha256(),
             resolved_ts: pb_info.resolved_ts,
             table_id: pb_info.table_id,
             compression: pb_info.compression_type,
@@ -524,26 +550,22 @@ impl LogFile {
         pb.range_length = self.id.length;
         pb.length = self.file_real_size;
         pb.region_id = self.region_id as _;
-        pb.cf = self.cf.to_owned();
+        pb.cf = self.cf.into();
         pb.max_ts = self.max_ts;
         pb.min_ts = self.min_ts;
-        pb.set_end_key(self.max_key.to_vec());
-        pb.set_start_key(self.min_key.to_vec());
+        pb.set_end_key(self.max_key);
+        pb.set_start_key(self.min_key);
         pb.is_meta = self.is_meta;
         pb.min_begin_ts_in_default_cf = self.min_start_ts;
         pb.r_type = self.ty;
         pb.crc64xor = self.crc64xor;
         pb.number_of_entries = self.number_of_entries;
-        pb.set_sha256(self.sha256.to_vec());
+        pb.set_sha256(self.sha256);
         pb.resolved_ts = self.resolved_ts;
         pb.table_id = self.table_id;
         pb.compression_type = self.compression;
-        pb.set_region_start_key(
-            self.region_start_key
-                .map(|v| v.to_vec())
-                .unwrap_or_default(),
-        );
-        pb.set_region_end_key(self.region_end_key.map(|v| v.to_vec()).unwrap_or_default());
+        pb.set_region_start_key(self.region_start_key.unwrap_or_default());
+        pb.set_region_end_key(self.region_end_key.unwrap_or_default());
         pb.set_region_epoch(
             self.region_epoches
                 .map(|v| v.iter().cloned().map(From::from).collect())
@@ -582,16 +604,26 @@ struct MetaEditFilters(HashMap<String, MetaEditFilter>);
 
 impl MetaEditFilters {
     fn from_migrations(migs: impl IntoIterator<Item = Migration>) -> Self {
-        Self(
-            migs.into_iter()
-                .flat_map(|mut m| m.take_edit_meta().into_iter())
-                .map(|em| (em.path.clone(), MetaEditFilter::from_meta_edit(em)))
-                .collect(),
-        )
+        let iter = migs
+            .into_iter()
+            .flat_map(|mut m| m.take_edit_meta().into_iter());
+        let mut m: HashMap<String, MetaEditFilter> = HashMap::with_capacity(iter.size_hint().0);
+        iter.for_each(|em| {
+            match m.entry(em.path.clone()) {
+                Entry::Occupied(mut o) => o.get_mut().merge_from_meta_edit(em),
+                Entry::Vacant(v) => {
+                    v.insert(MetaEditFilter::from_meta_edit(em));
+                }
+            };
+        });
+        Self(m)
     }
 
     fn should_fully_skip(&self, meta: &str) -> bool {
-        self.0.get(meta).map(|v| v.destructed_self).unwrap_or(false)
+        self.0
+            .get(meta)
+            .map(|v| v.all_data_files_compacted || v.destructed_self)
+            .unwrap_or(false)
     }
 
     /// Apply the meta edition to a meta file and returns how many log files are
@@ -620,6 +652,7 @@ struct MetaEditFilter {
     // FileName -> Offset
     segments: HashMap<String, BTreeSet<u64>>,
     destructed_self: bool,
+    all_data_files_compacted: bool,
 }
 
 impl MetaEditFilter {
@@ -628,6 +661,7 @@ impl MetaEditFilter {
             full_files: Default::default(),
             segments: Default::default(),
             destructed_self: em.destruct_self,
+            all_data_files_compacted: em.all_data_files_compacted,
         };
         this.full_files
             .extend(em.take_delete_physical_files().into_iter());
@@ -646,13 +680,44 @@ impl MetaEditFilter {
         this
     }
 
+    fn merge_from_meta_edit(&mut self, mut em: MetaEdit) {
+        self.destructed_self = self.destructed_self || em.destruct_self;
+        self.all_data_files_compacted =
+            self.all_data_files_compacted || em.all_data_files_compacted;
+        if self.destructed_self || self.all_data_files_compacted {
+            // NOTE: the metakv files will be filtered out in
+            // `SubcompactionCollector::add_new_file`. Therefore, the
+            // self.segments and self.full_files can be clear here.
+            self.full_files = Default::default();
+            self.segments = Default::default();
+            return;
+        }
+        self.full_files
+            .extend(em.take_delete_physical_files().into_iter());
+        for deletion in em.get_delete_logical_files() {
+            if !self.segments.contains_key(deletion.get_path()) {
+                self.segments
+                    .insert(deletion.get_path().to_owned(), Default::default());
+            }
+
+            self.segments
+                .get_mut(deletion.get_path())
+                .unwrap()
+                .extend(deletion.get_spans().iter().map(|span| span.offset));
+        }
+        for path in &self.full_files {
+            self.segments.remove(path);
+        }
+        self.segments.shrink_to_fit();
+    }
+
     fn should_retain(&self, file: &LogFileId) -> bool {
-        if self.full_files.contains(file.name.as_ref()) {
+        if self.full_files.contains(file.name.deref()) {
             return false;
         }
         if self
             .segments
-            .get(file.name.as_ref())
+            .get(file.name.deref())
             .is_some_and(|map| map.contains(&file.offset))
         {
             return false;
@@ -681,10 +746,7 @@ impl<'a> MigrationStorageWrapper<'a> {
             .err_into()
             .and_then(|item| async move {
                 let mut content = vec![];
-                self.storage
-                    .read(&item.key)
-                    .read_to_end(&mut content)
-                    .await?;
+                read_to_end(self.storage.read(&item.key), &mut content).await?;
                 protobuf::parse_from_bytes(&content).adapt_err()
             })
             .try_collect()
@@ -782,13 +844,17 @@ pub fn hash_meta_edit(meta_edit: &brpb::MetaEdit) -> u64 {
 
 #[cfg(test)]
 mod test {
+    use std::sync::Arc;
+
+    use external_storage::ExternalStorage;
     use futures::stream::TryStreamExt;
     use kvproto::brpb::{DeleteSpansOfFile, MetaEdit, Migration, Span};
+    use protobuf::Chars;
 
     use super::{LoadFromExt, MetaFile, StreamMetaStorage};
     use crate::{
-        storage::MigrationStorageWrapper,
-        test_util::{gen_step, KvGen, LogFileBuilder, TmpStorage},
+        storage::{LogFileId, MetaEditFilters, MigrationStorageWrapper},
+        test_util::{KvGen, LogFileBuilder, TmpStorage, gen_step},
     };
 
     async fn construct_storage(
@@ -836,8 +902,9 @@ mod test {
         let st = &st;
         let test_for_concurrency = |n| async move {
             let mut ext = LoadFromExt::default();
-            ext.max_concurrent_fetch = n;
-            let sst = StreamMetaStorage::load_from_ext(st.storage().as_ref(), ext)
+            ext.prefetch_running_count = n;
+            let storage = st.storage().clone() as Arc<dyn ExternalStorage>;
+            let sst = StreamMetaStorage::load_from_ext(&storage, ext)
                 .await
                 .unwrap();
             let mut result = sst.try_collect::<Vec<_>>().await.unwrap();
@@ -850,6 +917,65 @@ mod test {
         test_for_concurrency(16).await;
     }
 
+    #[tokio::test]
+    async fn test_merge_meta_edits() {
+        let meta_path = |i| format!("v1/backupmeta/00000000-{i}.meta");
+        let file_path = |i| format!("v1/00000000/00000000-{i}.log");
+        let span = |i, i1, i2, i3| {
+            let mut s = DeleteSpansOfFile::new();
+            s.set_path(file_path(i));
+            let mut s1 = Span::new();
+            s1.set_offset(i1);
+            let mut s2 = Span::new();
+            s2.set_offset(i2);
+            let mut s3 = Span::new();
+            s3.set_offset(i3);
+            s.set_spans(vec![s1, s2, s3].into());
+            s
+        };
+        let mut meta_edit1 = MetaEdit::new();
+        meta_edit1.set_path(meta_path(1));
+        meta_edit1.mut_delete_physical_files().push(file_path(1));
+        meta_edit1.mut_delete_logical_files().push(span(2, 1, 2, 3));
+        meta_edit1.mut_delete_logical_files().push(span(3, 1, 2, 3));
+        let mut meta_edit2 = MetaEdit::new();
+        meta_edit2.set_path(meta_path(1));
+        meta_edit2.mut_delete_physical_files().push(file_path(2));
+        meta_edit2.mut_delete_logical_files().push(span(3, 4, 5, 6));
+        let mut meta_edit3 = MetaEdit::new();
+        meta_edit3.set_path(meta_path(2));
+        meta_edit3.mut_delete_physical_files().push(file_path(4));
+        meta_edit3.mut_delete_logical_files().push(span(5, 1, 2, 3));
+        let mut meta_edit4 = MetaEdit::new();
+        meta_edit4.set_path(meta_path(2));
+        meta_edit4.set_destruct_self(true);
+        let mut mig1 = Migration::new();
+        mig1.mut_edit_meta().push(meta_edit1);
+        mig1.mut_edit_meta().push(meta_edit3);
+        let mut mig2 = Migration::new();
+        mig2.mut_edit_meta().push(meta_edit2);
+        mig2.mut_edit_meta().push(meta_edit4);
+        let migs = vec![mig1, mig2];
+        let mefs = MetaEditFilters::from_migrations(migs);
+        assert!(mefs.should_fully_skip(&meta_path(2)));
+        assert!(!mefs.should_fully_skip(&meta_path(1)));
+        let f1 = mefs.0.get(&meta_path(1)).unwrap();
+        let log_file_id = |name: String, offset: u64| LogFileId {
+            name: Chars::from(name),
+            offset,
+            length: offset + 1,
+        };
+        assert!(!f1.should_retain(&log_file_id(file_path(1), 234)));
+        assert!(!f1.should_retain(&log_file_id(file_path(2), 435)));
+        assert!(!f1.should_retain(&log_file_id(file_path(3), 1)));
+        assert!(!f1.should_retain(&log_file_id(file_path(3), 2)));
+        assert!(!f1.should_retain(&log_file_id(file_path(3), 3)));
+        assert!(!f1.should_retain(&log_file_id(file_path(3), 4)));
+        assert!(!f1.should_retain(&log_file_id(file_path(3), 5)));
+        assert!(!f1.should_retain(&log_file_id(file_path(3), 6)));
+        assert!(f1.should_retain(&log_file_id(file_path(3), 7)));
+    }
+
     #[tokio::test]
     async fn test_different_prefix() {
         let st = TmpStorage::create();
@@ -862,7 +988,8 @@ mod test {
 
         let mut ext = LoadFromExt::default();
         ext.meta_prefix = "my-fantastic-meta-dir";
-        let sst = StreamMetaStorage::load_from_ext(st.storage().as_ref(), ext)
+        let storage = st.storage().clone() as Arc<dyn ExternalStorage>;
+        let sst = StreamMetaStorage::load_from_ext(&storage, ext)
             .await
             .unwrap();
         let mut result = sst.try_collect::<Vec<_>>().await.unwrap();
@@ -925,7 +1052,8 @@ mod test {
         let s = MigrationStorageWrapper::new(st.storage().as_ref());
         s.write(mig.into()).await.unwrap();
         s.write(mig2.into()).await.unwrap();
-        let mut sst = StreamMetaStorage::load_from_ext(st.storage().as_ref(), Default::default())
+        let storage = st.storage().clone() as Arc<dyn ExternalStorage>;
+        let mut sst = StreamMetaStorage::load_from_ext(&storage, Default::default())
             .await
             .unwrap();
 
diff --git a/components/compact-log-backup/src/test_util.rs b/components/compact-log-backup/src/test_util.rs
index c5c0a01b493..171f2a53e38 100644
--- a/components/compact-log-backup/src/test_util.rs
+++ b/components/compact-log-backup/src/test_util.rs
@@ -6,9 +6,9 @@ use std::{
     ops::Not,
     path::{Path, PathBuf},
     sync::{Arc, Mutex},
-    u64,
 };
 
+use bytes::Bytes;
 use engine_rocks::RocksEngine;
 use engine_traits::{IterOptions, Iterator as _, RefIterable, SstExt};
 use external_storage::ExternalStorage;
@@ -18,8 +18,8 @@ use futures::{
     stream::StreamExt,
 };
 use keys::origin_key;
-use kvproto::brpb::{self, Metadata};
-use protobuf::{parse_from_bytes, Message};
+use kvproto::brpb;
+use protobuf::{Chars, Message, parse_from_bytes};
 use tempdir::TempDir;
 use tidb_query_datatype::codec::table::encode_row_key;
 use tikv_util::codec::stream_event::EventEncoder;
@@ -27,11 +27,11 @@ use txn_types::Key;
 
 use crate::{
     compaction::{
-        exec::{SubcompactExt, SubcompactionExec},
         Subcompaction, SubcompactionResult,
+        exec::{SubcompactExt, SubcompactionExec},
     },
     errors::{OtherErrExt, Result},
-    storage::{id_of_migration, Epoch, LogFile, LogFileId, MetaFile},
+    storage::{Epoch, LogFile, LogFileId, MetaFile, id_of_migration},
 };
 
 #[derive(Debug, PartialEq, Eq)]
@@ -325,26 +325,22 @@ impl LogFileBuilder {
 
             min_ts: self.min_ts,
             max_ts: self.max_ts,
-            min_key: Arc::from(self.min_key.into_boxed_slice()),
-            max_key: Arc::from(self.max_key.into_boxed_slice()),
+            min_key: Bytes::from(self.min_key),
+            max_key: Bytes::from(self.max_key),
             number_of_entries: self.number_of_entries as i64,
             crc64xor: self.crc64xor,
             compression: self.compression,
             file_real_size: self.file_real_size,
 
             id: LogFileId {
-                name: Arc::from(self.name.into_boxed_str()),
+                name: Chars::from(self.name),
                 offset: 0,
                 length: cnt.get_ref().len() as u64,
             },
             min_start_ts: 0,
             table_id: 0,
             resolved_ts: 0,
-            sha256: Arc::from(
-                sha256(cnt.get_ref())
-                    .expect("cannot calculate sha256 for file")
-                    .into_boxed_slice(),
-            ),
+            sha256: Bytes::from(sha256(cnt.get_ref()).expect("cannot calculate sha256 for file")),
             region_start_key: self.region_start_key.map(|v| v.into_boxed_slice().into()),
             region_end_key: self.region_end_key.map(|v| v.into_boxed_slice().into()),
             region_epoches: self
@@ -391,16 +387,54 @@ pub async fn save_many_log_files(
     name: &str,
     log_files: impl IntoIterator<Item = LogFileBuilder>,
     st: &dyn ExternalStorage,
-) -> std::io::Result<Metadata> {
+) -> std::io::Result<brpb::Metadata> {
     let mut w = vec![];
     let mut md = build_many_log_files(log_files, &mut w)?;
     let cl = w.len() as u64;
     let v = &mut md.file_groups[0];
-    v.set_path(name.to_string());
+    v.set_path(name.into());
     st.write(name, ACursor::new(w).into(), cl).await?;
     Ok(md)
 }
 
+/// Simulating a flush: save all log files and generate a metadata by them.
+/// Then save the generated metadata.
+pub async fn save_many_logs_files(
+    name: &str,
+    logs_files: impl IntoIterator<Item = impl IntoIterator<Item = LogFileBuilder>>,
+    st: &dyn ExternalStorage,
+) -> std::io::Result<brpb::Metadata> {
+    let mut md = brpb::Metadata::new();
+    md.set_meta_version(brpb::MetaVersion::V2);
+    for logs in logs_files {
+        let mut file_group = brpb::DataFileGroup::default();
+        let mut w = vec![];
+        let mut offset = 0;
+        for log in logs {
+            let (mut log_info, content) = log.build();
+            w.write_all(&content)?;
+            log_info.id.offset = offset;
+            log_info.id.length = content.len() as _;
+            md.min_ts = md.min_ts.min(log_info.min_ts);
+            md.max_ts = md.max_ts.max(log_info.max_ts);
+
+            let pb = log_info.into_pb();
+            file_group.data_files_info.push(pb);
+
+            offset += content.len() as u64;
+        }
+        file_group.set_length(offset);
+        let cl = w.len() as u64;
+        let file_group_name = format!("{name}.{}.log", md.file_groups.len());
+        st.write(&file_group_name, ACursor::new(w).into(), cl)
+            .await?;
+        file_group.set_path(file_group_name.into());
+        md.mut_file_groups().push(file_group);
+    }
+
+    Ok(md)
+}
+
 pub struct TmpStorage {
     path: Option<TempDir>,
     storage: Arc<external_storage::LocalStorage>,
@@ -515,15 +549,89 @@ impl TmpStorage {
         b.must_save(self.storage.as_ref()).await
     }
 
-    pub async fn build_flush(
+    pub async fn build_flush_logs(
         &self,
-        log_path: &str,
+        log_path_prefix: &str,
+        meta_path: &str,
+        data_kv_file_builders: impl IntoIterator<Item = impl IntoIterator<Item = LogFileBuilder>>,
+    ) -> MetaFile {
+        self.build_flush_with_many_physical_files(
+            log_path_prefix,
+            meta_path,
+            data_kv_file_builders,
+            None::<std::iter::Empty<LogFileBuilder>>,
+        )
+        .await
+    }
+
+    pub async fn build_flush_with_many_physical_files(
+        &self,
+        log_path_prefix: &str,
         meta_path: &str,
-        builders: impl IntoIterator<Item = LogFileBuilder>,
+        data_kv_file_builders: impl IntoIterator<Item = impl IntoIterator<Item = LogFileBuilder>>,
+        meta_kv_file_builders: Option<impl IntoIterator<Item = LogFileBuilder>>,
     ) -> MetaFile {
-        let result = save_many_log_files(log_path, builders, self.storage.as_ref())
+        let mut result = save_many_logs_files(
+            log_path_prefix,
+            data_kv_file_builders,
+            self.storage.as_ref(),
+        )
+        .await
+        .unwrap();
+        if let Some(builders) = meta_kv_file_builders {
+            let meta_kv_path = format!("meta_kv_{}", log_path_prefix);
+            let meta_result = save_many_log_files(&meta_kv_path, builders, self.storage.as_ref())
+                .await
+                .unwrap();
+            // hack way to merge different physical to one metadata.
+            result.file_groups.push(meta_result.file_groups[0].clone());
+        }
+        let content = result.write_to_bytes().unwrap();
+        self.storage
+            .write(
+                meta_path,
+                ACursor::new(&content).into(),
+                content.len() as u64,
+            )
             .await
             .unwrap();
+        MetaFile::from_file(Arc::from(meta_path), result)
+    }
+
+    pub async fn build_flush(
+        &self,
+        log_path: &str,
+        meta_path: &str,
+        data_kv_file_builders: impl IntoIterator<Item = LogFileBuilder>,
+    ) -> MetaFile {
+        self.build_flush_with_meta(
+            log_path,
+            meta_path,
+            data_kv_file_builders,
+            None::<std::iter::Empty<LogFileBuilder>>,
+        )
+        .await
+    }
+
+    pub async fn build_flush_with_meta(
+        &self,
+        log_path: &str,
+        meta_path: &str,
+        data_kv_file_builders: impl IntoIterator<Item = LogFileBuilder>,
+        meta_kv_file_builders: Option<impl IntoIterator<Item = LogFileBuilder>>,
+    ) -> MetaFile {
+        let mut result =
+            save_many_log_files(log_path, data_kv_file_builders, self.storage.as_ref())
+                .await
+                .unwrap();
+        if let Some(builders) = meta_kv_file_builders {
+            let meta_kv_path = format!("meta_kv_{}", log_path);
+            let meta_result = save_many_log_files(&meta_kv_path, builders, self.storage.as_ref())
+                .await
+                .unwrap();
+            // hack way to merge different physical to one metadata.
+            result.file_groups.push(meta_result.file_groups[0].clone());
+        }
         let content = result.write_to_bytes().unwrap();
         self.storage
             .write(
diff --git a/components/compact-log-backup/src/util.rs b/components/compact-log-backup/src/util.rs
index 4bfd31055ff..69343cf36e8 100644
--- a/components/compact-log-backup/src/util.rs
+++ b/components/compact-log-backup/src/util.rs
@@ -2,7 +2,7 @@
 
 use std::{fmt::Display, future::Future, task::Poll};
 
-use engine_traits::{CfName, SstCompressionType, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE};
+use engine_traits::{CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, CfName, SstCompressionType};
 use external_storage::ExternalStorage;
 
 /// A helper for cooperative concurrency.
@@ -170,7 +170,7 @@ pub fn compression_type_to_u8(c: SstCompressionType) -> u8 {
 #[derive(Eq, PartialEq)]
 pub struct EndKey<'a>(pub &'a [u8]);
 
-impl<'a> PartialOrd for EndKey<'a> {
+impl PartialOrd for EndKey<'_> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         use std::cmp::Ordering::*;
         match (self, other) {
@@ -182,7 +182,7 @@ impl<'a> PartialOrd for EndKey<'a> {
     }
 }
 
-impl<'a> Ord for EndKey<'a> {
+impl Ord for EndKey<'_> {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
         self.partial_cmp(other).unwrap()
     }
diff --git a/components/concurrency_manager/benches/update_max_ts.rs b/components/concurrency_manager/benches/update_max_ts.rs
index df2e61aeb42..b93c5b42afc 100644
--- a/components/concurrency_manager/benches/update_max_ts.rs
+++ b/components/concurrency_manager/benches/update_max_ts.rs
@@ -3,7 +3,7 @@
 use std::time::Duration;
 
 use concurrency_manager::{ActionOnInvalidMaxTs, ConcurrencyManager};
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use txn_types::TimeStamp;
 
 fn benchmark_update_max_ts(c: &mut Criterion) {
diff --git a/components/concurrency_manager/src/key_handle.rs b/components/concurrency_manager/src/key_handle.rs
index c7aebbc49e0..e8183e99b88 100644
--- a/components/concurrency_manager/src/key_handle.rs
+++ b/components/concurrency_manager/src/key_handle.rs
@@ -31,7 +31,10 @@ impl KeyHandle {
         // Safety: `_mutex_guard` is declared before `handle_ref` in `KeyHandleGuard`.
         // So the mutex guard will be released earlier than the `Arc<KeyHandle>`.
         // Then we can make sure the mutex guard doesn't point to released memory.
-        let mutex_guard = unsafe { mem::transmute(self.mutex.lock().await) };
+        let mutex_guard = unsafe {
+            #[allow(clippy::missing_transmute_annotations)]
+            mem::transmute(self.mutex.lock().await)
+        };
         KeyHandleGuard {
             _mutex_guard: mutex_guard,
             handle: self,
diff --git a/components/concurrency_manager/src/lib.rs b/components/concurrency_manager/src/lib.rs
index 7c6c8267ce6..57605fd9e3f 100644
--- a/components/concurrency_manager/src/lib.rs
+++ b/components/concurrency_manager/src/lib.rs
@@ -21,8 +21,8 @@ use std::{
     fmt::Display,
     mem::MaybeUninit,
     sync::{
-        atomic::{AtomicU64, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicU64, AtomicUsize, Ordering},
     },
     time::Duration,
 };
@@ -31,7 +31,7 @@ use crossbeam::atomic::AtomicCell;
 use lazy_static::lazy_static;
 use mockall::automock;
 use pd_client::{PdClient, PdFuture};
-use prometheus::{register_int_gauge, IntGauge};
+use prometheus::{IntGauge, register_int_gauge};
 use thiserror::Error;
 use tikv_util::{error, future::block_on_timeout, time::Instant, warn};
 use txn_types::{Key, Lock, TimeStamp};
@@ -209,7 +209,6 @@ impl ConcurrencyManager {
     /// - Ok(()): If the update is successful or has no effect
     /// - Err(limit): If new_ts is greater than the max_ts_limit, returns the
     ///   current limit value
-
     pub fn update_max_ts(
         &self,
         new_ts: TimeStamp,
@@ -575,7 +574,7 @@ pub trait IntoErrorSource: sealed::Sealed {
 }
 
 // &str impl
-impl<'a> sealed::Sealed for &'a str {}
+impl sealed::Sealed for &str {}
 impl<'a> IntoErrorSource for &'a str {
     type Output = &'a str;
     fn into_error_source(self) -> Self::Output {
diff --git a/components/concurrency_manager/tests/memory_usage.rs b/components/concurrency_manager/tests/memory_usage.rs
index 6822c2fdc52..e1d9e0c3f20 100644
--- a/components/concurrency_manager/tests/memory_usage.rs
+++ b/components/concurrency_manager/tests/memory_usage.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    mem::{forget, ManuallyDrop},
+    mem::{ManuallyDrop, forget},
     thread,
 };
 
diff --git a/components/coprocessor_plugin_api/src/allocator.rs b/components/coprocessor_plugin_api/src/allocator.rs
index d8c2ab5062f..555230a9141 100644
--- a/components/coprocessor_plugin_api/src/allocator.rs
+++ b/components/coprocessor_plugin_api/src/allocator.rs
@@ -18,6 +18,7 @@ pub struct HostAllocatorPtr {
 }
 
 /// An allocator that forwards invocations to the host (TiKV) of the plugin.
+#[derive(Default)]
 pub struct HostAllocator {
     alloc_fn: Atomic<Option<AllocFn>>,
     dealloc_fn: Atomic<Option<DeallocFn>>,
diff --git a/components/crossbeam-skiplist/src/lib.rs b/components/crossbeam-skiplist/src/lib.rs
index 222b735024a..904f833ea0e 100644
--- a/components/crossbeam-skiplist/src/lib.rs
+++ b/components/crossbeam-skiplist/src/lib.rs
@@ -91,9 +91,9 @@
 //! A solution to the above is to have the implementation wrap
 //! each value in a lock. However, this has some repercussions:
 //! * The map would no longer be lock-free, inhibiting scalability
-//! and allowing for deadlocks.
+//!   and allowing for deadlocks.
 //! * If a user of the map doesn't need mutable access, then they pay
-//! the price of locks without actually needing them.
+//!   the price of locks without actually needing them.
 //!
 //! Instead, the approach taken by this crate gives more control to the user.
 //! If mutable access is needed, then you can use interior mutability,
@@ -150,7 +150,7 @@
 //! Crossbeam [does not currently provide a concurrent unordered map](https://github.com/crossbeam-rs/rfcs/issues/32).
 //! That said, here are some other crates which may suit you:
 //! * [`DashMap`](https://docs.rs/dashmap) implements a novel concurrent hash map
-//! with good performance characteristics.
+//!   with good performance characteristics.
 //! * [`flurry`](https://docs.rs/flurry) is a Rust port of Java's `ConcurrentHashMap`.
 //!
 //! [`insert`]: SkipMap::insert
@@ -260,6 +260,7 @@ pub use crate::{map::SkipMap, set::SkipSet};
 
 // Prevent cargo machete warnings.
 mod seal {
+    #[allow(dead_code)]
     pub trait Sealed {}
     impl Sealed for crossbeam_skiplist_offical::SkipList<(), ()> {}
 }
diff --git a/components/crypto/Cargo.toml b/components/crypto/Cargo.toml
index b80628c2912..d1156484e37 100644
--- a/components/crypto/Cargo.toml
+++ b/components/crypto/Cargo.toml
@@ -13,3 +13,6 @@ openssl-sys = { workspace = true }
 slog = { workspace = true }
 # better to not use slog-global, but pass in the logger
 slog-global = { workspace = true }
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(ossl1)', 'cfg(ossl3)', 'cfg(disable_fips)'] }
diff --git a/components/crypto/build.rs b/components/crypto/build.rs
index 4b5b6fda112..cf974133ee6 100644
--- a/components/crypto/build.rs
+++ b/components/crypto/build.rs
@@ -3,7 +3,7 @@
 use std::env;
 
 fn main() {
-    if !option_env!("ENABLE_FIPS").map_or(false, |v| v == "1") {
+    if option_env!("ENABLE_FIPS").is_none_or(|v| v != "1") {
         println!("cargo:rustc-cfg=disable_fips");
         return;
     }
diff --git a/components/encryption/export/examples/ecli.rs b/components/encryption/export/examples/ecli.rs
index 106b22ded75..5eb1f92717e 100644
--- a/components/encryption/export/examples/ecli.rs
+++ b/components/encryption/export/examples/ecli.rs
@@ -5,13 +5,13 @@ use std::io::{Read, Write};
 use azure::STORAGE_VENDOR_NAME_AZURE;
 pub use cloud::kms::Config as CloudConfig;
 use encryption::{GcpConfig, KmsBackend};
-use encryption_export::{create_cloud_backend, AzureConfig, Backend, Error, KmsConfig, Result};
+use encryption_export::{AzureConfig, Backend, Error, KmsConfig, Result, create_cloud_backend};
 use file_system::{File, OpenOptions};
 use gcp::STORAGE_VENDOR_NAME_GCP;
 use ini::ini::Ini;
 use kvproto::encryptionpb::EncryptedContent;
 use protobuf::Message;
-use structopt::{clap::arg_enum, StructOpt};
+use structopt::{StructOpt, clap::arg_enum};
 use tikv_util::box_err;
 
 arg_enum! {
diff --git a/components/encryption/export/src/lib.rs b/components/encryption/export/src/lib.rs
index 1b7d23d5042..393e5bfddbd 100644
--- a/components/encryption/export/src/lib.rs
+++ b/components/encryption/export/src/lib.rs
@@ -4,11 +4,11 @@ use std::path::Path;
 use aws::{AwsKms, STORAGE_VENDOR_NAME_AWS};
 use azure::{AzureKms, STORAGE_VENDOR_NAME_AZURE};
 pub use encryption::{
-    clean_up_dir, clean_up_trash, trash_dir_all, AsyncBackend, AzureConfig, Backend,
-    DataKeyImporter, DataKeyManager, DataKeyManagerArgs, DecrypterReader, EncryptionConfig, Error,
-    FileConfig, Iv, KmsBackend, KmsConfig, MasterKeyConfig, Result,
+    AsyncBackend, AzureConfig, Backend, DataKeyImporter, DataKeyManager, DataKeyManagerArgs,
+    DecrypterReader, EncryptionConfig, Error, FileConfig, Iv, KmsBackend, KmsConfig,
+    MasterKeyConfig, Result, clean_up_dir, clean_up_trash, trash_dir_all,
 };
-use encryption::{cloud_convert_error, FileBackend, PlaintextBackend};
+use encryption::{FileBackend, PlaintextBackend, cloud_convert_error};
 use gcp::{GcpKms, STORAGE_VENDOR_NAME_GCP};
 use tikv_util::{box_err, error, info};
 
diff --git a/components/encryption/src/config.rs b/components/encryption/src/config.rs
index 2b8ed30a73d..40ac1d4955a 100644
--- a/components/encryption/src/config.rs
+++ b/components/encryption/src/config.rs
@@ -3,10 +3,10 @@
 use std::result;
 
 use cloud::{
-    kms::{SubConfigAws, SubConfigAzure, SubConfigGcp},
     Config as CloudConfig,
+    kms::{SubConfigAws, SubConfigAzure, SubConfigGcp},
 };
-use kvproto::encryptionpb::{EncryptionMethod, MasterKey, MasterKeyKms, MasterKey_oneof_backend};
+use kvproto::encryptionpb::{EncryptionMethod, MasterKey, MasterKey_oneof_backend, MasterKeyKms};
 use online_config::OnlineConfig;
 use serde_derive::{Deserialize, Serialize};
 use tikv_util::{box_err, config::ReadableDuration};
@@ -266,8 +266,8 @@ mod encryption_method_serde {
     use std::fmt;
 
     use serde::{
-        de::{self, Unexpected, Visitor},
         Deserializer, Serializer,
+        de::{self, Unexpected, Visitor},
     };
 
     use super::EncryptionMethod;
@@ -300,7 +300,7 @@ mod encryption_method_serde {
     {
         struct EncryptionMethodVisitor;
 
-        impl<'de> Visitor<'de> for EncryptionMethodVisitor {
+        impl Visitor<'_> for EncryptionMethodVisitor {
             type Value = EncryptionMethod;
 
             fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
diff --git a/components/encryption/src/encrypted_file/mod.rs b/components/encryption/src/encrypted_file/mod.rs
index 8cac47077f4..4b1f9b42056 100644
--- a/components/encryption/src/encrypted_file/mod.rs
+++ b/components/encryption/src/encrypted_file/mod.rs
@@ -6,13 +6,13 @@ use std::{
 };
 
 use crypto::rand;
-use file_system::{rename, File, OpenOptions};
+use file_system::{File, OpenOptions, rename};
 use kvproto::encryptionpb::EncryptedContent;
 use protobuf::Message;
 use slog_global::error;
 use tikv_util::time::Instant;
 
-use crate::{master_key::*, metrics::*, Result};
+use crate::{Result, master_key::*, metrics::*};
 
 mod header;
 pub use header::*;
diff --git a/components/encryption/src/errors.rs b/components/encryption/src/errors.rs
index da23d923be7..3198fd5d2a6 100644
--- a/components/encryption/src/errors.rs
+++ b/components/encryption/src/errors.rs
@@ -3,7 +3,7 @@
 use std::{
     error,
     fmt::{Debug, Display},
-    io::{Error as IoError, ErrorKind},
+    io::Error as IoError,
     result,
 };
 
@@ -67,7 +67,7 @@ impl From<Error> for IoError {
     fn from(err: Error) -> IoError {
         match err {
             Error::Io(e) => e,
-            other => IoError::new(ErrorKind::Other, format!("{}", other)),
+            other => IoError::other(format!("{}", other)),
         }
     }
 }
diff --git a/components/encryption/src/file_dict_file.rs b/components/encryption/src/file_dict_file.rs
index a40fb912b3b..0b172a58194 100644
--- a/components/encryption/src/file_dict_file.rs
+++ b/components/encryption/src/file_dict_file.rs
@@ -7,16 +7,16 @@ use std::{
 
 use byteorder::{BigEndian, ByteOrder};
 use crypto::rand;
-use file_system::{rename, File, OpenOptions};
+use file_system::{File, OpenOptions, rename};
 use kvproto::encryptionpb::{EncryptedContent, FileDictionary, FileInfo};
 use protobuf::Message;
 use tikv_util::{box_err, info, set_panic_mark, warn};
 
 use crate::{
-    encrypted_file::{EncryptedFile, Header, Version, TMP_FILE_SUFFIX},
+    Error, Result,
+    encrypted_file::{EncryptedFile, Header, TMP_FILE_SUFFIX, Version},
     master_key::{Backend, PlaintextBackend},
     metrics::*,
-    Error, Result,
 };
 
 #[derive(Debug)]
@@ -412,7 +412,7 @@ mod tests {
     use kvproto::encryptionpb::EncryptionMethod;
 
     use super::*;
-    use crate::{encrypted_file::EncryptedFile, Error};
+    use crate::{Error, encrypted_file::EncryptedFile};
 
     fn test_file_dict_file_normal(enable_log: bool) {
         let tempdir = tempfile::tempdir().unwrap();
diff --git a/components/encryption/src/io.rs b/components/encryption/src/io.rs
index 018b7f6f89f..1f12883989b 100644
--- a/components/encryption/src/io.rs
+++ b/components/encryption/src/io.rs
@@ -1,16 +1,16 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    io::{Error as IoError, ErrorKind, Read, Result as IoResult, Seek, SeekFrom, Write},
+    io::{Error as IoError, Read, Result as IoResult, Seek, SeekFrom, Write},
     pin::Pin,
     task::ready,
 };
 
 use file_system::File;
 use futures_util::{
+    AsyncWrite,
     io::AsyncRead,
     task::{Context, Poll},
-    AsyncWrite,
 };
 use kvproto::encryptionpb::EncryptionMethod;
 use openssl::symm::{Cipher as OCipher, Crypter as OCrypter, Mode};
@@ -564,13 +564,10 @@ impl CrypterCore {
         let crypter_count = crypter.update(&partial_block, &mut self.buffer)?;
         if crypter_count != partial_offset {
             self.lazy_reset_crypter(offset);
-            return Err(IoError::new(
-                ErrorKind::Other,
-                format!(
-                    "crypter output size mismatch, expect {} vs actual {}",
-                    partial_offset, crypter_count,
-                ),
-            ));
+            return Err(IoError::other(format!(
+                "crypter output size mismatch, expect {} vs actual {}",
+                partial_offset, crypter_count,
+            )));
         }
         self.offset = offset;
         self.crypter = Some(crypter);
@@ -596,14 +593,11 @@ impl CrypterCore {
             let crypter_count = crypter.update(&buf[encrypted..target], &mut self.buffer)?;
             if crypter_count != target - encrypted {
                 self.crypter.take();
-                return Err(IoError::new(
-                    ErrorKind::Other,
-                    format!(
-                        "crypter output size mismatch, expect {} vs actual {}",
-                        target - encrypted,
-                        crypter_count,
-                    ),
-                ));
+                return Err(IoError::other(format!(
+                    "crypter output size mismatch, expect {} vs actual {}",
+                    target - encrypted,
+                    crypter_count,
+                )));
             }
             buf[encrypted..target].copy_from_slice(&self.buffer[..crypter_count]);
             encrypted += crypter_count;
@@ -630,13 +624,10 @@ impl CrypterCore {
         let crypter_count = crypter.update(buf, &mut self.buffer)?;
         if crypter_count != count {
             self.crypter.take();
-            return Err(IoError::new(
-                ErrorKind::Other,
-                format!(
-                    "crypter output size mismatch, expect {} vs actual {}",
-                    count, crypter_count,
-                ),
-            ));
+            return Err(IoError::other(format!(
+                "crypter output size mismatch, expect {} vs actual {}",
+                count, crypter_count,
+            )));
         }
         self.offset += count as u64;
         Ok(&self.buffer[..count])
@@ -1077,7 +1068,7 @@ mod tests {
         let key = generate_data_key(method).unwrap().1;
         let mut wt = EncrypterWriter::new(YieldOnce::new(buf), method, &key, iv).unwrap();
         let waker = Waker::noop();
-        let mut cx = Context::from_waker(&waker);
+        let mut cx = Context::from_waker(waker);
         assert_matches!(
             Pin::new(&mut wt).poll_write(&mut cx, &plain_text[..size / 2]),
             Poll::Pending
diff --git a/components/encryption/src/lib.rs b/components/encryption/src/lib.rs
index 086c2c0ae8f..9bc7881d87b 100644
--- a/components/encryption/src/lib.rs
+++ b/components/encryption/src/lib.rs
@@ -1,7 +1,6 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 #![feature(let_chains)]
-#![feature(noop_waker)]
 
 mod backup;
 mod config;
@@ -23,12 +22,12 @@ use std::{io::ErrorKind, path::Path};
 pub use self::{
     backup::backup_encryption::*,
     config::*,
-    crypter::{verify_encryption_config, AesGcmCrypter, FileEncryptionInfo, Iv},
+    crypter::{AesGcmCrypter, FileEncryptionInfo, Iv, verify_encryption_config},
     encrypted_file::EncryptedFile,
-    errors::{cloud_convert_error, Error, Result, RetryCodedError},
+    errors::{Error, Result, RetryCodedError, cloud_convert_error},
     file_dict_file::FileDictionaryFile,
     io::{
-        create_aes_ctr_crypter, DecrypterReader, DecrypterWriter, EncrypterReader, EncrypterWriter,
+        DecrypterReader, DecrypterWriter, EncrypterReader, EncrypterWriter, create_aes_ctr_crypter,
     },
     manager::{DataKeyImporter, DataKeyManager, DataKeyManagerArgs},
     master_key::{
diff --git a/components/encryption/src/manager/mod.rs b/components/encryption/src/manager/mod.rs
index 9250ed0714c..35134d2c781 100644
--- a/components/encryption/src/manager/mod.rs
+++ b/components/encryption/src/manager/mod.rs
@@ -5,8 +5,8 @@ use std::{
     io::{self, Error as IoError, ErrorKind, Result as IoResult},
     path::{Path, PathBuf},
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc, Mutex,
+        atomic::{AtomicU64, Ordering},
     },
     thread::JoinHandle,
     time::{Duration, SystemTime, UNIX_EPOCH},
@@ -21,6 +21,7 @@ use protobuf::Message;
 use tikv_util::{box_err, debug, error, info, sys::thread::StdThreadBuildWrapper, thd_name, warn};
 
 use crate::{
+    Error, Result,
     config::EncryptionConfig,
     crypter::{self, FileEncryptionInfo, Iv},
     encrypted_file::EncryptedFile,
@@ -28,7 +29,6 @@ use crate::{
     io::{DecrypterReader, EncrypterWriter},
     master_key::Backend,
     metrics::*,
-    Error, Result,
 };
 
 const KEY_DICT_NAME: &str = "key.dict";
@@ -383,7 +383,7 @@ fn check_stale_file_exist(
     file_dict: &mut FileDictionary,
     file_dict_file: &mut FileDictionaryFile,
 ) -> Result<()> {
-    if file_dict.files.get(fname).is_some() {
+    if file_dict.files.contains_key(fname) {
         if Path::new(fname).exists() {
             return Err(Error::Io(IoError::new(
                 ErrorKind::AlreadyExists,
@@ -816,10 +816,10 @@ impl DataKeyManager {
         while let Some(e) = iter.next() {
             let e = e?;
             if e.path().is_symlink() {
-                return Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    format!("unexpected symbolic link: {}", e.path().display()),
-                ));
+                return Err(io::Error::other(format!(
+                    "unexpected symbolic link: {}",
+                    e.path().display()
+                )));
             }
             let fname = e.path().to_str().unwrap();
             let sync = iter.peek().is_none();
@@ -933,10 +933,10 @@ impl DataKeyManager {
             while let Some(e) = iter.next() {
                 let e = e?;
                 if e.path().is_symlink() {
-                    return Err(io::Error::new(
-                        io::ErrorKind::Other,
-                        format!("unexpected symbolic link: {}", e.path().display()),
-                    ));
+                    return Err(io::Error::other(format!(
+                        "unexpected symbolic link: {}",
+                        e.path().display()
+                    )));
                 }
                 let sub_path = e.path().strip_prefix(src_path).unwrap();
                 let src = e.path().to_str().unwrap();
@@ -1118,7 +1118,7 @@ impl<'a> DataKeyImporter<'a> {
     }
 }
 
-impl<'a> Drop for DataKeyImporter<'a> {
+impl Drop for DataKeyImporter<'_> {
     fn drop(&mut self) {
         if !self.committed {
             if let Err(e) = self.rollback() {
@@ -1130,7 +1130,7 @@ impl<'a> Drop for DataKeyImporter<'a> {
 
 #[cfg(test)]
 mod tests {
-    use file_system::{remove_file, File};
+    use file_system::{File, remove_file};
     use kvproto::encryptionpb::EncryptionMethod;
     use matches::assert_matches;
     use tempfile::TempDir;
@@ -1138,8 +1138,8 @@ mod tests {
 
     use super::*;
     use crate::master_key::{
-        tests::{decrypt_called, encrypt_called, MockBackend},
         FileBackend, PlaintextBackend,
+        tests::{MockBackend, decrypt_called, encrypt_called},
     };
 
     lazy_static::lazy_static! {
diff --git a/components/encryption/src/master_key/kms.rs b/components/encryption/src/master_key/kms.rs
index ad89d217f92..fe088595292 100644
--- a/components/encryption/src/master_key/kms.rs
+++ b/components/encryption/src/master_key/kms.rs
@@ -12,8 +12,8 @@ use tikv_util::{
 };
 use tokio::runtime::{Builder, Runtime};
 
-use super::{metadata::MetadataKey, AsyncBackend, Backend, MemAesGcmBackend};
-use crate::{crypter::Iv, errors::cloud_convert_error, Error, Result};
+use super::{AsyncBackend, Backend, MemAesGcmBackend, metadata::MetadataKey};
+use crate::{Error, Result, crypter::Iv, errors::cloud_convert_error};
 
 #[derive(Debug)]
 struct State {
diff --git a/components/encryption/src/master_key/mem.rs b/components/encryption/src/master_key/mem.rs
index c19351f5dc7..77c2fdbb2e3 100644
--- a/components/encryption/src/master_key/mem.rs
+++ b/components/encryption/src/master_key/mem.rs
@@ -5,7 +5,7 @@ use kvproto::encryptionpb::EncryptedContent;
 use tikv_util::box_err;
 
 use super::metadata::*;
-use crate::{crypter::*, errors::cloud_convert_error, AesGcmCrypter, Error, Iv, Result};
+use crate::{AesGcmCrypter, Error, Iv, Result, crypter::*, errors::cloud_convert_error};
 
 /// An in-memory backend, it saves master key in memory.
 #[derive(Debug)]
diff --git a/components/encryption/src/master_key/mod.rs b/components/encryption/src/master_key/mod.rs
index ab17ecdd0f0..c2c81950ba3 100644
--- a/components/encryption/src/master_key/mod.rs
+++ b/components/encryption/src/master_key/mod.rs
@@ -7,7 +7,7 @@ use kvproto::encryptionpb::{EncryptedContent, EncryptionMethod, MasterKey};
 use tikv_util::{box_err, error};
 use tokio::sync::RwLock;
 
-use crate::{manager::generate_data_key, Error, MasterKeyConfig, Result};
+use crate::{Error, MasterKeyConfig, Result, manager::generate_data_key};
 
 /// Provide API to encrypt/decrypt key dictionary content.
 ///
@@ -38,9 +38,9 @@ mod metadata;
 use self::metadata::*;
 
 mod kms;
+pub use self::kms::KmsBackend;
 #[cfg(any(test, feature = "testexport"))]
 pub use self::kms::fake;
-pub use self::kms::KmsBackend;
 
 #[derive(Default, Debug, Clone)]
 pub struct PlaintextBackend {}
@@ -371,14 +371,12 @@ pub mod tests {
             .update_from_config_if_needed(configs, |_| {
                 Ok(create_mock_backend(
                     || {
-                        Err(Error::Other(Box::new(std::io::Error::new(
-                            ErrorKind::Other,
+                        Err(Error::Other(Box::new(std::io::Error::other(
                             "Encrypt error",
                         ))))
                     },
                     || {
-                        Err(Error::Other(Box::new(std::io::Error::new(
-                            ErrorKind::Other,
+                        Err(Error::Other(Box::new(std::io::Error::other(
                             "Decrypt error",
                         ))))
                     },
@@ -432,8 +430,7 @@ pub mod tests {
         let backends: Vec<Box<dyn AsyncBackend>> = vec![
             create_mock_backend(
                 || {
-                    Err(Error::Other(Box::new(std::io::Error::new(
-                        ErrorKind::Other,
+                    Err(Error::Other(Box::new(std::io::Error::other(
                         "Encrypt error 1",
                     ))))
                 },
@@ -442,8 +439,7 @@ pub mod tests {
             create_mock_backend(
                 || Ok(EncryptedContent::default()),
                 || {
-                    Err(Error::Other(Box::new(std::io::Error::new(
-                        ErrorKind::Other,
+                    Err(Error::Other(Box::new(std::io::Error::other(
                         "Decrypt error 2",
                     ))))
                 },
diff --git a/components/engine_panic/src/compact.rs b/components/engine_panic/src/compact.rs
index 54997fa3cc6..91cfd32e5ff 100644
--- a/components/engine_panic/src/compact.rs
+++ b/components/engine_panic/src/compact.rs
@@ -52,6 +52,10 @@ impl CompactExt for PanicEngine {
 pub struct PanicCompactedEvent;
 
 impl CompactedEvent for PanicCompactedEvent {
+    fn get_key_range(&self) -> (Vec<u8>, Vec<u8>) {
+        panic!()
+    }
+
     fn total_bytes_declined(&self) -> u64 {
         panic!()
     }
diff --git a/components/engine_panic/src/db_vector.rs b/components/engine_panic/src/db_vector.rs
index 3daf6dc9500..5b7c6d73bad 100644
--- a/components/engine_panic/src/db_vector.rs
+++ b/components/engine_panic/src/db_vector.rs
@@ -17,7 +17,7 @@ impl Deref for PanicDbVector {
     }
 }
 
-impl<'a> PartialEq<&'a [u8]> for PanicDbVector {
+impl PartialEq<&[u8]> for PanicDbVector {
     fn eq(&self, rhs: &&[u8]) -> bool {
         **rhs == **self
     }
diff --git a/components/engine_panic/src/import.rs b/components/engine_panic/src/import.rs
index a34ce7b2e03..eb94789088c 100644
--- a/components/engine_panic/src/import.rs
+++ b/components/engine_panic/src/import.rs
@@ -13,6 +13,7 @@ impl ImportExt for PanicEngine {
         cf: &str,
         files: &[&str],
         range: Option<Range<'_>>,
+        force_allow_write: bool,
     ) -> Result<()> {
         panic!()
     }
diff --git a/components/engine_panic/src/misc.rs b/components/engine_panic/src/misc.rs
index 311674880df..f6ec2e52c66 100644
--- a/components/engine_panic/src/misc.rs
+++ b/components/engine_panic/src/misc.rs
@@ -55,11 +55,7 @@ impl MiscExt for PanicEngine {
         panic!()
     }
 
-    fn ingest_maybe_slowdown_writes(&self, cf: &str) -> Result<bool> {
-        panic!()
-    }
-
-    fn get_sst_key_ranges(&self, cf: &str, level: usize) -> Result<Vec<(Vec<u8>, Vec<u8>)>> {
+    fn ingest_maybe_slowdown_writes(&self, cf: &str, inflight_ingest_cnt: u64) -> Result<bool> {
         panic!()
     }
 
diff --git a/components/engine_panic/src/table_properties.rs b/components/engine_panic/src/table_properties.rs
index b3154ee9a12..3c6fabba988 100644
--- a/components/engine_panic/src/table_properties.rs
+++ b/components/engine_panic/src/table_properties.rs
@@ -1,6 +1,6 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_traits::{Range, Result};
+use engine_traits::{MvccProperties, Range, Result};
 
 use crate::engine::PanicEngine;
 
@@ -12,14 +12,27 @@ impl engine_traits::UserCollectedProperties for UserCollectedProperties {
     fn approximate_size_and_keys(&self, _: &[u8], _: &[u8]) -> Option<(usize, usize)> {
         None
     }
+    fn get_mvcc_properties(&self) -> Option<MvccProperties> {
+        None
+    }
 }
 
+pub struct TableProperties;
+impl engine_traits::TableProperties for TableProperties {
+    type UserCollectedProperties = UserCollectedProperties;
+    fn get_user_collected_properties(&self) -> &Self::UserCollectedProperties {
+        panic!()
+    }
+    fn get_num_entries(&self) -> u64 {
+        panic!()
+    }
+}
 pub struct TablePropertiesCollection;
 impl engine_traits::TablePropertiesCollection for TablePropertiesCollection {
-    type UserCollectedProperties = UserCollectedProperties;
-    fn iter_user_collected_properties<F>(&self, _: F)
+    type TableProperties = TableProperties;
+    fn iter_table_properties<F>(&self, _: F)
     where
-        F: FnMut(&Self::UserCollectedProperties) -> bool,
+        F: FnMut(&Self::TableProperties) -> bool,
     {
     }
 }
diff --git a/components/engine_rocks/src/checkpoint.rs b/components/engine_rocks/src/checkpoint.rs
index 3e085621f34..65f44a0ddc9 100644
--- a/components/engine_rocks/src/checkpoint.rs
+++ b/components/engine_rocks/src/checkpoint.rs
@@ -4,7 +4,7 @@ use std::path::Path;
 
 use engine_traits::{Checkpointable, Checkpointer, Result};
 
-use crate::{r2e, RocksEngine};
+use crate::{RocksEngine, r2e};
 
 impl Checkpointable for RocksEngine {
     type Checkpointer = RocksEngineCheckpointer;
@@ -44,7 +44,7 @@ impl Checkpointer for RocksEngineCheckpointer {
 
 #[cfg(test)]
 mod tests {
-    use engine_traits::{Checkpointable, Checkpointer, MiscExt, Peekable, SyncMutable, ALL_CFS};
+    use engine_traits::{ALL_CFS, Checkpointable, Checkpointer, MiscExt, Peekable, SyncMutable};
     use tempfile::tempdir;
 
     use crate::util::new_engine;
diff --git a/components/engine_rocks/src/compact.rs b/components/engine_rocks/src/compact.rs
index 53447e9a582..91fbe1f3313 100644
--- a/components/engine_rocks/src/compact.rs
+++ b/components/engine_rocks/src/compact.rs
@@ -134,7 +134,7 @@ mod tests {
     use engine_traits::{CfNamesExt, CfOptionsExt, CompactExt, MiscExt, SyncMutable};
     use tempfile::Builder;
 
-    use crate::{util, RocksCfOptions, RocksDbOptions};
+    use crate::{RocksCfOptions, RocksDbOptions, util};
 
     #[test]
     fn test_compact_files_in_range() {
diff --git a/components/engine_rocks/src/compact_listener.rs b/components/engine_rocks/src/compact_listener.rs
index e679410c8b9..3b62bc03dc1 100644
--- a/components/engine_rocks/src/compact_listener.rs
+++ b/components/engine_rocks/src/compact_listener.rs
@@ -137,12 +137,13 @@ impl RocksCompactedEvent {
 }
 
 impl CompactedEvent for RocksCompactedEvent {
+    fn get_key_range(&self) -> (Vec<u8>, Vec<u8>) {
+        (self.start_key.clone(), self.end_key.clone())
+    }
+
     fn total_bytes_declined(&self) -> u64 {
-        if self.total_input_bytes > self.total_output_bytes {
-            self.total_input_bytes - self.total_output_bytes
-        } else {
-            0
-        }
+        self.total_input_bytes
+            .saturating_sub(self.total_output_bytes)
     }
 
     fn is_size_declining_trivial(&self, split_check_diff: u64) -> bool {
diff --git a/components/engine_rocks/src/config.rs b/components/engine_rocks/src/config.rs
index 2a444a22d3e..d373769d2d9 100644
--- a/components/engine_rocks/src/config.rs
+++ b/components/engine_rocks/src/config.rs
@@ -65,9 +65,9 @@ pub mod compression_type_level_serde {
 
     use rocksdb::DBCompressionType;
     use serde::{
+        Deserializer, Serializer,
         de::{Error, SeqAccess, Unexpected, Visitor},
         ser::SerializeSeq,
-        Deserializer, Serializer,
     };
 
     pub fn serialize<S>(ts: &[DBCompressionType; 7], serializer: S) -> Result<S::Ok, S::Error>
@@ -152,8 +152,8 @@ pub mod compression_type_serde {
 
     use rocksdb::DBCompressionType;
     use serde::{
-        de::{Error, Unexpected, Visitor},
         Deserializer, Serializer,
+        de::{Error, Unexpected, Visitor},
     };
 
     pub fn serialize<S>(t: &DBCompressionType, serializer: S) -> Result<S::Ok, S::Error>
@@ -179,7 +179,7 @@ pub mod compression_type_serde {
         D: Deserializer<'de>,
     {
         struct StrVistor;
-        impl<'de> Visitor<'de> for StrVistor {
+        impl Visitor<'_> for StrVistor {
             type Value = DBCompressionType;
 
             fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -257,8 +257,8 @@ pub mod checksum_serde {
 
     use rocksdb::ChecksumType;
     use serde::{
-        de::{Error, Unexpected, Visitor},
         Deserializer, Serializer,
+        de::{Error, Unexpected, Visitor},
     };
 
     pub fn serialize<S>(t: &ChecksumType, serializer: S) -> Result<S::Ok, S::Error>
@@ -280,7 +280,7 @@ pub mod checksum_serde {
         D: Deserializer<'de>,
     {
         struct StrVistor;
-        impl<'de> Visitor<'de> for StrVistor {
+        impl Visitor<'_> for StrVistor {
             type Value = ChecksumType;
 
             fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -317,8 +317,8 @@ pub mod prepopulate_block_cache_serde {
 
     use rocksdb::PrepopulateBlockCache;
     use serde::{
-        de::{Error, Unexpected, Visitor},
         Deserializer, Serializer,
+        de::{Error, Unexpected, Visitor},
     };
 
     pub fn serialize<S>(t: &PrepopulateBlockCache, serializer: S) -> Result<S::Ok, S::Error>
@@ -337,7 +337,7 @@ pub mod prepopulate_block_cache_serde {
         D: Deserializer<'de>,
     {
         struct StrVistor;
-        impl<'de> Visitor<'de> for StrVistor {
+        impl Visitor<'_> for StrVistor {
             type Value = PrepopulateBlockCache;
 
             fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
diff --git a/components/engine_rocks/src/db_vector.rs b/components/engine_rocks/src/db_vector.rs
index 97fa65b7072..3b88e69717b 100644
--- a/components/engine_rocks/src/db_vector.rs
+++ b/components/engine_rocks/src/db_vector.rs
@@ -32,7 +32,7 @@ impl Debug for RocksDbVector {
     }
 }
 
-impl<'a> PartialEq<&'a [u8]> for RocksDbVector {
+impl PartialEq<&[u8]> for RocksDbVector {
     fn eq(&self, rhs: &&[u8]) -> bool {
         **rhs == **self
     }
diff --git a/components/engine_rocks/src/decode_properties.rs b/components/engine_rocks/src/decode_properties.rs
index 70b1d52ba8d..fc3258cc4d5 100644
--- a/components/engine_rocks/src/decode_properties.rs
+++ b/components/engine_rocks/src/decode_properties.rs
@@ -9,8 +9,8 @@ use std::{
 };
 
 use tikv_util::codec::{
-    number::{self, NumberEncoder},
     Result,
+    number::{self, NumberEncoder},
 };
 
 #[derive(Clone, Debug, Default)]
diff --git a/components/engine_rocks/src/engine.rs b/components/engine_rocks/src/engine.rs
index 4cd51a7fcad..4273d4fbd91 100644
--- a/components/engine_rocks/src/engine.rs
+++ b/components/engine_rocks/src/engine.rs
@@ -3,12 +3,12 @@
 use std::{any::Any, sync::Arc};
 
 use engine_traits::{IterOptions, Iterable, KvEngine, Peekable, ReadOptions, Result, SyncMutable};
-use rocksdb::{DBIterator, Writable, DB};
+use rocksdb::{DB, DBIterator, Writable};
 use tikv_util::range_latch::RangeLatch;
 
 use crate::{
-    db_vector::RocksDbVector, options::RocksReadOptions, r2e, util::get_cf_handle,
-    RocksEngineIterator, RocksSnapshot,
+    RocksEngineIterator, RocksSnapshot, db_vector::RocksDbVector, options::RocksReadOptions, r2e,
+    util::get_cf_handle,
 };
 
 #[cfg(feature = "trace-lifetime")]
@@ -30,8 +30,8 @@ mod trace {
         collections::BTreeMap,
         ops::Bound::Included,
         sync::{
-            atomic::{AtomicU64, Ordering},
             Mutex,
+            atomic::{AtomicU64, Ordering},
         },
     };
 
@@ -278,14 +278,14 @@ impl SyncMutable for RocksEngine {
 
 #[cfg(test)]
 mod tests {
-    use engine_traits::{Iterable, KvEngine, Peekable, SyncMutable, CF_DEFAULT};
+    use engine_traits::{CF_DEFAULT, Iterable, KvEngine, Peekable, SyncMutable};
     use kvproto::metapb::Region;
     use proptest::prelude::*;
-    use rocksdb::{DBOptions, FlushOptions, SeekKey, TitanDBOptions, Writable, DB};
+    use rocksdb::{DB, DBOptions, FlushOptions, SeekKey, TitanDBOptions, Writable};
     use tempfile::Builder;
     use tikv_util::config::ReadableSize;
 
-    use crate::{util, RocksSnapshot};
+    use crate::{RocksSnapshot, util};
 
     #[test]
     fn test_base() {
diff --git a/components/engine_rocks/src/engine_iterator.rs b/components/engine_rocks/src/engine_iterator.rs
index 5db3e21a03d..6f69da2c7eb 100644
--- a/components/engine_rocks/src/engine_iterator.rs
+++ b/components/engine_rocks/src/engine_iterator.rs
@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use engine_traits::{self, IterMetricsCollector, MetricsExt, Result};
-use rocksdb::{DBIterator, PerfContext, DB};
+use rocksdb::{DB, DBIterator, PerfContext};
 
 use crate::r2e;
 
diff --git a/components/engine_rocks/src/event_listener.rs b/components/engine_rocks/src/event_listener.rs
index 4ba4061a60f..12ea6504191 100644
--- a/components/engine_rocks/src/event_listener.rs
+++ b/components/engine_rocks/src/event_listener.rs
@@ -1,7 +1,7 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 use engine_traits::PersistenceListener;
-use file_system::{get_io_type, set_io_type, IoType};
+use file_system::{IoType, get_io_type, set_io_type};
 use regex::Regex;
 use rocksdb::{
     CompactionJobInfo, DBBackgroundErrorReason, FlushJobInfo, IngestionInfo, MemTableInfo,
@@ -175,10 +175,7 @@ impl rocksdb::EventListener for RocksEventListener {
 // We assume that only the corruption sst file path is printed inside error.
 fn resolve_sst_filename_from_err(err: &str) -> Option<String> {
     let r = Regex::new(r"/\w*\.sst").unwrap();
-    let matches = match r.captures(err) {
-        None => return None,
-        Some(v) => v,
-    };
+    let matches = r.captures(err)?;
     let filename = matches.get(0).unwrap().as_str().to_owned();
     Some(filename)
 }
@@ -227,17 +224,17 @@ impl rocksdb::EventListener for RocksPersistenceListener {
 #[cfg(test)]
 mod tests {
     use std::sync::{
-        mpsc::{self, Sender},
         Arc, Mutex,
+        mpsc::{self, Sender},
     };
 
     use engine_traits::{
-        ApplyProgress, FlushState, MiscExt, StateStorage, SyncMutable, CF_DEFAULT, DATA_CFS,
+        ApplyProgress, CF_DEFAULT, DATA_CFS, FlushState, MiscExt, StateStorage, SyncMutable,
     };
     use tempfile::Builder;
 
     use super::*;
-    use crate::{util, RocksCfOptions, RocksDbOptions};
+    use crate::{RocksCfOptions, RocksDbOptions, util};
 
     #[test]
     fn test_resolve_sst_filename() {
@@ -316,7 +313,7 @@ mod tests {
                         Ok(p) => p,
                         Err(_) => return false,
                     };
-                    p.path().extension().map_or(false, |ext| ext == "sst")
+                    p.path().extension().is_some_and(|ext| ext == "sst")
                 })
                 .count()
         };
diff --git a/components/engine_rocks/src/file_system.rs b/components/engine_rocks/src/file_system.rs
index 4f584347747..ee5762d1942 100644
--- a/components/engine_rocks/src/file_system.rs
+++ b/components/engine_rocks/src/file_system.rs
@@ -42,15 +42,15 @@ impl<T: FileSystemInspector> DBFileSystemInspector for WrappedFileSystemInspecto
 mod tests {
     use std::sync::Arc;
 
-    use engine_traits::{CompactExt, ManualCompactionOptions, MiscExt, SyncMutable, CF_DEFAULT};
+    use engine_traits::{CF_DEFAULT, CompactExt, ManualCompactionOptions, MiscExt, SyncMutable};
     use file_system::{IoOp, IoRateLimiter, IoRateLimiterStatistics, IoType};
     use keys::data_key;
     use tempfile::Builder;
 
     use super::*;
     use crate::{
-        event_listener::RocksEventListener, raw::DBCompressionType, util::new_engine_opt,
-        RocksCfOptions, RocksDbOptions, RocksEngine,
+        RocksCfOptions, RocksDbOptions, RocksEngine, event_listener::RocksEventListener,
+        raw::DBCompressionType, util::new_engine_opt,
     };
 
     fn new_test_db(dir: &str) -> (RocksEngine, Arc<IoRateLimiterStatistics>) {
diff --git a/components/engine_rocks/src/flow_listener.rs b/components/engine_rocks/src/flow_listener.rs
index 4a4f80cc46f..3d9f048f2df 100644
--- a/components/engine_rocks/src/flow_listener.rs
+++ b/components/engine_rocks/src/flow_listener.rs
@@ -1,6 +1,6 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::sync::{mpsc::Sender, Arc, Mutex};
+use std::sync::{Arc, Mutex, mpsc::Sender};
 
 use collections::hash_set_with_capacity;
 use rocksdb::{CompactionJobInfo, EventListener, FlushJobInfo, IngestionInfo};
@@ -122,8 +122,7 @@ impl EventListener for FlowListener {
                     }
                 }
 
-                let diff = if output < input { input - output } else { 0 };
-
+                let diff = input.saturating_sub(output);
                 let _ = self
                     .flow_info_sender
                     .lock()
diff --git a/components/engine_rocks/src/import.rs b/components/engine_rocks/src/import.rs
index 14947149c1b..216e3a2c21f 100644
--- a/components/engine_rocks/src/import.rs
+++ b/components/engine_rocks/src/import.rs
@@ -21,6 +21,7 @@ impl ImportExt for RocksEngine {
         cf_name: &str,
         files: &[&str],
         range: Option<Range<'_>>,
+        force_allow_write: bool,
     ) -> Result<()> {
         // Acquire latch to prevent concurrency with compaction-filter operations
         // when using RocksDB IngestExternalFileOptions.allow_write = true.
@@ -33,7 +34,7 @@ impl ImportExt for RocksEngine {
         let cf = util::get_cf_handle(self.as_inner(), cf_name)?;
         let mut opts = RocksIngestExternalFileOptions::new();
         opts.move_files(true);
-        let allow_write = range.is_some();
+        let allow_write = range.is_some() || force_allow_write;
         opts.allow_write(allow_write);
         if allow_write {
             INGEST_EXTERNAL_FILE_ALLOW_WRITE_COUNTER
@@ -99,13 +100,13 @@ impl IngestExternalFileOptions for RocksIngestExternalFileOptions {
 #[cfg(test)]
 mod tests {
     use engine_traits::{
-        FlowControlFactorsExt, MiscExt, Mutable, SstWriter, SstWriterBuilder, WriteBatch,
-        WriteBatchExt, ALL_CFS, CF_DEFAULT,
+        ALL_CFS, CF_DEFAULT, FlowControlFactorsExt, MiscExt, Mutable, SstWriter, SstWriterBuilder,
+        WriteBatch, WriteBatchExt,
     };
     use tempfile::Builder;
 
     use super::*;
-    use crate::{util::new_engine_opt, RocksCfOptions, RocksDbOptions, RocksSstWriterBuilder};
+    use crate::{RocksCfOptions, RocksDbOptions, RocksSstWriterBuilder, util::new_engine_opt};
 
     #[test]
     fn test_ingest_multiple_file() {
@@ -171,6 +172,7 @@ mod tests {
             CF_DEFAULT,
             &[p1.to_str().unwrap(), p2.to_str().unwrap()],
             None,
+            false, // force_allow_write
         )
         .unwrap();
     }
diff --git a/components/engine_rocks/src/lib.rs b/components/engine_rocks/src/lib.rs
index 28c7c97d0a8..6d45211e26a 100644
--- a/components/engine_rocks/src/lib.rs
+++ b/components/engine_rocks/src/lib.rs
@@ -17,7 +17,6 @@
 
 #![cfg_attr(test, feature(test))]
 #![feature(let_chains)]
-#![feature(option_get_or_insert_default)]
 #![feature(path_file_prefix)]
 
 #[allow(unused_extern_crates)]
@@ -108,8 +107,8 @@ pub mod file_system;
 mod raft_engine;
 
 pub use rocksdb::{
-    set_perf_flags, set_perf_level, PerfContext, PerfFlag, PerfFlags, PerfLevel,
-    Statistics as RocksStatistics,
+    PerfContext, PerfFlag, PerfFlags, PerfLevel, Statistics as RocksStatistics, set_perf_flags,
+    set_perf_level,
 };
 
 pub mod flow_control_factors;
diff --git a/components/engine_rocks/src/misc.rs b/components/engine_rocks/src/misc.rs
index 464106f302e..7f240c0080c 100644
--- a/components/engine_rocks/src/misc.rs
+++ b/components/engine_rocks/src/misc.rs
@@ -10,12 +10,13 @@ use rocksdb::{FlushOptions, Range as RocksRange};
 use tikv_util::{box_try, keybuilder::KeyBuilder};
 
 use crate::{
+    RocksSstWriter,
     engine::RocksEngine,
     r2e,
     rocks_metrics::{RocksStatisticsReporter, STORE_ENGINE_EVENT_COUNTER_VEC},
     rocks_metrics_defs::*,
     sst::RocksSstWriterBuilder,
-    util, RocksSstWriter,
+    util,
 };
 
 pub const MAX_DELETE_COUNT_BY_KEY: usize = 2048;
@@ -46,7 +47,7 @@ impl RocksEngine {
             // There may be a range overlap with next range
             if last_end_key
                 .as_ref()
-                .map_or(false, |key| key.as_slice() > r.start_key)
+                .is_some_and(|key| key.as_slice() > r.start_key)
             {
                 written |= self.delete_all_in_range_cf_by_key(wopts, cf, r)?;
                 continue;
@@ -110,7 +111,12 @@ impl RocksEngine {
             } else {
                 None
             };
-            self.ingest_external_file_cf(cf, &[sst_path.as_str()], range_to_lock)?;
+            self.ingest_external_file_cf(
+                cf,
+                &[sst_path.as_str()],
+                range_to_lock,
+                allow_write_during_ingestion,
+            )?;
         } else {
             let mut wb = self.write_batch();
             for key in data.iter() {
@@ -211,7 +217,7 @@ impl MiscExt for RocksEngine {
                     .map(|(_, time)| (handle, time))
             })
             .min_by(|(_, a), (_, b)| a.cmp(b))
-            && age_threshold.map_or(true, |threshold| time <= threshold)
+            && age_threshold.is_none_or(|threshold| time <= threshold)
         {
             let mut fopts = FlushOptions::default();
             fopts.set_wait(wait);
@@ -313,7 +319,10 @@ impl MiscExt for RocksEngine {
             .get_approximate_memtable_stats_cf(handle, &range))
     }
 
-    fn ingest_maybe_slowdown_writes(&self, cf: &str) -> Result<bool> {
+    // Checks if ingesting additional SSTs might trigger write slowdown, based
+    // on a conservative estimate of the L0 file count after ingesting the SSTs
+    // that are already inflight for ingestion.
+    fn ingest_maybe_slowdown_writes(&self, cf: &str, inflight_ingest_cnt: u64) -> Result<bool> {
         let handle = util::get_cf_handle(self.as_inner(), cf)?;
         if let Some(n) = util::get_cf_num_files_at_level(self.as_inner(), handle, 0) {
             let options = self.as_inner().get_options_cf(handle);
@@ -321,31 +330,16 @@ impl MiscExt for RocksEngine {
             let compaction_trigger = options.get_level_zero_file_num_compaction_trigger() as u64;
             // Leave enough buffer to tolerate heavy write workload,
             // which may flush some memtables in a short time.
-            if n > u64::from(slowdown_trigger) / 2 && n >= compaction_trigger {
+            let worse_case_l0_file_count = n + inflight_ingest_cnt;
+            if worse_case_l0_file_count > u64::from(slowdown_trigger) / 2
+                && worse_case_l0_file_count >= compaction_trigger
+            {
                 return Ok(true);
             }
         }
         Ok(false)
     }
 
-    fn get_sst_key_ranges(&self, cf: &str, level: usize) -> Result<Vec<(Vec<u8>, Vec<u8>)>> {
-        let handle = util::get_cf_handle(self.as_inner(), cf)?;
-        let ret = self
-            .as_inner()
-            .get_column_family_meta_data(handle)
-            .get_level(level)
-            .get_files()
-            .iter()
-            .map(|sst_meta| {
-                (
-                    sst_meta.get_smallestkey().to_vec(),
-                    sst_meta.get_largestkey().to_vec(),
-                )
-            })
-            .collect();
-        Ok(ret)
-    }
-
     fn get_engine_used_size(&self) -> Result<u64> {
         let mut used_size: u64 = 0;
         for cf in self.cf_names() {
@@ -509,16 +503,15 @@ impl MiscExt for RocksEngine {
 #[cfg(test)]
 mod tests {
     use engine_traits::{
-        CompactExt, DeleteStrategy, Iterable, Iterator, ManualCompactionOptions, Mutable,
-        SyncMutable, WriteBatchExt, ALL_CFS,
+        ALL_CFS, DeleteStrategy, Iterable, Iterator, Mutable, SyncMutable, WriteBatchExt,
     };
     use tempfile::Builder;
 
     use super::*;
     use crate::{
+        RocksCfOptions, RocksDbOptions,
         engine::RocksEngine,
         util::{new_engine, new_engine_opt},
-        RocksCfOptions, RocksDbOptions,
     };
 
     fn check_data(db: &RocksEngine, cfs: &[&str], expected: &[(&[u8], &[u8])]) {
@@ -772,79 +765,6 @@ mod tests {
         check_data(&db, &[cf], kvs_left.as_slice());
     }
 
-    #[test]
-    fn test_get_sst_key_ranges() {
-        let path = Builder::new()
-            .prefix("test_get_sst_key_ranges")
-            .tempdir()
-            .unwrap();
-        let path_str = path.path().to_str().unwrap();
-
-        let mut opts = RocksDbOptions::default();
-        opts.create_if_missing(true);
-        opts.enable_multi_batch_write(true);
-
-        let mut cf_opts = RocksCfOptions::default();
-        // Prefix extractor(trim the timestamp at tail) for write cf.
-        cf_opts
-            .set_prefix_extractor(
-                "FixedSuffixSliceTransform",
-                crate::util::FixedSuffixSliceTransform::new(8),
-            )
-            .unwrap_or_else(|err| panic!("{:?}", err));
-        // Create prefix bloom filter for memtable.
-        cf_opts.set_memtable_prefix_bloom_size_ratio(0.1_f64);
-        cf_opts.set_level_compaction_dynamic_level_bytes(false);
-        let cf = "default";
-        let db = new_engine_opt(path_str, opts, vec![(cf, cf_opts)]).unwrap();
-        let mut wb = db.write_batch();
-        let kvs: Vec<(&[u8], &[u8])> = vec![
-            (b"k1", b"v1"),
-            (b"k2", b"v2"),
-            (b"k6", b"v3"),
-            (b"k7", b"v4"),
-        ];
-
-        for &(k, v) in kvs.as_slice() {
-            wb.put_cf(cf, k, v).unwrap();
-        }
-        wb.write().unwrap();
-
-        db.flush_cf(cf, true).unwrap();
-        let sst_range = db.get_sst_key_ranges(cf, 0).unwrap();
-        let expected = vec![(b"k1".to_vec(), b"k7".to_vec())];
-        assert_eq!(sst_range, expected);
-
-        let mut wb = db.write_batch();
-        let kvs: Vec<(&[u8], &[u8])> = vec![(b"k3", b"v1"), (b"k4", b"v2"), (b"k8", b"v3")];
-
-        for &(k, v) in kvs.as_slice() {
-            wb.put_cf(cf, k, v).unwrap();
-        }
-        wb.write().unwrap();
-
-        db.flush_cf(cf, true).unwrap();
-        let sst_range = db.get_sst_key_ranges(cf, 0).unwrap();
-        let expected = vec![
-            (b"k3".to_vec(), b"k8".to_vec()),
-            (b"k1".to_vec(), b"k7".to_vec()),
-        ];
-        assert_eq!(sst_range, expected);
-
-        db.compact_range_cf(
-            cf,
-            None,
-            None,
-            ManualCompactionOptions::new(false, 1, false),
-        )
-        .unwrap();
-        let sst_range = db.get_sst_key_ranges(cf, 0).unwrap();
-        assert_eq!(sst_range.len(), 0);
-        let sst_range = db.get_sst_key_ranges(cf, 1).unwrap();
-        let expected = vec![(b"k1".to_vec(), b"k8".to_vec())];
-        assert_eq!(sst_range, expected);
-    }
-
     #[test]
     fn test_flush_oldest() {
         let path = Builder::new()
diff --git a/components/engine_rocks/src/mvcc_properties.rs b/components/engine_rocks/src/mvcc_properties.rs
index 99ac5fbe6b2..639bfb2a92f 100644
--- a/components/engine_rocks/src/mvcc_properties.rs
+++ b/components/engine_rocks/src/mvcc_properties.rs
@@ -3,7 +3,7 @@
 use engine_traits::{MvccProperties, MvccPropertiesExt, Result};
 use txn_types::TimeStamp;
 
-use crate::{decode_properties::DecodeProperties, RocksEngine, RocksTtlProperties, UserProperties};
+use crate::{RocksEngine, RocksTtlProperties, UserProperties, decode_properties::DecodeProperties};
 
 pub const PROP_NUM_ERRORS: &str = "tikv.num_errors";
 pub const PROP_MIN_TS: &str = "tikv.min_ts";
@@ -13,6 +13,11 @@ pub const PROP_NUM_PUTS: &str = "tikv.num_puts";
 pub const PROP_NUM_DELETES: &str = "tikv.num_deletes";
 pub const PROP_NUM_VERSIONS: &str = "tikv.num_versions";
 pub const PROP_MAX_ROW_VERSIONS: &str = "tikv.max_row_versions";
+pub const PROP_OLDEST_STALE_VERSION_TS: &str = "tikv.oldest_stale_version_ts";
+pub const PROP_NEWEST_STALE_VERSION_TS: &str = "tikv.newest_stale_version_ts";
+pub const PROP_OLDEST_DELETE_TS: &str = "tikv.oldest_delete_ts";
+pub const PROP_NEWEST_DELETE_TS: &str = "tikv.newest_delete_ts";
+
 pub const PROP_ROWS_INDEX: &str = "tikv.rows_index";
 pub const PROP_ROWS_INDEX_DISTANCE: u64 = 10000;
 
@@ -28,6 +33,22 @@ impl RocksMvccProperties {
         props.encode_u64(PROP_NUM_DELETES, mvcc_props.num_deletes);
         props.encode_u64(PROP_NUM_VERSIONS, mvcc_props.num_versions);
         props.encode_u64(PROP_MAX_ROW_VERSIONS, mvcc_props.max_row_versions);
+        props.encode_u64(
+            PROP_OLDEST_STALE_VERSION_TS,
+            mvcc_props.oldest_stale_version_ts.into_inner(),
+        );
+        props.encode_u64(
+            PROP_NEWEST_STALE_VERSION_TS,
+            mvcc_props.newest_stale_version_ts.into_inner(),
+        );
+        props.encode_u64(
+            PROP_OLDEST_DELETE_TS,
+            mvcc_props.oldest_delete_ts.into_inner(),
+        );
+        props.encode_u64(
+            PROP_NEWEST_DELETE_TS,
+            mvcc_props.newest_delete_ts.into_inner(),
+        );
         RocksTtlProperties::encode_to(&mvcc_props.ttl, &mut props);
         props
     }
@@ -44,6 +65,24 @@ impl RocksMvccProperties {
             .decode_u64(PROP_NUM_DELETES)
             .unwrap_or(res.num_versions - res.num_puts);
         res.max_row_versions = props.decode_u64(PROP_MAX_ROW_VERSIONS)?;
+        // The following 4 properties may not exist in old releases, so use min_ts for
+        // oldest, max_ts for newest if not found.
+        res.oldest_stale_version_ts = props
+            .decode_u64(PROP_OLDEST_STALE_VERSION_TS)
+            .map(Into::into)
+            .unwrap_or(res.min_ts);
+        res.newest_stale_version_ts = props
+            .decode_u64(PROP_NEWEST_STALE_VERSION_TS)
+            .map(Into::into)
+            .unwrap_or(res.max_ts);
+        res.oldest_delete_ts = props
+            .decode_u64(PROP_OLDEST_DELETE_TS)
+            .map(Into::into)
+            .unwrap_or(res.min_ts);
+        res.newest_delete_ts = props
+            .decode_u64(PROP_NEWEST_DELETE_TS)
+            .map(Into::into)
+            .unwrap_or(res.max_ts);
         RocksTtlProperties::decode_from(&mut res.ttl, props);
         Ok(res)
     }
diff --git a/components/engine_rocks/src/perf_context_impl.rs b/components/engine_rocks/src/perf_context_impl.rs
index 59086127154..c33fed20d3f 100644
--- a/components/engine_rocks/src/perf_context_impl.rs
+++ b/components/engine_rocks/src/perf_context_impl.rs
@@ -7,11 +7,11 @@ use engine_traits::{PerfContextKind, PerfLevel};
 use lazy_static::lazy_static;
 use slog_derive::KV;
 use tikv_util::time::Instant;
-use tracker::{Tracker, TrackerToken, GLOBAL_TRACKERS};
+use tracker::{GLOBAL_TRACKERS, Tracker, TrackerToken};
 
 use crate::{
-    perf_context_metrics::*, set_perf_flags, set_perf_level, util, PerfContext as RawPerfContext,
-    PerfFlag, PerfFlags,
+    PerfContext as RawPerfContext, PerfFlag, PerfFlags, perf_context_metrics::*, set_perf_flags,
+    set_perf_level, util,
 };
 
 macro_rules! report_write_perf_context {
diff --git a/components/engine_rocks/src/properties.rs b/components/engine_rocks/src/properties.rs
index 01ca0447a06..15fe57c6a4b 100644
--- a/components/engine_rocks/src/properties.rs
+++ b/components/engine_rocks/src/properties.rs
@@ -5,21 +5,26 @@ use std::{
     collections::HashMap,
     io::Read,
     ops::{Deref, DerefMut},
-    u64,
+    sync::{
+        Mutex,
+        atomic::{AtomicU64, Ordering},
+    },
 };
 
 use api_version::{ApiV2, KeyMode, KvFormat};
-use engine_traits::{raw_ttl::ttl_current_ts, MvccProperties, Range, RangeStats};
+use engine_traits::{MvccProperties, Range, RangeStats, raw_ttl::ttl_current_ts};
+use lazy_static::lazy_static;
 use rocksdb::{
     DBEntryType, TablePropertiesCollector, TablePropertiesCollectorFactory, TitanBlobIndex,
     UserCollectedProperties,
 };
 use tikv_util::{
     codec::{
-        number::{self, NumberEncoder},
         Error, Result,
+        number::{self, NumberEncoder},
     },
     info,
+    smoother::Smoother,
 };
 use txn_types::{Key, Write, WriteType};
 
@@ -34,11 +39,35 @@ const PROP_RANGE_INDEX: &str = "tikv.range_index";
 pub const DEFAULT_PROP_SIZE_INDEX_DISTANCE: u64 = 4 * 1024 * 1024;
 pub const DEFAULT_PROP_KEYS_INDEX_DISTANCE: u64 = 40 * 1024;
 
-fn get_entry_size(value: &[u8], entry_type: DBEntryType) -> std::result::Result<u64, ()> {
+/// Caps the compaction factor to avoid unrealistic estimates.
+pub const TITAN_MAX_COMPACTION_FACTOR: f64 = 5000.0;
+const FIVE_MINS_IN_SECONDS: u64 = 5 * 60;
+
+lazy_static! {
+    // A global smoother used to estimate the Titan blob compression factor over
+    // the last 5 minutes. The window size is 30, roughly matching the number of
+    // data points collected in 5 minutes assuming one data point every 10 secs.
+    pub static ref TITAN_COMPRESSION_FACTOR_SMOOTHER: Mutex<Smoother<f64, 30, FIVE_MINS_IN_SECONDS, 0>> =
+        Mutex::new(Smoother::<f64, 30, FIVE_MINS_IN_SECONDS, 0>::default());
+    pub static ref TITAN_COMPRESSION_FACTOR: AtomicU64 = AtomicU64::new(f64::to_bits(1.0));
+    pub static ref TITAN_MAX_BLOB_SIZE_SEEN: AtomicU64 = AtomicU64::new(u64::MAX);
+}
+
+fn get_entry_size(
+    value: &[u8],
+    entry_type: DBEntryType,
+    titan_compression_factor: f64,
+    titan_max_blob_size: u64,
+) -> std::result::Result<u64, ()> {
     match entry_type {
         DBEntryType::Put => Ok(value.len() as u64),
         DBEntryType::BlobIndex => match TitanBlobIndex::decode(value) {
-            Ok(index) => Ok(index.blob_size + value.len() as u64),
+            Ok(index) => {
+                // Estimate the raw blob size using the Titan compression factor.
+                let estimation = (index.blob_size as f64 * titan_compression_factor) as u64;
+                let blob_raw_size = estimation.min(titan_max_blob_size).max(index.blob_size);
+                Ok(blob_raw_size + value.len() as u64)
+            }
             Err(_) => Err(()),
         },
         _ => Err(()),
@@ -122,7 +151,7 @@ impl DecodeProperties for UserProperties {
 // type until the engine abstraction situation is straightened out.
 pub struct UserCollectedPropertiesDecoder<'a>(pub &'a UserCollectedProperties);
 
-impl<'a> DecodeProperties for UserCollectedPropertiesDecoder<'a> {
+impl DecodeProperties for UserCollectedPropertiesDecoder<'_> {
     fn decode(&self, k: &str) -> Result<&[u8]> {
         match self.0.get(k.as_bytes()) {
             Some(v) => Ok(v),
@@ -287,6 +316,9 @@ pub struct RangePropertiesCollector {
     cur_offsets: RangeOffsets,
     prop_size_index_distance: u64,
     prop_keys_index_distance: u64,
+    titan_compression_factor: f64,
+    titan_max_blob_size: u64,
+    should_reload_titan_stats: bool,
 }
 
 impl Default for RangePropertiesCollector {
@@ -298,6 +330,9 @@ impl Default for RangePropertiesCollector {
             cur_offsets: RangeOffsets::default(),
             prop_size_index_distance: DEFAULT_PROP_SIZE_INDEX_DISTANCE,
             prop_keys_index_distance: DEFAULT_PROP_KEYS_INDEX_DISTANCE,
+            titan_compression_factor: 1.0,
+            titan_max_blob_size: u64::MAX,
+            should_reload_titan_stats: true,
         }
     }
 }
@@ -327,8 +362,20 @@ impl RangePropertiesCollector {
 
 impl TablePropertiesCollector for RangePropertiesCollector {
     fn add(&mut self, key: &[u8], value: &[u8], entry_type: DBEntryType, _: u64, _: u64) {
+        if self.should_reload_titan_stats {
+            self.titan_compression_factor =
+                f64::from_bits(TITAN_COMPRESSION_FACTOR.load(Ordering::Relaxed))
+                    .clamp(1.0, TITAN_MAX_COMPACTION_FACTOR);
+            self.titan_max_blob_size = TITAN_MAX_BLOB_SIZE_SEEN.load(Ordering::Relaxed);
+            self.should_reload_titan_stats = false;
+        }
         // size
-        let size = match get_entry_size(value, entry_type) {
+        let size = match get_entry_size(
+            value,
+            entry_type,
+            self.titan_compression_factor,
+            self.titan_max_blob_size,
+        ) {
             Ok(entry_size) => key.len() as u64 + entry_size,
             Err(_) => return,
         };
@@ -347,6 +394,7 @@ impl TablePropertiesCollector for RangePropertiesCollector {
     }
 
     fn finish(&mut self) -> HashMap<Vec<u8>, Vec<u8>> {
+        self.should_reload_titan_stats = true;
         if self.size_in_last_range() > 0 || self.keys_in_last_range() > 0 {
             let key = self.last_key.clone();
             self.insert_new_point(key);
@@ -444,6 +492,8 @@ impl TablePropertiesCollector for MvccPropertiesCollector {
             self.last_row.extend(k);
         } else {
             self.row_versions += 1;
+            self.props.oldest_stale_version_ts = cmp::min(self.props.oldest_stale_version_ts, ts);
+            self.props.newest_stale_version_ts = cmp::max(self.props.newest_stale_version_ts, ts);
         }
         if self.row_versions > self.props.max_row_versions {
             self.props.max_row_versions = self.row_versions;
@@ -478,7 +528,11 @@ impl TablePropertiesCollector for MvccPropertiesCollector {
 
                 match write_type {
                     WriteType::Put => self.props.num_puts += 1,
-                    WriteType::Delete => self.props.num_deletes += 1,
+                    WriteType::Delete => {
+                        self.props.num_deletes += 1;
+                        self.props.oldest_delete_ts = cmp::min(self.props.oldest_delete_ts, ts);
+                        self.props.newest_delete_ts = cmp::max(self.props.newest_delete_ts, ts);
+                    }
                     _ => {}
                 }
             }
@@ -574,7 +628,7 @@ pub fn get_range_stats(
 #[cfg(test)]
 mod tests {
     use api_version::RawValue;
-    use engine_traits::{MiscExt, SyncMutable, CF_WRITE, LARGE_CFS};
+    use engine_traits::{CF_WRITE, LARGE_CFS, MiscExt, SyncMutable};
     use rand::Rng;
     use tempfile::Builder;
     use test::Bencher;
@@ -582,8 +636,8 @@ mod tests {
 
     use super::*;
     use crate::{
-        raw::{DBEntryType, TablePropertiesCollector},
         RocksCfOptions, RocksDbOptions,
+        raw::{DBEntryType, TablePropertiesCollector},
     };
 
     #[allow(clippy::many_single_char_names)]
@@ -878,4 +932,35 @@ mod tests {
             }
         });
     }
+
+    fn encode_blob_index(blob_size: u64) -> Vec<u8> {
+        let mut index = TitanBlobIndex::default();
+        index.blob_size = blob_size;
+        index.encode()
+    }
+
+    #[test]
+    fn test_get_entry_size() {
+        let blob_size = 10;
+        let val = encode_blob_index(blob_size);
+        let test_cases = [
+            (1.0, 1000, blob_size),
+            (100.0, 1000, blob_size * 100),
+            (200.0, u64::MAX, blob_size * 200),
+            // Estimation clamped by max blob size seen.
+            (100.0, 500, 500),
+            // No regress if stats are 0 or default values.
+            (0.0, 0, blob_size),
+            (0.0, 100, blob_size),
+            (100.0, 0, blob_size),
+            (1.0, u64::MAX, blob_size),
+            (0.0, u64::MAX, blob_size),
+        ];
+
+        for (factor, max_blob_size_seen, expect_size) in test_cases {
+            let entry_size =
+                get_entry_size(&val, DBEntryType::BlobIndex, factor, max_blob_size_seen).unwrap();
+            assert_eq!(entry_size, expect_size + val.len() as u64);
+        }
+    }
 }
diff --git a/components/engine_rocks/src/raft_engine.rs b/components/engine_rocks/src/raft_engine.rs
index df0988f4cdb..2f3e8ad5df4 100644
--- a/components/engine_rocks/src/raft_engine.rs
+++ b/components/engine_rocks/src/raft_engine.rs
@@ -2,9 +2,9 @@
 
 // #[PerformanceCriticalPath]
 use engine_traits::{
-    Error, Iterable, KvEngine, MiscExt, Mutable, Peekable, RaftEngine, RaftEngineDebug,
-    RaftEngineReadOnly, RaftLogBatch, Result, WriteBatch, WriteBatchExt, WriteOptions, CF_DEFAULT,
-    RAFT_LOG_MULTI_GET_CNT,
+    CF_DEFAULT, Error, Iterable, KvEngine, MiscExt, Mutable, Peekable, RAFT_LOG_MULTI_GET_CNT,
+    RaftEngine, RaftEngineDebug, RaftEngineReadOnly, RaftLogBatch, Result, WriteBatch,
+    WriteBatchExt, WriteOptions,
 };
 use kvproto::{
     metapb::Region,
@@ -16,7 +16,7 @@ use protobuf::Message;
 use raft::eraftpb::Entry;
 use tikv_util::{box_err, box_try};
 
-use crate::{util, RocksEngine, RocksWriteBatchVec};
+use crate::{RocksEngine, RocksWriteBatchVec, util};
 
 impl RaftEngineReadOnly for RocksEngine {
     fn get_raft_state(&self, raft_group_id: u64) -> Result<Option<RaftLocalState>> {
diff --git a/components/engine_rocks/src/range_properties.rs b/components/engine_rocks/src/range_properties.rs
index dfc41db5f6e..b0b7c0e2b8d 100644
--- a/components/engine_rocks/src/range_properties.rs
+++ b/components/engine_rocks/src/range_properties.rs
@@ -3,13 +3,13 @@
 use std::path::Path;
 
 use engine_traits::{
-    MiscExt, Range, RangePropertiesExt, Result, CF_DEFAULT, CF_LOCK, CF_WRITE, LARGE_CFS,
+    CF_DEFAULT, CF_LOCK, CF_WRITE, LARGE_CFS, MiscExt, Range, RangePropertiesExt, Result,
 };
 use tikv_util::{box_err, box_try, debug, info};
 
 use crate::{
     engine::RocksEngine,
-    properties::{get_range_stats, RangeProperties},
+    properties::{RangeProperties, get_range_stats},
 };
 
 impl RangePropertiesExt for RocksEngine {
diff --git a/components/engine_rocks/src/raw.rs b/components/engine_rocks/src/raw.rs
index f2c6d862280..b273ac2d7c0 100644
--- a/components/engine_rocks/src/raw.rs
+++ b/components/engine_rocks/src/raw.rs
@@ -7,13 +7,14 @@
 //! crate, but only until the engine interface is completely abstracted.
 
 pub use rocksdb::{
-    run_ldb_tool, run_sst_dump_tool, BlockBasedOptions, Cache, ChecksumType, CompactOptions,
-    CompactionFilter, CompactionFilterContext, CompactionFilterDecision, CompactionFilterFactory,
+    BlockBasedOptions, Cache, ChecksumType, CompactOptions, CompactionFilter,
+    CompactionFilterContext, CompactionFilterDecision, CompactionFilterFactory,
     CompactionFilterValueType, CompactionJobInfo, CompactionOptions, CompactionPriority,
     ConcurrentTaskLimiter, DBBottommostLevelCompaction, DBCompactionFilter, DBCompactionStyle,
     DBCompressionType, DBEntryType, DBRateLimiterMode, DBRecoveryMode, DBStatisticsTickerType,
     DBTableFileCreationReason, DBTitanDBBlobRunMode, Env, EventListener, FlushOptions,
     IngestExternalFileOptions, LRUCacheOptions, MemoryAllocator, PerfContext,
     PrepopulateBlockCache, Range, RateLimiter, SliceTransform, Statistics,
-    TablePropertiesCollector, TablePropertiesCollectorFactory, WriteBufferManager,
+    TablePropertiesCollector, TablePropertiesCollectorFactory, WriteBufferManager, run_ldb_tool,
+    run_sst_dump_tool,
 };
diff --git a/components/engine_rocks/src/rocks_metrics.rs b/components/engine_rocks/src/rocks_metrics.rs
index 7f7294f0188..5935d021979 100644
--- a/components/engine_rocks/src/rocks_metrics.rs
+++ b/components/engine_rocks/src/rocks_metrics.rs
@@ -1,7 +1,9 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
+use std::sync::atomic::Ordering;
+
 use collections::HashMap;
-use engine_traits::{StatisticsReporter, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, StatisticsReporter};
 use lazy_static::lazy_static;
 use prometheus::*;
 use prometheus_static_metric::*;
@@ -9,7 +11,11 @@ use rocksdb::{
     DBStatisticsHistogramType as HistType, DBStatisticsTickerType as TickerType, HistogramData,
 };
 
-use crate::{engine::RocksEngine, rocks_metrics_defs::*, RocksStatistics};
+use crate::{
+    RocksStatistics, TITAN_COMPRESSION_FACTOR, TITAN_COMPRESSION_FACTOR_SMOOTHER,
+    TITAN_MAX_BLOB_SIZE_SEEN, TITAN_MAX_COMPACTION_FACTOR, engine::RocksEngine,
+    rocks_metrics_defs::*,
+};
 
 make_auto_flush_static_metric! {
     pub label_enum TickerName {
@@ -1235,6 +1241,30 @@ pub fn flush_engine_statistics(statistics: &RocksStatistics, name: &str, is_tita
         }
     }
     if is_titan {
+        if let Some(v) = statistics.get_histogram(HistType::TitanValueSize) {
+            // Update the Titan compression factor, which is used to estimate
+            // blob raw size when building SST table properties.
+            let keys_cnt = statistics.get_ticker_count(TickerType::TitanBlobFileNumKeysWritten);
+            let compressed_size =
+                statistics.get_ticker_count(TickerType::TitanBlobFileBytesWritten);
+            let estimated_raw_size = (v.average * keys_cnt as f64) as u64;
+            if estimated_raw_size > 0 && compressed_size > 0 {
+                let compression_factor = (estimated_raw_size as f64 / compressed_size as f64)
+                    .clamp(1.0, TITAN_MAX_COMPACTION_FACTOR);
+                let mut smoother = TITAN_COMPRESSION_FACTOR_SMOOTHER.lock().unwrap();
+                smoother.observe(compression_factor);
+                TITAN_COMPRESSION_FACTOR.store(smoother.get_avg().to_bits(), Ordering::Relaxed);
+                TITAN_COMPRESSION_FACTOR_GAUGE.set(smoother.get_avg());
+            }
+
+            // Update the Titan max blob size seen, used to cap blob size
+            // estimation.
+            let current = TITAN_MAX_BLOB_SIZE_SEEN.load(Ordering::Relaxed);
+            if current == u64::MAX || v.max as u64 > current {
+                TITAN_MAX_BLOB_SIZE_SEEN.store(v.max as u64, Ordering::Relaxed);
+            }
+        }
+
         for t in TITAN_ENGINE_TICKER_TYPES {
             let v = statistics.get_and_reset_ticker_count(*t);
             flush_engine_ticker_metrics(*t, v, name);
@@ -1711,6 +1741,10 @@ lazy_static! {
         "Histogram of titan iter touched blob file count",
         &["db", "type"]
     ).unwrap();
+    pub static ref TITAN_COMPRESSION_FACTOR_GAUGE: Gauge = register_gauge!(
+        "tikv_engine_blob_compression_factor",
+        "Estimated compression factor (raw_size / compressed_size) of Titan"
+    ).unwrap();
 }
 
 #[cfg(test)]
diff --git a/components/engine_rocks/src/snapshot.rs b/components/engine_rocks/src/snapshot.rs
index 22cdea503ab..1f3ed47f0b5 100644
--- a/components/engine_rocks/src/snapshot.rs
+++ b/components/engine_rocks/src/snapshot.rs
@@ -9,11 +9,11 @@ use engine_traits::{
     self, CfNamesExt, IterOptions, Iterable, Peekable, ReadOptions, Result, Snapshot,
     SnapshotMiscExt,
 };
-use rocksdb::{rocksdb_options::UnsafeSnap, DBIterator, DB};
+use rocksdb::{DB, DBIterator, rocksdb_options::UnsafeSnap};
 
 use crate::{
-    db_vector::RocksDbVector, options::RocksReadOptions, r2e, util::get_cf_handle,
-    RocksEngineIterator,
+    RocksEngineIterator, db_vector::RocksDbVector, options::RocksReadOptions, r2e,
+    util::get_cf_handle,
 };
 
 pub struct RocksSnapshot {
diff --git a/components/engine_rocks/src/sst.rs b/components/engine_rocks/src/sst.rs
index d72456cc572..dcf3dfb90d4 100644
--- a/components/engine_rocks/src/sst.rs
+++ b/components/engine_rocks/src/sst.rs
@@ -4,15 +4,15 @@ use std::{path::PathBuf, sync::Arc};
 
 use ::encryption::DataKeyManager;
 use engine_traits::{
-    Error, ExternalSstFileInfo, ExternalSstFileReader, IterOptions, Iterator, RefIterable, Result,
-    SstCompressionType, SstExt, SstReader, SstWriter, SstWriterBuilder, CF_DEFAULT,
+    CF_DEFAULT, Error, ExternalSstFileInfo, ExternalSstFileReader, IterOptions, Iterator,
+    RefIterable, Result, SstCompressionType, SstExt, SstReader, SstWriter, SstWriterBuilder,
 };
 use fail::fail_point;
 use file_system::get_io_rate_limiter;
 use rocksdb::{
-    rocksdb::supported_compression, ColumnFamilyOptions, DBCompressionType, DBIterator, Env,
-    EnvOptions, ExternalSstFileInfo as RawExternalSstFileInfo, SequentialFile, SstFileReader,
-    SstFileWriter, DB,
+    ColumnFamilyOptions, DB, DBCompressionType, DBIterator, Env, EnvOptions,
+    ExternalSstFileInfo as RawExternalSstFileInfo, SequentialFile, SstFileReader, SstFileWriter,
+    rocksdb::supported_compression,
 };
 
 use crate::{engine::RocksEngine, get_env, options::RocksReadOptions, r2e};
diff --git a/components/engine_rocks/src/table_properties.rs b/components/engine_rocks/src/table_properties.rs
index 19b2141483d..2813c9f7c69 100644
--- a/components/engine_rocks/src/table_properties.rs
+++ b/components/engine_rocks/src/table_properties.rs
@@ -1,8 +1,8 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_traits::{Range, Result};
+use engine_traits::{MvccProperties, Range, Result};
 
-use crate::{r2e, util, RangeProperties, RocksEngine};
+use crate::{RangeProperties, RocksEngine, mvcc_properties::RocksMvccProperties, r2e, util};
 
 #[repr(transparent)]
 pub struct UserCollectedProperties(rocksdb::UserCollectedProperties);
@@ -16,18 +16,39 @@ impl engine_traits::UserCollectedProperties for UserCollectedProperties {
         let x = rp.get_approximate_distance_in_range(start, end);
         Some((x.0 as usize, x.1 as usize))
     }
+
+    fn get_mvcc_properties(&self) -> Option<MvccProperties> {
+        let mvcc = RocksMvccProperties::decode(&self.0).ok()?;
+        Some(mvcc)
+    }
 }
 
+#[repr(transparent)]
+pub struct TableProperties(rocksdb::TableProperties);
+impl engine_traits::TableProperties for TableProperties {
+    type UserCollectedProperties = UserCollectedProperties;
+    fn get_user_collected_properties(&self) -> &Self::UserCollectedProperties {
+        unsafe {
+            std::mem::transmute::<_, &UserCollectedProperties>(self.0.user_collected_properties())
+        }
+    }
+
+    fn get_num_entries(&self) -> u64 {
+        self.0.num_entries()
+    }
+}
 #[repr(transparent)]
 pub struct TablePropertiesCollection(rocksdb::TablePropertiesCollection);
 impl engine_traits::TablePropertiesCollection for TablePropertiesCollection {
-    type UserCollectedProperties = UserCollectedProperties;
-    fn iter_user_collected_properties<F>(&self, mut f: F)
+    type TableProperties = TableProperties;
+    fn iter_table_properties<F>(&self, mut f: F)
     where
-        F: FnMut(&Self::UserCollectedProperties) -> bool,
+        F: FnMut(&Self::TableProperties) -> bool,
     {
         for (_, props) in self.0.into_iter() {
-            let props = unsafe { std::mem::transmute(props.user_collected_properties()) };
+            let props = unsafe {
+                std::mem::transmute::<&rocksdb::TableProperties, &TableProperties>(props)
+            };
             if !f(props) {
                 break;
             }
diff --git a/components/engine_rocks/src/ttl_properties.rs b/components/engine_rocks/src/ttl_properties.rs
index 62731ac1aa4..43457e68b27 100644
--- a/components/engine_rocks/src/ttl_properties.rs
+++ b/components/engine_rocks/src/ttl_properties.rs
@@ -7,7 +7,7 @@ use engine_traits::{Range, Result, TtlProperties, TtlPropertiesExt};
 use rocksdb::{DBEntryType, TablePropertiesCollector, TablePropertiesCollectorFactory};
 use tikv_util::error;
 
-use crate::{decode_properties::DecodeProperties, RocksEngine, UserProperties};
+use crate::{RocksEngine, UserProperties, decode_properties::DecodeProperties};
 
 const PROP_MAX_EXPIRE_TS: &str = "tikv.max_expire_ts";
 const PROP_MIN_EXPIRE_TS: &str = "tikv.min_expire_ts";
diff --git a/components/engine_rocks/src/util.rs b/components/engine_rocks/src/util.rs
index e51e1178854..4a6e9e90b07 100644
--- a/components/engine_rocks/src/util.rs
+++ b/components/engine_rocks/src/util.rs
@@ -2,19 +2,19 @@
 
 use std::{ffi::CString, fs, path::Path, str::FromStr, sync::Arc};
 
-use engine_traits::{Engines, Range, Result, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, Engines, Range, Result};
 use fail::fail_point;
 use rocksdb::{
-    load_latest_options, CColumnFamilyDescriptor, CFHandle, ColumnFamilyOptions, CompactionFilter,
+    CColumnFamilyDescriptor, CFHandle, ColumnFamilyOptions, CompactionFilter,
     CompactionFilterContext, CompactionFilterDecision, CompactionFilterFactory,
-    CompactionFilterValueType, DBTableFileCreationReason, Env, Range as RocksRange, SliceTransform,
-    DB,
+    CompactionFilterValueType, DB, DBTableFileCreationReason, Env, Range as RocksRange,
+    SliceTransform, load_latest_options,
 };
 use slog_global::warn;
 
 use crate::{
-    cf_options::RocksCfOptions, db_options::RocksDbOptions, engine::RocksEngine, r2e,
-    rocks_metrics_defs::*, RocksStatistics,
+    RocksStatistics, cf_options::RocksCfOptions, db_options::RocksDbOptions, engine::RocksEngine,
+    r2e, rocks_metrics_defs::*,
 };
 
 pub fn new_temp_engine(path: &tempfile::TempDir) -> Engines<RocksEngine, RocksEngine> {
@@ -196,6 +196,18 @@ pub fn get_engine_cf_used_size(engine: &DB, handle: &CFHandle) -> u64 {
     cf_used_size
 }
 
+pub fn get_engine_cfs_used_size(engine: &DB) -> Result<u64> {
+    let mut cfs_used_size = 0;
+    for cf in engine.cf_names() {
+        let handle = engine
+            .cf_handle(cf)
+            .ok_or_else(|| format!("cf {} not found", cf))
+            .map_err(r2e)?;
+        cfs_used_size += get_engine_cf_used_size(engine, handle);
+    }
+    Ok(cfs_used_size)
+}
+
 /// Gets engine's compression ratio at given level.
 pub fn get_engine_compression_ratio_at_level(
     engine: &DB,
@@ -517,7 +529,7 @@ impl CompactionFilter for RangeCompactionFilter {
 #[cfg(test)]
 mod tests {
     use engine_traits::{
-        CfOptionsExt, FlowControlFactorsExt, Iterable, MiscExt, Peekable, SyncMutable, CF_DEFAULT,
+        CF_DEFAULT, CfOptionsExt, FlowControlFactorsExt, Iterable, MiscExt, Peekable, SyncMutable,
     };
     use rocksdb::DB;
     use tempfile::Builder;
diff --git a/components/engine_rocks/src/write_batch.rs b/components/engine_rocks/src/write_batch.rs
index 8c5aa1dd9b9..bbf5eb4248c 100644
--- a/components/engine_rocks/src/write_batch.rs
+++ b/components/engine_rocks/src/write_batch.rs
@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use engine_traits::{self, Mutable, Result, WriteBatchExt, WriteOptions};
-use rocksdb::{Writable, WriteBatch as RawWriteBatch, DB};
+use rocksdb::{DB, Writable, WriteBatch as RawWriteBatch};
 
 use crate::{engine::RocksEngine, options::RocksWriteOptions, r2e, util::get_cf_handle};
 
@@ -240,12 +240,12 @@ impl Mutable for RocksWriteBatchVec {
 
 #[cfg(test)]
 mod tests {
-    use engine_traits::{Peekable, WriteBatch, CF_DEFAULT};
+    use engine_traits::{CF_DEFAULT, Peekable, WriteBatch};
     use rocksdb::DBOptions as RawDBOptions;
     use tempfile::Builder;
 
     use super::{
-        super::{util::new_engine_opt, RocksDbOptions},
+        super::{RocksDbOptions, util::new_engine_opt},
         *,
     };
     use crate::RocksCfOptions;
diff --git a/components/engine_rocks_helper/src/sst_recovery.rs b/components/engine_rocks_helper/src/sst_recovery.rs
index 8a2d31b22fb..00bbce9e29b 100644
--- a/components/engine_rocks_helper/src/sst_recovery.rs
+++ b/components/engine_rocks_helper/src/sst_recovery.rs
@@ -210,7 +210,7 @@ mod tests {
     use std::{collections::BTreeMap, sync::Arc};
 
     use engine_rocks::util;
-    use engine_traits::{CompactExt, ManualCompactionOptions, SyncMutable, CF_DEFAULT};
+    use engine_traits::{CF_DEFAULT, CompactExt, ManualCompactionOptions, SyncMutable};
     use kvproto::metapb::{Peer, Region};
     use tempfile::Builder;
 
diff --git a/components/engine_test/src/lib.rs b/components/engine_test/src/lib.rs
index b8eb340c55a..1e0407f1cbe 100644
--- a/components/engine_test/src/lib.rs
+++ b/components/engine_test/src/lib.rs
@@ -267,6 +267,7 @@ pub mod ctor {
         disable_auto_compactions: bool,
         level_zero_file_num_compaction_trigger: Option<i32>,
         level_zero_slowdown_writes_trigger: Option<i32>,
+        level_zero_stop_writes_trigger: Option<i32>,
         /// On RocksDB, turns off the range properties collector. Only used in
         /// tests. Unclear how other engines should deal with this.
         no_range_properties: bool,
@@ -281,6 +282,7 @@ pub mod ctor {
                 disable_auto_compactions: false,
                 level_zero_file_num_compaction_trigger: None,
                 level_zero_slowdown_writes_trigger: None,
+                level_zero_stop_writes_trigger: None,
                 no_range_properties: false,
                 no_table_properties: false,
             }
@@ -310,6 +312,14 @@ pub mod ctor {
             self.level_zero_slowdown_writes_trigger
         }
 
+        pub fn set_level_zero_stop_writes_trigger(&mut self, n: i32) {
+            self.level_zero_stop_writes_trigger = Some(n);
+        }
+
+        pub fn get_level_zero_stop_writes_trigger(&self) -> Option<i32> {
+            self.level_zero_stop_writes_trigger
+        }
+
         pub fn set_no_range_properties(&mut self, v: bool) {
             self.no_range_properties = v;
         }
@@ -371,13 +381,12 @@ pub mod ctor {
 
     mod rocks {
         use engine_rocks::{
-            get_env,
+            RocksCfOptions, RocksDbOptions, RocksPersistenceListener, get_env,
             properties::{MvccPropertiesCollectorFactory, RangePropertiesCollectorFactory},
-            util::{new_engine_opt as rocks_new_engine_opt, RangeCompactionFilterFactory},
-            RocksCfOptions, RocksDbOptions, RocksPersistenceListener,
+            util::{RangeCompactionFilterFactory, new_engine_opt as rocks_new_engine_opt},
         };
         use engine_traits::{
-            CfOptions as _, PersistenceListener, Result, TabletContext, CF_DEFAULT,
+            CF_DEFAULT, CfOptions as _, PersistenceListener, Result, TabletContext,
         };
 
         use super::{
@@ -479,6 +488,9 @@ pub mod ctor {
             if let Some(trigger) = cf_opts.get_level_zero_slowdown_writes_trigger() {
                 rocks_cf_opts.set_level_zero_slowdown_writes_trigger(trigger);
             }
+            if let Some(trigger) = cf_opts.get_level_zero_stop_writes_trigger() {
+                rocks_cf_opts.set_level_zero_stop_writes_trigger(trigger);
+            }
             if cf_opts.get_disable_auto_compactions() {
                 rocks_cf_opts.set_disable_auto_compactions(true);
             }
diff --git a/components/engine_tirocks/src/db_vector.rs b/components/engine_tirocks/src/db_vector.rs
index 67a7609ac15..7e71a8905ee 100644
--- a/components/engine_tirocks/src/db_vector.rs
+++ b/components/engine_tirocks/src/db_vector.rs
@@ -27,7 +27,7 @@ impl Debug for RocksPinSlice {
     }
 }
 
-impl<'a> PartialEq<&'a [u8]> for RocksPinSlice {
+impl PartialEq<&[u8]> for RocksPinSlice {
     #[inline]
     fn eq(&self, rhs: &&[u8]) -> bool {
         **rhs == **self
diff --git a/components/engine_tirocks/src/write_batch.rs b/components/engine_tirocks/src/write_batch.rs
index 1671e686917..684f7ba0863 100644
--- a/components/engine_tirocks/src/write_batch.rs
+++ b/components/engine_tirocks/src/write_batch.rs
@@ -97,7 +97,7 @@ impl engine_traits::WriteBatch for RocksWriteBatchVec {
     fn data_size(&self) -> usize {
         let mut size = 0;
         for w in &self.wbs[..=self.index] {
-            size += w.as_bytes().len();
+            size += w.len();
         }
         size
     }
diff --git a/components/engine_traits/src/cf_defs.rs b/components/engine_traits/src/cf_defs.rs
index 46e56351387..68133424b9e 100644
--- a/components/engine_traits/src/cf_defs.rs
+++ b/components/engine_traits/src/cf_defs.rs
@@ -28,5 +28,5 @@ pub fn name_to_cf(name: &str) -> Option<CfName> {
 }
 
 pub fn is_data_cf(cf: &str) -> bool {
-    DATA_CFS.iter().any(|c| *c == cf)
+    DATA_CFS.contains(&cf)
 }
diff --git a/components/engine_traits/src/cf_options.rs b/components/engine_traits/src/cf_options.rs
index 1ed44825d37..35143bf0b18 100644
--- a/components/engine_traits/src/cf_options.rs
+++ b/components/engine_traits/src/cf_options.rs
@@ -1,6 +1,6 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use crate::{db_options::TitanCfOptions, sst_partitioner::SstPartitionerFactory, Result};
+use crate::{Result, db_options::TitanCfOptions, sst_partitioner::SstPartitionerFactory};
 
 /// Trait for engines with column family options
 pub trait CfOptionsExt {
diff --git a/components/engine_traits/src/compact.rs b/components/engine_traits/src/compact.rs
index 9be2543baa6..6fb960a8cb2 100644
--- a/components/engine_traits/src/compact.rs
+++ b/components/engine_traits/src/compact.rs
@@ -4,7 +4,7 @@
 
 use std::collections::BTreeMap;
 
-use crate::{errors::Result, CfNamesExt};
+use crate::{CfNamesExt, errors::Result};
 
 #[derive(Clone, Debug)]
 pub struct ManualCompactionOptions {
@@ -96,6 +96,8 @@ pub trait CompactExt: CfNamesExt {
 }
 
 pub trait CompactedEvent: Send {
+    fn get_key_range(&self) -> (Vec<u8>, Vec<u8>);
+
     fn total_bytes_declined(&self) -> u64;
 
     fn is_size_declining_trivial(&self, split_check_diff: u64) -> bool;
diff --git a/components/engine_traits/src/file_system.rs b/components/engine_traits/src/file_system.rs
index 51911b1f58e..77b7a40511f 100644
--- a/components/engine_traits/src/file_system.rs
+++ b/components/engine_traits/src/file_system.rs
@@ -2,7 +2,7 @@
 
 use std::sync::Arc;
 
-use file_system::{get_io_rate_limiter, get_io_type, IoOp, IoRateLimiter};
+use file_system::{IoOp, IoRateLimiter, get_io_rate_limiter, get_io_type};
 
 use crate::Result;
 
diff --git a/components/engine_traits/src/flush.rs b/components/engine_traits/src/flush.rs
index 2a98c69bc8b..2e1c1602936 100644
--- a/components/engine_traits/src/flush.rs
+++ b/components/engine_traits/src/flush.rs
@@ -15,8 +15,8 @@
 use std::{
     collections::LinkedList,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc, Mutex, RwLock,
+        atomic::{AtomicU64, Ordering},
     },
     time::Duration,
 };
@@ -25,7 +25,7 @@ use kvproto::import_sstpb::SstMeta;
 use slog_global::{info, warn};
 use tikv_util::{set_panic_mark, time::Instant};
 
-use crate::{data_cf_offset, RaftEngine, RaftLogBatch, DATA_CFS_LEN};
+use crate::{DATA_CFS_LEN, RaftEngine, RaftLogBatch, data_cf_offset};
 
 const HEAVY_WORKER_THRESHOLD: Duration = Duration::from_millis(25);
 
diff --git a/components/engine_traits/src/import.rs b/components/engine_traits/src/import.rs
index 1a6ef4f9334..2800ac1a7a8 100644
--- a/components/engine_traits/src/import.rs
+++ b/components/engine_traits/src/import.rs
@@ -2,7 +2,7 @@
 
 use tikv_util::range_latch::RangeLatchGuard;
 
-use crate::{errors::Result, Range};
+use crate::{Range, errors::Result};
 
 pub trait ImportExt {
     type IngestExternalFileOptions: IngestExternalFileOptions;
@@ -11,12 +11,13 @@ pub trait ImportExt {
     ///
     /// If the range is specified, it enables `RocksDB
     /// IngestExternalFileOptions.allow_write` and locks the
-    /// specified range.  
+    /// specified range.
     fn ingest_external_file_cf(
         &self,
         cf: &str,
         files: &[&str],
         range: Option<Range<'_>>,
+        force_allow_write: bool,
     ) -> Result<()>;
 
     fn acquire_ingest_latch(&self, range: Range<'_>) -> RangeLatchGuard<'_>;
diff --git a/components/engine_traits/src/lib.rs b/components/engine_traits/src/lib.rs
index 0c3131f92f3..657080ee820 100644
--- a/components/engine_traits/src/lib.rs
+++ b/components/engine_traits/src/lib.rs
@@ -342,8 +342,8 @@ pub use crate::range::*;
 
 mod raft_engine;
 pub use raft_engine::{
-    CacheStats, RaftEngine, RaftEngineDebug, RaftEngineReadOnly, RaftLogBatch,
-    RAFT_LOG_MULTI_GET_CNT,
+    CacheStats, RAFT_LOG_MULTI_GET_CNT, RaftEngine, RaftEngineDebug, RaftEngineReadOnly,
+    RaftLogBatch,
 };
 
 // These modules need further scrutiny
diff --git a/components/engine_traits/src/misc.rs b/components/engine_traits/src/misc.rs
index f8318948fc1..5804912ea07 100644
--- a/components/engine_traits/src/misc.rs
+++ b/components/engine_traits/src/misc.rs
@@ -6,8 +6,8 @@
 //! FIXME: Things here need to be moved elsewhere.
 
 use crate::{
-    cf_names::CfNamesExt, errors::Result, flow_control_factors::FlowControlFactorsExt,
-    range::Range, KvEngine, WriteBatchExt, WriteOptions,
+    KvEngine, WriteBatchExt, WriteOptions, cf_names::CfNamesExt, errors::Result,
+    flow_control_factors::FlowControlFactorsExt, range::Range,
 };
 
 #[derive(Clone, Debug)]
@@ -61,7 +61,20 @@ pub trait StatisticsReporter<T: ?Sized> {
     fn flush(&mut self);
 }
 
-#[derive(Default)]
+/// RocksDB example:
+/// lv0: f5: [{k1_t6, delete: () /* RocksDB tombstone */}]
+/// lv1: f4: [{k1_t10, put: v13}, {k2_t11, put: tombstone /* MVCC delete */},
+/// {k3_t12, put: v32}]
+/// ...
+/// lv5: f3: [{k2_t8, put: v21}], f2: [{k3_t9, put: v31}]
+/// lv6: f1: [{k1_t6, put: v11}, {k1_t7, put: v12}]
+/// The range stats for the range [k1, k3] will be:
+/// num_entries: 8
+/// num_versions: 7 (all entries except k1_t6 RocksDB delete entry)
+/// num_rows: 6 (f4: 3 + f3: 1 + f2: 1 + f1: 1, k1_t6 is masked by k1_t7)
+/// num_deletes: 1 (k2 in f4)
+
+#[derive(Default, Debug, Clone)]
 pub struct RangeStats {
     // The number of entries in write cf.
     pub num_entries: u64,
@@ -125,9 +138,7 @@ pub trait MiscExt: CfNamesExt + FlowControlFactorsExt + WriteBatchExt {
     /// memtables of the cf.
     fn get_approximate_memtable_stats_cf(&self, cf: &str, range: &Range<'_>) -> Result<(u64, u64)>;
 
-    fn ingest_maybe_slowdown_writes(&self, cf: &str) -> Result<bool>;
-
-    fn get_sst_key_ranges(&self, cf: &str, level: usize) -> Result<Vec<(Vec<u8>, Vec<u8>)>>;
+    fn ingest_maybe_slowdown_writes(&self, cf: &str, inflight_ingest_cnt: u64) -> Result<bool>;
 
     /// Gets total used size of rocksdb engine, including:
     /// * total size (bytes) of all SST files.
diff --git a/components/engine_traits/src/mvcc_properties.rs b/components/engine_traits/src/mvcc_properties.rs
index d1b3b406096..d76fd194562 100644
--- a/components/engine_traits/src/mvcc_properties.rs
+++ b/components/engine_traits/src/mvcc_properties.rs
@@ -6,6 +6,33 @@ use txn_types::TimeStamp;
 
 use crate::TtlProperties;
 
+/// MVCC properties for estimating discardable versions based on GC safe point.
+///
+/// These statistics are collected to estimate the number of discardable MVCC
+/// versions using uniform distribution assumption. There are two types of
+///  discardable versions:
+/// 1. Stale versions: Redundant versions from row updates that can be
+///    physically removed
+/// 2. Delete versions: Deleted rows that can be physically removed
+///
+/// Example scenario:
+/// - Each row gets inserted once, updated once, and deleted once
+/// - Each operation is 10 seconds apart
+///
+/// Timeline:
+/// [{r1_t01, v1}, {r1_t11, v2}, {r1_t21, del},
+///  {r2_t02, v1}, {r2_t12, v2}, {r2_t22, del},
+///  {r3_t03, v1}, {r3_t13, v2}, {r3_t23, del}]
+///
+/// Statistics collected:
+/// - oldest_stale_version_ts: t01, newest_stale_version_ts: t13
+/// - oldest_delete_ts: t21, newest_delete_ts: t23
+///
+/// If GC safe point is t22:
+/// - Discardable stale versions: 2 out of 6 total (versions t01-t13 span, t22
+///   cuts at ~2/3)
+/// - Discardable deletes: 1 out of 3 total (deletes t21-t23 span, t22 cuts at
+///   ~1/3)
 #[derive(Clone, Debug)]
 pub struct MvccProperties {
     pub min_ts: TimeStamp,     // The minimal timestamp.
@@ -16,6 +43,17 @@ pub struct MvccProperties {
     pub num_versions: u64,     // The number of MVCC versions of all rows.
     pub max_row_versions: u64, // The maximal number of MVCC versions of a single row.
     pub ttl: TtlProperties,    // The ttl properties of all rows, for RawKV only.
+    // Statistics for estimating number of discardable MVCC stale versions.
+    // Stale versions are redundant versions of rows that were updated (not deleted).
+    // These can be physically removed once past GC safe point.
+    pub oldest_stale_version_ts: TimeStamp,
+    pub newest_stale_version_ts: TimeStamp,
+
+    // Statistics for estimating number of discardable TiKV MVCC deletes.
+    // Delete versions represent rows that were deleted and can be physically
+    // removed once past GC safe point.
+    pub oldest_delete_ts: TimeStamp,
+    pub newest_delete_ts: TimeStamp,
 }
 
 impl MvccProperties {
@@ -29,6 +67,10 @@ impl MvccProperties {
             num_versions: 0,
             max_row_versions: 0,
             ttl: TtlProperties::default(),
+            oldest_stale_version_ts: TimeStamp::max(),
+            newest_stale_version_ts: TimeStamp::zero(),
+            oldest_delete_ts: TimeStamp::max(),
+            newest_delete_ts: TimeStamp::zero(),
         }
     }
 
@@ -41,6 +83,12 @@ impl MvccProperties {
         self.num_versions += other.num_versions;
         self.max_row_versions = cmp::max(self.max_row_versions, other.max_row_versions);
         self.ttl.merge(&other.ttl);
+        self.oldest_stale_version_ts =
+            cmp::min(self.oldest_stale_version_ts, other.oldest_stale_version_ts);
+        self.newest_stale_version_ts =
+            cmp::max(self.newest_stale_version_ts, other.newest_stale_version_ts);
+        self.oldest_delete_ts = cmp::min(self.oldest_delete_ts, other.oldest_delete_ts);
+        self.newest_delete_ts = cmp::max(self.newest_delete_ts, other.newest_delete_ts);
     }
 }
 
diff --git a/components/engine_traits/src/raft_engine.rs b/components/engine_traits/src/raft_engine.rs
index 01b8fca875b..2e2444cb46a 100644
--- a/components/engine_traits/src/raft_engine.rs
+++ b/components/engine_traits/src/raft_engine.rs
@@ -193,9 +193,9 @@ pub trait RaftLogBatch: Send {
     ///
     /// There are two types of apply index:
     /// 1. Normal apply index that only related to single tablet. These apply
-    /// indexes    are recorded using its own CF.
+    ///    indexes are recorded using its own CF.
     /// 2. Apply index that can affect other tablets, like split, merge. These
-    /// apply indexes are recorded using special Raft CF.
+    ///    apply indexes are recorded using special Raft CF.
     ///
     /// Because a peer may have multiple tablets (only one is latest), we use
     /// `tablet_index` to avoid conflicts.
diff --git a/components/engine_traits/src/range_properties.rs b/components/engine_traits/src/range_properties.rs
index f97008dd929..5646443cd99 100644
--- a/components/engine_traits/src/range_properties.rs
+++ b/components/engine_traits/src/range_properties.rs
@@ -5,7 +5,7 @@
 //! In RocksDB these are typically implemented with user collected properties,
 //! which might require the database to be constructed with specific options.
 
-use crate::{errors::Result, Range};
+use crate::{Range, errors::Result};
 
 pub trait RangePropertiesExt {
     /// Gets the number of keys in a range.
diff --git a/components/engine_traits/src/snapshot.rs b/components/engine_traits/src/snapshot.rs
index e8f61fc9d68..95709d73f5a 100644
--- a/components/engine_traits/src/snapshot.rs
+++ b/components/engine_traits/src/snapshot.rs
@@ -2,7 +2,7 @@
 
 use std::fmt::Debug;
 
-use crate::{iterable::Iterable, peekable::Peekable, CfNamesExt, SnapshotMiscExt};
+use crate::{CfNamesExt, SnapshotMiscExt, iterable::Iterable, peekable::Peekable};
 
 /// A consistent read-only view of the database.
 ///
diff --git a/components/engine_traits/src/sst.rs b/components/engine_traits/src/sst.rs
index c0cdf998d16..d0474b5186f 100644
--- a/components/engine_traits/src/sst.rs
+++ b/components/engine_traits/src/sst.rs
@@ -5,7 +5,7 @@ use std::{path::PathBuf, str::FromStr, sync::Arc};
 use encryption::DataKeyManager;
 use kvproto::import_sstpb::SstMeta;
 
-use crate::{errors::Result, RefIterable};
+use crate::{RefIterable, errors::Result};
 
 #[derive(Clone, Debug)]
 pub struct SstMetaInfo {
diff --git a/components/engine_traits/src/table_properties.rs b/components/engine_traits/src/table_properties.rs
index fcfd295faa7..afd0af0c7d4 100644
--- a/components/engine_traits/src/table_properties.rs
+++ b/components/engine_traits/src/table_properties.rs
@@ -1,19 +1,27 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use crate::{Range, Result};
+use crate::{MvccProperties, Range, Result};
 
 pub trait UserCollectedProperties {
     fn get(&self, index: &[u8]) -> Option<&[u8]>;
     fn approximate_size_and_keys(&self, start: &[u8], end: &[u8]) -> Option<(usize, usize)>;
+    fn get_mvcc_properties(&self) -> Option<MvccProperties>;
 }
 
-pub trait TablePropertiesCollection {
+pub trait TableProperties {
     type UserCollectedProperties: UserCollectedProperties;
 
-    /// Iterator all `UserCollectedProperties`, break if `f` returns false.
-    fn iter_user_collected_properties<F>(&self, f: F)
+    fn get_user_collected_properties(&self) -> &Self::UserCollectedProperties;
+    fn get_num_entries(&self) -> u64;
+}
+
+pub trait TablePropertiesCollection {
+    type TableProperties: TableProperties;
+
+    /// Iterator all `TableProperties`, break if `f` returns false.
+    fn iter_table_properties<F>(&self, f: F)
     where
-        F: FnMut(&Self::UserCollectedProperties) -> bool;
+        F: FnMut(&Self::TableProperties) -> bool;
 }
 
 pub trait TablePropertiesExt {
diff --git a/components/engine_traits/src/tablet.rs b/components/engine_traits/src/tablet.rs
index 64e6dcbd4b4..68144a826c3 100644
--- a/components/engine_traits/src/tablet.rs
+++ b/components/engine_traits/src/tablet.rs
@@ -4,8 +4,8 @@ use std::{
     fmt::{self, Debug, Formatter},
     path::{Path, PathBuf},
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc, Mutex,
+        atomic::{AtomicU64, Ordering},
     },
 };
 
diff --git a/components/engine_traits_tests/src/basic_read_write.rs b/components/engine_traits_tests/src/basic_read_write.rs
index 38a1921dd85..9847751a22e 100644
--- a/components/engine_traits_tests/src/basic_read_write.rs
+++ b/components/engine_traits_tests/src/basic_read_write.rs
@@ -2,7 +2,7 @@
 
 //! Reading and writing
 
-use engine_traits::{Peekable, SyncMutable, ALL_CFS, CF_DEFAULT};
+use engine_traits::{ALL_CFS, CF_DEFAULT, Peekable, SyncMutable};
 
 use super::engine_cfs;
 
diff --git a/components/engine_traits_tests/src/cf_names.rs b/components/engine_traits_tests/src/cf_names.rs
index f85c2f5df97..cd3e65c2691 100644
--- a/components/engine_traits_tests/src/cf_names.rs
+++ b/components/engine_traits_tests/src/cf_names.rs
@@ -1,6 +1,6 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_traits::{CfNamesExt, ALL_CFS, CF_DEFAULT};
+use engine_traits::{ALL_CFS, CF_DEFAULT, CfNamesExt};
 
 use super::{default_engine, engine_cfs};
 
diff --git a/components/engine_traits_tests/src/checkpoint.rs b/components/engine_traits_tests/src/checkpoint.rs
index e531e55a55e..523a2260c73 100644
--- a/components/engine_traits_tests/src/checkpoint.rs
+++ b/components/engine_traits_tests/src/checkpoint.rs
@@ -10,7 +10,7 @@ use engine_test::{
     kv::KvTestEngine,
 };
 use engine_traits::{
-    Checkpointable, Checkpointer, KvEngine, Peekable, SyncMutable, ALL_CFS, CF_DEFAULT,
+    ALL_CFS, CF_DEFAULT, Checkpointable, Checkpointer, KvEngine, Peekable, SyncMutable,
 };
 
 use super::tempdir;
diff --git a/components/engine_traits_tests/src/ctor.rs b/components/engine_traits_tests/src/ctor.rs
index ba3154d9267..3e0b6bd9b27 100644
--- a/components/engine_traits_tests/src/ctor.rs
+++ b/components/engine_traits_tests/src/ctor.rs
@@ -9,7 +9,7 @@ use engine_test::{
     ctor::{CfOptions, DbOptions, KvEngineConstructorExt},
     kv::KvTestEngine,
 };
-use engine_traits::{KvEngine, Peekable, SyncMutable, ALL_CFS, CF_DEFAULT};
+use engine_traits::{ALL_CFS, CF_DEFAULT, KvEngine, Peekable, SyncMutable};
 
 use super::tempdir;
 
diff --git a/components/engine_traits_tests/src/iterator.rs b/components/engine_traits_tests/src/iterator.rs
index 714ca4cb0b4..8c8315024d0 100644
--- a/components/engine_traits_tests/src/iterator.rs
+++ b/components/engine_traits_tests/src/iterator.rs
@@ -1,6 +1,6 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_traits::{Iterable, Iterator, KvEngine, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, Iterable, Iterator, KvEngine};
 use panic_hook::recover_safe;
 
 use super::default_engine;
diff --git a/components/engine_traits_tests/src/read_consistency.rs b/components/engine_traits_tests/src/read_consistency.rs
index 8c7ab50657f..d0e639af96c 100644
--- a/components/engine_traits_tests/src/read_consistency.rs
+++ b/components/engine_traits_tests/src/read_consistency.rs
@@ -2,7 +2,7 @@
 
 //! Testing iterator and snapshot behavior in the presence of intermixed writes
 
-use engine_traits::{Iterable, Iterator, KvEngine, Peekable, SyncMutable, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, Iterable, Iterator, KvEngine, Peekable, SyncMutable};
 
 use super::default_engine;
 
diff --git a/components/engine_traits_tests/src/scenario_writes.rs b/components/engine_traits_tests/src/scenario_writes.rs
index 169be158006..204db7064d2 100644
--- a/components/engine_traits_tests/src/scenario_writes.rs
+++ b/components/engine_traits_tests/src/scenario_writes.rs
@@ -2,8 +2,8 @@
 
 use engine_test::kv::KvTestEngine;
 use engine_traits::{
-    Mutable, Peekable, Result, SyncMutable, WriteBatch, WriteBatchExt, ALL_CFS, CF_DEFAULT,
-    CF_WRITE,
+    ALL_CFS, CF_DEFAULT, CF_WRITE, Mutable, Peekable, Result, SyncMutable, WriteBatch,
+    WriteBatchExt,
 };
 use panic_hook::recover_safe;
 
diff --git a/components/engine_traits_tests/src/snapshot_basic.rs b/components/engine_traits_tests/src/snapshot_basic.rs
index c0f93480830..c35a897a557 100644
--- a/components/engine_traits_tests/src/snapshot_basic.rs
+++ b/components/engine_traits_tests/src/snapshot_basic.rs
@@ -1,6 +1,6 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_traits::{KvEngine, Peekable, SyncMutable, ALL_CFS, CF_WRITE};
+use engine_traits::{ALL_CFS, CF_WRITE, KvEngine, Peekable, SyncMutable};
 
 use super::{default_engine, engine_cfs};
 
diff --git a/components/external_storage/Cargo.toml b/components/external_storage/Cargo.toml
index 6760a35329d..f6b6aad5602 100644
--- a/components/external_storage/Cargo.toml
+++ b/components/external_storage/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 failpoints = ["fail/failpoints"]
 
 [dependencies]
-async-compression = { version = "0.4.12", features = ["futures-io", "zstd"] }
+async-compression = { version = "0.4.27", features = ["futures-io", "zstd"] }
 async-trait = "0.1"
 aws = { workspace = true }
 azure = { workspace = true }
diff --git a/components/external_storage/examples/scli.rs b/components/external_storage/examples/scli.rs
index 9621f840e6c..c7b18e73096 100644
--- a/components/external_storage/examples/scli.rs
+++ b/components/external_storage/examples/scli.rs
@@ -2,18 +2,18 @@
 
 use std::{
     fs::{self, File},
-    io::{Error, ErrorKind, Result},
+    io::{Error, Result},
     path::Path,
 };
 
 use external_storage::{
-    create_storage, make_azblob_backend, make_gcs_backend, make_hdfs_backend, make_local_backend,
-    make_noop_backend, make_s3_backend, ExternalStorage, UnpinReader,
+    ExternalStorage, UnpinReader, create_storage, make_azblob_backend, make_gcs_backend,
+    make_hdfs_backend, make_local_backend, make_noop_backend, make_s3_backend,
 };
-use futures_util::io::{copy, AllowStdIo};
+use futures_util::io::{AllowStdIo, copy};
 use ini::ini::Ini;
-use kvproto::brpb::{AzureBlobStorage, Gcs, StorageBackend, S3};
-use structopt::{clap::arg_enum, StructOpt};
+use kvproto::brpb::{AzureBlobStorage, Gcs, S3, StorageBackend};
+use structopt::{StructOpt, clap::arg_enum};
 use tikv_util::stream::block_on_external_io;
 use tokio::runtime::Runtime;
 
@@ -77,22 +77,18 @@ fn create_s3_storage(opt: &Opt) -> Result<StorageBackend> {
     let mut config = S3::default();
 
     if let Some(credential_file) = &opt.credential_file {
-        let ini = Ini::load_from_file(credential_file).map_err(|e| {
-            Error::new(
-                ErrorKind::Other,
-                format!("Failed to parse credential file as ini: {}", e),
-            )
-        })?;
+        let ini = Ini::load_from_file(credential_file)
+            .map_err(|e| Error::other(format!("Failed to parse credential file as ini: {}", e)))?;
         let props = ini
             .section(Some("default"))
-            .ok_or_else(|| Error::new(ErrorKind::Other, "fail to parse section"))?;
+            .ok_or_else(|| Error::other("fail to parse section"))?;
         config.access_key = props
             .get("aws_access_key_id")
-            .ok_or_else(|| Error::new(ErrorKind::Other, "fail to parse credential"))?
+            .ok_or_else(|| Error::other("fail to parse credential"))?
             .clone();
         config.secret_access_key = props
             .get("aws_secret_access_key")
-            .ok_or_else(|| Error::new(ErrorKind::Other, "fail to parse credential"))?
+            .ok_or_else(|| Error::other("fail to parse credential"))?
             .clone();
     }
 
@@ -102,12 +98,12 @@ fn create_s3_storage(opt: &Opt) -> Result<StorageBackend> {
     if let Some(region) = &opt.region {
         config.region = region.to_string();
     } else {
-        return Err(Error::new(ErrorKind::Other, "missing region"));
+        return Err(Error::other("missing region"));
     }
     if let Some(bucket) = &opt.bucket {
         config.bucket = bucket.to_string();
     } else {
-        return Err(Error::new(ErrorKind::Other, "missing bucket"));
+        return Err(Error::other("missing bucket"));
     }
     if let Some(prefix) = &opt.prefix {
         config.prefix = prefix.to_string();
@@ -127,7 +123,7 @@ fn create_gcs_storage(opt: &Opt) -> Result<StorageBackend> {
     if let Some(bucket) = &opt.bucket {
         config.bucket = bucket.to_string();
     } else {
-        return Err(Error::new(ErrorKind::Other, "missing bucket"));
+        return Err(Error::other("missing bucket"));
     }
     if let Some(prefix) = &opt.prefix {
         config.prefix = prefix.to_string();
@@ -139,22 +135,18 @@ fn create_azure_storage(opt: &Opt) -> Result<StorageBackend> {
     let mut config = AzureBlobStorage::default();
 
     if let Some(credential_file) = &opt.credential_file {
-        let ini = Ini::load_from_file(credential_file).map_err(|e| {
-            Error::new(
-                ErrorKind::Other,
-                format!("Failed to parse credential file as ini: {}", e),
-            )
-        })?;
+        let ini = Ini::load_from_file(credential_file)
+            .map_err(|e| Error::other(format!("Failed to parse credential file as ini: {}", e)))?;
         let props = ini
             .section(Some("default"))
-            .ok_or_else(|| Error::new(ErrorKind::Other, "fail to parse section"))?;
+            .ok_or_else(|| Error::other("fail to parse section"))?;
         config.account_name = props
             .get("azure_storage_name")
-            .ok_or_else(|| Error::new(ErrorKind::Other, "fail to parse credential"))?
+            .ok_or_else(|| Error::other("fail to parse credential"))?
             .clone();
         config.shared_key = props
             .get("azure_storage_key")
-            .ok_or_else(|| Error::new(ErrorKind::Other, "fail to parse credential"))?
+            .ok_or_else(|| Error::other("fail to parse credential"))?
             .clone();
     }
     if let Some(endpoint) = &opt.endpoint {
@@ -163,7 +155,7 @@ fn create_azure_storage(opt: &Opt) -> Result<StorageBackend> {
     if let Some(bucket) = &opt.bucket {
         config.bucket = bucket.to_string();
     } else {
-        return Err(Error::new(ErrorKind::Other, "missing bucket"));
+        return Err(Error::other("missing bucket"));
     }
     if let Some(prefix) = &opt.prefix {
         config.prefix = prefix.to_string();
diff --git a/components/external_storage/src/export.rs b/components/external_storage/src/export.rs
index 127bace7f52..ea0754124aa 100644
--- a/components/external_storage/src/export.rs
+++ b/components/external_storage/src/export.rs
@@ -11,14 +11,14 @@ use encryption::DataKeyManager;
 use futures_util::{future::LocalBoxFuture, stream::LocalBoxStream};
 use gcp::GcsStorage;
 use kvproto::brpb::{
-    AzureBlobStorage, Gcs, Noop, StorageBackend, StorageBackend_oneof_backend as Backend, S3,
+    AzureBlobStorage, Gcs, Noop, S3, StorageBackend, StorageBackend_oneof_backend as Backend,
 };
 use tikv_util::time::{Instant, Limiter};
 
 use crate::{
-    compression_reader_dispatcher, encrypt_wrap_reader, read_external_storage_into_file,
-    record_storage_create, wrap_with_checksum_reader_if_needed, BackendConfig, ExternalData,
-    ExternalStorage, HdfsStorage, LocalStorage, NoopStorage, RestoreConfig, UnpinReader,
+    BackendConfig, ExternalData, ExternalStorage, HdfsStorage, LocalStorage, NoopStorage,
+    RestoreConfig, UnpinReader, compression_reader_dispatcher, encrypt_wrap_reader,
+    read_external_storage_into_file, record_storage_create, wrap_with_checksum_reader_if_needed,
 };
 pub fn create_storage(
     storage_backend: &StorageBackend,
diff --git a/components/external_storage/src/hdfs.rs b/components/external_storage/src/hdfs.rs
index 05934463091..b5b4840edda 100644
--- a/components/external_storage/src/hdfs.rs
+++ b/components/external_storage/src/hdfs.rs
@@ -37,7 +37,7 @@ pub struct HdfsStorage {
 
 impl HdfsStorage {
     pub fn new(remote: &str, config: HdfsConfig) -> io::Result<HdfsStorage> {
-        let mut remote = Url::parse(remote).map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
+        let mut remote = Url::parse(remote).map_err(|e| io::Error::other(e))?;
         if !remote.path().ends_with('/') {
             let mut new_path = remote.path().to_owned();
             new_path.push('/');
@@ -88,17 +88,14 @@ impl ExternalStorage for HdfsStorage {
         _content_length: u64,
     ) -> io::Result<()> {
         if name.contains(path::MAIN_SEPARATOR) {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("[{}] parent is not allowed in storage", name),
-            ));
+            return Err(io::Error::other(format!(
+                "[{}] parent is not allowed in storage",
+                name
+            )));
         }
 
         let cmd_path = self.get_hdfs_bin().ok_or_else(|| {
-            io::Error::new(
-                io::ErrorKind::Other,
-                "Cannot found hdfs command, please specify HADOOP_HOME",
-            )
+            io::Error::other("Cannot found hdfs command, please specify HADOOP_HOME")
         })?;
         let remote_url = self.remote.clone().join(name).unwrap();
         let path = try_convert_to_path(&remote_url);
@@ -134,10 +131,10 @@ impl ExternalStorage for HdfsStorage {
                 "stdout" => stdout.as_ref(),
                 "stderr" => stderr.as_ref(),
             );
-            Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("hdfs returned non-zero status: {:?}", output.status.code()),
-            ))
+            Err(io::Error::other(format!(
+                "hdfs returned non-zero status: {:?}",
+                output.status.code()
+            )))
         }
     }
 
diff --git a/components/external_storage/src/lib.rs b/components/external_storage/src/lib.rs
index c9b3aafe586..eb19625eaaa 100644
--- a/components/external_storage/src/lib.rs
+++ b/components/external_storage/src/lib.rs
@@ -23,7 +23,7 @@ use encryption::{DecrypterReader, FileEncryptionInfo, Iv};
 use file_system::{File, Sha256Reader};
 use futures::io::BufReader;
 use futures_io::AsyncRead;
-use futures_util::{future::LocalBoxFuture, stream::LocalBoxStream, AsyncReadExt};
+use futures_util::{AsyncReadExt, future::LocalBoxFuture, stream::LocalBoxStream};
 use kvproto::brpb::CompressionType;
 use openssl::hash::{Hasher, MessageDigest};
 use tikv_util::{
@@ -94,13 +94,10 @@ pub fn compression_reader_dispatcher(
             // So here regard Unkown(0) as uncompressed type.
             CompressionType::Unknown => Ok(inner),
             CompressionType::Zstd => Ok(Box::new(ZstdDecoder::new(BufReader::new(inner)))),
-            _ => Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!(
-                    "the compression type is unimplemented, compression type id {:?}",
-                    c
-                ),
-            )),
+            _ => Err(io::Error::other(format!(
+                "the compression type is unimplemented, compression type id {:?}",
+                c
+            ))),
         },
         None => Ok(inner),
     }
@@ -492,30 +489,23 @@ pub async fn read_external_storage_info_buff(
 }
 
 fn build_hasher() -> Result<Hasher, io::Error> {
-    Hasher::new(MessageDigest::sha256()).map_err(|err| {
-        io::Error::new(
-            io::ErrorKind::Other,
-            format!("openssl hasher failed to init: {}", err),
-        )
-    })
+    Hasher::new(MessageDigest::sha256())
+        .map_err(|err| io::Error::other(format!("openssl hasher failed to init: {}", err)))
 }
 
 fn update_hasher(hasher: &mut Hasher, data: &[u8]) -> Result<(), io::Error> {
-    hasher.update(data).map_err(|err| {
-        io::Error::new(
-            io::ErrorKind::Other,
-            format!("openssl hasher update failed: {}", err),
-        )
-    })
+    hasher
+        .update(data)
+        .map_err(|err| io::Error::other(format!("openssl hasher update failed: {}", err)))
 }
 
 fn finish_hasher(mut hasher: Hasher) -> Result<Vec<u8>, io::Error> {
     hasher.finish().map_or_else(
         |err| {
-            Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("openssl hasher finish failed: {}", err),
-            ))
+            Err(io::Error::other(format!(
+                "openssl hasher finish failed: {}",
+                err
+            )))
         },
         |bytes| Ok(bytes.to_vec()),
     )
@@ -529,10 +519,10 @@ fn calc_and_compare_checksums(
         if let Some(hasher) = opt_encrypted_file_hasher {
             let calc_checksum = hasher.lock().unwrap().finish().map_or_else(
                 |err| {
-                    Err(io::Error::new(
-                        io::ErrorKind::Other,
-                        format!("openssl hasher finish failed: {}", err),
-                    ))
+                    Err(io::Error::other(format!(
+                        "openssl hasher finish failed: {}",
+                        err
+                    )))
                 },
                 |bytes| Ok(bytes.to_vec()),
             )?;
diff --git a/components/external_storage/src/local.rs b/components/external_storage/src/local.rs
index cf974df5dd2..d6af0fa8a53 100644
--- a/components/external_storage/src/local.rs
+++ b/components/external_storage/src/local.rs
@@ -219,8 +219,7 @@ impl ExternalStorage for LocalStorage {
                     .path()
                     .strip_prefix(&self.base);
                     match rel {
-                        Err(_) => futures::future::err(io::Error::new(
-                            io::ErrorKind::Other,
+                        Err(_) => futures::future::err(io::Error::other(
                             format!("unknown: we found something not match the prefix... it is {}, our prefix is {}", v.path().display(), self.base.display()),
                         )),
                         Ok(item) => futures::future::ok(BlobObject{
diff --git a/components/external_storage/src/locking.rs b/components/external_storage/src/locking.rs
index b44c974c3ec..53d7597f0ab 100644
--- a/components/external_storage/src/locking.rs
+++ b/components/external_storage/src/locking.rs
@@ -22,13 +22,13 @@ use std::io;
 
 use chrono::Utc;
 use futures_util::{
-    future::{ok, FutureExt, LocalBoxFuture},
+    future::{FutureExt, LocalBoxFuture, ok},
     io::AsyncReadExt,
     stream::TryStreamExt,
 };
 use tikv_util::sys::{
     hostname,
-    thread::{process_id, Pid},
+    thread::{Pid, process_id},
 };
 use uuid::Uuid;
 
@@ -230,7 +230,7 @@ pub mod requirements {
     }
 }
 
-impl<'a> ExclusiveWriteCtx<'a> {
+impl ExclusiveWriteCtx<'_> {
     pub fn txn_id(&self) -> uuid::Uuid {
         self.txn_id
     }
diff --git a/components/file_system/src/file.rs b/components/file_system/src/file.rs
index 76d662464f8..a49efc58d00 100644
--- a/components/file_system/src/file.rs
+++ b/components/file_system/src/file.rs
@@ -13,7 +13,7 @@ use std::{
 // Extention Traits
 use fs2::FileExt;
 
-use super::{get_io_rate_limiter, get_io_type, IoOp, IoRateLimiter};
+use super::{IoOp, IoRateLimiter, get_io_rate_limiter, get_io_type};
 
 /// A wrapper around `std::fs::File` with capability to track and regulate IO
 /// flow.
@@ -169,7 +169,7 @@ impl File {
     }
 
     pub fn lock_shared(&self) -> io::Result<()> {
-        self.inner.lock_shared()
+        fs2::FileExt::lock_shared(&self.inner)
     }
 
     pub fn lock_exclusive(&self) -> io::Result<()> {
@@ -177,7 +177,7 @@ impl File {
     }
 
     pub fn try_lock_shared(&self) -> io::Result<()> {
-        self.inner.try_lock_shared()
+        fs2::FileExt::try_lock_shared(&self.inner)
     }
 
     pub fn try_lock_exclusive(&self) -> io::Result<()> {
@@ -185,7 +185,7 @@ impl File {
     }
 
     pub fn unlock(&self) -> io::Result<()> {
-        self.inner.unlock()
+        fs2::FileExt::unlock(&self.inner)
     }
 }
 
diff --git a/components/file_system/src/io_stats/biosnoop.rs b/components/file_system/src/io_stats/biosnoop.rs
index 2267193a3ec..ae3ceec8d74 100644
--- a/components/file_system/src/io_stats/biosnoop.rs
+++ b/components/file_system/src/io_stats/biosnoop.rs
@@ -4,17 +4,17 @@ use std::{
     collections::VecDeque,
     ptr,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Mutex,
+        atomic::{AtomicUsize, Ordering},
     },
 };
 
-use bcc::{table::Table, Kprobe, BPF};
+use bcc::{BPF, Kprobe, table::Table};
 use crossbeam_utils::CachePadded;
 use strum::{EnumCount, IntoEnumIterator};
 use tikv_util::sys::thread;
 
-use crate::{metrics::*, IoBytes, IoType};
+use crate::{IoBytes, IoType, metrics::*};
 
 /// Biosnoop leverages BCC to make use of eBPF to get disk IO of TiKV requests.
 /// The BCC code is in `biosnoop.c` which is compiled and attached kernel on
@@ -288,10 +288,10 @@ mod tests {
     use test::Bencher;
 
     use super::{
-        fetch_io_bytes, flush_io_latency_metrics, get_io_type, init, set_io_type, BPF_CONTEXT,
-        MAX_THREAD_IDX,
+        BPF_CONTEXT, MAX_THREAD_IDX, fetch_io_bytes, flush_io_latency_metrics, get_io_type, init,
+        set_io_type,
     };
-    use crate::{io_stats::A512, metrics::*, IoType, OpenOptions};
+    use crate::{IoType, OpenOptions, io_stats::A512, metrics::*};
 
     #[test]
     fn test_biosnoop() {
diff --git a/components/file_system/src/io_stats/proc.rs b/components/file_system/src/io_stats/proc.rs
index 087672d4fc2..9101e394db9 100644
--- a/components/file_system/src/io_stats/proc.rs
+++ b/components/file_system/src/io_stats/proc.rs
@@ -200,7 +200,7 @@ mod tests {
     use tikv_util::sys::thread::StdThreadBuildWrapper;
 
     use super::*;
-    use crate::{io_stats::A512, OpenOptions, WithIoType};
+    use crate::{OpenOptions, WithIoType, io_stats::A512};
 
     #[test]
     fn test_read_bytes() {
diff --git a/components/file_system/src/lib.rs b/components/file_system/src/lib.rs
index 01bc0105ddf..40e920f1d8f 100644
--- a/components/file_system/src/lib.rs
+++ b/components/file_system/src/lib.rs
@@ -1,7 +1,6 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 #![feature(test)]
-#![feature(duration_consts_float)]
 
 #[macro_use]
 extern crate lazy_static;
@@ -15,9 +14,9 @@ use std::cell::Cell;
 pub use std::{
     convert::TryFrom,
     fs::{
-        canonicalize, create_dir, create_dir_all, hard_link, metadata, read_dir, read_link,
-        remove_dir, remove_dir_all, remove_file, rename, set_permissions, symlink_metadata,
-        DirBuilder, DirEntry, FileType, Metadata, Permissions, ReadDir,
+        DirBuilder, DirEntry, FileType, Metadata, Permissions, ReadDir, canonicalize, create_dir,
+        create_dir_all, hard_link, metadata, read_dir, read_link, remove_dir, remove_dir_all,
+        remove_file, rename, set_permissions, symlink_metadata,
     },
 };
 use std::{
@@ -26,7 +25,7 @@ use std::{
     pin::Pin,
     str::FromStr,
     sync::{Arc, Mutex},
-    task::{ready, Context, Poll},
+    task::{Context, Poll, ready},
 };
 
 pub use file::{File, OpenOptions};
@@ -41,8 +40,8 @@ use openssl::{
     hash::{self, Hasher, MessageDigest},
 };
 pub use rate_limiter::{
-    get_io_rate_limiter, set_io_rate_limiter, IoBudgetAdjustor, IoRateLimitMode, IoRateLimiter,
-    IoRateLimiterStatistics,
+    IoBudgetAdjustor, IoRateLimitMode, IoRateLimiter, IoRateLimiterStatistics, get_io_rate_limiter,
+    set_io_rate_limiter,
 };
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use strum::{EnumCount, EnumIter};
@@ -326,7 +325,7 @@ impl<'de> Deserialize<'de> for IoPriority {
     {
         use serde::de::{Error, Unexpected, Visitor};
         struct StrVistor;
-        impl<'de> Visitor<'de> for StrVistor {
+        impl Visitor<'_> for StrVistor {
             type Value = IoPriority;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -583,7 +582,7 @@ impl<R: AsyncRead + Unpin> AsyncRead for Sha256Reader<R> {
             .lock()
             .expect("failed to lock hasher in Sha256Reader async read");
         if let Err(e) = hasher.update(new_data) {
-            return Poll::Ready(Err(io::Error::new(ErrorKind::Other, e)));
+            return Poll::Ready(Err(io::Error::other(e)));
         }
 
         Poll::Ready(Ok(()))
@@ -622,7 +621,7 @@ pub fn reserve_space_for_recover<P: AsRef<Path>>(data_dir: P, file_size: u64) ->
 mod tests {
     use std::{io::Write, iter};
 
-    use rand::{distributions::Alphanumeric, thread_rng, Rng};
+    use rand::{Rng, distributions::Alphanumeric, thread_rng};
     use tempfile::{Builder, TempDir};
 
     use super::*;
diff --git a/components/file_system/src/metrics_manager.rs b/components/file_system/src/metrics_manager.rs
index 89e822b24e7..d67d3b665e8 100644
--- a/components/file_system/src/metrics_manager.rs
+++ b/components/file_system/src/metrics_manager.rs
@@ -6,9 +6,9 @@ use strum::{EnumCount, IntoEnumIterator};
 use tikv_util::time::Instant;
 
 use crate::{
-    io_stats::fetch_io_bytes,
-    metrics::{tls_flush, IO_BYTES_VEC},
     IoBytes, IoOp, IoRateLimiterStatistics, IoType,
+    io_stats::fetch_io_bytes,
+    metrics::{IO_BYTES_VEC, tls_flush},
 };
 
 pub enum BytesFetcher {
diff --git a/components/file_system/src/rate_limiter.rs b/components/file_system/src/rate_limiter.rs
index 79c7094b186..7e9f0986046 100644
--- a/components/file_system/src/rate_limiter.rs
+++ b/components/file_system/src/rate_limiter.rs
@@ -3,8 +3,8 @@
 use std::{
     str::FromStr,
     sync::{
-        atomic::{AtomicU32, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicU32, AtomicUsize, Ordering},
     },
     time::Duration,
 };
@@ -16,8 +16,8 @@ use strum::EnumCount;
 use tikv_util::time::Instant;
 
 use super::{
-    metrics::{tls_collect_rate_limiter_request_wait, RATE_LIMITER_MAX_BYTES_PER_SEC},
     IoOp, IoPriority, IoType,
+    metrics::{RATE_LIMITER_MAX_BYTES_PER_SEC, tls_collect_rate_limiter_request_wait},
 };
 
 const DEFAULT_REFILL_PERIOD: Duration = Duration::from_millis(50);
@@ -81,7 +81,7 @@ impl<'de> Deserialize<'de> for IoRateLimitMode {
     {
         use serde::de::{Error, Unexpected, Visitor};
         struct StrVistor;
-        impl<'de> Visitor<'de> for StrVistor {
+        impl Visitor<'_> for StrVistor {
             type Value = IoRateLimitMode;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -263,8 +263,7 @@ macro_rules! request_imp {
                 // Bytes served by next epoch (and skipped epochs) during refill are subtracted
                 // from pending_bytes, round up the rest.
                 DEFAULT_REFILL_PERIOD
-                    * ((locked.pending_bytes[priority_idx] + cached_bytes_per_epoch - 1)
-                        / cached_bytes_per_epoch) as u32
+                    * locked.pending_bytes[priority_idx].div_ceil(cached_bytes_per_epoch) as u32
             } else {
                 // `(a-1)/b` is equivalent to `roundup(a.saturating_sub(b)/b)`.
                 locked.next_refill_time - now
diff --git a/components/health_controller/Cargo.toml b/components/health_controller/Cargo.toml
index 829e6f71f2e..d45226cc13a 100644
--- a/components/health_controller/Cargo.toml
+++ b/components/health_controller/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
+collections = { workspace = true }
 grpcio-health = { workspace = true }
 kvproto = { workspace = true }
 ordered-float = "2.6"
diff --git a/components/health_controller/src/lib.rs b/components/health_controller/src/lib.rs
index 75427cd8e7c..d759787c81b 100644
--- a/components/health_controller/src/lib.rs
+++ b/components/health_controller/src/lib.rs
@@ -30,8 +30,6 @@
 //!   that are specific to different modules, increasing the complexity and
 //!   possibility to misuse of `HealthController`.
 
-#![feature(div_duration)]
-
 pub mod reporters;
 pub mod slow_score;
 pub mod trend;
@@ -41,16 +39,25 @@ use std::{
     collections::HashSet,
     ops::Deref,
     sync::{
-        atomic::{AtomicU64, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicU64, AtomicUsize, Ordering},
     },
+    time::Duration,
 };
 
+use collections::HashMap;
 use grpcio_health::HealthService;
 use kvproto::pdpb::SlowTrend as SlowTrendPb;
 use parking_lot::{Mutex, RwLock};
 pub use types::{LatencyInspector, RaftstoreDuration};
 
+/// Trait for health checker to abstract network latency monitoring
+pub trait HealthChecker: Send + Sync {
+    /// Get all maximum latencies
+    /// Returns a HashMap of store_id -> max_latency_ms
+    fn get_all_max_latencies(&self) -> HashMap<u64, f64>;
+}
+
 struct ServingStatus {
     is_serving: bool,
     unhealthy_modules: HashSet<&'static str>,
@@ -71,6 +78,9 @@ struct HealthControllerInner {
     raftstore_slow_score: AtomicU64,
     raftstore_slow_trend: RollingRetriever<SlowTrendPb>,
 
+    /// Optional raft client health checker for network latency monitoring
+    health_checker: Mutex<Option<Box<dyn HealthChecker>>>,
+
     /// gRPC's builtin `HealthService`.
     ///
     /// **Note**: DO NOT update its state directly. Only change its state while
@@ -104,6 +114,7 @@ impl HealthControllerInner {
         Self {
             raftstore_slow_score: AtomicU64::new(f64::to_bits(1.0)),
             raftstore_slow_trend: RollingRetriever::new(),
+            health_checker: Mutex::new(None),
 
             health_service,
             current_serving_status: Mutex::new(ServingStatus {
@@ -201,6 +212,25 @@ impl HealthControllerInner {
     fn shutdown(&self) {
         self.health_service.shutdown();
     }
+
+    /// Set the health checker for network latency monitoring
+    fn set_health_checker(&self, checker: Box<dyn HealthChecker>) {
+        let mut health_checker_guard = self.health_checker.lock();
+        *health_checker_guard = Some(checker);
+    }
+
+    /// Get network latencies from the health checker
+    fn get_network_latencies(&self) -> HashMap<u64, Duration> {
+        if let Some(checker) = self.health_checker.lock().as_ref() {
+            checker
+                .get_all_max_latencies()
+                .into_iter()
+                .map(|(store_id, latency_ms)| (store_id, Duration::from_millis(latency_ms as u64)))
+                .collect()
+        } else {
+            HashMap::default()
+        }
+    }
 }
 
 #[derive(Clone)]
@@ -215,6 +245,11 @@ impl HealthController {
         }
     }
 
+    /// Set a health checker that implements HealthChecker
+    pub fn set_health_checker(&self, checker: Box<dyn HealthChecker>) {
+        self.inner.set_health_checker(checker);
+    }
+
     pub fn get_raftstore_slow_score(&self) -> f64 {
         self.inner.get_raftstore_slow_score()
     }
@@ -322,7 +357,7 @@ impl<T: Clone> RollingRetriever<T> {
 #[cfg(test)]
 mod tests {
     use std::{
-        sync::mpsc::{sync_channel, RecvTimeoutError},
+        sync::mpsc::{RecvTimeoutError, sync_channel},
         time::Duration,
     };
 
diff --git a/components/health_controller/src/reporters.rs b/components/health_controller/src/reporters.rs
index 56624c37d64..8d1668ec2b4 100644
--- a/components/health_controller/src/reporters.rs
+++ b/components/health_controller/src/reporters.rs
@@ -1,19 +1,21 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::Arc,
+    collections::HashSet,
+    sync::{Arc, Mutex},
     time::{Duration, Instant},
 };
 
+use collections::HashMap;
 use kvproto::pdpb;
 use pdpb::SlowTrend as SlowTrendPb;
 use prometheus::IntGauge;
 
 use crate::{
-    slow_score::{SlowScore, SlowScoreTickResult},
+    HealthController, HealthControllerInner, RaftstoreDuration,
+    slow_score::*,
     trend::{RequestPerSecRecorder, Trend},
     types::InspectFactor,
-    HealthController, HealthControllerInner, RaftstoreDuration,
 };
 
 /// The parameters for building a [`RaftstoreReporter`].
@@ -29,6 +31,7 @@ pub struct RaftstoreReporterConfig {
     /// some internal calculations.
     pub inspect_interval: Duration,
     pub inspect_kvdb_interval: Duration,
+    pub inspect_network_interval: Duration,
 
     pub unsensitive_cause: f64,
     pub unsensitive_result: f64,
@@ -47,64 +50,175 @@ pub struct RaftstoreReporterConfig {
 
 /// A unified slow score that combines multiple slow scores.
 ///
-/// It calculates the final slow score of a store by picking the maximum
-/// score among multiple factors. Each factor represents a different aspect of
-/// the store's performance. Typically, we have two factors: Raft Disk I/O and
-/// KvDB Disk I/O. If there are more factors in the future, we can add them
-/// here.
-#[derive(Default)]
+/// For disk factor, it calculates the final slow score of a store by picking
+/// the maximum score among multiple disk_factors. Each factor represents a
+/// different aspect of the store's performance. Typically, we have two
+/// disk_factors: Raft Disk I/O and KvDB Disk I/O.
+/// For network factor, it calculates all stores' slow score and report them
+/// which is greater than 1 to PD.
 pub struct UnifiedSlowScore {
-    factors: Vec<SlowScore>,
+    disk_factors: Vec<SlowScore>,
+    // store_id -> SlowScore
+    network_factors: Arc<Mutex<HashMap<u64, SlowScore>>>,
 }
 
 impl UnifiedSlowScore {
     pub fn new(cfg: &RaftstoreReporterConfig) -> Self {
-        let mut unified_slow_score = UnifiedSlowScore::default();
+        let mut unified_slow_score = UnifiedSlowScore {
+            disk_factors: Vec::new(),
+            network_factors: Arc::new(Mutex::new(HashMap::default())),
+        };
         // The first factor is for Raft Disk I/O.
-        unified_slow_score
-            .factors
-            .push(SlowScore::new(cfg.inspect_interval));
+        unified_slow_score.disk_factors.push(SlowScore::new(
+            cfg.inspect_interval, // timeout
+            DISK_TIMEOUT_RATIO_THRESHOLD,
+            DISK_ROUND_TICKS,
+            DISK_RECOVERY_INTERVALS,
+        ));
         // The second factor is for KvDB Disk I/O.
-        unified_slow_score
-            .factors
-            .push(SlowScore::new_with_extra_config(
-                cfg.inspect_kvdb_interval,
-                0.6,
-            ));
+        unified_slow_score.disk_factors.push(SlowScore::new(
+            cfg.inspect_kvdb_interval, // timeout
+            DISK_TIMEOUT_RATIO_THRESHOLD,
+            DISK_ROUND_TICKS,
+            DISK_RECOVERY_INTERVALS,
+        ));
+
         unified_slow_score
     }
 
     #[inline]
-    pub fn record(
+    pub fn record_disk(
         &mut self,
         id: u64,
         factor: InspectFactor,
         duration: &RaftstoreDuration,
         not_busy: bool,
     ) {
-        self.factors[factor as usize].record(id, duration.delays_on_disk_io(false), not_busy);
+        // For disk disk_factors, we care about the raftstore duration.
+        let dur = duration.delays_on_disk_io(false);
+        self.disk_factors[factor as usize].record(id, dur, not_busy);
+    }
+
+    pub fn record_network(
+        &mut self,
+        id: u64,
+        durations: HashMap<u64, Duration>, // store_id -> duration
+    ) {
+        let mut network_factors = self.network_factors.lock().unwrap();
+
+        // Remove store_ids that exist in network_factors but not in durations
+        let store_ids_in_durations: HashSet<u64> = durations.keys().cloned().collect();
+        network_factors.retain(|store_id, _| store_ids_in_durations.contains(store_id));
+
+        // Record durations for each store
+        for (store_id, duration) in durations.iter() {
+            network_factors
+                .entry(*store_id)
+                .or_insert_with(|| {
+                    SlowScore::new(
+                        NETWORK_TIMEOUT_THRESHOLD,
+                        NETWORK_TIMEOUT_RATIO_THRESHOLD,
+                        NETWORK_ROUND_TICKS,
+                        NETWORK_RECOVERY_INTERVALS,
+                    )
+                })
+                .record(id, *duration, true);
+        }
     }
 
     #[inline]
     pub fn get(&self, factor: InspectFactor) -> &SlowScore {
-        &self.factors[factor as usize]
+        &self.disk_factors[factor as usize]
     }
 
     #[inline]
     pub fn get_mut(&mut self, factor: InspectFactor) -> &mut SlowScore {
-        &mut self.factors[factor as usize]
+        &mut self.disk_factors[factor as usize]
     }
 
-    // Returns the maximum score of all factors.
-    pub fn get_score(&self) -> f64 {
-        self.factors
+    // Returns the maximum score of disk disk_factors.
+    pub fn get_disk_score(&self) -> f64 {
+        self.disk_factors
             .iter()
             .map(|factor| factor.get())
             .fold(1.0, f64::max)
     }
 
+    pub fn get_network_score(&self) -> HashMap<u64, u64> {
+        self.network_factors
+            .lock()
+            .unwrap()
+            .iter_mut()
+            .map(|(k, v)| (*k, v.get() as u64))
+            .collect()
+    }
+
     pub fn last_tick_finished(&self) -> bool {
-        self.factors.iter().all(SlowScore::last_tick_finished)
+        self.disk_factors.iter().all(SlowScore::last_tick_finished)
+    }
+
+    pub fn record_timeout(&mut self, factor: InspectFactor) {
+        // We should be able to get the latency from HealthChecker
+        // every time, so there is no need to explicitly mark timeout
+        if factor == InspectFactor::Network {
+            return;
+        }
+
+        self.disk_factors[factor as usize].record_timeout();
+    }
+
+    pub fn tick(&mut self, factor: InspectFactor) -> SlowScoreTickResult {
+        if factor == InspectFactor::Network {
+            self.tick_network()
+        } else {
+            self.disk_factors[factor as usize].tick()
+        }
+    }
+
+    fn tick_network(&mut self) -> SlowScoreTickResult {
+        let mut slow_score_tick_result = SlowScoreTickResult::default();
+        // For network factor, we need to tick all network factors and return the avg
+        // result.
+        let mut network_factors = self.network_factors.lock().unwrap();
+        let mut total_score = 0.0;
+        let mut total_count = 0;
+
+        // We need to sync last_tick_id among all stores' network factors, because
+        // we record network duration based on the last_tick_id and record network
+        // duration at the same time. If the last_tick_id is different, we can't
+        // record network duration correctly. In addition, the same last_tick_id
+        // makes it easier for us to return the result to the upper layer to record
+        // metrics.
+        let mut need_sync = false;
+        let mut last_tick_id = 0;
+        for (_, factor) in network_factors.iter_mut() {
+            if last_tick_id != 0 {
+                need_sync = need_sync || !last_tick_id.eq(&factor.get_last_tick_id());
+            }
+            last_tick_id = factor.get_last_tick_id().max(last_tick_id);
+        }
+        if need_sync {
+            for (_, factor) in network_factors.iter_mut() {
+                factor.set_last_tick_id(last_tick_id);
+            }
+        }
+        for (_, factor) in network_factors.iter_mut() {
+            let factor_tick_result = factor.tick();
+            if factor_tick_result.updated_score.is_some() {
+                slow_score_tick_result.has_new_record = true;
+                total_score += factor_tick_result.updated_score.unwrap_or(1.0);
+                total_count += 1;
+            }
+            slow_score_tick_result.tick_id = factor_tick_result
+                .tick_id
+                .max(slow_score_tick_result.tick_id);
+        }
+
+        // To ensure that score can display complete information
+        if total_count == network_factors.len() {
+            slow_score_tick_result.updated_score = Some(total_score / total_count as f64);
+        }
+        slow_score_tick_result
     }
 }
 
@@ -127,15 +241,19 @@ impl RaftstoreReporter {
         }
     }
 
-    pub fn get_slow_score(&self) -> f64 {
-        self.slow_score.get_score()
+    pub fn get_disk_slow_score(&mut self) -> f64 {
+        self.slow_score.get_disk_score()
+    }
+
+    pub fn get_network_slow_score(&mut self) -> HashMap<u64, u64> {
+        self.slow_score.get_network_score()
     }
 
     pub fn get_slow_trend(&self) -> &SlowTrendStatistics {
         &self.slow_trend
     }
 
-    pub fn record_raftstore_duration(
+    pub fn record_duration(
         &mut self,
         id: u64,
         factor: InspectFactor,
@@ -143,13 +261,23 @@ impl RaftstoreReporter {
         store_not_busy: bool,
     ) {
         // Fine-tuned, `SlowScore` only takes the I/O jitters on the disk into account.
-        self.slow_score
-            .record(id, factor, &duration, store_not_busy);
-        self.slow_trend.record(duration);
 
-        // Publish slow score to health controller
-        self.health_controller_inner
-            .update_raftstore_slow_score(self.slow_score.get_score());
+        self.slow_trend.record(&duration);
+
+        if factor == InspectFactor::RaftDisk || factor == InspectFactor::KvDisk {
+            self.slow_score
+                .record_disk(id, factor, &duration, store_not_busy);
+            // Publish slow score to health controller
+            self.health_controller_inner
+                .update_raftstore_slow_score(self.slow_score.get_disk_score());
+        }
+    }
+
+    pub fn record_network_duration(&mut self, id: u64) -> HashMap<u64, Duration> {
+        let network_durations = self.health_controller_inner.get_network_latencies();
+        self.slow_score
+            .record_network(id, network_durations.clone());
+        network_durations
     }
 
     fn is_healthy(&self) -> bool {
@@ -172,44 +300,51 @@ impl RaftstoreReporter {
     }
 
     pub fn tick(&mut self, store_maybe_busy: bool, factor: InspectFactor) -> SlowScoreTickResult {
-        // Record a fairly great value when timeout
-        self.slow_trend.slow_cause.record(500_000, Instant::now());
-
-        // healthy: The health status of the current store.
-        // all_ticks_finished: The last tick of all factors is finished.
-        // factor_tick_finished: The last tick of the current factor is finished.
-        let (healthy, all_ticks_finished, factor_tick_finished) = (
-            self.is_healthy(),
-            self.slow_score.last_tick_finished(),
-            self.slow_score.get(factor).last_tick_finished(),
-        );
-        // The health status is recovered to serving as long as any tick
-        // does not timeout.
-        if !healthy && all_ticks_finished {
-            self.set_is_healthy(true);
-        }
-        if !all_ticks_finished {
-            // If the last tick is not finished, it means that the current store might
-            // be busy on handling requests or delayed on I/O operations. And only when
-            // the current store is not busy, it should record the last_tick as a timeout.
-            if !store_maybe_busy && !factor_tick_finished {
-                self.slow_score.get_mut(factor).record_timeout();
+        match factor {
+            InspectFactor::Network => self.slow_score.tick(factor),
+            InspectFactor::RaftDisk | InspectFactor::KvDisk => {
+                // Record a fairly great value when timeout
+                self.slow_trend.slow_cause.record(500_000, Instant::now());
+
+                // healthy: The health status of the current store.
+                // all_ticks_finished: The last tick of all disk_factors is finished.
+                // factor_tick_finished: The last tick of the current factor is finished.
+                let (healthy, all_ticks_finished, factor_tick_finished) = (
+                    self.is_healthy(),
+                    self.slow_score.last_tick_finished(),
+                    self.slow_score.get(factor).last_tick_finished(),
+                );
+                // The health status is recovered to serving as long as any tick
+                // does not timeout.
+                if !healthy && all_ticks_finished {
+                    self.set_is_healthy(true);
+                }
+                if !all_ticks_finished {
+                    // If the last tick is not finished, it means that the current store might
+                    // be busy on handling requests or delayed on I/O operations. And only when
+                    // the current store is not busy, it should record the last_tick as a timeout.
+                    if !store_maybe_busy && !factor_tick_finished {
+                        self.slow_score.get_mut(factor).record_timeout();
+                    }
+                }
+
+                let slow_score_tick_result = self.slow_score.tick(factor);
+                if slow_score_tick_result.updated_score.is_some()
+                    && !slow_score_tick_result.has_new_record
+                {
+                    self.set_is_healthy(false);
+                }
+
+                // Publish the slow score to health controller
+                if slow_score_tick_result.updated_score.is_some() {
+                    // Publish slow score to health controller
+                    self.health_controller_inner
+                        .update_raftstore_slow_score(self.slow_score.get_disk_score());
+                }
+
+                slow_score_tick_result
             }
         }
-
-        let slow_score_tick_result = self.slow_score.get_mut(factor).tick();
-        if slow_score_tick_result.updated_score.is_some() && !slow_score_tick_result.has_new_record
-        {
-            self.set_is_healthy(false);
-        }
-
-        // Publish the slow score to health controller
-        if slow_score_tick_result.updated_score.is_some() {
-            self.health_controller_inner
-                .update_raftstore_slow_score(self.slow_score.get_score());
-        }
-
-        slow_score_tick_result
     }
 
     pub fn update_slow_trend(
@@ -293,10 +428,10 @@ impl SlowTrendStatistics {
     }
 
     #[inline]
-    pub fn record(&mut self, duration: RaftstoreDuration) {
+    pub fn record(&mut self, duration: &RaftstoreDuration) {
         // TODO: It's more appropriate to divide the factor into `Disk IO factor` and
         // `Net IO factor`.
-        // Currently, when `network ratio == 1`, it summarizes all factors by `sum`
+        // Currently, when `network ratio == 1`, it summarizes all disk_factors by `sum`
         // simplily, approved valid to common cases when there exists IO jitters on
         // Network or Disk.
         let latency = || -> u64 {
@@ -330,3 +465,234 @@ impl TestReporter {
             .update_raftstore_slow_score(slow_score);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::{collections::HashMap, time::Duration};
+
+    use prometheus::IntGauge;
+
+    use super::*;
+
+    fn create_test_config() -> RaftstoreReporterConfig {
+        RaftstoreReporterConfig {
+            inspect_interval: Duration::from_secs(1),
+            inspect_kvdb_interval: Duration::from_secs(1),
+            inspect_network_interval: Duration::from_secs(1),
+            unsensitive_cause: 0.5,
+            unsensitive_result: 0.5,
+            net_io_factor: 1.0,
+            cause_spike_filter_value_gauge: IntGauge::new("cause_spike_filter_value", "help")
+                .unwrap(),
+            cause_spike_filter_count_gauge: IntGauge::new("cause_spike_filter_count", "help")
+                .unwrap(),
+            cause_l1_gap_gauges: IntGauge::new("cause_l1_gap", "help").unwrap(),
+            cause_l2_gap_gauges: IntGauge::new("cause_l2_gap", "help").unwrap(),
+            result_spike_filter_value_gauge: IntGauge::new("result_spike_filter_value", "help")
+                .unwrap(),
+            result_spike_filter_count_gauge: IntGauge::new("result_spike_filter_count", "help")
+                .unwrap(),
+            result_l1_gap_gauges: IntGauge::new("result_l1_gap", "help").unwrap(),
+            result_l2_gap_gauges: IntGauge::new("result_l2_gap", "help").unwrap(),
+        }
+    }
+
+    #[test]
+    fn test_unified_slow_score_record_network() {
+        let cfg = create_test_config();
+        let mut unified_slow_score = UnifiedSlowScore::new(&cfg);
+
+        // Test recording network durations for multiple stores
+        let mut durations = HashMap::default();
+        durations.insert(1u64, Duration::from_millis(100));
+        durations.insert(2u64, Duration::from_millis(200));
+        durations.insert(3u64, Duration::from_millis(300));
+
+        // First tick to establish baseline
+        let result = unified_slow_score.tick_network();
+        assert_eq!(result.tick_id, 0);
+
+        // Record network durations for current tick
+        unified_slow_score.record_network(0, durations.clone());
+
+        // Verify that network disk_factors are created
+        let network_factors = unified_slow_score.network_factors.lock().unwrap();
+        assert_eq!(network_factors.len(), 3);
+        assert!(network_factors.contains_key(&1));
+        assert!(network_factors.contains_key(&2));
+        assert!(network_factors.contains_key(&3));
+        assert!(!network_factors.contains_key(&4));
+        drop(network_factors);
+
+        // Tick again to advance
+        let result2 = unified_slow_score.tick_network();
+        assert_eq!(result2.tick_id, 1);
+
+        durations.insert(4u64, Duration::from_millis(400));
+        unified_slow_score.record_network(1, durations.clone());
+
+        // Test updating with fewer stores (should remove missing stores)
+        let mut new_durations = HashMap::default();
+        new_durations.insert(1u64, Duration::from_millis(150));
+        new_durations.insert(2u64, Duration::from_millis(250));
+        // Store 3 is not included, should be removed
+
+        unified_slow_score.record_network(2, new_durations);
+
+        let network_factors = unified_slow_score.network_factors.lock().unwrap();
+        assert_eq!(network_factors.len(), 2);
+        assert!(network_factors.contains_key(&1));
+        assert!(network_factors.contains_key(&2));
+        assert!(!network_factors.contains_key(&3));
+    }
+
+    #[test]
+    fn test_unified_slow_score_tick_network_synchronization() {
+        let cfg = create_test_config();
+        let mut unified_slow_score = UnifiedSlowScore::new(&cfg);
+
+        // Record network durations
+        let mut durations = HashMap::default();
+        durations.insert(1u64, Duration::from_millis(100));
+        durations.insert(2u64, Duration::from_millis(200));
+
+        // First tick to establish baseline
+        let result1 = unified_slow_score.tick_network();
+        assert_eq!(result1.tick_id, 0);
+
+        unified_slow_score.record_network(1, durations);
+
+        // Manually set different tick IDs to test synchronization
+        {
+            let mut network_factors = unified_slow_score.network_factors.lock().unwrap();
+            let factor_1 = network_factors.get_mut(&1).unwrap();
+            factor_1.set_last_tick_id(5);
+            let factor_2 = network_factors.get_mut(&2).unwrap();
+            factor_2.set_last_tick_id(3);
+        }
+
+        // Tick should synchronize the tick IDs
+        let result2 = unified_slow_score.tick_network();
+
+        // Verify all disk_factors have the same (maximum) tick ID
+        {
+            let network_factors = unified_slow_score.network_factors.lock().unwrap();
+            let factor_1_id = network_factors.get(&1).unwrap().get_last_tick_id();
+            let factor_2_id = network_factors.get(&2).unwrap().get_last_tick_id();
+            assert_eq!(factor_1_id, factor_2_id);
+            assert_eq!(factor_1_id, 6); // Should be the maximum (5 + 1 from tick)
+            assert_eq!(result2.tick_id, 6);
+        }
+    }
+
+    #[test]
+    fn test_unified_slow_score_get_network_score() {
+        let cfg = create_test_config();
+        let mut unified_slow_score = UnifiedSlowScore::new(&cfg);
+
+        // Initially should return empty scores
+        let scores = unified_slow_score.get_network_score();
+        assert!(scores.is_empty());
+
+        // Record network durations
+        let mut durations = HashMap::default();
+        durations.insert(1u64, Duration::from_millis(100));
+        durations.insert(2u64, Duration::from_millis(200));
+        unified_slow_score.record_network(1, durations);
+
+        // Get network scores
+        let scores = unified_slow_score.get_network_score();
+        assert_eq!(scores.len(), 2);
+        assert!(scores.contains_key(&1));
+        assert!(scores.contains_key(&2));
+
+        // All scores should start at 1 (default slow score)
+        assert_eq!(scores[&1], 1);
+        assert_eq!(scores[&2], 1);
+
+        // Test multiple ticks to see score evolution
+        // NETWORK_ROUND_TICKS = 3, so scores will update every 3 ticks
+
+        // First 2 ticks - no score update yet
+        let result1 = unified_slow_score.tick_network();
+        assert!(result1.updated_score.is_none());
+        assert_eq!(result1.tick_id, 1);
+
+        let result2 = unified_slow_score.tick_network();
+        assert!(result2.updated_score.is_none());
+        assert_eq!(result2.tick_id, 2);
+
+        // 3rd tick - should trigger score update
+        let result3 = unified_slow_score.tick_network();
+        assert!(result3.updated_score.is_some());
+        assert_eq!(result3.tick_id, 3);
+        // Since no timeout requests were recorded, scores should still be 1.0
+        assert_eq!(result3.updated_score.unwrap(), 1.0);
+
+        // Verify scores remain at 1
+        let scores_after_ticks = unified_slow_score.get_network_score();
+        assert_eq!(scores_after_ticks[&1], 1);
+        assert_eq!(scores_after_ticks[&2], 1);
+
+        // Now record some timeout durations to test score increase
+        let mut timeout_durations = HashMap::default();
+        timeout_durations.insert(1u64, Duration::from_secs(2)); // > NETWORK_TIMEOUT_THRESHOLD (1s)
+        timeout_durations.insert(2u64, Duration::from_secs(3)); // > NETWORK_TIMEOUT_THRESHOLD (1s)
+
+        // Tick to next round (ticks 4, 5, 6)
+        let result4 = unified_slow_score.tick_network();
+        assert!(result4.updated_score.is_none());
+        assert_eq!(result4.tick_id, 4);
+
+        // Record timeouts for tick 4 (current tick)
+        unified_slow_score.record_network(4, timeout_durations.clone());
+
+        let result5 = unified_slow_score.tick_network();
+        assert!(result5.updated_score.is_none());
+        assert_eq!(result5.tick_id, 5);
+
+        // Record timeouts for tick 5 (current tick)
+        unified_slow_score.record_network(5, timeout_durations.clone());
+
+        let result6 = unified_slow_score.tick_network();
+        assert!(result6.updated_score.is_some());
+        assert_eq!(result6.tick_id, 6);
+        // Score should increase due to timeout requests
+        assert!(result6.updated_score.unwrap() > 1.0);
+
+        // Verify scores have increased
+        let scores_after_timeout = unified_slow_score.get_network_score();
+        assert!(scores_after_timeout[&1] > 1);
+        assert!(scores_after_timeout[&2] > 1);
+
+        // Test recovery - record normal durations (no timeouts)
+        let mut normal_durations = HashMap::default();
+        normal_durations.insert(1u64, Duration::from_millis(100));
+        normal_durations.insert(2u64, Duration::from_millis(200));
+
+        // Record for several rounds to test score recovery
+        for i in 7..=15 {
+            unified_slow_score.record_network(i, normal_durations.clone());
+            let result = unified_slow_score.tick_network();
+
+            // Every 3rd tick should have updated score
+            if i % 3 == 0 {
+                assert!(result.updated_score.is_some());
+                // Scores should gradually decrease back towards 1.0
+                if i >= 12 {
+                    // After several rounds without timeouts, scores should be decreasing
+                    let current_scores = unified_slow_score.get_network_score();
+                    // Scores should be lower than after the timeout round
+                    assert!(
+                        current_scores[&1] <= scores_after_timeout[&1] || current_scores[&1] == 1
+                    );
+                    assert!(
+                        current_scores[&2] <= scores_after_timeout[&2] || current_scores[&2] == 1
+                    );
+                }
+            } else {
+                assert!(result.updated_score.is_none());
+            }
+        }
+    }
+}
diff --git a/components/health_controller/src/slow_score.rs b/components/health_controller/src/slow_score.rs
index 846e3f98517..f4d4f7d6272 100644
--- a/components/health_controller/src/slow_score.rs
+++ b/components/health_controller/src/slow_score.rs
@@ -9,10 +9,28 @@ use ordered_float::OrderedFloat;
 
 /// Interval for updating the slow score.
 const UPDATE_INTERVALS: Duration = Duration::from_secs(10);
-/// Recovery intervals for the slow score.
+/// Disk recovery intervals for the disk slow score.
 /// If the score has reached 100 and there is no timeout inspecting requests
 /// during this interval, the score will go back to 1 after 5min.
-const RECOVERY_INTERVALS: Duration = Duration::from_secs(60 * 5);
+pub const DISK_RECOVERY_INTERVALS: Duration = Duration::from_secs(60 * 5);
+/// Network recovery intervals for the network slow score.
+/// If the score has reached 100 and there is no timeout inspecting requests
+/// during this interval, the score will go back to 1 after 10min.
+pub const NETWORK_RECOVERY_INTERVALS: Duration = Duration::from_secs(60 * 10);
+/// After every DISK_ROUND_TICKS, the disk's slow score will be updated.
+pub const DISK_ROUND_TICKS: u64 = 30;
+/// After every NETWORK_ROUND_TICKS, the network's slow score will be updated.
+pub const NETWORK_ROUND_TICKS: u64 = 3;
+/// DISK_TIMEOUT_RATIO_THRESHOLD is the maximal tolerated timeout ratio
+/// for disk inspecting requests. If the timeout ratio is larger than this
+/// threshold, the disk's slow score will be multiplied by 2.
+pub const DISK_TIMEOUT_RATIO_THRESHOLD: f64 = 0.1;
+/// NETWORK_TIMEOUT_RATIO_THRESHOLD is the maximal tolerated timeout ratio
+/// for network inspecting requests. If the timeout ratio is larger than this
+/// threshold, the network's slow score will be multiplied by 2.
+pub const NETWORK_TIMEOUT_RATIO_THRESHOLD: f64 = 1.0;
+/// The timeout threshold for network inspecting requests.
+pub const NETWORK_TIMEOUT_THRESHOLD: Duration = Duration::from_secs(1);
 // Slow score is a value that represents the speed of a store and ranges in [1,
 // 100]. It is maintained in the AIMD way.
 // If there are some inspecting requests timeout during a round, by default the
@@ -27,7 +45,7 @@ pub struct SlowScore {
     timeout_requests: usize,
     total_requests: usize,
 
-    inspect_interval: Duration,
+    timeout_threshold: Duration,
     // The maximal tolerated timeout ratio.
     ratio_thresh: OrderedFloat<f64>,
     // Minimal time that the score could be decreased from 100 to 1.
@@ -42,19 +60,24 @@ pub struct SlowScore {
 }
 
 impl SlowScore {
-    pub fn new(inspect_interval: Duration) -> SlowScore {
+    pub fn new(
+        timeout_threshold: Duration,
+        ratio_thresh: f64,
+        round_ticks: u64,
+        recovery_interval: Duration,
+    ) -> SlowScore {
         SlowScore {
             value: OrderedFloat(1.0),
 
             timeout_requests: 0,
             total_requests: 0,
 
-            inspect_interval,
-            ratio_thresh: OrderedFloat(0.1),
-            min_ttr: RECOVERY_INTERVALS,
+            timeout_threshold,
+            ratio_thresh: OrderedFloat(ratio_thresh),
+            min_ttr: recovery_interval,
             last_record_time: Instant::now(),
             last_update_time: Instant::now(),
-            round_ticks: 30,
+            round_ticks,
             last_tick_id: 0,
             last_tick_finished: true,
         }
@@ -68,9 +91,9 @@ impl SlowScore {
             timeout_requests: 0,
             total_requests: 0,
 
-            inspect_interval,
+            timeout_threshold: inspect_interval,
             ratio_thresh: OrderedFloat(timeout_ratio),
-            min_ttr: RECOVERY_INTERVALS,
+            min_ttr: DISK_RECOVERY_INTERVALS,
             last_record_time: Instant::now(),
             last_update_time: Instant::now(),
             // The minimal round ticks is 1 for kvdb.
@@ -83,6 +106,14 @@ impl SlowScore {
         }
     }
 
+    pub fn set_last_tick_id(&mut self, id: u64) {
+        self.last_tick_id = id;
+    }
+
+    pub fn get_last_tick_id(&self) -> u64 {
+        self.last_tick_id
+    }
+
     pub fn record(&mut self, id: u64, duration: Duration, not_busy: bool) {
         self.last_record_time = Instant::now();
         if id != self.last_tick_id {
@@ -90,7 +121,7 @@ impl SlowScore {
         }
         self.last_tick_finished = true;
         self.total_requests += 1;
-        if not_busy && duration >= self.inspect_interval {
+        if not_busy && duration >= self.timeout_threshold {
             self.timeout_requests += 1;
         }
     }
@@ -126,7 +157,6 @@ impl SlowScore {
             let value = self.value * (OrderedFloat(1.0) + near_thresh);
             self.value = cmp::min(OrderedFloat(100.0), value);
         }
-
         self.total_requests = 0;
         self.timeout_requests = 0;
         self.last_update_time = Instant::now();
@@ -137,10 +167,6 @@ impl SlowScore {
         self.value >= OrderedFloat(100.0) && (self.last_tick_id % self.round_ticks == 0)
     }
 
-    pub fn get_inspect_interval(&self) -> Duration {
-        self.inspect_interval
-    }
-
     pub fn last_tick_finished(&self) -> bool {
         self.last_tick_finished
     }
@@ -172,6 +198,7 @@ impl SlowScore {
     }
 }
 
+#[derive(Default, Debug)]
 pub struct SlowScoreTickResult {
     pub tick_id: u64,
     // None if skipped in this tick
@@ -186,7 +213,12 @@ mod tests {
 
     #[test]
     fn test_slow_score() {
-        let mut slow_score = SlowScore::new(Duration::from_millis(500));
+        let mut slow_score = SlowScore::new(
+            Duration::from_millis(500),
+            DISK_TIMEOUT_RATIO_THRESHOLD,
+            DISK_ROUND_TICKS,
+            DISK_RECOVERY_INTERVALS,
+        );
         slow_score.timeout_requests = 5;
         slow_score.total_requests = 100;
         assert_eq!(
diff --git a/components/health_controller/src/types.rs b/components/health_controller/src/types.rs
index 7342273e972..a895ef424c0 100644
--- a/components/health_controller/src/types.rs
+++ b/components/health_controller/src/types.rs
@@ -1,6 +1,6 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{fmt::Debug, u64};
+use std::fmt::Debug;
 
 /// Represent the duration of all stages of raftstore recorded by one
 /// inspecting.
@@ -54,6 +54,7 @@ impl RaftstoreDuration {
 pub enum InspectFactor {
     RaftDisk = 0,
     KvDisk,
+    Network,
     // TODO: Add more factors, like network io.
 }
 
@@ -62,6 +63,7 @@ impl InspectFactor {
         match *self {
             InspectFactor::RaftDisk => "raft",
             InspectFactor::KvDisk => "kvdb",
+            InspectFactor::Network => "network",
         }
     }
 }
diff --git a/components/hybrid_engine/src/db_vector.rs b/components/hybrid_engine/src/db_vector.rs
index 1b286e182e7..5251c204913 100644
--- a/components/hybrid_engine/src/db_vector.rs
+++ b/components/hybrid_engine/src/db_vector.rs
@@ -80,7 +80,7 @@ where
     }
 }
 
-impl<'a, EK, EC> PartialEq<&'a [u8]> for HybridDbVector<EK, EC>
+impl<EK, EC> PartialEq<&[u8]> for HybridDbVector<EK, EC>
 where
     EK: KvEngine,
     EC: RegionCacheEngine,
diff --git a/components/hybrid_engine/src/engine.rs b/components/hybrid_engine/src/engine.rs
index 0fb70eed7ac..13a94092ac8 100644
--- a/components/hybrid_engine/src/engine.rs
+++ b/components/hybrid_engine/src/engine.rs
@@ -76,10 +76,10 @@ mod tests {
     use std::sync::Arc;
 
     use engine_rocks::util::new_engine;
-    use engine_traits::{CacheRegion, CF_DEFAULT, CF_LOCK, CF_WRITE};
+    use engine_traits::{CF_DEFAULT, CF_LOCK, CF_WRITE, CacheRegion};
     use in_memory_engine::{
-        config::InMemoryEngineConfigManager, test_util::new_region, InMemoryEngineConfig,
-        InMemoryEngineContext, RegionCacheMemoryEngine,
+        InMemoryEngineConfig, InMemoryEngineContext, RegionCacheMemoryEngine,
+        config::InMemoryEngineConfigManager, test_util::new_region,
     };
     use online_config::{ConfigChange, ConfigManager, ConfigValue};
     use tempfile::Builder;
diff --git a/components/hybrid_engine/src/metrics.rs b/components/hybrid_engine/src/metrics.rs
index 76329179375..11ef247c293 100644
--- a/components/hybrid_engine/src/metrics.rs
+++ b/components/hybrid_engine/src/metrics.rs
@@ -1,7 +1,7 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
 use lazy_static::lazy_static;
-use prometheus::{register_int_counter_vec, IntCounterVec};
+use prometheus::{IntCounterVec, register_int_counter_vec};
 use prometheus_static_metric::{auto_flush_from, make_auto_flush_static_metric};
 
 make_auto_flush_static_metric! {
diff --git a/components/hybrid_engine/src/observer/load_eviction.rs b/components/hybrid_engine/src/observer/load_eviction.rs
index cba8029e31a..16b4d5e6e8a 100644
--- a/components/hybrid_engine/src/observer/load_eviction.rs
+++ b/components/hybrid_engine/src/observer/load_eviction.rs
@@ -13,11 +13,11 @@ use protobuf::ProtobufEnum as _;
 use raft::StateRole;
 use raftstore::{
     coprocessor::{
-        dispatcher::{BoxDestroyPeerObserver, BoxTransferLeaderObserver},
         AdminObserver, ApplyCtxInfo, ApplySnapshotObserver, BoxAdminObserver,
         BoxApplySnapshotObserver, BoxQueryObserver, BoxRoleObserver, Cmd, Coprocessor,
         CoprocessorHost, DestroyPeerObserver, ObserverContext, QueryObserver, RegionState,
         RoleObserver, TransferLeaderCustomContext, TransferLeaderObserver,
+        dispatcher::{BoxDestroyPeerObserver, BoxTransferLeaderObserver},
     },
     store::TransferLeaderContext,
 };
diff --git a/components/hybrid_engine/src/observer/snapshot.rs b/components/hybrid_engine/src/observer/snapshot.rs
index edf8d9729f9..6c344fd6433 100644
--- a/components/hybrid_engine/src/observer/snapshot.rs
+++ b/components/hybrid_engine/src/observer/snapshot.rs
@@ -6,7 +6,7 @@ use engine_traits::{CacheRegion, FailedReason, KvEngine, RegionCacheEngine};
 use in_memory_engine::{RegionCacheMemoryEngine, RegionCacheSnapshot};
 use kvproto::metapb::Region;
 use raftstore::coprocessor::{
-    dispatcher::BoxSnapshotObserver, CoprocessorHost, ObservedSnapshot, SnapshotObserver,
+    CoprocessorHost, ObservedSnapshot, SnapshotObserver, dispatcher::BoxSnapshotObserver,
 };
 
 use crate::metrics::{
diff --git a/components/hybrid_engine/src/observer/test_write_batch.rs b/components/hybrid_engine/src/observer/test_write_batch.rs
index faa1cbf30d1..9c3dc233400 100644
--- a/components/hybrid_engine/src/observer/test_write_batch.rs
+++ b/components/hybrid_engine/src/observer/test_write_batch.rs
@@ -5,8 +5,8 @@ use std::{sync::mpsc::sync_channel, time::Duration};
 use crossbeam::epoch;
 use engine_traits::{CacheRegion, Mutable, Peekable, RegionCacheEngine, WriteBatch, WriteBatchExt};
 use in_memory_engine::{
-    decode_key, test_util::new_region, InMemoryEngineConfig, InternalKey, RegionCacheStatus,
-    ValueType,
+    InMemoryEngineConfig, InternalKey, RegionCacheStatus, ValueType, decode_key,
+    test_util::new_region,
 };
 use raftstore::coprocessor::{WriteBatchObserver, WriteBatchWrapper};
 
diff --git a/components/hybrid_engine/src/observer/write_batch.rs b/components/hybrid_engine/src/observer/write_batch.rs
index 854dc6a2eb7..7d9271f365d 100644
--- a/components/hybrid_engine/src/observer/write_batch.rs
+++ b/components/hybrid_engine/src/observer/write_batch.rs
@@ -1,11 +1,11 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_traits::{is_data_cf, KvEngine, Mutable, Result, WriteBatch, WriteOptions};
+use engine_traits::{KvEngine, Mutable, Result, WriteBatch, WriteOptions, is_data_cf};
 use in_memory_engine::{RegionCacheMemoryEngine, RegionCacheWriteBatch};
 use kvproto::metapb;
 use raftstore::coprocessor::{
-    dispatcher::BoxWriteBatchObserver, Coprocessor, CoprocessorHost, ObservableWriteBatch,
-    WriteBatchObserver,
+    Coprocessor, CoprocessorHost, ObservableWriteBatch, WriteBatchObserver,
+    dispatcher::BoxWriteBatchObserver,
 };
 
 #[derive(Clone)]
diff --git a/components/hybrid_engine/src/snapshot.rs b/components/hybrid_engine/src/snapshot.rs
index 01587de3fa9..7b72489be7d 100644
--- a/components/hybrid_engine/src/snapshot.rs
+++ b/components/hybrid_engine/src/snapshot.rs
@@ -6,8 +6,8 @@ use std::{
 };
 
 use engine_traits::{
-    is_data_cf, CfNamesExt, IterOptions, Iterable, KvEngine, Peekable, ReadOptions,
-    RegionCacheEngine, Result, Snapshot, SnapshotMiscExt, CF_DEFAULT,
+    CF_DEFAULT, CfNamesExt, IterOptions, Iterable, KvEngine, Peekable, ReadOptions,
+    RegionCacheEngine, Result, Snapshot, SnapshotMiscExt, is_data_cf,
 };
 use in_memory_engine::RegionCacheMemoryEngine;
 use raftstore::coprocessor::ObservedSnapshot;
@@ -161,10 +161,10 @@ where
 #[cfg(test)]
 mod tests {
     use engine_traits::{
-        CacheRegion, IterOptions, Iterable, Iterator, Mutable, WriteBatch, WriteBatchExt,
-        CF_DEFAULT,
+        CF_DEFAULT, CacheRegion, IterOptions, Iterable, Iterator, Mutable, WriteBatch,
+        WriteBatchExt,
     };
-    use in_memory_engine::{test_util::new_region, InMemoryEngineConfig, RegionCacheStatus};
+    use in_memory_engine::{InMemoryEngineConfig, RegionCacheStatus, test_util::new_region};
     use raftstore::coprocessor::WriteBatchWrapper;
 
     use crate::{
diff --git a/components/hybrid_engine/src/util.rs b/components/hybrid_engine/src/util.rs
index 2a5828a7658..35afac31244 100644
--- a/components/hybrid_engine/src/util.rs
+++ b/components/hybrid_engine/src/util.rs
@@ -2,8 +2,8 @@
 
 use std::sync::Arc;
 
-use engine_rocks::{util::new_engine, RocksEngine};
-use engine_traits::{RegionCacheEngine, Result, CF_DEFAULT, CF_LOCK, CF_WRITE};
+use engine_rocks::{RocksEngine, util::new_engine};
+use engine_traits::{CF_DEFAULT, CF_LOCK, CF_WRITE, RegionCacheEngine, Result};
 use in_memory_engine::{InMemoryEngineConfig, InMemoryEngineContext, RegionCacheMemoryEngine};
 use tempfile::{Builder, TempDir};
 use tikv_util::config::VersionTrack;
@@ -17,7 +17,7 @@ use crate::HybridEngine;
 ///
 /// ```
 /// use hybrid_engine::util::hybrid_engine_for_tests;
-/// use in_memory_engine::{test_util::new_region, InMemoryEngineConfig};
+/// use in_memory_engine::{InMemoryEngineConfig, test_util::new_region};
 /// let mut config = InMemoryEngineConfig::default();
 /// config.enable = true;
 /// let (_path, _hybrid_engine) = hybrid_engine_for_tests("temp", config, |memory_engine| {
diff --git a/components/in_memory_engine/benches/load_region.rs b/components/in_memory_engine/benches/load_region.rs
index 77315ffc3cb..f5a307c3d8e 100644
--- a/components/in_memory_engine/benches/load_region.rs
+++ b/components/in_memory_engine/benches/load_region.rs
@@ -5,17 +5,17 @@
 use std::sync::Arc;
 
 use criterion::*;
-use engine_rocks::{util::new_engine, RocksEngine};
+use engine_rocks::{RocksEngine, util::new_engine};
 use engine_traits::{
-    CacheRegion, KvEngine, Mutable, RegionCacheEngine, WriteBatch, WriteBatchExt, CF_DEFAULT,
-    CF_WRITE, DATA_CFS,
+    CF_DEFAULT, CF_WRITE, CacheRegion, DATA_CFS, KvEngine, Mutable, RegionCacheEngine, WriteBatch,
+    WriteBatchExt,
 };
 use futures::future::ready;
 use in_memory_engine::{BackgroundRunner, *};
 use keys::{DATA_MAX_KEY, DATA_MIN_KEY};
 use pd_client::PdClient;
 use raftstore::coprocessor::config::SPLIT_SIZE;
-use rand::{thread_rng, RngCore};
+use rand::{RngCore, thread_rng};
 use tikv_util::config::VersionTrack;
 use txn_types::{Key, TimeStamp, Write, WriteType};
 
diff --git a/components/in_memory_engine/src/background.rs b/components/in_memory_engine/src/background.rs
index 4a30c6ca4e2..74a1dd3d78f 100644
--- a/components/in_memory_engine/src/background.rs
+++ b/components/in_memory_engine/src/background.rs
@@ -4,13 +4,13 @@ use std::{borrow::Cow, fmt, sync::Arc, time::Duration};
 
 use bytes::Bytes;
 use crossbeam::{
-    channel::{bounded, tick, Sender},
+    channel::{Sender, bounded, tick},
     epoch, select,
 };
 use engine_rocks::{RocksEngine, RocksSnapshot};
 use engine_traits::{
-    CacheRegion, EvictReason, IterOptions, Iterable, Iterator, MiscExt, OnEvictFinishedCallback,
-    RangeHintService, SnapshotMiscExt, CF_DEFAULT, CF_WRITE, DATA_CFS,
+    CF_DEFAULT, CF_WRITE, CacheRegion, DATA_CFS, EvictReason, IterOptions, Iterable, Iterator,
+    MiscExt, OnEvictFinishedCallback, RangeHintService, SnapshotMiscExt,
 };
 use fail::fail_point;
 use keys::{origin_end_key, origin_key};
@@ -33,11 +33,12 @@ use txn_types::{Key, TimeStamp, WriteRef, WriteType};
 use yatp::Remote;
 
 use crate::{
+    InMemoryEngineConfig, RegionCacheMemoryEngine,
     cross_check::CrossChecker,
     engine::{RegionCacheMemoryEngineCore, SkiplistHandle},
     keys::{
-        decode_key, encode_key, encode_key_for_boundary_with_mvcc, encoding_for_filter,
-        InternalBytes, InternalKey, ValueType,
+        InternalBytes, InternalKey, ValueType, decode_key, encode_key,
+        encode_key_for_boundary_with_mvcc, encoding_for_filter,
     },
     memory_controller::{MemoryController, MemoryUsage},
     metrics::{
@@ -50,9 +51,8 @@ use crate::{
         LabelRule, RegionLabelChangedCallback, RegionLabelRulesManager, RegionLabelServiceBuilder,
     },
     region_manager::{CacheRegionMeta, RegionState},
-    region_stats::{RegionStatsManager, DEFAULT_EVICT_MIN_DURATION},
+    region_stats::{DEFAULT_EVICT_MIN_DURATION, RegionStatsManager},
     write_batch::RegionCacheWriteBatchEntry,
-    InMemoryEngineConfig, RegionCacheMemoryEngine,
 };
 
 // 5 seconds should be long enough for getting a TSO from PD.
@@ -1077,9 +1077,7 @@ impl Runnable for BackgroundRunner {
                         Some(t.unwrap().parse::<u64>().unwrap())
                     });
 
-                    let Some(ref rocks_engine) = self.rocks_engine else {
-                        return None;
-                    };
+                    let rocks_engine = self.rocks_engine.as_ref()?;
                     let latest_seqno = rocks_engine.get_latest_sequence_number();
                     Some(
                         rocks_engine
@@ -1727,8 +1725,8 @@ impl Filter {
 pub mod tests {
     use std::{
         sync::{
-            mpsc::{channel, Sender},
             Arc, Mutex,
+            mpsc::{Sender, channel},
         },
         time::Duration,
     };
@@ -1736,11 +1734,11 @@ pub mod tests {
     use crossbeam::epoch;
     use engine_rocks::util::new_engine;
     use engine_traits::{
-        CacheRegion, IterOptions, Iterable, Iterator, RegionCacheEngine, RegionCacheEngineExt,
-        RegionEvent, SyncMutable, CF_DEFAULT, CF_LOCK, CF_WRITE, DATA_CFS,
+        CF_DEFAULT, CF_LOCK, CF_WRITE, CacheRegion, DATA_CFS, IterOptions, Iterable, Iterator,
+        RegionCacheEngine, RegionCacheEngineExt, RegionEvent, SyncMutable,
     };
     use futures::future::ready;
-    use keys::{data_key, DATA_MAX_KEY, DATA_MIN_KEY};
+    use keys::{DATA_MAX_KEY, DATA_MIN_KEY, data_key};
     use kvproto::metapb::Region;
     use online_config::{ConfigChange, ConfigManager, ConfigValue};
     use pd_client::PdClient;
@@ -1753,12 +1751,13 @@ pub mod tests {
 
     use super::*;
     use crate::{
+        InMemoryEngineConfig, InMemoryEngineContext, RegionCacheMemoryEngine,
         background::BackgroundRunner,
         config::InMemoryEngineConfigManager,
         engine::{SkiplistEngine, SkiplistHandle},
         keys::{
-            construct_key, construct_region_key, construct_value, encode_key, encode_seek_key,
-            encoding_for_filter, InternalBytes, ValueType,
+            InternalBytes, ValueType, construct_key, construct_region_key, construct_value,
+            encode_key, encode_seek_key, encoding_for_filter,
         },
         memory_controller::MemoryController,
         region_label::{
@@ -1768,7 +1767,6 @@ pub mod tests {
         region_manager::RegionState::*,
         test_util::{new_region, put_data, put_data_with_overwrite},
         write_batch::RegionCacheWriteBatchEntry,
-        InMemoryEngineConfig, InMemoryEngineContext, RegionCacheMemoryEngine,
     };
 
     fn delete_data(
diff --git a/components/in_memory_engine/src/config.rs b/components/in_memory_engine/src/config.rs
index 904143755b6..d9ecd53aeda 100644
--- a/components/in_memory_engine/src/config.rs
+++ b/components/in_memory_engine/src/config.rs
@@ -248,7 +248,7 @@ mod tests {
     use super::*;
 
     const DEFAULT_REGION_SPLIT_SIZE: ReadableSize = ReadableSize::mb(256);
-    const SMALL_ENOUGH_BLOCK_CACHE_CAPACITY: u64 = (MIN_CAPACITY + 1) / 2;
+    const SMALL_ENOUGH_BLOCK_CACHE_CAPACITY: u64 = MIN_CAPACITY.div_ceil(2);
     const LARGE_ENOUGH_BLOCK_CACHE_CAPACITY: u64 =
         (MIN_CAPACITY + 1) * (1.0 / DEFAULT_CAPACITY_FROM_BLOCK_CACHE_RATIO) as u64;
 
diff --git a/components/in_memory_engine/src/cross_check.rs b/components/in_memory_engine/src/cross_check.rs
index 36165af1a77..f503de2a4f6 100644
--- a/components/in_memory_engine/src/cross_check.rs
+++ b/components/in_memory_engine/src/cross_check.rs
@@ -4,8 +4,8 @@ use std::{fmt::Display, sync::Arc, time::Duration};
 
 use engine_rocks::{RocksEngine, RocksEngineIterator, RocksSnapshot};
 use engine_traits::{
-    iter_option, CacheRegion, Iterable, Iterator, KvEngine, Peekable, RegionCacheEngine,
-    SnapshotMiscExt, CF_LOCK, CF_WRITE,
+    CF_LOCK, CF_WRITE, CacheRegion, Iterable, Iterator, KvEngine, Peekable, RegionCacheEngine,
+    SnapshotMiscExt, iter_option,
 };
 use pd_client::PdClient;
 use slog_global::{error, info, warn};
@@ -17,9 +17,9 @@ use tikv_util::{
 use txn_types::{Key, TimeStamp, WriteRef, WriteType};
 
 use crate::{
+    RegionCacheMemoryEngine, RegionState,
     background::{parse_write, split_ts},
     read::{RegionCacheIterator, RegionCacheSnapshot},
-    RegionCacheMemoryEngine, RegionState,
 };
 
 // Cross check stops for some reason.
@@ -945,18 +945,18 @@ impl std::fmt::Debug for KeyCheckingInfo {
 mod tests {
     use std::{sync::Arc, time::Duration};
 
-    use engine_rocks::{util::new_engine_opt, RocksDbOptions, RocksWriteBatchVec};
+    use engine_rocks::{RocksDbOptions, RocksWriteBatchVec, util::new_engine_opt};
     use engine_traits::{
-        CacheRegion, KvEngine, Mutable, RegionCacheEngine, WriteBatch, WriteBatchExt, CF_DEFAULT,
-        CF_LOCK, CF_WRITE,
+        CF_DEFAULT, CF_LOCK, CF_WRITE, CacheRegion, KvEngine, Mutable, RegionCacheEngine,
+        WriteBatch, WriteBatchExt,
     };
     use futures::future::ready;
     use keys::data_key;
     use kvproto::metapb::{Region, RegionEpoch};
     use pd_client::PdClient;
     use raftstore::{
-        coprocessor::{RegionInfoCallback, RegionInfoProvider},
         RegionInfo, SeekRegionCallback,
+        coprocessor::{RegionInfoCallback, RegionInfoProvider},
     };
     use tempfile::Builder;
     use tikv_util::{config::VersionTrack, store::new_peer};
@@ -964,8 +964,8 @@ mod tests {
 
     use super::Result;
     use crate::{
-        cross_check::CrossChecker, InMemoryEngineConfig, InMemoryEngineContext,
-        RegionCacheMemoryEngine, RegionCacheWriteBatch,
+        InMemoryEngineConfig, InMemoryEngineContext, RegionCacheMemoryEngine,
+        RegionCacheWriteBatch, cross_check::CrossChecker,
     };
 
     #[derive(Clone)]
diff --git a/components/in_memory_engine/src/engine.rs b/components/in_memory_engine/src/engine.rs
index 81925dc6ada..70ad4b37e4b 100644
--- a/components/in_memory_engine/src/engine.rs
+++ b/components/in_memory_engine/src/engine.rs
@@ -4,18 +4,18 @@ use std::{
     fmt::{self, Debug},
     ops::Bound,
     result,
-    sync::{atomic::AtomicU64, Arc},
+    sync::{Arc, atomic::AtomicU64},
 };
 
-use crossbeam::epoch::{self, default_collector, Guard};
+use crossbeam::epoch::{self, Guard, default_collector};
 use crossbeam_skiplist::{
-    base::{Entry, OwnedIter},
     SkipList,
+    base::{Entry, OwnedIter},
 };
 use engine_rocks::RocksEngine;
 use engine_traits::{
-    CacheRegion, EvictReason, FailedReason, KvEngine, OnEvictFinishedCallback, RegionCacheEngine,
-    RegionCacheEngineExt, RegionEvent, CF_DEFAULT, CF_LOCK, CF_WRITE, DATA_CFS,
+    CF_DEFAULT, CF_LOCK, CF_WRITE, CacheRegion, DATA_CFS, EvictReason, FailedReason, KvEngine,
+    OnEvictFinishedCallback, RegionCacheEngine, RegionCacheEngineExt, RegionEvent,
 };
 use fail::fail_point;
 use kvproto::metapb::Region;
@@ -25,15 +25,15 @@ use slog_global::error;
 use tikv_util::{config::VersionTrack, info, warn, worker::Scheduler};
 
 use crate::{
+    InMemoryEngineConfig, InMemoryEngineContext,
     background::{BackgroundTask, BgWorkManager, PdRangeHintService},
     keys::{
-        encode_key_for_boundary_with_mvcc, encode_key_for_boundary_without_mvcc, InternalBytes,
+        InternalBytes, encode_key_for_boundary_with_mvcc, encode_key_for_boundary_without_mvcc,
     },
     memory_controller::MemoryController,
     read::RegionCacheSnapshot,
     region_manager::{LoadFailedReason, RegionCacheStatus, RegionManager, RegionState},
     statistics::Statistics,
-    InMemoryEngineConfig, InMemoryEngineContext,
 };
 
 pub(crate) const CF_DEFAULT_USIZE: usize = 0;
@@ -638,24 +638,24 @@ pub mod tests {
     use crossbeam::epoch;
     use engine_rocks::util::new_engine;
     use engine_traits::{
-        CacheRegion, EvictReason, Mutable, RegionCacheEngine, RegionCacheEngineExt, RegionEvent,
-        WriteBatch, WriteBatchExt, CF_DEFAULT, CF_LOCK, CF_WRITE, DATA_CFS,
+        CF_DEFAULT, CF_LOCK, CF_WRITE, CacheRegion, DATA_CFS, EvictReason, Mutable,
+        RegionCacheEngine, RegionCacheEngineExt, RegionEvent, WriteBatch, WriteBatchExt,
     };
     use tikv_util::config::{ReadableDuration, VersionTrack};
     use tokio::{
         runtime::Builder,
-        sync::{mpsc, Mutex},
+        sync::{Mutex, mpsc},
         time::timeout,
     };
 
     use super::SkiplistEngine;
     use crate::{
+        InMemoryEngineConfig, InMemoryEngineContext, InternalBytes, RegionCacheMemoryEngine,
+        ValueType,
         keys::{construct_key, construct_user_key, encode_key},
         memory_controller::MemoryController,
         region_manager::{CacheRegionMeta, RegionManager, RegionState::*},
         test_util::new_region,
-        InMemoryEngineConfig, InMemoryEngineContext, InternalBytes, RegionCacheMemoryEngine,
-        ValueType,
     };
 
     fn count_region(mgr: &RegionManager, mut f: impl FnMut(&CacheRegionMeta) -> bool) -> usize {
diff --git a/components/in_memory_engine/src/keys.rs b/components/in_memory_engine/src/keys.rs
index 90845af7f54..b5901ea6e23 100644
--- a/components/in_memory_engine/src/keys.rs
+++ b/components/in_memory_engine/src/keys.rs
@@ -156,7 +156,7 @@ pub struct InternalKey<'a> {
     pub sequence: u64,
 }
 
-impl<'a> fmt::Debug for InternalKey<'a> {
+impl fmt::Debug for InternalKey<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
@@ -305,7 +305,7 @@ mod tests {
     use bytes::BufMut;
 
     use super::*;
-    use crate::keys::{encode_key, ValueType};
+    use crate::keys::{ValueType, encode_key};
 
     fn construct_key(i: u64, mvcc: u64) -> Vec<u8> {
         let k = format!("zk{:08}", i);
diff --git a/components/in_memory_engine/src/lib.rs b/components/in_memory_engine/src/lib.rs
index e4011f20235..ccdd858d0c7 100644
--- a/components/in_memory_engine/src/lib.rs
+++ b/components/in_memory_engine/src/lib.rs
@@ -36,8 +36,8 @@ pub use background::{BackgroundRunner, BackgroundTask, GcTask};
 pub use config::InMemoryEngineConfig;
 pub use engine::{RegionCacheMemoryEngine, SkiplistHandle};
 pub use keys::{
-    decode_key, encode_key_for_boundary_without_mvcc, encoding_for_filter, InternalBytes,
-    InternalKey, ValueType,
+    InternalBytes, InternalKey, ValueType, decode_key, encode_key_for_boundary_without_mvcc,
+    encoding_for_filter,
 };
 pub use metrics::flush_in_memory_engine_statistics;
 pub use read::RegionCacheSnapshot;
diff --git a/components/in_memory_engine/src/memory_controller.rs b/components/in_memory_engine/src/memory_controller.rs
index da6ffe64071..5e0320d1523 100644
--- a/components/in_memory_engine/src/memory_controller.rs
+++ b/components/in_memory_engine/src/memory_controller.rs
@@ -3,15 +3,15 @@
 use std::{
     fmt,
     sync::{
-        atomic::{AtomicBool, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicUsize, Ordering},
     },
 };
 
 use tikv_util::config::VersionTrack;
 
 use crate::{
-    engine::SkiplistEngine, write_batch::NODE_OVERHEAD_SIZE_EXPECTATION, InMemoryEngineConfig,
+    InMemoryEngineConfig, engine::SkiplistEngine, write_batch::NODE_OVERHEAD_SIZE_EXPECTATION,
 };
 
 #[derive(Debug, PartialEq)]
@@ -124,7 +124,7 @@ mod tests {
     use tikv_util::config::ReadableSize;
 
     use super::*;
-    use crate::keys::{encode_key, InternalBytes, ValueType};
+    use crate::keys::{InternalBytes, ValueType, encode_key};
 
     #[test]
     fn test_memory_controller() {
diff --git a/components/in_memory_engine/src/metrics.rs b/components/in_memory_engine/src/metrics.rs
index 470507a749d..2016777a434 100644
--- a/components/in_memory_engine/src/metrics.rs
+++ b/components/in_memory_engine/src/metrics.rs
@@ -8,8 +8,8 @@ use prometheus::*;
 use prometheus_static_metric::*;
 
 use crate::{
-    statistics::{Tickers, ENGINE_TICKER_TYPES},
     InMemoryEngineStatistics,
+    statistics::{ENGINE_TICKER_TYPES, Tickers},
 };
 
 make_auto_flush_static_metric! {
diff --git a/components/in_memory_engine/src/prop_test.rs b/components/in_memory_engine/src/prop_test.rs
index be9912bec01..ea00dc2f888 100644
--- a/components/in_memory_engine/src/prop_test.rs
+++ b/components/in_memory_engine/src/prop_test.rs
@@ -3,9 +3,9 @@
 use std::sync::Arc;
 
 use crossbeam::epoch;
-use engine_rocks::{util::new_engine, RocksEngine};
+use engine_rocks::{RocksEngine, util::new_engine};
 use engine_traits::{
-    CacheRegion, CfName, Iterable, Iterator, Peekable, SyncMutable, CF_DEFAULT, CF_LOCK, CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_WRITE, CacheRegion, CfName, Iterable, Iterator, Peekable, SyncMutable,
 };
 use proptest::prelude::*;
 use tikv_util::config::{ReadableSize, VersionTrack};
@@ -13,8 +13,8 @@ use txn_types::{Key, TimeStamp};
 
 use super::engine::SkiplistHandle;
 use crate::{
-    decode_key, engine::SkiplistEngine, keys::encode_key, memory_controller::MemoryController,
-    InMemoryEngineConfig, InternalBytes,
+    InMemoryEngineConfig, InternalBytes, decode_key, engine::SkiplistEngine, keys::encode_key,
+    memory_controller::MemoryController,
 };
 
 // This fixed mvcc suffix is used for CF_WRITE and CF_DEFAULT in prop test.
diff --git a/components/in_memory_engine/src/read.rs b/components/in_memory_engine/src/read.rs
index 3619c4c4555..e587b93921c 100644
--- a/components/in_memory_engine/src/read.rs
+++ b/components/in_memory_engine/src/read.rs
@@ -5,29 +5,29 @@ use std::{fmt::Debug, ops::Deref, result, sync::Arc};
 
 use bytes::Bytes;
 use crossbeam::epoch;
-use crossbeam_skiplist::{base::OwnedIter, SkipList};
+use crossbeam_skiplist::{SkipList, base::OwnedIter};
 use engine_rocks::{raw::SliceTransform, util::FixedSuffixSliceTransform};
 use engine_traits::{
-    CacheRegion, CfNamesExt, DbVector, Error, FailedReason, IterMetricsCollector, IterOptions,
-    Iterable, Iterator, MetricsExt, Peekable, ReadOptions, Result, Snapshot, SnapshotMiscExt,
-    CF_DEFAULT,
+    CF_DEFAULT, CacheRegion, CfNamesExt, DbVector, Error, FailedReason, IterMetricsCollector,
+    IterOptions, Iterable, Iterator, MetricsExt, Peekable, ReadOptions, Result, Snapshot,
+    SnapshotMiscExt,
 };
 use prometheus::local::LocalHistogram;
 use slog_global::error;
 use tikv_util::{box_err, time::Instant};
 
 use crate::{
+    RegionCacheMemoryEngine,
     background::BackgroundTask,
-    engine::{cf_to_id, SkiplistEngine},
+    engine::{SkiplistEngine, cf_to_id},
     keys::{
-        decode_key, encode_seek_for_prev_key, encode_seek_key, InternalBytes, InternalKey,
-        ValueType,
+        InternalBytes, InternalKey, ValueType, decode_key, encode_seek_for_prev_key,
+        encode_seek_key,
     },
     metrics::IN_MEMORY_ENGINE_SEEK_DURATION,
     perf_context::PERF_CONTEXT,
     perf_counter_add,
     statistics::{LocalStatistics, Statistics, Tickers},
-    RegionCacheMemoryEngine,
 };
 
 // The max snapshot number that can exist in the RocksDB. This is typically used
@@ -653,7 +653,7 @@ impl Deref for RegionCacheDbVector {
 
 impl DbVector for RegionCacheDbVector {}
 
-impl<'a> PartialEq<&'a [u8]> for RegionCacheDbVector {
+impl PartialEq<&[u8]> for RegionCacheDbVector {
     fn eq(&self, rhs: &&[u8]) -> bool {
         self.0.as_slice() == *rhs
     }
@@ -673,13 +673,13 @@ mod tests {
     use crossbeam::epoch;
     use crossbeam_skiplist::SkipList;
     use engine_rocks::{
-        raw::DBStatisticsTickerType, util::new_engine_opt, RocksDbOptions, RocksStatistics,
+        RocksDbOptions, RocksStatistics, raw::DBStatisticsTickerType, util::new_engine_opt,
     };
     use engine_traits::{
-        CacheRegion, EvictReason, FailedReason, IterMetricsCollector, IterOptions, Iterable,
-        Iterator, MetricsExt, Mutable, Peekable, ReadOptions, RegionCacheEngine,
-        RegionCacheEngineExt, RegionEvent, WriteBatch, WriteBatchExt, CF_DEFAULT, CF_LOCK,
-        CF_WRITE,
+        CF_DEFAULT, CF_LOCK, CF_WRITE, CacheRegion, EvictReason, FailedReason,
+        IterMetricsCollector, IterOptions, Iterable, Iterator, MetricsExt, Mutable, Peekable,
+        ReadOptions, RegionCacheEngine, RegionCacheEngineExt, RegionEvent, WriteBatch,
+        WriteBatchExt,
     };
     use keys::DATA_PREFIX_KEY;
     use tempfile::Builder;
@@ -687,17 +687,17 @@ mod tests {
 
     use super::{RegionCacheIterator, RegionCacheSnapshot};
     use crate::{
-        engine::{cf_to_id, SkiplistEngine},
+        InMemoryEngineConfig, InMemoryEngineContext, RegionCacheMemoryEngine,
+        RegionCacheWriteBatch,
+        engine::{SkiplistEngine, cf_to_id},
         keys::{
-            construct_key, construct_region_key, construct_user_key, construct_value, decode_key,
-            encode_key, encode_seek_key, InternalBytes, ValueType,
+            InternalBytes, ValueType, construct_key, construct_region_key, construct_user_key,
+            construct_value, decode_key, encode_key, encode_seek_key,
         },
         perf_context::PERF_CONTEXT,
         region_manager::RegionState,
         statistics::Tickers,
         test_util::new_region,
-        InMemoryEngineConfig, InMemoryEngineContext, RegionCacheMemoryEngine,
-        RegionCacheWriteBatch,
     };
 
     #[test]
@@ -723,13 +723,12 @@ mod tests {
                 );
             } else {
                 assert!(
-                    regions_map.regions()[&region.id]
+                    !regions_map.regions()[&region.id]
                         .region_snapshot_list()
                         .lock()
                         .unwrap()
                         .0
-                        .get(&snapshot_ts)
-                        .is_none()
+                        .contains_key(&snapshot_ts)
                 )
             }
         };
diff --git a/components/in_memory_engine/src/region_label.rs b/components/in_memory_engine/src/region_label.rs
index 41fb8f5f6fa..4004d0f13bd 100644
--- a/components/in_memory_engine/src/region_label.rs
+++ b/components/in_memory_engine/src/region_label.rs
@@ -11,8 +11,8 @@ use futures::{
 use keys::{data_end_key, data_key};
 use kvproto::meta_storagepb::EventEventType;
 use pd_client::{
+    Error as PdError, PdClient, REGION_LABEL_PATH_PREFIX, RpcClient,
     meta_storage::{Checked, Get, MetaStorageClient, Sourced, Watch},
-    Error as PdError, PdClient, RpcClient, REGION_LABEL_PATH_PREFIX,
 };
 use serde::{Deserialize, Serialize};
 use tikv_util::{error, info, timer::GLOBAL_TIMER_HANDLE, warn};
@@ -296,7 +296,7 @@ pub mod tests {
     use futures::executor::block_on;
     use pd_client::meta_storage::{Delete, Put};
     use security::{SecurityConfig, SecurityManager};
-    use test_pd::{mocker::MetaStorage, util::*, Server as MockServer};
+    use test_pd::{Server as MockServer, mocker::MetaStorage, util::*};
     use tikv_util::{config::ReadableDuration, worker::Builder};
 
     use super::*;
diff --git a/components/in_memory_engine/src/region_manager.rs b/components/in_memory_engine/src/region_manager.rs
index 338f6f56aed..0b2236f59ef 100644
--- a/components/in_memory_engine/src/region_manager.rs
+++ b/components/in_memory_engine/src/region_manager.rs
@@ -9,8 +9,8 @@ use std::{
     fmt::Debug,
     result,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, Ordering},
     },
 };
 
diff --git a/components/in_memory_engine/src/region_stats.rs b/components/in_memory_engine/src/region_stats.rs
index 634d5d2bb73..9abbc78ebf6 100644
--- a/components/in_memory_engine/src/region_stats.rs
+++ b/components/in_memory_engine/src/region_stats.rs
@@ -3,8 +3,8 @@ use std::{
     collections::BTreeMap,
     num::NonZeroUsize,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, Mutex as StdMutex,
+        atomic::{AtomicBool, Ordering},
     },
     time::{Duration, Instant},
 };
@@ -21,6 +21,7 @@ use tikv_util::{config::VersionTrack, info, worker::Scheduler};
 use tokio::sync::mpsc;
 
 use crate::{
+    BackgroundTask, InMemoryEngineConfig,
     memory_controller::MemoryController,
     metrics::{
         IN_MEMORY_ENGINE_AUTO_LOAD_EVICT_CACHED_REGION_COP_REQ,
@@ -29,7 +30,6 @@ use crate::{
         IN_MEMORY_ENGINE_AUTO_LOAD_EVICT_TOP_REGION_MVCC_AMP,
     },
     region_manager::CopRequestsSma,
-    BackgroundTask, InMemoryEngineConfig,
 };
 
 /// Do not evict a region if has been cached for less than this duration.
@@ -282,7 +282,7 @@ impl RegionStatsManager {
             let load_time = regions_loaded.entry(crs.region.id).or_insert(now);
             let can_evict = now
                 .checked_duration_since(*load_time)
-                .map_or(false, |d| d > self.evict_min_duration);
+                .is_some_and(|d| d > self.evict_min_duration);
             if !can_evict {
                 continue;
             }
@@ -473,7 +473,7 @@ fn sort_cached_region_stats(
 pub mod tests {
     use futures::executor::block_on;
     use pd_client::{RegionStat, RegionWriteCfCopDetail};
-    use raftstore::coprocessor::{self, region_info_accessor::TopRegions, RegionInfoProvider};
+    use raftstore::coprocessor::{self, RegionInfoProvider, region_info_accessor::TopRegions};
     use tikv_util::{
         box_err,
         config::{ReadableDuration, ReadableSize, VersionTrack},
@@ -482,8 +482,8 @@ pub mod tests {
 
     use super::*;
     use crate::{
-        engine::SkiplistEngine, region_manager::COP_REQUEST_SMA_RECORD_COUNT,
-        test_util::new_region, InMemoryEngineConfig,
+        InMemoryEngineConfig, engine::SkiplistEngine, region_manager::COP_REQUEST_SMA_RECORD_COUNT,
+        test_util::new_region,
     };
 
     struct RegionInfoSimulator {
diff --git a/components/in_memory_engine/src/statistics.rs b/components/in_memory_engine/src/statistics.rs
index 47e5a912bb7..64608dd6880 100644
--- a/components/in_memory_engine/src/statistics.rs
+++ b/components/in_memory_engine/src/statistics.rs
@@ -1,8 +1,8 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::sync::{
-    atomic::{AtomicU64, Ordering},
     Mutex,
+    atomic::{AtomicU64, Ordering},
 };
 
 use crossbeam::utils::CachePadded;
diff --git a/components/in_memory_engine/src/test_util.rs b/components/in_memory_engine/src/test_util.rs
index c11ba667ae4..217716e2179 100644
--- a/components/in_memory_engine/src/test_util.rs
+++ b/components/in_memory_engine/src/test_util.rs
@@ -4,14 +4,14 @@ use std::sync::Arc;
 
 use crossbeam::epoch;
 use engine_rocks::RocksEngine;
-use engine_traits::{SyncMutable, CF_WRITE};
+use engine_traits::{CF_WRITE, SyncMutable};
 use keys::data_key;
 use kvproto::metapb::{Peer, Region};
 use txn_types::{Key, TimeStamp, Write, WriteType};
 
 use crate::{
     engine::SkiplistHandle,
-    keys::{encode_key, InternalBytes, ValueType},
+    keys::{InternalBytes, ValueType, encode_key},
     memory_controller::MemoryController,
     write_batch::RegionCacheWriteBatchEntry,
 };
diff --git a/components/in_memory_engine/src/write_batch.rs b/components/in_memory_engine/src/write_batch.rs
index f2e4b6aeed9..1ef5f5e66a6 100644
--- a/components/in_memory_engine/src/write_batch.rs
+++ b/components/in_memory_engine/src/write_batch.rs
@@ -1,31 +1,31 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::Ordering, Arc},
+    sync::{Arc, atomic::Ordering},
     time::Duration,
 };
 
 use bytes::Bytes;
 use crossbeam::epoch;
 use engine_traits::{
-    CacheRegion, EvictReason, MiscExt, Mutable, RegionCacheEngine, Result, WriteBatch,
-    WriteBatchExt, WriteOptions, CF_DEFAULT,
+    CF_DEFAULT, CacheRegion, EvictReason, MiscExt, Mutable, RegionCacheEngine, Result, WriteBatch,
+    WriteBatchExt, WriteOptions,
 };
 use kvproto::metapb;
 use smallvec::SmallVec;
 use tikv_util::{box_err, config::ReadableSize, error, info, time::Instant, warn};
 
 use crate::{
+    RegionCacheMemoryEngine,
     background::BackgroundTask,
-    engine::{cf_to_id, id_to_cf, is_lock_cf, SkiplistEngine},
-    keys::{encode_key, InternalBytes, ValueType, ENC_KEY_SEQ_LENGTH},
+    engine::{SkiplistEngine, cf_to_id, id_to_cf, is_lock_cf},
+    keys::{ENC_KEY_SEQ_LENGTH, InternalBytes, ValueType, encode_key},
     memory_controller::{MemoryController, MemoryUsage},
     metrics::{
-        count_operations_for_cfs, IN_MEMORY_ENGINE_PREPARE_FOR_WRITE_DURATION_HISTOGRAM,
-        IN_MEMORY_ENGINE_WRITE_DURATION_HISTOGRAM,
+        IN_MEMORY_ENGINE_PREPARE_FOR_WRITE_DURATION_HISTOGRAM,
+        IN_MEMORY_ENGINE_WRITE_DURATION_HISTOGRAM, count_operations_for_cfs,
     },
     region_manager::RegionCacheStatus,
-    RegionCacheMemoryEngine,
 };
 
 // This is a bit of a hack. It's the overhead of a node in the skiplist with
@@ -592,7 +592,7 @@ mod tests {
     use crossbeam_skiplist::SkipList;
     use engine_rocks::util::new_engine;
     use engine_traits::{
-        CacheRegion, FailedReason, Peekable, RegionCacheEngine, WriteBatch, DATA_CFS,
+        CacheRegion, DATA_CFS, FailedReason, Peekable, RegionCacheEngine, WriteBatch,
     };
     use kvproto::metapb::{Region, RegionEpoch};
     use online_config::{ConfigChange, ConfigManager, ConfigValue};
@@ -601,8 +601,8 @@ mod tests {
 
     use super::*;
     use crate::{
-        background::flush_epoch, config::InMemoryEngineConfigManager, region_manager::RegionState,
-        test_util::new_region, InMemoryEngineConfig, InMemoryEngineContext,
+        InMemoryEngineConfig, InMemoryEngineContext, background::flush_epoch,
+        config::InMemoryEngineConfigManager, region_manager::RegionState, test_util::new_region,
     };
 
     // We should not use skiplist.get directly as we only cares keys without
diff --git a/components/in_memory_engine/tests/failpoints/test_memory_engine.rs b/components/in_memory_engine/tests/failpoints/test_memory_engine.rs
index 84bce6bdd64..8431e33f701 100644
--- a/components/in_memory_engine/tests/failpoints/test_memory_engine.rs
+++ b/components/in_memory_engine/tests/failpoints/test_memory_engine.rs
@@ -1,28 +1,28 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc::sync_channel, Arc},
+    sync::{Arc, mpsc::sync_channel},
     time::Duration,
 };
 
 use crossbeam::epoch;
 use engine_rocks::util::new_engine;
 use engine_traits::{
-    CacheRegion, EvictReason, Mutable, RegionCacheEngine, RegionCacheEngineExt, RegionEvent,
-    WriteBatch, WriteBatchExt, CF_DEFAULT, CF_LOCK, CF_WRITE, DATA_CFS,
+    CF_DEFAULT, CF_LOCK, CF_WRITE, CacheRegion, DATA_CFS, EvictReason, Mutable, RegionCacheEngine,
+    RegionCacheEngineExt, RegionEvent, WriteBatch, WriteBatchExt,
 };
 use in_memory_engine::{
-    decode_key, encode_key_for_boundary_without_mvcc, encoding_for_filter,
-    test_util::{new_region, put_data, put_data_in_rocks},
     BackgroundTask, InMemoryEngineConfig, InMemoryEngineContext, InternalBytes, InternalKey,
-    RegionCacheMemoryEngine, RegionState, SkiplistHandle, ValueType,
+    RegionCacheMemoryEngine, RegionState, SkiplistHandle, ValueType, decode_key,
+    encode_key_for_boundary_without_mvcc, encoding_for_filter,
+    test_util::{new_region, put_data, put_data_in_rocks},
 };
-use keys::{data_key, DATA_MAX_KEY, DATA_MIN_KEY};
+use keys::{DATA_MAX_KEY, DATA_MIN_KEY, data_key};
 use kvproto::metapb::Region;
 use tempfile::Builder;
 use tikv_util::config::{ReadableDuration, ReadableSize, VersionTrack};
 use tokio::{
-    sync::{mpsc, Mutex},
+    sync::{Mutex, mpsc},
     time::timeout,
 };
 use txn_types::{Key, TimeStamp, WriteType};
diff --git a/components/keys/src/lib.rs b/components/keys/src/lib.rs
index 304e13f1e66..caa1f0b7cc1 100644
--- a/components/keys/src/lib.rs
+++ b/components/keys/src/lib.rs
@@ -361,7 +361,7 @@ mod tests {
 
     #[test]
     fn test_region_key() {
-        let ids = vec![1, 1024, u64::max_value()];
+        let ids = vec![1, 1024, u64::MAX];
         for id in ids {
             // region meta key
             let meta_prefix = region_meta_prefix(id);
diff --git a/components/log_wrappers/src/lib.rs b/components/log_wrappers/src/lib.rs
index d4097ce5a13..e2dc2bb7767 100644
--- a/components/log_wrappers/src/lib.rs
+++ b/components/log_wrappers/src/lib.rs
@@ -14,10 +14,10 @@ use std::{fmt, str::FromStr, sync::atomic::Ordering};
 use atomic::Atomic;
 use online_config::ConfigValue;
 use protobuf::atomic_flags::{
-    set_redact_level as proto_set_redact_level, RedactLevel, DEFAULT_REDACT_MARKER_HEAD,
-    DEFAULT_REDACT_MARKER_TAIL,
+    DEFAULT_REDACT_MARKER_HEAD, DEFAULT_REDACT_MARKER_TAIL, RedactLevel,
+    set_redact_level as proto_set_redact_level,
 };
-use serde::{de, Deserialize, Serialize, Serializer};
+use serde::{Deserialize, Serialize, Serializer, de};
 
 pub use crate::hex::*;
 
@@ -145,7 +145,7 @@ impl<'de> Deserialize<'de> for RedactOption {
     {
         struct RedactOptionVisitor;
 
-        impl<'de> de::Visitor<'de> for RedactOptionVisitor {
+        impl de::Visitor<'_> for RedactOptionVisitor {
             type Value = RedactOption;
 
             fn expecting(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -196,6 +196,7 @@ pub fn set_redact_info_log(config: RedactOption) {
     proto_set_redact_level(level);
 }
 
+#[derive(Clone, Copy)]
 pub struct Value<'a>(pub &'a [u8]);
 
 impl<'a> Value<'a> {
@@ -208,7 +209,7 @@ impl<'a> Value<'a> {
     }
 }
 
-impl<'a> slog::Value for Value<'a> {
+impl slog::Value for Value<'_> {
     #[inline]
     fn serialize(
         &self,
@@ -234,7 +235,7 @@ impl<'a> slog::Value for Value<'a> {
     }
 }
 
-impl<'a> fmt::Display for Value<'a> {
+impl fmt::Display for Value<'_> {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match REDACT_INFO_LOG.load(Ordering::Relaxed) {
@@ -258,7 +259,7 @@ impl<'a> fmt::Display for Value<'a> {
     }
 }
 
-impl<'a> fmt::Debug for Value<'a> {
+impl fmt::Debug for Value<'_> {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Display::fmt(self, f)
diff --git a/components/memory_trace_macros/src/lib.rs b/components/memory_trace_macros/src/lib.rs
index be5e516b437..ab073dcef32 100644
--- a/components/memory_trace_macros/src/lib.rs
+++ b/components/memory_trace_macros/src/lib.rs
@@ -4,7 +4,7 @@
 
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::{parse_macro_input, Data, DeriveInput, Fields};
+use syn::{Data, DeriveInput, Fields, parse_macro_input};
 
 /// MemoryTraceHelper adds two methods `reset` and `sum` to derived struct.
 /// All fields of derived struct should be `usize`.
diff --git a/components/online_config/src/lib.rs b/components/online_config/src/lib.rs
index b02a4e94ed9..7d4571ba61c 100644
--- a/components/online_config/src/lib.rs
+++ b/components/online_config/src/lib.rs
@@ -109,15 +109,15 @@ impl_into!(ConfigChange, Module);
 /// The OnlineConfig trait
 ///
 /// There are four type of fields inside derived OnlineConfig struct:
-/// 1. `#[online_config(skip)]` field, these fields will not return
-/// by `diff` method and have not effect of `update` method
+/// 1. `#[online_config(skip)]` field, these fields will not return by `diff`
+///    method and have not effect of `update` method
 /// 2. `#[online_config(hidden)]` field, these fields have the same effect of
-/// `#[online_config(skip)]` field, in addition, these fields will not appear
-/// at the output of serializing `Self::Encoder`
+///    `#[online_config(skip)]` field, in addition, these fields will not appear
+///    at the output of serializing `Self::Encoder`
 /// 3. `#[online_config(submodule)]` field, these fields represent the
-/// submodule, and should also derive `OnlineConfig`
-/// 4. normal fields, the type of these fields should be implment
-/// `Into` and `From`/`TryFrom` for `ConfigValue`
+///    submodule, and should also derive `OnlineConfig`
+/// 4. normal fields, the type of these fields should be implment `Into` and
+///    `From`/`TryFrom` for `ConfigValue`
 pub trait OnlineConfig<'a> {
     type Encoder: serde::Serialize;
     /// Compare to other config, return the difference
diff --git a/components/panic_hook/src/lib.rs b/components/panic_hook/src/lib.rs
index 7e95ea4071a..7c26b866f08 100644
--- a/components/panic_hook/src/lib.rs
+++ b/components/panic_hook/src/lib.rs
@@ -8,16 +8,16 @@
 
 use std::{
     cell::RefCell,
-    panic::{self, AssertUnwindSafe, PanicInfo},
+    panic::{self, AssertUnwindSafe, PanicHookInfo},
     sync::Once,
 };
 
 static INIT: Once = Once::new();
 // store the default panic hook defined in std.
-static mut DEFAULT_HOOK: Option<*mut (dyn Fn(&PanicInfo<'_>) + 'static + Sync + Send)> = None;
+static mut DEFAULT_HOOK: Option<*mut (dyn Fn(&PanicHookInfo<'_>) + 'static + Sync + Send)> = None;
 
 thread_local! {
-    static MUTED: RefCell<bool> = RefCell::new(false)
+    static MUTED: RefCell<bool> = const {RefCell::new(false)}
 }
 
 /// Replace the default hook if we haven't.
@@ -40,7 +40,7 @@ pub fn unmute() {
 }
 
 /// Print the stacktrace according to the static MUTED.
-fn track_hook(p: &PanicInfo<'_>) {
+fn track_hook(p: &PanicHookInfo<'_>) {
     MUTED.with(|m| {
         if *m.borrow() {
             return;
diff --git a/components/pd_client/src/client.rs b/components/pd_client/src/client.rs
index 39154207666..6798a6013c3 100644
--- a/components/pd_client/src/client.rs
+++ b/components/pd_client/src/client.rs
@@ -3,21 +3,20 @@
 use std::{
     fmt,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicU64, Ordering},
     },
     time::Duration,
-    u64,
 };
 
 use futures::{
+    TryStreamExt,
     channel::mpsc,
     compat::{Compat, Future01CompatExt},
     executor::block_on,
     future::{self, BoxFuture, FutureExt, TryFlattenStream, TryFutureExt},
     sink::SinkExt,
     stream::{ErrInto, StreamExt},
-    TryStreamExt,
 };
 use grpcio::{EnvBuilder, Environment, WriteFlags};
 use kvproto::{
@@ -31,18 +30,18 @@ use kvproto::{
 };
 use security::SecurityManager;
 use tikv_util::{
-    box_err, debug, error, info, thd_name, time::Instant, timer::GLOBAL_TIMER_HANDLE, warn, Either,
-    HandyRwLock,
+    Either, HandyRwLock, box_err, debug, error, info, thd_name, time::Instant,
+    timer::GLOBAL_TIMER_HANDLE, warn,
 };
 use txn_types::TimeStamp;
-use yatp::{task::future::TaskCell, ThreadPool};
+use yatp::{ThreadPool, task::future::TaskCell};
 
 use super::{
+    BucketStat, Config, Error, FeatureGate, PdClient, PdFuture, REQUEST_TIMEOUT, RegionInfo,
+    RegionStat, Result, UnixSecs,
     meta_storage::{Delete, Get, MetaStorageClient, Put, Watch},
     metrics::*,
-    util::{call_option_inner, check_resp_header, sync_request, Client, PdConnector},
-    BucketStat, Config, Error, FeatureGate, PdClient, PdFuture, RegionInfo, RegionStat, Result,
-    UnixSecs, REQUEST_TIMEOUT,
+    util::{Client, PdConnector, call_option_inner, check_resp_header, sync_request},
 };
 
 pub const CQ_COUNT: usize = 1;
@@ -81,7 +80,7 @@ impl RpcClient {
 
         // -1 means the max.
         let retries = match cfg.retry_max_count {
-            -1 => std::isize::MAX,
+            -1 => isize::MAX,
             v => v.saturating_add(1),
         };
         let monitor = Arc::new(
diff --git a/components/pd_client/src/client_v2.rs b/components/pd_client/src/client_v2.rs
index 7ffb0ca08bf..1030fc90281 100644
--- a/components/pd_client/src/client_v2.rs
+++ b/components/pd_client/src/client_v2.rs
@@ -15,11 +15,10 @@ use std::{
     fmt::Debug,
     pin::Pin,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc, Mutex,
+        atomic::{AtomicU64, Ordering},
     },
     time::{Duration, Instant as StdInstant},
-    u64,
 };
 
 use fail::fail_point;
@@ -53,11 +52,11 @@ use tokio::sync::{broadcast, mpsc as tokio_mpsc};
 use txn_types::TimeStamp;
 
 use super::{
+    Config, Error, FeatureGate, REQUEST_TIMEOUT as REQUEST_TIMEOUT_SEC, RegionInfo, Result,
+    UnixSecs,
     client::{CLIENT_PREFIX, CQ_COUNT},
     metrics::*,
-    util::{check_resp_header, PdConnector, TargetInfo},
-    Config, Error, FeatureGate, RegionInfo, Result, UnixSecs,
-    REQUEST_TIMEOUT as REQUEST_TIMEOUT_SEC,
+    util::{PdConnector, TargetInfo, check_resp_header},
 };
 use crate::PdFuture;
 
@@ -88,7 +87,7 @@ impl RawClient {
     async fn connect(ctx: &ConnectContext) -> Result<Self> {
         // -1 means the max.
         let retries = match ctx.cfg.retry_max_count {
-            -1 => std::isize::MAX,
+            -1 => isize::MAX,
             v => v.saturating_add(1),
         };
         for i in 0..retries {
diff --git a/components/pd_client/src/config.rs b/components/pd_client/src/config.rs
index f42cc3528d7..e80ae19dcb8 100644
--- a/components/pd_client/src/config.rs
+++ b/components/pd_client/src/config.rs
@@ -45,7 +45,7 @@ impl Default for Config {
         Config {
             endpoints: vec!["127.0.0.1:2379".to_string()],
             retry_interval: ReadableDuration::millis(300),
-            retry_max_count: std::isize::MAX,
+            retry_max_count: isize::MAX,
             retry_log_every: 10,
             update_interval: ReadableDuration::minutes(10),
             enable_forwarding: false,
diff --git a/components/pd_client/src/feature_gate.rs b/components/pd_client/src/feature_gate.rs
index dc8bef853de..c55e17aa192 100644
--- a/components/pd_client/src/feature_gate.rs
+++ b/components/pd_client/src/feature_gate.rs
@@ -1,8 +1,8 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::sync::{
-    atomic::{AtomicU64, Ordering},
     Arc,
+    atomic::{AtomicU64, Ordering},
 };
 
 use semver::{SemVerError, Version};
diff --git a/components/pd_client/src/lib.rs b/components/pd_client/src/lib.rs
index 43646452c04..75fffa44b79 100644
--- a/components/pd_client/src/lib.rs
+++ b/components/pd_client/src/lib.rs
@@ -37,7 +37,7 @@ pub use self::{
     config::Config,
     errors::{Error, Result},
     feature_gate::{Feature, FeatureGate},
-    util::{merge_bucket_stats, new_bucket_stats, PdConnector, REQUEST_RECONNECT_INTERVAL},
+    util::{PdConnector, REQUEST_RECONNECT_INTERVAL, merge_bucket_stats, new_bucket_stats},
 };
 
 pub type Key = Vec<u8>;
@@ -322,7 +322,7 @@ pub trait PdClient: Send + Sync {
     /// recovery mode recovery mode will do
     /// 1. update tikv cluster id from pd
     /// 2. all peer apply the log to last of the leader peer which has the most
-    /// log appended. 3. delete data to some point of time (resolved_ts)
+    ///    log appended. 3. delete data to some point of time (resolved_ts)
     fn is_recovering_marked(&self) -> Result<bool> {
         unimplemented!();
     }
@@ -343,7 +343,7 @@ pub trait PdClient: Send + Sync {
     ///   which Region and Peers will be removed.
     /// - For auto-balance, PD determines how to move the Region from one store
     ///   to another.
-
+    ///
     /// Gets store information if it is not a tombstone store.
     fn get_store(&self, _store_id: u64) -> Result<metapb::Store> {
         unimplemented!();
diff --git a/components/pd_client/src/tso.rs b/components/pd_client/src/tso.rs
index feec5061a8c..4f67870f2e6 100644
--- a/components/pd_client/src/tso.rs
+++ b/components/pd_client/src/tso.rs
@@ -27,7 +27,7 @@ use tikv_util::{box_err, info, sys::thread::StdThreadBuildWrapper};
 use tokio::sync::{mpsc, oneshot, watch};
 use txn_types::TimeStamp;
 
-use crate::{metrics::PD_PENDING_TSO_REQUEST_GAUGE, Error, Result};
+use crate::{Error, Result, metrics::PD_PENDING_TSO_REQUEST_GAUGE};
 
 /// It is an empirical value.
 const MAX_BATCH_SIZE: usize = 64;
@@ -174,7 +174,7 @@ struct TsoRequestStream<'a> {
     self_waker: Rc<AtomicWaker>,
 }
 
-impl<'a> Stream for TsoRequestStream<'a> {
+impl Stream for TsoRequestStream<'_> {
     type Item = (TsoRequest, WriteFlags);
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
diff --git a/components/pd_client/src/util.rs b/components/pd_client/src/util.rs
index 4eafd486c54..9de08cfe1b9 100644
--- a/components/pd_client/src/util.rs
+++ b/components/pd_client/src/util.rs
@@ -3,7 +3,7 @@
 use core::panic;
 use std::{
     pin::Pin,
-    sync::{atomic::AtomicU64, Arc, RwLock},
+    sync::{Arc, RwLock, atomic::AtomicU64},
     thread,
     time::Duration,
 };
@@ -36,14 +36,14 @@ use kvproto::{
 };
 use security::SecurityManager;
 use tikv_util::{
-    box_err, debug, error, info, slow_log, time::Instant, timer::GLOBAL_TIMER_HANDLE, warn, Either,
-    HandyRwLock,
+    Either, HandyRwLock, box_err, debug, error, info, slow_log, time::Instant,
+    timer::GLOBAL_TIMER_HANDLE, warn,
 };
 use tokio_timer::timer::Handle;
 
 use super::{
-    metrics::*, tso::TimestampOracle, BucketMeta, Config, Error, FeatureGate, PdFuture, Result,
-    REQUEST_TIMEOUT,
+    BucketMeta, Config, Error, FeatureGate, PdFuture, REQUEST_TIMEOUT, Result, metrics::*,
+    tso::TimestampOracle,
 };
 
 const RETRY_INTERVAL: Duration = Duration::from_secs(1); // 1s
@@ -817,7 +817,7 @@ impl PdConnector {
                             network_fail_num += 1;
                         }
                     }
-                    error!("failed to connect to PD member"; "endpoints" => ep, "error" => ?e);
+                    warn!("failed to connect to PD member"; "endpoints" => ep, "error" => ?e);
                 }
                 _ => unreachable!(),
             }
diff --git a/components/profiler/src/lib.rs b/components/profiler/src/lib.rs
index 2734d8f7877..2ebf851df41 100644
--- a/components/profiler/src/lib.rs
+++ b/components/profiler/src/lib.rs
@@ -43,6 +43,7 @@
 //!
 //! Also see `examples/prime.rs`.
 
+#![allow(clippy::doc_overindented_list_items)]
 #[allow(unused_extern_crates)]
 extern crate tikv_alloc;
 
diff --git a/components/raft_log_engine/src/engine.rs b/components/raft_log_engine/src/engine.rs
index c71b9fd65d9..44c335b838b 100644
--- a/components/raft_log_engine/src/engine.rs
+++ b/components/raft_log_engine/src/engine.rs
@@ -10,9 +10,8 @@ use std::{
 use codec::number::NumberCodec;
 use encryption::{DataKeyManager, DecrypterReader, EncrypterWriter};
 use engine_traits::{
-    CacheStats, PerfContextExt, PerfContextKind, PerfLevel, RaftEngine, RaftEngineDebug,
-    RaftEngineReadOnly, RaftLogBatch as RaftLogBatchTrait, Result, CF_DEFAULT, CF_LOCK, CF_RAFT,
-    CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, CacheStats, PerfContextExt, PerfContextKind, PerfLevel,
+    RaftEngine, RaftEngineDebug, RaftEngineReadOnly, RaftLogBatch as RaftLogBatchTrait, Result,
 };
 use file_system::{IoOp, IoRateLimiter, IoType, WithIoType};
 use kvproto::{
@@ -24,8 +23,8 @@ use kvproto::{
 };
 use raft::eraftpb::Entry;
 use raft_engine::{
-    env::{DefaultFileSystem, FileSystem, Handle, Permission, WriteExt},
     Command, Engine as RawRaftEngine, Error as RaftEngineError, LogBatch, MessageExt,
+    env::{DefaultFileSystem, FileSystem, Handle, Permission, WriteExt},
 };
 pub use raft_engine::{Config as RaftEngineConfig, ReadableSize, RecoveryMode};
 use tikv_util::Either;
diff --git a/components/raft_log_engine/src/perf_context.rs b/components/raft_log_engine/src/perf_context.rs
index 87946e2f48e..257f2d4a6dc 100644
--- a/components/raft_log_engine/src/perf_context.rs
+++ b/components/raft_log_engine/src/perf_context.rs
@@ -1,7 +1,7 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
 use raft_engine::get_perf_context;
-use tracker::{TrackerToken, GLOBAL_TRACKERS};
+use tracker::{GLOBAL_TRACKERS, TrackerToken};
 
 #[derive(Debug)]
 pub struct RaftEnginePerfContext;
diff --git a/components/raftstore-v2/src/batch/mod.rs b/components/raftstore-v2/src/batch/mod.rs
index 7daeebaa8f0..d6003224c45 100644
--- a/components/raftstore-v2/src/batch/mod.rs
+++ b/components/raftstore-v2/src/batch/mod.rs
@@ -7,4 +7,4 @@
 
 mod store;
 
-pub use store::{create_store_batch_system, StoreContext, StoreRouter, StoreSystem};
+pub use store::{StoreContext, StoreRouter, StoreSystem, create_store_batch_system};
diff --git a/components/raftstore-v2/src/batch/store.rs b/components/raftstore-v2/src/batch/store.rs
index 056cd122e67..bfaa2b464ef 100644
--- a/components/raftstore-v2/src/batch/store.rs
+++ b/components/raftstore-v2/src/batch/store.rs
@@ -4,8 +4,8 @@ use std::{
     ops::{Deref, DerefMut},
     path::Path,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, Ordering},
     },
     time::Duration,
 };
@@ -19,52 +19,51 @@ use concurrency_manager::ConcurrencyManager;
 use crossbeam::channel::TrySendError;
 use encryption_export::DataKeyManager;
 use engine_traits::{KvEngine, RaftEngine, TabletRegistry};
-use file_system::{set_io_type, IoType, WithIoType};
+use file_system::{IoType, WithIoType, set_io_type};
 use futures::compat::Future01CompatExt;
 use health_controller::types::LatencyInspector;
 use kvproto::{disk_usage::DiskUsage, raft_serverpb::RaftMessage};
 use pd_client::PdClient;
-use raft::{StateRole, INVALID_ID};
+use raft::{INVALID_ID, StateRole};
 use raftstore::{
     coprocessor::{CoprocessorHost, RegionChangeEvent},
     store::{
+        AutoSplitController, Config, ReadRunner, ReadTask, RefreshConfigTask, SplitCheckRunner,
+        SplitCheckTask, StoreWriters, StoreWritersContext, TabletSnapManager, Transport,
+        WriteRouterContext, WriteSenders, WriterContoller,
         fsm::{
-            store::{PeerTickBatch, ENTRY_CACHE_EVICT_TICK_DURATION},
             GlobalStoreStat, LocalStoreStat,
+            store::{ENTRY_CACHE_EVICT_TICK_DURATION, PeerTickBatch},
         },
         local_metrics::RaftMetrics,
-        AutoSplitController, Config, ReadRunner, ReadTask, RefreshConfigTask, SplitCheckRunner,
-        SplitCheckTask, StoreWriters, StoreWritersContext, TabletSnapManager, Transport,
-        WriteRouterContext, WriteSenders, WriterContoller,
     },
 };
 use resource_control::ResourceController;
 use resource_metering::CollectorRegHandle;
 use service::service_manager::GrpcServiceManager;
-use slog::{warn, Logger};
+use slog::{Logger, warn};
 use sst_importer::SstImporter;
 use tikv_util::{
-    box_err,
+    Either, box_err,
     config::{Tracker, VersionTrack},
     log::SlogFormat,
-    sys::{disk::get_disk_status, SysQuota},
-    time::{duration_to_sec, monotonic_raw_now, Instant as TiInstant, Limiter},
-    timer::{SteadyTimer, GLOBAL_TIMER_HANDLE},
+    sys::{SysQuota, disk::get_disk_status},
+    time::{Instant as TiInstant, Limiter, duration_to_sec, monotonic_raw_now},
+    timer::{GLOBAL_TIMER_HANDLE, SteadyTimer},
     worker::{Builder, LazyWorker, Scheduler, Worker},
     yatp_pool::{DefaultTicker, FuturePool, YatpPoolBuilder},
-    Either,
 };
 use time::Timespec;
 
 use crate::{
+    Error, Result,
     fsm::{PeerFsm, PeerFsmDelegate, SenderFsmPair, StoreFsm, StoreFsmDelegate, StoreMeta},
     operation::{
-        ReplayWatch, SharedReadTablet, MERGE_IN_PROGRESS_PREFIX, MERGE_SOURCE_PREFIX, SPLIT_PREFIX,
+        MERGE_IN_PROGRESS_PREFIX, MERGE_SOURCE_PREFIX, ReplayWatch, SPLIT_PREFIX, SharedReadTablet,
     },
     raft::Storage,
     router::{PeerMsg, PeerTick, StoreMsg},
-    worker::{cleanup, pd, refresh_config, tablet},
-    Error, Result,
+    worker::{pd, refresh_config, tablet},
 };
 
 const MIN_MANUAL_FLUSH_RATE: f64 = 0.2;
@@ -488,7 +487,7 @@ impl<EK: KvEngine, ER: RaftEngine, T> StorePollerBuilder<EK, ER, T> {
         for entry in file_system::read_dir(self.tablet_registry.tablet_root())? {
             let entry = entry?;
             let path = entry.path();
-            if path.extension().map_or(false, |s| s == "tmp") {
+            if path.extension().is_some_and(|s| s == "tmp") {
                 // The directory may be generated by an aborted checkpoint.
                 self.remove_dir(&path)?;
                 continue;
@@ -591,11 +590,10 @@ pub struct Schedulers<EK: KvEngine, ER: RaftEngine> {
     pub pd: Scheduler<pd::Task>,
     pub tablet: Scheduler<tablet::Task<EK>>,
     pub write: WriteSenders<EK, ER>,
-    pub cleanup: Scheduler<cleanup::Task>,
     pub refresh_config: Scheduler<RefreshConfigTask>,
 
     // Following is not maintained by raftstore itself.
-    pub split_check: Scheduler<SplitCheckTask>,
+    pub split_check: Scheduler<SplitCheckTask<EK>>,
 }
 
 impl<EK: KvEngine, ER: RaftEngine> Schedulers<EK, ER> {
@@ -617,7 +615,6 @@ struct Workers<EK: KvEngine, ER: RaftEngine> {
     checkpoint: Worker,
     async_write: StoreWriters<EK, ER>,
     purge: Option<Worker>,
-    cleanup_worker: Worker,
 
     refresh_config_worker: LazyWorker<RefreshConfigTask>,
 
@@ -644,7 +641,6 @@ impl<EK: KvEngine, ER: RaftEngine> Workers<EK, ER> {
             checkpoint,
             async_write: StoreWriters::new(resource_control),
             purge,
-            cleanup_worker: Worker::new("cleanup-worker"),
             refresh_config_worker: LazyWorker::new("refreash-config-worker"),
             background,
             high_priority_pool: YatpPoolBuilder::new(DefaultTicker::default())
@@ -820,6 +816,7 @@ impl<EK: KvEngine, ER: RaftEngine> StoreSystem<EK, ER> {
             self.logger.clone(),
             self.shutdown.clone(),
             cfg.clone(),
+            Arc::new(AtomicBool::new(false)),
         )?);
 
         let split_check_scheduler = workers.background.start(
@@ -828,6 +825,7 @@ impl<EK: KvEngine, ER: RaftEngine> StoreSystem<EK, ER> {
                 tablet_registry.clone(),
                 router.clone(),
                 coprocessor_host.clone(),
+                None,
             ),
         );
 
@@ -841,12 +839,6 @@ impl<EK: KvEngine, ER: RaftEngine> StoreSystem<EK, ER> {
             ),
         );
 
-        let compact_runner =
-            cleanup::CompactRunner::new(tablet_registry.clone(), self.logger.clone());
-        let cleanup_worker_scheduler = workers
-            .cleanup_worker
-            .start("cleanup-worker", cleanup::Runner::new(compact_runner));
-
         let refresh_config_scheduler = workers.refresh_config_worker.scheduler();
 
         let schedulers = Schedulers {
@@ -855,7 +847,6 @@ impl<EK: KvEngine, ER: RaftEngine> StoreSystem<EK, ER> {
             tablet: tablet_scheduler,
             write: workers.async_write.senders(),
             split_check: split_check_scheduler,
-            cleanup: cleanup_worker_scheduler,
             refresh_config: refresh_config_scheduler,
         };
 
@@ -949,6 +940,11 @@ impl<EK: KvEngine, ER: RaftEngine> StoreSystem<EK, ER> {
             .scheduler()
     }
 
+    pub fn pd_scheduler(&self) -> Scheduler<pd::Task> {
+        assert!(self.workers.is_some());
+        self.workers.as_ref().unwrap().pd.scheduler()
+    }
+
     pub fn shutdown(&mut self) {
         self.shutdown.store(true, Ordering::Relaxed);
 
diff --git a/components/raftstore-v2/src/bootstrap.rs b/components/raftstore-v2/src/bootstrap.rs
index 62bc9e4b8c5..54694184d19 100644
--- a/components/raftstore-v2/src/bootstrap.rs
+++ b/components/raftstore-v2/src/bootstrap.rs
@@ -12,10 +12,10 @@ use kvproto::{
 use pd_client::PdClient;
 use raft::INVALID_ID;
 use raftstore::store::initial_region;
-use slog::{debug, error, info, warn, Logger};
+use slog::{Logger, debug, error, info, warn};
 use tikv_util::{box_err, box_try};
 
-use crate::{operation::write_initial_states, Result};
+use crate::{Result, operation::write_initial_states};
 
 const MAX_CHECK_CLUSTER_BOOTSTRAPPED_RETRY_COUNT: u64 = 60;
 const CHECK_CLUSTER_BOOTSTRAPPED_RETRY_INTERVAL: Duration = Duration::from_secs(3);
diff --git a/components/raftstore-v2/src/fsm/apply.rs b/components/raftstore-v2/src/fsm/apply.rs
index 49530fcd6df..fb2c61e39db 100644
--- a/components/raftstore-v2/src/fsm/apply.rs
+++ b/components/raftstore-v2/src/fsm/apply.rs
@@ -9,7 +9,7 @@ use batch_system::{Fsm, FsmScheduler, Mailbox};
 use crossbeam::channel::TryRecvError;
 use engine_traits::{FlushState, KvEngine, SstApplyState, TabletRegistry};
 use fail::fail_point;
-use futures::{compat::Future01CompatExt, FutureExt, StreamExt};
+use futures::{FutureExt, StreamExt, compat::Future01CompatExt};
 use kvproto::{metapb, raft_serverpb::RegionLocalState};
 use pd_client::BucketStat;
 use raftstore::{
@@ -26,10 +26,10 @@ use tikv_util::{
 };
 
 use crate::{
+    TabletTask,
     operation::{CatchUpLogs, DataTrace},
     raft::Apply,
     router::{ApplyRes, ApplyTask, PeerMsg},
-    TabletTask,
 };
 
 /// A trait for reporting apply result.
diff --git a/components/raftstore-v2/src/fsm/peer.rs b/components/raftstore-v2/src/fsm/peer.rs
index 7dc099c2944..4d1c5a06814 100644
--- a/components/raftstore-v2/src/fsm/peer.rs
+++ b/components/raftstore-v2/src/fsm/peer.rs
@@ -10,21 +10,21 @@ use encryption_export::DataKeyManager;
 use engine_traits::{KvEngine, RaftEngine, TabletRegistry};
 use kvproto::{errorpb, raft_cmdpb::RaftCmdResponse};
 use raftstore::store::{Config, ReadCallback, TabletSnapManager, Transport};
-use slog::{debug, info, trace, Logger};
+use slog::{Logger, debug, info, trace};
 use tikv_util::{
     is_zero_duration,
     mpsc::{self, LooseBoundedSender, Receiver},
     slog_panic,
-    time::{duration_to_sec, Instant},
+    time::{Instant, duration_to_sec},
 };
-use tracker::{TrackerToken, GLOBAL_TRACKERS};
+use tracker::{GLOBAL_TRACKERS, TrackerToken};
 
 use crate::{
+    Result,
     batch::StoreContext,
     operation::ReplayWatch,
     raft::{Peer, Storage},
     router::{PeerMsg, PeerTick, QueryResult},
-    Result,
 };
 
 pub type SenderFsmPair<EK, ER> = (LooseBoundedSender<PeerMsg>, Box<PeerFsm<EK, ER>>);
diff --git a/components/raftstore-v2/src/fsm/store.rs b/components/raftstore-v2/src/fsm/store.rs
index 107c35f5559..2a3109e33b9 100644
--- a/components/raftstore-v2/src/fsm/store.rs
+++ b/components/raftstore-v2/src/fsm/store.rs
@@ -9,13 +9,13 @@ use std::{
 use batch_system::Fsm;
 use collections::HashMap;
 use engine_traits::{KvEngine, RaftEngine};
-use futures::{compat::Future01CompatExt, FutureExt};
+use futures::{FutureExt, compat::Future01CompatExt};
 use keys::{data_end_key, data_key};
 use kvproto::metapb::Region;
 use raftstore::store::{
-    fsm::store::StoreRegionMeta, Config, ReadDelegate, RegionReadProgressRegistry, Transport,
+    Config, ReadDelegate, RegionReadProgressRegistry, Transport, fsm::store::StoreRegionMeta,
 };
-use slog::{info, o, Logger};
+use slog::{Logger, info, o};
 use tikv_util::{
     future::poll_future_notify,
     is_zero_duration,
@@ -81,8 +81,7 @@ impl<EK> StoreMeta<EK> {
             } else {
                 assert!(
                     self.region_ranges
-                        .get(&(data_end_key(prev.get_end_key()), version))
-                        .is_some(),
+                        .contains_key(&(data_end_key(prev.get_end_key()), version)),
                     "{} region corrupted",
                     SlogFormat(logger)
                 );
@@ -267,7 +266,6 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T> StoreFsmDelegate<'a, EK, ER, T> {
             StoreTick::CleanupImportSst,
             self.store_ctx.cfg.cleanup_import_sst_interval.0,
         );
-        self.register_compact_check_tick();
 
         self.schedule_tick(
             StoreTick::SnapGc,
@@ -297,7 +295,6 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T> StoreFsmDelegate<'a, EK, ER, T> {
         match tick {
             StoreTick::PdStoreHeartbeat => self.on_pd_store_heartbeat(),
             StoreTick::CleanupImportSst => self.on_cleanup_import_sst(),
-            StoreTick::CompactCheck => self.on_compact_check_tick(),
             StoreTick::SnapGc => self.on_snapshot_gc(),
             _ => slog_panic!(
                 self.store_ctx.logger,
diff --git a/components/raftstore-v2/src/lib.rs b/components/raftstore-v2/src/lib.rs
index 5b5e132b9ce..25718902a87 100644
--- a/components/raftstore-v2/src/lib.rs
+++ b/components/raftstore-v2/src/lib.rs
@@ -23,10 +23,8 @@
 
 #![feature(let_chains)]
 #![feature(array_windows)]
-#![feature(div_duration)]
 #![feature(box_into_inner)]
 #![feature(assert_matches)]
-#![feature(option_get_or_insert_default)]
 
 mod batch;
 mod bootstrap;
@@ -37,13 +35,12 @@ pub mod router;
 mod worker;
 
 pub(crate) use batch::StoreContext;
-pub use batch::{create_store_batch_system, StoreRouter, StoreSystem};
+pub use batch::{StoreRouter, StoreSystem, create_store_batch_system};
 pub use bootstrap::Bootstrap;
 pub use fsm::StoreMeta;
-pub use operation::{write_initial_states, SimpleWriteBinary, SimpleWriteEncoder, StateStorage};
-pub use raftstore::{store::Config, Error, Result};
+pub use operation::{SimpleWriteBinary, SimpleWriteEncoder, StateStorage, write_initial_states};
+pub use raftstore::{Error, Result, store::Config};
 pub use worker::{
-    cleanup::CompactTask,
     pd::{PdReporter, Task as PdTask},
     tablet::Task as TabletTask,
 };
diff --git a/components/raftstore-v2/src/operation/bucket.rs b/components/raftstore-v2/src/operation/bucket.rs
index db57b815576..7fc3de93ea4 100644
--- a/components/raftstore-v2/src/operation/bucket.rs
+++ b/components/raftstore-v2/src/operation/bucket.rs
@@ -12,7 +12,7 @@ use kvproto::{
 use pd_client::BucketMeta;
 use raftstore::{
     coprocessor::RegionChangeEvent,
-    store::{util, Bucket, BucketRange, ReadProgress, SplitCheckTask, Transport},
+    store::{Bucket, BucketRange, ReadProgress, SplitCheckTask, Transport, util},
 };
 use slog::{error, info};
 
@@ -185,7 +185,7 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
     }
 }
 
-impl<'a, EK, ER, T: Transport> PeerFsmDelegate<'a, EK, ER, T>
+impl<EK, ER, T: Transport> PeerFsmDelegate<'_, EK, ER, T>
 where
     EK: KvEngine,
     ER: RaftEngine,
diff --git a/components/raftstore-v2/src/operation/command/admin/compact_log.rs b/components/raftstore-v2/src/operation/command/admin/compact_log.rs
index 4eff2e132a9..64da88b347b 100644
--- a/components/raftstore-v2/src/operation/command/admin/compact_log.rs
+++ b/components/raftstore-v2/src/operation/command/admin/compact_log.rs
@@ -16,8 +16,8 @@
 use std::{
     path::PathBuf,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicU64, Ordering},
     },
 };
 
@@ -25,11 +25,11 @@ use engine_traits::{KvEngine, RaftEngine, RaftLogBatch};
 use kvproto::raft_cmdpb::{AdminCmdType, AdminRequest, AdminResponse, RaftCmdRequest};
 use protobuf::Message;
 use raftstore::{
+    Result,
     store::{
-        fsm::new_admin_request, metrics::REGION_MAX_LOG_LAG, needs_evict_entry_cache, Transport,
-        WriteTask, RAFT_INIT_LOG_INDEX,
+        RAFT_INIT_LOG_INDEX, Transport, WriteTask, fsm::new_admin_request,
+        metrics::REGION_MAX_LOG_LAG, needs_evict_entry_cache,
     },
-    Result,
 };
 use slog::{debug, error, info};
 use tikv_util::{box_err, log::SlogFormat};
@@ -105,7 +105,7 @@ impl CompactLogContext {
     }
 }
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> PeerFsmDelegate<'a, EK, ER, T> {
+impl<EK: KvEngine, ER: RaftEngine, T: Transport> PeerFsmDelegate<'_, EK, ER, T> {
     pub fn on_compact_log_tick(&mut self, force: bool) {
         // Might read raft logs.
         debug_assert!(self.fsm.peer().serving());
@@ -202,10 +202,10 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
         // leader may call `get_term()` on the latest replicated index, so compact
         // entries before `alive_cache_idx` instead of `alive_cache_idx + 1`.
         let mut cache_warmup_state = self.transfer_leader_state_mut().cache_warmup_state.take();
-        self.entry_storage_mut().compact_entry_cache(
-            std::cmp::min(alive_cache_idx, applied_idx + 1),
-            cache_warmup_state.as_mut(),
-        );
+        let compact_idx = std::cmp::min(alive_cache_idx, applied_idx + 1);
+        self.entry_storage_mut()
+            .compact_entry_cache(compact_idx, cache_warmup_state.as_mut());
+        self.entry_storage_mut().compact_term_cache(compact_idx);
         self.transfer_leader_state_mut().cache_warmup_state = cache_warmup_state;
 
         let mut compact_idx = if force && replicated_idx > first_idx {
@@ -507,6 +507,8 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
         let mut cache_warmup_state = self.transfer_leader_state_mut().cache_warmup_state.take();
         self.entry_storage_mut()
             .compact_entry_cache(res.compact_index, cache_warmup_state.as_mut());
+        self.entry_storage_mut()
+            .compact_term_cache(res.compact_index);
         self.transfer_leader_state_mut().cache_warmup_state = cache_warmup_state;
 
         self.storage_mut()
diff --git a/components/raftstore-v2/src/operation/command/admin/conf_change.rs b/components/raftstore-v2/src/operation/command/admin/conf_change.rs
index 5c7ff96a955..f80bb900c7b 100644
--- a/components/raftstore-v2/src/operation/command/admin/conf_change.rs
+++ b/components/raftstore-v2/src/operation/command/admin/conf_change.rs
@@ -19,13 +19,13 @@ use kvproto::{
 use protobuf::Message;
 use raft::prelude::*;
 use raftstore::{
+    Error, Result,
     coprocessor::{RegionChangeEvent, RegionChangeReason},
     store::{
+        ProposalContext,
         metrics::{PEER_ADMIN_CMD_COUNTER_VEC, PEER_PROPOSE_LOG_SIZE_HISTOGRAM},
         util::{self, ChangePeerI, ConfChangeKind},
-        ProposalContext,
     },
-    Error, Result,
 };
 use slog::{error, info, warn};
 use tikv_util::{box_err, slog_panic};
diff --git a/components/raftstore-v2/src/operation/command/admin/flashback.rs b/components/raftstore-v2/src/operation/command/admin/flashback.rs
index 7301736e380..a9fc47030e4 100644
--- a/components/raftstore-v2/src/operation/command/admin/flashback.rs
+++ b/components/raftstore-v2/src/operation/command/admin/flashback.rs
@@ -8,12 +8,12 @@ use kvproto::{
 };
 use protobuf::Message;
 use raftstore::{
+    Result,
     coprocessor::RegionChangeReason,
     store::{
-        metrics::{PEER_ADMIN_CMD_COUNTER, PEER_IN_FLASHBACK_STATE},
         LocksStatus,
+        metrics::{PEER_ADMIN_CMD_COUNTER, PEER_IN_FLASHBACK_STATE},
     },
-    Result,
 };
 
 use super::AdminCmdResult;
diff --git a/components/raftstore-v2/src/operation/command/admin/merge/commit.rs b/components/raftstore-v2/src/operation/command/admin/merge/commit.rs
index 166d3a98d86..a0b7d9fbd5b 100644
--- a/components/raftstore-v2/src/operation/command/admin/merge/commit.rs
+++ b/components/raftstore-v2/src/operation/command/admin/merge/commit.rs
@@ -64,15 +64,15 @@ use kvproto::{
     raft_serverpb::{MergedRecord, PeerState, RegionLocalState},
 };
 use protobuf::Message;
-use raft::{GetEntriesContext, Storage, INVALID_ID, NO_LIMIT};
+use raft::{GetEntriesContext, INVALID_ID, NO_LIMIT, Storage};
 use raftstore::{
+    Result,
     coprocessor::RegionChangeReason,
     store::{
-        fsm::new_admin_request, metrics::PEER_ADMIN_CMD_COUNTER, util, ProposalContext, Transport,
+        ProposalContext, Transport, fsm::new_admin_request, metrics::PEER_ADMIN_CMD_COUNTER, util,
     },
-    Result,
 };
-use slog::{debug, error, info, Logger};
+use slog::{Logger, debug, error, info};
 use tikv_util::{
     config::ReadableDuration,
     log::SlogFormat,
@@ -81,7 +81,7 @@ use tikv_util::{
     time::Instant,
 };
 
-use super::{merge_source_path, PrepareStatus};
+use super::{PrepareStatus, merge_source_path};
 use crate::{
     batch::StoreContext,
     fsm::ApplyResReporter,
diff --git a/components/raftstore-v2/src/operation/command/admin/merge/mod.rs b/components/raftstore-v2/src/operation/command/admin/merge/mod.rs
index 94adc1e1c3c..bc4d0d6dc81 100644
--- a/components/raftstore-v2/src/operation/command/admin/merge/mod.rs
+++ b/components/raftstore-v2/src/operation/command/admin/merge/mod.rs
@@ -13,9 +13,9 @@ use kvproto::{
     raft_serverpb::{MergeState, PeerState, RegionLocalState},
 };
 use prepare::PrepareStatus;
-use raft::{ProgressState, INVALID_INDEX};
+use raft::{INVALID_INDEX, ProgressState};
 use raftstore::Result;
-use slog::{info, warn, Logger};
+use slog::{Logger, info, warn};
 use tikv_util::box_err;
 
 use crate::raft::Peer;
diff --git a/components/raftstore-v2/src/operation/command/admin/merge/prepare.rs b/components/raftstore-v2/src/operation/command/admin/merge/prepare.rs
index 0aa44ea45db..b4dbdaf9ab7 100644
--- a/components/raftstore-v2/src/operation/command/admin/merge/prepare.rs
+++ b/components/raftstore-v2/src/operation/command/admin/merge/prepare.rs
@@ -30,7 +30,7 @@
 use std::{mem, time::Duration};
 
 use collections::HashMap;
-use engine_traits::{Checkpointer, KvEngine, RaftEngine, RaftLogBatch, CF_LOCK};
+use engine_traits::{CF_LOCK, Checkpointer, KvEngine, RaftEngine, RaftLogBatch};
 use futures::channel::oneshot;
 use kvproto::{
     metapb::RegionEpoch,
@@ -44,11 +44,11 @@ use kvproto::{
 };
 use parking_lot::RwLockUpgradableReadGuard;
 use protobuf::Message;
-use raft::{eraftpb::EntryType, GetEntriesContext, NO_LIMIT};
+use raft::{GetEntriesContext, NO_LIMIT, eraftpb::EntryType};
 use raftstore::{
-    coprocessor::RegionChangeReason,
-    store::{metrics::PEER_ADMIN_CMD_COUNTER, util, LocksStatus, ProposalContext, Transport},
     Error, Result,
+    coprocessor::RegionChangeReason,
+    store::{LocksStatus, ProposalContext, Transport, metrics::PEER_ADMIN_CMD_COUNTER, util},
 };
 use slog::{debug, error, info};
 use tikv_util::{
@@ -56,11 +56,11 @@ use tikv_util::{
 };
 use txn_types::WriteBatchFlags;
 
-use super::{merge_source_path, CatchUpLogs};
+use super::{CatchUpLogs, merge_source_path};
 use crate::{
     batch::StoreContext,
     fsm::ApplyResReporter,
-    operation::{command::parse_at, AdminCmdResult, SimpleWriteReqDecoder},
+    operation::{AdminCmdResult, SimpleWriteReqDecoder, command::parse_at},
     raft::{Apply, Peer},
     router::{CmdResChannel, PeerMsg, RaftRequest},
 };
diff --git a/components/raftstore-v2/src/operation/command/admin/merge/rollback.rs b/components/raftstore-v2/src/operation/command/admin/merge/rollback.rs
index adc49a928b3..e15a1511eb1 100644
--- a/components/raftstore-v2/src/operation/command/admin/merge/rollback.rs
+++ b/components/raftstore-v2/src/operation/command/admin/merge/rollback.rs
@@ -8,9 +8,9 @@ use kvproto::{
     raft_serverpb::{PeerState, RegionLocalState},
 };
 use raftstore::{
-    coprocessor::RegionChangeReason,
-    store::{fsm::new_admin_request, metrics::PEER_ADMIN_CMD_COUNTER, LocksStatus, Transport},
     Result,
+    coprocessor::RegionChangeReason,
+    store::{LocksStatus, Transport, fsm::new_admin_request, metrics::PEER_ADMIN_CMD_COUNTER},
 };
 use slog::{error, info};
 use tikv_util::slog_panic;
diff --git a/components/raftstore-v2/src/operation/command/admin/mod.rs b/components/raftstore-v2/src/operation/command/admin/mod.rs
index db836086172..1c54d428e8a 100644
--- a/components/raftstore-v2/src/operation/command/admin/mod.rs
+++ b/components/raftstore-v2/src/operation/command/admin/mod.rs
@@ -17,28 +17,28 @@ use kvproto::{
     raft_cmdpb::{AdminCmdType, RaftCmdRequest},
     raft_serverpb::{ExtraMessageType, FlushMemtable, RaftMessage},
 };
-use merge::{
-    commit::CommitMergeResult, prepare::PrepareMergeResult, rollback::RollbackMergeResult,
-};
 pub use merge::{
+    MERGE_SOURCE_PREFIX, MergeContext,
     commit::{CatchUpLogs, MERGE_IN_PROGRESS_PREFIX},
-    merge_source_path, MergeContext, MERGE_SOURCE_PREFIX,
+    merge_source_path,
+};
+use merge::{
+    commit::CommitMergeResult, prepare::PrepareMergeResult, rollback::RollbackMergeResult,
 };
 use protobuf::Message;
 use raftstore::{
+    Error,
     store::{
-        cmd_resp,
+        ProposalContext, Transport, cmd_resp,
         fsm::{apply, apply::validate_batch_split},
         msg::ErrorCallback,
-        ProposalContext, Transport,
     },
-    Error,
 };
 use slog::{debug, error, info};
 use split::SplitResult;
 pub use split::{
-    report_split_init_finish, temp_split_path, RequestHalfSplit, RequestSplit, SplitFlowControl,
-    SplitInit, SplitPendingAppend, SPLIT_PREFIX,
+    RequestHalfSplit, RequestSplit, SPLIT_PREFIX, SplitFlowControl, SplitInit, SplitPendingAppend,
+    report_split_init_finish, temp_split_path,
 };
 use tikv_util::{box_err, log::SlogFormat, slog_panic, sys::disk::DiskUsage};
 use txn_types::WriteBatchFlags;
diff --git a/components/raftstore-v2/src/operation/command/admin/split.rs b/components/raftstore-v2/src/operation/command/admin/split.rs
index 1f7ba9b9075..9969c1c0cd9 100644
--- a/components/raftstore-v2/src/operation/command/admin/split.rs
+++ b/components/raftstore-v2/src/operation/command/admin/split.rs
@@ -42,30 +42,30 @@ use kvproto::{
     raft_serverpb::{RaftMessage, RaftSnapshotData},
 };
 use protobuf::Message;
-use raft::{prelude::Snapshot, INVALID_ID};
+use raft::{INVALID_ID, prelude::Snapshot};
 use raftstore::{
+    Result,
     coprocessor::RegionChangeReason,
     store::{
+        PeerPessimisticLocks, RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM, SplitCheckTask, Transport,
         cmd_resp,
-        fsm::{apply::validate_batch_split, ApplyMetrics},
+        fsm::{ApplyMetrics, apply::validate_batch_split},
         metrics::PEER_ADMIN_CMD_COUNTER,
         snap::TABLET_SNAPSHOT_VERSION,
         util::{self, KeysInfoFormatter},
-        PeerPessimisticLocks, SplitCheckTask, Transport, RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM,
     },
-    Result,
 };
 use slog::{error, info, warn};
 use tikv_util::{box_err, log::SlogFormat, slog_panic, time::Instant};
 
 use crate::{
+    Error,
     batch::StoreContext,
     fsm::{ApplyResReporter, PeerFsmDelegate},
     operation::{AdminCmdResult, SharedReadTablet},
     raft::{Apply, Peer},
     router::{CmdResChannel, PeerMsg, PeerTick, StoreMsg},
     worker::tablet,
-    Error,
 };
 
 pub const SPLIT_PREFIX: &str = "split";
@@ -1005,8 +1005,8 @@ mod test {
         kv::{KvTestEngine, TestTabletFactory},
     };
     use engine_traits::{
-        FlushState, Peekable, SstApplyState, TabletContext, TabletRegistry, WriteBatch, CF_DEFAULT,
-        DATA_CFS,
+        CF_DEFAULT, DATA_CFS, FlushState, Peekable, SstApplyState, TabletContext, TabletRegistry,
+        WriteBatch,
     };
     use futures::executor::block_on;
     use kvproto::{
@@ -1016,7 +1016,7 @@ mod test {
     };
     use raftstore::{
         coprocessor::CoprocessorHost,
-        store::{cmd_resp::new_error, Config},
+        store::{Config, cmd_resp::new_error},
     };
     use slog::o;
     use tempfile::TempDir;
@@ -1028,7 +1028,7 @@ mod test {
 
     use super::*;
     use crate::{
-        operation::test_util::{create_tmp_importer, MockReporter},
+        operation::test_util::{MockReporter, create_tmp_importer},
         raft::Apply,
     };
 
diff --git a/components/raftstore-v2/src/operation/command/admin/transfer_leader.rs b/components/raftstore-v2/src/operation/command/admin/transfer_leader.rs
index c56128150ec..fa603f1761a 100644
--- a/components/raftstore-v2/src/operation/command/admin/transfer_leader.rs
+++ b/components/raftstore-v2/src/operation/command/admin/transfer_leader.rs
@@ -10,13 +10,13 @@ use kvproto::{
         AdminCmdType, AdminRequest, AdminResponse, RaftCmdRequest, TransferLeaderRequest,
     },
 };
-use raft::{eraftpb, ProgressState, Storage};
+use raft::{ProgressState, Storage, eraftpb};
 use raftstore::{
+    Result,
     store::{
-        entry_storage::CacheWarmupState, fsm::new_admin_request, make_transfer_leader_response,
-        metrics::PEER_ADMIN_CMD_COUNTER, Config, TransferLeaderContext, Transport,
+        Config, TransferLeaderContext, Transport, entry_storage::CacheWarmupState,
+        fsm::new_admin_request, make_transfer_leader_response, metrics::PEER_ADMIN_CMD_COUNTER,
     },
-    Result,
 };
 use rand::prelude::SliceRandom;
 use slog::info;
diff --git a/components/raftstore-v2/src/operation/command/control.rs b/components/raftstore-v2/src/operation/command/control.rs
index f05c9ca5297..f6c61ae6df3 100644
--- a/components/raftstore-v2/src/operation/command/control.rs
+++ b/components/raftstore-v2/src/operation/command/control.rs
@@ -4,16 +4,16 @@ use std::{collections::LinkedList, mem};
 
 use kvproto::{metapb, raft_cmdpb::AdminCmdType};
 use raftstore::{
+    Error,
     store::{
         cmd_resp,
         fsm::apply,
         msg::ErrorCallback,
         util::{
-            admin_cmd_epoch_lookup, AdminCmdEpochState, NORMAL_REQ_CHECK_CONF_VER,
-            NORMAL_REQ_CHECK_VER,
+            AdminCmdEpochState, NORMAL_REQ_CHECK_CONF_VER, NORMAL_REQ_CHECK_VER,
+            admin_cmd_epoch_lookup,
         },
     },
-    Error,
 };
 
 use crate::router::CmdResChannel;
diff --git a/components/raftstore-v2/src/operation/command/mod.rs b/components/raftstore-v2/src/operation/command/mod.rs
index 8c372fdb278..2d8b55ae952 100644
--- a/components/raftstore-v2/src/operation/command/mod.rs
+++ b/components/raftstore-v2/src/operation/command/mod.rs
@@ -18,7 +18,7 @@
 
 use std::{
     mem,
-    sync::{atomic::Ordering, Arc},
+    sync::{Arc, atomic::Ordering},
     time::Duration,
 };
 
@@ -30,12 +30,13 @@ use kvproto::raft_cmdpb::{
 use raft::eraftpb::{ConfChange, ConfChangeV2, Entry, EntryType};
 use raft_proto::ConfChangeI;
 use raftstore::{
+    Error, Result,
     coprocessor::ObserveLevel,
     store::{
-        cmd_resp,
+        Config, ProposalContext, Transport, WriteCallback, cmd_resp,
         fsm::{
-            apply::{self, APPLY_WB_SHRINK_SIZE, SHRINK_PENDING_CMD_QUEUE_CAP},
             Proposal,
+            apply::{self, APPLY_WB_SHRINK_SIZE, SHRINK_PENDING_CMD_QUEUE_CAP},
         },
         local_metrics::RaftMetrics,
         metrics::{
@@ -43,16 +44,14 @@ use raftstore::{
         },
         msg::ErrorCallback,
         util::{self, check_flashback_state},
-        Config, ProposalContext, Transport, WriteCallback,
     },
-    Error, Result,
 };
 use slog::{debug, error, warn};
 use tikv_util::{
     box_err,
     log::SlogFormat,
     slog_panic,
-    time::{duration_to_sec, monotonic_raw_now, Instant},
+    time::{Instant, duration_to_sec, monotonic_raw_now},
 };
 
 use crate::{
@@ -67,9 +66,9 @@ mod control;
 mod write;
 
 pub use admin::{
-    merge_source_path, report_split_init_finish, temp_split_path, AdminCmdResult, CatchUpLogs,
-    CompactLogContext, MergeContext, RequestHalfSplit, RequestSplit, SplitFlowControl, SplitInit,
-    SplitPendingAppend, MERGE_IN_PROGRESS_PREFIX, MERGE_SOURCE_PREFIX, SPLIT_PREFIX,
+    AdminCmdResult, CatchUpLogs, CompactLogContext, MERGE_IN_PROGRESS_PREFIX, MERGE_SOURCE_PREFIX,
+    MergeContext, RequestHalfSplit, RequestSplit, SPLIT_PREFIX, SplitFlowControl, SplitInit,
+    SplitPendingAppend, merge_source_path, report_split_init_finish, temp_split_path,
 };
 pub use control::ProposalControl;
 use pd_client::{BucketMeta, BucketStat};
@@ -659,7 +658,7 @@ impl<EK: KvEngine, R: ApplyResReporter> Apply<EK, R> {
                 Ok(decoder) => {
                     fail::fail_point!(
                         "on_apply_write_cmd",
-                        cfg!(release) || self.peer_id() == 3,
+                        !cfg!(debug_assertions) || self.peer_id() == 3,
                         |_| {
                             unimplemented!();
                         }
diff --git a/components/raftstore-v2/src/operation/command/write/ingest.rs b/components/raftstore-v2/src/operation/command/write/ingest.rs
index 48f15b3615d..4a227ed21d2 100644
--- a/components/raftstore-v2/src/operation/command/write/ingest.rs
+++ b/components/raftstore-v2/src/operation/command/write/ingest.rs
@@ -2,12 +2,12 @@
 
 use collections::HashMap;
 use crossbeam::channel::TrySendError;
-use engine_traits::{data_cf_offset, KvEngine, RaftEngine, DATA_CFS_LEN};
+use engine_traits::{DATA_CFS_LEN, KvEngine, RaftEngine, data_cf_offset};
 use kvproto::import_sstpb::SstMeta;
 use pd_client::metrics::STORE_SIZE_EVENT_INT_VEC;
 use raftstore::{
-    store::{check_sst_for_ingestion, metrics::PEER_WRITE_CMD_COUNTER, util},
     Result,
+    store::{check_sst_for_ingestion, metrics::PEER_WRITE_CMD_COUNTER, util},
 };
 use slog::{error, info, warn};
 use sst_importer::range_overlaps;
@@ -21,7 +21,7 @@ use crate::{
     worker::tablet,
 };
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T> StoreFsmDelegate<'a, EK, ER, T> {
+impl<EK: KvEngine, ER: RaftEngine, T> StoreFsmDelegate<'_, EK, ER, T> {
     #[inline]
     pub fn on_cleanup_import_sst(&mut self) {
         if let Err(e) = self.fsm.store.on_cleanup_import_sst(self.store_ctx) {
diff --git a/components/raftstore-v2/src/operation/command/write/mod.rs b/components/raftstore-v2/src/operation/command/write/mod.rs
index 5806614e192..88e37f0f921 100644
--- a/components/raftstore-v2/src/operation/command/write/mod.rs
+++ b/components/raftstore-v2/src/operation/command/write/mod.rs
@@ -1,32 +1,31 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
 use engine_traits::{
-    data_cf_offset, name_to_cf, KvEngine, Mutable, RaftEngine, ALL_CFS, CF_DEFAULT,
+    ALL_CFS, CF_DEFAULT, KvEngine, Mutable, RaftEngine, data_cf_offset, name_to_cf,
 };
 use fail::fail_point;
 use futures::channel::oneshot;
 use kvproto::raft_cmdpb::RaftRequestHeader;
 use raftstore::{
+    Error, Result,
     store::{
-        cmd_resp,
-        fsm::{apply, MAX_PROPOSAL_SIZE_RATIO},
+        RaftCmdExtraOpts, cmd_resp,
+        fsm::{MAX_PROPOSAL_SIZE_RATIO, apply},
         metrics::PEER_WRITE_CMD_COUNTER,
         msg::ErrorCallback,
         util::{self},
-        RaftCmdExtraOpts,
     },
-    Error, Result,
 };
 use slog::{error, info};
 use tikv_util::{box_err, slog_panic, time::Instant};
 
 use crate::{
+    TabletTask,
     batch::StoreContext,
     fsm::ApplyResReporter,
     operation::SimpleWriteReqEncoder,
     raft::{Apply, Peer},
     router::{ApplyTask, CmdResChannel},
-    TabletTask,
 };
 
 mod ingest;
@@ -254,7 +253,7 @@ impl<EK: KvEngine, R: ApplyResReporter> Apply<EK, R> {
             cf = CF_DEFAULT;
         }
 
-        if !ALL_CFS.iter().any(|x| *x == cf) {
+        if !ALL_CFS.contains(&cf) {
             return Err(box_err!("invalid delete range command, cf: {:?}", cf));
         }
 
@@ -316,7 +315,7 @@ mod test {
         kv::{KvTestEngine, TestTabletFactory},
     };
     use engine_traits::{
-        FlushState, Peekable, SstApplyState, TabletContext, TabletRegistry, CF_DEFAULT, DATA_CFS,
+        CF_DEFAULT, DATA_CFS, FlushState, Peekable, SstApplyState, TabletContext, TabletRegistry,
     };
     use futures::executor::block_on;
     use kvproto::{
@@ -331,14 +330,14 @@ mod test {
     use tempfile::TempDir;
     use tikv_util::{
         store::new_peer,
-        worker::{dummy_scheduler, Worker},
+        worker::{Worker, dummy_scheduler},
         yatp_pool::{DefaultTicker, YatpPoolBuilder},
     };
 
     use crate::{
         operation::{
-            test_util::{create_tmp_importer, new_delete_range_entry, new_put_entry, MockReporter},
             CommittedEntries,
+            test_util::{MockReporter, create_tmp_importer, new_delete_range_entry, new_put_entry},
         },
         raft::Apply,
         worker::tablet,
diff --git a/components/raftstore-v2/src/operation/life.rs b/components/raftstore-v2/src/operation/life.rs
index 6dd0589b27c..38347375311 100644
--- a/components/raftstore-v2/src/operation/life.rs
+++ b/components/raftstore-v2/src/operation/life.rs
@@ -40,23 +40,23 @@ use kvproto::{
 };
 use raft::eraftpb::MessageType;
 use raftstore::{
+    Error, Result,
     store::{
+        DiskFullPeers, Transport, WriteTask,
         fsm::{
-            apply,
+            Proposal, apply,
             life::{build_peer_destroyed_report, forward_destroy_to_source_peer},
-            Proposal,
         },
         local_metrics::IoType as InspectIoType,
         metrics::RAFT_PEER_PENDING_DURATION,
-        util, DiskFullPeers, Transport, WriteTask,
+        util,
     },
-    Error, Result,
 };
 use slog::{debug, error, info, warn};
 use tikv_util::{
     store::find_peer,
     sys::disk::DiskUsage,
-    time::{duration_to_sec, Instant},
+    time::{Instant, duration_to_sec},
 };
 
 use super::command::SplitInit;
@@ -251,7 +251,7 @@ fn check_if_to_peer_destroyed<ER: RaftEngine>(
         .get_removed_records()
         .iter()
         .find(|p| p.get_store_id() == store_id)
-        .map_or(false, |p| to_peer.id <= p.get_id())
+        .is_some_and(|p| to_peer.id <= p.get_id())
     {
         return Ok(true);
     }
diff --git a/components/raftstore-v2/src/operation/misc.rs b/components/raftstore-v2/src/operation/misc.rs
index 535f49592ef..20084001e70 100644
--- a/components/raftstore-v2/src/operation/misc.rs
+++ b/components/raftstore-v2/src/operation/misc.rs
@@ -1,119 +1,19 @@
 // Copyright 2023 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::collections::{
-    Bound::{Excluded, Unbounded},
-    HashSet,
-};
-
 use collections::HashMap;
 use crossbeam::channel::TrySendError;
-use engine_traits::{KvEngine, RaftEngine, CF_DEFAULT, CF_WRITE};
-use raftstore::{
-    store::{CompactThreshold, TabletSnapKey},
-    Result,
-};
-use slog::{debug, error, info, warn};
+use engine_traits::{KvEngine, RaftEngine};
+use raftstore::{Result, store::TabletSnapKey};
+use slog::warn;
 
 use crate::{
     batch::StoreContext,
     fsm::{Store, StoreFsmDelegate},
     router::{PeerMsg, StoreTick},
-    worker::{
-        cleanup::{self},
-        tablet,
-    },
-    CompactTask::CheckAndCompact,
+    worker::tablet,
 };
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T> StoreFsmDelegate<'a, EK, ER, T> {
-    pub fn register_compact_check_tick(&mut self) {
-        self.schedule_tick(
-            StoreTick::CompactCheck,
-            self.store_ctx.cfg.region_compact_check_interval.0,
-        )
-    }
-
-    pub fn on_compact_check_tick(&mut self) {
-        self.register_compact_check_tick();
-        if self.store_ctx.schedulers.cleanup.is_busy() {
-            info!(
-                self.store_ctx.logger,
-                "compact worker is busy, check space redundancy next time";
-            );
-            return;
-        }
-
-        // Use HashSet here as the region end_keys in store_meta is not unique.
-        let mut regions_to_check: HashSet<u64> = HashSet::default();
-
-        let (largest_end_key, last_check_key) = {
-            // Start from last checked key.
-            let mut last_check_key = self.fsm.store.last_compact_checked_key();
-
-            let meta = self.store_ctx.store_meta.lock().unwrap();
-            if meta.region_ranges.is_empty() {
-                debug!(
-                    self.store_ctx.logger,
-                    "there is no range need to check";
-                );
-                return;
-            }
-            // Collect continuous ranges.
-            let ranges = meta.region_ranges.range((
-                Excluded((last_check_key.clone(), u64::MAX)),
-                Unbounded::<(Vec<u8>, u64)>,
-            ));
-
-            for region_range in ranges {
-                last_check_key = &region_range.0.0;
-                regions_to_check.insert(*region_range.1);
-
-                if regions_to_check.len() >= self.store_ctx.cfg.region_compact_check_step() as usize
-                {
-                    break;
-                }
-            }
-
-            (
-                meta.region_ranges.keys().last().unwrap().0.to_vec(),
-                last_check_key.clone(),
-            )
-        };
-
-        if largest_end_key == last_check_key {
-            // Next task will start from the very beginning.
-            self.fsm
-                .store
-                .set_last_compact_checked_key(keys::DATA_MIN_KEY.to_vec());
-        } else {
-            self.fsm.store.set_last_compact_checked_key(last_check_key);
-        }
-
-        // Schedule the task.
-        let cf_names = vec![CF_DEFAULT.to_owned(), CF_WRITE.to_owned()];
-        if let Err(e) = self
-            .store_ctx
-            .schedulers
-            .cleanup
-            .schedule(cleanup::Task::Compact(CheckAndCompact {
-                cf_names,
-                region_ids: regions_to_check.into_iter().collect::<Vec<_>>(),
-                compact_threshold: CompactThreshold::new(
-                    self.store_ctx.cfg.region_compact_min_tombstones,
-                    self.store_ctx.cfg.region_compact_tombstones_percent,
-                    self.store_ctx.cfg.region_compact_min_redundant_rows,
-                    self.store_ctx.cfg.region_compact_redundant_rows_percent(),
-                ),
-            }))
-        {
-            error!(
-                self.store_ctx.logger,
-                "schedule space check task failed";
-                "err" => ?e,
-            );
-        }
-    }
-
+impl<EK: KvEngine, ER: RaftEngine, T> StoreFsmDelegate<'_, EK, ER, T> {
     #[inline]
     pub fn on_snapshot_gc(&mut self) {
         if let Err(e) = self.fsm.store.on_snapshot_gc(self.store_ctx) {
diff --git a/components/raftstore-v2/src/operation/mod.rs b/components/raftstore-v2/src/operation/mod.rs
index df82f1abfe9..77ff21453b7 100644
--- a/components/raftstore-v2/src/operation/mod.rs
+++ b/components/raftstore-v2/src/operation/mod.rs
@@ -12,17 +12,16 @@ mod txn_ext;
 mod unsafe_recovery;
 
 pub use command::{
-    merge_source_path, AdminCmdResult, ApplyFlowControl, CatchUpLogs, CommittedEntries,
-    CompactLogContext, MergeContext, ProposalControl, RequestHalfSplit, RequestSplit,
-    SimpleWriteBinary, SimpleWriteEncoder, SimpleWriteReqDecoder, SimpleWriteReqEncoder,
-    SplitFlowControl, SplitPendingAppend, MERGE_IN_PROGRESS_PREFIX, MERGE_SOURCE_PREFIX,
-    SPLIT_PREFIX,
+    AdminCmdResult, ApplyFlowControl, CatchUpLogs, CommittedEntries, CompactLogContext,
+    MERGE_IN_PROGRESS_PREFIX, MERGE_SOURCE_PREFIX, MergeContext, ProposalControl, RequestHalfSplit,
+    RequestSplit, SPLIT_PREFIX, SimpleWriteBinary, SimpleWriteEncoder, SimpleWriteReqDecoder,
+    SimpleWriteReqEncoder, SplitFlowControl, SplitPendingAppend, merge_source_path,
 };
 pub use disk_snapshot_backup::UnimplementedHandle as DiskSnapBackupHandle;
 pub use life::{AbnormalPeerContext, DestroyProgress, GcPeerContext};
 pub use ready::{
-    write_initial_states, ApplyTrace, AsyncWriter, DataTrace, GenSnapTask, ReplayWatch, SnapState,
-    StateStorage,
+    ApplyTrace, AsyncWriter, DataTrace, GenSnapTask, ReplayWatch, SnapState, StateStorage,
+    write_initial_states,
 };
 
 pub(crate) use self::{
@@ -34,11 +33,11 @@ pub(crate) use self::{
 #[cfg(test)]
 pub mod test_util {
     use std::sync::{
-        mpsc::{channel, Receiver, Sender},
         Arc,
+        mpsc::{Receiver, Sender, channel},
     };
 
-    use engine_traits::{CfName, KvEngine, CF_DEFAULT};
+    use engine_traits::{CF_DEFAULT, CfName, KvEngine};
     use kvproto::{kvrpcpb::ApiVersion, metapb::RegionEpoch, raft_cmdpb::RaftRequestHeader};
     use raft::prelude::{Entry, EntryType};
     use raftstore::store::simple_write::SimpleWriteEncoder;
diff --git a/components/raftstore-v2/src/operation/pd.rs b/components/raftstore-v2/src/operation/pd.rs
index 8e392755c5e..2b69ceadb3e 100644
--- a/components/raftstore-v2/src/operation/pd.rs
+++ b/components/raftstore-v2/src/operation/pd.rs
@@ -7,7 +7,7 @@ use std::sync::atomic::Ordering;
 use engine_traits::{KvEngine, RaftEngine};
 use fail::fail_point;
 use kvproto::{metapb, pdpb};
-use raftstore::store::{metrics::STORE_SNAPSHOT_TRAFFIC_GAUGE_VEC, Transport};
+use raftstore::store::{Transport, metrics::STORE_SNAPSHOT_TRAFFIC_GAUGE_VEC};
 use slog::{debug, error};
 use tikv_util::{slog_panic, time::Instant};
 
@@ -19,7 +19,7 @@ use crate::{
     worker::pd,
 };
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T> StoreFsmDelegate<'a, EK, ER, T> {
+impl<EK: KvEngine, ER: RaftEngine, T> StoreFsmDelegate<'_, EK, ER, T> {
     #[inline]
     pub fn on_pd_store_heartbeat(&mut self) {
         self.fsm.store.store_heartbeat_pd(self.store_ctx, None);
@@ -85,7 +85,7 @@ impl Store {
     }
 }
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> PeerFsmDelegate<'a, EK, ER, T> {
+impl<EK: KvEngine, ER: RaftEngine, T: Transport> PeerFsmDelegate<'_, EK, ER, T> {
     #[inline]
     pub fn on_pd_heartbeat(&mut self) {
         self.fsm.peer_mut().update_peer_statistics();
diff --git a/components/raftstore-v2/src/operation/query/capture.rs b/components/raftstore-v2/src/operation/query/capture.rs
index 4b6a8c24fc3..414c8fb044f 100644
--- a/components/raftstore-v2/src/operation/query/capture.rs
+++ b/components/raftstore-v2/src/operation/query/capture.rs
@@ -8,14 +8,14 @@ use kvproto::raft_cmdpb::{RaftCmdRequest, RaftCmdResponse};
 use raftstore::{
     coprocessor::{Cmd, CmdBatch, ObserveHandle, ObserveLevel},
     store::{
-        cmd_resp,
+        RegionSnapshot, cmd_resp,
         fsm::{
-            apply::{notify_stale_req_with_msg, ObserverType, SHRINK_PENDING_CMD_QUEUE_CAP},
-            new_read_index_request, ChangeObserver,
+            ChangeObserver,
+            apply::{ObserverType, SHRINK_PENDING_CMD_QUEUE_CAP, notify_stale_req_with_msg},
+            new_read_index_request,
         },
         msg::ErrorCallback,
         util::compare_region_epoch,
-        RegionSnapshot,
     },
 };
 use slog::info;
@@ -24,12 +24,10 @@ use txn_types::WriteBatchFlags;
 use crate::{
     fsm::{ApplyResReporter, PeerFsmDelegate},
     raft::Apply,
-    router::{message::CaptureChange, ApplyTask, QueryResChannel, QueryResult},
+    router::{ApplyTask, QueryResChannel, QueryResult, message::CaptureChange},
 };
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T: raftstore::store::Transport>
-    PeerFsmDelegate<'a, EK, ER, T>
-{
+impl<EK: KvEngine, ER: RaftEngine, T: raftstore::store::Transport> PeerFsmDelegate<'_, EK, ER, T> {
     pub fn on_leader_callback(&mut self, ch: QueryResChannel) {
         let peer = self.fsm.peer();
         let mut msg = new_read_index_request(
@@ -185,8 +183,8 @@ impl<EK: KvEngine, R: ApplyResReporter> Apply<EK, R> {
 #[cfg(test)]
 mod test {
     use std::sync::{
-        mpsc::{channel, Receiver, Sender},
         Arc, Mutex,
+        mpsc::{Receiver, Sender, channel},
     };
 
     use engine_test::{
@@ -194,7 +192,7 @@ mod test {
         kv::{KvTestEngine, TestTabletFactory},
     };
     use engine_traits::{
-        FlushState, Peekable, SstApplyState, TabletContext, TabletRegistry, CF_DEFAULT, DATA_CFS,
+        CF_DEFAULT, DATA_CFS, FlushState, Peekable, SstApplyState, TabletContext, TabletRegistry,
     };
     use futures::executor::block_on;
     use kvproto::{
@@ -217,8 +215,8 @@ mod test {
     use super::*;
     use crate::{
         operation::{
-            test_util::{create_tmp_importer, new_put_entry, MockReporter},
             CommittedEntries,
+            test_util::{MockReporter, create_tmp_importer, new_put_entry},
         },
         raft::Apply,
         router::build_any_channel,
diff --git a/components/raftstore-v2/src/operation/query/lease.rs b/components/raftstore-v2/src/operation/query/lease.rs
index 27b69d2cabe..6bdd55d3ad9 100644
--- a/components/raftstore-v2/src/operation/query/lease.rs
+++ b/components/raftstore-v2/src/operation/query/lease.rs
@@ -5,21 +5,20 @@ use std::sync::Mutex;
 use engine_traits::{KvEngine, RaftEngine};
 use kvproto::raft_cmdpb::{RaftCmdRequest, RaftRequestHeader};
 use raft::{
-    eraftpb::{self, MessageType},
     Storage,
+    eraftpb::{self, MessageType},
 };
 use raftstore::{
+    Error, Result,
     store::{
-        can_amend_read, cmd_resp,
+        ReadDelegate, ReadIndexRequest, ReadProgress, Transport, can_amend_read, cmd_resp,
         fsm::{apply::notify_stale_req, new_read_index_request},
         metrics::RAFT_READ_INDEX_PENDING_COUNT,
         msg::{ErrorCallback, ReadCallback},
         propose_read_index, should_renew_lease,
         simple_write::SimpleWriteEncoder,
-        util::{check_req_region_epoch, LeaseState},
-        ReadDelegate, ReadIndexRequest, ReadProgress, Transport,
+        util::{LeaseState, check_req_region_epoch},
     },
-    Error, Result,
 };
 use slog::debug;
 use tikv_util::time::monotonic_raw_now;
@@ -76,7 +75,7 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
 
     pub fn pre_read_index(&self) -> Result<()> {
         fail::fail_point!("before_propose_readindex", |s| if s
-            .map_or(true, |s| s.parse().unwrap_or(true))
+            .is_none_or(|s| s.parse().unwrap_or(true))
         {
             Ok(())
         } else {
@@ -344,23 +343,23 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
             None => return false,
         };
         let max_lease = ctx.cfg.raft_store_max_leader_lease();
-        let has_overlapped_reads = self.pending_reads().back().map_or(false, |read| {
+        let has_overlapped_reads = self.pending_reads().back().is_some_and(|read| {
             // If there is any read index whose lease can cover till next heartbeat
             // then we don't need to propose a new one
             read.propose_time + max_lease > renew_bound
         });
-        let has_overlapped_writes = self.proposals().back().map_or(false, |proposal| {
+        let has_overlapped_writes = self.proposals().back().is_some_and(|proposal| {
             // If there is any write whose lease can cover till next heartbeat
             // then we don't need to propose a new one
             proposal
                 .propose_time
-                .map_or(false, |propose_time| propose_time + max_lease > renew_bound)
+                .is_some_and(|propose_time| propose_time + max_lease > renew_bound)
         });
         !has_overlapped_reads && !has_overlapped_writes
     }
 }
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> PeerFsmDelegate<'a, EK, ER, T> {
+impl<EK: KvEngine, ER: RaftEngine, T: Transport> PeerFsmDelegate<'_, EK, ER, T> {
     fn register_check_leader_lease_tick(&mut self) {
         self.schedule_tick(PeerTick::CheckLeaderLease)
     }
diff --git a/components/raftstore-v2/src/operation/query/local.rs b/components/raftstore-v2/src/operation/query/local.rs
index 860d43ce514..63035ea7411 100644
--- a/components/raftstore-v2/src/operation/query/local.rs
+++ b/components/raftstore-v2/src/operation/query/local.rs
@@ -4,7 +4,7 @@
 use std::{
     num::NonZeroU64,
     ops::Deref,
-    sync::{atomic, Arc, Mutex},
+    sync::{Arc, Mutex, atomic},
 };
 
 use batch_system::Router;
@@ -16,25 +16,24 @@ use kvproto::{
     raft_cmdpb::{CmdType, RaftCmdRequest, RaftCmdResponse},
 };
 use raftstore::{
+    Result,
     errors::RAFTSTORE_IS_BUSY,
     store::{
-        cmd_resp,
+        LocalReaderCore, ReadDelegate, ReadExecutorProvider, RegionSnapshot, cmd_resp,
         util::LeaseState,
         worker_metrics::{self, TLS_LOCAL_READ_METRICS},
-        LocalReaderCore, ReadDelegate, ReadExecutorProvider, RegionSnapshot,
     },
-    Result,
 };
-use slog::{debug, Logger};
-use tikv_util::{box_err, codec::number::decode_u64, time::monotonic_raw_now, Either};
+use slog::{Logger, debug};
+use tikv_util::{Either, box_err, codec::number::decode_u64, time::monotonic_raw_now};
 use time::Timespec;
-use tracker::{get_tls_tracker_token, GLOBAL_TRACKERS};
+use tracker::{GLOBAL_TRACKERS, get_tls_tracker_token};
 use txn_types::WriteBatchFlags;
 
 use crate::{
+    StoreRouter,
     fsm::StoreMeta,
     router::{PeerMsg, QueryResult},
-    StoreRouter,
 };
 
 pub trait MsgRouter: Clone + Send + 'static {
@@ -57,15 +56,15 @@ pub type ReadDelegatePair<EK> = (ReadDelegate, SharedReadTablet<EK>);
 ///
 /// Though it looks like `CachedTablet`, but there are subtle differences.
 /// 1. `CachedTablet` always hold the latest version of the tablet. But
-/// `SharedReadTablet` should only hold the tablet that matches epoch. So it
-/// will be updated only when the epoch is updated.
+///    `SharedReadTablet` should only hold the tablet that matches epoch. So it
+///    will be updated only when the epoch is updated.
 /// 2. `SharedReadTablet` should always hold a tablet and the same tablet. If
-/// tablet is taken, then it should be considered as stale and should check
-/// again epoch to load the new `SharedReadTablet`.
+///    tablet is taken, then it should be considered as stale and should check
+///    again epoch to load the new `SharedReadTablet`.
 /// 3. `SharedReadTablet` may be cloned into thread local. So its cache should
-/// be released as soon as possible, so there should be no strong reference
-/// that prevents tablet from being dropped after it's marked as stale by other
-/// threads.
+///    be released as soon as possible, so there should be no strong reference
+///    that prevents tablet from being dropped after it's marked as stale by
+///    other threads.
 pub struct SharedReadTablet<EK> {
     tablet: Arc<Mutex<Option<EK>>>,
     cache: Option<EK>,
@@ -366,7 +365,7 @@ where
                                     || res
                                         .get_responses()
                                         .first()
-                                        .map_or(false, |r| r.get_read_index().has_locked()),
+                                        .is_some_and(|r| r.get_read_index().has_locked()),
                                 "{:?}",
                                 res
                             );
@@ -582,7 +581,7 @@ struct SnapRequestInspector<'r> {
     logger: &'r Logger,
 }
 
-impl<'r> SnapRequestInspector<'r> {
+impl SnapRequestInspector<'_> {
     fn inspect(&mut self, req: &RaftCmdRequest) -> Result<ReadRequestPolicy> {
         assert!(!req.has_admin_request());
         if req.get_requests().len() != 1
@@ -667,13 +666,13 @@ mod tests {
         ctor::{CfOptions, DbOptions},
         kv::{KvTestEngine, TestTabletFactory},
     };
-    use engine_traits::{MiscExt, SyncMutable, TabletContext, TabletRegistry, DATA_CFS};
+    use engine_traits::{DATA_CFS, MiscExt, SyncMutable, TabletContext, TabletRegistry};
     use futures::executor::block_on;
     use kvproto::{kvrpcpb::ExtraOp as TxnExtraOp, metapb, raft_cmdpb::*};
     use pd_client::BucketMeta;
     use raftstore::store::{
-        util::Lease, worker_metrics::TLS_LOCAL_READ_METRICS, ReadCallback, ReadProgress,
-        RegionReadProgress, TrackVer, TxnExt,
+        ReadCallback, ReadProgress, RegionReadProgress, TrackVer, TxnExt, util::Lease,
+        worker_metrics::TLS_LOCAL_READ_METRICS,
     };
     use slog::o;
     use tempfile::Builder;
@@ -851,7 +850,7 @@ mod tests {
             TLS_LOCAL_READ_METRICS.with(|m| m.borrow().reject_reason.cache_miss.get()),
             1
         );
-        assert!(reader.local_reader.delegates.get(&1).is_none());
+        assert!(!reader.local_reader.delegates.contains_key(&1));
 
         // Register region 1
         lease.renew(monotonic_raw_now());
diff --git a/components/raftstore-v2/src/operation/query/mod.rs b/components/raftstore-v2/src/operation/query/mod.rs
index 10f6e3279c3..9d19ac8f396 100644
--- a/components/raftstore-v2/src/operation/query/mod.rs
+++ b/components/raftstore-v2/src/operation/query/mod.rs
@@ -21,13 +21,13 @@ use kvproto::{
 };
 use raft::{Ready, StateRole};
 use raftstore::{
+    Error, Result,
     errors::RAFTSTORE_IS_BUSY,
     store::{
-        cmd_resp, local_metrics::RaftMetrics, metrics::RAFT_READ_INDEX_PENDING_COUNT,
-        msg::ErrorCallback, region_meta::RegionMeta, util, util::LeaseState, GroupState,
-        ReadIndexContext, ReadProgress, RequestPolicy,
+        GroupState, ReadIndexContext, ReadProgress, RequestPolicy, cmd_resp,
+        local_metrics::RaftMetrics, metrics::RAFT_READ_INDEX_PENDING_COUNT, msg::ErrorCallback,
+        region_meta::RegionMeta, util, util::LeaseState,
     },
-    Error, Result,
 };
 use slog::{debug, info};
 use tikv_util::{box_err, log::SlogFormat};
@@ -38,7 +38,7 @@ use crate::{
     fsm::PeerFsmDelegate,
     raft::Peer,
     router::{
-        message::RaftRequest, DebugInfoChannel, PeerMsg, QueryResChannel, QueryResult, ReadResponse,
+        DebugInfoChannel, PeerMsg, QueryResChannel, QueryResult, ReadResponse, message::RaftRequest,
     },
 };
 
@@ -49,9 +49,7 @@ mod replica;
 
 pub(crate) use self::local::{LocalReader, ReadDelegatePair, SharedReadTablet};
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T: raftstore::store::Transport>
-    PeerFsmDelegate<'a, EK, ER, T>
-{
+impl<EK: KvEngine, ER: RaftEngine, T: raftstore::store::Transport> PeerFsmDelegate<'_, EK, ER, T> {
     fn inspect_read(&mut self, req: &RaftCmdRequest) -> Result<RequestPolicy> {
         if req.get_header().get_read_quorum() {
             return Ok(RequestPolicy::ReadIndex);
diff --git a/components/raftstore-v2/src/operation/query/replica.rs b/components/raftstore-v2/src/operation/query/replica.rs
index 8dab933f5ed..48451a90e93 100644
--- a/components/raftstore-v2/src/operation/query/replica.rs
+++ b/components/raftstore-v2/src/operation/query/replica.rs
@@ -4,14 +4,14 @@ use engine_traits::{KvEngine, RaftEngine};
 use kvproto::raft_cmdpb::{self, RaftCmdRequest, RaftCmdResponse};
 use pd_client::INVALID_ID;
 use raftstore::{
+    Error,
     store::{
-        cmd_resp,
+        Config, ReadIndexContext, ReadIndexRequest, cmd_resp,
         fsm::apply::notify_stale_req,
         metrics::RAFT_READ_INDEX_PENDING_COUNT,
         msg::{ErrorCallback, ReadCallback},
-        propose_read_index, Config, ReadIndexContext, ReadIndexRequest,
+        propose_read_index,
     },
-    Error,
 };
 use slog::debug;
 use tikv_util::time::monotonic_raw_now;
diff --git a/components/raftstore-v2/src/operation/ready/apply_trace.rs b/components/raftstore-v2/src/operation/ready/apply_trace.rs
index 53756465cc4..1ab961938d0 100644
--- a/components/raftstore-v2/src/operation/ready/apply_trace.rs
+++ b/components/raftstore-v2/src/operation/ready/apply_trace.rs
@@ -17,11 +17,13 @@
 //! `ApplyTrace::maybe_advance_admin_flushed`.
 //!
 //! The correctness of raft cf index relies on the fact that:
+//!
 //! - apply is sequential, so if any apply index is updated to apply trace, all
 //!   modification events before that must be processed.
 //! - admin commands that marked by raft cf index must flush all data before
 //!   being executed. Note this contraint is not just for recovery, but also
 //!   necessary to guarantee safety of operations like split init or log gc.
+//!
 //! So data of logs before raft cf index must be applied and flushed to disk.
 //!
 //! All apply related states are associated with an apply index. During
@@ -31,13 +33,13 @@ use std::{
     cmp,
     collections::VecDeque,
     path::Path,
-    sync::{atomic::Ordering, mpsc::SyncSender, Mutex},
+    sync::{Mutex, atomic::Ordering, mpsc::SyncSender},
 };
 
 use encryption_export::DataKeyManager;
 use engine_traits::{
-    data_cf_offset, offset_to_cf, ApplyProgress, KvEngine, RaftEngine, RaftLogBatch,
-    TabletRegistry, ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, DATA_CFS, DATA_CFS_LEN,
+    ALL_CFS, ApplyProgress, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, DATA_CFS, DATA_CFS_LEN,
+    KvEngine, RaftEngine, RaftLogBatch, TabletRegistry, data_cf_offset, offset_to_cf,
 };
 use fail::fail_point;
 use kvproto::{
@@ -45,12 +47,13 @@ use kvproto::{
     raft_serverpb::{PeerState, RaftApplyState, RaftLocalState, RegionLocalState},
 };
 use raftstore::store::{
-    util, ReadTask, TabletSnapManager, WriteTask, RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM,
+    RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM, ReadTask, TabletSnapManager, WriteTask, util,
 };
-use slog::{info, trace, warn, Logger};
+use slog::{Logger, info, trace, warn};
 use tikv_util::{box_err, slog_panic, worker::Scheduler};
 
 use crate::{
+    Result, StoreRouter,
     batch::StoreContext,
     operation::{
         command::temp_split_path,
@@ -59,7 +62,6 @@ use crate::{
     raft::{Peer, Storage},
     router::{PeerMsg, SstApplyIndex},
     worker::tablet,
-    Result, StoreRouter,
 };
 
 /// Write states for the given region. The region is supposed to have all its
diff --git a/components/raftstore-v2/src/operation/ready/async_writer.rs b/components/raftstore-v2/src/operation/ready/async_writer.rs
index c2a9427580a..0c55371546e 100644
--- a/components/raftstore-v2/src/operation/ready/async_writer.rs
+++ b/components/raftstore-v2/src/operation/ready/async_writer.rs
@@ -5,10 +5,10 @@ use std::collections::VecDeque;
 use engine_traits::{KvEngine, RaftEngine};
 use kvproto::{metapb::RegionEpoch, raft_serverpb::RaftMessage};
 use raftstore::store::{
-    local_metrics::RaftMetrics, Config, PersistedNotifier, WriteRouter, WriteRouterContext,
-    WriteSenders, WriteTask,
+    Config, PersistedNotifier, WriteRouter, WriteRouterContext, WriteSenders, WriteTask,
+    local_metrics::RaftMetrics,
 };
-use slog::{warn, Logger};
+use slog::{Logger, warn};
 use tikv_util::slog_panic;
 
 use crate::{
@@ -120,7 +120,7 @@ impl<EK: KvEngine, ER: RaftEngine> AsyncWriter<EK, ER> {
         }
 
         let last_unpersisted = self.unpersisted_readies.back();
-        if last_unpersisted.map_or(true, |u| u.number < ready_number) {
+        if last_unpersisted.is_none_or(|u| u.number < ready_number) {
             slog_panic!(
                 logger,
                 "ready number is too large";
diff --git a/components/raftstore-v2/src/operation/ready/mod.rs b/components/raftstore-v2/src/operation/ready/mod.rs
index 3603f03078c..1fa2ae188a7 100644
--- a/components/raftstore-v2/src/operation/ready/mod.rs
+++ b/components/raftstore-v2/src/operation/ready/mod.rs
@@ -25,42 +25,42 @@ use std::{
     cmp,
     fmt::{self, Debug, Formatter},
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
     time::Instant,
 };
 
-use engine_traits::{KvEngine, RaftEngine, DATA_CFS};
+use engine_traits::{DATA_CFS, KvEngine, RaftEngine};
 use error_code::ErrorCodeExt;
 use kvproto::{
     raft_cmdpb::AdminCmdType,
     raft_serverpb::{ExtraMessageType, RaftMessage},
 };
 use protobuf::Message as _;
-use raft::{eraftpb, prelude::MessageType, Ready, SnapshotStatus, StateRole, INVALID_ID};
+use raft::{INVALID_ID, Ready, SnapshotStatus, StateRole, eraftpb, prelude::MessageType};
 use raftstore::{
     coprocessor::{RegionChangeEvent, RoleChange},
     store::{
+        FetchedLogs, ReadProgress, Transport, WriteCallback, WriteTask,
         fsm::store::StoreRegionMeta,
         local_metrics::IoType,
         needs_evict_entry_cache,
         util::{self, is_first_append_entry, is_initial_msg},
         worker_metrics::SNAP_COUNTER,
-        FetchedLogs, ReadProgress, Transport, WriteCallback, WriteTask,
     },
 };
-use slog::{debug, error, info, warn, Logger};
+use slog::{Logger, debug, error, info, warn};
 use tikv_util::{
     log::SlogFormat,
     slog_panic,
     store::find_peer,
     sys::disk::DiskUsage,
-    time::{duration_to_sec, monotonic_raw_now, Duration, Instant as TiInstant},
+    time::{Duration, Instant as TiInstant, duration_to_sec, monotonic_raw_now},
 };
 
 pub use self::{
-    apply_trace::{write_initial_states, ApplyTrace, DataTrace, StateStorage},
+    apply_trace::{ApplyTrace, DataTrace, StateStorage, write_initial_states},
     async_writer::AsyncWriter,
     snapshot::{GenSnapTask, SnapState},
 };
@@ -151,7 +151,7 @@ impl Store {
     }
 }
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> PeerFsmDelegate<'a, EK, ER, T> {
+impl<EK: KvEngine, ER: RaftEngine, T: Transport> PeerFsmDelegate<'_, EK, ER, T> {
     /// Raft relies on periodic ticks to keep the state machine sync with other
     /// peers.
     pub fn on_raft_tick(&mut self) {
@@ -689,6 +689,13 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
             for entry in committed_entries.iter().rev() {
                 self.compact_log_context_mut()
                     .add_log_size(entry.get_data().len() as u64);
+                // Using per committed entry to update the term cache may slightly reduce
+                // `raft::Storage::term()` query performance for recently appended
+                // indices, but it ensures that the term cache maintains the
+                // integrity and continuity of each term's lifecycle, making it safe
+                // and efficient for access and compaction.
+                self.entry_storage_mut()
+                    .update_term_cache(entry.get_index(), entry.get_term());
                 if update_lease {
                     let propose_time = self
                         .proposals()
@@ -966,7 +973,7 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
         let now = Instant::now();
         for i in old_index + 1..=new_index {
             if let Some((term, trackers)) = self.proposals().find_trackers(i) {
-                if self.entry_storage().term(i).map_or(false, |t| t == term) {
+                if self.entry_storage().term(i) == Ok(term) {
                     for tracker in trackers {
                         tracker.observe(now, &ctx.raft_metrics.wf_persist_log, |t| {
                             &mut t.metrics.wf_persist_log_nanos
@@ -991,7 +998,7 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
         let health_stats = &mut ctx.raft_metrics.health_stats;
         for i in old_index + 1..=new_index {
             if let Some((term, trackers)) = self.proposals().find_trackers(i) {
-                if self.entry_storage().term(i).map_or(false, |t| t == term) {
+                if self.entry_storage().term(i) == Ok(term) {
                     let commit_persisted = i <= self.persisted_index();
                     let hist = if commit_persisted {
                         &ctx.raft_metrics.wf_commit_log
@@ -1260,7 +1267,7 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
             disk_full_peers.is_empty()
                 || disk_full_peers
                     .get(peer_id)
-                    .map_or(true, |x| x != msg.disk_usage)
+                    .is_none_or(|x| x != msg.disk_usage)
         };
 
         if refill_disk_usages || self.has_region_merge_proposal {
diff --git a/components/raftstore-v2/src/operation/ready/snapshot.rs b/components/raftstore-v2/src/operation/ready/snapshot.rs
index b6a02d70eac..7393ecd158e 100644
--- a/components/raftstore-v2/src/operation/ready/snapshot.rs
+++ b/components/raftstore-v2/src/operation/ready/snapshot.rs
@@ -24,38 +24,38 @@ use std::{
     fs,
     path::{Path, PathBuf},
     sync::{
-        atomic::{AtomicBool, AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicU64, Ordering},
     },
 };
 
 use encryption_export::DataKeyManager;
-use engine_traits::{KvEngine, RaftEngine, RaftLogBatch, TabletContext, TabletRegistry, ALL_CFS};
+use engine_traits::{ALL_CFS, KvEngine, RaftEngine, RaftLogBatch, TabletContext, TabletRegistry};
 use fail::fail_point;
 use kvproto::{
     metapb::PeerRole,
     raft_serverpb::{PeerState, RaftSnapshotData},
 };
 use protobuf::Message;
-use raft::{eraftpb::Snapshot, StateRole};
+use raft::{StateRole, eraftpb::Snapshot};
 use raftstore::{
     coprocessor::RegionChangeEvent,
     store::{
+        GenSnapRes, RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM, ReadTask, TabletSnapKey,
+        TabletSnapManager, Transport, WriteTask,
         metrics::STORE_SNAPSHOT_VALIDATION_FAILURE_COUNTER, worker_metrics::SNAP_COUNTER,
-        GenSnapRes, ReadTask, TabletSnapKey, TabletSnapManager, Transport, WriteTask,
-        RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM,
     },
 };
 use slog::{debug, error, info, warn};
 use tikv_util::{box_err, log::SlogFormat, slog_panic, store::find_peer_by_id};
 
 use crate::{
+    Result, StoreContext,
     fsm::ApplyResReporter,
-    operation::{command::temp_split_path, SharedReadTablet},
+    operation::{SharedReadTablet, command::temp_split_path},
     raft::{Apply, Peer, Storage},
     router::ApplyTask,
     worker::tablet,
-    Result, StoreContext,
 };
 
 /// Snapshot generating task state.
@@ -322,9 +322,10 @@ impl<EK: KvEngine, ER: RaftEngine> Peer<EK, ER> {
             }
             self.read_progress_mut().update_applied_core(snapshot_index);
             let split = self.storage_mut().split_init_mut().take();
-            if split.as_ref().map_or(true, |s| {
-                !s.scheduled || snapshot_index != RAFT_INIT_LOG_INDEX
-            }) {
+            if split
+                .as_ref()
+                .is_none_or(|s| !s.scheduled || snapshot_index != RAFT_INIT_LOG_INDEX)
+            {
                 info!(self.logger, "apply tablet snapshot completely");
                 // Tablet sent from region leader should have already be trimmed.
                 self.storage_mut().set_has_dirty_data(false);
diff --git a/components/raftstore-v2/src/operation/txn_ext.rs b/components/raftstore-v2/src/operation/txn_ext.rs
index ebb8a3bb2a0..1ae265e3b98 100644
--- a/components/raftstore-v2/src/operation/txn_ext.rs
+++ b/components/raftstore-v2/src/operation/txn_ext.rs
@@ -5,10 +5,10 @@
 //! This is the temporary (efficient) solution, it should be implemented as one
 //! type of coprocessor.
 
-use std::sync::{atomic::Ordering, Arc};
+use std::sync::{Arc, atomic::Ordering};
 
 use crossbeam::atomic::AtomicCell;
-use engine_traits::{KvEngine, RaftEngine, CF_LOCK};
+use engine_traits::{CF_LOCK, KvEngine, RaftEngine};
 use kvproto::{
     kvrpcpb::{DiskFullOpt, ExtraOp},
     metapb::Region,
@@ -19,14 +19,14 @@ use raft::eraftpb;
 use raftstore::store::{
     LocksStatus, PeerPessimisticLocks, RaftCmdExtraOpts, TransferLeaderContext, TxnExt,
 };
-use slog::{error, info, warn, Logger};
+use slog::{Logger, error, info, warn};
 
 use crate::{
+    SimpleWriteEncoder,
     batch::StoreContext,
     raft::Peer,
     router::{PeerMsg, PeerTick},
     worker::pd,
-    SimpleWriteEncoder,
 };
 
 pub struct TxnContext {
diff --git a/components/raftstore-v2/src/operation/unsafe_recovery/create.rs b/components/raftstore-v2/src/operation/unsafe_recovery/create.rs
index c96f3dc55c5..2547f857966 100644
--- a/components/raftstore-v2/src/operation/unsafe_recovery/create.rs
+++ b/components/raftstore-v2/src/operation/unsafe_recovery/create.rs
@@ -7,15 +7,15 @@ use engine_traits::{KvEngine, RaftEngine, TabletContext};
 use keys::{data_end_key, data_key, enc_start_key};
 use kvproto::metapb::Region;
 use raftstore::store::{
-    PeerPessimisticLocks, Transport, UnsafeRecoveryExecutePlanSyncer, UnsafeRecoveryState,
-    RAFT_INIT_LOG_INDEX,
+    PeerPessimisticLocks, RAFT_INIT_LOG_INDEX, Transport, UnsafeRecoveryExecutePlanSyncer,
+    UnsafeRecoveryState,
 };
 use slog::{error, info, warn};
 
 use crate::{
     batch::StoreContext,
     fsm::Store,
-    operation::{command::temp_split_path, SplitInit},
+    operation::{SplitInit, command::temp_split_path},
     raft::Peer,
     router::PeerMsg,
 };
diff --git a/components/raftstore-v2/src/operation/unsafe_recovery/demote.rs b/components/raftstore-v2/src/operation/unsafe_recovery/demote.rs
index 0eb722a94c7..1a39cc3cb79 100644
--- a/components/raftstore-v2/src/operation/unsafe_recovery/demote.rs
+++ b/components/raftstore-v2/src/operation/unsafe_recovery/demote.rs
@@ -3,8 +3,8 @@
 use engine_traits::{KvEngine, RaftEngine};
 use kvproto::metapb;
 use raftstore::store::{
-    demote_failed_voters_request, exit_joint_request, Transport, UnsafeRecoveryExecutePlanSyncer,
-    UnsafeRecoveryState,
+    Transport, UnsafeRecoveryExecutePlanSyncer, UnsafeRecoveryState, demote_failed_voters_request,
+    exit_joint_request,
 };
 use slog::{error, info, warn};
 
diff --git a/components/raftstore-v2/src/operation/unsafe_recovery/force_leader.rs b/components/raftstore-v2/src/operation/unsafe_recovery/force_leader.rs
index b80cc645b84..2875d687386 100644
--- a/components/raftstore-v2/src/operation/unsafe_recovery/force_leader.rs
+++ b/components/raftstore-v2/src/operation/unsafe_recovery/force_leader.rs
@@ -4,9 +4,9 @@ use std::mem;
 
 use collections::HashSet;
 use engine_traits::{KvEngine, RaftEngine};
-use raft::{eraftpb::MessageType, StateRole, Storage};
+use raft::{StateRole, Storage, eraftpb::MessageType};
 use raftstore::store::{
-    util::LeaseState, ForceLeaderState, UnsafeRecoveryForceLeaderSyncer, UnsafeRecoveryState,
+    ForceLeaderState, UnsafeRecoveryForceLeaderSyncer, UnsafeRecoveryState, util::LeaseState,
 };
 use slog::{info, warn};
 use tikv_util::time::Instant as TiInstant;
diff --git a/components/raftstore-v2/src/operation/unsafe_recovery/report.rs b/components/raftstore-v2/src/operation/unsafe_recovery/report.rs
index db78c61a0e7..e89d8b41227 100644
--- a/components/raftstore-v2/src/operation/unsafe_recovery/report.rs
+++ b/components/raftstore-v2/src/operation/unsafe_recovery/report.rs
@@ -2,7 +2,7 @@
 
 use engine_traits::{KvEngine, RaftEngine};
 use kvproto::{pdpb, raft_serverpb::RegionLocalState};
-use raft::{GetEntriesContext, Storage, NO_LIMIT};
+use raft::{GetEntriesContext, NO_LIMIT, Storage};
 use raftstore::store::{
     ProposalContext, Transport, UnsafeRecoveryFillOutReportSyncer, UnsafeRecoveryState,
     UnsafeRecoveryWaitApplySyncer,
diff --git a/components/raftstore-v2/src/raft/apply.rs b/components/raftstore-v2/src/raft/apply.rs
index 35959dd8aea..af0b1a776e6 100644
--- a/components/raftstore-v2/src/raft/apply.rs
+++ b/components/raftstore-v2/src/raft/apply.rs
@@ -3,15 +3,15 @@
 use std::{mem, sync::Arc};
 
 use engine_traits::{
-    FlushState, KvEngine, PerfContextKind, SstApplyState, TabletRegistry, WriteBatch, DATA_CFS_LEN,
+    DATA_CFS_LEN, FlushState, KvEngine, PerfContextKind, SstApplyState, TabletRegistry, WriteBatch,
 };
 use kvproto::{metapb, raft_cmdpb::RaftCmdResponse, raft_serverpb::RegionLocalState};
 use pd_client::BucketStat;
 use raftstore::{
     coprocessor::{Cmd, CmdObserveInfo, CoprocessorHost, ObserveLevel},
     store::{
-        fsm::{apply::DEFAULT_APPLY_WB_SIZE, ApplyMetrics},
         Config, ReadTask,
+        fsm::{ApplyMetrics, apply::DEFAULT_APPLY_WB_SIZE},
     },
 };
 use slog::Logger;
@@ -19,9 +19,9 @@ use sst_importer::SstImporter;
 use tikv_util::{log::SlogFormat, worker::Scheduler, yatp_pool::FuturePool};
 
 use crate::{
+    TabletTask,
     operation::{AdminCmdResult, ApplyFlowControl, DataTrace},
     router::{CmdResChannel, SstApplyIndex},
-    TabletTask,
 };
 
 pub(crate) struct Observe {
@@ -239,7 +239,7 @@ impl<EK: KvEngine, R> Apply<EK, R> {
     #[inline]
     pub fn set_tablet(&mut self, tablet: EK) {
         assert!(
-            self.write_batch.as_ref().map_or(true, |wb| wb.is_empty()),
+            self.write_batch.as_ref().is_none_or(|wb| wb.is_empty()),
             "{} setting tablet while still have dirty write batch",
             SlogFormat(&self.logger)
         );
@@ -290,7 +290,7 @@ impl<EK: KvEngine, R> Apply<EK, R> {
     #[inline]
     pub fn release_memory(&mut self) {
         mem::take(&mut self.key_buffer);
-        if self.write_batch.as_ref().map_or(false, |wb| wb.is_empty()) {
+        if self.write_batch.as_ref().is_some_and(|wb| wb.is_empty()) {
             self.write_batch = None;
         }
     }
diff --git a/components/raftstore-v2/src/raft/peer.rs b/components/raftstore-v2/src/raft/peer.rs
index 48d51ece654..bbae8035f4a 100644
--- a/components/raftstore-v2/src/raft/peer.rs
+++ b/components/raftstore-v2/src/raft/peer.rs
@@ -16,23 +16,24 @@ use kvproto::{
     pdpb,
     raft_serverpb::RaftMessage,
 };
-use raft::{eraftpb, RawNode, StateRole};
+use raft::{RawNode, StateRole, eraftpb};
 use raftstore::{
     coprocessor::{CoprocessorHost, RegionChangeEvent, RegionChangeReason},
     store::{
-        fsm::ApplyMetrics,
-        metrics::RAFT_PEER_PENDING_DURATION,
-        util::{Lease, RegionReadProgress},
         BucketStatsInfo, Config, EntryStorage, ForceLeaderState, PeerStat, ProposalQueue,
         ReadDelegate, ReadIndexQueue, ReadProgress, TabletSnapManager, TransferLeaderState,
         UnsafeRecoveryState, WriteTask,
+        fsm::ApplyMetrics,
+        metrics::RAFT_PEER_PENDING_DURATION,
+        util::{Lease, RegionReadProgress},
     },
 };
-use slog::{debug, info, Logger};
+use slog::{Logger, debug, info};
 use tikv_util::{slog_panic, time::duration_to_sec};
 
 use super::storage::Storage;
 use crate::{
+    Result,
     batch::StoreContext,
     fsm::ApplyScheduler,
     operation::{
@@ -41,7 +42,6 @@ use crate::{
         SplitPendingAppend, TxnContext,
     },
     router::{ApplyTask, CmdResChannel, PeerTick, QueryResChannel},
-    Result,
 };
 
 const REGION_READ_PROGRESS_CAP: usize = 128;
diff --git a/components/raftstore-v2/src/raft/storage.rs b/components/raftstore-v2/src/raft/storage.rs
index 4b78bee9b46..8ece3e41e26 100644
--- a/components/raftstore-v2/src/raft/storage.rs
+++ b/components/raftstore-v2/src/raft/storage.rs
@@ -13,16 +13,16 @@ use kvproto::{
     raft_serverpb::{RaftApplyState, RaftLocalState, RegionLocalState},
 };
 use raft::{
+    GetEntriesContext, INVALID_ID, RaftState,
     eraftpb::{ConfState, Entry, Snapshot},
-    GetEntriesContext, RaftState, INVALID_ID,
 };
-use raftstore::store::{local_metrics::RaftMetrics, util, EntryStorage, ReadTask};
-use slog::{o, Logger};
+use raftstore::store::{EntryStorage, ReadTask, local_metrics::RaftMetrics, util};
+use slog::{Logger, o};
 use tikv_util::{box_err, store::find_peer, worker::Scheduler};
 
 use crate::{
-    operation::{ApplyTrace, GenSnapTask, SnapState, SplitInit},
     Result,
+    operation::{ApplyTrace, GenSnapTask, SnapState, SplitInit},
 };
 
 /// A storage for raft.
@@ -337,8 +337,8 @@ impl<EK: KvEngine, ER: RaftEngine> raft::Storage for Storage<EK, ER> {
 mod tests {
     use std::{
         sync::{
-            mpsc::{sync_channel, Receiver, SyncSender},
             Arc,
+            mpsc::{Receiver, SyncSender, sync_channel},
         },
         time::Duration,
     };
@@ -348,8 +348,8 @@ mod tests {
         kv::{KvTestEngine, TestTabletFactory},
     };
     use engine_traits::{
-        FlushState, RaftEngine, RaftLogBatch, SstApplyState, TabletContext, TabletRegistry,
-        DATA_CFS,
+        DATA_CFS, FlushState, RaftEngine, RaftLogBatch, SstApplyState, TabletContext,
+        TabletRegistry,
     };
     use kvproto::{
         metapb::Region,
@@ -360,23 +360,23 @@ mod tests {
     use raftstore::{
         coprocessor::CoprocessorHost,
         store::{
-            util::new_empty_snapshot, write_to_db_for_test, AsyncReadNotifier, Config, FetchedLogs,
-            GenSnapRes, ReadRunner, TabletSnapKey, TabletSnapManager, WriteTask,
-            RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM,
+            AsyncReadNotifier, Config, FetchedLogs, GenSnapRes, RAFT_INIT_LOG_INDEX,
+            RAFT_INIT_LOG_TERM, ReadRunner, TabletSnapKey, TabletSnapManager, WriteTask,
+            util::new_empty_snapshot, write_to_db_for_test,
         },
     };
     use slog::o;
     use tempfile::TempDir;
     use tikv_util::{
         store::new_peer,
-        worker::{dummy_scheduler, Worker},
+        worker::{Worker, dummy_scheduler},
         yatp_pool::{DefaultTicker, YatpPoolBuilder},
     };
 
     use super::*;
     use crate::{
         fsm::ApplyResReporter,
-        operation::{test_util::create_tmp_importer, write_initial_states, CatchUpLogs},
+        operation::{CatchUpLogs, test_util::create_tmp_importer, write_initial_states},
         raft::Apply,
         router::ApplyRes,
     };
diff --git a/components/raftstore-v2/src/router/imp.rs b/components/raftstore-v2/src/router/imp.rs
index e7a63f6d48f..c85c2ea4200 100644
--- a/components/raftstore-v2/src/router/imp.rs
+++ b/components/raftstore-v2/src/router/imp.rs
@@ -19,18 +19,19 @@ use kvproto::{
 use raftstore::{
     router::CdcHandle,
     store::{
-        fsm::ChangeObserver, AsyncReadNotifier, Callback, FetchedLogs, GenSnapRes, RegionSnapshot,
+        AsyncReadNotifier, Callback, FetchedLogs, GenSnapRes, RegionSnapshot,
         UnsafeRecoveryExecutePlanSyncer, UnsafeRecoveryFillOutReportSyncer,
         UnsafeRecoveryForceLeaderSyncer, UnsafeRecoveryHandle, UnsafeRecoveryWaitApplySyncer,
+        fsm::ChangeObserver,
     },
 };
 use slog::warn;
 use tikv_util::box_err;
 
 use super::{
-    build_any_channel, message::CaptureChange, PeerMsg, QueryResChannel, QueryResult, StoreMsg,
+    PeerMsg, QueryResChannel, QueryResult, StoreMsg, build_any_channel, message::CaptureChange,
 };
-use crate::{batch::StoreRouter, operation::LocalReader, StoreMeta};
+use crate::{StoreMeta, batch::StoreRouter, operation::LocalReader};
 
 impl<EK: KvEngine, ER: RaftEngine> AsyncReadNotifier for StoreRouter<EK, ER> {
     fn notify_logs_fetched(&self, region_id: u64, fetched_logs: FetchedLogs) {
@@ -109,6 +110,10 @@ impl<EK: KvEngine, ER: RaftEngine> raftstore::coprocessor::StoreHandle for Store
     ) {
         // TODO
     }
+
+    fn update_compaction_declined_bytes(&self, _region_id: u64, _bytes: u64) {
+        // TODO
+    }
 }
 
 /// A router that routes messages to the raftstore
diff --git a/components/raftstore-v2/src/router/message.rs b/components/raftstore-v2/src/router/message.rs
index b66c84d9740..203306f26e6 100644
--- a/components/raftstore-v2/src/router/message.rs
+++ b/components/raftstore-v2/src/router/message.rs
@@ -1,7 +1,7 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
 // #[PerformanceCriticalPath]
-use std::sync::{mpsc::SyncSender, Arc};
+use std::sync::{Arc, mpsc::SyncSender};
 
 use collections::HashSet;
 use health_controller::types::LatencyInspector;
@@ -14,10 +14,10 @@ use kvproto::{
     raft_serverpb::RaftMessage,
 };
 use raftstore::store::{
-    fsm::ChangeObserver, metrics::RaftEventDurationType, simple_write::SimpleWriteBinary,
     FetchedLogs, GenSnapRes, RaftCmdExtraOpts, TabletSnapKey, UnsafeRecoveryExecutePlanSyncer,
     UnsafeRecoveryFillOutReportSyncer, UnsafeRecoveryForceLeaderSyncer,
-    UnsafeRecoveryWaitApplySyncer,
+    UnsafeRecoveryWaitApplySyncer, fsm::ChangeObserver, metrics::RaftEventDurationType,
+    simple_write::SimpleWriteBinary,
 };
 use resource_control::ResourceMetered;
 use tikv_util::time::Instant;
diff --git a/components/raftstore-v2/src/router/mod.rs b/components/raftstore-v2/src/router/mod.rs
index d63e1abc733..2f80c6cd155 100644
--- a/components/raftstore-v2/src/router/mod.rs
+++ b/components/raftstore-v2/src/router/mod.rs
@@ -15,9 +15,9 @@ pub use self::{
     internal_message::{ApplyRes, SstApplyIndex},
     message::{PeerMsg, PeerTick, RaftRequest, StoreMsg, StoreTick},
     response_channel::{
-        build_any_channel, AnyResChannel, AnyResSubscriber, BaseSubscriber, CmdResChannel,
-        CmdResChannelBuilder, CmdResEvent, CmdResStream, CmdResSubscriber, DebugInfoChannel,
-        DebugInfoSubscriber, QueryResChannel, QueryResult, ReadResponse,
+        AnyResChannel, AnyResSubscriber, BaseSubscriber, CmdResChannel, CmdResChannelBuilder,
+        CmdResEvent, CmdResStream, CmdResSubscriber, DebugInfoChannel, DebugInfoSubscriber,
+        QueryResChannel, QueryResult, ReadResponse, build_any_channel,
     },
 };
 pub use super::operation::DiskSnapBackupHandle;
diff --git a/components/raftstore-v2/src/router/response_channel.rs b/components/raftstore-v2/src/router/response_channel.rs
index 4f47f971670..2ef211f4cba 100644
--- a/components/raftstore-v2/src/router/response_channel.rs
+++ b/components/raftstore-v2/src/router/response_channel.rs
@@ -19,19 +19,19 @@ use std::{
     future::Future,
     pin::Pin,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicU64, Ordering},
     },
     task::{Context, Poll},
 };
 
-use futures::{task::AtomicWaker, FutureExt, Stream};
+use futures::{FutureExt, Stream, task::AtomicWaker};
 use kvproto::{kvrpcpb::ExtraOp as TxnExtraOp, raft_cmdpb::RaftCmdResponse};
 use raftstore::store::{
-    local_metrics::TimeTracker, msg::ErrorCallback, region_meta::RegionMeta, ReadCallback,
-    WriteCallback,
+    ReadCallback, WriteCallback, local_metrics::TimeTracker, msg::ErrorCallback,
+    region_meta::RegionMeta,
 };
-use tracker::{get_tls_tracker_token, TrackerToken};
+use tracker::{TrackerToken, get_tls_tracker_token};
 
 union Tracker {
     read: TrackerToken,
@@ -49,6 +49,7 @@ struct EventCore<Res> {
     /// - 0b01 means the event is fired and not subscribed.
     /// - 0b10 means the event is not fired and subscribed.
     /// - 0b11 means the event is fired and subscribed.
+    ///
     /// Event 0 and Event 31 is reserved as payload and cancel respectively.
     /// Other events should be defined within [1, 30].
     event: AtomicU64,
@@ -152,7 +153,7 @@ fn check_bit(e: u64, fired_bit: u64) -> Option<bool> {
     None
 }
 
-impl<'a, Res> Future for WaitEvent<'a, Res> {
+impl<Res> Future for WaitEvent<'_, Res> {
     type Output = bool;
 
     #[inline]
@@ -186,7 +187,7 @@ struct WaitResult<'a, Res> {
     sub: &'a BaseSubscriber<Res>,
 }
 
-impl<'a, Res> Future for WaitResult<'a, Res> {
+impl<Res> Future for WaitResult<'_, Res> {
     type Output = Option<Res>;
 
     #[inline]
@@ -729,7 +730,7 @@ pub use flush_channel::{FlushChannel, FlushSubscriber};
 mod tests {
     use std::assert_matches::assert_matches;
 
-    use futures::{executor::block_on, StreamExt};
+    use futures::{StreamExt, executor::block_on};
 
     use super::*;
 
diff --git a/components/raftstore-v2/src/worker/cleanup/compact.rs b/components/raftstore-v2/src/worker/cleanup/compact.rs
deleted file mode 100644
index 3fe94daa684..00000000000
--- a/components/raftstore-v2/src/worker/cleanup/compact.rs
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright 2023 TiKV Project Authors. Licensed under Apache-2.0.
-
-use std::{
-    error::Error as StdError,
-    fmt::{self, Display, Formatter},
-};
-
-use engine_traits::{KvEngine, ManualCompactionOptions, TabletRegistry, CF_WRITE};
-use fail::fail_point;
-use keys::{DATA_MAX_KEY, DATA_MIN_KEY};
-use raftstore::store::{need_compact, CompactThreshold};
-use slog::{debug, error, info, warn, Logger};
-use thiserror::Error;
-use tikv_util::{box_try, worker::Runnable};
-
-pub enum Task {
-    CheckAndCompact {
-        // Column families need to compact
-        cf_names: Vec<String>,
-        region_ids: Vec<u64>,
-        compact_threshold: CompactThreshold,
-    },
-}
-
-impl Display for Task {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match *self {
-            Task::CheckAndCompact {
-                ref cf_names,
-                ref region_ids,
-                ref compact_threshold,
-            } => f
-                .debug_struct("CheckAndCompact")
-                .field("cf_names", cf_names)
-                .field("regions", region_ids)
-                .field(
-                    "tombstones_num_threshold",
-                    &compact_threshold.tombstones_num_threshold,
-                )
-                .field(
-                    "tombstones_percent_threshold",
-                    &compact_threshold.tombstones_percent_threshold,
-                )
-                .field(
-                    "redundant_rows_threshold",
-                    &compact_threshold.redundant_rows_threshold,
-                )
-                .field(
-                    "redundant_rows_percent_threshold",
-                    &compact_threshold.redundant_rows_percent_threshold,
-                )
-                .finish(),
-        }
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error("compact failed {0:?}")]
-    Other(#[from] Box<dyn StdError + Sync + Send>),
-}
-
-pub struct Runner<E> {
-    logger: Logger,
-    tablet_registry: TabletRegistry<E>,
-}
-
-impl<E> Runner<E>
-where
-    E: KvEngine,
-{
-    pub fn new(tablet_registry: TabletRegistry<E>, logger: Logger) -> Runner<E> {
-        Runner {
-            logger,
-            tablet_registry,
-        }
-    }
-}
-
-impl<E> Runnable for Runner<E>
-where
-    E: KvEngine,
-{
-    type Task = Task;
-
-    fn run(&mut self, task: Self::Task) {
-        match task {
-            Task::CheckAndCompact {
-                cf_names,
-                region_ids,
-                compact_threshold,
-            } => match collect_regions_to_compact(
-                &self.tablet_registry,
-                region_ids,
-                compact_threshold,
-                &self.logger,
-            ) {
-                Ok(mut region_ids) => {
-                    for region_id in region_ids.drain(..) {
-                        let Some(mut tablet_cache) = self.tablet_registry.get(region_id) else {
-                            continue;
-                        };
-                        let Some(tablet) = tablet_cache.latest() else {
-                            continue;
-                        };
-                        for cf in &cf_names {
-                            if let Err(e) = tablet.compact_range_cf(
-                                cf,
-                                None,
-                                None,
-                                ManualCompactionOptions::new(false, 1, false),
-                            ) {
-                                error!(
-                                    self.logger,
-                                    "compact range failed";
-                                    "region_id" => region_id,
-                                    "cf" => cf,
-                                    "err" => %e,
-                                );
-                            }
-                        }
-                        info!(
-                            self.logger,
-                            "compaction range finished";
-                            "region_id" => region_id,
-                        );
-                        fail_point!("raftstore-v2::CheckAndCompact::AfterCompact");
-                    }
-                }
-                Err(e) => warn!(
-                    self.logger,
-                    "check ranges need reclaim failed"; "err" => %e
-                ),
-            },
-        }
-    }
-}
-
-fn collect_regions_to_compact<E: KvEngine>(
-    reg: &TabletRegistry<E>,
-    region_ids: Vec<u64>,
-    compact_threshold: CompactThreshold,
-    logger: &Logger,
-) -> Result<Vec<u64>, Error> {
-    fail_point!("on_collect_regions_to_compact");
-    debug!(
-        logger,
-        "received compaction check";
-        "regions" => ?region_ids
-    );
-    let mut regions_to_compact = vec![];
-    for id in region_ids {
-        let Some(mut tablet_cache) = reg.get(id) else {
-            continue;
-        };
-        let Some(tablet) = tablet_cache.latest() else {
-            continue;
-        };
-        if tablet.auto_compactions_is_disabled().expect("cf") {
-            info!(
-                logger,
-                "skip compact check when disabled auto compactions";
-                "region_id" => id,
-            );
-            continue;
-        }
-
-        if let Some(range_stats) =
-            box_try!(tablet.get_range_stats(CF_WRITE, DATA_MIN_KEY, DATA_MAX_KEY))
-        {
-            info!(
-                logger,
-                "get range entries and versions";
-                "num_entries" => range_stats.num_entries,
-                "num_versions" => range_stats.num_versions,
-                "num_rows" => range_stats.num_rows,
-                "region_id" => id,
-            );
-            if need_compact(&range_stats, &compact_threshold) {
-                regions_to_compact.push(id);
-            }
-        }
-    }
-    Ok(regions_to_compact)
-}
-
-#[cfg(test)]
-mod tests {
-    use engine_test::{
-        ctor::{CfOptions, DbOptions},
-        kv::{KvTestEngine, TestTabletFactory},
-    };
-    use engine_traits::{MiscExt, SyncMutable, TabletContext, TabletRegistry, CF_DEFAULT, CF_LOCK};
-    use keys::data_key;
-    use kvproto::metapb::Region;
-    use tempfile::Builder;
-    use txn_types::{Key, TimeStamp, Write, WriteType};
-
-    use super::*;
-
-    fn build_test_factory(name: &'static str) -> (tempfile::TempDir, TabletRegistry<KvTestEngine>) {
-        let dir = Builder::new().prefix(name).tempdir().unwrap();
-        let mut cf_opts = CfOptions::new();
-        cf_opts.set_level_zero_file_num_compaction_trigger(8);
-        let factory = Box::new(TestTabletFactory::new(
-            DbOptions::default(),
-            vec![
-                (CF_DEFAULT, CfOptions::new()),
-                (CF_LOCK, CfOptions::new()),
-                (CF_WRITE, cf_opts),
-            ],
-        ));
-        let registry = TabletRegistry::new(factory, dir.path()).unwrap();
-        (dir, registry)
-    }
-
-    fn mvcc_put(db: &KvTestEngine, k: &[u8], v: &[u8], start_ts: TimeStamp, commit_ts: TimeStamp) {
-        let k = Key::from_encoded(data_key(k)).append_ts(commit_ts);
-        let w = Write::new(WriteType::Put, start_ts, Some(v.to_vec()));
-        db.put_cf(CF_WRITE, k.as_encoded(), &w.as_ref().to_bytes())
-            .unwrap();
-    }
-
-    fn delete(db: &KvTestEngine, k: &[u8], commit_ts: TimeStamp) {
-        let k = Key::from_encoded(data_key(k)).append_ts(commit_ts);
-        db.delete_cf(CF_WRITE, k.as_encoded()).unwrap();
-    }
-
-    #[test]
-    fn test_compact_range() {
-        let (_dir, registry) = build_test_factory("compact-range-test");
-
-        let mut region = Region::default();
-        region.set_id(2);
-        let ctx = TabletContext::new(&region, Some(5));
-        let mut cache = registry.load(ctx, true).unwrap();
-        let tablet = cache.latest().unwrap();
-
-        // mvcc_put 0..5
-        for i in 0..5 {
-            let (k, v) = (format!("k{}", i), format!("value{}", i));
-            mvcc_put(tablet, k.as_bytes(), v.as_bytes(), 1.into(), 2.into());
-            mvcc_put(tablet, k.as_bytes(), v.as_bytes(), 3.into(), 4.into());
-        }
-        tablet.flush_cf(CF_WRITE, true).unwrap();
-
-        // gc 0..5
-        for i in 0..5 {
-            let k = format!("k{}", i);
-            delete(tablet, k.as_bytes(), 4.into());
-        }
-        tablet.flush_cf(CF_WRITE, true).unwrap();
-
-        let (start, end) = (data_key(b"k0"), data_key(b"k5"));
-        let range_stats = tablet
-            .get_range_stats(CF_WRITE, &start, &end)
-            .unwrap()
-            .unwrap();
-        assert_eq!(range_stats.num_entries, 15);
-        assert_eq!(range_stats.num_versions, 10);
-        assert_eq!(range_stats.num_rows, 5);
-
-        region.set_id(3);
-        let ctx = TabletContext::new(&region, Some(5));
-        let mut cache = registry.load(ctx, true).unwrap();
-        let tablet = cache.latest().unwrap();
-        // mvcc_put 5..10
-        for i in 5..10 {
-            let (k, v) = (format!("k{}", i), format!("value{}", i));
-            mvcc_put(tablet, k.as_bytes(), v.as_bytes(), 1.into(), 2.into());
-        }
-        for i in 5..8 {
-            let (k, v) = (format!("k{}", i), format!("value{}", i));
-            mvcc_put(tablet, k.as_bytes(), v.as_bytes(), 3.into(), 4.into());
-        }
-        tablet.flush_cf(CF_WRITE, true).unwrap();
-
-        let (s, e) = (data_key(b"k5"), data_key(b"k9"));
-        let range_stats = tablet.get_range_stats(CF_WRITE, &s, &e).unwrap().unwrap();
-        assert_eq!(range_stats.num_entries, 8);
-        assert_eq!(range_stats.num_versions, 8);
-        assert_eq!(range_stats.num_rows, 5);
-
-        // gc 5..8
-        for i in 5..8 {
-            let k = format!("k{}", i);
-            delete(tablet, k.as_bytes(), 4.into());
-        }
-        tablet.flush_cf(CF_WRITE, true).unwrap();
-
-        let (s, e) = (data_key(b"k5"), data_key(b"k9"));
-        let range_stats = tablet.get_range_stats(CF_WRITE, &s, &e).unwrap().unwrap();
-        assert_eq!(range_stats.num_entries, 11);
-        assert_eq!(range_stats.num_versions, 8);
-        assert_eq!(range_stats.num_rows, 5);
-
-        let logger = slog_global::borrow_global().new(slog::o!());
-
-        // collect regions according to tombstone's parameters
-        let regions = collect_regions_to_compact(
-            &registry,
-            vec![2, 3, 4],
-            CompactThreshold::new(4, 30, 100, 100),
-            &logger,
-        )
-        .unwrap();
-        assert!(regions.len() == 1 && regions[0] == 2);
-
-        let regions = collect_regions_to_compact(
-            &registry,
-            vec![2, 3, 4],
-            CompactThreshold::new(3, 25, 100, 100),
-            &logger,
-        )
-        .unwrap();
-        assert!(regions.len() == 2 && !regions.contains(&4));
-
-        // collect regions accroding to redundant rows' parameter
-        let regions = collect_regions_to_compact(
-            &registry,
-            vec![2, 3, 4],
-            CompactThreshold::new(100, 100, 9, 60),
-            &logger,
-        )
-        .unwrap();
-        assert!(regions.len() == 1 && regions[0] == 2);
-
-        let regions = collect_regions_to_compact(
-            &registry,
-            vec![2, 3, 4],
-            CompactThreshold::new(100, 100, 5, 50),
-            &logger,
-        )
-        .unwrap();
-        assert!(regions.len() == 2 && !regions.contains(&4));
-    }
-}
diff --git a/components/raftstore-v2/src/worker/cleanup/mod.rs b/components/raftstore-v2/src/worker/cleanup/mod.rs
deleted file mode 100644
index fa95fbcc480..00000000000
--- a/components/raftstore-v2/src/worker/cleanup/mod.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2023 TiKV Project Authors. Licensed under Apache-2.0.
-
-use std::fmt::{self, Display, Formatter};
-
-pub use compact::{Runner as CompactRunner, Task as CompactTask};
-use engine_traits::KvEngine;
-use tikv_util::worker::Runnable;
-
-mod compact;
-
-pub enum Task {
-    Compact(CompactTask),
-}
-
-impl Display for Task {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            Task::Compact(ref t) => t.fmt(f),
-        }
-    }
-}
-
-pub struct Runner<E: KvEngine> {
-    compact: CompactRunner<E>,
-    // todo: more cleanup related runner may be added later
-}
-
-impl<E: KvEngine> Runner<E> {
-    pub fn new(compact: CompactRunner<E>) -> Runner<E> {
-        Runner { compact }
-    }
-}
-
-impl<E: KvEngine> Runnable for Runner<E> {
-    type Task = Task;
-
-    fn run(&mut self, task: Task) {
-        match task {
-            Task::Compact(t) => self.compact.run(t),
-        }
-    }
-}
diff --git a/components/raftstore-v2/src/worker/mod.rs b/components/raftstore-v2/src/worker/mod.rs
index 4eee822b8c7..3a5a188588d 100644
--- a/components/raftstore-v2/src/worker/mod.rs
+++ b/components/raftstore-v2/src/worker/mod.rs
@@ -1,6 +1,5 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
-pub mod cleanup;
 pub mod pd;
 pub mod refresh_config;
 pub mod tablet;
diff --git a/components/raftstore-v2/src/worker/pd/misc.rs b/components/raftstore-v2/src/worker/pd/misc.rs
index fd2848b95a4..eb6bdd203b0 100644
--- a/components/raftstore-v2/src/worker/pd/misc.rs
+++ b/components/raftstore-v2/src/worker/pd/misc.rs
@@ -1,15 +1,15 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::Ordering, Arc},
+    sync::{Arc, atomic::Ordering},
     time::{Duration, Instant},
 };
 
 use causal_ts::CausalTsProvider;
 use engine_traits::{KvEngine, RaftEngine};
-use futures::{compat::Future01CompatExt, FutureExt};
+use futures::{FutureExt, compat::Future01CompatExt};
 use pd_client::PdClient;
-use raftstore::{store::TxnExt, Result};
+use raftstore::{Result, store::TxnExt};
 use slog::{info, warn};
 use tikv_util::{box_err, timer::GLOBAL_TIMER_HANDLE};
 
diff --git a/components/raftstore-v2/src/worker/pd/mod.rs b/components/raftstore-v2/src/worker/pd/mod.rs
index e95a378fba6..a6a40eced67 100644
--- a/components/raftstore-v2/src/worker/pd/mod.rs
+++ b/components/raftstore-v2/src/worker/pd/mod.rs
@@ -2,7 +2,7 @@
 
 use std::{
     fmt::{self, Display, Formatter},
-    sync::{atomic::AtomicBool, Arc},
+    sync::{Arc, atomic::AtomicBool},
 };
 
 use causal_ts::CausalTsProviderImpl;
@@ -13,19 +13,19 @@ use health_controller::types::{InspectFactor, LatencyInspector, RaftstoreDuratio
 use kvproto::{metapb, pdpb};
 use pd_client::{BucketStat, PdClient};
 use raftstore::store::{
-    metrics::STORE_INSPECT_DURATION_HISTOGRAM, util::KeysInfoFormatter, AutoSplitController,
-    Config, FlowStatsReporter, PdStatsMonitor, ReadStats, SplitInfo, StoreStatsReporter,
-    TabletSnapManager, TxnExt, WriteStats, NUM_COLLECT_STORE_INFOS_PER_HEARTBEAT,
+    AutoSplitController, Config, FlowStatsReporter, NUM_COLLECT_STORE_INFOS_PER_HEARTBEAT,
+    PdStatsMonitor, ReadStats, SplitInfo, StoreStatsReporter, TabletSnapManager, TxnExt,
+    WriteStats, metrics::STORE_INSPECT_DURATION_HISTOGRAM, util::KeysInfoFormatter,
 };
 use resource_metering::{Collector, CollectorRegHandle, RawRecords};
 use service::service_manager::GrpcServiceManager;
-use slog::{error, warn, Logger};
+use slog::{Logger, error, warn};
 use tikv_util::{
     config::VersionTrack,
     time::{Instant as TiInstant, UnixSecs},
     worker::{Runnable, Scheduler},
 };
-use yatp::{task::future::TaskCell, Remote};
+use yatp::{Remote, task::future::TaskCell};
 
 use crate::{
     batch::StoreRouter,
@@ -99,6 +99,9 @@ pub enum Task {
         tick_id: u64,
         duration: RaftstoreDuration,
     },
+    GracefulShutdownState {
+        state: bool,
+    },
 }
 
 impl Display for Task {
@@ -179,6 +182,9 @@ impl Display for Task {
                 "update slowness statistics: tick_id {}, duration {:?}",
                 tick_id, duration
             ),
+            Task::GracefulShutdownState { state } => {
+                write!(f, "graceful shutdown state: {}", state)
+            }
         }
     }
 }
@@ -227,6 +233,8 @@ where
     shutdown: Arc<AtomicBool>,
     #[allow(dead_code)]
     cfg: Arc<VersionTrack<Config>>,
+
+    graceful_shutdown_state: Arc<AtomicBool>,
 }
 
 impl<EK, ER, T> Runner<EK, ER, T>
@@ -252,12 +260,14 @@ where
         logger: Logger,
         shutdown: Arc<AtomicBool>,
         cfg: Arc<VersionTrack<Config>>,
+        graceful_shutdown_state: Arc<AtomicBool>,
     ) -> Result<Self, std::io::Error> {
         let store_heartbeat_interval = cfg.value().pd_store_heartbeat_tick_interval.0;
         let mut stats_monitor = PdStatsMonitor::new(
             store_heartbeat_interval / NUM_COLLECT_STORE_INFOS_PER_HEARTBEAT,
             cfg.value().inspect_interval.0,
             std::time::Duration::default(),
+            cfg.value().inspect_network_interval.0,
             PdReporter::new(pd_scheduler, logger.clone()),
         );
         stats_monitor.start(auto_split_controller, collector_reg_handle)?;
@@ -285,6 +295,7 @@ where
             logger,
             shutdown,
             cfg,
+            graceful_shutdown_state,
         })
     }
 }
@@ -348,6 +359,7 @@ where
             Task::UpdateSlownessStats { tick_id, duration } => {
                 self.handle_update_slowness_stats(tick_id, duration)
             }
+            Task::GracefulShutdownState { state } => self.handle_graceful_shutdown_state(state),
         }
     }
 }
diff --git a/components/raftstore-v2/src/worker/pd/region.rs b/components/raftstore-v2/src/worker/pd/region.rs
index be207e1ab16..7da269e20b6 100644
--- a/components/raftstore-v2/src/worker/pd/region.rs
+++ b/components/raftstore-v2/src/worker/pd/region.rs
@@ -6,14 +6,14 @@ use collections::HashMap;
 use engine_traits::{KvEngine, RaftEngine};
 use kvproto::{metapb, pdpb};
 use pd_client::{
-    metrics::PD_HEARTBEAT_COUNTER_VEC, BucketStat, PdClient, RegionStat, RegionWriteCfCopDetail,
+    BucketStat, PdClient, RegionStat, RegionWriteCfCopDetail, metrics::PD_HEARTBEAT_COUNTER_VEC,
 };
 use raftstore::store::{ReadStats, WriteStats};
 use resource_metering::RawRecords;
 use slog::{debug, error, info};
 use tikv_util::{store::QueryStats, time::UnixSecs};
 
-use super::{requests::*, Runner};
+use super::{Runner, requests::*};
 use crate::{
     operation::{RequestHalfSplit, RequestSplit},
     router::{CmdResChannel, PeerMsg},
diff --git a/components/raftstore-v2/src/worker/pd/slowness.rs b/components/raftstore-v2/src/worker/pd/slowness.rs
index 4f2aee6102e..abc24a3618e 100644
--- a/components/raftstore-v2/src/worker/pd/slowness.rs
+++ b/components/raftstore-v2/src/worker/pd/slowness.rs
@@ -1,6 +1,9 @@
 // Copyright 2023 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::time::{Duration, Instant};
+use std::{
+    sync::atomic::Ordering,
+    time::{Duration, Instant},
+};
 
 use engine_traits::{KvEngine, RaftEngine};
 use fail::fail_point;
@@ -10,9 +13,11 @@ use health_controller::{
 };
 use kvproto::pdpb;
 use pd_client::PdClient;
-use raftstore::store::{metrics::*, Config};
+use raftstore::store::{Config, metrics::*};
+use slog::warn;
 
 use super::Runner;
+use crate::router::{StoreMsg, StoreTick};
 pub struct SlownessStatistics {
     /// Detector to detect NetIo&DiskIo jitters.
     slow_cause: Trend,
@@ -84,6 +89,15 @@ where
         );
     }
 
+    pub fn handle_graceful_shutdown_state(&mut self, state: bool) {
+        self.graceful_shutdown_state.store(state, Ordering::SeqCst);
+        let msg = StoreMsg::Tick(StoreTick::PdStoreHeartbeat);
+        if let Err(e) = self.router.send_control(msg) {
+            warn!(self.logger, "pd worker send graceful shutdown state failed";
+                    "err" => ?e);
+        }
+    }
+
     pub fn handle_slowness_stats_tick(&mut self) {
         let mock_slowness_last_tick_unfinished = || {
             fail_point!("mock_slowness_last_tick_unfinished", |_| { true });
diff --git a/components/raftstore-v2/src/worker/pd/split.rs b/components/raftstore-v2/src/worker/pd/split.rs
index 7bafb6c442a..07b3f99577f 100644
--- a/components/raftstore-v2/src/worker/pd/split.rs
+++ b/components/raftstore-v2/src/worker/pd/split.rs
@@ -7,10 +7,10 @@ use kvproto::{
 };
 use pd_client::PdClient;
 use raftstore::store::SplitInfo;
-use slog::{info, warn, Logger};
-use yatp::{task::future::TaskCell, Remote};
+use slog::{Logger, info, warn};
+use yatp::{Remote, task::future::TaskCell};
 
-use super::{requests::*, Runner};
+use super::{Runner, requests::*};
 use crate::{batch::StoreRouter, router::CmdResChannel};
 
 fn new_batch_split_region_request(
diff --git a/components/raftstore-v2/src/worker/pd/store.rs b/components/raftstore-v2/src/worker/pd/store.rs
index e840d77e5cf..55ef7497ccf 100644
--- a/components/raftstore-v2/src/worker/pd/store.rs
+++ b/components/raftstore-v2/src/worker/pd/store.rs
@@ -1,6 +1,9 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{cmp, sync::Arc};
+use std::{
+    cmp,
+    sync::{Arc, atomic::Ordering},
+};
 
 use collections::{HashMap, HashSet};
 use engine_traits::{KvEngine, RaftEngine};
@@ -8,16 +11,16 @@ use fail::fail_point;
 use health_controller::types::LatencyInspector;
 use kvproto::pdpb;
 use pd_client::{
+    PdClient,
     metrics::{
         REGION_READ_BYTES_HISTOGRAM, REGION_READ_KEYS_HISTOGRAM, REGION_WRITTEN_BYTES_HISTOGRAM,
         REGION_WRITTEN_KEYS_HISTOGRAM,
     },
-    PdClient,
 };
 use prometheus::local::LocalHistogram;
 use raftstore::store::{
-    metrics::STORE_SNAPSHOT_TRAFFIC_GAUGE_VEC, UnsafeRecoveryExecutePlanSyncer,
-    UnsafeRecoveryForceLeaderSyncer, UnsafeRecoveryHandle,
+    UnsafeRecoveryExecutePlanSyncer, UnsafeRecoveryForceLeaderSyncer, UnsafeRecoveryHandle,
+    metrics::STORE_SNAPSHOT_TRAFFIC_GAUGE_VEC,
 };
 use slog::{error, info, warn};
 use tikv_util::{
@@ -268,6 +271,8 @@ where
         // Update slowness statistics
         self.update_slowness_in_store_stats(&mut stats, last_query_sum);
 
+        stats.set_is_stopping(self.graceful_shutdown_state.load(Ordering::SeqCst));
+
         let resp = self.pd_client.store_heartbeat(stats, store_report, None);
         let logger = self.logger.clone();
         let router = self.router.clone();
diff --git a/components/raftstore-v2/src/worker/refresh_config.rs b/components/raftstore-v2/src/worker/refresh_config.rs
index 797f5b821ab..fce6f94970a 100644
--- a/components/raftstore-v2/src/worker/refresh_config.rs
+++ b/components/raftstore-v2/src/worker/refresh_config.rs
@@ -3,16 +3,16 @@
 use std::{sync::Arc, thread};
 
 use batch_system::{BatchRouter, Fsm, FsmTypes, HandlerBuilder, Poller, PoolState, Priority};
-use file_system::{set_io_type, IoType};
+use file_system::{IoType, set_io_type};
 use raftstore::store::{BatchComponent, RefreshConfigTask, Transport, WriterContoller};
-use slog::{error, info, warn, Logger};
+use slog::{Logger, error, info, warn};
 use tikv_util::{
     sys::thread::StdThreadBuildWrapper, thd_name, worker::Runnable, yatp_pool::FuturePool,
 };
 
 use crate::{
-    fsm::{PeerFsm, StoreFsm},
     StoreRouter,
+    fsm::{PeerFsm, StoreFsm},
 };
 
 pub struct PoolController<N: Fsm, C: Fsm, H: HandlerBuilder<N, C>> {
diff --git a/components/raftstore-v2/src/worker/tablet.rs b/components/raftstore-v2/src/worker/tablet.rs
index 88bbe5f4ef7..aa5930c9522 100644
--- a/components/raftstore-v2/src/worker/tablet.rs
+++ b/components/raftstore-v2/src/worker/tablet.rs
@@ -9,21 +9,21 @@ use std::{
 
 use collections::HashMap;
 use engine_traits::{
-    CfName, DeleteStrategy, KvEngine, ManualCompactionOptions, Range, TabletContext,
-    TabletRegistry, WriteOptions, DATA_CFS,
+    CfName, DATA_CFS, DeleteStrategy, KvEngine, ManualCompactionOptions, Range, TabletContext,
+    TabletRegistry, WriteOptions,
 };
 use fail::fail_point;
 use kvproto::{import_sstpb::SstMeta, metapb::Region};
 use raftstore::store::{TabletSnapKey, TabletSnapManager};
-use slog::{debug, error, info, warn, Logger};
+use slog::{Logger, debug, error, info, warn};
 use sst_importer::SstImporter;
 use tikv_util::{
+    Either,
     config::ReadableDuration,
     slog_panic,
     time::Instant,
     worker::{Runnable, RunnableWithTimer},
     yatp_pool::{DefaultTicker, FuturePool, YatpPoolBuilder},
-    Either,
 };
 
 const DEFAULT_HIGH_PRI_POOL_SIZE: usize = 2;
diff --git a/components/raftstore-v2/tests/failpoints/test_basic_write.rs b/components/raftstore-v2/tests/failpoints/test_basic_write.rs
index 1b1dba04e55..013b5e66a3f 100644
--- a/components/raftstore-v2/tests/failpoints/test_basic_write.rs
+++ b/components/raftstore-v2/tests/failpoints/test_basic_write.rs
@@ -3,11 +3,11 @@
 use std::{assert_matches::assert_matches, time::Duration};
 
 use engine_traits::{
-    CompactExt, DbOptionsExt, ManualCompactionOptions, MiscExt, Peekable, RaftEngineReadOnly,
-    CF_DEFAULT, CF_RAFT, CF_WRITE,
+    CF_DEFAULT, CF_RAFT, CF_WRITE, CompactExt, DbOptionsExt, ManualCompactionOptions, MiscExt,
+    Peekable, RaftEngineReadOnly,
 };
 use futures::executor::block_on;
-use raftstore_v2::{router::PeerMsg, SimpleWriteEncoder};
+use raftstore_v2::{SimpleWriteEncoder, router::PeerMsg};
 
 use crate::cluster::Cluster;
 
diff --git a/components/raftstore-v2/tests/failpoints/test_bucket.rs b/components/raftstore-v2/tests/failpoints/test_bucket.rs
index f136cf6dc53..36494615fb3 100644
--- a/components/raftstore-v2/tests/failpoints/test_bucket.rs
+++ b/components/raftstore-v2/tests/failpoints/test_bucket.rs
@@ -6,7 +6,7 @@ use engine_traits::RaftEngineReadOnly;
 use raftstore::store::RAFT_INIT_LOG_INDEX;
 use tikv_util::store::new_peer;
 
-use crate::cluster::{split_helper::split_region_and_refresh_bucket, Cluster};
+use crate::cluster::{Cluster, split_helper::split_region_and_refresh_bucket};
 
 /// Test refresh bucket.
 #[test]
diff --git a/components/raftstore-v2/tests/failpoints/test_life.rs b/components/raftstore-v2/tests/failpoints/test_life.rs
index ed05c1c6fad..46df7cd84e3 100644
--- a/components/raftstore-v2/tests/failpoints/test_life.rs
+++ b/components/raftstore-v2/tests/failpoints/test_life.rs
@@ -6,10 +6,10 @@ use engine_traits::CF_DEFAULT;
 use futures::executor::block_on;
 use kvproto::raft_serverpb::RaftMessage;
 use raft::prelude::MessageType;
-use raftstore_v2::{router::PeerMsg, SimpleWriteEncoder};
+use raftstore_v2::{SimpleWriteEncoder, router::PeerMsg};
 use tikv_util::store::new_peer;
 
-use crate::cluster::{life_helper::assert_peer_not_exist, Cluster};
+use crate::cluster::{Cluster, life_helper::assert_peer_not_exist};
 
 /// Test if a peer can be destroyed when it's applying entries
 #[test]
diff --git a/components/raftstore-v2/tests/failpoints/test_merge.rs b/components/raftstore-v2/tests/failpoints/test_merge.rs
index 11fe666b49b..a5cc2d2e940 100644
--- a/components/raftstore-v2/tests/failpoints/test_merge.rs
+++ b/components/raftstore-v2/tests/failpoints/test_merge.rs
@@ -1,7 +1,7 @@
 // Copyright 2023 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc, Mutex},
+    sync::{Mutex, mpsc},
     time::Duration,
 };
 
@@ -10,10 +10,10 @@ use raftstore_v2::router::{PeerMsg, PeerTick};
 use tikv_util::{config::ReadableDuration, info, store::new_peer};
 
 use crate::cluster::{
+    Cluster,
     life_helper::assert_peer_not_exist,
     merge_helper::merge_region,
     split_helper::{put, split_region},
-    Cluster,
 };
 
 #[test]
diff --git a/components/raftstore-v2/tests/failpoints/test_pd_heartbeat.rs b/components/raftstore-v2/tests/failpoints/test_pd_heartbeat.rs
index f175e3cd5c9..6ae9fb34b20 100644
--- a/components/raftstore-v2/tests/failpoints/test_pd_heartbeat.rs
+++ b/components/raftstore-v2/tests/failpoints/test_pd_heartbeat.rs
@@ -5,7 +5,7 @@ use pd_client::PdClient;
 use raftstore_v2::router::{StoreMsg, StoreTick};
 use tikv_util::config::ReadableDuration;
 
-use crate::cluster::{v2_default_config, Cluster};
+use crate::cluster::{Cluster, v2_default_config};
 
 #[test]
 fn test_fake_store_heartbeat() {
diff --git a/components/raftstore-v2/tests/failpoints/test_split.rs b/components/raftstore-v2/tests/failpoints/test_split.rs
index e67041ab181..7255e6eee24 100644
--- a/components/raftstore-v2/tests/failpoints/test_split.rs
+++ b/components/raftstore-v2/tests/failpoints/test_split.rs
@@ -5,12 +5,12 @@ use std::{
     time::{Duration, Instant},
 };
 
-use engine_traits::{RaftEngineReadOnly, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, RaftEngineReadOnly};
 use futures::executor::block_on;
 use raftstore::store::RAFT_INIT_LOG_INDEX;
-use raftstore_v2::{router::PeerMsg, SimpleWriteEncoder};
+use raftstore_v2::{SimpleWriteEncoder, router::PeerMsg};
 
-use crate::cluster::{split_helper::split_region, Cluster};
+use crate::cluster::{Cluster, split_helper::split_region};
 
 /// If a node is restarted after metadata is persisted before tablet is not
 /// installed, it should resume install the tablet.
diff --git a/components/raftstore-v2/tests/integrations/cluster.rs b/components/raftstore-v2/tests/integrations/cluster.rs
index 0cc14abf2c2..9ee70ee8547 100644
--- a/components/raftstore-v2/tests/integrations/cluster.rs
+++ b/components/raftstore-v2/tests/integrations/cluster.rs
@@ -4,8 +4,8 @@ use std::{
     ops::{Deref, DerefMut},
     path::Path,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
     thread,
     time::{Duration, Instant},
@@ -15,13 +15,13 @@ use causal_ts::CausalTsProviderImpl;
 use collections::HashSet;
 use concurrency_manager::ConcurrencyManager;
 use crossbeam::channel::{self, Receiver, Sender, TrySendError};
-use encryption_export::{data_key_manager_from_config, DataKeyImporter};
+use encryption_export::{DataKeyImporter, data_key_manager_from_config};
 use engine_test::{
     ctor::{CfOptions, DbOptions},
     kv::{KvTestEngine, KvTestSnapshot, TestTabletFactory},
     raft::RaftTestEngine,
 };
-use engine_traits::{TabletContext, TabletRegistry, DATA_CFS};
+use engine_traits::{DATA_CFS, TabletContext, TabletRegistry};
 use futures::executor::block_on;
 use kvproto::{
     kvrpcpb::ApiVersion,
@@ -34,20 +34,19 @@ use raft::eraftpb::MessageType;
 use raftstore::{
     coprocessor::{Config as CopConfig, CoprocessorHost, StoreHandle},
     store::{
+        AutoSplitController, Bucket, Config, RAFT_INIT_LOG_INDEX, RegionSnapshot, TabletSnapKey,
+        TabletSnapManager, Transport,
         region_meta::{RegionLocalState, RegionMeta},
-        AutoSplitController, Bucket, Config, RegionSnapshot, TabletSnapKey, TabletSnapManager,
-        Transport, RAFT_INIT_LOG_INDEX,
     },
 };
 use raftstore_v2::{
-    create_store_batch_system,
+    Bootstrap, SimpleWriteEncoder, StateStorage, StoreSystem, create_store_batch_system,
     router::{DebugInfoChannel, FlushChannel, PeerMsg, QueryResult, RaftRouter, StoreMsg},
-    Bootstrap, SimpleWriteEncoder, StateStorage, StoreSystem,
 };
 use resource_control::{ResourceController, ResourceGroupManager};
 use resource_metering::CollectorRegHandle;
 use service::service_manager::GrpcServiceManager;
-use slog::{debug, o, Logger};
+use slog::{Logger, debug, o};
 use sst_importer::SstImporter;
 use tempfile::TempDir;
 use test_pd::mocker::Service;
@@ -62,7 +61,7 @@ pub fn check_skip_wal(path: &str) {
     let mut found = false;
     for f in std::fs::read_dir(path).unwrap() {
         let e = f.unwrap();
-        if e.path().extension().map_or(false, |ext| ext == "log") {
+        if e.path().extension().is_some_and(|ext| ext == "log") {
             found = true;
             assert_eq!(e.metadata().unwrap().len(), 0, "{}", e.path().display());
         }
@@ -514,7 +513,6 @@ pub fn disable_all_auto_ticks(cfg: &mut Config) {
     cfg.raft_log_compact_sync_interval = ReadableDuration::ZERO;
     cfg.raft_engine_purge_interval = ReadableDuration::ZERO;
     cfg.split_region_check_tick_interval = ReadableDuration::ZERO;
-    cfg.region_compact_check_interval = ReadableDuration::ZERO;
     cfg.pd_heartbeat_tick_interval = ReadableDuration::ZERO;
     cfg.pd_store_heartbeat_tick_interval = ReadableDuration::ZERO;
     cfg.pd_report_min_resolved_ts_interval = ReadableDuration::ZERO;
@@ -720,7 +718,7 @@ pub mod split_helper {
         raft_cmdpb::{AdminCmdType, AdminRequest, RaftCmdRequest, RaftCmdResponse, SplitRequest},
     };
     use raftstore::store::Bucket;
-    use raftstore_v2::{router::PeerMsg, SimpleWriteEncoder};
+    use raftstore_v2::{SimpleWriteEncoder, router::PeerMsg};
 
     use super::TestRouter;
 
diff --git a/components/raftstore-v2/tests/integrations/test_basic_write.rs b/components/raftstore-v2/tests/integrations/test_basic_write.rs
index cb8d71840cf..08351debd93 100644
--- a/components/raftstore-v2/tests/integrations/test_basic_write.rs
+++ b/components/raftstore-v2/tests/integrations/test_basic_write.rs
@@ -2,14 +2,14 @@
 
 use std::{assert_matches::assert_matches, time::Duration};
 
-use engine_traits::{Peekable, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, Peekable};
 use futures::executor::block_on;
 use kvproto::raft_serverpb::RaftMessage;
 use raftstore::store::{INIT_EPOCH_CONF_VER, INIT_EPOCH_VER};
-use raftstore_v2::{router::PeerMsg, SimpleWriteEncoder};
+use raftstore_v2::{SimpleWriteEncoder, router::PeerMsg};
 use tikv_util::store::new_peer;
 
-use crate::cluster::{check_skip_wal, Cluster};
+use crate::cluster::{Cluster, check_skip_wal};
 
 /// Test basic write flow.
 #[test]
diff --git a/components/raftstore-v2/tests/integrations/test_conf_change.rs b/components/raftstore-v2/tests/integrations/test_conf_change.rs
index c1c7861fd54..017225965a7 100644
--- a/components/raftstore-v2/tests/integrations/test_conf_change.rs
+++ b/components/raftstore-v2/tests/integrations/test_conf_change.rs
@@ -2,7 +2,7 @@
 
 use std::{self, time::Duration};
 
-use engine_traits::{Peekable, RaftEngineReadOnly, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, Peekable, RaftEngineReadOnly};
 use futures::executor::block_on;
 use kvproto::{
     raft_cmdpb::{AdminCmdType, RaftCmdRequest},
@@ -10,12 +10,12 @@ use kvproto::{
 };
 use raft::prelude::{ConfChangeType, MessageType};
 use raftstore_v2::{
-    router::{PeerMsg, PeerTick},
     SimpleWriteEncoder,
+    router::{PeerMsg, PeerTick},
 };
 use tikv_util::store::{new_learner_peer, new_peer};
 
-use crate::cluster::{check_skip_wal, Cluster};
+use crate::cluster::{Cluster, check_skip_wal};
 
 #[test]
 fn test_simple_change() {
diff --git a/components/raftstore-v2/tests/integrations/test_life.rs b/components/raftstore-v2/tests/integrations/test_life.rs
index 373763a53ef..50052dd9b01 100644
--- a/components/raftstore-v2/tests/integrations/test_life.rs
+++ b/components/raftstore-v2/tests/integrations/test_life.rs
@@ -2,21 +2,21 @@
 
 use std::time::Duration;
 
-use engine_traits::{RaftEngineReadOnly, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, RaftEngineReadOnly};
 use futures::executor::block_on;
 use kvproto::{raft_cmdpb::AdminCmdType, raft_serverpb::RaftMessage};
 use raft::prelude::{ConfChangeType, MessageType};
 use raftstore_v2::{
-    router::{PeerMsg, PeerTick},
     SimpleWriteEncoder,
+    router::{PeerMsg, PeerTick},
 };
 use tikv_util::store::{new_learner_peer, new_peer};
 
 use crate::cluster::{
+    Cluster,
     life_helper::{
         assert_peer_not_exist, assert_tombstone, assert_tombstone_msg, assert_valid_report,
     },
-    Cluster,
 };
 
 /// Test a peer can be created by general raft message and destroyed tombstone
diff --git a/components/raftstore-v2/tests/integrations/test_merge.rs b/components/raftstore-v2/tests/integrations/test_merge.rs
index 7d9dbef720e..b00c0113afd 100644
--- a/components/raftstore-v2/tests/integrations/test_merge.rs
+++ b/components/raftstore-v2/tests/integrations/test_merge.rs
@@ -7,7 +7,7 @@ use kvproto::metapb::{Peer, Region};
 use raftstore::store::RAFT_INIT_LOG_INDEX;
 use tikv_util::store::new_peer;
 
-use crate::cluster::{merge_helper::merge_region, split_helper::split_region, Cluster, TestRouter};
+use crate::cluster::{Cluster, TestRouter, merge_helper::merge_region, split_helper::split_region};
 
 #[test]
 fn test_merge() {
diff --git a/components/raftstore-v2/tests/integrations/test_pd_heartbeat.rs b/components/raftstore-v2/tests/integrations/test_pd_heartbeat.rs
index 679183735b6..e9d92cb9b07 100644
--- a/components/raftstore-v2/tests/integrations/test_pd_heartbeat.rs
+++ b/components/raftstore-v2/tests/integrations/test_pd_heartbeat.rs
@@ -2,18 +2,18 @@
 
 use std::time::Duration;
 
-use engine_traits::{MiscExt, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, MiscExt};
 use futures::executor::block_on;
 use kvproto::raft_cmdpb::{RaftCmdRequest, StatusCmdType};
 use pd_client::PdClient;
 use raftstore::coprocessor::Config as CopConfig;
 use raftstore_v2::{
-    router::{PeerMsg, PeerTick, StoreMsg, StoreTick},
     SimpleWriteEncoder,
+    router::{PeerMsg, PeerTick, StoreMsg, StoreTick},
 };
 use tikv_util::{config::ReadableSize, store::new_peer};
 
-use crate::cluster::{v2_default_config, Cluster};
+use crate::cluster::{Cluster, v2_default_config};
 
 #[test]
 fn test_region_heartbeat() {
@@ -210,8 +210,6 @@ fn test_report_buckets() {
             router.send(region_id, msg).unwrap();
             let _resp = block_on(sub.result()).unwrap();
         }
-        ((suffix.as_bytes().len() + 10) * repeat)
-            .try_into()
-            .unwrap()
+        ((suffix.len() + 10) * repeat) as u64
     }
 }
diff --git a/components/raftstore-v2/tests/integrations/test_read.rs b/components/raftstore-v2/tests/integrations/test_read.rs
index f9575ff8da1..8e7dea81a54 100644
--- a/components/raftstore-v2/tests/integrations/test_read.rs
+++ b/components/raftstore-v2/tests/integrations/test_read.rs
@@ -3,11 +3,11 @@
 use engine_traits::CF_DEFAULT;
 use futures::executor::block_on;
 use kvproto::raft_cmdpb::{CmdType, Request};
-use raftstore_v2::{router::PeerMsg, SimpleWriteEncoder};
+use raftstore_v2::{SimpleWriteEncoder, router::PeerMsg};
 use tikv_util::{config::ReadableDuration, store::new_peer};
 use txn_types::WriteBatchFlags;
 
-use crate::cluster::{v2_default_config, Cluster};
+use crate::cluster::{Cluster, v2_default_config};
 
 #[test]
 fn test_read_index() {
diff --git a/components/raftstore-v2/tests/integrations/test_split.rs b/components/raftstore-v2/tests/integrations/test_split.rs
index 9dab98be598..8c9ff35d030 100644
--- a/components/raftstore-v2/tests/integrations/test_split.rs
+++ b/components/raftstore-v2/tests/integrations/test_split.rs
@@ -2,12 +2,12 @@
 
 use std::time::Duration;
 
-use engine_traits::{Peekable, RaftEngineReadOnly, CF_RAFT};
+use engine_traits::{CF_RAFT, Peekable, RaftEngineReadOnly};
 use raftstore::store::{INIT_EPOCH_VER, RAFT_INIT_LOG_INDEX};
 use tikv_util::store::new_peer;
 use txn_types::{Key, TimeStamp};
 
-use crate::cluster::{split_helper::split_region, Cluster};
+use crate::cluster::{Cluster, split_helper::split_region};
 
 #[test]
 fn test_split() {
diff --git a/components/raftstore-v2/tests/integrations/test_trace_apply.rs b/components/raftstore-v2/tests/integrations/test_trace_apply.rs
index 71682ff52a4..c484fb35ff0 100644
--- a/components/raftstore-v2/tests/integrations/test_trace_apply.rs
+++ b/components/raftstore-v2/tests/integrations/test_trace_apply.rs
@@ -2,10 +2,10 @@
 
 use std::{path::Path, time::Duration};
 
-use engine_traits::{DbOptionsExt, MiscExt, Peekable, CF_DEFAULT, CF_LOCK, CF_WRITE, DATA_CFS};
+use engine_traits::{CF_DEFAULT, CF_LOCK, CF_WRITE, DATA_CFS, DbOptionsExt, MiscExt, Peekable};
 use futures::executor::block_on;
 use raftstore::store::RAFT_INIT_LOG_INDEX;
-use raftstore_v2::{router::PeerMsg, SimpleWriteEncoder};
+use raftstore_v2::{SimpleWriteEncoder, router::PeerMsg};
 
 use crate::cluster::Cluster;
 
@@ -21,7 +21,7 @@ fn count_file(path: &Path, pat: impl Fn(&Path) -> bool) -> usize {
 
 fn count_sst(path: &Path) -> usize {
     count_file(path, |path| {
-        path.extension().map_or(false, |ext| ext == "sst")
+        path.extension().is_some_and(|ext| ext == "sst")
     })
 }
 
diff --git a/components/raftstore-v2/tests/integrations/test_transfer_leader.rs b/components/raftstore-v2/tests/integrations/test_transfer_leader.rs
index 3b0feefc406..ed8200737e5 100644
--- a/components/raftstore-v2/tests/integrations/test_transfer_leader.rs
+++ b/components/raftstore-v2/tests/integrations/test_transfer_leader.rs
@@ -2,7 +2,7 @@
 
 use std::{assert_matches::assert_matches, time::Duration};
 
-use engine_traits::{Peekable, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, Peekable};
 use futures::executor::block_on;
 use kvproto::{
     metapb,
@@ -10,8 +10,8 @@ use kvproto::{
 };
 use raft::prelude::ConfChangeType;
 use raftstore_v2::{
-    router::{PeerMsg, PeerTick},
     SimpleWriteEncoder,
+    router::{PeerMsg, PeerTick},
 };
 use tikv_util::{store::new_peer, time::Instant};
 
diff --git a/components/raftstore/Cargo.toml b/components/raftstore/Cargo.toml
index e840c9a4e61..28ffae46600 100644
--- a/components/raftstore/Cargo.toml
+++ b/components/raftstore/Cargo.toml
@@ -31,7 +31,7 @@ collections = { workspace = true }
 concurrency_manager = { workspace = true }
 crc32fast = "1.2"
 crossbeam = { workspace = true }
-derivative = "2"
+derive_more = { version = "2.0", features = ["debug"] }
 encryption = { workspace = true }
 engine_rocks = { workspace = true, optional = true }
 engine_traits = { workspace = true }
diff --git a/components/raftstore/src/compacted_event_sender.rs b/components/raftstore/src/compacted_event_sender.rs
index b984dac2fd9..8fd9844f948 100644
--- a/components/raftstore/src/compacted_event_sender.rs
+++ b/components/raftstore/src/compacted_event_sender.rs
@@ -5,7 +5,7 @@ use engine_rocks::{CompactedEventSender, RocksCompactedEvent};
 use engine_traits::{KvEngine, RaftEngine};
 use tikv_util::warn;
 
-use crate::store::{fsm::store::RaftRouter, StoreMsg};
+use crate::store::{StoreMsg, fsm::store::RaftRouter};
 
 // raftstore v1's implementation
 pub struct RaftRouterCompactedEventSender<EK, ER>
diff --git a/components/raftstore/src/coprocessor/config.rs b/components/raftstore/src/coprocessor/config.rs
index 7eb13210ee1..5bc830728e0 100644
--- a/components/raftstore/src/coprocessor/config.rs
+++ b/components/raftstore/src/coprocessor/config.rs
@@ -1,6 +1,6 @@
 // Copyright 2017 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_traits::{perf_level_serde, PerfLevel};
+use engine_traits::{KvEngine, PerfLevel, perf_level_serde};
 use online_config::{ConfigChange, ConfigManager, OnlineConfig};
 use serde::{Deserialize, Serialize};
 use tikv_util::{box_err, config::ReadableSize, worker::Scheduler};
@@ -218,9 +218,9 @@ impl Config {
     }
 }
 
-pub struct SplitCheckConfigManager(pub Scheduler<SplitCheckTask>);
+pub struct SplitCheckConfigManager<EK: KvEngine>(pub Scheduler<SplitCheckTask<EK>>);
 
-impl ConfigManager for SplitCheckConfigManager {
+impl<EK: KvEngine> ConfigManager for SplitCheckConfigManager<EK> {
     fn dispatch(
         &mut self,
         change: ConfigChange,
@@ -230,8 +230,8 @@ impl ConfigManager for SplitCheckConfigManager {
     }
 }
 
-impl std::ops::Deref for SplitCheckConfigManager {
-    type Target = Scheduler<SplitCheckTask>;
+impl<EK: KvEngine> std::ops::Deref for SplitCheckConfigManager<EK> {
+    type Target = Scheduler<SplitCheckTask<EK>>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
diff --git a/components/raftstore/src/coprocessor/consistency_check.rs b/components/raftstore/src/coprocessor/consistency_check.rs
index 2ebf27c963f..43c0aaddd37 100644
--- a/components/raftstore/src/coprocessor/consistency_check.rs
+++ b/components/raftstore/src/coprocessor/consistency_check.rs
@@ -2,12 +2,12 @@
 
 use std::marker::PhantomData;
 
-use engine_traits::{KvEngine, Snapshot, CF_RAFT};
+use engine_traits::{CF_RAFT, KvEngine, Snapshot};
 use kvproto::metapb::Region;
 
 use crate::{
-    coprocessor::{ConsistencyCheckMethod, Coprocessor},
     Result,
+    coprocessor::{ConsistencyCheckMethod, Coprocessor},
 };
 
 pub trait ConsistencyCheckObserver<E: KvEngine>: Coprocessor {
diff --git a/components/raftstore/src/coprocessor/dispatcher.rs b/components/raftstore/src/coprocessor/dispatcher.rs
index bea8de7869a..41b66f7c1ec 100644
--- a/components/raftstore/src/coprocessor/dispatcher.rs
+++ b/components/raftstore/src/coprocessor/dispatcher.rs
@@ -43,6 +43,7 @@ pub trait StoreHandle: Clone + Send {
         context: Vec<u8>,
         hash: Vec<u8>,
     );
+    fn update_compaction_declined_bytes(&self, region_id: u64, bytes: u64);
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -75,6 +76,10 @@ pub enum SchedTask {
         hash: Vec<u8>,
         context: Vec<u8>,
     },
+    UpdateCompactionDeclinedBytes {
+        region_id: u64,
+        bytes: u64,
+    },
 }
 
 impl StoreHandle for std::sync::mpsc::SyncSender<SchedTask> {
@@ -138,6 +143,10 @@ impl StoreHandle for std::sync::mpsc::SyncSender<SchedTask> {
             hash,
         });
     }
+
+    fn update_compaction_declined_bytes(&self, region_id: u64, bytes: u64) {
+        let _ = self.try_send(SchedTask::UpdateCompactionDeclinedBytes { region_id, bytes });
+    }
 }
 
 struct Entry<T> {
diff --git a/components/raftstore/src/coprocessor/metrics.rs b/components/raftstore/src/coprocessor/metrics.rs
index 79f76820f12..47ba6b5579b 100644
--- a/components/raftstore/src/coprocessor/metrics.rs
+++ b/components/raftstore/src/coprocessor/metrics.rs
@@ -2,7 +2,7 @@
 
 use lazy_static::lazy_static;
 use prometheus::{
-    exponential_buckets, register_histogram, register_int_gauge_vec, Histogram, IntGaugeVec,
+    Histogram, IntGaugeVec, exponential_buckets, register_histogram, register_int_gauge_vec,
 };
 
 lazy_static! {
diff --git a/components/raftstore/src/coprocessor/mod.rs b/components/raftstore/src/coprocessor/mod.rs
index fc162498152..494c9e9d100 100644
--- a/components/raftstore/src/coprocessor/mod.rs
+++ b/components/raftstore/src/coprocessor/mod.rs
@@ -3,8 +3,8 @@
 use std::{
     fmt::{self, Debug, Formatter},
     sync::{
-        atomic::{AtomicBool, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicUsize, Ordering},
     },
     vec::IntoIter,
 };
@@ -20,7 +20,7 @@ use kvproto::{
     raft_serverpb::RaftApplyState,
 };
 use pd_client::RegionStat;
-use raft::{eraftpb, StateRole};
+use raft::{StateRole, eraftpb};
 
 pub mod config;
 mod consistency_check;
@@ -52,9 +52,9 @@ pub use self::{
         RegionInfoProvider, SeekRegionCallback,
     },
     split_check::{
-        get_region_approximate_keys, get_region_approximate_middle, get_region_approximate_size,
         HalfCheckObserver, Host as SplitCheckerHost, KeysCheckObserver, SizeCheckObserver,
-        TableCheckObserver,
+        TableCheckObserver, get_region_approximate_keys, get_region_approximate_middle,
+        get_region_approximate_size,
     },
 };
 pub use crate::store::{Bucket, KeyEntry};
@@ -73,7 +73,7 @@ pub struct ObserverContext<'a> {
     pub bypass: bool,
 }
 
-impl<'a> ObserverContext<'a> {
+impl ObserverContext<'_> {
     pub fn new(region: &Region) -> ObserverContext<'_> {
         ObserverContext {
             region,
diff --git a/components/raftstore/src/coprocessor/read_write/write_batch.rs b/components/raftstore/src/coprocessor/read_write/write_batch.rs
index 72c98523086..a0a806cc9fb 100644
--- a/components/raftstore/src/coprocessor/read_write/write_batch.rs
+++ b/components/raftstore/src/coprocessor/read_write/write_batch.rs
@@ -2,7 +2,7 @@
 
 use std::sync::atomic::{AtomicBool, Ordering};
 
-use engine_traits::{Mutable, Result, WriteBatch, WriteOptions, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, Mutable, Result, WriteBatch, WriteOptions};
 use kvproto::metapb;
 
 pub trait WriteBatchObserver: Send {
diff --git a/components/raftstore/src/coprocessor/region_info_accessor.rs b/components/raftstore/src/coprocessor/region_info_accessor.rs
index 07caa3aa456..03433279bd4 100644
--- a/components/raftstore/src/coprocessor/region_info_accessor.rs
+++ b/components/raftstore/src/coprocessor/region_info_accessor.rs
@@ -7,7 +7,7 @@ use std::{
     },
     fmt::{Display, Formatter, Result as FmtResult},
     num::NonZeroUsize,
-    sync::{mpsc, Arc, Mutex, RwLock},
+    sync::{Arc, Mutex, RwLock, mpsc},
     time::Duration,
 };
 
@@ -23,9 +23,9 @@ use tikv_util::{
 };
 
 use super::{
-    dispatcher::BoxRegionHeartbeatObserver, metrics::*, BoxRegionChangeObserver, BoxRoleObserver,
-    Coprocessor, CoprocessorHost, ObserverContext, RegionChangeEvent, RegionChangeObserver,
-    RegionHeartbeatObserver, Result, RoleChange, RoleObserver,
+    BoxRegionChangeObserver, BoxRoleObserver, Coprocessor, CoprocessorHost, ObserverContext,
+    RegionChangeEvent, RegionChangeObserver, RegionHeartbeatObserver, Result, RoleChange,
+    RoleObserver, dispatcher::BoxRegionHeartbeatObserver, metrics::*,
 };
 
 // TODO(SpadeA): this 100 may be adjusted by observing more workloads.
@@ -48,7 +48,7 @@ const ITERATED_COUNT_FILTER_FACTOR: usize = 100;
 /// perfectly precise. Some regions may be temporarily absent while merging or
 /// splitting is in progress. Also, `RegionInfoAccessor`'s information may
 /// slightly lag the actual regions on the TiKV.
-
+///
 /// `RaftStoreEvent` Represents events dispatched from raftstore coprocessor.
 #[derive(Debug)]
 pub enum RaftStoreEvent {
@@ -232,9 +232,9 @@ impl RegionChangeObserver for RegionEventListener {
                 RaftStoreEvent::UpdateRegionBuckets { region, buckets }
             }
         };
-        self.scheduler
-            .schedule(RegionInfoQuery::RaftStoreEvent(event))
-            .unwrap();
+        let _ = self
+            .scheduler
+            .schedule(RegionInfoQuery::RaftStoreEvent(event));
     }
 }
 
@@ -247,9 +247,9 @@ impl RoleObserver for RegionEventListener {
             role,
             initialized: role_change.initialized,
         };
-        self.scheduler
-            .schedule(RegionInfoQuery::RaftStoreEvent(event))
-            .unwrap();
+        let _ = self
+            .scheduler
+            .schedule(RegionInfoQuery::RaftStoreEvent(event));
     }
 }
 
@@ -266,9 +266,9 @@ impl RegionHeartbeatObserver for RegionEventListener {
             activity: RegionActivity { region_stat },
         };
 
-        self.scheduler
-            .schedule(RegionInfoQuery::RaftStoreEvent(event))
-            .unwrap();
+        let _ = self
+            .scheduler
+            .schedule(RegionInfoQuery::RaftStoreEvent(event));
     }
 }
 
@@ -1081,6 +1081,16 @@ impl MockRegionInfoProvider {
                 .collect_vec(),
         ))
     }
+
+    pub fn set_role(&self, region_id: u64, role: StateRole) {
+        let mut region_infos = self.0.lock().unwrap();
+        if let Some(region_info) = region_infos
+            .iter_mut()
+            .find(|info| info.region.get_id() == region_id)
+        {
+            region_info.role = role;
+        }
+    }
 }
 
 impl Clone for MockRegionInfoProvider {
@@ -1210,8 +1220,7 @@ mod tests {
         if is_regions_equal {
             for (expect_region, expect_role) in regions {
                 is_regions_equal = is_regions_equal
-                    && c.regions.get(&expect_region.get_id()).map_or(
-                        false,
+                    && c.regions.get(&expect_region.get_id()).is_some_and(
                         |RegionInfo { region, role, .. }| {
                             expect_region == region && expect_role == role
                         },
@@ -1259,7 +1268,7 @@ mod tests {
     }
 
     fn must_create_region(c: &mut RegionCollector, region: &Region, role: StateRole) {
-        assert!(c.regions.get(&region.get_id()).is_none());
+        assert!(!c.regions.contains_key(&region.get_id()));
 
         c.handle_raftstore_event(RaftStoreEvent::CreateRegion {
             region: region.clone(),
@@ -1307,7 +1316,7 @@ mod tests {
                 assert!(
                     c.region_ranges
                         .get(&RangeKey::from_end_key(old_end_key))
-                        .map_or(true, |id| *id != region.get_id())
+                        .is_none_or(|id| *id != region.get_id())
                 );
             }
         }
@@ -1329,14 +1338,14 @@ mod tests {
 
         c.handle_raftstore_event(RaftStoreEvent::DestroyRegion { region });
 
-        assert!(c.regions.get(&id).is_none());
+        assert!(!c.regions.contains_key(&id));
         // If the region_id corresponding to the end_key doesn't equals to `id`, it
         // shouldn't be removed since it was used by another region.
         if let Some(end_key) = end_key {
             assert!(
                 c.region_ranges
                     .get(&RangeKey::from_end_key(end_key))
-                    .map_or(true, |r| *r != id)
+                    .is_none_or(|r| *r != id)
             );
         }
     }
diff --git a/components/raftstore/src/coprocessor/split_check/half.rs b/components/raftstore/src/coprocessor/split_check/half.rs
index 1f4527128d8..64f8e07ddd0 100644
--- a/components/raftstore/src/coprocessor/split_check/half.rs
+++ b/components/raftstore/src/coprocessor/split_check/half.rs
@@ -6,7 +6,7 @@ use tikv_util::{box_try, config::ReadableSize};
 
 use super::{
     super::{
-        error::Result, Coprocessor, KeyEntry, ObserverContext, SplitCheckObserver, SplitChecker,
+        Coprocessor, KeyEntry, ObserverContext, SplitCheckObserver, SplitChecker, error::Result,
     },
     Host,
 };
@@ -126,7 +126,7 @@ mod tests {
     use std::{iter, sync::mpsc};
 
     use engine_test::ctor::{CfOptions, DbOptions};
-    use engine_traits::{MiscExt, SyncMutable, ALL_CFS, CF_DEFAULT, LARGE_CFS};
+    use engine_traits::{ALL_CFS, CF_DEFAULT, LARGE_CFS, MiscExt, SyncMutable};
     use kvproto::{
         metapb::{Peer, Region},
         pdpb::CheckPolicy,
@@ -140,7 +140,7 @@ mod tests {
         *,
     };
     use crate::{
-        coprocessor::{dispatcher::SchedTask, Config, CoprocessorHost},
+        coprocessor::{Config, CoprocessorHost, dispatcher::SchedTask},
         store::{BucketRange, SplitCheckRunner, SplitCheckTask},
     };
 
@@ -161,8 +161,12 @@ mod tests {
             region_max_size: Some(ReadableSize(BUCKET_NUMBER_LIMIT as u64)),
             ..Default::default()
         };
-        let mut runnable =
-            SplitCheckRunner::new(engine.clone(), tx.clone(), CoprocessorHost::new(tx, cfg));
+        let mut runnable = SplitCheckRunner::new(
+            engine.clone(),
+            tx.clone(),
+            CoprocessorHost::new(tx, cfg),
+            None,
+        );
 
         // so split key will be z0005
         for i in 0..11 {
@@ -206,8 +210,12 @@ mod tests {
             region_max_size: Some(ReadableSize(BUCKET_NUMBER_LIMIT as u64)),
             ..Default::default()
         };
-        let mut runnable =
-            SplitCheckRunner::new(engine.clone(), tx.clone(), CoprocessorHost::new(tx, cfg));
+        let mut runnable = SplitCheckRunner::new(
+            engine.clone(),
+            tx.clone(),
+            CoprocessorHost::new(tx, cfg),
+            None,
+        );
 
         for i in 0..11 {
             let k = format!("{:04}", i).into_bytes();
@@ -273,7 +281,7 @@ mod tests {
             ..Default::default()
         };
         let cop_host = CoprocessorHost::new(tx.clone(), cfg);
-        let mut runnable = SplitCheckRunner::new(engine.clone(), tx, cop_host.clone());
+        let mut runnable = SplitCheckRunner::new(engine.clone(), tx, cop_host.clone(), None);
 
         let key_gen = |k: &[u8], i: u64, mvcc: bool| {
             if !mvcc {
@@ -396,8 +404,12 @@ mod tests {
             region_bucket_size: ReadableSize(20_u64), // so that each key below will form a bucket
             ..Default::default()
         };
-        let mut runnable =
-            SplitCheckRunner::new(engine.clone(), tx.clone(), CoprocessorHost::new(tx, cfg));
+        let mut runnable = SplitCheckRunner::new(
+            engine.clone(),
+            tx.clone(),
+            CoprocessorHost::new(tx, cfg),
+            None,
+        );
 
         // so bucket key will be all these keys
         let mut exp_bucket_keys = vec![];
@@ -488,7 +500,7 @@ mod tests {
         let engine = engine_test::kv::new_engine_opt(path, db_opts, cfs_opts).unwrap();
 
         let mut big_value = Vec::with_capacity(256);
-        big_value.extend(iter::repeat(b'v').take(256));
+        big_value.extend(iter::repeat_n(b'v', 256));
         for i in 0..100 {
             let k = format!("key_{:03}", i).into_bytes();
             let k = keys::data_key(Key::from_raw(&k).as_encoded());
diff --git a/components/raftstore/src/coprocessor/split_check/keys.rs b/components/raftstore/src/coprocessor/split_check/keys.rs
index d6a49175441..2d95a90608c 100644
--- a/components/raftstore/src/coprocessor/split_check/keys.rs
+++ b/components/raftstore/src/coprocessor/split_check/keys.rs
@@ -7,12 +7,11 @@ use tikv_util::{box_try, debug, info, warn};
 
 use super::{
     super::{
-        error::Result, metrics::*, Coprocessor, KeyEntry, ObserverContext, SplitCheckObserver,
-        SplitChecker,
+        Coprocessor, KeyEntry, ObserverContext, SplitCheckObserver, SplitChecker, error::Result,
+        metrics::*,
     },
-    calc_split_keys_count,
+    Host, calc_split_keys_count,
     size::get_approximate_split_keys,
-    Host,
 };
 use crate::coprocessor::dispatcher::StoreHandle;
 
@@ -209,10 +208,10 @@ pub fn get_region_approximate_keys(
 
 #[cfg(test)]
 mod tests {
-    use std::{cmp, sync::mpsc, u64};
+    use std::{cmp, sync::mpsc};
 
     use engine_test::ctor::{CfOptions, DbOptions};
-    use engine_traits::{KvEngine, MiscExt, SyncMutable, ALL_CFS, CF_DEFAULT, CF_WRITE, LARGE_CFS};
+    use engine_traits::{ALL_CFS, CF_DEFAULT, CF_WRITE, KvEngine, LARGE_CFS, MiscExt, SyncMutable};
     use kvproto::{
         metapb::{Peer, Region},
         pdpb::CheckPolicy,
@@ -232,7 +231,7 @@ mod tests {
         *,
     };
     use crate::{
-        coprocessor::{dispatcher::SchedTask, Config, CoprocessorHost},
+        coprocessor::{Config, CoprocessorHost, dispatcher::SchedTask},
         store::{SplitCheckRunner, SplitCheckTask},
     };
 
@@ -289,8 +288,12 @@ mod tests {
             ..Default::default()
         };
 
-        let mut runnable =
-            SplitCheckRunner::new(engine.clone(), tx.clone(), CoprocessorHost::new(tx, cfg));
+        let mut runnable = SplitCheckRunner::new(
+            engine.clone(),
+            tx.clone(),
+            CoprocessorHost::new(tx, cfg),
+            None,
+        );
 
         // so split key will be z0080
         put_data(&engine, 0, 90, false);
@@ -410,8 +413,12 @@ mod tests {
             ..Default::default()
         };
 
-        let mut runnable =
-            SplitCheckRunner::new(engine.clone(), tx.clone(), CoprocessorHost::new(tx, cfg));
+        let mut runnable = SplitCheckRunner::new(
+            engine.clone(),
+            tx.clone(),
+            CoprocessorHost::new(tx, cfg),
+            None,
+        );
 
         put_data(&engine, 0, 90, false);
         runnable.run(SplitCheckTask::split_check(
@@ -599,6 +606,7 @@ mod tests {
             engine.clone(),
             tx.clone(),
             CoprocessorHost::new(tx.clone(), cfg.clone()),
+            None,
         );
 
         put_data(&engine, 0, 90, false);
@@ -625,7 +633,7 @@ mod tests {
         // exists, it will result in split by keys failed.
         cfg.region_max_size = Some(ReadableSize(region_size * 6 / 5));
         cfg.region_split_size = Some(ReadableSize(region_size * 4 / 5));
-        runnable = SplitCheckRunner::new(engine, tx.clone(), CoprocessorHost::new(tx, cfg));
+        runnable = SplitCheckRunner::new(engine, tx.clone(), CoprocessorHost::new(tx, cfg), None);
         runnable.run(SplitCheckTask::split_check(
             region.clone(),
             true,
diff --git a/components/raftstore/src/coprocessor/split_check/mod.rs b/components/raftstore/src/coprocessor/split_check/mod.rs
index e92000f2c95..bf8aecb1a74 100644
--- a/components/raftstore/src/coprocessor/split_check/mod.rs
+++ b/components/raftstore/src/coprocessor/split_check/mod.rs
@@ -9,12 +9,12 @@ use kvproto::{metapb::Region, pdpb::CheckPolicy};
 use tikv_util::box_try;
 
 pub use self::{
-    half::{get_region_approximate_middle, HalfCheckObserver},
-    keys::{get_region_approximate_keys, KeysCheckObserver},
-    size::{get_region_approximate_size, SizeCheckObserver},
+    half::{HalfCheckObserver, get_region_approximate_middle},
+    keys::{KeysCheckObserver, get_region_approximate_keys},
+    size::{SizeCheckObserver, get_region_approximate_size},
     table::TableCheckObserver,
 };
-use super::{config::Config, error::Result, Bucket, KeyEntry, ObserverContext, SplitChecker};
+use super::{Bucket, KeyEntry, ObserverContext, SplitChecker, config::Config, error::Result};
 
 pub struct Host<'a, E> {
     checkers: Vec<Box<dyn SplitChecker<E>>>,
diff --git a/components/raftstore/src/coprocessor/split_check/size.rs b/components/raftstore/src/coprocessor/split_check/size.rs
index e5048a83826..8e13d57fd6b 100644
--- a/components/raftstore/src/coprocessor/split_check/size.rs
+++ b/components/raftstore/src/coprocessor/split_check/size.rs
@@ -7,10 +7,10 @@ use tikv_util::{box_try, debug, info, warn};
 
 use super::{
     super::{
-        error::Result, metrics::*, Coprocessor, KeyEntry, ObserverContext, SplitCheckObserver,
-        SplitChecker,
+        Coprocessor, KeyEntry, ObserverContext, SplitCheckObserver, SplitChecker, error::Result,
+        metrics::*,
     },
-    calc_split_keys_count, Host,
+    Host, calc_split_keys_count,
 };
 use crate::coprocessor::dispatcher::StoreHandle;
 
@@ -234,7 +234,7 @@ pub fn get_approximate_split_keys(
 
 #[cfg(test)]
 pub mod tests {
-    use std::{assert_matches::assert_matches, iter, sync::mpsc, u64};
+    use std::{assert_matches::assert_matches, iter, sync::mpsc};
 
     use collections::HashSet;
     use engine_test::{
@@ -242,7 +242,7 @@ pub mod tests {
         kv::KvTestEngine,
     };
     use engine_traits::{
-        CfName, MiscExt, SyncMutable, ALL_CFS, CF_DEFAULT, CF_LOCK, CF_WRITE, LARGE_CFS,
+        ALL_CFS, CF_DEFAULT, CF_LOCK, CF_WRITE, CfName, LARGE_CFS, MiscExt, SyncMutable,
     };
     use kvproto::{
         metapb::{Peer, Region},
@@ -255,7 +255,7 @@ pub mod tests {
     use super::{Checker, *};
     use crate::{
         coprocessor::{
-            dispatcher::SchedTask, Config, CoprocessorHost, ObserverContext, SplitChecker,
+            Config, CoprocessorHost, ObserverContext, SplitChecker, dispatcher::SchedTask,
         },
         store::{BucketRange, KeyEntry, SplitCheckRunner, SplitCheckTask},
     };
@@ -454,8 +454,12 @@ pub mod tests {
             ..Default::default()
         };
 
-        let mut runnable =
-            SplitCheckRunner::new(engine.clone(), tx.clone(), CoprocessorHost::new(tx, cfg));
+        let mut runnable = SplitCheckRunner::new(
+            engine.clone(),
+            tx.clone(),
+            CoprocessorHost::new(tx, cfg),
+            None,
+        );
 
         // so split key will be [z0006]
         for i in 0..7 {
@@ -590,7 +594,7 @@ pub mod tests {
             }
         };
         let cop_host = CoprocessorHost::new(tx.clone(), cfg);
-        let mut runnable = SplitCheckRunner::new(engine.clone(), tx, cop_host.clone());
+        let mut runnable = SplitCheckRunner::new(engine.clone(), tx, cop_host.clone(), None);
         for i in 0..1000 {
             // if not mvcc, kv size is (6+1)*2 = 14, given bucket size is 3000, expect each
             // bucket has about 210 keys if mvcc, kv size is about 18*2 = 36, expect each
@@ -774,6 +778,7 @@ pub mod tests {
             engine.clone(),
             tx.clone(),
             CoprocessorHost::new(tx.clone(), cfg.clone()),
+            None,
         );
 
         for cf in LARGE_CFS {
@@ -810,8 +815,12 @@ pub mod tests {
         let engine =
             engine_test::kv::new_engine_opt(path_str, DbOptions::default(), cfs_opts).unwrap();
 
-        let mut runnable =
-            SplitCheckRunner::new(engine.clone(), tx.clone(), CoprocessorHost::new(tx, cfg));
+        let mut runnable = SplitCheckRunner::new(
+            engine.clone(),
+            tx.clone(),
+            CoprocessorHost::new(tx, cfg),
+            None,
+        );
 
         // Flush a sst of CF_LOCK with range properties.
         for i in 7..15 {
@@ -896,7 +905,7 @@ pub mod tests {
         );
 
         let mut big_value = Vec::with_capacity(256);
-        big_value.extend(iter::repeat(b'v').take(256));
+        big_value.extend(iter::repeat_n(b'v', 256));
         for i in 0..100 {
             let k = format!("key_{:03}", i).into_bytes();
             let k = keys::data_key(Key::from_raw(&k).as_encoded());
@@ -923,7 +932,7 @@ pub mod tests {
         let engine = engine_test::kv::new_engine_opt(path, db_opts, cfs_opts).unwrap();
 
         let mut big_value = Vec::with_capacity(256);
-        big_value.extend(iter::repeat(b'v').take(256));
+        big_value.extend(iter::repeat_n(b'v', 256));
 
         for i in 0..4 {
             let k = format!("key_{:03}", i).into_bytes();
diff --git a/components/raftstore/src/coprocessor/split_check/table.rs b/components/raftstore/src/coprocessor/split_check/table.rs
index df825bc2641..76331228872 100644
--- a/components/raftstore/src/coprocessor/split_check/table.rs
+++ b/components/raftstore/src/coprocessor/split_check/table.rs
@@ -2,7 +2,7 @@
 
 use std::cmp::Ordering;
 
-use engine_traits::{IterOptions, Iterator, KvEngine, CF_WRITE};
+use engine_traits::{CF_WRITE, IterOptions, Iterator, KvEngine};
 use error_code::ErrorCodeExt;
 use kvproto::{metapb::Region, pdpb::CheckPolicy};
 use tidb_query_datatype::codec::table as table_codec;
@@ -229,7 +229,7 @@ mod tests {
     use std::{io::Write, sync::mpsc};
 
     use engine_test::kv::new_engine;
-    use engine_traits::{SyncMutable, ALL_CFS};
+    use engine_traits::{ALL_CFS, SyncMutable};
     use kvproto::{metapb::Peer, pdpb::CheckPolicy};
     use tempfile::Builder;
     use tidb_query_datatype::codec::table::{TABLE_PREFIX, TABLE_PREFIX_KEY_LEN};
@@ -238,7 +238,7 @@ mod tests {
 
     use super::*;
     use crate::{
-        coprocessor::{dispatcher::SchedTask, Config, CoprocessorHost},
+        coprocessor::{Config, CoprocessorHost, dispatcher::SchedTask},
         store::{SplitCheckRunner, SplitCheckTask},
     };
 
@@ -335,7 +335,7 @@ mod tests {
 
         // Try to ignore the ApproximateRegionSize
         let coprocessor = CoprocessorHost::new(stx, cfg);
-        let mut runnable = SplitCheckRunner::new(engine.clone(), tx, coprocessor);
+        let mut runnable = SplitCheckRunner::new(engine.clone(), tx, coprocessor, None);
 
         type Case = (Option<Vec<u8>>, Option<Vec<u8>>, Option<i64>);
         let mut check_cases = |cases: Vec<Case>| {
diff --git a/components/raftstore/src/coprocessor/split_observer.rs b/components/raftstore/src/coprocessor/split_observer.rs
index 8b8015ff5da..f79bbd115b0 100644
--- a/components/raftstore/src/coprocessor/split_observer.rs
+++ b/components/raftstore/src/coprocessor/split_observer.rs
@@ -8,7 +8,7 @@ use kvproto::{
 use tikv_util::{box_err, box_try, codec::bytes, warn};
 
 use super::{AdminObserver, Coprocessor, ObserverContext, Result as CopResult};
-use crate::{store::util, Error};
+use crate::{Error, store::util};
 
 pub const NO_VALID_SPLIT_KEY: &str = "no valid key found for split.";
 
@@ -168,7 +168,7 @@ mod tests {
         raft_cmdpb::{AdminCmdType, AdminRequest, SplitRequest},
     };
     use tidb_query_datatype::{
-        codec::{datum, table, Datum},
+        codec::{Datum, datum, table},
         expr::EvalContext,
     };
     use tikv_util::codec::bytes::encode_bytes;
diff --git a/components/raftstore/src/errors.rs b/components/raftstore/src/errors.rs
index fce8eb2ef16..f5e830ff4a6 100644
--- a/components/raftstore/src/errors.rs
+++ b/components/raftstore/src/errors.rs
@@ -9,7 +9,7 @@ use protobuf::ProtobufError;
 use thiserror::Error;
 use tikv_util::{
     codec,
-    deadline::{set_deadline_exceeded_busy_error, DeadlineError},
+    deadline::{DeadlineError, set_deadline_exceeded_busy_error},
 };
 
 use super::{coprocessor::Error as CopError, store::SnapError};
diff --git a/components/raftstore/src/lib.rs b/components/raftstore/src/lib.rs
index b8fbd2ac9af..b57625d1ffe 100644
--- a/components/raftstore/src/lib.rs
+++ b/components/raftstore/src/lib.rs
@@ -2,20 +2,19 @@
 
 #![cfg_attr(test, feature(test))]
 #![feature(cell_update)]
-#![feature(div_duration)]
 #![feature(min_specialization)]
 #![feature(box_patterns)]
-#![feature(hash_extract_if)]
 #![feature(let_chains)]
 #![feature(assert_matches)]
 #![feature(type_alias_impl_trait)]
 #![feature(impl_trait_in_assoc_type)]
 #![recursion_limit = "256"]
+// `Instant` does not implement the "Ord" trait.
+// So type `TtlRange` can't derive Ord trait directly.
+#![allow(clippy::derive_ord_xor_partial_ord)]
 
 #[cfg(test)]
 extern crate test;
-#[macro_use]
-extern crate derivative;
 #[cfg(feature = "engine_rocks")]
 pub mod compacted_event_sender;
 
diff --git a/components/raftstore/src/router.rs b/components/raftstore/src/router.rs
index afa8b831ba2..6a96d6cbed8 100644
--- a/components/raftstore/src/router.rs
+++ b/components/raftstore/src/router.rs
@@ -15,13 +15,13 @@ use slog_global::warn;
 use tikv_util::time::ThreadReadId;
 
 use crate::{
+    DiscardReason, Error as RaftStoreError, Result as RaftStoreResult,
     store::{
-        fsm::{ChangeObserver, RaftRouter},
-        transport::{CasualRouter, ProposalRouter, SignificantRouter},
         Callback, CasualMessage, LocalReader, PeerMsg, RaftCmdExtraOpts, RaftCommand,
         SignificantMsg, StoreMsg, StoreRouter,
+        fsm::{ChangeObserver, RaftRouter},
+        transport::{CasualRouter, ProposalRouter, SignificantRouter},
     },
-    DiscardReason, Error as RaftStoreError, Result as RaftStoreResult,
 };
 /// Routes messages to the raftstore.
 pub trait RaftStoreRouter<EK>:
@@ -401,6 +401,14 @@ impl<EK: KvEngine, ER: RaftEngine> crate::coprocessor::StoreHandle for RaftRoute
             },
         );
     }
+
+    fn update_compaction_declined_bytes(&self, region_id: u64, bytes: u64) {
+        let _ = CasualRouter::send(
+            self,
+            region_id,
+            CasualMessage::CompactionDeclinedBytes { bytes },
+        );
+    }
 }
 
 /// A handle for cdc and pitr to schedule some command back to raftstore.
diff --git a/components/raftstore/src/store/async_io/read.rs b/components/raftstore/src/store/async_io/read.rs
index 006fe0eb24c..cddcce2ea3f 100644
--- a/components/raftstore/src/store/async_io/read.rs
+++ b/components/raftstore/src/store/async_io/read.rs
@@ -4,8 +4,8 @@ use std::{
     fmt,
     marker::PhantomData,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     },
 };
 
@@ -14,15 +14,15 @@ use fail::fail_point;
 use file_system::{IoType, WithIoType};
 use kvproto::raft_serverpb::{PeerState, RaftSnapshotData, RegionLocalState};
 use protobuf::Message;
-use raft::{eraftpb::Snapshot, GetEntriesContext};
+use raft::{GetEntriesContext, eraftpb::Snapshot};
 use tikv_util::{error, info, time::Instant, worker::Runnable};
 
 use crate::store::{
+    MAX_INIT_ENTRY_COUNT, RaftlogFetchResult, TabletSnapKey, TabletSnapManager,
     metrics::{SNAPSHOT_KV_COUNT_HISTOGRAM, SNAPSHOT_SIZE_HISTOGRAM},
     snap::TABLET_SNAPSHOT_VERSION,
     util,
     worker::metrics::{SNAP_COUNTER, SNAP_HISTOGRAM},
-    RaftlogFetchResult, TabletSnapKey, TabletSnapManager, MAX_INIT_ENTRY_COUNT,
 };
 
 pub enum ReadTask<EK> {
diff --git a/components/raftstore/src/store/async_io/write.rs b/components/raftstore/src/store/async_io/write.rs
index 7f32b1aaf71..9f0a21159cd 100644
--- a/components/raftstore/src/store/async_io/write.rs
+++ b/components/raftstore/src/store/async_io/write.rs
@@ -21,7 +21,7 @@ use engine_traits::{
 };
 use error_code::ErrorCodeExt;
 use fail::fail_point;
-use file_system::{set_io_type, IoType};
+use file_system::{IoType, set_io_type};
 use health_controller::types::LatencyInspector;
 use kvproto::{
     metapb::RegionEpoch,
@@ -31,8 +31,8 @@ use parking_lot::Mutex;
 use protobuf::Message;
 use raft::eraftpb::Entry;
 use resource_control::{
-    channel::{bounded, Receiver},
     ResourceConsumeType, ResourceController, ResourceMetered,
+    channel::{Receiver, bounded},
 };
 use tikv_util::{
     box_err,
@@ -40,22 +40,23 @@ use tikv_util::{
     debug, info, slow_log,
     sys::thread::StdThreadBuildWrapper,
     thd_name,
-    time::{duration_to_sec, setup_for_spin_interval, spin_at_least, Duration, Instant},
+    time::{Duration, Instant, duration_to_sec, setup_for_spin_interval, spin_at_least},
     warn,
 };
 use tracker::TrackerTokenArray;
 
 use super::write_router::{SharedSenders, WriteSenders};
 use crate::{
+    Result,
     store::{
+        PeerMsg,
         config::Config,
         fsm::RaftRouter,
         local_metrics::{RaftSendMessageMetrics, StoreWriteMetrics, TimeTracker},
         metrics::*,
         transport::Transport,
-        util, PeerMsg,
+        util,
     },
-    Result,
 };
 
 const KV_WB_SHRINK_SIZE: usize = 1024 * 1024;
@@ -237,7 +238,7 @@ where
         !(self.raft_state.is_none()
             && self.entries.is_empty()
             && self.extra_write.is_empty()
-            && self.raft_wb.as_ref().map_or(true, |wb| wb.is_empty()))
+            && self.raft_wb.as_ref().is_none_or(|wb| wb.is_empty()))
     }
 
     /// Append continous entries.
diff --git a/components/raftstore/src/store/async_io/write_router.rs b/components/raftstore/src/store/async_io/write_router.rs
index 3669fddd613..0747c63a441 100644
--- a/components/raftstore/src/store/async_io/write_router.rs
+++ b/components/raftstore/src/store/async_io/write_router.rs
@@ -7,8 +7,8 @@ use std::{
     mem,
     ops::Index,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
     time::Duration,
 };
@@ -123,7 +123,7 @@ where
         ctx: &mut C,
         persisted_number: u64,
     ) {
-        if self.last_unpersisted.map_or(true, |n| n > persisted_number) {
+        if self.last_unpersisted.is_none_or(|n| n > persisted_number) {
             return;
         }
         // The peer must be destroyed after all previous write tasks have been finished.
@@ -354,7 +354,7 @@ pub(crate) mod tests {
     use std::thread;
 
     use engine_test::{kv::KvTestEngine, raft::RaftTestEngine};
-    use resource_control::channel::{bounded, Receiver};
+    use resource_control::channel::{Receiver, bounded};
     use tikv_util::config::ReadableDuration;
 
     use super::*;
diff --git a/components/raftstore/src/store/async_io/write_tests.rs b/components/raftstore/src/store/async_io/write_tests.rs
index aa6bd8aca3c..7aaa578c9e3 100644
--- a/components/raftstore/src/store/async_io/write_tests.rs
+++ b/components/raftstore/src/store/async_io/write_tests.rs
@@ -3,7 +3,7 @@
 use std::{sync::mpsc, time::Duration};
 
 use collections::HashSet;
-use crossbeam::channel::{unbounded, Receiver, Sender};
+use crossbeam::channel::{Receiver, Sender, unbounded};
 use engine_test::{kv::KvTestEngine, new_temp_engine, raft::RaftTestEngine};
 use engine_traits::{Engines, Mutable, Peekable, RaftEngineReadOnly, WriteBatchExt};
 use kvproto::{
@@ -16,11 +16,11 @@ use tempfile::Builder;
 
 use super::*;
 use crate::{
+    Result,
     store::{
-        async_io::write_router::tests::TestContext, local_metrics::RaftMetrics,
-        peer_storage::tests::new_entry, Config, Transport, WriteRouter,
+        Config, Transport, WriteRouter, async_io::write_router::tests::TestContext,
+        local_metrics::RaftMetrics, peer_storage::tests::new_entry,
     },
-    Result,
 };
 type TestKvWriteBatch = <KvTestEngine as WriteBatchExt>::WriteBatch;
 type TestRaftLogBatch = <RaftTestEngine as RaftEngine>::LogBatch;
diff --git a/components/raftstore/src/store/bootstrap.rs b/components/raftstore/src/store/bootstrap.rs
index 249ae4b704f..f959e754788 100644
--- a/components/raftstore/src/store/bootstrap.rs
+++ b/components/raftstore/src/store/bootstrap.rs
@@ -1,6 +1,6 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_traits::{Engines, KvEngine, Mutable, RaftEngine, WriteBatch, CF_DEFAULT, CF_RAFT};
+use engine_traits::{CF_DEFAULT, CF_RAFT, Engines, KvEngine, Mutable, RaftEngine, WriteBatch};
 use kvproto::{
     metapb,
     raft_serverpb::{RaftLocalState, RegionLocalState, StoreIdent},
@@ -8,7 +8,7 @@ use kvproto::{
 use tikv_util::{box_err, box_try, store::new_peer};
 
 use super::peer_storage::{
-    write_initial_apply_state, write_initial_raft_state, INIT_EPOCH_CONF_VER, INIT_EPOCH_VER,
+    INIT_EPOCH_CONF_VER, INIT_EPOCH_VER, write_initial_apply_state, write_initial_raft_state,
 };
 use crate::Result;
 
@@ -123,7 +123,7 @@ pub fn clear_prepare_bootstrap_key(
 #[cfg(test)]
 mod tests {
     use engine_traits::{
-        Engines, Peekable, RaftEngineDebug, RaftEngineReadOnly, RaftLogBatch, CF_DEFAULT,
+        CF_DEFAULT, Engines, Peekable, RaftEngineDebug, RaftEngineReadOnly, RaftLogBatch,
     };
     use tempfile::Builder;
 
diff --git a/components/raftstore/src/store/compaction_guard.rs b/components/raftstore/src/store/compaction_guard.rs
index 992f0856556..d57a81e3cd2 100644
--- a/components/raftstore/src/store/compaction_guard.rs
+++ b/components/raftstore/src/store/compaction_guard.rs
@@ -1,17 +1,22 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::ffi::CString;
+use std::{
+    cmp::Ordering,
+    ffi::CString,
+    sync::{Arc, RwLock},
+    time::Duration,
+};
 
 use engine_traits::{
-    CfName, SstPartitioner, SstPartitionerContext, SstPartitionerFactory, SstPartitionerRequest,
-    SstPartitionerResult, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, CfName, SstPartitioner, SstPartitionerContext,
+    SstPartitionerFactory, SstPartitionerRequest, SstPartitionerResult,
 };
 use keys::{data_end_key, origin_key};
 use lazy_static::lazy_static;
-use tikv_util::warn;
+use tikv_util::{time::Instant, warn};
 
 use super::metrics::*;
-use crate::{coprocessor::RegionInfoProvider, Error, Result};
+use crate::{Error, Result, coprocessor::RegionInfoProvider};
 
 const COMPACTION_GUARD_MAX_POS_SKIP: u32 = 10;
 
@@ -19,11 +24,146 @@ lazy_static! {
     static ref COMPACTION_GUARD: CString = CString::new(b"CompactionGuard".to_vec()).unwrap();
 }
 
+#[derive(Eq, PartialEq, PartialOrd, Clone)]
+struct TtlRange {
+    start: Vec<u8>,
+    end: Vec<u8>,
+    expired_at: Instant,
+}
+
+impl TtlRange {
+    #[cfg(test)]
+    fn new(start: Vec<u8>, end: Vec<u8>, expired_at: Instant) -> Self {
+        Self {
+            start,
+            end,
+            expired_at,
+        }
+    }
+}
+
+impl Ord for TtlRange {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.partial_cmp(other).unwrap_or(Ordering::Equal)
+    }
+}
+
+impl std::fmt::Debug for TtlRange {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "Range({:?}, {:?})",
+            log_wrappers::Value(&self.start),
+            log_wrappers::Value(&self.end)
+        )
+    }
+}
+
+#[derive(Clone, Default)]
+pub struct ForcePartitionRangeManager {
+    force_partition_ranges: Arc<RwLock<Vec<TtlRange>>>,
+}
+
+impl ForcePartitionRangeManager {
+    pub fn add_range(&self, start: Vec<u8>, end: Vec<u8>, ttl: u64) -> bool {
+        let expires = Instant::now_coarse() + Duration::from_secs(ttl);
+        let mut ranges = self.force_partition_ranges.write().unwrap();
+        for r in &mut *ranges {
+            if r.start == start && r.end == end {
+                // prolong the ttl if needed.
+                if r.expired_at < expires {
+                    r.expired_at = expires;
+                }
+                return false;
+            }
+        }
+        ranges.push(TtlRange {
+            start,
+            end,
+            expired_at: expires,
+        });
+        ranges.sort();
+        true
+    }
+
+    pub fn remove_range(&self, start: &[u8], end: &[u8]) -> bool {
+        let mut ranges = self.force_partition_ranges.write().unwrap();
+        let mut removed = false;
+        ranges.retain(|r| {
+            let ne = r.start != start || r.end != end;
+            if !ne {
+                removed = true;
+            }
+            ne
+        });
+        removed
+    }
+
+    fn get_overlapped_ranges(&self, start: &[u8], end: &[u8]) -> Vec<TtlRange> {
+        let mut ranges: Vec<TtlRange> = vec![];
+        let now = Instant::now_coarse();
+        let mut clean = false;
+        for rg in &*self.force_partition_ranges.read().unwrap() {
+            if rg.expired_at < now {
+                clean = true;
+                continue;
+            }
+            if *rg.start < *end && *rg.end > *start {
+                // try to merge overlapping or adjacent range into a bigger range.
+                let idx = ranges.len().saturating_sub(1);
+                if !ranges.is_empty() && ranges[idx].end >= rg.start {
+                    if ranges[idx].end < rg.end {
+                        ranges[idx].end = rg.end.clone();
+                    }
+                } else {
+                    ranges.push(rg.clone());
+                }
+            }
+        }
+        if clean {
+            self.remove_outdated_ranges();
+        }
+        ranges
+    }
+
+    fn remove_outdated_ranges(&self) {
+        let now = Instant::now_coarse();
+        self.force_partition_ranges.write().unwrap().retain(|r| {
+            let keep = r.expired_at > now;
+            if !keep {
+                tikv_util::info!("remove outdated force partition range"; "start" => ?log_wrappers::Value(&r.start), "end" => ?log_wrappers::Value(&r.end));
+            }
+            keep
+        });
+    }
+
+    pub fn iter_all_ranges(&self, mut func: impl FnMut(&[u8], &[u8], u64)) {
+        let now = Instant::now_coarse();
+        let mut need_clean = false;
+        self.force_partition_ranges
+            .read()
+            .unwrap()
+            .iter()
+            .for_each(|r| {
+                let expired = r.expired_at.saturating_duration_since(now);
+                if expired == Duration::ZERO {
+                    need_clean = true;
+                    return;
+                }
+                func(&r.start, &r.end, expired.as_secs());
+            });
+        if need_clean {
+            self.remove_outdated_ranges();
+        }
+    }
+}
+
 pub struct CompactionGuardGeneratorFactory<P: RegionInfoProvider> {
     cf_name: CfNames,
     provider: P,
     min_output_file_size: u64,
     max_compaction_size: u64,
+    partition_range_mgr: ForcePartitionRangeManager,
 }
 
 impl<P: RegionInfoProvider> CompactionGuardGeneratorFactory<P> {
@@ -32,6 +172,7 @@ impl<P: RegionInfoProvider> CompactionGuardGeneratorFactory<P> {
         provider: P,
         min_output_file_size: u64,
         max_compaction_size: u64,
+        partition_range_mgr: ForcePartitionRangeManager,
     ) -> Result<Self> {
         let cf_name = match cf {
             CF_DEFAULT => CfNames::default,
@@ -50,6 +191,7 @@ impl<P: RegionInfoProvider> CompactionGuardGeneratorFactory<P> {
             provider,
             min_output_file_size,
             max_compaction_size,
+            partition_range_mgr,
         })
     }
 }
@@ -66,6 +208,10 @@ impl<P: RegionInfoProvider + Clone + 'static> SstPartitionerFactory
     }
 
     fn create_partitioner(&self, context: &SstPartitionerContext<'_>) -> Option<Self::Partitioner> {
+        let force_partition_ranges = self
+            .partition_range_mgr
+            .get_overlapped_ranges(context.smallest_key, context.largest_key);
+
         // create_partitioner can be called in RocksDB while holding db_mutex. It can
         // block other operations on RocksDB. To avoid such cases, we defer
         // region info query to the first time should_partition is called.
@@ -88,6 +234,7 @@ impl<P: RegionInfoProvider + Clone + 'static> SstPartitionerFactory
             next_level_size: context.next_level_sizes.clone(),
             current_next_level_size: 0,
             max_compaction_size: self.max_compaction_size,
+            force_partition_ranges,
         })
     }
 }
@@ -116,6 +263,7 @@ pub struct CompactionGuardGenerator<P: RegionInfoProvider> {
     next_level_pos: usize,
     current_next_level_size: u64,
     max_compaction_size: u64,
+    force_partition_ranges: Vec<TtlRange>,
 }
 
 impl<P: RegionInfoProvider> CompactionGuardGenerator<P> {
@@ -152,8 +300,14 @@ impl<P: RegionInfoProvider> CompactionGuardGenerator<P> {
                     let mut boundaries = regions
                         .iter()
                         .map(|region| data_end_key(&region.end_key))
+                        .chain(
+                            self.force_partition_ranges
+                                .iter()
+                                .flat_map(|r| [r.start.clone(), r.end.clone()].into_iter()),
+                        )
                         .collect::<Vec<Vec<u8>>>();
                     boundaries.sort();
+                    boundaries.dedup();
                     self.boundaries = boundaries;
                     true
                 }
@@ -174,6 +328,20 @@ impl<P: RegionInfoProvider> CompactionGuardGenerator<P> {
     }
 }
 
+fn overlap_with(ranges: &[TtlRange], last_key: &[u8], next_key: &[u8]) -> bool {
+    // do not partition at the same key.
+    if last_key >= next_key {
+        return false;
+    }
+    if ranges.is_empty() {
+        return false;
+    }
+    // find the range who's end_key is larger than the start_key
+    let check_idx = ranges.partition_point(|r| *last_key >= *r.end);
+    // if the range's start key is smaller than next_key, then it should overlap.
+    check_idx < ranges.len() && *next_key > *ranges[check_idx].start
+}
+
 impl<P: RegionInfoProvider> SstPartitioner for CompactionGuardGenerator<P> {
     fn should_partition(&mut self, req: &SstPartitionerRequest<'_>) -> SstPartitionerResult {
         if !self.initialized {
@@ -211,6 +379,7 @@ impl<P: RegionInfoProvider> SstPartitioner for CompactionGuardGenerator<P> {
             if req.current_output_file_size >= self.min_output_file_size
                 // Or, the output file may make a huge compaction even greater than the max compaction size.
                 || self.current_next_level_size >= self.max_compaction_size
+                || overlap_with(&self.force_partition_ranges, req.prev_user_key, req.current_user_key)
             {
                 COMPACTION_GUARD_ACTION_COUNTER
                     .get(self.cf_name)
@@ -228,6 +397,29 @@ impl<P: RegionInfoProvider> SstPartitioner for CompactionGuardGenerator<P> {
                 // greater than the `max-sst-size`, which is tiny comparing to the
                 // `max-compaction-size` usually.
                 self.current_next_level_size = 0;
+                if req.current_output_file_size < self.min_output_file_size
+                    && self.current_next_level_size < self.max_compaction_size
+                {
+                    let last_pos = if self.pos > 0 {
+                        self.boundaries[self.pos].as_slice()
+                    } else {
+                        &[]
+                    };
+                    let next_pos = if self.pos > 0 && self.pos < self.boundaries.len() - 1 {
+                        self.boundaries[self.pos + 1].as_slice()
+                    } else {
+                        &[]
+                    };
+
+                    tikv_util::info!("sst partition due to force partition ranges";
+                        "prev_key" => ?log_wrappers::Value(req.prev_user_key),
+                        "next_key" => ?log_wrappers::Value(req.current_user_key),
+                        "last_pos" => ?log_wrappers::Value(last_pos),
+                        "cur_pos" => ?log_wrappers::Value(self.boundaries[self.pos].as_slice()),
+                        "next_pos" => ?log_wrappers::Value(next_pos),
+                        "check_ranges" => ?&self.force_partition_ranges,
+                    );
+                }
                 SstPartitionerResult::Required
             } else {
                 COMPACTION_GUARD_ACTION_COUNTER
@@ -241,9 +433,9 @@ impl<P: RegionInfoProvider> SstPartitioner for CompactionGuardGenerator<P> {
         }
     }
 
-    fn can_do_trivial_move(&mut self, _smallest_key: &[u8], _largest_key: &[u8]) -> bool {
-        // Always allow trivial move
-        true
+    fn can_do_trivial_move(&mut self, smallest_key: &[u8], largest_key: &[u8]) -> bool {
+        // do not allow trivial move if the range overlaps with force partition range.
+        !overlap_with(&self.force_partition_ranges, smallest_key, largest_key)
     }
 }
 
@@ -270,13 +462,13 @@ mod tests {
 
     use collections::HashMap;
     use engine_rocks::{
+        RocksCfOptions, RocksDbOptions, RocksEngine, RocksSstPartitionerFactory, RocksSstReader,
         raw::{BlockBasedOptions, DBCompressionType},
         util::new_engine_opt,
-        RocksCfOptions, RocksDbOptions, RocksEngine, RocksSstPartitionerFactory, RocksSstReader,
     };
     use engine_traits::{
-        CompactExt, IterOptions, Iterator, ManualCompactionOptions, MiscExt, RefIterable,
-        SstReader, SyncMutable, CF_DEFAULT,
+        CF_DEFAULT, CompactExt, IterOptions, Iterator, ManualCompactionOptions, MiscExt,
+        RefIterable, SstReader, SyncMutable,
     };
     use keys::DATA_PREFIX_KEY;
     use kvproto::metapb::Region;
@@ -309,6 +501,7 @@ mod tests {
             next_level_boundaries: vec![],
             next_level_size: vec![],
             max_compaction_size: 1 << 30,
+            force_partition_ranges: vec![],
         };
 
         guard.smallest_key = keys::LOCAL_MIN_KEY.to_vec();
@@ -352,7 +545,13 @@ mod tests {
             provider: MockRegionInfoProvider::new(vec![]),
             initialized: true,
             use_guard: true,
-            boundaries: vec![b"bbb".to_vec(), b"ccc".to_vec(), b"ddd".to_vec()],
+            boundaries: vec![
+                b"bbb".to_vec(),
+                b"ccc".to_vec(),
+                b"ddd".to_vec(),
+                b"e".to_vec(),
+                b"f".to_vec(),
+            ],
             pos: 0,
             current_next_level_size: 0,
             next_level_pos: 0,
@@ -362,6 +561,11 @@ mod tests {
                 .collect(),
             next_level_size: [&[1 << 18; 99][..], &[1 << 28; 10][..]].concat(),
             max_compaction_size: 1 << 30, // 1GB
+            force_partition_ranges: vec![TtlRange::new(
+                "e".into(),
+                "f".into(),
+                Instant::now_coarse() + Duration::from_secs(100),
+            )],
         };
         // Crossing region boundary.
         let mut req = SstPartitionerRequest {
@@ -390,6 +594,60 @@ mod tests {
         assert_eq!(guard.current_next_level_size, 9 << 18);
         guard.reset_next_level_size_state();
 
+        // small output file, and not overlap with force partition boundary.
+        let cases: [(&[u8], &[u8]); 2] = [(b"dde", b"e"), (b"f", b"g")];
+        for (start, end) in cases {
+            req = SstPartitionerRequest {
+                prev_user_key: start,
+                current_user_key: end,
+                current_output_file_size: 4 << 20,
+            };
+            assert_eq!(
+                guard.should_partition(&req),
+                SstPartitionerResult::NotRequired
+            );
+            let mut idx = 0;
+            for i in &guard.boundaries {
+                if **i > *start {
+                    break;
+                }
+                idx += 1;
+            }
+            assert_eq!(guard.pos, idx, "pos: {}, idx: {}", guard.pos, idx);
+            assert_eq!(guard.next_level_pos, 110);
+            assert_eq!(guard.current_next_level_size, 0);
+            guard.reset_next_level_size_state();
+        }
+
+        // small output file, but overlap with force partition boundary.
+        let cases: [(&[u8], &[u8]); 5] = [
+            (b"abc", b"eee"),
+            (b"dde", b"eee"),
+            (b"eff", b"g"),
+            (b"e", b"f"),
+            (b"de", b"fg"),
+        ];
+        for (start, end) in cases {
+            req = SstPartitionerRequest {
+                prev_user_key: start,
+                current_user_key: end,
+                current_output_file_size: 4 << 20,
+            };
+            guard.reset_next_level_size_state();
+            guard.pos = 0;
+            guard.next_level_pos = 0;
+            guard.current_next_level_size = 0;
+            assert_eq!(
+                guard.should_partition(&req),
+                SstPartitionerResult::Required,
+                "start: {:?}, end: {:?}",
+                start,
+                end,
+            );
+        }
+        guard.pos = 0;
+        guard.next_level_pos = 0;
+        guard.current_next_level_size = 0;
         // Not crossing boundary.
         req = SstPartitionerRequest {
             prev_user_key: b"aaa",
@@ -398,7 +656,7 @@ mod tests {
         };
         assert_eq!(
             guard.should_partition(&req),
-            SstPartitionerResult::NotRequired
+            SstPartitionerResult::NotRequired,
         );
         assert_eq!(guard.pos, 0);
         assert_eq!(guard.next_level_pos, 0);
@@ -472,6 +730,7 @@ mod tests {
             next_level_boundaries: vec![],
             next_level_size: vec![],
             max_compaction_size: 1 << 30,
+            force_partition_ranges: vec![],
         };
         // Binary search meet exact match.
         guard.pos = 0;
@@ -514,6 +773,7 @@ mod tests {
                 provider,
                 MIN_OUTPUT_FILE_SIZE,
                 MAX_COMPACTION_SIZE,
+                Default::default(),
             )
             .unwrap(),
         ));
@@ -742,4 +1002,88 @@ mod tests {
         }
         res
     }
+
+    #[test]
+    fn test_overlap_with() {
+        // empty ranges
+        assert!(!overlap_with(&[], b"a", b"b"));
+
+        let ttl = Instant::now_coarse() + Duration::from_secs(10);
+        let ranges = vec![
+            TtlRange::new(b"b".to_vec(), b"c".to_vec(), ttl),
+            TtlRange::new(b"e".to_vec(), b"g".to_vec(), ttl),
+            TtlRange::new(b"j".to_vec(), b"p".to_vec(), ttl),
+        ];
+
+        let cases = [
+            (b"a".as_ref(), b"aaa".as_ref(), false),
+            (b"a", b"b", false),
+            (b"a", b"bb", true),
+            (b"a", b"c", true),
+            (b"a", b"e", true),
+            (b"a", b"j", true),
+            (b"a", b"p", true),
+            (b"a", b"z", true),
+            (b"b", b"bccc", true),
+            (b"b", b"c", true),
+            (b"b", b"d", true),
+            (b"c", b"d", false),
+            (b"c", b"e", false),
+            (b"c", b"f", true),
+            (b"c", b"g", true),
+            (b"c", b"h", true),
+            (b"g", b"h", false),
+            (b"j", b"p", true),
+            (b"jj", b"n", true),
+            (b"p", b"q", false),
+            (b"q", b"r", false),
+            // following are not overlap because start >= end
+            (b"a", b"a", false),
+            (b"b", b"a", false),
+            (b"f", b"f", false),
+            (b"z", b"a", false),
+        ];
+        for (i, (start, end, overlap)) in cases.into_iter().enumerate() {
+            assert_eq!(overlap_with(&ranges, start, end), overlap, "case: {}", i);
+        }
+    }
+
+    #[test]
+    fn test_force_partition_range() {
+        let mgr = ForcePartitionRangeManager::default();
+
+        mgr.add_range(b"h".to_vec(), b"n".to_vec(), 10);
+        mgr.add_range(b"b".to_vec(), b"f".to_vec(), 10);
+        assert!(mgr.force_partition_ranges.read().unwrap().is_sorted());
+
+        #[track_caller]
+        fn check_overlap(
+            mgr: &ForcePartitionRangeManager,
+            start: &[u8],
+            end: &[u8],
+            expect: &[(&[u8], &[u8])],
+        ) {
+            let ranges = mgr.get_overlapped_ranges(start, end);
+            assert_eq!(ranges.len(), expect.len());
+            ranges
+                .iter()
+                .zip(expect)
+                .for_each(|(got, exp)| assert!(*got.start == *exp.0 && *got.end == *exp.1));
+        }
+
+        check_overlap(&mgr, b"a", b"aa", &[]);
+        check_overlap(&mgr, b"a", b"b", &[]);
+        check_overlap(&mgr, b"a", b"c", &[(b"b", b"f")]);
+        check_overlap(&mgr, b"a", b"h", &[(b"b", b"f")]);
+        check_overlap(&mgr, b"a", b"i", &[(b"b", b"f"), (b"h", b"n")]);
+        check_overlap(&mgr, b"a", b"n", &[(b"b", b"f"), (b"h", b"n")]);
+        check_overlap(&mgr, b"a", b"z", &[(b"b", b"f"), (b"h", b"n")]);
+
+        // test overlapped ranges
+        mgr.add_range(b"b".to_vec(), b"d".to_vec(), 10);
+        check_overlap(&mgr, b"a", b"d", &[(b"b", b"f")]);
+
+        mgr.add_range(b"bb".to_vec(), b"g".to_vec(), 10);
+        check_overlap(&mgr, b"a", b"d", &[(b"b", b"g")]);
+    }
 }
diff --git a/components/raftstore/src/store/config.rs b/components/raftstore/src/store/config.rs
index ebc57653ecc..245ea14df63 100644
--- a/components/raftstore/src/store/config.rs
+++ b/components/raftstore/src/store/config.rs
@@ -1,9 +1,9 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{cmp::min, collections::HashMap, sync::Arc, time::Duration, u64};
+use std::{cmp::min, collections::HashMap, sync::Arc, time::Duration};
 
 use batch_system::Config as BatchSystemConfig;
-use engine_traits::{perf_level_serde, PerfLevel};
+use engine_traits::{PerfLevel, perf_level_serde};
 use lazy_static::lazy_static;
 use online_config::{ConfigChange, ConfigManager, ConfigValue, OnlineConfig};
 use prometheus::register_gauge_vec;
@@ -20,7 +20,7 @@ use tikv_util::{
 use time::Duration as TimeDuration;
 
 use super::worker::{RaftStoreBatchComponent, RefreshConfigTask};
-use crate::{coprocessor::config::RAFTSTORE_V2_SPLIT_SIZE, Result};
+use crate::{Result, coprocessor::config::RAFTSTORE_V2_SPLIT_SIZE};
 
 lazy_static! {
     pub static ref CONFIG_RAFTSTORE_GAUGE: prometheus::GaugeVec = register_gauge_vec!(
@@ -130,18 +130,42 @@ pub struct Config {
     /// will be checked again whether it should be split.
     pub region_split_check_diff: Option<ReadableSize>,
     /// Interval (ms) to check whether start compaction for a region.
+    #[doc(hidden)]
+    #[serde(skip_serializing)]
+    #[online_config(hidden)]
+    #[deprecated = "The configuration has been removed. Check and compact is done in GC module."]
     pub region_compact_check_interval: ReadableDuration,
     /// Number of regions for each time checking.
+    #[doc(hidden)]
+    #[serde(skip_serializing)]
+    #[online_config(hidden)]
+    #[deprecated = "The configuration has been removed. Check and compact is done in GC module."]
     pub region_compact_check_step: Option<u64>,
     /// Minimum number of tombstones to trigger manual compaction.
+    #[doc(hidden)]
+    #[serde(skip_serializing)]
+    #[online_config(hidden)]
+    #[deprecated = "The configuration has been removed. Check and compact is done in GC module."]
     pub region_compact_min_tombstones: u64,
     /// Minimum percentage of tombstones to trigger manual compaction.
     /// Should between 1 and 100.
+    #[doc(hidden)]
+    #[serde(skip_serializing)]
+    #[online_config(hidden)]
+    #[deprecated = "The configuration has been removed. Check and compact is done in GC module."]
     pub region_compact_tombstones_percent: u64,
     /// Minimum number of redundant rows to trigger manual compaction.
+    #[doc(hidden)]
+    #[serde(skip_serializing)]
+    #[online_config(hidden)]
+    #[deprecated = "The configuration has been removed. Check and compact is done in GC module."]
     pub region_compact_min_redundant_rows: u64,
     /// Minimum percentage of redundant rows to trigger manual compaction.
     /// Should between 1 and 100.
+    #[doc(hidden)]
+    #[serde(skip_serializing)]
+    #[online_config(hidden)]
+    #[deprecated = "The configuration has been removed. Check and compact is done in GC module."]
     pub region_compact_redundant_rows_percent: Option<u64>,
     pub pd_heartbeat_tick_interval: ReadableDuration,
     pub pd_store_heartbeat_tick_interval: ReadableDuration,
@@ -376,6 +400,11 @@ pub struct Config {
     #[doc(hidden)]
     #[online_config(hidden)]
     pub inspect_kvdb_interval: ReadableDuration,
+    #[doc(hidden)]
+    #[serde(skip_serializing)]
+    #[online_config(hidden)]
+    // Interval to inspect the network latency between PD and tikv for slow store detection.
+    pub inspect_network_interval: ReadableDuration,
     /// Threshold of CPU utilization to inspect for slow store detection.
     #[doc(hidden)]
     #[online_config(hidden)]
@@ -445,10 +474,39 @@ pub struct Config {
     #[online_config(hidden)]
     pub min_pending_apply_region_count: u64,
 
-    /// Whether to skip manual compaction in the clean up worker for `write` and
-    /// `default` column family
+    /// Controls whether RocksDB performs compaction at the bottommost level
+    /// during manual compaction operations.
+    ///
+    /// This option maps to `CompactRangeOptions::bottommost_level_compaction`
+    /// in RocksDB.
+    ///
+    /// Bottommost level compaction is expensive but necessary for space
+    /// reclamation and ensuring data is fully compacted. The default
+    /// behavior (`kIfHaveCompactionFilter`) only performs this operation when a
+    /// compaction filter is present, balancing performance and
+    /// functionality.
+    #[doc(hidden)]
+    #[serde(skip_serializing)]
+    #[online_config(hidden)]
+    #[deprecated = "The configuration has been removed. Check then compact is done in GC module."]
+    pub check_then_compact_force_bottommost_level: bool,
+    /// The maximum number of ranges to compact in a single check.
+    /// Set to 0 to disable the limit, meaning all ranges that have redundant
+    /// keys more than the threshold will be compacted.
+    #[doc(hidden)]
+    #[serde(skip_serializing)]
+    #[online_config(hidden)]
+    #[deprecated = "The configuration has been removed. Check then compact is done in GC module."]
+    pub check_then_compact_top_n: u64,
+    // TODO: remove this field after we have a better way to propagate the
+    // compaction filter enabled flag in GC module to raftstore.
+    // If this does not match the compaction filter enabled flag in GC module,
+    // the compaction score will be incorrect.
     #[doc(hidden)]
-    pub skip_manual_compaction_in_clean_up_worker: bool,
+    #[serde(skip_serializing)]
+    #[online_config(hidden)]
+    #[deprecated = "The configuration has been removed. Check then compact is done in GC module."]
+    pub compaction_filter_enabled: bool,
 }
 
 impl Default for Config {
@@ -482,7 +540,7 @@ impl Default for Config {
             split_region_check_tick_interval: ReadableDuration::secs(10),
             region_split_check_diff: None,
             region_compact_check_interval: ReadableDuration::minutes(5),
-            region_compact_check_step: None,
+            region_compact_check_step: Some(100),
             region_compact_min_tombstones: 10000,
             region_compact_tombstones_percent: 30,
             region_compact_min_redundant_rows: 50000,
@@ -507,12 +565,12 @@ impl Default for Config {
             leader_transfer_max_log_lag: 128,
             snap_apply_batch_size: ReadableSize::mb(10),
             snap_apply_copy_symlink: false,
-            region_worker_tick_interval: if cfg!(feature = "test") {
+            region_worker_tick_interval: if cfg!(test) {
                 ReadableDuration::millis(200)
             } else {
                 ReadableDuration::millis(1000)
             },
-            clean_stale_ranges_tick: if cfg!(feature = "test") { 1 } else { 10 },
+            clean_stale_ranges_tick: if cfg!(test) { 1 } else { 10 },
             lock_cf_compact_interval: ReadableDuration::minutes(10),
             lock_cf_compact_bytes_threshold: ReadableSize::mb(256),
             // Disable consistency check by default as it will hurt performance.
@@ -566,7 +624,8 @@ impl Default for Config {
             region_split_size: ReadableSize(0),
             clean_stale_peer_delay: ReadableDuration::minutes(0),
             inspect_interval: ReadableDuration::millis(100),
-            inspect_kvdb_interval: ReadableDuration::secs(2),
+            inspect_kvdb_interval: ReadableDuration::millis(100),
+            inspect_network_interval: ReadableDuration::millis(100),
             // The default value of `inspect_cpu_util_thd` is 0.4, which means
             // when the cpu utilization is greater than 40%, the store might be
             // regarded as a slow node if there exists delayed inspected messages.
@@ -591,7 +650,9 @@ impl Default for Config {
             enable_v2_compatible_learner: false,
             unsafe_disable_check_quorum: false,
             min_pending_apply_region_count: 10,
-            skip_manual_compaction_in_clean_up_worker: false,
+            check_then_compact_force_bottommost_level: true,
+            check_then_compact_top_n: 20,
+            compaction_filter_enabled: true,
         }
     }
 }
@@ -651,14 +712,6 @@ impl Config {
         self.follower_read_max_log_gap
     }
 
-    pub fn region_compact_check_step(&self) -> u64 {
-        self.region_compact_check_step.unwrap()
-    }
-
-    pub fn region_compact_redundant_rows_percent(&self) -> u64 {
-        self.region_compact_redundant_rows_percent.unwrap()
-    }
-
     #[inline]
     pub fn warmup_entry_cache_enabled(&self) -> bool {
         self.max_entry_cache_warmup_duration.0 != Duration::from_secs(0)
@@ -679,14 +732,6 @@ impl Config {
     }
 
     pub fn optimize_for(&mut self, raft_kv_v2: bool) {
-        if self.region_compact_check_step.is_none() {
-            if raft_kv_v2 {
-                self.region_compact_check_step = Some(5);
-            } else {
-                self.region_compact_check_step = Some(100);
-            }
-        }
-
         // When use raft kv v2, we can set raft log gc size limit to a smaller value to
         // avoid too many entry logs in cache.
         // The snapshot support to increment snapshot sst, so the old snapshot files
@@ -702,25 +747,18 @@ impl Config {
 
     /// Optimize the interval of different inspectors according to the
     /// configuration.
-    pub fn optimize_inspector(&mut self, separated_raft_mount_path: bool) {
+    pub fn tune_inspector_configs(
+        &mut self,
+        separated_raft_mount_path: bool,
+        inspect_network_interval: ReadableDuration,
+    ) {
         // If the kvdb uses the same mount path with raftdb, the health status
         // of kvdb will be inspected by raftstore automatically. So it's not necessary
         // to inspect kvdb.
         if !separated_raft_mount_path {
             self.inspect_kvdb_interval = ReadableDuration::ZERO;
-        } else {
-            // If the inspect_kvdb_interval is less than inspect_interval, it should
-            // use `inspect_interval` * 10 as an empirical inspect interval for KvDB Disk
-            // I/O.
-            let inspect_kvdb_interval = if self.inspect_kvdb_interval < self.inspect_interval
-                && self.inspect_kvdb_interval != ReadableDuration::ZERO
-            {
-                self.inspect_interval * 10
-            } else {
-                self.inspect_kvdb_interval
-            };
-            self.inspect_kvdb_interval = inspect_kvdb_interval;
         }
+        self.inspect_network_interval = inspect_network_interval;
     }
 
     pub fn validate(
@@ -865,24 +903,6 @@ impl Config {
             ));
         }
 
-        if self.region_compact_tombstones_percent < 1
-            || self.region_compact_tombstones_percent > 100
-        {
-            return Err(box_err!(
-                "region-compact-tombstones-percent must between 1 and 100, current value is {}",
-                self.region_compact_tombstones_percent
-            ));
-        }
-
-        let region_compact_redundant_rows_percent =
-            self.region_compact_redundant_rows_percent.unwrap();
-        if !(1..=100).contains(&region_compact_redundant_rows_percent) {
-            return Err(box_err!(
-                "region-compact-redundant-rows-percent must between 1 and 100, current value is {}",
-                region_compact_redundant_rows_percent
-            ));
-        }
-
         if self.local_read_batch_size == 0 {
             return Err(box_err!("local-read-batch-size must be greater than 0"));
         }
@@ -1020,7 +1040,6 @@ impl Config {
                 }
             }
         }
-        assert!(self.region_compact_check_step.is_some());
         if raft_kv_v2 && self.use_delete_range {
             return Err(box_err!(
                 "partitioned-raft-kv doesn't support RocksDB delete range."
@@ -1093,6 +1112,9 @@ impl Config {
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["raft_log_gc_size_limit"])
             .set(self.raft_log_gc_size_limit.unwrap_or_default().0 as f64);
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["max_apply_unpersisted_log_limit"])
+            .set(self.max_apply_unpersisted_log_limit as f64);
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["raft_log_reserve_max_ticks"])
             .set(self.raft_log_reserve_max_ticks as f64);
@@ -1112,27 +1134,6 @@ impl Config {
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["region_split_check_diff"])
             .set(self.region_split_check_diff.unwrap_or_default().0 as f64);
-        CONFIG_RAFTSTORE_GAUGE
-            .with_label_values(&["region_compact_check_interval"])
-            .set(self.region_compact_check_interval.as_secs_f64());
-        CONFIG_RAFTSTORE_GAUGE
-            .with_label_values(&["region_compact_check_step"])
-            .set(self.region_compact_check_step.unwrap_or_default() as f64);
-        CONFIG_RAFTSTORE_GAUGE
-            .with_label_values(&["region_compact_min_tombstones"])
-            .set(self.region_compact_min_tombstones as f64);
-        CONFIG_RAFTSTORE_GAUGE
-            .with_label_values(&["region_compact_tombstones_percent"])
-            .set(self.region_compact_tombstones_percent as f64);
-        CONFIG_RAFTSTORE_GAUGE
-            .with_label_values(&["region_compact_min_redundant_rows"])
-            .set(self.region_compact_min_redundant_rows as f64);
-        CONFIG_RAFTSTORE_GAUGE
-            .with_label_values(&["region_compact_redundant_rows_percent"])
-            .set(
-                self.region_compact_redundant_rows_percent
-                    .unwrap_or_default() as f64,
-            );
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["pd_heartbeat_tick_interval"])
             .set(self.pd_heartbeat_tick_interval.as_secs_f64());
@@ -1148,6 +1149,9 @@ impl Config {
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["snap_gc_timeout"])
             .set(self.snap_gc_timeout.as_secs_f64());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["snap_wait_split_duration"])
+            .set(self.snap_wait_split_duration.as_secs_f64());
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["lock_cf_compact_interval"])
             .set(self.lock_cf_compact_interval.as_secs_f64());
@@ -1155,6 +1159,10 @@ impl Config {
             .with_label_values(&["lock_cf_compact_bytes_threshold"])
             .set(self.lock_cf_compact_bytes_threshold.0 as f64);
 
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["periodic_full_compact_start_max_cpu"])
+            .set(self.periodic_full_compact_start_max_cpu);
+
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["notify_capacity"])
             .set(self.notify_capacity as f64);
@@ -1184,6 +1192,9 @@ impl Config {
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["snap_apply_batch_size"])
             .set(self.snap_apply_batch_size.0 as f64);
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["snap_apply_copy_symlink"])
+            .set(self.snap_apply_copy_symlink.into());
 
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["consistency_check_interval_seconds"])
@@ -1194,9 +1205,18 @@ impl Config {
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["raft_store_max_leader_lease"])
             .set(self.raft_store_max_leader_lease.as_secs_f64());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["check_leader_lease_interval"])
+            .set(self.check_leader_lease_interval.as_secs_f64());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["renew_leader_lease_advance_duration"])
+            .set(self.renew_leader_lease_advance_duration.as_secs_f64());
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["right_derive_when_split"])
             .set((self.right_derive_when_split as i32).into());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["allow_remove_leader"])
+            .set(self.allow_remove_leader().into());
 
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["merge_max_log_gap"])
@@ -1207,6 +1227,9 @@ impl Config {
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["use_delete_range"])
             .set((self.use_delete_range as i32).into());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["snap_generator_pool_size"])
+            .set(self.snap_generator_pool_size as f64);
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["cleanup_import_sst_interval"])
             .set(self.cleanup_import_sst_interval.as_secs_f64());
@@ -1214,21 +1237,33 @@ impl Config {
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["local_read_batch_size"])
             .set(self.local_read_batch_size as f64);
-        CONFIG_RAFTSTORE_GAUGE
-            .with_label_values(&["apply_yield_write_size"])
-            .set(self.apply_yield_write_size.0 as f64);
+
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["apply_max_batch_size"])
             .set(self.apply_batch_system.max_batch_size() as f64);
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["apply_pool_size"])
             .set(self.apply_batch_system.pool_size as f64);
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["apply_reschedule_duration"])
+            .set(self.apply_batch_system.reschedule_duration.as_secs_f64());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["apply_priority_pool_size"])
+            .set(self.apply_batch_system.low_priority_pool_size as f64);
+
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["store_max_batch_size"])
             .set(self.store_batch_system.max_batch_size() as f64);
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["store_pool_size"])
             .set(self.store_batch_system.pool_size as f64);
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["store_reschedule_duration"])
+            .set(self.store_batch_system.reschedule_duration.as_secs_f64());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["store_priority_pool_size"])
+            .set(self.store_batch_system.low_priority_pool_size as f64);
+
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["store_io_pool_size"])
             .set(self.store_io_pool_size as f64);
@@ -1238,12 +1273,18 @@ impl Config {
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["future_poll_size"])
             .set(self.future_poll_size as f64);
-        CONFIG_RAFTSTORE_GAUGE
-            .with_label_values(&["snap_generator_pool_size"])
-            .set(self.snap_generator_pool_size as f64);
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["hibernate_regions"])
             .set((self.hibernate_regions as i32).into());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["apply_yield_duration"])
+            .set(self.apply_yield_duration.as_secs_f64());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["apply_yield_write_size"])
+            .set(self.apply_yield_write_size.0 as f64);
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["perf_level"])
+            .set(self.perf_level as u64 as f64);
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["cmd_batch"])
             .set((self.cmd_batch as i32).into());
@@ -1268,6 +1309,25 @@ impl Config {
         CONFIG_RAFTSTORE_GAUGE
             .with_label_values(&["io_reschedule_hotpot_duration"])
             .set(self.io_reschedule_hotpot_duration.as_secs_f64());
+
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["inspect_interval"])
+            .set(self.inspect_interval.as_secs_f64());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["reactive_memory_lock_tick_interval"])
+            .set(self.reactive_memory_lock_tick_interval.as_secs_f64());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["reactive_memory_lock_timeout_tick"])
+            .set(self.reactive_memory_lock_timeout_tick as f64);
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["report_region_buckets_tick_interval"])
+            .set(self.report_region_buckets_tick_interval.as_secs_f64());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["max_entry_cache_warmup_duration"])
+            .set(self.max_entry_cache_warmup_duration.as_secs_f64());
+        CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["unreachable_backoff"])
+            .set(self.unreachable_backoff.as_secs_f64());
     }
 
     fn write_change_into_metrics(change: ConfigChange) {
@@ -1676,24 +1736,23 @@ mod tests {
             .unwrap_err();
 
         cfg = Config::new();
-        cfg.optimize_inspector(false);
+        cfg.tune_inspector_configs(false, ReadableDuration::millis(100));
         assert_eq!(cfg.inspect_kvdb_interval, ReadableDuration::ZERO);
 
         cfg = Config::new();
         cfg.inspect_kvdb_interval = ReadableDuration::secs(1);
-        cfg.optimize_inspector(false);
+        cfg.tune_inspector_configs(false, ReadableDuration::millis(100));
         assert_eq!(cfg.inspect_kvdb_interval, ReadableDuration::ZERO);
-        cfg.optimize_inspector(true);
+        cfg.tune_inspector_configs(true, ReadableDuration::millis(100));
         assert_eq!(cfg.inspect_kvdb_interval, ReadableDuration::ZERO);
 
         cfg.inspect_kvdb_interval = ReadableDuration::secs(1);
-        cfg.optimize_inspector(true);
+        cfg.tune_inspector_configs(true, ReadableDuration::millis(100));
         assert_eq!(cfg.inspect_kvdb_interval, ReadableDuration::secs(1));
 
         cfg = Config::new();
         cfg.inspect_kvdb_interval = ReadableDuration::millis(1);
-        cfg.inspect_interval = ReadableDuration::millis(100);
-        cfg.optimize_inspector(true);
-        assert_eq!(cfg.inspect_kvdb_interval, ReadableDuration::secs(1));
+        cfg.tune_inspector_configs(true, ReadableDuration::millis(100));
+        assert_eq!(cfg.inspect_kvdb_interval, ReadableDuration::millis(1));
     }
 }
diff --git a/components/raftstore/src/store/entry_storage.rs b/components/raftstore/src/store/entry_storage.rs
index 3dc2d008df1..29b88c334ce 100644
--- a/components/raftstore/src/store/entry_storage.rs
+++ b/components/raftstore/src/store/entry_storage.rs
@@ -7,6 +7,7 @@
 use std::{
     cell::{Cell, RefCell},
     cmp,
+    cmp::Ordering::*,
     collections::VecDeque,
     mem,
     ops::Range,
@@ -15,7 +16,7 @@ use std::{
 };
 
 use collections::HashMap;
-use engine_traits::{KvEngine, RaftEngine, RAFT_LOG_MULTI_GET_CNT};
+use engine_traits::{KvEngine, RAFT_LOG_MULTI_GET_CNT, RaftEngine};
 use fail::fail_point;
 use kvproto::{
     metapb,
@@ -23,15 +24,15 @@ use kvproto::{
 };
 use prometheus::local::LocalHistogram;
 use protobuf::Message;
-use raft::{prelude::*, util::limit_size, GetEntriesContext, StorageError};
+use raft::{GetEntriesContext, StorageError, prelude::*, util::limit_size};
 use tikv_alloc::TraceEvent;
 use tikv_util::{box_err, debug, error, info, time::Instant, warn, worker::Scheduler};
 
 use super::{
-    local_metrics::RaftMetrics, metrics::*, peer_storage::storage_error, WriteTask,
-    MEMTRACE_ENTRY_CACHE, RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM,
+    MEMTRACE_ENTRY_CACHE, RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM, WriteTask,
+    local_metrics::RaftMetrics, metrics::*, peer_storage::storage_error,
 };
-use crate::{bytes_capacity, store::ReadTask, Result};
+use crate::{Result, bytes_capacity, store::ReadTask};
 
 const MAX_ASYNC_FETCH_TRY_CNT: usize = 3;
 const SHRINK_CACHE_CAPACITY: usize = 64;
@@ -399,6 +400,130 @@ impl Drop for EntryCache {
     }
 }
 
+/// A cache that maintains term information for recently updated Raft log
+/// entries.
+///
+/// This cache optimizes term lookups by storing term-to-index mappings for
+/// recent entries. Each cache entry contains:
+/// - term: The term number of a sequence of entries
+/// - start_index: The start raft log index that shares this term
+///
+/// The cache maintains entries in monotonically increasing order by term,
+/// allowing quick lookups of terms for any given log index. The small fixed
+/// capacity helps keep memory overhead minimal while caching the most relevant
+/// term information.
+struct TermCache {
+    cache: VecDeque<(u64, u64)>, // (term, start_index)
+    capacity: usize,
+}
+
+impl Default for TermCache {
+    fn default() -> Self {
+        TermCache {
+            cache: Default::default(),
+            capacity: 8, /* 8 is enough for the recent updated terms.
+                          * Small capacity will make the extra memory
+                          * cost negligible. */
+        }
+    }
+}
+
+impl TermCache {
+    fn append(&mut self, index: u64, term: u64) {
+        // Check if we can update an existing entry or insert into the cache
+        if let Some(first_term) = self.cache.front().map(|(first_term, _)| *first_term) {
+            match first_term.cmp(&(term + 1)) {
+                Greater => {
+                    // Skip terms with gaps, as they represent stale/unfresh information.
+                    return;
+                }
+                Equal => {
+                    // Insert older term at the front if there's available space.
+                    if self.cache.len() < self.capacity {
+                        self.cache.push_front((term, index));
+                    }
+                    return;
+                }
+                Less => {
+                    // Calculate position of the term in the cache (terms are stored sequentially)
+                    let pos = (term - first_term) as usize;
+                    if pos < self.cache.len() {
+                        let (cached_term, cached_start_idx) = self.cache[pos];
+                        assert_eq!(cached_term, term);
+
+                        // Update start index only if the new index is smaller (extends the term
+                        // range)
+                        if cached_start_idx > index {
+                            self.cache[pos].1 = index;
+                        }
+                        return;
+                    } else if self.cache.back().unwrap().0 + 1 < term {
+                        // Detected a term jump indicating potential network partition.
+                        // Clear the cache to prevent serving stale term information.
+                        self.cache.clear();
+                    }
+                }
+            }
+        }
+        // New term.
+        self.cache.push_back((term, index));
+        if self.cache.len() > self.capacity {
+            self.cache.pop_front();
+        }
+    }
+
+    /// Push entries to the left of the cache.
+    #[cfg(test)]
+    fn prepend(&mut self, entries: &[Entry]) {
+        for e in entries.iter().rev() {
+            self.append(e.get_index(), e.get_term());
+            if self.cache.len() == self.capacity {
+                // NOTE: no need to check the previous term as the cached
+                // terms are fresh and the term is not allowed to decrease.
+                break;
+            }
+        }
+    }
+
+    /// Compact all terms whose start_index are less than the given index.
+    fn compact_to(&mut self, index: u64) {
+        // This operation has low cost.
+        // Since consistency and safety have been assured, compaction of the
+        // `TermCache` is only called when `UnsafeForceCompact` is triggered.
+        // Meanwhile, the capacity of `TermCache` is limited to 8, so the
+        // traversal cost is low.
+        self.cache.retain(|(_, start_idx)| *start_idx >= index);
+    }
+
+    /// Return the term of the given index.
+    ///
+    /// If the term is not found in the cache, return None.
+    fn entry(&self, idx: u64) -> Option<u64> {
+        if self.cache.is_empty() {
+            return None;
+        }
+        let (_, start_idx) = self.cache.front().unwrap();
+        if idx < *start_idx {
+            return None;
+        }
+        let (end_term, end_idx) = self.cache.back().unwrap();
+        if idx >= *end_idx {
+            return Some(*end_term);
+        }
+        // Traverse the cache in reverse order.
+        // The cost is low since the cache is small and the term is likely to be
+        // found in the recent terms.
+        let mut candidate = None;
+        for (term, start_index) in self.cache.iter().rev() {
+            candidate = Some(*term);
+            if idx >= *start_index {
+                break;
+            }
+        }
+        candidate
+    }
+}
+
 #[derive(Debug)]
 pub enum RaftlogFetchState {
     // The Instant records the start time of the fetching.
@@ -482,7 +607,7 @@ fn validate_states<ER: RaftEngine>(
     // If so, forward the commit index.
     if commit_index < recorded_commit_index {
         let entry = raft_engine.get_entry(region_id, recorded_commit_index)?;
-        if entry.map_or(true, |e| e.get_term() != apply_state.get_commit_term()) {
+        if entry.is_none_or(|e| e.get_term() != apply_state.get_commit_term()) {
             return Err(box_err!(
                 "log at recorded commit index [{}] {} doesn't exist, may lose data, {}",
                 apply_state.get_commit_term(),
@@ -648,6 +773,7 @@ pub struct EntryStorage<EK: KvEngine, ER> {
     region_id: u64,
     peer_id: u64,
     raft_engine: ER,
+    term_cache: TermCache,
     cache: EntryCache,
     raft_state: RaftLocalState,
     apply_state: RaftApplyState,
@@ -685,6 +811,7 @@ impl<EK: KvEngine, ER: RaftEngine> EntryStorage<EK, ER> {
             region_id: region.id,
             peer_id,
             raft_engine,
+            term_cache: TermCache::default(),
             cache: EntryCache::default(),
             raft_state,
             apply_state,
@@ -979,6 +1106,10 @@ impl<EK: KvEngine, ER: RaftEngine> EntryStorage<EK, ER> {
         if let Some(e) = self.cache.entry(idx) {
             Ok(e.get_term())
         } else {
+            // Try to fetch it from caching terms.
+            if let Some(term) = self.term_cache.entry(idx) {
+                return Ok(term);
+            }
             let _timer = self.io_read_raft_term.start_timer();
             Ok(self
                 .raft_engine
@@ -1280,8 +1411,19 @@ impl<EK: KvEngine, ER: RaftEngine> EntryStorage<EK, ER> {
         self.cache.trace_cached_entries(entries);
     }
 
+    #[inline]
+    pub fn compact_term_cache(&mut self, index: u64) {
+        self.term_cache.compact_to(index);
+    }
+
+    #[inline]
+    pub fn update_term_cache(&mut self, index: u64, term: u64) {
+        self.term_cache.append(index, term);
+    }
+
     pub fn clear(&mut self) {
         self.cache = EntryCache::default();
+        self.term_cache = TermCache::default();
     }
 
     pub fn read_scheduler(&self) -> Scheduler<ReadTask<EK>> {
@@ -1298,7 +1440,7 @@ pub mod tests {
     use protobuf::Message;
     use raft::{GetEntriesContext, StorageError};
     use tempfile::Builder;
-    use tikv_util::worker::{dummy_scheduler, LazyWorker, Worker};
+    use tikv_util::worker::{LazyWorker, Worker, dummy_scheduler};
 
     use super::*;
     use crate::store::peer_storage::tests::{append_ents, new_entry, new_storage_from_ents};
@@ -1427,6 +1569,137 @@ pub mod tests {
         res.unwrap_err();
     }
 
+    #[test]
+    fn test_storage_term_cache() {
+        // Normal
+        {
+            let mut cache = TermCache::default();
+            assert_eq!(cache.entry(0), None);
+            assert_eq!(cache.entry(123), None);
+            // Append entries
+            cache.append(1, 1);
+            cache.append(2, 1);
+            cache.append(3, 2);
+            cache.append(4, 2);
+            cache.append(5, 2);
+            cache.append(4, 2); // skip as rewrite with old idx
+            cache.append(3, 2); // skip as rewrite with old idx
+            for i in (1..=10).rev() {
+                cache.append(i + 5, 3);
+            }
+            for i in 1..=5 {
+                cache.append(i + 15, 3 + i);
+            }
+            assert_eq!(cache.entry(0), None);
+            assert_eq!(cache.entry(20), Some(8));
+            assert_eq!(cache.entry(21), Some(8));
+            // index [1..2] => term 1
+            assert_eq!(cache.entry(1), Some(1));
+            assert_eq!(cache.entry(2), Some(1));
+            // index [3..5] => term 2
+            assert_eq!(cache.entry(3), Some(2));
+            assert_eq!(cache.entry(4), Some(2));
+            assert_eq!(cache.entry(5), Some(2));
+            // index [6..15] => term 3
+            assert_eq!(cache.entry(6), Some(3));
+            assert_eq!(cache.entry(15), Some(3));
+            // index [16..20] => term 4..8
+            for i in 16..=20 {
+                assert_eq!(cache.entry(i), Some(i - 12));
+            }
+        }
+        // Prepend sequentail entries & Compact
+        {
+            let mut cache = TermCache::default();
+            cache.append(20, 6);
+            for i in 1..=5 {
+                cache.append(20 + i * 5, i + 6);
+            }
+            let ents = vec![
+                new_entry(2, 2),
+                new_entry(3, 3),
+                new_entry(4, 4),
+                new_entry(5, 5),
+                new_entry(6, 6),
+            ];
+            cache.prepend(&ents);
+            assert_eq!(cache.entry(46), Some(11));
+            assert_eq!(cache.entry(3), None);
+            assert_eq!(cache.entry(4), Some(4));
+            assert_eq!(cache.entry(5), Some(5));
+            assert_eq!(cache.entry(15), Some(6));
+            assert_eq!(cache.entry(39), Some(9));
+            assert_eq!(cache.entry(44), Some(10));
+            // compact to (index = 40, term = 10)
+            cache.compact_to(40);
+            assert_eq!(cache.cache.len(), 2);
+            assert_eq!(cache.entry(39), None);
+            assert_eq!(cache.entry(40), Some(10));
+            // compact to (index = 45, term = 11)
+            cache.compact_to(45);
+            assert_eq!(cache.cache.len(), 1);
+            cache.append(48, 12);
+            assert_eq!(cache.cache.len(), 2);
+            assert_eq!(cache.entry(45), Some(11));
+            cache.compact_to(46);
+            assert_eq!(cache.entry(45), None);
+            // Append reversely, the first term should be cleared.
+            for i in (12..20).rev() {
+                cache.append(48 + i - 11, i);
+            }
+            assert_eq!(cache.entry(48), None);
+            assert_eq!(cache.entry(49), Some(12));
+            assert_eq!(cache.entry(56), Some(19));
+            assert_eq!(cache.entry(57), Some(19));
+        }
+        // Abnormal cases: index hopping
+        {
+            let mut cache = TermCache::default();
+            cache.append(5, 5);
+            cache.append(6, 6);
+            cache.append(7, 6);
+            cache.append(8, 6);
+            assert_eq!(cache.cache.len(), 2);
+            assert_eq!(cache.entry(8), Some(6));
+            cache.append(6, 8);
+            assert_eq!(cache.cache.len(), 1);
+            assert_eq!(cache.entry(8), Some(8));
+            drop(cache);
+
+            let mut cache = TermCache::default();
+            cache.append(6, 3);
+            cache.append(7, 5); // index hopping, clear the cache
+            assert_eq!(cache.cache.len(), 1);
+            assert_eq!(cache.entry(6), None);
+            assert_eq!(cache.entry(7), Some(5));
+            cache.append(5, 4);
+            cache.append(10, 6);
+            assert_eq!(cache.cache.len(), 3);
+        }
+        // Abnormal cases: prepend hopping index
+        {
+            let mut cache = TermCache::default();
+            let ents = vec![
+                new_entry(10, 5),
+                new_entry(15, 6),
+                new_entry(18, 7),
+                // multi election timeout
+                new_entry(20, 10),
+                new_entry(25, 11),
+            ];
+            cache.prepend(&ents);
+            assert_eq!(cache.cache.len(), 2);
+            assert_eq!(cache.entry(18), None);
+            assert_eq!(cache.entry(20), Some(10));
+            cache.append(30, 12);
+            assert_eq!(cache.cache.len(), 3);
+            cache.append(19, 9);
+            assert_eq!(cache.cache.len(), 4);
+            assert_eq!(cache.entry(18), None);
+            assert_eq!(cache.entry(19), Some(9));
+        }
+    }
+
     #[test]
     fn test_async_fetch() {
         let ents = vec![
@@ -1444,7 +1717,7 @@ pub mod tests {
 
         let mut store = new_storage_from_ents(region_scheduler, dummy_scheduler, &td, &ents);
 
-        let max_u64 = u64::max_value();
+        let max_u64 = u64::MAX;
         let mut tests = vec![
             // already compacted
             (
@@ -1708,7 +1981,7 @@ pub mod tests {
             append_ents(&mut store, &entries);
             let li = store.last_index().unwrap();
             let actual_entries = store
-                .entries(4, li + 1, u64::max_value(), GetEntriesContext::empty(false))
+                .entries(4, li + 1, u64::MAX, GetEntriesContext::empty(false))
                 .unwrap();
             if actual_entries != wentries {
                 panic!("#{}: want {:?}, got {:?}", i, wentries, actual_entries);
@@ -1727,7 +2000,7 @@ pub mod tests {
         store.cache.cache.clear();
         // empty cache should fetch data from rocksdb directly.
         let mut res = store
-            .entries(4, 6, u64::max_value(), GetEntriesContext::empty(false))
+            .entries(4, 6, u64::MAX, GetEntriesContext::empty(false))
             .unwrap();
         assert_eq!(*res, ents[1..]);
 
@@ -1737,7 +2010,7 @@ pub mod tests {
 
         // direct cache access
         res = store
-            .entries(6, 8, u64::max_value(), GetEntriesContext::empty(false))
+            .entries(6, 8, u64::MAX, GetEntriesContext::empty(false))
             .unwrap();
         assert_eq!(res, entries);
 
@@ -1765,7 +2038,7 @@ pub mod tests {
         for low in 4..9 {
             for high in low..9 {
                 let res = store
-                    .entries(low, high, u64::max_value(), GetEntriesContext::empty(false))
+                    .entries(low, high, u64::MAX, GetEntriesContext::empty(false))
                     .unwrap();
                 assert_eq!(*res, exp_res[low as usize - 4..high as usize - 4]);
             }
diff --git a/components/raftstore/src/store/fsm/apply.rs b/components/raftstore/src/store/fsm/apply.rs
index 21b6a36b088..10b695beab3 100644
--- a/components/raftstore/src/store/fsm/apply.rs
+++ b/components/raftstore/src/store/fsm/apply.rs
@@ -13,12 +13,11 @@ use std::{
     mem,
     ops::{Deref, DerefMut, Range as StdRange},
     sync::{
+        Arc, Mutex,
         atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
         mpsc::SyncSender,
-        Arc, Mutex,
     },
     time::Duration,
-    usize,
     vec::Drain,
 };
 
@@ -28,10 +27,11 @@ use batch_system::{
 };
 use collections::{HashMap, HashMapEntry, HashSet};
 use crossbeam::channel::{TryRecvError, TrySendError};
+use derive_more::Debug as DebugMore;
 use engine_traits::{
-    util::SequenceNumber, DeleteStrategy, KvEngine, Mutable, PerfContext, PerfContextKind,
-    RaftEngine, RaftEngineReadOnly, Range as EngineRange, Snapshot, SstMetaInfo, WriteBatch,
-    WriteOptions, ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE,
+    ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, DeleteStrategy, KvEngine, Mutable,
+    PerfContext, PerfContextKind, RaftEngine, RaftEngineReadOnly, Range as EngineRange, Snapshot,
+    SstMetaInfo, WriteBatch, WriteOptions, util::SequenceNumber,
 };
 use fail::fail_point;
 use health_controller::types::LatencyInspector;
@@ -47,42 +47,41 @@ use kvproto::{
 };
 use pd_client::{BucketMeta, BucketStat};
 use prometheus::local::LocalHistogram;
-use protobuf::{wire_format::WireType, CodedInputStream, Message};
+use protobuf::{CodedInputStream, Message, wire_format::WireType};
 use raft::eraftpb::{
     ConfChange, ConfChangeType, ConfChangeV2, Entry, EntryType, Snapshot as RaftSnapshot,
 };
 use raft_proto::ConfChangeI;
 use resource_control::{ResourceConsumeType, ResourceController, ResourceMetered};
-use smallvec::{smallvec, SmallVec};
+use smallvec::{SmallVec, smallvec};
 use sst_importer::SstImporter;
 use tikv_alloc::trace::TraceEvent;
 use tikv_util::{
-    box_err, box_try,
+    Either, MustConsumeVec, box_err, box_try,
     config::{Tracker, VersionTrack},
     debug, error, info,
     memory::HeapSize,
-    mpsc::{loose_bounded, LooseBoundedSender, Receiver},
+    mpsc::{LooseBoundedSender, Receiver, loose_bounded},
     safe_panic, slow_log,
     store::{find_peer, find_peer_by_id, find_peer_mut, is_learner, remove_peer},
-    time::{duration_to_sec, Instant},
+    time::{Instant, duration_to_sec},
     warn,
     worker::Scheduler,
-    Either, MustConsumeVec,
 };
 use time::Timespec;
-use tracker::{TrackerToken, TrackerTokenArray, GLOBAL_TRACKERS};
+use tracker::{GLOBAL_TRACKERS, TrackerToken, TrackerTokenArray};
 use uuid::Builder as UuidBuilder;
 
 use self::memtrace::*;
 use super::metrics::*;
 use crate::{
-    bytes_capacity,
+    Error, Result, bytes_capacity,
     coprocessor::{
         ApplyCtxInfo, Cmd, CmdBatch, CmdObserveInfo, CoprocessorHost, ObserveHandle, ObserveLevel,
         RegionState, WriteBatchWrapper,
     },
     store::{
-        cmd_resp,
+        Config, RegionSnapshot, SnapGenTask, WriteCallback, cmd_resp,
         entry_storage::{self, CachedEntries},
         fsm::RaftPollerBuilder,
         local_metrics::RaftMetrics,
@@ -92,12 +91,10 @@ use crate::{
         peer::Peer,
         peer_storage::{write_initial_apply_state, write_peer_state},
         util::{
-            self, admin_cmd_epoch_lookup, check_flashback_state, check_req_region_epoch,
-            compare_region_epoch, ChangePeerI, ConfChangeKind, KeysInfoFormatter,
+            self, ChangePeerI, ConfChangeKind, KeysInfoFormatter, admin_cmd_epoch_lookup,
+            check_flashback_state, check_req_region_epoch, compare_region_epoch,
         },
-        Config, RegionSnapshot, SnapGenTask, WriteCallback,
     },
-    Error, Result,
 };
 
 // These consts are shared in both v1 and v2.
@@ -201,7 +198,7 @@ impl<C> PendingCmdQueue<C> {
 
     fn pop_compact(&mut self, index: u64) -> Option<PendingCmd<C>> {
         let mut front = None;
-        while self.compacts.front().map_or(false, |c| c.index < index) {
+        while self.compacts.front().is_some_and(|c| c.index < index) {
             front = self.compacts.pop_front();
             front.as_mut().unwrap().cb.take().unwrap();
         }
@@ -671,6 +668,40 @@ where
             ),
             "cmd_batch" => ?cmd_batch.len(),
         );
+        // TODO: remove this field when the cause of issue 18498 is located.
+        if txn_types::ENABLE_DUP_KEY_DEBUG.load(Ordering::Relaxed) {
+            use std::collections::HashMap;
+            let mut lock_cf_map: HashMap<Vec<u8>, Vec<u8>> = HashMap::new();
+            for batch in &cmd_batch {
+                for cmd in &batch.cmds {
+                    for r in cmd.request.get_requests() {
+                        if r.get_cmd_type() == CmdType::Put && r.get_put().get_cf() == CF_LOCK {
+                            let key = r.get_put().get_key();
+                            let value = r.get_put().get_value();
+                            if let Some(existing_value) = lock_cf_map.get(key) {
+                                error!(
+                                    "[for debug] found duplicate PUT on lock cf: key={:?}, existing_value={:?}, new_value={:?} during apply",
+                                    log_wrappers::Value::key(key),
+                                    log_wrappers::Value::value(existing_value),
+                                    log_wrappers::Value::value(value)
+                                );
+
+                                // TODO: remove this in production or new release.
+                                panic!(
+                                    "[for debug] found duplicate PUT on lock cf: key={:?}, existing_value={:?}, new_value={:?} during apply",
+                                    log_wrappers::Value::key(key),
+                                    log_wrappers::Value::value(existing_value),
+                                    log_wrappers::Value::value(value)
+                                );
+                            } else {
+                                lock_cf_map.insert(key.to_vec(), value.to_vec());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         self.host
             .on_flush_applied_cmd_batch(batch_max_level, cmd_batch, &self.engine);
         // Invoke callbacks
@@ -683,6 +714,7 @@ where
         }
         self.apply_time.flush();
         self.apply_wait.flush();
+        self.apply_msg_len.flush();
         self.key_size.flush();
         self.value_size.flush();
         let res_count = self.uncommitted_res_count;
@@ -1013,8 +1045,7 @@ pub struct NewSplitPeer {
 /// Region. The apply worker receives all the apply tasks of different Regions
 /// located at this store, and it will get the corresponding apply delegate to
 /// handle the apply task to make the code logic more clear.
-#[derive(Derivative)]
-#[derivative(Debug)]
+#[derive(DebugMore)]
 pub struct ApplyDelegate<EK>
 where
     EK: KvEngine,
@@ -1084,7 +1115,7 @@ where
     priority: Priority,
 
     /// To fetch Raft entries for applying if necessary.
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     raft_engine: Box<dyn RaftEngineReadOnly>,
 
     trace: ApplyMemoryTrace,
@@ -1460,8 +1491,8 @@ where
     ///
     /// An apply operation can fail in the following situations:
     ///   - it encounters an error that will occur on all stores, it can
-    /// continue applying next entry safely, like epoch not match for
-    /// example;
+    ///     continue applying next entry safely, like epoch not match for
+    ///     example;
     ///   - it encounters an error that may not occur on all stores, in this
     ///     case we should try to apply the entry again or panic. Considering
     ///     that this usually due to disk operation fail, which is rare, so just
@@ -1792,7 +1823,7 @@ where
     ) -> Result<(RaftCmdResponse, ApplyResult<EK::Snapshot>)> {
         fail_point!(
             "on_apply_write_cmd",
-            cfg!(release) || self.id() == 3,
+            !cfg!(debug_assertions) || self.id() == 3,
             |_| {
                 unimplemented!();
             }
@@ -1990,7 +2021,7 @@ where
         if cf.is_empty() {
             cf = CF_DEFAULT;
         }
-        if !ALL_CFS.iter().any(|x| *x == cf) {
+        if !ALL_CFS.contains(&cf) {
             return Err(box_err!("invalid delete range command, cf: {:?}", cf));
         }
 
@@ -2729,7 +2760,7 @@ where
             {
                 Ok(None) => (),
                 Ok(Some(state)) => {
-                    if replace_regions.get(region_id).is_some() {
+                    if replace_regions.contains(region_id) {
                         // It's marked replaced, then further destroy will skip cleanup, so there
                         // should be no region local state.
                         panic!(
@@ -4649,7 +4680,7 @@ pub struct ControlFsm {
 
 impl ControlFsm {
     pub fn new() -> (LooseBoundedSender<ControlMsg>, Box<ControlFsm>) {
-        let (tx, rx) = loose_bounded(std::usize::MAX);
+        let (tx, rx) = loose_bounded(usize::MAX);
         let fsm = Box::new(ControlFsm {
             stopped: false,
             receiver: rx,
@@ -5184,7 +5215,7 @@ mod tests {
 
     use bytes::Bytes;
     use engine_panic::PanicEngine;
-    use engine_test::kv::{new_engine, KvTestEngine, KvTestSnapshot};
+    use engine_test::kv::{KvTestEngine, KvTestSnapshot, new_engine};
     use engine_traits::{Peekable as PeekableTrait, SyncMutable, WriteBatchExt};
     use kvproto::{
         kvrpcpb::ApiVersion,
@@ -5208,10 +5239,10 @@ mod tests {
     use crate::{
         coprocessor::*,
         store::{
+            Config, SnapGenTask,
             msg::WriteResponse,
             peer_storage::RAFT_INIT_LOG_INDEX,
             simple_write::{SimpleWriteEncoder, SimpleWriteReqEncoder},
-            Config, SnapGenTask,
         },
     };
 
@@ -6005,18 +6036,15 @@ mod tests {
             _: &RegionState,
             apply_info: &mut ApplyCtxInfo<'_>,
         ) -> bool {
-            match apply_info.pending_handle_ssts {
-                Some(v) => {
-                    // If it is a ingest sst
-                    let mut ssts = std::mem::take(v);
-                    assert_ne!(ssts.len(), 0);
-                    if self.delay_remove_ssts.load(Ordering::SeqCst) {
-                        apply_info.pending_delete_ssts.append(&mut ssts);
-                    } else {
-                        apply_info.delete_ssts.append(&mut ssts);
-                    }
+            if let Some(v) = apply_info.pending_handle_ssts {
+                // If it is a ingest sst
+                let mut ssts = std::mem::take(v);
+                assert_ne!(ssts.len(), 0);
+                if self.delay_remove_ssts.load(Ordering::SeqCst) {
+                    apply_info.pending_delete_ssts.append(&mut ssts);
+                } else {
+                    apply_info.delete_ssts.append(&mut ssts);
                 }
-                None => (),
             }
             self.last_delete_sst_count
                 .store(apply_info.delete_ssts.len() as u64, Ordering::SeqCst);
@@ -7611,7 +7639,7 @@ mod tests {
         epoch: Rc<RefCell<RegionEpoch>>,
     }
 
-    impl<'a, E> SplitResultChecker<'a, E>
+    impl<E> SplitResultChecker<'_, E>
     where
         E: KvEngine,
     {
diff --git a/components/raftstore/src/store/fsm/life.rs b/components/raftstore/src/store/fsm/life.rs
index e95f8978338..4cbbf194739 100644
--- a/components/raftstore/src/store/fsm/life.rs
+++ b/components/raftstore/src/store/fsm/life.rs
@@ -3,7 +3,7 @@
 //! This module contains functions that relates to peer liftime management and
 //! are shared with raftstore and raftstore v2.
 
-use engine_traits::{KvEngine, CF_RAFT};
+use engine_traits::{CF_RAFT, KvEngine};
 use kvproto::raft_serverpb::{ExtraMessageType, PeerState, RaftMessage, RegionLocalState};
 use tikv_util::warn;
 
diff --git a/components/raftstore/src/store/fsm/metrics.rs b/components/raftstore/src/store/fsm/metrics.rs
index 6ee346bfd75..89c0c6f6a4b 100644
--- a/components/raftstore/src/store/fsm/metrics.rs
+++ b/components/raftstore/src/store/fsm/metrics.rs
@@ -2,12 +2,12 @@
 
 // #[PerformanceCriticalPath]
 use std::sync::{
-    atomic::{AtomicBool, AtomicU64, Ordering},
     Arc,
+    atomic::{AtomicBool, AtomicU64, Ordering},
 };
 
 use lazy_static::lazy_static;
-use prometheus::{exponential_buckets, register_histogram, Histogram};
+use prometheus::{Histogram, exponential_buckets, register_histogram};
 use tikv_util::store::QueryStats;
 
 lazy_static! {
diff --git a/components/raftstore/src/store/fsm/mod.rs b/components/raftstore/src/store/fsm/mod.rs
index e0cd7235d97..811e893b7e4 100644
--- a/components/raftstore/src/store/fsm/mod.rs
+++ b/components/raftstore/src/store/fsm/mod.rs
@@ -12,14 +12,14 @@ pub mod store;
 
 pub use self::{
     apply::{
-        check_sst_for_ingestion, create_apply_batch_system, Apply, ApplyBatchSystem, ApplyMetrics,
-        ApplyRes, ApplyRouter, Builder as ApplyPollerBuilder, CatchUpLogs, ChangeObserver,
-        ChangePeer, ExecResult, GenSnapTask, Msg as ApplyTask, Notifier as ApplyNotifier, Proposal,
-        Registration, SwitchWitness, TaskRes as ApplyTaskRes,
+        Apply, ApplyBatchSystem, ApplyMetrics, ApplyRes, ApplyRouter,
+        Builder as ApplyPollerBuilder, CatchUpLogs, ChangeObserver, ChangePeer, ExecResult,
+        GenSnapTask, Msg as ApplyTask, Notifier as ApplyNotifier, Proposal, Registration,
+        SwitchWitness, TaskRes as ApplyTaskRes, check_sst_for_ingestion, create_apply_batch_system,
     },
     metrics::{GlobalStoreStat, LocalStoreStat},
     peer::{
-        new_admin_request, new_read_index_request, DestroyPeerJob, PeerFsm, MAX_PROPOSAL_SIZE_RATIO,
+        DestroyPeerJob, MAX_PROPOSAL_SIZE_RATIO, PeerFsm, new_admin_request, new_read_index_request,
     },
-    store::{create_raft_batch_system, RaftBatchSystem, RaftPollerBuilder, RaftRouter, StoreMeta},
+    store::{RaftBatchSystem, RaftPollerBuilder, RaftRouter, StoreMeta, create_raft_batch_system},
 };
diff --git a/components/raftstore/src/store/fsm/peer.rs b/components/raftstore/src/store/fsm/peer.rs
index 868de4767a2..88026d393be 100644
--- a/components/raftstore/src/store/fsm/peer.rs
+++ b/components/raftstore/src/store/fsm/peer.rs
@@ -11,15 +11,14 @@ use std::{
     },
     iter::Iterator,
     mem,
-    sync::{atomic::Ordering, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::Ordering},
     time::{Duration, Instant},
-    u64,
 };
 
 use batch_system::{BasicMailbox, Fsm, FsmType};
 use collections::{HashMap, HashSet};
 use engine_traits::{
-    Engines, KvEngine, RaftEngine, RaftLogBatch, SstMetaInfo, WriteBatchExt, CF_LOCK, CF_RAFT,
+    CF_LOCK, CF_RAFT, Engines, KvEngine, RaftEngine, RaftLogBatch, SstMetaInfo, WriteBatchExt,
 };
 use error_code::ErrorCodeExt;
 use fail::fail_point;
@@ -47,23 +46,22 @@ use parking_lot::RwLockWriteGuard;
 use pd_client::BucketMeta;
 use protobuf::Message;
 use raft::{
-    self,
+    self, GetEntriesContext, INVALID_INDEX, NO_LIMIT, Progress, ReadState, SnapshotStatus,
+    StateRole,
     eraftpb::{self, ConfChangeType, MessageType},
-    GetEntriesContext, Progress, ReadState, SnapshotStatus, StateRole, INVALID_INDEX, NO_LIMIT,
 };
 use smallvec::SmallVec;
 use strum::{EnumCount, VariantNames};
 use tikv_alloc::trace::TraceEvent;
 use tikv_util::{
-    box_err, debug, defer, error, escape, info, info_or_debug, is_zero_duration,
+    Either, box_err, debug, defer, error, escape, info, info_or_debug, is_zero_duration,
     mpsc::{self, LooseBoundedSender, Receiver},
     slow_log,
     store::{find_peer, find_peer_by_id, is_learner, region_on_same_stores},
     sys::disk::DiskUsage,
-    time::{monotonic_raw_now, Instant as TiInstant, SlowTimer},
+    time::{Instant as TiInstant, SlowTimer, monotonic_raw_now},
     trace, warn,
     worker::{ScheduleError, Scheduler},
-    Either,
 };
 use tracker::GLOBAL_TRACKERS;
 use txn_types::WriteBatchFlags;
@@ -73,41 +71,42 @@ use super::life::forward_destroy_to_source_peer;
 #[cfg(any(test, feature = "testexport"))]
 use crate::store::PeerInternalStat;
 use crate::{
+    Error, Result,
     coprocessor::{RegionChangeEvent, RegionChangeReason},
     store::{
+        CasualMessage, Config, LocksStatus, MergeResultKind, PdTask, PeerMsg, PeerTick,
+        ProposalContext, RAFT_INIT_LOG_INDEX, RaftCmdExtraOpts, RaftCommand, RaftlogFetchResult,
+        ReadCallback, ReadIndexContext, ReadTask, SignificantMsg, SnapKey, StoreMsg, WriteCallback,
         cmd_resp::{bind_term, new_error},
         demote_failed_voters_request,
         fsm::{
-            apply,
-            store::{PollContext, StoreMeta},
             ApplyMetrics, ApplyTask, ApplyTaskRes, CatchUpLogs, ChangeObserver, ChangePeer,
-            ExecResult, SwitchWitness,
+            ExecResult, SwitchWitness, apply,
+            store::{PollContext, StoreMeta},
         },
         hibernate_state::{GroupState, HibernateState},
         local_metrics::{RaftMetrics, TimeTracker},
         memory::*,
         metrics::*,
-        msg::{Callback, CampaignType, ExtCallback, InspectedRaftMessage},
-        peer::{ConsistencyState, Peer, PersistSnapshotResult, StaleState, TransferLeaderContext},
+        msg::{Callback, CampaignType, ExtCallback, InspectedRaftMessage, PeerClearMetaStat},
+        peer::{
+            ConsistencyState, Peer, PendingRemoveReason, PersistSnapshotResult, StaleState,
+            TransferLeaderContext,
+        },
         region_meta::RegionMeta,
         snapshot_backup::{AbortReason, SnapshotBrState, SnapshotBrWaitApplyRequest},
         transport::Transport,
         unsafe_recovery::{
-            exit_joint_request, ForceLeaderState, UnsafeRecoveryExecutePlanSyncer,
-            UnsafeRecoveryFillOutReportSyncer, UnsafeRecoveryForceLeaderSyncer,
-            UnsafeRecoveryState, UnsafeRecoveryWaitApplySyncer,
+            ForceLeaderState, UnsafeRecoveryExecutePlanSyncer, UnsafeRecoveryFillOutReportSyncer,
+            UnsafeRecoveryForceLeaderSyncer, UnsafeRecoveryState, UnsafeRecoveryWaitApplySyncer,
+            exit_joint_request,
         },
-        util::{self, compare_region_epoch, KeysInfoFormatter, LeaseState},
+        util::{self, KeysInfoFormatter, LeaseState, compare_region_epoch},
         worker::{
             Bucket, BucketRange, CleanupTask, ConsistencyCheckTask, GcSnapshotTask, RaftlogGcTask,
             ReadDelegate, ReadProgress, RegionTask, SplitCheckTask,
         },
-        CasualMessage, Config, LocksStatus, MergeResultKind, PdTask, PeerMsg, PeerTick,
-        ProposalContext, RaftCmdExtraOpts, RaftCommand, RaftlogFetchResult, ReadCallback,
-        ReadIndexContext, ReadTask, SignificantMsg, SnapKey, StoreMsg, WriteCallback,
-        RAFT_INIT_LOG_INDEX,
     },
-    Error, Result,
 };
 
 #[derive(Clone, Copy, Debug)]
@@ -197,6 +196,12 @@ where
     propose_checked: Option<bool>,
     request: Option<RaftCmdRequest>,
     callbacks: Vec<Callback<E::Snapshot>>,
+
+    // Ref: https://github.com/tikv/tikv/issues/18498.
+    // Check for duplicate key entries batching proposed commands.
+    // TODO: remove this field when the cause of issue 18498 is located.
+    lock_cf_keys: HashSet<Vec<u8>>,
+    duplicate_put_on_lock_cf_detected: bool,
 }
 
 impl<EK, ER> Drop for PeerFsm<EK, ER>
@@ -439,6 +444,8 @@ where
             propose_checked: None,
             request: None,
             callbacks: vec![],
+            lock_cf_keys: HashSet::default(),
+            duplicate_put_on_lock_cf_detected: false,
         }
     }
 
@@ -479,6 +486,31 @@ where
             mut callback,
             ..
         } = cmd;
+        if txn_types::ENABLE_DUP_KEY_DEBUG.load(Ordering::Relaxed) {
+            // Ref: https://github.com/tikv/tikv/issues/18498.
+            // Check for duplicate key entries batching proposed commands.
+            // TODO: remove this check when the cause of issue 18498 is located.
+            for req in request.get_requests() {
+                if req.has_put() && req.get_put().get_cf() == CF_LOCK {
+                    let key = req.get_put().get_key();
+                    if !self.lock_cf_keys.insert(key.to_vec()) {
+                        let wrapped_key = log_wrappers::Value::key(key);
+                        error!(
+                            "[for debug] found duplicate key in Lock CF PUT request between batched requests. \
+                            key: {:?}, existing batch request: {:?}, new request to add: {:?}",
+                            wrapped_key, self.request, request
+                        );
+                        self.duplicate_put_on_lock_cf_detected = true;
+                        // TODO: remove this in production or new release.
+                        panic!(
+                            "[for debug] found duplicate key in Lock CF PUT request between batched requests. \
+                            key: {:?}, existing batch request: {:?}, new request to add: {:?}",
+                            wrapped_key, self.request, request
+                        );
+                    }
+                }
+            }
+        }
         if let Some(batch_req) = self.request.as_mut() {
             let requests: Vec<_> = request.take_requests().into();
             for q in requests {
@@ -521,6 +553,7 @@ where
             self.batch_req_size = 0;
             self.has_proposed_cb = false;
             self.propose_checked = None;
+            self.lock_cf_keys = HashSet::default();
             if self.callbacks.len() == 1 {
                 let cb = self.callbacks.pop().unwrap();
                 return Some((req, cb));
@@ -693,6 +726,30 @@ where
                         continue;
                     }
 
+                    if txn_types::ENABLE_DUP_KEY_DEBUG.load(Ordering::Relaxed) {
+                        // Ref: https://github.com/tikv/tikv/issues/18498.
+                        // Check for duplicate key entries within the to be proposed raft cmd.
+                        // TODO: remove this check when the cause of issue 18498 is located.
+                        let mut keys_set = std::collections::HashSet::new();
+                        for req in cmd.request.get_requests() {
+                            if req.has_put() && req.get_put().get_cf() == CF_LOCK {
+                                let key = req.get_put().get_key();
+                                if !keys_set.insert(key.to_vec()) {
+                                    let wrapped_key = log_wrappers::Value::key(key);
+                                    error!(
+                                        "[for debug] found duplicate key in Lock CF PUT request, key: {:?}, cmd: {:?}",
+                                        wrapped_key, cmd
+                                    );
+                                    // TODO: remove this in production or new release.
+                                    panic!(
+                                        "[for debug] found duplicate key in Lock CF PUT request, key: {:?}, cmd: {:?}",
+                                        wrapped_key, cmd
+                                    );
+                                }
+                            }
+                        }
+                    }
+
                     let req_size = cmd.request.compute_size();
                     if self.ctx.cfg.cmd_batch
                         && self.fsm.batch_req_builder.can_batch(&self.ctx.cfg, &cmd.request, req_size)
@@ -1057,14 +1114,14 @@ where
                 "peer_id" => self.fsm.peer_id(),
                 "target_index" => target_index,
                 "applied_index" => applied_index,
-                "pending_remove" => self.fsm.peer.pending_remove,
+                "pending_remove" => ?self.fsm.peer.pending_remove,
                 "voter" => self.fsm.peer.raft_group.raft.vote,
             );
 
             // do some sanity check, for follower, leader already apply to last log,
             // case#1 if it is learner during backup and never vote before, vote is 0
             // case#2 if peer is suppose to remove
-            if self.fsm.peer.raft_group.raft.vote == 0 || self.fsm.peer.pending_remove {
+            if self.fsm.peer.raft_group.raft.vote == 0 || self.fsm.peer.pending_remove.is_some() {
                 info!(
                     "this peer is never vote before or pending remove, it should be skip to wait apply";
                     "region" => %self.region_id(),
@@ -1093,7 +1150,7 @@ where
     }
 
     fn on_unsafe_recovery_fill_out_report(&mut self, syncer: UnsafeRecoveryFillOutReportSyncer) {
-        if self.fsm.peer.pending_remove || self.fsm.stopped {
+        if self.fsm.peer.pending_remove.is_some() || self.fsm.stopped {
             return;
         }
         let mut self_report = pdpb::PeerReport::default();
@@ -1157,6 +1214,11 @@ where
     }
 
     fn on_casual_msg(&mut self, msg: Box<CasualMessage<EK>>) {
+        if self.fsm.peer.pending_remove == Some(PendingRemoveReason::ReadyToDestroy) {
+            // It means that the peer will be asynchronously removed, it's no
+            // need to execute the consequentail CasualMessages.
+            return;
+        }
         match *msg {
             CasualMessage::SplitRegion {
                 region_epoch,
@@ -1469,7 +1531,7 @@ where
                 && (key.idx < compacted_idx
                     || key.idx == compacted_idx
                         && !is_applying_snap
-                        && !self.fsm.peer.pending_remove)
+                        && self.fsm.peer.pending_remove.is_none())
             {
                 info!(
                     "deleting applied snap file";
@@ -1634,6 +1696,25 @@ where
             // for snapshot recovery (safe recovery)
             SignificantMsg::SnapshotBrWaitApply(syncer) => self.on_snapshot_br_wait_apply(syncer),
             SignificantMsg::CheckPendingAdmin(ch) => self.on_check_pending_admin(ch),
+            SignificantMsg::ReadyToDestroyPeer {
+                to_peer_id,
+                merged_by_target,
+                clear_stat,
+            } => {
+                if to_peer_id != self.fsm.peer_id() {
+                    // Ignore redundant or stale messages from an outdated peer for the same region.
+                    // This handles the corner case where a stale peer is being removed
+                    // asynchronously while a new peer for the region is added.
+                    // If the async cleanup thread returns a delayed message
+                    // aimed to the removed peer, skip it to avoid acting on stale state.
+                    // This is a corner case after introducing `async destroy peer` by PR#18805.
+                    info!("delayed destroy peer message";
+                        "old_peer_id" => to_peer_id,
+                        "peer_id" => self.fsm.peer_id());
+                    return;
+                }
+                self.on_ready_destroy_peer(merged_by_target, clear_stat);
+            }
         }
     }
 
@@ -2052,7 +2133,7 @@ where
             .peer
             .uncampaigned_new_regions
             .as_ref()
-            .map_or(false, |r| r.is_empty());
+            .is_some_and(|r| r.is_empty());
         // If the peer has any uncleared records in the uncampaigned_new_regions list,
         // and there has valid leader in the region, it's safely to clear the records.
         if has_uncompaigned_regions && self.fsm.peer.has_valid_leader() {
@@ -2066,7 +2147,7 @@ where
         // state, or it is being destroyed, ignore the result.
         let cache_warmup_state = &self.fsm.peer.transfer_leader_state.cache_warmup_state;
         if !self.fsm.peer.is_leader() && cache_warmup_state.is_none()
-            || self.fsm.peer.pending_remove
+            || self.fsm.peer.pending_remove.is_some()
         {
             self.fsm.peer.mut_store().clean_async_fetch_res(low);
             return;
@@ -2319,7 +2400,7 @@ where
             |_| {}
         );
 
-        if self.fsm.peer.pending_remove {
+        if self.fsm.peer.pending_remove.is_some() {
             self.fsm.peer.mut_store().flush_entry_cache_metrics();
             return;
         }
@@ -2511,7 +2592,16 @@ where
                     return;
                 }
                 self.on_ready_result(&mut res.exec_res, &res.metrics);
-                if self.fsm.stopped {
+                if self.fsm.stopped
+                    || self.fsm.peer.pending_remove == Some(PendingRemoveReason::ReadyToDestroy)
+                {
+                    // In PR#18805 we introduced asynchronous peer destruction. A peer
+                    // with `PendingRemoveReason::ReadyToDestroy` is a stale peer that has been
+                    // marked for removal and will be cleaned up by an async worker.
+                    // Similarly, `stopped` means the peer is stopped. In either case we should
+                    // ignore subsequent apply results for this peer — this preserves the semantics
+                    // of the original synchronous-destroy path and avoids applying results for a
+                    // peer that is effectively slated for removal or already stopped.
                     return;
                 }
                 let applied_index = res.apply_state.applied_index;
@@ -2650,10 +2740,7 @@ where
             }
             let disk_full_peers = &self.fsm.peer.disk_full_peers;
 
-            disk_full_peers.is_empty()
-                || disk_full_peers
-                    .get(peer_id)
-                    .map_or(true, |x| x != msg.disk_usage)
+            disk_full_peers.is_empty() || (disk_full_peers.get(peer_id) != Some(msg.disk_usage))
         };
         if refill_disk_usages || self.fsm.peer.has_region_merge_proposal {
             let prev = self.fsm.peer.disk_full_peers.get(peer_id);
@@ -2738,7 +2825,7 @@ where
             |_| Ok(())
         );
 
-        if self.fsm.peer.pending_remove || self.fsm.stopped {
+        if self.fsm.peer.pending_remove.is_some() || self.fsm.stopped {
             return Ok(());
         }
 
@@ -4035,12 +4122,12 @@ where
         self.destroy_peer(delay.merged_by_target);
     }
 
-    // [PerformanceCriticalPath] TODO: spin off the I/O code (self.fsm.peer.destroy)
     fn destroy_peer(&mut self, merged_by_target: bool) -> bool {
         self.ctx.coprocessor_host.on_destroy_peer(self.region());
         fail_point!("destroy_peer");
-        // Mark itself as pending_remove
-        self.fsm.peer.pending_remove = true;
+        // Mark itself `PendingRemoveReason::ReadyToDestroy` to represent that this peer
+        // is ready to be removed.
+        self.fsm.peer.pending_remove = Some(PendingRemoveReason::ReadyToDestroy);
 
         // try to decrease the RAFT_ENABLE_UNPERSISTED_APPLY_GAUGE count.
         self.fsm.peer.disable_apply_unpersisted_log(0);
@@ -4051,7 +4138,7 @@ where
             if self
                 .fsm
                 .delayed_destroy
-                .map_or(false, |delay| delay.reason == reason)
+                .is_some_and(|delay| delay.reason == reason)
             {
                 panic!(
                     "{} destroy peer twice with same delay reason, original {:?}, now {}",
@@ -4170,20 +4257,47 @@ where
                 "err" => %e,
             );
         }
-        if let Err(e) = self.fsm.peer.destroy(
+
+        // Drop the `StoreMeta` lock here to ensure that the asynchronous destroy task
+        // can execute safely without blocking other threads.
+        drop(meta);
+
+        let clear_stat = self.fsm.peer.destroy(
             &self.ctx.engines,
-            &mut self.ctx.raft_perf_context,
             merged_by_target,
-            &self.ctx.pending_create_peers,
-            &self.ctx.raft_metrics,
-        ) {
-            // If not panic here, the peer will be recreated in the next restart,
-            // then it will be gc again. But if some overlap region is created
-            // before restarting, the gc action will delete the overlap region's
-            // data too.
-            panic!("{} destroy err {:?}", self.fsm.peer.tag, e);
+            self.ctx.store_meta.clone(),
+            self.ctx.pending_create_peers.clone(),
+        );
+        // If clear_stat is valid, it means the destroy task above was executed
+        // synchronously. In this case, we should immediately perform the
+        // follow-up steps required to complete the peer destruction process.
+        if let Some(clear_stat) = clear_stat {
+            self.on_ready_destroy_peer(merged_by_target, clear_stat);
         }
 
+        true
+    }
+
+    fn on_ready_destroy_peer(
+        &mut self,
+        merged_by_target: bool,
+        clear_stat: PeerClearMetaStat,
+    ) -> bool {
+        assert_eq!(
+            self.fsm.peer.pending_remove,
+            Some(PendingRemoveReason::ReadyToDestroy),
+            "terminate the peer under pending_remove state, exepcted {:?} actual {:?} ",
+            Some(PendingRemoveReason::ReadyToDestroy),
+            self.fsm.peer.pending_remove,
+        );
+        // Clean remains if needs and notify all pending requests to exit.
+        self.fsm
+            .peer
+            .ready_to_destroy(merged_by_target, clear_stat, &self.ctx.raft_metrics);
+
+        let region_id = self.region_id();
+        let is_peer_initialized = self.fsm.peer.is_initialized();
+        let mut meta = self.ctx.store_meta.lock().unwrap();
         // Some places use `force_send().unwrap()` if the StoreMeta lock is held.
         // So in here, it's necessary to held the StoreMeta lock when closing the
         // router.
@@ -4239,7 +4353,7 @@ where
                 // peer decide to destroy by itself. Without target, the
                 // `pending_merge_targets` for target won't be removed, so here source peer help
                 // target to clear.
-                if meta.regions.get(&target).is_none()
+                if !meta.regions.contains_key(&target)
                     && meta.pending_merge_targets.get(&target).unwrap().is_empty()
                 {
                     meta.pending_merge_targets.remove(&target);
@@ -4454,10 +4568,19 @@ where
         self.fsm.peer.schedule_raftlog_gc(self.ctx, compact_to);
         self.fsm.peer.last_compacted_idx = compact_to;
         let transfer_leader_state = &mut self.fsm.peer.transfer_leader_state;
-        self.fsm.peer.raft_group.mut_store().on_compact_raftlog(
-            compact_to,
-            transfer_leader_state.cache_warmup_state.as_mut(),
-        );
+        self.fsm
+            .peer
+            .raft_group
+            .mut_store()
+            .on_compact_raftlog_cache(
+                compact_to,
+                transfer_leader_state.cache_warmup_state.as_mut(),
+            );
+        self.fsm
+            .peer
+            .raft_group
+            .mut_store()
+            .cancel_generating_snap(Some(compact_to));
         if self.fsm.peer.is_witness() {
             self.fsm.peer.last_compacted_time = Instant::now();
         }
@@ -4967,7 +5090,7 @@ where
 
     fn on_check_merge(&mut self) {
         if self.fsm.stopped
-            || self.fsm.peer.pending_remove
+            || self.fsm.peer.pending_remove.is_some()
             || self.fsm.peer.pending_merge_state.is_none()
         {
             return;
@@ -5055,7 +5178,7 @@ where
                 assert_eq!(state.get_target().get_id(), catch_up_logs.target_region_id);
                 // Indicate that `on_catch_up_logs_for_merge` has already executed.
                 // Mark pending_remove because its apply fsm will be destroyed.
-                self.fsm.peer.pending_remove = true;
+                self.fsm.peer.pending_remove = Some(PendingRemoveReason::Merge);
                 // Send CatchUpLogs back to destroy source apply fsm,
                 // then it will send `Noop` to trigger target apply fsm.
                 self.ctx.apply_router.schedule_task(
@@ -5088,7 +5211,7 @@ where
                 );
                 // Indicate that `on_ready_prepare_merge` has already executed.
                 // Mark pending_remove because its apply fsm will be destroyed.
-                self.fsm.peer.pending_remove = true;
+                self.fsm.peer.pending_remove = Some(PendingRemoveReason::Merge);
                 // Just for saving memory.
                 catch_up_logs.merge.clear_entries();
                 // Send CatchUpLogs back to destroy source apply fsm,
@@ -5273,16 +5396,12 @@ where
         target: metapb::Peer,
         result: MergeResultKind,
     ) {
-        let exists = self
-            .fsm
-            .peer
-            .pending_merge_state
-            .as_ref()
-            .map_or(true, |s| {
-                s.get_target().get_peers().iter().any(|p| {
-                    p.get_store_id() == target.get_store_id() && p.get_id() <= target.get_id()
-                })
-            });
+        let exists = self.fsm.peer.pending_merge_state.as_ref().is_none_or(|s| {
+            s.get_target()
+                .get_peers()
+                .iter()
+                .any(|p| p.get_store_id() == target.get_store_id() && p.get_id() <= target.get_id())
+        });
         if !exists {
             panic!(
                 "{} unexpected merge result: {:?} {:?} {:?}",
@@ -5331,7 +5450,7 @@ where
                     "peer_id" => self.fsm.peer_id(),
                     "target_region_id" => target_region_id,
                 );
-                self.fsm.peer.pending_remove = true;
+                self.fsm.peer.pending_remove = Some(PendingRemoveReason::Merge);
                 // Destroy apply fsm at first
                 self.ctx.apply_router.schedule_task(
                     self.fsm.region_id(),
@@ -5351,7 +5470,7 @@ where
     }
 
     fn on_stale_merge(&mut self, target_region_id: u64) {
-        if self.fsm.peer.pending_remove {
+        if self.fsm.peer.pending_remove.is_some() {
             return;
         }
         info!(
@@ -5583,6 +5702,7 @@ where
                             &mut self.fsm.peer.transfer_leader_state.cache_warmup_state;
                         let peer_store = self.fsm.peer.raft_group.mut_store();
                         peer_store.set_apply_state(apply_state);
+                        peer_store.compact_term_cache(last_index + 1);
                         peer_store.compact_entry_cache(last_index + 1, cache_warmup_state.as_mut());
                         peer_store.raft_state_mut().mut_hard_state().commit = last_index;
                         peer_store.raft_state_mut().last_index = last_index;
@@ -5910,7 +6030,7 @@ where
         cb: Callback<EK::Snapshot>,
         diskfullopt: DiskFullOpt,
     ) {
-        if self.fsm.peer.pending_remove {
+        if self.fsm.peer.pending_remove.is_some() {
             apply::notify_req_region_removed(self.region_id(), cb);
             return;
         }
@@ -6041,7 +6161,16 @@ where
 
     #[allow(clippy::if_same_then_else)]
     fn on_raft_gc_log_tick(&mut self, force_compact: bool) {
-        if !self.fsm.peer.is_leader() {
+        fail_point!(
+            "check_state_on_raft_gc_log_tick",
+            self.fsm.stopped || self.fsm.peer.pending_remove.is_some(),
+            |_| {}
+        );
+        if self.fsm.stopped || self.fsm.peer.pending_remove.is_some() || !self.fsm.peer.is_leader()
+        {
+            // If the peer is marked as `pending_remove`, it means the clearing might be
+            // executed by the region worker, or this peer is already stopped. In both
+            // scenarios, there is no need to execute log gc.
             // `compact_cache_to` is called when apply, there is no need to call
             // `compact_to` here, snapshot generating has already been cancelled
             // when the role becomes follower.
@@ -6117,10 +6246,14 @@ where
         // leader may call `get_term()` on the latest replicated index, so compact
         // entries before `alive_cache_idx` instead of `alive_cache_idx + 1`.
         let transfer_leader_state = &mut self.fsm.peer.transfer_leader_state;
-        self.fsm.peer.raft_group.mut_store().on_compact_raftlog(
-            std::cmp::min(alive_cache_idx, applied_idx + 1),
-            transfer_leader_state.cache_warmup_state.as_mut(),
-        );
+        self.fsm
+            .peer
+            .raft_group
+            .mut_store()
+            .on_compact_raftlog_cache(
+                std::cmp::min(alive_cache_idx, applied_idx + 1),
+                transfer_leader_state.cache_warmup_state.as_mut(),
+            );
         if needs_evict_entry_cache(self.ctx.cfg.evict_cache_on_memory_ratio) {
             self.fsm.peer.mut_store().evict_entry_cache(true);
             if !self.fsm.peer.get_store().is_entry_cache_empty() {
@@ -6177,6 +6310,15 @@ where
             return;
         }
 
+        // If RaftEngine's compact idx exceeds the snapshot idx,
+        // means the snapshot idx has already been compacted.
+        // We should cancel the snapshot generating as it is now out of date.
+        self.fsm
+            .peer
+            .raft_group
+            .mut_store()
+            .cancel_generating_snap(Some(compact_idx));
+
         // Create a compact log request and notify directly.
         let region_id = self.fsm.peer.region().get_id();
         let peer = self.fsm.peer.peer.clone();
@@ -6230,7 +6372,7 @@ where
         fail_point!("ignore request snapshot", |_| {
             self.schedule_tick(PeerTick::RequestSnapshot);
         });
-        if !self.fsm.peer.wait_data {
+        if !self.fsm.peer.wait_data || self.fsm.peer.pending_remove.is_some() {
             return;
         }
         if self.fsm.peer.is_leader()
@@ -6302,12 +6444,12 @@ where
 
     #[inline]
     fn region_split_skip_max_count(&self) -> usize {
-        fail_point!("region_split_skip_max_count", |_| { usize::max_value() });
+        fail_point!("region_split_skip_max_count", |_| { usize::MAX });
         REGION_SPLIT_SKIP_MAX_COUNT
     }
 
     fn on_split_region_check_tick(&mut self) {
-        if !self.fsm.peer.is_leader() {
+        if !self.fsm.peer.is_leader() || self.fsm.peer.pending_remove.is_some() {
             return;
         }
 
@@ -6775,7 +6917,7 @@ where
     }
 
     fn on_check_peer_stale_state_tick(&mut self) {
-        if self.fsm.peer.pending_remove {
+        if self.fsm.peer.pending_remove.is_some() {
             return;
         }
 
@@ -7088,7 +7230,7 @@ where
     }
 }
 
-impl<'a, EK, ER, T: Transport> PeerFsmDelegate<'a, EK, ER, T>
+impl<EK, ER, T: Transport> PeerFsmDelegate<'_, EK, ER, T>
 where
     EK: KvEngine,
     ER: RaftEngine,
@@ -7430,7 +7572,7 @@ fn new_compact_log_request(
     request
 }
 
-impl<'a, EK, ER, T: Transport> PeerFsmDelegate<'a, EK, ER, T>
+impl<EK, ER, T: Transport> PeerFsmDelegate<'_, EK, ER, T>
 where
     EK: KvEngine,
     ER: RaftEngine,
@@ -7528,8 +7670,8 @@ mod memtrace {
 #[cfg(test)]
 mod tests {
     use std::sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     };
 
     use engine_test::kv::KvTestEngine;
@@ -7690,4 +7832,39 @@ mod tests {
         let req_size = req.compute_size();
         assert!(!builder.can_batch(&cfg, &req, req_size));
     }
+
+    #[test]
+    #[should_panic]
+    fn test_batch_build_with_duplicate_lock_cf_keys() {
+        let mut builder = BatchRaftCmdRequestBuilder::<KvTestEngine>::new();
+
+        // Create first request.
+        let mut req1 = RaftCmdRequest::default();
+        let mut put1 = Request::default();
+        let mut put_req1 = PutRequest::default();
+        put_req1.set_cf(CF_LOCK.to_string());
+        put_req1.set_key(b"key1".to_vec());
+        put_req1.set_value(b"value1".to_vec());
+        put1.set_cmd_type(CmdType::Put);
+        put1.set_put(put_req1);
+        req1.mut_requests().push(put1);
+
+        // Create second request with same key in Lock CF.
+        let mut req2 = RaftCmdRequest::default();
+        let mut put2 = Request::default();
+        let mut put_req2 = PutRequest::default();
+        put_req2.set_cf(CF_LOCK.to_string());
+        put_req2.set_key(b"key1".to_vec());
+        put_req2.set_value(b"value2".to_vec());
+        put2.set_cmd_type(CmdType::Put);
+        put2.set_put(put_req2);
+        req2.mut_requests().push(put2);
+
+        // Add both requests to batch builder, should cause panic.
+        let size = req1.compute_size();
+        builder.add(RaftCommand::new(req1, Callback::None), size);
+        let size = req2.compute_size();
+        builder.add(RaftCommand::new(req2, Callback::None), size);
+        assert!(builder.duplicate_put_on_lock_cf_detected);
+    }
 }
diff --git a/components/raftstore/src/store/fsm/store.rs b/components/raftstore/src/store/fsm/store.rs
index 02251f65670..67d2bcbcb66 100644
--- a/components/raftstore/src/store/fsm/store.rs
+++ b/components/raftstore/src/store/fsm/store.rs
@@ -11,11 +11,10 @@ use std::{
     mem,
     ops::{Deref, DerefMut},
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, AtomicU64, Ordering},
     },
     time::{Duration, Instant, SystemTime},
-    u64,
 };
 
 use batch_system::{
@@ -27,15 +26,15 @@ use collections::{HashMap, HashMapEntry, HashSet};
 use concurrency_manager::ConcurrencyManager;
 use crossbeam::channel::{TryRecvError, TrySendError};
 use engine_traits::{
-    CompactedEvent, DeleteStrategy, Engines, KvEngine, Mutable, PerfContextKind, RaftEngine,
-    RaftLogBatch, Range, WriteBatch, WriteOptions, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE,
+    CF_LOCK, CF_RAFT, DeleteStrategy, Engines, KvEngine, Mutable, PerfContextKind, RaftEngine,
+    RaftLogBatch, Range, WriteBatch, WriteOptions,
 };
 use fail::fail_point;
 use file_system::{IoType, WithIoType};
-use futures::{compat::Future01CompatExt, FutureExt};
+use futures::{FutureExt, compat::Future01CompatExt};
 use health_controller::{
-    types::{InspectFactor, LatencyInspector},
     HealthController,
+    types::{InspectFactor, LatencyInspector},
 };
 use itertools::Itertools;
 use keys::{self, data_end_key, data_key, enc_end_key, enc_start_key};
@@ -49,14 +48,14 @@ use kvproto::{
 use pd_client::{Feature, FeatureGate, PdClient};
 use protobuf::Message;
 use raft::StateRole;
-use resource_control::{channel::unbounded, ResourceGroupManager};
+use resource_control::{ResourceGroupManager, channel::unbounded};
 use resource_metering::CollectorRegHandle;
 use service::service_manager::GrpcServiceManager;
 use sst_importer::SstImporter;
 use strum::{EnumCount, VariantNames};
 use tikv_alloc::trace::TraceEvent;
 use tikv_util::{
-    box_try,
+    Either, GLOBAL_SERVER_READINESS, RingQueue, box_try,
     config::{Tracker, VersionTrack},
     debug, defer, error,
     future::poll_future_notify,
@@ -67,21 +66,23 @@ use tikv_util::{
     sys::{
         self as sys_util,
         cpu_time::ProcessStat,
-        disk::{get_disk_status, DiskUsage},
+        disk::{DiskUsage, get_disk_status},
     },
-    time::{duration_to_sec, monotonic_raw_now, Instant as TiInstant, SlowTimer},
+    time::{Instant as TiInstant, SlowTimer, duration_to_sec, monotonic_raw_now},
     timer::SteadyTimer,
     warn,
     worker::{Builder as WorkerBuilder, LazyWorker, Scheduler, Worker},
     yatp_pool::FuturePool,
-    Either, RingQueue, GLOBAL_SERVER_READINESS,
 };
 use time::{self, Timespec};
 
 use crate::{
-    bytes_capacity,
+    Error, Result, bytes_capacity,
     coprocessor::{CoprocessorHost, RegionChangeEvent, RegionChangeReason},
     store::{
+        Callback, CasualMessage, FullCompactController, GlobalReplicationState,
+        InspectedRaftMessage, MergeResultKind, PdTask, PeerMsg, PeerTick, RaftCommand,
+        SignificantMsg, SnapManager, StoreMsg, StoreTick,
         async_io::{
             read::{ReadRunner, ReadTask},
             write::{StoreWriters, StoreWritersContext, Worker as WriteWorker, WriteMsg},
@@ -89,14 +90,13 @@ use crate::{
         },
         config::Config,
         fsm::{
-            create_apply_batch_system,
+            ApplyBatchSystem, ApplyNotifier, ApplyPollerBuilder, ApplyRes, ApplyRouter,
+            ApplyTaskRes, create_apply_batch_system,
             life::handle_tombstone_message_on_learner,
             metrics::*,
             peer::{
-                maybe_destroy_source, new_admin_request, PeerFsm, PeerFsmDelegate, SenderFsmPair,
+                PeerFsm, PeerFsmDelegate, SenderFsmPair, maybe_destroy_source, new_admin_request,
             },
-            ApplyBatchSystem, ApplyNotifier, ApplyPollerBuilder, ApplyRes, ApplyRouter,
-            ApplyTaskRes,
         },
         local_metrics::{IoType as InspectIoType, RaftMetrics},
         memory::*,
@@ -104,25 +104,19 @@ use crate::{
         peer_storage,
         transport::Transport,
         util,
-        util::{is_initial_msg, RegionReadProgressRegistry},
+        util::{RegionReadProgressRegistry, is_initial_msg},
         worker::{
             AutoSplitController, CleanupRunner, CleanupSstRunner, CleanupSstTask, CleanupTask,
             CompactRunner, CompactTask, ConsistencyCheckRunner, ConsistencyCheckTask,
             DiskCheckRunner, DiskCheckTask, GcSnapshotRunner, GcSnapshotTask, PdRunner,
             RaftlogGcRunner, RaftlogGcTask, ReadDelegate, RefreshConfigRunner, RefreshConfigTask,
-            RegionRunner, RegionTask, SnapGenRunner, SnapGenTask, SplitCheckTask,
-            SNAP_GENERATOR_MAX_POOL_SIZE,
+            RegionRunner, RegionTask, SNAP_GENERATOR_MAX_POOL_SIZE, SnapGenRunner, SnapGenTask,
+            SplitCheckTask,
         },
         worker_metrics::PROCESS_STAT_CPU_USAGE,
-        Callback, CasualMessage, CompactThreshold, FullCompactController, GlobalReplicationState,
-        InspectedRaftMessage, MergeResultKind, PdTask, PeerMsg, PeerTick, RaftCommand,
-        SignificantMsg, SnapManager, StoreMsg, StoreTick,
     },
-    Error, Result,
 };
 
-type Key = Vec<u8>;
-
 pub const PENDING_MSG_CAP: usize = 100;
 pub const ENTRY_CACHE_EVICT_TICK_DURATION: Duration = Duration::from_secs(1);
 pub const MULTI_FILES_SNAPSHOT_FEATURE: Feature = Feature::require(6, 1, 0); // it only makes sense for large region
@@ -269,7 +263,7 @@ impl StoreMeta {
         reason: RegionChangeReason,
     ) {
         let prev = self.regions.insert(region.get_id(), region.clone());
-        if prev.map_or(true, |r| r.get_id() != region.get_id()) {
+        if prev.is_none_or(|r| r.get_id() != region.get_id()) {
             // TODO: may not be a good idea to panic when holding a lock.
             panic!("{} region corrupted", peer.tag);
         }
@@ -556,7 +550,7 @@ where
     pub store: metapb::Store,
     pub pd_scheduler: Scheduler<PdTask<EK>>,
     pub consistency_check_scheduler: Scheduler<ConsistencyCheckTask<EK::Snapshot>>,
-    pub split_check_scheduler: Scheduler<SplitCheckTask>,
+    pub split_check_scheduler: Scheduler<SplitCheckTask<EK>>,
     // handle Compact, CleanupSst task
     pub cleanup_scheduler: Scheduler<CleanupTask>,
     pub raftlog_gc_scheduler: Scheduler<RaftlogGcTask>,
@@ -614,7 +608,7 @@ where
     pub sync_write_worker: Option<WriteWorker<EK, ER, RaftRouter<EK, ER>, T>>,
     pub pending_latency_inspect: Vec<LatencyInspector>,
 
-    pub safe_point: Arc<AtomicU64>,
+    pub gc_safe_point: Arc<AtomicU64>,
 
     pub process_stat: Option<ProcessStat>,
 }
@@ -746,7 +740,6 @@ where
 struct Store {
     // store id, before start the id is 0.
     id: u64,
-    last_compact_checked_key: Key,
     stopped: bool,
     start_time: Option<Timespec>,
     consistency_check_time: HashMap<u64, Instant>,
@@ -775,7 +768,6 @@ where
         let fsm = Box::new(StoreFsm {
             store: Store {
                 id: 0,
-                last_compact_checked_key: keys::DATA_MIN_KEY.to_vec(),
                 stopped: false,
                 start_time: None,
                 consistency_check_time: HashMap::default(),
@@ -806,8 +798,8 @@ struct StoreFsmDelegate<'a, EK: KvEngine + 'static, ER: RaftEngine + 'static, T:
     ctx: &'a mut PollContext<EK, ER, T>,
 }
 
-impl<'a, EK: KvEngine + 'static, ER: RaftEngine + 'static, T: Transport>
-    StoreFsmDelegate<'a, EK, ER, T>
+impl<EK: KvEngine + 'static, ER: RaftEngine + 'static, T: Transport>
+    StoreFsmDelegate<'_, EK, ER, T>
 {
     fn on_tick(&mut self, tick: StoreTick) {
         let timer = TiInstant::now_coarse();
@@ -815,7 +807,10 @@ impl<'a, EK: KvEngine + 'static, ER: RaftEngine + 'static, T: Transport>
             StoreTick::PdStoreHeartbeat => self.on_pd_store_heartbeat_tick(),
             StoreTick::SnapGc => self.on_snap_mgr_gc(),
             StoreTick::CompactLockCf => self.on_compact_lock_cf(),
-            StoreTick::CompactCheck => self.on_compact_check_tick(),
+            StoreTick::CompactCheck => {
+                // Disabled: replaced by GC worker auto compaction
+                debug!("CompactCheck tick disabled, using GC worker auto compaction instead");
+            }
             StoreTick::PeriodicFullCompact => self.on_full_compact_tick(),
             StoreTick::LoadMetricsWindow => self.on_load_metrics_window_tick(),
             StoreTick::ConsistencyCheck => self.on_consistency_check_tick(),
@@ -917,6 +912,7 @@ impl<'a, EK: KvEngine + 'static, ER: RaftEngine + 'static, T: Transport>
                                 );
                             }
                         }
+                        _ => unimplemented!(),
                     }
                 }
                 StoreMsg::UnsafeRecoveryReport(report) => self.store_heartbeat_pd(Some(report)),
@@ -925,8 +921,11 @@ impl<'a, EK: KvEngine + 'static, ER: RaftEngine + 'static, T: Transport>
                     drop(syncer);
                 }
                 StoreMsg::GcSnapshotFinish => self.register_snap_mgr_gc_tick(),
-                StoreMsg::AwakenRegions { abnormal_stores } => {
-                    self.on_wake_up_regions(abnormal_stores);
+                StoreMsg::AwakenRegions {
+                    abnormal_stores,
+                    region_ids,
+                } => {
+                    self.on_wake_up_regions(abnormal_stores, region_ids);
                 }
             }
         }
@@ -955,7 +954,6 @@ impl<'a, EK: KvEngine + 'static, ER: RaftEngine + 'static, T: Transport>
         self.fsm.store.id = store.get_id();
         self.fsm.store.start_time = Some(time::get_time());
         self.register_cleanup_import_sst_tick();
-        self.register_compact_check_tick();
         self.register_full_compact_tick();
         self.register_load_metrics_window_tick();
         self.register_pd_store_heartbeat_tick();
@@ -1276,7 +1274,7 @@ pub struct RaftPollerBuilder<EK: KvEngine, ER: RaftEngine, T> {
     pub store: metapb::Store,
     pd_scheduler: Scheduler<PdTask<EK>>,
     consistency_check_scheduler: Scheduler<ConsistencyCheckTask<EK::Snapshot>>,
-    split_check_scheduler: Scheduler<SplitCheckTask>,
+    split_check_scheduler: Scheduler<SplitCheckTask<EK>>,
     cleanup_scheduler: Scheduler<CleanupTask>,
     raftlog_gc_scheduler: Scheduler<RaftlogGcTask>,
     raftlog_fetch_scheduler: Scheduler<ReadTask<EK>>,
@@ -1297,7 +1295,7 @@ pub struct RaftPollerBuilder<EK: KvEngine, ER: RaftEngine, T> {
     feature_gate: FeatureGate,
     write_senders: WriteSenders<EK, ER>,
     node_start_time: Timespec, // monotonic_raw_now
-    safe_point: Arc<AtomicU64>,
+    gc_safe_point: Arc<AtomicU64>,
 }
 
 impl<EK: KvEngine, ER: RaftEngine, T> RaftPollerBuilder<EK, ER, T> {
@@ -1561,7 +1559,7 @@ where
             write_senders: self.write_senders.clone(),
             sync_write_worker,
             pending_latency_inspect: vec![],
-            safe_point: self.safe_point.clone(),
+            gc_safe_point: self.gc_safe_point.clone(),
             process_stat: None,
         };
         ctx.update_ticks_timeout();
@@ -1617,7 +1615,7 @@ where
             feature_gate: self.feature_gate.clone(),
             write_senders: self.write_senders.clone(),
             node_start_time: self.node_start_time,
-            safe_point: self.safe_point.clone(),
+            gc_safe_point: self.gc_safe_point.clone(),
         }
     }
 }
@@ -1642,6 +1640,8 @@ struct Workers<EK: KvEngine> {
     coprocessor_host: CoprocessorHost<EK>,
 
     refresh_config_worker: LazyWorker<RefreshConfigTask>,
+
+    on_stop_hooks: Vec<Box<dyn FnOnce() + Send>>,
 }
 
 pub struct RaftBatchSystem<EK: KvEngine, ER: RaftEngine> {
@@ -1672,6 +1672,11 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
             .scheduler()
     }
 
+    pub fn pd_scheduler(&self) -> Scheduler<PdTask<EK>> {
+        assert!(self.workers.is_some());
+        self.workers.as_ref().unwrap().pd_worker.scheduler()
+    }
+
     // TODO: reduce arguments
     pub fn spawn<T: Transport + 'static, C: PdClient + 'static>(
         &mut self,
@@ -1685,7 +1690,7 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
         store_meta: Arc<Mutex<StoreMeta>>,
         coprocessor_host: CoprocessorHost<EK>,
         importer: Arc<SstImporter<EK>>,
-        split_check_scheduler: Scheduler<SplitCheckTask>,
+        split_check_scheduler: Scheduler<SplitCheckTask<EK>>,
         background_worker: Worker,
         auto_split_controller: AutoSplitController,
         global_replication_state: Arc<Mutex<GlobalReplicationState>>,
@@ -1695,7 +1700,7 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
         causal_ts_provider: Option<Arc<CausalTsProviderImpl>>, // used for rawkv apiv2
         mut disk_check_runner: DiskCheckRunner,
         grpc_service_mgr: GrpcServiceManager,
-        safe_point: Arc<AtomicU64>,
+        gc_safe_point: Arc<AtomicU64>,
     ) -> Result<()> {
         assert!(self.workers.is_none());
         // TODO: we can get cluster meta regularly too later.
@@ -1732,7 +1737,7 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
             .thread_count(cfg.value().snap_generator_pool_size)
             .thread_count_limits(1, SNAP_GENERATOR_MAX_POOL_SIZE)
             .create();
-        let workers = Workers {
+        let mut workers = Workers {
             pd_worker,
             background_worker,
             cleanup_worker: Worker::new("cleanup-worker"),
@@ -1742,7 +1747,20 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
             raftlog_fetch_worker: Worker::new("raftlog-fetch-worker"),
             coprocessor_host: coprocessor_host.clone(),
             refresh_config_worker: LazyWorker::new("refreash-config-worker"),
+            on_stop_hooks: vec![],
         };
+        // Ideally, we should not stop split_check_scheduler when Workers stop, since
+        // Workers do not own it. But, no body owns it, it is shared. And, since the
+        // split check worker internally runs a infinite loop, it will not stop
+        // when shutting down the threadpool, causing the reference to the kv
+        // engine inside the scheduler to be dangle, so that the kv engine never
+        // closes until the process exits. If we want to restart engines in the same
+        // process, e.g. in a test that requires restarting the engines, we need to stop
+        // the scheduler first.
+        let split_check_scheduler_clone = split_check_scheduler.clone();
+        workers.on_stop_hooks.push(Box::new(move || {
+            split_check_scheduler_clone.stop();
+        }));
         mgr.init()?;
 
         let snap_gen_runner = SnapGenRunner::new(
@@ -1754,7 +1772,8 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
         );
 
         let region_runner = RegionRunner::new(
-            engines.kv.clone(),
+            engines.clone(),
+            store_meta.clone(),
             mgr.clone(),
             cfg.clone(),
             workers.coprocessor_host.clone(),
@@ -1767,6 +1786,14 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
         let region_scheduler = workers
             .region_worker
             .start_with_timer("region-worker", region_runner);
+        // Same as split_check_scheduler, region worker also runs a infinite
+        // loop, that will not stop when shutting down the threadpool, causing the
+        // reference to the kv engine inside the scheduler to be dangle. So we need
+        // to stop the scheduler before shutting down the threadpool.
+        let region_scheduler_clone = region_scheduler.clone();
+        workers.on_stop_hooks.push(Box::new(move || {
+            region_scheduler_clone.stop();
+        }));
         let raftlog_gc_runner = RaftlogGcRunner::new(
             engines.clone(),
             cfg.value().raft_log_compact_sync_interval.0,
@@ -1774,18 +1801,21 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
         let raftlog_gc_scheduler = workers
             .background_worker
             .start_with_timer("raft-gc-worker", raftlog_gc_runner);
+        // Same as split_check_scheduler, raftlog_gc_scheduler also runs a infinite
+        // loop, that will not stop when shutting down the threadpool, causing the
+        // reference to the raft engine inside the scheduler to be dangle. So we need
+        // to stop the scheduler before shutting down the threadpool.
+        let raftlog_gc_scheduler_clone = raftlog_gc_scheduler.clone();
+        workers.on_stop_hooks.push(Box::new(move || {
+            raftlog_gc_scheduler_clone.stop();
+        }));
 
         let raftlog_fetch_scheduler = workers.raftlog_fetch_worker.start(
             "raftlog-fetch-worker",
             ReadRunner::new(self.router.clone(), engines.raft.clone()),
         );
 
-        let compact_runner = CompactRunner::new(
-            engines.kv.clone(),
-            bgworker_remote,
-            cfg.clone().tracker(String::from("compact-runner")),
-            cfg.value().skip_manual_compaction_in_clean_up_worker,
-        );
+        let compact_runner = CompactRunner::new(engines.kv.clone(), bgworker_remote);
         let cleanup_sst_runner = CleanupSstRunner::new(Arc::clone(&importer));
         let gc_snapshot_runner = GcSnapshotRunner::new(
             meta.get_id(),
@@ -1794,7 +1824,7 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
         );
         let cleanup_runner =
             CleanupRunner::new(compact_runner, cleanup_sst_runner, gc_snapshot_runner);
-        let cleanup_scheduler = workers
+        let cleanup_scheduler: Scheduler<CleanupTask> = workers
             .cleanup_worker
             .start("cleanup-worker", cleanup_runner);
         let consistency_check_runner =
@@ -1844,7 +1874,7 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
             feature_gate: pd_client.feature_gate().clone(),
             write_senders: self.store_writers.senders(),
             node_start_time: self.node_start_time,
-            safe_point,
+            gc_safe_point,
         };
         let region_peers = builder.init()?;
         self.start_system::<T, C>(
@@ -1969,6 +1999,7 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
             coprocessor_host,
             causal_ts_provider,
             grpc_service_mgr,
+            Arc::new(AtomicBool::new(false)),
         );
         assert!(workers.pd_worker.start(pd_runner));
 
@@ -1984,6 +2015,9 @@ impl<EK: KvEngine, ER: RaftEngine> RaftBatchSystem<EK, ER> {
             return;
         }
         let mut workers = self.workers.take().unwrap();
+        for hook in workers.on_stop_hooks.drain(..) {
+            hook();
+        }
         // Wait all workers finish.
         workers.pd_worker.stop();
 
@@ -2056,7 +2090,7 @@ enum CheckMsgStatus {
     NewPeerFirst,
 }
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER, T> {
+impl<EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'_, EK, ER, T> {
     /// Checks if the message is targeting a stale peer.
     fn check_msg(&mut self, msg: &RaftMessage) -> Result<CheckMsgStatus> {
         let region_id = msg.get_region_id();
@@ -2563,34 +2597,17 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER
     }
 
     fn on_compaction_finished(&mut self, event: EK::CompactedEvent) {
-        if event.is_size_declining_trivial(self.ctx.cfg.region_split_check_diff().0) {
-            return;
-        }
-
-        let output_level_str = event.output_level_label();
-        COMPACTION_DECLINED_BYTES
-            .with_label_values(&[&output_level_str])
-            .observe(event.total_bytes_declined() as f64);
-
-        // self.cfg.region_split_check_diff.0 / 16 is an experienced value.
-        let mut region_declined_bytes = {
-            let meta = self.ctx.store_meta.lock().unwrap();
-            event.calc_ranges_declined_bytes(
-                &meta.region_ranges,
-                self.ctx.cfg.region_split_check_diff().0 / 16,
-            )
-        };
-
-        COMPACTION_RELATED_REGION_COUNT
-            .with_label_values(&[&output_level_str])
-            .observe(region_declined_bytes.len() as f64);
-
-        for (region_id, declined_bytes) in region_declined_bytes.drain(..) {
-            let _ = self.ctx.router.send(
-                region_id,
-                PeerMsg::CasualMessage(Box::new(CasualMessage::CompactionDeclinedBytes {
-                    bytes: declined_bytes,
-                })),
+        if let Err(e) = self
+            .ctx
+            .split_check_scheduler
+            .schedule(SplitCheckTask::CompactedEvent {
+                event,
+                region_split_check_diff: self.ctx.cfg.region_split_check_diff().0,
+            })
+        {
+            error!(
+                "failed to schedule split check for compaction finished event";
+                "err" => %e,
             );
         }
     }
@@ -2685,15 +2702,15 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER
 
     /// Returns a predicate `Fn` which is evaluated:
     /// 1. Before full compaction runs: if  `false`, we return and wait for the
-    /// next full compaction tick
-    /// (`PERIODIC_FULL_COMPACT_TICK_INTERVAL_DURATION`) before starting. If
-    /// true, we begin full compaction, which means the first incremental range
-    /// will be compactecd. See: ``StoreFsmDelegate::on_full_compact_tick``
-    /// in this file.
+    ///    next full compaction tick
+    ///    (`PERIODIC_FULL_COMPACT_TICK_INTERVAL_DURATION`) before starting. If
+    ///    true, we begin full compaction, which means the first incremental
+    ///    range will be compactecd. See:
+    ///    ``StoreFsmDelegate::on_full_compact_tick`` in this file.
     ///
     /// 2. After each incremental range finishes and before next one (if any)
-    /// starts. If `false`, we pause compaction and wait. See:
-    /// `CompactRunner::full_compact` in `worker/compact.rs`.
+    ///    starts. If `false`, we pause compaction and wait. See:
+    ///    `CompactRunner::full_compact` in `worker/compact.rs`.
     fn is_low_load_for_full_compact(&self) -> impl Fn() -> bool {
         let max_start_cpu_usage = self.ctx.cfg.periodic_full_compact_start_max_cpu;
         let global_stat = self.ctx.global_stat.clone();
@@ -2716,104 +2733,6 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER
         }
     }
 
-    fn register_compact_check_tick(&self) {
-        self.ctx.schedule_store_tick(
-            StoreTick::CompactCheck,
-            self.ctx.cfg.region_compact_check_interval.0,
-        )
-    }
-
-    fn on_compact_check_tick(&mut self) {
-        self.register_compact_check_tick();
-        if self.ctx.cleanup_scheduler.is_busy() {
-            debug!(
-                "compact worker is busy, check space redundancy next time";
-                "store_id" => self.fsm.store.id,
-            );
-            return;
-        }
-
-        if self
-            .ctx
-            .engines
-            .kv
-            .auto_compactions_is_disabled()
-            .expect("cf")
-        {
-            debug!(
-                "skip compact check when disabled auto compactions";
-                "store_id" => self.fsm.store.id,
-            );
-            return;
-        }
-
-        // Start from last checked key.
-        let mut ranges_need_check =
-            Vec::with_capacity(self.ctx.cfg.region_compact_check_step() as usize + 1);
-        ranges_need_check.push(self.fsm.store.last_compact_checked_key.clone());
-
-        let largest_key = {
-            let meta = self.ctx.store_meta.lock().unwrap();
-            if meta.region_ranges.is_empty() {
-                debug!(
-                    "there is no range need to check";
-                    "store_id" => self.fsm.store.id
-                );
-                return;
-            }
-
-            // Collect continuous ranges.
-            let left_ranges = meta.region_ranges.range((
-                Excluded(self.fsm.store.last_compact_checked_key.clone()),
-                Unbounded::<Key>,
-            ));
-            ranges_need_check.extend(
-                left_ranges
-                    .take(self.ctx.cfg.region_compact_check_step() as usize)
-                    .map(|(k, _)| k.to_owned()),
-            );
-
-            // Update last_compact_checked_key.
-            meta.region_ranges.keys().last().unwrap().to_vec()
-        };
-
-        let last_key = ranges_need_check.last().unwrap().clone();
-        if last_key == largest_key {
-            // Range [largest key, DATA_MAX_KEY) also need to check.
-            if last_key != keys::DATA_MAX_KEY.to_vec() {
-                ranges_need_check.push(keys::DATA_MAX_KEY.to_vec());
-            }
-            // Next task will start from the very beginning.
-            self.fsm.store.last_compact_checked_key = keys::DATA_MIN_KEY.to_vec();
-        } else {
-            self.fsm.store.last_compact_checked_key = last_key;
-        }
-
-        // Schedule the task.
-        // Since compaction-filter only works for the write-cf and during compaction it
-        // may perform(write) deletion operations in the default-cf, so we compact the
-        // write-cf before the default-cf.
-        let cf_names = vec![CF_WRITE.to_owned(), CF_DEFAULT.to_owned()];
-        if let Err(e) = self.ctx.cleanup_scheduler.schedule(CleanupTask::Compact(
-            CompactTask::CheckAndCompact {
-                cf_names,
-                ranges: ranges_need_check,
-                compact_threshold: CompactThreshold::new(
-                    self.ctx.cfg.region_compact_min_tombstones,
-                    self.ctx.cfg.region_compact_tombstones_percent,
-                    self.ctx.cfg.region_compact_min_redundant_rows,
-                    self.ctx.cfg.region_compact_redundant_rows_percent(),
-                ),
-            },
-        )) {
-            error!(
-                "schedule space check task failed";
-                "store_id" => self.fsm.store.id,
-                "err" => ?e,
-            );
-        }
-    }
-
     fn report_min_resolved_ts(&self) {
         let read_progress = {
             let meta = self.ctx.store_meta.lock().unwrap();
@@ -2826,7 +2745,7 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER
             min_resolved_ts,
         };
         if let Err(e) = self.ctx.pd_scheduler.schedule(task) {
-            error!("failed to send min resolved ts to pd worker";
+            warn!("failed to send min resolved ts to pd worker";
                 "store_id" => self.fsm.store.id,
                 "err" => ?e
             );
@@ -3102,13 +3021,22 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER
         self.register_compact_lock_cf_tick();
     }
 
-    fn on_wake_up_regions(&self, abnormal_stores: Vec<u64>) {
+    fn on_wake_up_regions(&self, abnormal_stores: Vec<u64>, region_ids: Vec<u64>) {
         info!("try to wake up all hibernated regions in this store";
             "to_all" => abnormal_stores.is_empty());
         let store_id = self.ctx.store_id();
         let meta = self.ctx.store_meta.lock().unwrap();
 
-        for (region_id, region) in &meta.regions {
+        for region_id in region_ids {
+            let region = {
+                match meta.regions.get(&region_id) {
+                    None => {
+                        // The region has been merged or removed from this store; skip processing.
+                        continue;
+                    }
+                    Some(r) => r,
+                }
+            };
             // Check whether the current region is not found on abnormal stores. If so,
             // this region is not the target to be awaken.
             if !region_on_stores(region, &abnormal_stores) {
@@ -3123,7 +3051,7 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER
             {
                 // Send MsgRegionWakeUp to Peer for awakening hibernated regions.
                 let mut message = RaftMessage::default();
-                message.set_region_id(*region_id);
+                message.set_region_id(region_id);
                 message.set_from_peer(peer.clone());
                 message.set_to_peer(peer);
                 message.set_region_epoch(region.get_region_epoch().clone());
@@ -3172,7 +3100,7 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER
 // we will remove 1-week old version 1 SST files.
 const VERSION_1_SST_CLEANUP_DURATION: Duration = Duration::from_secs(7 * 24 * 60 * 60);
 
-impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER, T> {
+impl<EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'_, EK, ER, T> {
     fn on_cleanup_import_sst(&mut self) -> Result<()> {
         let mut delete_ssts = Vec::new();
 
@@ -3515,9 +3443,10 @@ impl<'a, EK: KvEngine, ER: RaftEngine, T: Transport> StoreFsmDelegate<'a, EK, ER
 
 #[cfg(test)]
 mod tests {
-    use engine_rocks::{RangeOffsets, RangeProperties, RocksCompactedEvent};
+    use std::collections::BTreeMap;
 
-    use super::*;
+    use engine_rocks::{RangeOffsets, RangeProperties, RocksCompactedEvent};
+    use engine_traits::CompactedEvent;
 
     #[test]
     fn test_calc_region_declined_bytes() {
@@ -3546,6 +3475,8 @@ mod tests {
                 ),
             ],
         };
+        let (prop_start_key, prop_end_key) =
+            (prop.smallest_key().unwrap(), prop.largest_key().unwrap());
         let event = RocksCompactedEvent {
             cf: "default".to_owned(),
             output_level: 3,
@@ -3556,6 +3487,8 @@ mod tests {
             input_props: vec![prop],
             output_props: vec![],
         };
+        let (start_key, end_key) = event.get_key_range();
+        assert_eq!((start_key, end_key), (prop_start_key, prop_end_key));
 
         let mut region_ranges = BTreeMap::new();
         region_ranges.insert(b"a".to_vec(), 1);
diff --git a/components/raftstore/src/store/local_metrics.rs b/components/raftstore/src/store/local_metrics.rs
index 2f8f36a5634..02b16850597 100644
--- a/components/raftstore/src/store/local_metrics.rs
+++ b/components/raftstore/src/store/local_metrics.rs
@@ -7,7 +7,7 @@ use collections::HashSet;
 use prometheus::local::{LocalHistogram, LocalIntCounter};
 use raft::eraftpb::MessageType;
 use tikv_util::time::{Duration, Instant};
-use tracker::{Tracker, TrackerToken, GLOBAL_TRACKERS, INVALID_TRACKER_TOKEN};
+use tracker::{GLOBAL_TRACKERS, INVALID_TRACKER_TOKEN, Tracker, TrackerToken};
 
 use super::metrics::*;
 
diff --git a/components/raftstore/src/store/metrics.rs b/components/raftstore/src/store/metrics.rs
index ecd08e493f6..aabb3cfb08a 100644
--- a/components/raftstore/src/store/metrics.rs
+++ b/components/raftstore/src/store/metrics.rs
@@ -484,13 +484,6 @@ lazy_static! {
             exponential_buckets(0.00001, 2.0, 32).unwrap() // 10us ~ 42949s.
         ).unwrap();
 
-    pub static ref PEER_CREATE_RAFT_DURATION_HISTOGRAM: Histogram =
-        register_histogram!(
-            "tikv_raftstore_peer_create_raft_write_duration_seconds",
-            "Bucketed histogram of peer create raft engine write duration",
-            exponential_buckets(0.00001, 2.0, 26).unwrap() // 10us ~ 671s.
-        ).unwrap();
-
     pub static ref STORE_IO_DURATION_HISTOGRAM: HistogramVec =
         register_histogram_vec!(
             "tikv_raftstore_io_duration_seconds",
@@ -885,6 +878,14 @@ lazy_static! {
             exponential_buckets(0.00001, 2.0, 26).unwrap()
         ).unwrap();
 
+    pub static ref STORE_INSPECT_NETWORK_DURATION_HISTOGRAM: HistogramVec =
+        register_histogram_vec!(
+            "tikv_raftstore_inspect_network_duration_seconds",
+            "Bucketed histogram of inspect network duration.",
+            &["target"],
+            exponential_buckets(0.00001, 2.0, 26).unwrap()
+        ).unwrap();
+
     pub static ref STORE_SLOW_SCORE_GAUGE: IntGaugeVec = register_int_gauge_vec!(
         "tikv_raftstore_slow_score",
         "Slow score of the store.",
diff --git a/components/raftstore/src/store/mod.rs b/components/raftstore/src/store/mod.rs
index c28d8806f9a..c4f09f3cddf 100644
--- a/components/raftstore/src/store/mod.rs
+++ b/components/raftstore/src/store/mod.rs
@@ -35,8 +35,8 @@ pub use self::{
     async_io::{
         read::{AsyncReadNotifier, FetchedLogs, GenSnapRes, ReadRunner, ReadTask},
         write::{
-            write_to_db_for_test, PersistedNotifier, StoreWriters, StoreWritersContext,
-            Worker as WriteWorker, WriteMsg, WriteTask,
+            PersistedNotifier, StoreWriters, StoreWritersContext, Worker as WriteWorker, WriteMsg,
+            WriteTask, write_to_db_for_test,
         },
         write_router::{WriteRouter, WriteRouterContext, WriteSenders},
     },
@@ -44,10 +44,10 @@ pub use self::{
         bootstrap_store, clear_prepare_bootstrap_cluster, clear_prepare_bootstrap_key,
         initial_region, prepare_bootstrap_cluster,
     },
-    compaction_guard::CompactionGuardGeneratorFactory,
+    compaction_guard::{CompactionGuardGeneratorFactory, ForcePartitionRangeManager},
     config::Config,
-    entry_storage::{EntryStorage, RaftlogFetchResult, MAX_INIT_ENTRY_COUNT},
-    fsm::{check_sst_for_ingestion, DestroyPeerJob, RaftRouter},
+    entry_storage::{EntryStorage, MAX_INIT_ENTRY_COUNT, RaftlogFetchResult},
+    fsm::{DestroyPeerJob, RaftRouter, check_sst_for_ingestion},
     hibernate_state::{GroupState, HibernateState},
     memory::*,
     metrics::RAFT_ENTRY_FETCHES_VEC,
@@ -57,45 +57,44 @@ pub use self::{
         StoreMsg, StoreTick, WriteCallback, WriteResponse,
     },
     peer::{
-        can_amend_read, get_sync_log_from_request, make_transfer_leader_response,
-        propose_read_index, should_renew_lease, DiskFullPeers, Peer, PeerStat, ProposalContext,
-        ProposalQueue, RequestInspector, RequestPolicy, TransferLeaderContext, TransferLeaderState,
+        DiskFullPeers, Peer, PeerStat, ProposalContext, ProposalQueue, RequestInspector,
+        RequestPolicy, TransferLeaderContext, TransferLeaderState, can_amend_read,
+        get_sync_log_from_request, make_transfer_leader_response, propose_read_index,
+        should_renew_lease,
     },
     peer_storage::{
-        clear_meta, do_snapshot, write_initial_apply_state, write_initial_raft_state,
-        write_peer_state, PeerStorage, SnapState, INIT_EPOCH_CONF_VER, INIT_EPOCH_VER,
-        RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM,
+        INIT_EPOCH_CONF_VER, INIT_EPOCH_VER, PeerStorage, RAFT_INIT_LOG_INDEX, RAFT_INIT_LOG_TERM,
+        SnapState, clear_meta, do_snapshot, write_initial_apply_state, write_initial_raft_state,
+        write_peer_state,
     },
     read_queue::{ReadIndexContext, ReadIndexQueue, ReadIndexRequest},
     region_snapshot::{RegionIterator, RegionSnapshot},
     replication_mode::{GlobalReplicationState, StoreGroup},
     snap::{
-        check_abort, copy_snapshot,
-        snap_io::{apply_sst_cf_files_by_ingest, build_sst_cf_file_list},
         ApplyOptions, CfFile, Error as SnapError, SnapEntry, SnapKey, SnapManager,
         SnapManagerBuilder, Snapshot, SnapshotStatistics, TabletSnapKey, TabletSnapManager,
+        check_abort, copy_snapshot,
+        snap_io::{apply_sst_cf_files_by_ingest, build_sst_cf_file_list},
     },
     snapshot_backup::SnapshotBrWaitApplySyncer,
     transport::{CasualRouter, ProposalRouter, SignificantRouter, StoreRouter, Transport},
     txn_ext::{LocksStatus, PeerPessimisticLocks, PessimisticLockPair, TxnExt},
     unsafe_recovery::{
-        demote_failed_voters_request, exit_joint_request, ForceLeaderState,
-        UnsafeRecoveryExecutePlanSyncer, UnsafeRecoveryFillOutReportSyncer,
+        ForceLeaderState, UnsafeRecoveryExecutePlanSyncer, UnsafeRecoveryFillOutReportSyncer,
         UnsafeRecoveryForceLeaderSyncer, UnsafeRecoveryHandle, UnsafeRecoveryState,
-        UnsafeRecoveryWaitApplySyncer,
+        UnsafeRecoveryWaitApplySyncer, demote_failed_voters_request, exit_joint_request,
     },
     util::{RegionReadProgress, RegionReadProgressRegistry},
     worker::{
-        metrics as worker_metrics, need_compact, AutoSplitController, BatchComponent, Bucket,
+        AutoSplitController, BIG_REGION_CPU_OVERLOAD_THRESHOLD_RATIO, BatchComponent, Bucket,
         BucketRange, BucketStatsInfo, CachedReadDelegate, CheckLeaderRunner, CheckLeaderTask,
-        CompactThreshold, DiskCheckRunner, FlowStatistics, FlowStatsReporter,
-        FullCompactController, KeyEntry, LocalReadContext, LocalReader, LocalReaderCore,
-        PdStatsMonitor, PdTask, ReadDelegate, ReadExecutor, ReadExecutorProvider, ReadProgress,
-        ReadStats, RefreshConfigTask, RegionTask, SnapGenTask, SplitCheckRunner, SplitCheckTask,
-        SplitConfig, SplitConfigManager, SplitInfo, StoreMetaDelegate, StoreStatsReporter,
-        TrackVer, WriteStats, WriterContoller, BIG_REGION_CPU_OVERLOAD_THRESHOLD_RATIO,
         DEFAULT_BIG_REGION_BYTE_THRESHOLD, DEFAULT_BIG_REGION_QPS_THRESHOLD,
-        DEFAULT_BYTE_THRESHOLD, DEFAULT_QPS_THRESHOLD, NUM_COLLECT_STORE_INFOS_PER_HEARTBEAT,
-        REGION_CPU_OVERLOAD_THRESHOLD_RATIO,
+        DEFAULT_BYTE_THRESHOLD, DEFAULT_QPS_THRESHOLD, DiskCheckRunner, FlowStatistics,
+        FlowStatsReporter, FullCompactController, KeyEntry, LocalReadContext, LocalReader,
+        LocalReaderCore, NUM_COLLECT_STORE_INFOS_PER_HEARTBEAT, PdStatsMonitor, PdTask,
+        REGION_CPU_OVERLOAD_THRESHOLD_RATIO, ReadDelegate, ReadExecutor, ReadExecutorProvider,
+        ReadProgress, ReadStats, RefreshConfigTask, RegionTask, SnapGenTask, SplitCheckRunner,
+        SplitCheckTask, SplitConfig, SplitConfigManager, SplitInfo, StoreMetaDelegate,
+        StoreStatsReporter, TrackVer, WriteStats, WriterContoller, metrics as worker_metrics,
     },
 };
diff --git a/components/raftstore/src/store/msg.rs b/components/raftstore/src/store/msg.rs
index dc88e881b20..03b4bd01c6d 100644
--- a/components/raftstore/src/store/msg.rs
+++ b/components/raftstore/src/store/msg.rs
@@ -3,7 +3,7 @@
 // #[PerformanceCriticalPath]
 #[cfg(any(test, feature = "testexport"))]
 use std::sync::Arc;
-use std::{borrow::Cow, fmt};
+use std::{borrow::Cow, fmt, time::Duration};
 
 use collections::HashSet;
 use engine_traits::{CompactedEvent, KvEngine, Snapshot};
@@ -23,16 +23,17 @@ use kvproto::{
 use pd_client::BucketMeta;
 use raft::SnapshotStatus;
 use resource_control::ResourceMetered;
-use smallvec::{smallvec, SmallVec};
+use smallvec::{SmallVec, smallvec};
 use strum::{EnumCount, EnumVariantNames};
 use tikv_util::{deadline::Deadline, escape, memory::HeapSize, time::Instant};
-use tracker::{get_tls_tracker_token, TrackerToken};
+use tracker::{TrackerToken, get_tls_tracker_token};
 
 use super::{
-    local_metrics::TimeTracker, region_meta::RegionMeta,
-    snapshot_backup::SnapshotBrWaitApplyRequest, FetchedLogs, RegionSnapshot,
+    FetchedLogs, RegionSnapshot, local_metrics::TimeTracker, region_meta::RegionMeta,
+    snapshot_backup::SnapshotBrWaitApplyRequest,
 };
 use crate::store::{
+    SnapKey,
     fsm::apply::{CatchUpLogs, ChangeObserver, TaskRes as ApplyTaskRes},
     metrics::RaftEventDurationType,
     unsafe_recovery::{
@@ -41,7 +42,6 @@ use crate::store::{
     },
     util::KeysInfoFormatter,
     worker::{Bucket, BucketRange},
-    SnapKey,
 };
 
 #[derive(Debug)]
@@ -64,6 +64,32 @@ pub struct PeerInternalStat {
     pub bucket_ranges: Option<Vec<BucketRange>>,
 }
 
+/// Statistics about clearing peer metadata.
+#[derive(Debug, Default, Clone)]
+pub struct PeerClearMetaStat {
+    // Duration of clearing metadata in raft
+    pub raft_duration: Duration,
+    // Duration of clearning metadata in kvdb
+    pub kvdb_duration: Duration,
+}
+
+impl PeerClearMetaStat {
+    pub fn new(raft_duration: Duration, kvdb_duration: Duration) -> Self {
+        Self {
+            raft_duration,
+            kvdb_duration,
+        }
+    }
+
+    pub fn is_zero(&self) -> bool {
+        self.raft_duration.is_zero() && self.kvdb_duration.is_zero()
+    }
+
+    pub fn duration(&self) -> Duration {
+        self.raft_duration + self.kvdb_duration
+    }
+}
+
 // This is only necessary because of seeming limitations in derive(Clone) w/r/t
 // generics. If it can be deleted in the future in favor of derive, it should
 // be.
@@ -552,6 +578,15 @@ where
     UnsafeRecoveryFillOutReport(UnsafeRecoveryFillOutReportSyncer),
     SnapshotBrWaitApply(SnapshotBrWaitApplyRequest),
     CheckPendingAdmin(UnboundedSender<CheckAdminResponse>),
+    /// A message to destroy the corresponding peer.
+    ///
+    /// `clear_stat` records the statistics of duration when clear raft state
+    /// and data in kvdb.
+    ReadyToDestroyPeer {
+        to_peer_id: u64,
+        merged_by_target: bool,
+        clear_stat: PeerClearMetaStat,
+    },
 }
 
 /// Campaign type for triggering a Raft campaign.
@@ -939,18 +974,20 @@ where
 {
     RaftMessage(Box<InspectedRaftMessage>),
 
+    StoreUnreachable {
+        store_id: u64,
+    },
+
+    // Compaction finished event
+    CompactedEvent(EK::CompactedEvent),
+
     // Clear region size and keys for all regions in the range, so we can force them to
     // re-calculate their size later.
     ClearRegionSizeInRange {
         start_key: Vec<u8>,
         end_key: Vec<u8>,
     },
-    StoreUnreachable {
-        store_id: u64,
-    },
 
-    // Compaction finished event
-    CompactedEvent(EK::CompactedEvent),
     Tick(StoreTick),
     Start {
         store: metapb::Store,
@@ -976,6 +1013,7 @@ where
 
     AwakenRegions {
         abnormal_stores: Vec<u64>,
+        region_ids: Vec<u64>,
     },
 
     /// Message only used for test.
@@ -1053,4 +1091,35 @@ mod tests {
         // make sure the msg is small enough
         assert_eq!(mem::size_of::<PeerMsg<RocksEngine>>(), 32);
     }
+
+    #[test]
+    fn test_validate_slowlog_of_store_msg() {
+        use engine_rocks::RocksEngine;
+        use strum::VariantNames;
+
+        use super::*;
+
+        #[allow(const_evaluatable_unchecked)]
+        let mut distribution = [0; StoreMsg::<RocksEngine>::COUNT];
+
+        let unreachable_msg: StoreMsg<RocksEngine> = StoreMsg::StoreUnreachable { store_id: 4 };
+        distribution[unreachable_msg.discriminant()] += 1;
+        let result = StoreMsg::<RocksEngine>::VARIANTS
+            .iter()
+            .zip(distribution)
+            .find(|(_, c)| *c > 0)
+            .unwrap();
+        assert_eq!(result.1, unreachable_msg.discriminant());
+        assert_eq!(*result.0, "StoreUnreachable");
+
+        let gcsnap_msg: StoreMsg<RocksEngine> = StoreMsg::GcSnapshotFinish;
+        distribution[gcsnap_msg.discriminant()] += 1;
+        let mut filter = StoreMsg::<RocksEngine>::VARIANTS
+            .iter()
+            .zip(distribution)
+            .filter(|(_, c)| *c > 0);
+        assert_eq!(*filter.next().unwrap().0, "StoreUnreachable");
+        assert_eq!(*filter.next().unwrap().0, "GcSnapshotFinish");
+        assert!(filter.next().is_none());
+    }
 }
diff --git a/components/raftstore/src/store/peer.rs b/components/raftstore/src/store/peer.rs
index 9cb74bb15ea..51f302c51f5 100644
--- a/components/raftstore/src/store/peer.rs
+++ b/components/raftstore/src/store/peer.rs
@@ -7,11 +7,10 @@ use std::{
     collections::VecDeque,
     mem,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc, Mutex,
+        atomic::{AtomicUsize, Ordering},
     },
     time::{Duration, Instant},
-    u64, usize,
 };
 
 use bitflags::bitflags;
@@ -22,14 +21,10 @@ use codec::{
 };
 use collections::{HashMap, HashSet};
 use crossbeam::{atomic::AtomicCell, channel::TrySendError};
-use engine_traits::{
-    Engines, KvEngine, PerfContext, RaftEngine, Snapshot, WriteBatch, WriteOptions, CF_DEFAULT,
-    CF_LOCK, CF_WRITE,
-};
+use engine_traits::{CF_LOCK, Engines, KvEngine, RaftEngine, Snapshot};
 use error_code::ErrorCodeExt;
 use fail::fail_point;
 use getset::{Getters, MutGetters};
-use keys::{enc_end_key, enc_start_key};
 use kvproto::{
     errorpb,
     kvrpcpb::{DiskFullOpt, ExtraOp as TxnExtraOp},
@@ -39,9 +34,7 @@ use kvproto::{
         self, AdminCmdType, AdminResponse, CmdType, CommitMergeRequest, PutRequest, RaftCmdRequest,
         RaftCmdResponse, Request, TransferLeaderRequest, TransferLeaderResponse,
     },
-    raft_serverpb::{
-        ExtraMessage, ExtraMessageType, MergeState, PeerState, RaftApplyState, RaftMessage,
-    },
+    raft_serverpb::{ExtraMessage, ExtraMessageType, MergeState, RaftApplyState, RaftMessage},
     replication_modepb::{
         DrAutoSyncState, RegionReplicationState, RegionReplicationStatus, ReplicationMode,
     },
@@ -50,78 +43,72 @@ use parking_lot::RwLockUpgradableReadGuard;
 use pd_client::{Feature, INVALID_ID};
 use protobuf::Message;
 use raft::{
-    self,
+    self, GetEntriesContext, INVALID_INDEX, LightReady, NO_LIMIT, ProgressState, RawNode, Ready,
+    SnapshotStatus, StateRole,
     eraftpb::{self, Entry, EntryType, MessageType},
-    GetEntriesContext, LightReady, ProgressState, RawNode, Ready, SnapshotStatus, StateRole,
-    INVALID_INDEX, NO_LIMIT,
 };
 use rand::seq::SliceRandom;
 use smallvec::SmallVec;
 use tikv_alloc::trace::TraceEvent;
 use tikv_util::{
-    box_err, box_try,
+    Either, box_err, box_try,
     codec::number::decode_u64,
     debug, error, info,
     store::{find_peer_by_id, is_learner},
     sys::disk::DiskUsage,
-    time::{duration_to_sec, monotonic_raw_now, Instant as TiInstant, InstantExt},
+    time::{Instant as TiInstant, InstantExt, duration_to_sec, monotonic_raw_now},
     warn,
     worker::Scheduler,
-    Either,
 };
 use time::{Duration as TimeDuration, Timespec};
-use tracker::{TrackerTokenArray, GLOBAL_TRACKERS};
+use tracker::{GLOBAL_TRACKERS, TrackerTokenArray};
 use txn_types::{TimeStamp, WriteBatchFlags};
 use uuid::Uuid;
 
 use super::{
-    cmd_resp,
+    DestroyPeerJob, LocalReadContext, cmd_resp,
     local_metrics::{IoType, RaftMetrics},
     metrics::*,
-    peer_storage::{
-        write_peer_state, CheckApplyingSnapStatus, HandleReadyResult, PeerStorage,
-        RAFT_INIT_LOG_TERM,
-    },
+    peer_storage::{CheckApplyingSnapStatus, HandleReadyResult, PeerStorage, RAFT_INIT_LOG_TERM},
     read_queue::{ReadIndexQueue, ReadIndexRequest},
     transport::Transport,
     util::{
-        self, check_req_region_epoch, is_initial_msg, AdminCmdEpochState, ChangePeerI,
-        ConfChangeKind, Lease, LeaseState, NORMAL_REQ_CHECK_CONF_VER, NORMAL_REQ_CHECK_VER,
+        self, AdminCmdEpochState, ChangePeerI, ConfChangeKind, Lease, LeaseState,
+        NORMAL_REQ_CHECK_CONF_VER, NORMAL_REQ_CHECK_VER, check_req_region_epoch, is_initial_msg,
     },
     worker::BucketStatsInfo,
-    DestroyPeerJob, LocalReadContext,
 };
 use crate::{
+    Error, Result,
     coprocessor::{
-        split_observer::NO_VALID_SPLIT_KEY, CoprocessorHost, RegionChangeEvent, RegionChangeReason,
-        RoleChange, TransferLeaderCustomContext,
+        CoprocessorHost, RegionChangeEvent, RegionChangeReason, RoleChange,
+        TransferLeaderCustomContext,
     },
     errors::RAFTSTORE_IS_BUSY,
     router::{RaftStoreRouter, ReadContext},
     store::{
+        Callback, Config, GlobalReplicationState, PdTask, PeerMsg, RAFT_INIT_LOG_INDEX,
+        ReadCallback, ReadIndexContext, ReadResponse, TxnExt, WriteCallback,
         async_io::{read::ReadTask, write::WriteMsg, write_router::WriteRouter},
         entry_storage::CacheWarmupState,
         fsm::{
+            Apply, ApplyMetrics, ApplyTask, Proposal, StoreMeta,
             apply::{self, CatchUpLogs},
             store::PollContext,
-            Apply, ApplyMetrics, ApplyTask, Proposal,
         },
         hibernate_state::GroupState,
-        memory::{needs_evict_entry_cache, MEMTRACE_RAFT_ENTRIES},
-        msg::{CampaignType, CasualMessage, ErrorCallback, RaftCommand},
-        peer_storage::HandleSnapshotResult,
+        memory::{MEMTRACE_RAFT_ENTRIES, needs_evict_entry_cache},
+        msg::{CampaignType, CasualMessage, ErrorCallback, PeerClearMetaStat, RaftCommand},
+        peer_storage::{HandleSnapshotResult, clear_meta_in_kv_and_raft},
         snapshot_backup::{AbortReason, SnapshotBrState},
         txn_ext::LocksStatus,
         unsafe_recovery::{ForceLeaderState, UnsafeRecoveryState},
-        util::{admin_cmd_epoch_lookup, RegionReadProgress},
+        util::{RegionReadProgress, admin_cmd_epoch_lookup},
         worker::{
-            CleanupTask, CompactTask, HeartbeatTask, RaftlogGcTask, ReadDelegate, ReadExecutor,
-            ReadProgress, RegionTask, SplitCheckTask,
+            HeartbeatTask, RaftlogGcTask, ReadDelegate, ReadExecutor, ReadProgress, RegionTask,
+            SplitCheckTask,
         },
-        Callback, Config, GlobalReplicationState, PdTask, PeerMsg, ReadCallback, ReadIndexContext,
-        ReadResponse, TxnExt, WriteCallback, RAFT_INIT_LOG_INDEX,
     },
-    Error, Result,
 };
 
 const SHRINK_CACHE_CAPACITY: usize = 64;
@@ -484,7 +471,7 @@ pub struct ApplySnapshotContext {
     /// Destroy the peer after apply task finished or aborted
     /// This flag is set to true when the peer destroy is skipped because of
     /// running snapshot task.
-    /// This is to accelerate peer destroy without waiting for extra destory
+    /// This is to accelerate peer destroy without waiting for extra destroy
     /// peer message.
     pub destroy_peer_after_apply: bool,
 }
@@ -704,6 +691,25 @@ impl SplitCheckTrigger {
     }
 }
 
+/// A enum contains some useful state to represent different reason for
+/// pending remove.
+#[repr(u8)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum PendingRemoveReason {
+    NotRemoved = 0,
+    Merge,
+    /// The peer has been marked for destruction and is scheduled to be removed.
+    Destroy,
+    /// The peer is now ready to be destroyed; all necessary preparations (such
+    /// as clearing the ApplyFsm) have been completed, so it can be safely
+    /// removed.
+    ///
+    /// Note: The peer enters the final stage of destruction only when its state
+    /// transitions from `Destroy` to `ReadyToDestroy`, or if it is directly
+    /// marked as `ReadyToDestroy`.
+    ReadyToDestroy,
+}
+
 #[derive(Getters, MutGetters)]
 pub struct Peer<EK, ER>
 where
@@ -747,11 +753,11 @@ where
     /// Indicates whether the peer should be woken up.
     pub should_wake_up: bool,
     /// Whether this peer is destroyed asynchronously.
-    /// If it's true,
+    /// If it's Some(...),
     /// - when merging, its data in storeMeta will be removed early by the
     ///   target peer.
     /// - all read requests must be rejected.
-    pub pending_remove: bool,
+    pub pending_remove: Option<PendingRemoveReason>,
     /// Currently it's used to indicate whether the witness -> non-witess
     /// convertion operation is complete. The meaning of completion is that
     /// this peer must contain the applied data, then PD can consider that
@@ -926,7 +932,6 @@ where
     pub unsafe_recovery_state: Option<UnsafeRecoveryState>,
     pub snapshot_recovery_state: Option<SnapshotBrState>,
 
-    last_record_safe_point: u64,
     /// Used for checking whether the peer is busy on apply.
     /// * `None` => the peer has no pending logs for apply or already finishes
     ///   applying.
@@ -1027,7 +1032,7 @@ where
             split_check_trigger: SplitCheckTrigger::default(),
             delete_keys_hint: 0,
             leader_unreachable: false,
-            pending_remove: false,
+            pending_remove: None,
             wait_data,
             request_index: last_index,
             delay_clean_data: false,
@@ -1085,7 +1090,6 @@ where
                 REGION_READ_PROGRESS_CAP,
                 peer_id,
             )),
-            last_record_safe_point: 0,
             memtrace_raft_entries: 0,
             write_router: WriteRouter::new(tag),
             unpersisted_readies: VecDeque::default(),
@@ -1109,7 +1113,6 @@ where
 
         let persisted_index = peer.raft_group.raft.raft_log.persisted;
         peer.mut_store().update_cache_persisted(persisted_index);
-
         Ok(peer)
     }
 
@@ -1324,7 +1327,7 @@ where
     /// Tries to destroy itself. Returns a job (if needed) to do more cleaning
     /// tasks.
     pub fn maybe_destroy<T>(&mut self, ctx: &PollContext<EK, ER, T>) -> Option<DestroyPeerJob> {
-        if self.pending_remove {
+        if self.pending_remove.is_some() {
             info!(
                 "is being destroyed, skip";
                 "region_id" => self.region_id,
@@ -1381,7 +1384,9 @@ where
         //   is Some and should be set to None.
         self.apply_snap_ctx = None;
 
-        self.pending_remove = true;
+        // Marks the peer is prepared to be destroyed, waiting for finishing
+        // preparations.
+        self.pending_remove = Some(PendingRemoveReason::Destroy);
 
         Some(DestroyPeerJob {
             initialized: self.get_store().is_initialized(),
@@ -1390,115 +1395,112 @@ where
         })
     }
 
-    /// Does the real destroy task which includes:
-    /// 1. Set the region to tombstone;
-    /// 2. Clear data;
-    /// 3. Notify all pending requests.
+    /// Destroys the peer by scheduling an asychronous task to the region
+    /// worker by default.
+    ///
+    /// If the scheduling is abnormal due to `region-worker` is exited, it
+    /// will redirect to directly destroy the peer synchronously.
+    ///
+    /// The return value:
+    /// - `None` represents that the destroy task is scheduled successfully.
+    /// - `Some(...)` represents that the destroy task is executed
+    ///   synchronously.
     pub fn destroy(
         &mut self,
         engines: &Engines<EK, ER>,
-        perf_context: &mut ER::PerfContext,
         keep_data: bool,
-        pending_create_peers: &Mutex<HashMap<u64, (u64, bool)>>,
-        raft_metrics: &RaftMetrics,
-    ) -> Result<()> {
-        fail_point!("raft_store_skip_destroy_peer", |_| Ok(()));
-        let t = TiInstant::now();
+        store_meta: Arc<Mutex<StoreMeta>>,
+        pending_create_peers: Arc<Mutex<HashMap<u64, (u64, bool)>>>,
+    ) -> Option<PeerClearMetaStat> {
+        fail_point!("raft_store_skip_destroy_peer", |_| {
+            Some(PeerClearMetaStat::default())
+        });
 
-        let mut region = self.region().clone();
-        info!(
-            "begin to destroy";
-            "region_id" => self.region_id,
-            "peer_id" => self.peer.get_id(),
-        );
+        let peer = self.peer.clone();
+        let region = self.region().clone();
+        // Raft log gc should be flushed before being destroyed, so last_compacted_idx
+        // has to be the minimal index that may still have logs.
+        let last_compacted_idx = self.last_compacted_idx;
+        let local_first_replicate = self.local_first_replicate;
+        let merge_state = if keep_data {
+            self.pending_merge_state.clone()
+        } else {
+            None
+        };
 
-        let (pending_create_peers, clean) = if self.local_first_replicate {
-            let mut pending = pending_create_peers.lock().unwrap();
-            if self.get_store().is_initialized() {
-                assert_eq!(pending.get(&region.get_id()), None);
-                (None, true)
-            } else if let Some(status) = pending.get(&region.get_id()) {
-                if *status == (self.peer.get_id(), false) {
-                    pending.remove(&region.get_id());
-                    // Hold the lock to avoid apply worker applies split.
-                    (Some(pending), true)
-                } else if *status == (self.peer.get_id(), true) {
-                    // It's already marked to split by apply worker, skip delete.
-                    (None, false)
-                } else {
-                    // Peer id can't be different as router should exist all the time, their is no
-                    // chance for store to insert a different peer id. And apply worker should skip
-                    // split when meeting a different id.
-                    let status = *status;
-                    // Avoid panic with lock.
-                    drop(pending);
-                    panic!("{} unexpected pending states {:?}", self.tag, status);
+        // Asynchronously destroy the peer by triggering a task to background worker,
+        // and the corresponding worker will finish the preparations for destroying.
+        let async_failed = self
+            .mut_store()
+            .schedule_destroy_peer(
+                peer.clone(),
+                region.clone(),
+                keep_data,
+                local_first_replicate,
+                last_compacted_idx,
+                merge_state.clone(),
+                pending_create_peers.clone(),
+            )
+            .is_err();
+        // Failed to asynchronously destroy the peer (channel is closed),
+        // redirecting to synchronously destroy the peer.
+        let clear_stat = if async_failed {
+            match clear_meta_in_kv_and_raft(
+                engines,
+                peer,
+                region,
+                self.get_store().raft_state().clone(),
+                merge_state,
+                self.get_store().is_initialized(),
+                local_first_replicate,
+                last_compacted_idx,
+                store_meta.clone(),
+                pending_create_peers,
+            ) {
+                Err(e) => {
+                    // If not panic here, the peer will be recreated in the next restart,
+                    // then it will be gc again. But if some overlap region is created
+                    // before restarting, the gc action will delete the overlap region's
+                    // data too.
+                    panic!("{} prepare to destroy err {:?}", self.tag, e);
                 }
-            } else {
-                // The status is inserted when it's created. It will be removed in following
-                // cases:
-                // - By apply worker as it fails to split due to region state key. This is
-                //   impossible to reach this code path because the delete write batch is not
-                //   persisted yet.
-                // - By store fsm as it fails to create peer, which is also invalid obviously.
-                // - By peer fsm after persisting snapshot, then it should be initialized.
-                // - By peer fsm after split.
-                // - By peer fsm when destroy, which should go the above branch instead.
-                (None, false)
+                Ok(stat) => Some(stat),
             }
         } else {
-            (None, true)
+            // Returns `None` to represent that the destroy task is successfully
+            // scheduled.
+            None
         };
-        if clean {
-            // Set Tombstone state explicitly
-            let mut kv_wb = engines.kv.write_batch();
-            let mut raft_wb = engines.raft.log_batch(1024);
-            // Raft log gc should be flushed before being destroyed, so last_compacted_idx
-            // has to be the minimal index that may still have logs.
-            let last_compacted_idx = self.last_compacted_idx;
-            self.mut_store()
-                .clear_meta(last_compacted_idx, &mut kv_wb, &mut raft_wb)?;
-
-            // StoreFsmDelegate::check_msg use both epoch and region peer list to check
-            // whether a message is targeting a staled peer. But for an uninitialized peer,
-            // both epoch and peer list are empty, so a removed peer will be created again.
-            // Saving current peer into the peer list of region will fix this problem.
-            if !self.get_store().is_initialized() {
-                region.mut_peers().push(self.peer.clone());
-            }
-
-            write_peer_state(
-                &mut kv_wb,
-                &region,
-                PeerState::Tombstone,
-                // Only persist the `merge_state` if the merge is known to be succeeded
-                // which is determined by the `keep_data` flag
-                if keep_data {
-                    self.pending_merge_state.clone()
-                } else {
-                    None
-                },
-            )?;
 
-            let start = Instant::now();
-            // write kv rocksdb first in case of restart happen between two write
-            let mut write_opts = WriteOptions::new();
-            write_opts.set_sync(true);
-            kv_wb.write_opt(&write_opts)?;
-            raft_metrics
-                .io_write_peer_destroy_kv
-                .observe(start.saturating_elapsed().as_secs_f64());
+        info!(
+            "trigger destroy peer task";
+            "region_id" => self.region_id,
+            "peer_id" => self.peer.get_id(),
+            "async" => !async_failed,
+        );
+        clear_stat
+    }
 
-            drop(pending_create_peers);
+    /// Does the final destroy task which includes:
+    /// 1. Clear data if needs (async mode).
+    /// 2. Notify all pending requests.
+    pub fn ready_to_destroy(
+        &mut self,
+        keep_data: bool,
+        clear_stat: PeerClearMetaStat,
+        raft_metrics: &RaftMetrics,
+    ) {
+        let t = TiInstant::now();
+        let region_id = self.region_id;
+        let clean = !clear_stat.is_zero();
 
-            let start = Instant::now();
-            perf_context.start_observe();
-            engines.raft.consume(&mut raft_wb, true)?;
-            perf_context.report_metrics(&[]);
+        if clean {
             raft_metrics
                 .io_write_peer_destroy_raft
-                .observe(start.saturating_elapsed().as_secs_f64());
-
+                .observe(clear_stat.raft_duration.as_secs_f64());
+            raft_metrics
+                .io_write_peer_destroy_kv
+                .observe(clear_stat.kvdb_duration.as_secs_f64());
             if self.get_store().is_initialized() && !keep_data {
                 // If we meet panic when deleting data and raft log, the dirty data
                 // will be cleared by a newer snapshot applying or restart.
@@ -1512,24 +1514,22 @@ where
             }
         }
 
-        self.pending_reads.clear_all(Some(region.get_id()));
+        self.pending_reads.clear_all(Some(region_id));
 
         for Proposal { cb, .. } in self.proposals.queue.drain(..) {
-            apply::notify_req_region_removed(region.get_id(), cb);
+            apply::notify_req_region_removed(region_id, cb);
         }
 
         info!(
             "peer destroy itself";
             "region_id" => self.region_id,
             "peer_id" => self.peer.get_id(),
-            "takes" => ?t.saturating_elapsed(),
+            "takes" => ?(t.saturating_elapsed() + clear_stat.duration()),
             "clean" => clean,
             "keep_data" => keep_data,
         );
 
         fail_point!("raft_store_after_destroy_peer");
-
-        Ok(())
     }
 
     #[inline]
@@ -1675,6 +1675,12 @@ where
         region: metapb::Region,
         reason: RegionChangeReason,
     ) {
+        fail_point!(
+            "raftstore_set_region_after_change_peer",
+            self.peer.get_store_id() == 3 && reason == RegionChangeReason::ChangePeer,
+            |_| {}
+        );
+
         if self.region().get_region_epoch().get_version() < region.get_region_epoch().get_version()
         {
             // Epoch version changed, disable read on the local reader for this region.
@@ -1696,7 +1702,7 @@ where
             pessimistic_locks.version = self.region().get_region_epoch().get_version();
         }
 
-        if !self.pending_remove {
+        if self.pending_remove.is_none() {
             host.on_region_changed(
                 self.region(),
                 RegionChangeEvent::Update(reason),
@@ -1776,7 +1782,7 @@ where
     pub fn should_destroy_after_apply_snapshot(&self) -> bool {
         self.apply_snap_ctx
             .as_ref()
-            .map_or(false, |ctx| ctx.destroy_peer_after_apply)
+            .is_some_and(|ctx| ctx.destroy_peer_after_apply)
     }
 
     /// Returns `true` if the raft group has replicated a snapshot but not
@@ -2628,8 +2634,8 @@ where
     ///   `Peer::on_persist_ready`
     /// - Schedule the snapshot task to region worker through
     ///   `schedule_applying_snapshot`
-    /// - Wait for applying snapshot to complete(`check_snap_status`)
-    /// Then it's valid to handle the next ready.
+    /// - Wait for applying snapshot to complete(`check_snap_status`) Then it's
+    ///   valid to handle the next ready.
     fn check_snap_status<T: Transport>(&mut self, ctx: &mut PollContext<EK, ER, T>) -> bool {
         if let Some(snap_ctx) = self.apply_snap_ctx.as_ref() {
             if !snap_ctx.scheduled {
@@ -2763,7 +2769,7 @@ where
             None => return,
         };
         let cancel_by_unreachable_store =
-            unreachable_store_id.map_or(false, |s| to_peer.get_store_id() == s);
+            unreachable_store_id.is_some_and(|s| to_peer.get_store_id() == s);
         let cancel_by_peer_not_found = find_peer_by_id(self.region(), to_peer.get_id()).is_none();
         if cancel_by_unreachable_store || cancel_by_peer_not_found {
             self.get_store().cancel_generating_snap(None);
@@ -2807,7 +2813,7 @@ where
         &mut self,
         ctx: &mut PollContext<EK, ER, T>,
     ) -> Option<ReadyResult> {
-        if self.pending_remove {
+        if self.pending_remove.is_some() {
             return None;
         }
 
@@ -3142,6 +3148,13 @@ where
         for entry in committed_entries.iter().rev() {
             // raft meta is very small, can be ignored.
             self.raft_log_size_hint += entry.get_data().len() as u64;
+            // Using per committed entry to update the term cache may slightly reduce
+            // `raft::Storage::term()` query performance for recently appended
+            // indices, but it ensures that the term cache maintains the
+            // integrity and continuity of each term's lifecycle, making it safe
+            // and efficient for access and compaction.
+            self.mut_store()
+                .update_term_cache(entry.get_index(), entry.get_term());
             if lease_to_be_updated {
                 let propose_time = self
                     .proposals
@@ -3385,7 +3398,7 @@ where
         self.write_router
             .check_new_persisted(ctx, self.persisted_number);
 
-        if !self.pending_remove {
+        if self.pending_remove.is_none() {
             // If `pending_remove` is true, no need to call `on_persist_ready` to
             // update persist index.
             let pre_persist_index = self.raft_group.raft.raft_log.persisted;
@@ -3829,7 +3842,7 @@ where
     }
 
     fn maybe_update_read_progress(&self, reader: &mut ReadDelegate, progress: ReadProgress) {
-        if self.pending_remove {
+        if self.pending_remove.is_some() {
             return;
         }
         debug!(
@@ -3884,7 +3897,7 @@ where
         mut err_resp: RaftCmdResponse,
         mut disk_full_opt: DiskFullOpt,
     ) -> bool {
-        if self.pending_remove {
+        if self.pending_remove.is_some() {
             return false;
         }
 
@@ -4128,7 +4141,7 @@ where
     pub fn pre_read_index(&self) -> Result<()> {
         fail_point!(
             "before_propose_readindex",
-            |s| if s.map_or(true, |s| s.parse().unwrap_or(true)) {
+            |s| if s.is_none_or(|s| s.parse().unwrap_or(true)) {
                 Ok(())
             } else {
                 Err(box_err!(
@@ -4574,71 +4587,7 @@ where
         poll_ctx: &mut PollContext<EK, ER, T>,
         req: &mut RaftCmdRequest,
     ) -> Result<ProposalContext> {
-        poll_ctx
-            .coprocessor_host
-            .pre_propose(self.region(), req)
-            .map_err(|e| {
-                // If the error of prepropose contains str `NO_VALID_SPLIT_KEY`, it may mean the
-                // split_key of the split request is the region start key which
-                // means we may have so many potential duplicate mvcc versions
-                // that we can not manage to get a valid split key. So, we
-                // trigger a compaction to handle it.
-                if e.to_string().contains(NO_VALID_SPLIT_KEY) {
-                    let safe_ts = (|| {
-                        fail::fail_point!("safe_point_inject", |t| {
-                            t.unwrap().parse::<u64>().unwrap()
-                        });
-                        poll_ctx.safe_point.load(Ordering::Relaxed)
-                    })();
-                    if safe_ts <= self.last_record_safe_point {
-                        debug!(
-                            "skip schedule compact range due to safe_point not updated";
-                            "region_id" => self.region_id,
-                            "safe_point" => safe_ts,
-                        );
-                        return e;
-                    }
-
-                    let start_key = enc_start_key(self.region());
-                    let end_key = enc_end_key(self.region());
-
-                    let mut all_scheduled = true;
-                    for cf in [CF_WRITE, CF_DEFAULT] {
-                        let task = CompactTask::Compact {
-                            cf_name: String::from(cf),
-                            start_key: Some(start_key.clone()),
-                            end_key: Some(end_key.clone()),
-                            bottommost_level_force: true,
-                        };
-
-                        if let Err(e) = poll_ctx
-                            .cleanup_scheduler
-                            .schedule(CleanupTask::Compact(task))
-                        {
-                            error!(
-                                "schedule compact range task failed";
-                                "region_id" => self.region_id,
-                                "cf" => ?cf,
-                                "err" => ?e,
-                            );
-                            all_scheduled = false;
-                            break;
-                        }
-                    }
-
-                    if all_scheduled {
-                        info!(
-                            "schedule compact range due to no valid split keys";
-                            "region_id" => self.region_id,
-                            "safe_point" => safe_ts,
-                            "region_start_key" => log_wrappers::Value::key(&start_key),
-                            "region_end_key" => log_wrappers::Value::key(&end_key),
-                        );
-                        self.last_record_safe_point = safe_ts;
-                    }
-                }
-                e
-            })?;
+        poll_ctx.coprocessor_host.pre_propose(self.region(), req)?;
         let mut ctx = ProposalContext::empty();
 
         if get_sync_log_from_request(req) {
@@ -5546,7 +5495,7 @@ where
             }
             for peer in self.get_store().region().get_peers() {
                 let (peer_id, store_id) = (peer.get_id(), peer.get_store_id());
-                if self.disk_full_peers.peers.get(&peer_id).is_some() {
+                if self.disk_full_peers.peers.contains_key(&peer_id) {
                     disk_full_stores.push(store_id);
                 }
             }
@@ -5560,7 +5509,7 @@ where
 
     /// Check if the command will be likely to pass all the check and propose.
     pub fn will_likely_propose(&mut self, cmd: &RaftCmdRequest) -> bool {
-        !self.pending_remove
+        self.pending_remove.is_none()
             && self.is_leader()
             && self.pending_merge_state.is_none()
             && self.prepare_merge_fence == 0
@@ -5648,7 +5597,7 @@ where
 
             if self.raft_group.raft.raft_log.applied >= *target_index
                 || force
-                || self.pending_remove
+                || self.pending_remove.is_some()
             {
                 info!("snapshot recovery wait apply finished";
                     "region_id" => self.region().get_id(),
@@ -6112,17 +6061,17 @@ where
             None => return false,
         };
         let max_lease = ctx.cfg.raft_store_max_leader_lease();
-        let has_overlapped_reads = self.pending_reads.back().map_or(false, |read| {
+        let has_overlapped_reads = self.pending_reads.back().is_some_and(|read| {
             // If there is any read index whose lease can cover till next heartbeat
             // then we don't need to propose a new one
             read.propose_time + max_lease > renew_bound
         });
-        let has_overlapped_writes = self.proposals.back().map_or(false, |proposal| {
+        let has_overlapped_writes = self.proposals.back().is_some_and(|proposal| {
             // If there is any write whose lease can cover till next heartbeat
             // then we don't need to propose a new one
             proposal
                 .propose_time
-                .map_or(false, |propose_time| propose_time + max_lease > renew_bound)
+                .is_some_and(|propose_time| propose_time + max_lease > renew_bound)
         });
         !has_overlapped_reads && !has_overlapped_writes
     }
@@ -6299,7 +6248,7 @@ struct PollContextReader<'a, EK, ER> {
     engines: &'a Engines<EK, ER>,
 }
 
-impl<'a, EK, ER> ReadExecutor for PollContextReader<'a, EK, ER>
+impl<EK, ER> ReadExecutor for PollContextReader<'_, EK, ER>
 where
     EK: KvEngine,
     ER: RaftEngine,
diff --git a/components/raftstore/src/store/peer_storage.rs b/components/raftstore/src/store/peer_storage.rs
index 5fba934b462..45706610ef1 100644
--- a/components/raftstore/src/store/peer_storage.rs
+++ b/components/raftstore/src/store/peer_storage.rs
@@ -6,28 +6,31 @@ use std::{
     error,
     ops::{Deref, DerefMut},
     sync::{
+        Arc, Mutex,
         atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
         mpsc::{self, Receiver, TryRecvError},
-        Arc,
     },
-    u64,
+    time::Duration,
 };
 
-use engine_traits::{Engines, KvEngine, Mutable, Peekable, RaftEngine, RaftLogBatch, CF_RAFT};
+use collections::HashMap;
+use engine_traits::{
+    CF_RAFT, Engines, KvEngine, Mutable, Peekable, RaftEngine, RaftLogBatch, WriteBatch,
+    WriteOptions,
+};
 use fail::fail_point;
 use into_other::into_other;
 use keys::{self, enc_end_key, enc_start_key};
 use kvproto::{
-    metapb::{self, Region},
+    metapb::{self, Peer, Region},
     raft_serverpb::{
         MergeState, PeerState, RaftApplyState, RaftLocalState, RaftSnapshotData, RegionLocalState,
     },
 };
 use protobuf::Message;
 use raft::{
-    self,
+    self, Error as RaftError, GetEntriesContext, RaftState, Ready, Storage, StorageError,
     eraftpb::{self, ConfState, Entry, HardState, Snapshot},
-    Error as RaftError, GetEntriesContext, RaftState, Ready, Storage, StorageError,
 };
 use rand::Rng;
 use tikv_util::{
@@ -39,17 +42,18 @@ use tikv_util::{
 };
 
 use super::{
-    local_metrics::RaftMetrics, metrics::*, worker::RegionTask, SnapEntry, SnapKey, SnapManager,
+    SnapEntry, SnapKey, SnapManager, local_metrics::RaftMetrics, metrics::*, worker::RegionTask,
 };
 use crate::{
+    Error, Result,
     store::{
         async_io::{read::ReadTask, write::WriteTask},
         entry_storage::{CacheWarmupState, EntryStorage},
-        fsm::GenSnapTask,
+        fsm::{GenSnapTask, StoreMeta},
+        msg::PeerClearMetaStat,
         peer::PersistSnapshotResult,
         util,
     },
-    Error, Result,
 };
 
 // The maximum tick interval between precheck requests. The tick interval helps
@@ -193,11 +197,6 @@ fn init_raft_state<EK: KvEngine, ER: RaftEngine>(
         raft_state.last_index = RAFT_INIT_LOG_INDEX;
         raft_state.mut_hard_state().set_term(RAFT_INIT_LOG_TERM);
         raft_state.mut_hard_state().set_commit(RAFT_INIT_LOG_INDEX);
-        let mut lb = engines.raft.log_batch(0);
-        lb.put_raft_state(region.get_id(), &raft_state)?;
-        let start = Instant::now();
-        engines.raft.consume(&mut lb, true)?;
-        PEER_CREATE_RAFT_DURATION_HISTOGRAM.observe(start.saturating_elapsed().as_secs_f64());
     }
     Ok(raft_state)
 }
@@ -488,7 +487,7 @@ where
             ));
         }
 
-        if find_peer_by_id(&self.region, to).map_or(false, |p| p.is_witness) {
+        if find_peer_by_id(&self.region, to).is_some_and(|p| p.is_witness) {
             // Although we always sending snapshot task behind apply task to get latest
             // snapshot, we can't use `last_applying_idx` here, as below the judgment
             // condition will generate an witness snapshot directly, the new non-witness
@@ -652,9 +651,9 @@ where
         *gen_snap_task = Some(task);
     }
 
-    pub fn on_compact_raftlog(&mut self, idx: u64, state: Option<&mut CacheWarmupState>) {
+    pub fn on_compact_raftlog_cache(&mut self, idx: u64, state: Option<&mut CacheWarmupState>) {
         self.entry_storage.compact_entry_cache(idx, state);
-        self.cancel_generating_snap(Some(idx));
+        self.entry_storage.compact_term_cache(idx);
     }
 
     // Apply the peer with given snapshot.
@@ -759,6 +758,36 @@ where
         Ok((region, for_witness))
     }
 
+    pub fn schedule_destroy_peer(
+        &mut self,
+        peer: metapb::Peer,
+        region: metapb::Region,
+        keep_data: bool,
+        local_first_replicate: bool,
+        first_index: u64,
+        merge_state: Option<MergeState>,
+        pending_create_peers: Arc<Mutex<HashMap<u64, (u64, bool)>>>,
+    ) -> Result<()> {
+        self.entry_storage.clear();
+        // For `ClearPeerMeta` task, it must be sent to the worker even
+        // if the capacity is full.
+        box_try!(
+            self.region_scheduler
+                .schedule_force(RegionTask::ClearPeerMeta {
+                    peer,
+                    region,
+                    raft_state: self.raft_state().clone(),
+                    initialized: self.is_initialized(),
+                    keep_data,
+                    merge_state,
+                    local_first_replicate,
+                    first_index,
+                    pending_create_peers,
+                })
+        );
+        Ok(())
+    }
+
     /// Delete all meta belong to the region. Results are stored in `wb`.
     pub fn clear_meta(
         &mut self,
@@ -1130,6 +1159,117 @@ where
     Ok(())
 }
 
+pub fn clear_meta_in_kv_and_raft<EK, ER>(
+    engines: &Engines<EK, ER>,
+    peer: Peer,
+    region: Region,
+    raft_state: RaftLocalState,
+    merge_state: Option<MergeState>,
+    initialized: bool,
+    local_first_replicate: bool,
+    first_index: u64,
+    // Holding lock to avoid apply worker applies split.
+    store_meta: Arc<Mutex<StoreMeta>>,
+    pending_create_peers: Arc<Mutex<HashMap<u64, (u64, bool)>>>,
+) -> Result<PeerClearMetaStat>
+where
+    EK: KvEngine,
+    ER: RaftEngine,
+{
+    let peer_id = peer.get_id();
+    let mut region = region.clone();
+
+    // Lock the store_meta to ensure safe access to pending_create_peers.
+    // TODO: Find a way to make destroying operations not hold the
+    // store_meta lock in the future.
+    let _meta = store_meta.lock().unwrap();
+
+    let (pending_create_peers, clean) = if local_first_replicate {
+        let mut pending = pending_create_peers.lock().unwrap();
+        if initialized {
+            assert_eq!(pending.get(&region.get_id()), None);
+            (None, true)
+        } else if let Some(status) = pending.get(&region.get_id()) {
+            if *status == (peer_id, false) {
+                pending.remove(&region.get_id());
+                // Hold the lock to avoid apply worker applies split.
+                (Some(pending), true)
+            } else if *status == (peer_id, true) {
+                // It's already marked to split by apply worker, skip delete.
+                (None, false)
+            } else {
+                // Peer id can't be different as router should exist all the time, their is no
+                // chance for store to insert a different peer id. And apply worker should skip
+                // split when meeting a different id.
+                let status = *status;
+                // Avoid panic with lock.
+                drop(pending);
+                panic!(
+                    "[peer = {}] region {:?} unexpected pending states {:?}",
+                    peer_id, region, status
+                );
+            }
+        } else {
+            // The status is inserted when it's created. It will be removed in following
+            // cases:
+            // - By apply worker as it fails to split due to region state key. This is
+            //   impossible to reach this code path because the delete write batch is not
+            //   persisted yet.
+            // - By store fsm as it fails to create peer, which is also invalid obviously.
+            // - By peer fsm after persisting snapshot, then it should be initialized.
+            // - By peer fsm after split.
+            // - By peer fsm when destroy, which should go the above branch instead.
+            (None, false)
+        }
+    } else {
+        (None, true)
+    };
+    let (raft_duration, kv_duration) = if clean {
+        // Set Tombstone state explicitly
+        let mut kv_wb = engines.kv.write_batch();
+        let mut raft_wb = engines.raft.log_batch(1024);
+        // Raft log gc should be flushed before being destroyed, so last_compacted_idx
+        // has to be the minimal index that may still have logs.
+        clear_meta(
+            engines,
+            &mut kv_wb,
+            &mut raft_wb,
+            region.get_id(),
+            first_index,
+            &raft_state,
+        )?;
+
+        // StoreFsmDelegate::check_msg use both epoch and region peer list to check
+        // whether a message is targeting a staled peer. But for an uninitialized peer,
+        // both epoch and peer list are empty, so a removed peer will be created again.
+        // Saving current peer into the peer list of region will fix this problem.
+        if !initialized {
+            region.mut_peers().push(peer.clone());
+        }
+
+        // Persist the Tomstone state of this peer to kvdb.
+        write_peer_state(&mut kv_wb, &region, PeerState::Tombstone, merge_state)?;
+
+        // Write kv rocksdb first in case of restart happen between two write
+        let start = Instant::now();
+        let mut write_opts = WriteOptions::new();
+        write_opts.set_sync(true);
+        kv_wb.write_opt(&write_opts)?;
+        let kv_duration = start.saturating_elapsed();
+
+        drop(pending_create_peers);
+
+        let start = Instant::now();
+        engines.raft.consume(&mut raft_wb, true)?;
+        let raft_duration = start.saturating_elapsed();
+        (raft_duration, kv_duration)
+    } else {
+        (Duration::ZERO, Duration::ZERO)
+    };
+
+    Ok(PeerClearMetaStat::new(raft_duration, kv_duration))
+}
+
 pub fn do_snapshot<E>(
     mgr: SnapManager,
     engine: &E,
@@ -1270,31 +1410,31 @@ pub mod tests {
         raft::RaftTestEngine,
     };
     use engine_traits::{
-        Engines, Iterable, RaftEngineDebug, RaftEngineReadOnly, SyncMutable, WriteBatch,
-        WriteBatchExt, ALL_CFS, CF_DEFAULT,
+        ALL_CFS, CF_DEFAULT, Engines, Iterable, RaftEngineDebug, RaftEngineReadOnly, SyncMutable,
+        WriteBatch, WriteBatchExt,
     };
     use kvproto::raft_serverpb::RaftSnapshotData;
     use metapb::{Peer, Store, StoreLabel};
     use pd_client::PdClient;
     use raft::{
-        eraftpb::{ConfState, Entry, HardState},
         Error as RaftError, GetEntriesContext, StorageError,
+        eraftpb::{ConfState, Entry, HardState},
     };
     use tempfile::{Builder, TempDir};
     use tikv_util::{
         store::{new_peer, new_witness_peer},
-        worker::{dummy_scheduler, LazyWorker, Scheduler, Worker},
+        worker::{LazyWorker, Scheduler, Worker, dummy_scheduler},
     };
 
     use super::*;
     use crate::store::{
+        AsyncReadNotifier, FetchedLogs, GenSnapRes,
         async_io::{read::ReadRunner, write::write_to_db_for_test},
         bootstrap_store,
         entry_storage::tests::validate_cache,
         fsm::apply::compact_raft_log,
         initial_region, prepare_bootstrap_cluster,
         worker::{RegionTask, SnapGenRunner, SnapGenTask},
-        AsyncReadNotifier, FetchedLogs, GenSnapRes,
     };
 
     fn new_storage(
@@ -1341,7 +1481,9 @@ pub mod tests {
         let mut write_task: WriteTask<KvTestEngine, _> =
             WriteTask::new(store.get_region_id(), store.peer_id, 1);
         store.append(ents[1..].to_vec(), &mut write_task);
-        store.update_cache_persisted(ents.last().unwrap().get_index());
+        let last_entry = ents.last().unwrap();
+        store.update_cache_persisted(last_entry.get_index());
+        store.update_term_cache(last_entry.get_index(), last_entry.get_term());
         store
             .apply_state_mut()
             .mut_truncated_state()
@@ -1546,7 +1688,7 @@ pub mod tests {
             new_entry(5, 5),
             new_entry(6, 6),
         ];
-        let max_u64 = u64::max_value();
+        let max_u64 = u64::MAX;
         let mut tests = vec![
             (
                 2,
diff --git a/components/raftstore/src/store/read_queue.rs b/components/raftstore/src/store/read_queue.rs
index 34e2b457ae6..73acfd703d5 100644
--- a/components/raftstore/src/store/read_queue.rs
+++ b/components/raftstore/src/store/read_queue.rs
@@ -1,7 +1,7 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 // #[PerformanceCriticalPath]
-use std::{cmp, collections::VecDeque, mem, u64, usize};
+use std::{cmp, collections::VecDeque, mem};
 
 use collections::HashMap;
 use kvproto::{
@@ -10,20 +10,19 @@ use kvproto::{
 };
 use protobuf::Message;
 use tikv_util::{
-    box_err,
-    codec::number::{NumberEncoder, MAX_VAR_U64_LEN},
+    MustConsumeVec, box_err,
+    codec::number::{MAX_VAR_U64_LEN, NumberEncoder},
     debug, error,
     memory::HeapSize,
     time::{duration_to_sec, monotonic_raw_now},
-    MustConsumeVec,
 };
 use time::Timespec;
 use uuid::Uuid;
 
 use super::msg::ErrorCallback;
 use crate::{
-    store::{fsm::apply, metrics::*, Config},
     Result,
+    store::{Config, fsm::apply, metrics::*},
 };
 
 const READ_QUEUE_SHRINK_SIZE: usize = 64;
diff --git a/components/raftstore/src/store/region_snapshot.rs b/components/raftstore/src/store/region_snapshot.rs
index f19c725a569..48b59e933b2 100644
--- a/components/raftstore/src/store/region_snapshot.rs
+++ b/components/raftstore/src/store/region_snapshot.rs
@@ -5,14 +5,14 @@ use std::{
     fmt,
     num::NonZeroU64,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc, Mutex,
+        atomic::{AtomicU64, Ordering},
     },
 };
 
 use engine_traits::{
-    util::check_key_in_range, Error as EngineError, IterOptions, Iterable, Iterator, KvEngine,
-    MetricsExt, Peekable, RaftEngine, ReadOptions, Result as EngineResult, Snapshot, CF_RAFT,
+    CF_RAFT, Error as EngineError, IterOptions, Iterable, Iterator, KvEngine, MetricsExt, Peekable,
+    RaftEngine, ReadOptions, Result as EngineResult, Snapshot, util::check_key_in_range,
 };
 use fail::fail_point;
 use keys::DATA_PREFIX_KEY;
@@ -24,9 +24,9 @@ use tikv_util::{
 };
 
 use crate::{
-    coprocessor::ObservedSnapshot,
-    store::{util, PeerStorage, TxnExt},
     Error, Result,
+    coprocessor::ObservedSnapshot,
+    store::{PeerStorage, TxnExt, util},
 };
 
 /// Snapshot of a region.
@@ -452,7 +452,7 @@ fn handle_check_key_in_region_error(e: crate::Error) -> Result<()> {
 #[cfg(test)]
 mod tests {
     use engine_test::{kv::KvTestSnapshot, new_temp_engine};
-    use engine_traits::{Engines, KvEngine, Peekable, RaftEngine, SyncMutable, CF_DEFAULT};
+    use engine_traits::{CF_DEFAULT, Engines, KvEngine, Peekable, RaftEngine, SyncMutable};
     use keys::data_key;
     use kvproto::metapb::{Peer, Region};
     use tempfile::Builder;
@@ -460,8 +460,8 @@ mod tests {
 
     use super::*;
     use crate::{
-        store::{local_metrics::RaftMetrics, PeerStorage},
         Result,
+        store::{PeerStorage, local_metrics::RaftMetrics},
     };
 
     type DataSet = Vec<(Vec<u8>, Vec<u8>)>;
diff --git a/components/raftstore/src/store/replication_mode.rs b/components/raftstore/src/store/replication_mode.rs
index b83aff3d991..3a6f91873df 100644
--- a/components/raftstore/src/store/replication_mode.rs
+++ b/components/raftstore/src/store/replication_mode.rs
@@ -31,7 +31,7 @@ impl StoreGroup {
         if self
             .labels
             .get(&store.id)
-            .map_or(false, |l| store.get_labels() == &**l)
+            .is_some_and(|l| store.get_labels() == &**l)
         {
             return;
         }
diff --git a/components/raftstore/src/store/simple_write.rs b/components/raftstore/src/store/simple_write.rs
index 6f2901402a6..a5e15a4096a 100644
--- a/components/raftstore/src/store/simple_write.rs
+++ b/components/raftstore/src/store/simple_write.rs
@@ -11,7 +11,7 @@ use protobuf::{CodedInputStream, Message};
 use slog::Logger;
 use tikv_util::slog_panic;
 
-use crate::store::{msg::ErrorCallback, WriteCallback};
+use crate::store::{WriteCallback, msg::ErrorCallback};
 
 // MAGIC number to hint simple write codec is used. If it's a protobuf message,
 // the first one or several bytes are for field tag, which can't be zero.
diff --git a/components/raftstore/src/store/snap.rs b/components/raftstore/src/store/snap.rs
index f53de9a37ed..69833fbfd89 100644
--- a/components/raftstore/src/store/snap.rs
+++ b/components/raftstore/src/store/snap.rs
@@ -8,22 +8,21 @@ use std::{
     path::{Path, PathBuf},
     result, str,
     sync::{
-        atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
         Arc, Mutex, RwLock,
+        atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
     },
     thread,
     time::{self, Duration},
-    u64,
 };
 
 use collections::{HashMap, HashMapEntry as Entry};
-use encryption::{create_aes_ctr_crypter, DataKeyManager, Iv};
-use engine_traits::{CfName, KvEngine, CF_DEFAULT, CF_LOCK, CF_WRITE};
+use encryption::{DataKeyManager, Iv, create_aes_ctr_crypter};
+use engine_traits::{CF_DEFAULT, CF_LOCK, CF_WRITE, CfName, KvEngine};
 use error_code::{self, ErrorCode, ErrorCodeExt};
 use fail::fail_point;
 use file_system::{
-    calc_crc32, calc_crc32_and_size, delete_dir_if_exist, delete_file_if_exist, file_exists,
-    get_file_size, sync_dir, File, Metadata, OpenOptions,
+    File, Metadata, OpenOptions, calc_crc32, calc_crc32_and_size, delete_dir_if_exist,
+    delete_file_if_exist, file_exists, get_file_size, sync_dir,
 };
 use keys::{enc_end_key, enc_start_key};
 use kvproto::{
@@ -37,17 +36,17 @@ use protobuf::Message;
 use raft::eraftpb::Snapshot as RaftSnapshot;
 use thiserror::Error;
 use tikv_util::{
-    box_err, box_try,
+    HandyRwLock, box_err, box_try,
     config::ReadableSize,
     debug, error, info,
-    time::{duration_to_sec, Instant, Limiter, UnixSecs},
-    warn, HandyRwLock,
+    time::{Instant, Limiter, UnixSecs, duration_to_sec},
+    warn,
 };
 
 use crate::{
+    Error as RaftStoreError, Result as RaftStoreResult,
     coprocessor::CoprocessorHost,
     store::{metrics::*, peer_storage::JOB_STATUS_CANCELLING},
-    Error as RaftStoreError, Result as RaftStoreResult,
 };
 
 #[path = "snap/io.rs"]
@@ -162,7 +161,7 @@ impl SnapKey {
     pub fn from_snap(snap: &RaftSnapshot) -> io::Result<SnapKey> {
         let mut snap_data = RaftSnapshotData::default();
         if let Err(e) = snap_data.merge_from_bytes(snap.get_data()) {
-            return Err(io::Error::new(ErrorKind::Other, e));
+            return Err(io::Error::other(e));
         }
         Ok(SnapKey::from_region_snap(
             snap_data.get_region().get_id(),
@@ -230,7 +229,7 @@ fn retry_delete_snapshot(mgr: &SnapManagerCore, key: &SnapKey, snap: &Snapshot)
 pub fn gen_snapshot_meta(cf_files: &[CfFile], for_balance: bool) -> RaftStoreResult<SnapshotMeta> {
     let mut meta = Vec::with_capacity(cf_files.len());
     for cf_file in cf_files {
-        if !SNAPSHOT_CFS.iter().any(|cf| cf_file.cf == *cf) {
+        if !SNAPSHOT_CFS.contains(&cf_file.cf) {
             return Err(box_err!(
                 "failed to encode invalid snapshot cf {}",
                 cf_file.cf
@@ -810,10 +809,7 @@ impl Snapshot {
                 self.cf_index = index;
                 Ok(())
             }
-            None => Err(io::Error::new(
-                ErrorKind::Other,
-                format!("fail to find cf {}", cf),
-            )),
+            None => Err(io::Error::other(format!("fail to find cf {}", cf))),
         }
     }
 
@@ -848,10 +844,7 @@ impl Snapshot {
         region: &Region,
         allow_multi_files_snapshot: bool,
         for_balance: bool,
-    ) -> RaftStoreResult<()>
-    where
-        EK: KvEngine,
-    {
+    ) -> RaftStoreResult<()> {
         fail_point!("snapshot_enter_do_build");
         if self.exists() {
             match self.validate(|_, _| -> RaftStoreResult<()> { Ok(()) }) {
@@ -1515,10 +1508,10 @@ impl SnapManager {
             return Ok(());
         }
         if !path.is_dir() {
-            return Err(io::Error::new(
-                ErrorKind::Other,
-                format!("{} should be a directory", path.display()),
-            ));
+            return Err(io::Error::other(format!(
+                "{} should be a directory",
+                path.display()
+            )));
         }
         for f in file_system::read_dir(path)? {
             let p = f?;
@@ -2359,10 +2352,10 @@ impl TabletSnapManager {
             file_system::create_dir_all(&path)?;
         }
         if !path.is_dir() {
-            return Err(io::Error::new(
-                ErrorKind::Other,
-                format!("{} should be a directory", path.display()),
-            ));
+            return Err(io::Error::other(format!(
+                "{} should be a directory",
+                path.display()
+            )));
         }
         encryption::clean_up_dir(&path, SNAP_GEN_PREFIX, key_manager.as_deref())?;
         encryption::clean_up_trash(&path, key_manager.as_deref())?;
@@ -2452,9 +2445,11 @@ impl TabletSnapManager {
             };
 
             let path = entry.path();
-            if path.file_name().and_then(|n| n.to_str()).map_or(true, |n| {
-                !n.starts_with(SNAP_GEN_PREFIX) || n.ends_with(TMP_FILE_SUFFIX)
-            }) {
+            if path
+                .file_name()
+                .and_then(|n| n.to_str())
+                .is_none_or(|n| !n.starts_with(SNAP_GEN_PREFIX) || n.ends_with(TMP_FILE_SUFFIX))
+            {
                 continue;
             }
             paths.push(path);
@@ -2476,7 +2471,7 @@ impl TabletSnapManager {
             if !path
                 .file_name()
                 .and_then(|n| n.to_str())
-                .map_or(true, |n| n.starts_with(SNAP_REV_PREFIX))
+                .is_none_or(|n| n.starts_with(SNAP_REV_PREFIX))
             {
                 continue;
             }
@@ -2539,8 +2534,8 @@ pub mod tests {
         io::{self, Read, Seek, SeekFrom, Write},
         path::{Path, PathBuf},
         sync::{
-            atomic::{AtomicBool, AtomicU64, AtomicUsize},
             Arc,
+            atomic::{AtomicBool, AtomicU64, AtomicUsize},
         },
     };
 
@@ -2552,9 +2547,9 @@ pub mod tests {
         raft::RaftTestEngine,
     };
     use engine_traits::{
-        Engines, ExternalSstFileInfo, KvEngine, RaftEngine, RaftLogBatch,
-        Snapshot as EngineSnapshot, SstExt, SstWriter, SstWriterBuilder, SyncMutable, ALL_CFS,
-        CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE,
+        ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, Engines, ExternalSstFileInfo, KvEngine,
+        RaftEngine, RaftLogBatch, Snapshot as EngineSnapshot, SstExt, SstWriter, SstWriterBuilder,
+        SyncMutable,
     };
     use kvproto::{
         encryptionpb::EncryptionMethod,
@@ -2568,9 +2563,9 @@ pub mod tests {
 
     use super::*;
     use crate::{
-        coprocessor::CoprocessorHost,
-        store::{peer_storage::JOB_STATUS_RUNNING, INIT_EPOCH_CONF_VER, INIT_EPOCH_VER},
         Result,
+        coprocessor::CoprocessorHost,
+        store::{INIT_EPOCH_CONF_VER, INIT_EPOCH_VER, peer_storage::JOB_STATUS_RUNNING},
     };
 
     const TEST_STORE_ID: u64 = 1;
@@ -3086,7 +3081,7 @@ pub mod tests {
                     f.seek(pos).unwrap();
                     let mut buf = [0; BYTE_SIZE];
                     f.read_exact(&mut buf[..]).unwrap();
-                    buf[0] ^= u8::max_value();
+                    buf[0] ^= u8::MAX;
                     f.seek(pos).unwrap();
                     f.write_all(&buf[..]).unwrap();
                     total += 1;
@@ -3446,7 +3441,7 @@ pub mod tests {
         s.save().unwrap();
 
         let snap_size = snap_mgr.get_total_snap_size().unwrap();
-        let max_snap_count = (max_total_size + snap_size - 1) / snap_size;
+        let max_snap_count = max_total_size.div_ceil(snap_size);
         for (i, region_id) in regions.into_iter().enumerate() {
             let key = SnapKey::new(region_id, 1, 1);
             let region = gen_test_region(region_id, 1, 1);
diff --git a/components/raftstore/src/store/snap/io.rs b/components/raftstore/src/store/snap/io.rs
index aec9ce1d0d6..052d7cda922 100644
--- a/components/raftstore/src/store/snap/io.rs
+++ b/components/raftstore/src/store/snap/io.rs
@@ -4,7 +4,6 @@ use std::{
     fs,
     io::{self, BufReader, Read, Write},
     sync::Arc,
-    usize,
 };
 
 use encryption::{DataKeyManager, DecrypterReader, EncrypterWriter, Iv};
@@ -243,7 +242,7 @@ where
                             as usize;
                 }
                 Err(e) => {
-                    let io_error = io::Error::new(io::ErrorKind::Other, e);
+                    let io_error = io::Error::other(e);
                     return Err(io_error.into());
                 }
             }
@@ -260,7 +259,7 @@ where
         }
 
         if let Err(e) = sst_writer.borrow_mut().put(key, value) {
-            let io_error = io::Error::new(io::ErrorKind::Other, e);
+            let io_error = io::Error::other(e);
             return Err(io_error.into());
         }
         file_length += entry_len;
@@ -392,7 +391,8 @@ where
         Some(Range {
             start_key: start_key.as_slice(),
             end_key: end_key.as_slice()
-        })
+        }),
+        true, // force_allow_write
     ));
     Ok(())
 }
@@ -527,7 +527,7 @@ mod tests {
     use tikv_util::time::Limiter;
 
     use super::*;
-    use crate::store::snap::{tests::*, SNAPSHOT_CFS, SST_FILE_SUFFIX};
+    use crate::store::snap::{SNAPSHOT_CFS, SST_FILE_SUFFIX, tests::*};
 
     struct TestStaleDetector;
     impl StaleDetector for TestStaleDetector {
diff --git a/components/raftstore/src/store/snapshot_backup.rs b/components/raftstore/src/store/snapshot_backup.rs
index 1f5a3d65cf9..ae0b8d6785b 100644
--- a/components/raftstore/src/store/snapshot_backup.rs
+++ b/components/raftstore/src/store/snapshot_backup.rs
@@ -2,8 +2,8 @@
 
 use std::{
     sync::{
-        atomic::{AtomicBool, AtomicU64, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, AtomicU64, Ordering},
     },
     time::Duration,
 };
@@ -14,11 +14,11 @@ use kvproto::{brpb::CheckAdminResponse, metapb::RegionEpoch, raft_cmdpb::AdminCm
 use tikv_util::{info, warn};
 use tokio::sync::oneshot;
 
-use super::{metrics, PeerMsg, RaftRouter, SignificantMsg, SignificantRouter};
+use super::{PeerMsg, RaftRouter, SignificantMsg, SignificantRouter, metrics};
 use crate::coprocessor::{
-    dispatcher::BoxTransferLeaderObserver, AdminObserver, BoxAdminObserver, BoxQueryObserver,
-    Coprocessor, CoprocessorHost, Error as CopError, QueryObserver, TransferLeaderCustomContext,
-    TransferLeaderObserver,
+    AdminObserver, BoxAdminObserver, BoxQueryObserver, Coprocessor, CoprocessorHost,
+    Error as CopError, QueryObserver, TransferLeaderCustomContext, TransferLeaderObserver,
+    dispatcher::BoxTransferLeaderObserver,
 };
 
 fn epoch_second_coarse() -> u64 {
diff --git a/components/raftstore/src/store/transport.rs b/components/raftstore/src/store/transport.rs
index 35761aa5d18..f17258cb495 100644
--- a/components/raftstore/src/store/transport.rs
+++ b/components/raftstore/src/store/transport.rs
@@ -1,7 +1,7 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
 // #[PerformanceCriticalPath]
-use std::sync::{mpsc, Mutex};
+use std::sync::{Mutex, mpsc};
 
 use crossbeam::channel::{SendError, TrySendError};
 use engine_traits::{KvEngine, RaftEngine, Snapshot};
@@ -10,8 +10,8 @@ use tikv_util::{error, warn};
 
 use super::{AsyncReadNotifier, FetchedLogs, GenSnapRes};
 use crate::{
-    store::{CasualMessage, PeerMsg, RaftCommand, RaftRouter, SignificantMsg, StoreMsg},
     DiscardReason, Error, Result,
+    store::{CasualMessage, PeerMsg, RaftCommand, RaftRouter, SignificantMsg, StoreMsg},
 };
 
 /// Transports messages between different Raft peers.
@@ -46,7 +46,7 @@ where
     fn significant_send(&self, region_id: u64, msg: SignificantMsg<EK::Snapshot>) -> Result<()>;
 }
 
-impl<'a, T: SignificantRouter<EK>, EK: KvEngine> SignificantRouter<EK> for &'a Mutex<T> {
+impl<T: SignificantRouter<EK>, EK: KvEngine> SignificantRouter<EK> for &Mutex<T> {
     #[inline]
     fn significant_send(&self, region_id: u64, msg: SignificantMsg<EK::Snapshot>) -> Result<()> {
         Mutex::lock(self).unwrap().significant_send(region_id, msg)
@@ -89,7 +89,7 @@ where
     }
 }
 
-impl<'a, EK: KvEngine, T: CasualRouter<EK>> CasualRouter<EK> for &'a Mutex<T> {
+impl<EK: KvEngine, T: CasualRouter<EK>> CasualRouter<EK> for &Mutex<T> {
     #[inline]
     fn send(&self, region_id: u64, msg: CasualMessage<EK>) -> Result<()> {
         CasualRouter::send(&*Mutex::lock(self).unwrap(), region_id, msg)
diff --git a/components/raftstore/src/store/txn_ext.rs b/components/raftstore/src/store/txn_ext.rs
index e791b520c05..1097ee753eb 100644
--- a/components/raftstore/src/store/txn_ext.rs
+++ b/components/raftstore/src/store/txn_ext.rs
@@ -9,7 +9,7 @@ use std::{
 use kvproto::metapb;
 use lazy_static::lazy_static;
 use parking_lot::RwLock;
-use prometheus::{register_int_gauge, IntGauge};
+use prometheus::{IntGauge, register_int_gauge};
 use txn_types::{Key, Lock, PessimisticLock};
 
 /// Transaction extensions related to a peer.
diff --git a/components/raftstore/src/store/unsafe_recovery.rs b/components/raftstore/src/store/unsafe_recovery.rs
index 876f181807b..ef9b7504a72 100644
--- a/components/raftstore/src/store/unsafe_recovery.rs
+++ b/components/raftstore/src/store/unsafe_recovery.rs
@@ -18,8 +18,8 @@ use raft::eraftpb::ConfChangeType;
 use tikv_util::{box_err, error, info, time::Instant as TiInstant, warn};
 
 use super::{
-    fsm::new_admin_request, worker::new_change_peer_v2_request, PeerMsg, RaftRouter,
-    SignificantMsg, SignificantRouter, StoreMsg,
+    PeerMsg, RaftRouter, SignificantMsg, SignificantRouter, StoreMsg, fsm::new_admin_request,
+    worker::new_change_peer_v2_request,
 };
 use crate::Result;
 
@@ -246,6 +246,7 @@ pub fn start_unsafe_recovery_report(
 }
 
 #[derive(Clone, Debug)]
+#[allow(dead_code)]
 pub struct UnsafeRecoveryForceLeaderSyncer(Arc<InvokeClosureOnDrop>);
 
 impl UnsafeRecoveryForceLeaderSyncer {
@@ -443,15 +444,23 @@ pub fn demote_failed_voters_request(
         .get_peers()
         .iter()
         .filter_map(|peer| {
-            if failed_voter_ids.contains(&peer.get_id())
-                && peer.get_role() == metapb::PeerRole::Voter
-            {
-                let mut peer_clone = peer.clone();
-                peer_clone.set_role(metapb::PeerRole::Learner);
-                let mut cp = ChangePeer::default();
-                cp.set_change_type(ConfChangeType::AddLearnerNode);
-                cp.set_peer(peer_clone);
-                return Some(cp);
+            if failed_voter_ids.contains(&peer.get_id()) {
+                if peer.get_role() == metapb::PeerRole::Voter {
+                    let mut peer_clone = peer.clone();
+                    peer_clone.set_role(metapb::PeerRole::Learner);
+                    let mut cp = ChangePeer::default();
+                    cp.set_change_type(ConfChangeType::AddLearnerNode);
+                    cp.set_peer(peer_clone);
+                    return Some(cp);
+                } else if peer.get_role() == metapb::PeerRole::Learner {
+                    let mut cp = ChangePeer::default();
+                    cp.set_change_type(ConfChangeType::RemoveNode);
+                    let peer_clone = peer.clone();
+                    let mut cp = ChangePeer::default();
+                    cp.set_change_type(ConfChangeType::RemoveNode);
+                    cp.set_peer(peer_clone);
+                    return Some(cp);
+                }
             }
             None
         })
diff --git a/components/raftstore/src/store/util.rs b/components/raftstore/src/store/util.rs
index a2d8bbaec8e..da42c25992d 100644
--- a/components/raftstore/src/store/util.rs
+++ b/components/raftstore/src/store/util.rs
@@ -8,10 +8,9 @@ use std::{
     fmt::{Debug, Display},
     option::Option,
     sync::{
-        atomic::{AtomicBool, AtomicU64, Ordering as AtomicOrdering},
         Arc, Mutex, MutexGuard,
+        atomic::{AtomicBool, AtomicU64, Ordering as AtomicOrdering},
     },
-    u64,
 };
 
 use collections::HashSet;
@@ -26,27 +25,26 @@ use kvproto::{
 };
 use protobuf::{self, CodedInputStream, Message};
 use raft::{
+    Changer, INVALID_INDEX, RawNode,
     eraftpb::{self, ConfChangeType, ConfState, Entry, EntryType, MessageType, Snapshot},
-    Changer, RawNode, INVALID_INDEX,
 };
 use raft_proto::ConfChangeI;
 use tikv_util::{
-    box_err,
-    codec::number::{decode_u64, NumberEncoder},
+    Either, box_err,
+    codec::number::{NumberEncoder, decode_u64},
     debug, info,
     store::{find_peer_by_id, region},
-    time::{monotonic_raw_now, Instant},
-    Either,
+    time::{Instant, monotonic_raw_now},
 };
 use time::{Duration, Timespec};
 use tokio::sync::Notify;
 use txn_types::WriteBatchFlags;
 
-use super::{metrics::PEER_ADMIN_CMD_COUNTER_VEC, peer_storage, Config};
+use super::{Config, metrics::PEER_ADMIN_CMD_COUNTER_VEC, peer_storage};
 use crate::{
+    Error, Result,
     coprocessor::CoprocessorHost,
     store::{simple_write::SimpleWriteReqDecoder, snap::SNAPSHOT_VERSION},
-    Error, Result,
 };
 
 const INVALID_TIMESTAMP: u64 = u64::MAX;
@@ -941,7 +939,7 @@ pub trait ChangePeerI {
     fn to_confchange(&self, _: Vec<u8>) -> Self::CC;
 }
 
-impl<'a> ChangePeerI for &'a ChangePeerRequest {
+impl ChangePeerI for &ChangePeerRequest {
     type CC = eraftpb::ConfChange;
     type CP = Vec<ChangePeerRequest>;
 
@@ -1055,7 +1053,7 @@ pub fn check_conf_change(
             .get_peers()
             .iter()
             .find(|p| p.get_id() == peer.get_id())
-            .map_or(false, |p| p.get_is_witness() != peer.get_is_witness())
+            .is_some_and(|p| p.get_is_witness() != peer.get_is_witness())
         {
             return Err(box_err!(
                 "invalid conf change request: {:?}, can not switch witness in conf change",
@@ -1151,9 +1149,7 @@ fn check_availability_by_last_heartbeats(
             .get_peers()
             .iter()
             .find(|p| p.get_id() == *id)
-            .map_or(false, |p| {
-                p.role == PeerRole::Voter || p.role == PeerRole::IncomingVoter
-            })
+            .is_some_and(|p| p.role == PeerRole::Voter || p.role == PeerRole::IncomingVoter)
         {
             // leader itself is not a slow peer
             if *id == leader_id || last_heartbeat.elapsed() <= slow_voter_threshold {
@@ -1178,9 +1174,7 @@ fn check_availability_by_last_heartbeats(
             .get_peers()
             .iter()
             .find(|p| p.get_id() == peer.get_id())
-            .map_or(false, |p| {
-                p.role == PeerRole::Voter || p.role == PeerRole::IncomingVoter
-            });
+            .is_some_and(|p| p.role == PeerRole::Voter || p.role == PeerRole::IncomingVoter);
         if !is_voter && change_type == ConfChangeType::AddNode {
             // exiting peers, promoting from learner to voter
             if let Some(last_heartbeat) = peer_heartbeats.get(&peer.get_id()) {
@@ -1379,7 +1373,10 @@ pub struct RegionReadProgress {
     core: Mutex<RegionReadProgressCore>,
     // The fast path to read `safe_ts` without acquiring the mutex
     // on `core`
+    // Use `AcqRel` to ensure that the `safe_ts` is always visible to
+    // the readers after it is updated.
     safe_ts: AtomicU64,
+    // Use `AcqRel` same as `safe_ts`.
     pub read_index_safe_ts: AtomicU64,
 }
 
@@ -1469,6 +1466,9 @@ impl RegionReadProgress {
                 coprocessor.on_update_safe_ts(core.region_id, ts, ts)
             }
         }
+        // Reset `read_index_safe_ts` to 0 after region merge, because the source
+        // region's `read_index_safe_ts` may lag from the target region's.
+        self.read_index_safe_ts.store(0, AtomicOrdering::Release);
     }
 
     // Consume the provided `LeaderInfo` to update `safe_ts` and return whether the
@@ -1530,11 +1530,12 @@ impl RegionReadProgress {
             find_store_id(&core.leader_info.peers, core.leader_info.leader_id)
     }
 
-    /// Reset `safe_ts` to 0 and stop updating it
+    /// Reset `safe_ts` and `read_index_safe_ts` to 0 and stop updating them
     pub fn pause(&self) {
         let mut core = self.core.lock().unwrap();
         core.pause = true;
         self.safe_ts.store(0, AtomicOrdering::Release);
+        self.read_index_safe_ts.store(0, AtomicOrdering::Release);
     }
 
     /// Discard incoming `read_state` item and stop updating `safe_ts`
@@ -1542,6 +1543,7 @@ impl RegionReadProgress {
         let mut core = self.core.lock().unwrap();
         core.pause = true;
         core.discard = true;
+        self.read_index_safe_ts.store(0, AtomicOrdering::Release);
     }
 
     /// Reset `safe_ts` and resume updating it
@@ -1551,6 +1553,7 @@ impl RegionReadProgress {
         core.discard = false;
         self.safe_ts
             .store(core.read_state.ts, AtomicOrdering::Release);
+        self.read_index_safe_ts.store(0, AtomicOrdering::Release);
     }
 
     pub fn safe_ts(&self) -> u64 {
@@ -1558,13 +1561,20 @@ impl RegionReadProgress {
     }
 
     pub fn update_read_index_safe_ts(&self, start_ts: u64) {
+        if start_ts == u64::MAX {
+            return;
+        }
+        let core = self.core.lock().unwrap();
+        if core.pause || core.discard {
+            return;
+        }
         let current_ts: u64 = self.read_index_safe_ts();
         if start_ts > current_ts {
             let compare_exchange = self.read_index_safe_ts.compare_exchange(
                 current_ts,
                 start_ts,
-                AtomicOrdering::SeqCst,
-                AtomicOrdering::Relaxed,
+                AtomicOrdering::AcqRel,
+                AtomicOrdering::Acquire,
             );
             // it is a single threaded function
             debug_assert!(
@@ -1575,7 +1585,7 @@ impl RegionReadProgress {
     }
 
     pub fn read_index_safe_ts(&self) -> u64 {
-        self.read_index_safe_ts.load(AtomicOrdering::Relaxed)
+        self.read_index_safe_ts.load(AtomicOrdering::Acquire)
     }
 
     // `safe_ts` is calculated from the `resolved_ts`, they are the same thing
@@ -1678,7 +1688,7 @@ impl RegionReadProgressCore {
         peer_id: u64,
     ) -> RegionReadProgressCore {
         // forbids stale read for witness
-        let is_witness = find_peer_by_id(region, peer_id).map_or(false, |p| p.is_witness);
+        let is_witness = find_peer_by_id(region, peer_id).is_some_and(|p| p.is_witness);
         RegionReadProgressCore {
             peer_id,
             region_id: region.get_id(),
@@ -2850,4 +2860,47 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn test_read_index_safe_ts() {
+        let cap = 10;
+        let region = Region::default();
+        let rrp = RegionReadProgress::new(&region, 10, cap, 1);
+        rrp.update_read_index_safe_ts(10);
+        assert_eq!(rrp.read_index_safe_ts(), 10);
+        rrp.update_read_index_safe_ts(15);
+        assert_eq!(rrp.read_index_safe_ts(), 15);
+        // read index safe ts will not go backward
+        rrp.update_read_index_safe_ts(10);
+        assert_eq!(rrp.read_index_safe_ts(), 15);
+        // read index will not be updated if the ts is max
+        rrp.update_read_index_safe_ts(u64::MAX);
+        assert_eq!(rrp.read_index_safe_ts(), 15);
+
+        // read index safe ts is set to 0 when pause and cannot be updated
+        rrp.pause();
+        assert_eq!(rrp.read_index_safe_ts(), 0);
+        rrp.update_read_index_safe_ts(20);
+        assert_eq!(rrp.read_index_safe_ts(), 0);
+
+        // resume will reset read index safe ts and the update will work again
+        rrp.resume();
+        rrp.update_read_index_safe_ts(30);
+        assert_eq!(rrp.read_index_safe_ts(), 30);
+
+        // donot update read index safe ts when discarded
+        rrp.discard();
+        assert_eq!(rrp.read_index_safe_ts(), 0);
+        rrp.update_read_index_safe_ts(40);
+        assert_eq!(rrp.read_index_safe_ts(), 0);
+
+        rrp.resume();
+        rrp.update_read_index_safe_ts(50);
+        assert_eq!(rrp.read_index_safe_ts(), 50);
+
+        // reset read index safe ts after region merge
+        let coprocessor_host = CoprocessorHost::<KvTestEngine>::default();
+        rrp.merge_safe_ts(40, 10, &coprocessor_host);
+        assert_eq!(rrp.read_index_safe_ts(), 0);
+    }
 }
diff --git a/components/raftstore/src/store/worker/cleanup_snapshot.rs b/components/raftstore/src/store/worker/cleanup_snapshot.rs
index 51a989147bb..24813480dc5 100644
--- a/components/raftstore/src/store/worker/cleanup_snapshot.rs
+++ b/components/raftstore/src/store/worker/cleanup_snapshot.rs
@@ -8,10 +8,10 @@ use fail::fail_point;
 use tikv_util::{debug, error, info, warn, worker::Runnable};
 
 use crate::{
+    Result,
     store::{
         CasualMessage, PeerMsg, RaftRouter, SnapKey, SnapManager, Snapshot, StoreMsg, StoreRouter,
     },
-    Result,
 };
 
 pub enum Task {
diff --git a/components/raftstore/src/store/worker/compact.rs b/components/raftstore/src/store/worker/compact.rs
index 3bf6b1358e4..d8e255e47e1 100644
--- a/components/raftstore/src/store/worker/compact.rs
+++ b/components/raftstore/src/store/worker/compact.rs
@@ -8,20 +8,18 @@ use std::{
     time::Duration,
 };
 
-use engine_traits::{KvEngine, ManualCompactionOptions, RangeStats, CF_LOCK, CF_WRITE};
+use engine_traits::{KvEngine, ManualCompactionOptions};
 use fail::fail_point;
 use futures_util::compat::Future01CompatExt;
 use thiserror::Error;
 use tikv_util::{
-    box_try, config::Tracker, debug, error, info, time::Instant, timer::GLOBAL_TIMER_HANDLE, warn,
-    worker::Runnable,
+    box_try, debug, error, info, time::Instant, timer::GLOBAL_TIMER_HANDLE, worker::Runnable,
 };
 use yatp::Remote;
 
 use super::metrics::{
     COMPACT_RANGE_CF, FULL_COMPACT, FULL_COMPACT_INCREMENTAL, FULL_COMPACT_PAUSE,
 };
-use crate::store::Config;
 
 type Key = Vec<u8>;
 
@@ -40,15 +38,6 @@ pub enum Task {
         end_key: Option<Key>,         // None means largest key
         bottommost_level_force: bool, // Whether force the bottommost level to compact
     },
-
-    CheckAndCompact {
-        // Column families need to compact
-        cf_names: Vec<String>,
-        // Ranges need to check
-        ranges: Vec<Key>,
-        // The minimum RocksDB tombstones/duplicate versions a range that need compacting has
-        compact_threshold: CompactThreshold,
-    },
 }
 
 type CompactPredicateFn = Box<dyn Fn() -> bool + Send + Sync>;
@@ -109,30 +98,6 @@ impl FullCompactController {
     }
 }
 
-#[derive(Debug)]
-pub struct CompactThreshold {
-    pub tombstones_num_threshold: u64,
-    pub tombstones_percent_threshold: u64,
-    pub redundant_rows_threshold: u64,
-    pub redundant_rows_percent_threshold: u64,
-}
-
-impl CompactThreshold {
-    pub fn new(
-        tombstones_num_threshold: u64,
-        tombstones_percent_threshold: u64,
-        redundant_rows_threshold: u64,
-        redundant_rows_percent_threshold: u64,
-    ) -> Self {
-        Self {
-            tombstones_num_threshold,
-            tombstones_percent_threshold,
-            redundant_rows_percent_threshold,
-            redundant_rows_threshold,
-        }
-    }
-}
-
 impl Display for Task {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match *self {
@@ -172,37 +137,6 @@ impl Display for Task {
                 )
                 .field("bottommost_level_force", bottommost_level_force)
                 .finish(),
-            Task::CheckAndCompact {
-                ref cf_names,
-                ref ranges,
-                ref compact_threshold,
-            } => f
-                .debug_struct("CheckAndCompact")
-                .field("cf_names", cf_names)
-                .field(
-                    "ranges",
-                    &(
-                        ranges.first().as_ref().map(|k| log_wrappers::Value::key(k)),
-                        ranges.last().as_ref().map(|k| log_wrappers::Value::key(k)),
-                    ),
-                )
-                .field(
-                    "tombstones_num_threshold",
-                    &compact_threshold.tombstones_num_threshold,
-                )
-                .field(
-                    "tombstones_percent_threshold",
-                    &compact_threshold.tombstones_percent_threshold,
-                )
-                .field(
-                    "redundant_rows_threshold",
-                    &compact_threshold.redundant_rows_threshold,
-                )
-                .field(
-                    "redundant_rows_percent_threshold",
-                    &compact_threshold.redundant_rows_percent_threshold,
-                )
-                .finish(),
         }
     }
 }
@@ -216,27 +150,14 @@ pub enum Error {
 pub struct Runner<E> {
     engine: E,
     remote: Remote<yatp::task::future::TaskCell>,
-    cfg_tracker: Tracker<Config>,
-    // Whether to skip the manual compaction of write and default comlumn family.
-    skip_compact: bool,
 }
 
 impl<E> Runner<E>
 where
     E: KvEngine,
 {
-    pub fn new(
-        engine: E,
-        remote: Remote<yatp::task::future::TaskCell>,
-        cfg_tracker: Tracker<Config>,
-        skip_compact: bool,
-    ) -> Runner<E> {
-        Runner {
-            engine,
-            remote,
-            cfg_tracker,
-            skip_compact,
-        }
+    pub fn new(engine: E, remote: Remote<yatp::task::future::TaskCell>) -> Runner<E> {
+        Runner { engine, remote }
     }
 
     /// Periodic full compaction.
@@ -323,9 +244,6 @@ where
     ) -> Result<(), Error> {
         fail_point!("on_compact_range_cf");
         let timer = Instant::now();
-        let compact_range_timer = COMPACT_RANGE_CF
-            .with_label_values(&[cf_name])
-            .start_coarse_timer();
         let compact_options = ManualCompactionOptions::new(false, 1, bottommost_level_force);
         box_try!(self.engine.compact_range_cf(
             cf_name,
@@ -333,7 +251,6 @@ where
             end_key,
             compact_options.clone()
         ));
-        compact_range_timer.observe_duration();
         info!(
             "compact range finished";
             "range_start" => start_key.map(::log_wrappers::Value::key),
@@ -384,21 +301,9 @@ where
                 bottommost_level_force,
             } => {
                 let cf = &cf_name;
-                if cf != CF_LOCK {
-                    // check whether the config changed for ignoring manual compaction
-                    if let Some(incoming) = self.cfg_tracker.any_new() {
-                        self.skip_compact = incoming.skip_manual_compaction_in_clean_up_worker;
-                    }
-                    if self.skip_compact {
-                        info!(
-                            "skip compact range";
-                            "range_start" => start_key.as_ref().map(|k| log_wrappers::Value::key(k)),
-                            "range_end" => end_key.as_ref().map(|k|log_wrappers::Value::key(k)),
-                            "cf" => cf_name,
-                        );
-                        return;
-                    }
-                }
+                let compact_range_timer = COMPACT_RANGE_CF
+                    .with_label_values(&[cf])
+                    .start_coarse_timer();
                 if let Err(e) = self.compact_range_cf(
                     cf,
                     start_key.as_deref(),
@@ -407,101 +312,10 @@ where
                 ) {
                     error!("execute compact range failed"; "cf" => cf, "err" => %e);
                 }
+                compact_range_timer.observe_duration();
             }
-            Task::CheckAndCompact {
-                cf_names,
-                ranges,
-                compact_threshold,
-            } => match collect_ranges_need_compact(&self.engine, ranges, compact_threshold) {
-                Ok(mut ranges) => {
-                    for (start, end) in ranges.drain(..) {
-                        for cf in &cf_names {
-                            if let Err(e) =
-                                self.compact_range_cf(cf, Some(&start), Some(&end), false)
-                            {
-                                error!(
-                                    "compact range failed";
-                                    "range_start" => log_wrappers::Value::key(&start),
-                                    "range_end" => log_wrappers::Value::key(&end),
-                                    "cf" => cf,
-                                    "err" => %e,
-                                );
-                            }
-                        }
-                        fail_point!("raftstore::compact::CheckAndCompact:AfterCompact");
-                    }
-                }
-                Err(e) => warn!("check ranges need reclaim failed"; "err" => %e),
-            },
-        }
-    }
-}
-
-pub fn need_compact(range_stats: &RangeStats, compact_threshold: &CompactThreshold) -> bool {
-    if range_stats.num_entries < range_stats.num_versions {
-        return false;
-    }
-
-    // We trigger region compaction when their are to many tombstones as well as
-    // redundant keys, both of which can severly impact scan operation:
-    let estimate_num_del = range_stats.num_entries - range_stats.num_versions;
-    let redundant_keys = range_stats.redundant_keys();
-    (redundant_keys >= compact_threshold.redundant_rows_threshold
-        && redundant_keys * 100
-            >= compact_threshold.redundant_rows_percent_threshold * range_stats.num_entries)
-        || (estimate_num_del >= compact_threshold.tombstones_num_threshold
-            && estimate_num_del * 100
-                >= compact_threshold.tombstones_percent_threshold * range_stats.num_entries)
-}
-
-fn collect_ranges_need_compact(
-    engine: &impl KvEngine,
-    ranges: Vec<Key>,
-    compact_threshold: CompactThreshold,
-) -> Result<VecDeque<(Key, Key)>, Error> {
-    // Check the SST properties for each range, and TiKV will compact a range if the
-    // range contains too many RocksDB tombstones. TiKV will merge multiple
-    // neighboring ranges that need compacting into a single range.
-    let mut ranges_need_compact = VecDeque::new();
-    let mut compact_start = None;
-    let mut compact_end = None;
-    for range in ranges.windows(2) {
-        // Get total entries and total versions in this range and checks if it needs to
-        // be compacted.
-        if let Some(range_stats) = box_try!(engine.get_range_stats(CF_WRITE, &range[0], &range[1]))
-        {
-            if need_compact(&range_stats, &compact_threshold) {
-                if compact_start.is_none() {
-                    // The previous range doesn't need compacting.
-                    compact_start = Some(range[0].clone());
-                }
-                compact_end = Some(range[1].clone());
-                // Move to next range.
-                continue;
-            }
-        }
-
-        // Current range doesn't need compacting, save previous range that need
-        // compacting.
-        if compact_start.is_some() {
-            assert!(compact_end.is_some());
-        }
-        if let (Some(cs), Some(ce)) = (compact_start, compact_end) {
-            ranges_need_compact.push_back((cs, ce));
         }
-        compact_start = None;
-        compact_end = None;
-    }
-
-    // Save the last range that needs to be compacted.
-    if compact_start.is_some() {
-        assert!(compact_end.is_some());
-    }
-    if let (Some(cs), Some(ce)) = (compact_start, compact_end) {
-        ranges_need_compact.push_back((cs, ce));
     }
-
-    Ok(ranges_need_compact)
 }
 
 #[cfg(test)]
@@ -510,11 +324,11 @@ mod tests {
 
     use engine_test::{
         ctor::{CfOptions, DbOptions},
-        kv::{new_engine, new_engine_opt, KvTestEngine},
+        kv::{KvTestEngine, new_engine, new_engine_opt},
     };
     use engine_traits::{
-        CompactExt, MiscExt, Mutable, SyncMutable, WriteBatch, WriteBatchExt, CF_DEFAULT, CF_LOCK,
-        CF_RAFT, CF_WRITE,
+        CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, CompactExt, MiscExt, Mutable, SyncMutable,
+        WriteBatch, WriteBatchExt,
     };
     use keys::data_key;
     use tempfile::Builder;
@@ -528,10 +342,7 @@ mod tests {
         E: KvEngine,
     {
         let pool = YatpPoolBuilder::new(DefaultTicker::default()).build_future_pool();
-        (
-            pool.clone(),
-            Runner::new(engine, pool.remote().clone(), Tracker::default(), false),
-        )
+        (pool.clone(), Runner::new(engine, pool.remote().clone()))
     }
 
     #[test]
@@ -670,106 +481,6 @@ mod tests {
         new_engine_opt(path, db_opts, cfs_opts).unwrap()
     }
 
-    #[test]
-    fn test_check_space_redundancy() {
-        let tmp_dir = Builder::new().prefix("test").tempdir().unwrap();
-        let engine = open_db(tmp_dir.path().to_str().unwrap());
-
-        // mvcc_put 0..5
-        for i in 0..5 {
-            let (k, v) = (format!("k{}", i), format!("value{}", i));
-            mvcc_put(&engine, k.as_bytes(), v.as_bytes(), 1.into(), 2.into());
-            mvcc_put(&engine, k.as_bytes(), v.as_bytes(), 3.into(), 4.into());
-        }
-        engine.flush_cf(CF_WRITE, true).unwrap();
-
-        // gc 0..5
-        for i in 0..5 {
-            let k = format!("k{}", i);
-            delete(&engine, k.as_bytes(), 4.into());
-        }
-        engine.flush_cf(CF_WRITE, true).unwrap();
-
-        let (start, end) = (data_key(b"k0"), data_key(b"k5"));
-        let range_stats = engine
-            .get_range_stats(CF_WRITE, &start, &end)
-            .unwrap()
-            .unwrap();
-        assert_eq!(range_stats.num_entries, 15);
-        assert_eq!(range_stats.num_versions, 10);
-        assert_eq!(range_stats.num_rows, 5);
-
-        // mvcc_put 5..10
-        for i in 5..10 {
-            let (k, v) = (format!("k{}", i), format!("value{}", i));
-            mvcc_put(&engine, k.as_bytes(), v.as_bytes(), 1.into(), 2.into());
-        }
-        for i in 5..8 {
-            let (k, v) = (format!("k{}", i), format!("value{}", i));
-            mvcc_put(&engine, k.as_bytes(), v.as_bytes(), 3.into(), 4.into());
-        }
-        engine.flush_cf(CF_WRITE, true).unwrap();
-
-        let (s, e) = (data_key(b"k5"), data_key(b"k9"));
-        let range_stats = engine.get_range_stats(CF_WRITE, &s, &e).unwrap().unwrap();
-        assert_eq!(range_stats.num_entries, 8);
-        assert_eq!(range_stats.num_versions, 8);
-        assert_eq!(range_stats.num_rows, 5);
-
-        // tombstone triggers compaction
-        let ranges_need_to_compact = collect_ranges_need_compact(
-            &engine,
-            vec![data_key(b"k0"), data_key(b"k5"), data_key(b"k9")],
-            CompactThreshold::new(4, 30, 100, 100),
-        )
-        .unwrap();
-        let (s, e) = (data_key(b"k0"), data_key(b"k5"));
-        let mut expected_ranges = VecDeque::new();
-        expected_ranges.push_back((s, e));
-        assert_eq!(ranges_need_to_compact, expected_ranges);
-
-        // duplicated mvcc triggers compaction
-        let ranges_need_to_compact = collect_ranges_need_compact(
-            &engine,
-            vec![data_key(b"k0"), data_key(b"k5"), data_key(b"k9")],
-            CompactThreshold::new(100, 100, 5, 50),
-        )
-        .unwrap();
-        assert_eq!(ranges_need_to_compact, expected_ranges);
-
-        // gc 5..8
-        for i in 5..8 {
-            let k = format!("k{}", i);
-            delete(&engine, k.as_bytes(), 4.into());
-        }
-        engine.flush_cf(CF_WRITE, true).unwrap();
-
-        let (s, e) = (data_key(b"k5"), data_key(b"k9"));
-        let range_stats = engine.get_range_stats(CF_WRITE, &s, &e).unwrap().unwrap();
-        assert_eq!(range_stats.num_entries, 11);
-        assert_eq!(range_stats.num_versions, 8);
-        assert_eq!(range_stats.num_rows, 5);
-
-        let ranges_need_to_compact = collect_ranges_need_compact(
-            &engine,
-            vec![data_key(b"k0"), data_key(b"k5"), data_key(b"k9")],
-            CompactThreshold::new(3, 25, 100, 100),
-        )
-        .unwrap();
-        let (s, e) = (data_key(b"k0"), data_key(b"k9"));
-        let mut expected_ranges = VecDeque::new();
-        expected_ranges.push_back((s, e));
-        assert_eq!(ranges_need_to_compact, expected_ranges);
-
-        let ranges_need_to_compact = collect_ranges_need_compact(
-            &engine,
-            vec![data_key(b"k0"), data_key(b"k5"), data_key(b"k9")],
-            CompactThreshold::new(100, 100, 3, 35),
-        )
-        .unwrap();
-        assert_eq!(ranges_need_to_compact, expected_ranges);
-    }
-
     #[test]
     fn test_full_compact_deletes() {
         let tmp_dir = Builder::new().prefix("test").tempdir().unwrap();
@@ -870,43 +581,4 @@ mod tests {
             .unwrap();
         assert_eq!(stats.num_entries - stats.num_versions, 0);
     }
-
-    #[test]
-    fn test_need_compact() {
-        // many tombstone case
-        let range_stats = RangeStats {
-            num_entries: 1000,
-            num_versions: 200,
-            num_deletes: 0,
-            num_rows: 200,
-        };
-        assert!(need_compact(
-            &range_stats,
-            &CompactThreshold::new(10, 30, 100, 100)
-        ));
-
-        // many mvcc put case
-        let range_stats = RangeStats {
-            num_entries: 1000,
-            num_versions: 1000,
-            num_deletes: 0,
-            num_rows: 200,
-        };
-        assert!(need_compact(
-            &range_stats,
-            &CompactThreshold::new(100, 100, 100, 30)
-        ));
-
-        // many mvcc delete case
-        let range_stats = RangeStats {
-            num_entries: 1000,
-            num_versions: 1000,
-            num_deletes: 800,
-            num_rows: 1000,
-        };
-        assert!(need_compact(
-            &range_stats,
-            &CompactThreshold::new(100, 100, 100, 30)
-        ));
-    }
 }
diff --git a/components/raftstore/src/store/worker/consistency_check.rs b/components/raftstore/src/store/worker/consistency_check.rs
index fef2bae332c..4eb6a75810c 100644
--- a/components/raftstore/src/store/worker/consistency_check.rs
+++ b/components/raftstore/src/store/worker/consistency_check.rs
@@ -9,7 +9,7 @@ use tikv_util::{error, info, warn, worker::Runnable};
 
 use super::metrics::*;
 use crate::{
-    coprocessor::{dispatcher::StoreHandle, CoprocessorHost},
+    coprocessor::{CoprocessorHost, dispatcher::StoreHandle},
     store::metrics::*,
 };
 
@@ -117,16 +117,16 @@ mod tests {
     use std::{assert_matches::assert_matches, sync::mpsc, time::Duration};
 
     use byteorder::{BigEndian, WriteBytesExt};
-    use engine_test::kv::{new_engine, KvTestEngine};
-    use engine_traits::{KvEngine, SyncMutable, ALL_CFS};
+    use engine_test::kv::{KvTestEngine, new_engine};
+    use engine_traits::{ALL_CFS, KvEngine, SyncMutable};
     use kvproto::metapb::*;
     use tempfile::Builder;
     use tikv_util::worker::Runnable;
 
     use super::*;
     use crate::coprocessor::{
-        dispatcher::SchedTask, BoxConsistencyCheckObserver, ConsistencyCheckMethod,
-        RawConsistencyCheckObserver,
+        BoxConsistencyCheckObserver, ConsistencyCheckMethod, RawConsistencyCheckObserver,
+        dispatcher::SchedTask,
     };
 
     #[test]
diff --git a/components/raftstore/src/store/worker/disk_check.rs b/components/raftstore/src/store/worker/disk_check.rs
index 3f497102b08..0f0046a4d92 100644
--- a/components/raftstore/src/store/worker/disk_check.rs
+++ b/components/raftstore/src/store/worker/disk_check.rs
@@ -7,7 +7,7 @@ use std::{
     time::Duration,
 };
 
-use crossbeam::channel::{bounded, Receiver, Sender};
+use crossbeam::channel::{Receiver, Sender, bounded};
 use health_controller::types::LatencyInspector;
 use tikv_util::{
     time::Instant,
diff --git a/components/raftstore/src/store/worker/mod.rs b/components/raftstore/src/store/worker/mod.rs
index 3cd4534b8f0..26da30309fb 100644
--- a/components/raftstore/src/store/worker/mod.rs
+++ b/components/raftstore/src/store/worker/mod.rs
@@ -23,16 +23,13 @@ pub use self::{
     cleanup::{Runner as CleanupRunner, Task as CleanupTask},
     cleanup_snapshot::{Runner as GcSnapshotRunner, Task as GcSnapshotTask},
     cleanup_sst::{Runner as CleanupSstRunner, Task as CleanupSstTask},
-    compact::{
-        need_compact, CompactThreshold, FullCompactController, Runner as CompactRunner,
-        Task as CompactTask,
-    },
+    compact::{FullCompactController, Runner as CompactRunner, Task as CompactTask},
     consistency_check::{Runner as ConsistencyCheckRunner, Task as ConsistencyCheckTask},
     disk_check::{Runner as DiskCheckRunner, Task as DiskCheckTask},
     pd::{
-        new_change_peer_v2_request, FlowStatistics, FlowStatsReporter, HeartbeatTask,
+        FlowStatistics, FlowStatsReporter, HeartbeatTask, NUM_COLLECT_STORE_INFOS_PER_HEARTBEAT,
         Runner as PdRunner, StatsMonitor as PdStatsMonitor, StoreStatsReporter, Task as PdTask,
-        NUM_COLLECT_STORE_INFOS_PER_HEARTBEAT,
+        new_change_peer_v2_request,
     },
     raftlog_gc::{Runner as RaftlogGcRunner, Task as RaftlogGcTask},
     read::{
@@ -45,15 +42,15 @@ pub use self::{
         Task as RefreshConfigTask, WriterContoller,
     },
     region::{Runner as RegionRunner, Task as RegionTask},
-    snap_gen::{Runner as SnapGenRunner, Task as SnapGenTask, SNAP_GENERATOR_MAX_POOL_SIZE},
+    snap_gen::{Runner as SnapGenRunner, SNAP_GENERATOR_MAX_POOL_SIZE, Task as SnapGenTask},
     split_check::{
         Bucket, BucketRange, BucketStatsInfo, KeyEntry, Runner as SplitCheckRunner,
         Task as SplitCheckTask,
     },
     split_config::{
-        SplitConfig, SplitConfigManager, BIG_REGION_CPU_OVERLOAD_THRESHOLD_RATIO,
-        DEFAULT_BIG_REGION_BYTE_THRESHOLD, DEFAULT_BIG_REGION_QPS_THRESHOLD,
-        DEFAULT_BYTE_THRESHOLD, DEFAULT_QPS_THRESHOLD, REGION_CPU_OVERLOAD_THRESHOLD_RATIO,
+        BIG_REGION_CPU_OVERLOAD_THRESHOLD_RATIO, DEFAULT_BIG_REGION_BYTE_THRESHOLD,
+        DEFAULT_BIG_REGION_QPS_THRESHOLD, DEFAULT_BYTE_THRESHOLD, DEFAULT_QPS_THRESHOLD,
+        REGION_CPU_OVERLOAD_THRESHOLD_RATIO, SplitConfig, SplitConfigManager,
     },
     split_controller::{AutoSplitController, ReadStats, SplitConfigChange, SplitInfo, WriteStats},
 };
diff --git a/components/raftstore/src/store/worker/pd.rs b/components/raftstore/src/store/worker/pd.rs
index 017cce61429..336b56c717f 100644
--- a/components/raftstore/src/store/worker/pd.rs
+++ b/components/raftstore/src/store/worker/pd.rs
@@ -1,14 +1,13 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    cmp,
-    cmp::Ordering as CmpOrdering,
+    cmp::{self, Ordering as CmpOrdering},
     fmt::{self, Display, Formatter},
     io, mem,
     sync::{
-        atomic::Ordering,
+        Arc, Mutex, RwLock,
+        atomic::{AtomicBool, Ordering},
         mpsc::{self, Receiver, Sender, SyncSender},
-        Arc, Mutex,
     },
     thread::{Builder, JoinHandle},
     time::{Duration, Instant},
@@ -19,11 +18,11 @@ use collections::{HashMap, HashSet};
 use concurrency_manager::ConcurrencyManager;
 use engine_traits::{KvEngine, RaftEngine};
 use fail::fail_point;
-use futures::{compat::Future01CompatExt, FutureExt};
+use futures::{FutureExt, compat::Future01CompatExt};
 use health_controller::{
+    HealthController,
     reporters::{RaftstoreReporter, RaftstoreReporterConfig},
     types::{InspectFactor, LatencyInspector, RaftstoreDuration},
-    HealthController,
 };
 use kvproto::{
     kvrpcpb::DiskFullOpt,
@@ -35,23 +34,22 @@ use kvproto::{
     raft_serverpb::RaftMessage,
     replication_modepb::{RegionReplicationStatus, StoreDrAutoSyncStatus},
 };
-use pd_client::{metrics::*, BucketStat, Error, PdClient, RegionStat, RegionWriteCfCopDetail};
+use pd_client::{BucketStat, Error, PdClient, RegionStat, RegionWriteCfCopDetail, metrics::*};
 use prometheus::local::LocalHistogram;
 use raft::eraftpb::ConfChangeType;
 use resource_metering::{Collector, CollectorGuard, CollectorRegHandle, RawRecords};
 use service::service_manager::GrpcServiceManager;
 use tikv_util::{
-    box_err, debug, error, info,
+    GLOBAL_SERVER_READINESS, box_err, debug, error, info,
     metrics::ThreadInfoStatistics,
     store::QueryStats,
-    sys::{disk, thread::StdThreadBuildWrapper, SysQuota},
+    sys::{SysQuota, disk, thread::StdThreadBuildWrapper},
     thd_name,
     time::{Instant as TiInstant, UnixSecs},
     timer::GLOBAL_TIMER_HANDLE,
     topn::TopN,
     warn,
     worker::{Runnable, ScheduleError, Scheduler},
-    GLOBAL_SERVER_READINESS,
 };
 use yatp::Remote;
 
@@ -60,18 +58,18 @@ use crate::{
     coprocessor::CoprocessorHost,
     router::RaftStoreRouter,
     store::{
+        Callback, CasualMessage, Config, PeerMsg, RaftCmdExtraOpts, RaftCommand, RaftRouter,
+        SnapManager, StoreMsg, StoreTick, TxnExt,
         cmd_resp::new_error,
         metrics::*,
         unsafe_recovery::{
             UnsafeRecoveryExecutePlanSyncer, UnsafeRecoveryForceLeaderSyncer, UnsafeRecoveryHandle,
         },
-        util::{is_epoch_stale, KeysInfoFormatter},
+        util::{KeysInfoFormatter, is_epoch_stale},
         worker::{
-            split_controller::{SplitInfo, TOP_N},
             AutoSplitController, ReadStats, SplitConfigChange, WriteStats,
+            split_controller::{SplitInfo, TOP_N},
         },
-        Callback, CasualMessage, Config, PeerMsg, RaftCmdExtraOpts, RaftCommand, RaftRouter,
-        SnapManager, StoreMsg, TxnExt,
     },
 };
 
@@ -110,13 +108,13 @@ where
 {
     fn report_read_stats(&self, read_stats: ReadStats) {
         if let Err(e) = self.schedule(Task::ReadStats { read_stats }) {
-            error!("Failed to send read flow statistics"; "err" => ?e);
+            warn!("Failed to send read flow statistics"; "err" => ?e);
         }
     }
 
     fn report_write_stats(&self, write_stats: WriteStats) {
         if let Err(e) = self.schedule(Task::WriteStats { write_stats }) {
-            error!("Failed to send write flow statistics"; "err" => ?e);
+            warn!("Failed to send write flow statistics"; "err" => ?e);
         }
     }
 }
@@ -211,6 +209,9 @@ where
     InspectLatency {
         factor: InspectFactor,
     },
+    GracefulShutdownState {
+        state: bool,
+    },
 }
 
 pub struct StoreStat {
@@ -482,6 +483,9 @@ where
             Task::InspectLatency { factor } => {
                 write!(f, "inspect raftstore latency: {:?}", factor)
             }
+            Task::GracefulShutdownState { state } => {
+                write!(f, "graceful shutdown state: {:?}", state)
+            }
         }
     }
 }
@@ -496,6 +500,52 @@ fn default_collect_tick_interval() -> Duration {
     DEFAULT_COLLECT_TICK_INTERVAL
 }
 
+/// Determines the minimal interval for latency inspection ticks based on raft
+/// and kvdb inspection intervals.
+///
+/// This function handles different scenarios for latency inspection:
+/// 1. Both intervals are zero: Inspection is disabled, returns a large interval
+///    (1 hour)
+/// 2. Only raft interval is zero: Uses kvdb interval (raft inspection disabled)
+/// 3. Only kvdb interval is zero: Uses raft interval (kvdb inspection disabled)
+/// 4. Both intervals non-zero: Uses the smaller of the two intervals
+///
+/// # Arguments
+///
+/// * `inspect_latency_interval` - Interval for raft latency inspection
+/// * `inspect_kvdb_latency_interval` - Interval for kvdb latency inspection
+///
+/// # Returns
+///
+/// The minimal interval that should be used for latency inspection ticks
+fn get_minimal_inspect_tick_interval(
+    inspect_latency_interval: Duration,
+    inspect_kvdb_latency_interval: Duration,
+) -> Duration {
+    match (
+        inspect_latency_interval.is_zero(),
+        inspect_kvdb_latency_interval.is_zero(),
+    ) {
+        (true, true) => {
+            // Both inspections are disabled - return a large interval to avoid misleading
+            // tick checks
+            Duration::from_secs(3600)
+        }
+        (true, false) => {
+            // raft inspection disabled - use kvdb interval
+            inspect_kvdb_latency_interval
+        }
+        (false, true) => {
+            // kvdb inspection disabled - use raft interval
+            inspect_latency_interval
+        }
+        (false, false) => {
+            // Both inspections enabled - use the smaller interval
+            std::cmp::min(inspect_latency_interval, inspect_kvdb_latency_interval)
+        }
+    }
+}
+
 #[inline]
 fn convert_record_pairs(m: HashMap<String, u64>) -> RecordPairVec {
     m.into_iter()
@@ -561,7 +611,7 @@ where
             min_resolved_ts,
         };
         if let Err(e) = self.0.schedule(task) {
-            error!(
+            warn!(
                 "failed to send min resolved ts to pd worker";
                 "err" => ?e,
             );
@@ -571,7 +621,7 @@ where
     fn auto_split(&self, split_infos: Vec<SplitInfo>) {
         let task = Task::AutoSplit { split_infos };
         if let Err(e) = self.0.schedule(task) {
-            error!(
+            warn!(
                 "failed to send split infos to pd worker";
                 "err" => ?e,
             );
@@ -583,7 +633,7 @@ where
                 "tick" => timer_tick);
         let task = Task::InspectLatency { factor };
         if let Err(e) = self.0.schedule(task) {
-            error!(
+            warn!(
                 "failed to send inspect raftstore latency task to pd worker";
                 "err" => ?e,
             );
@@ -603,8 +653,9 @@ where
     collect_store_infos_interval: Duration,
     load_base_split_check_interval: Duration,
     collect_tick_interval: Duration,
-    inspect_latency_interval: Duration,
-    inspect_kvdb_latency_interval: Duration,
+    inspect_latency_interval: Duration,      // for raft mount path
+    inspect_kvdb_latency_interval: Duration, // for kvdb mount path
+    inspect_network_interval: Duration,
 }
 
 impl<T> StatsMonitor<T>
@@ -615,6 +666,7 @@ where
         interval: Duration,
         inspect_latency_interval: Duration,
         inspect_kvdb_latency_interval: Duration,
+        inspect_network_interval: Duration,
         reporter: T,
     ) -> Self {
         StatsMonitor {
@@ -628,13 +680,17 @@ where
                 DEFAULT_LOAD_BASE_SPLIT_CHECK_INTERVAL,
                 interval,
             ),
-            // Use `inspect_latency_interval` as the minimal limitation for collecting tick.
+            // Use the smallest inspect latency as the minimal limitation for collecting tick.
             collect_tick_interval: cmp::min(
-                inspect_latency_interval,
-                cmp::min(default_collect_tick_interval(), interval),
+                get_minimal_inspect_tick_interval(
+                    inspect_latency_interval,
+                    inspect_kvdb_latency_interval,
+                ),
+                interval.min(default_collect_tick_interval()),
             ),
             inspect_latency_interval,
             inspect_kvdb_latency_interval,
+            inspect_network_interval,
         }
     }
 
@@ -647,7 +703,10 @@ where
     ) -> Result<(), io::Error> {
         if self.collect_tick_interval
             < cmp::min(
-                self.inspect_latency_interval,
+                get_minimal_inspect_tick_interval(
+                    self.inspect_latency_interval,
+                    self.inspect_kvdb_latency_interval,
+                ),
                 default_collect_tick_interval(),
             )
         {
@@ -670,6 +729,9 @@ where
         let update_kvdisk_latency_stats_interval =
             self.inspect_kvdb_latency_interval
                 .div_duration_f64(tick_interval) as u64;
+        let update_network_latency_stats_interval =
+            self.inspect_network_interval
+                .div_duration_f64(tick_interval) as u64;
 
         let (timer_tx, timer_rx) = mpsc::channel();
         self.timer = Some(timer_tx);
@@ -736,6 +798,9 @@ where
                     if is_enable_tick(timer_cnt, update_kvdisk_latency_stats_interval) {
                         reporter.update_latency_stats(timer_cnt, InspectFactor::KvDisk);
                     }
+                    if is_enable_tick(timer_cnt, update_network_latency_stats_interval) {
+                        reporter.update_latency_stats(timer_cnt, InspectFactor::Network);
+                    }
                     timer_cnt += 1;
                 }
             })?;
@@ -864,7 +929,7 @@ where
     store_id: u64,
     pd_client: Arc<T>,
     router: RaftRouter<EK, ER>,
-    region_peers: HashMap<u64, PeerStat>,
+    region_peers: Arc<RwLock<HashMap<u64, PeerStat>>>,
     region_buckets: HashMap<u64, ReportBucket>,
     store_stat: StoreStat,
     is_hb_receiver_scheduled: bool,
@@ -893,6 +958,9 @@ where
 
     // Service manager for grpc service.
     grpc_service_manager: GrpcServiceManager,
+
+    // Graceful shutdown state for evict leader during shutdown
+    graceful_shutdown_state: Arc<AtomicBool>,
 }
 
 impl<EK, ER, T> Runner<EK, ER, T>
@@ -916,6 +984,7 @@ where
         coprocessor_host: CoprocessorHost<EK>,
         causal_ts_provider: Option<Arc<CausalTsProviderImpl>>, // used for rawkv apiv2
         grpc_service_manager: GrpcServiceManager,
+        graceful_shutdown_state: Arc<std::sync::atomic::AtomicBool>,
     ) -> Runner<EK, ER, T> {
         let mut store_stat = StoreStat::default();
         store_stat.set_cpu_quota(SysQuota::cpu_cores_quota(), cfg.inspect_cpu_util_thd);
@@ -925,15 +994,17 @@ where
             interval,
             cfg.inspect_interval.0,
             cfg.inspect_kvdb_interval.0,
+            cfg.inspect_network_interval.0,
             WrappedScheduler(scheduler.clone()),
         );
         if let Err(e) = stats_monitor.start(auto_split_controller, collector_reg_handle) {
             error!("failed to start stats collector, error = {:?}", e);
         }
 
-        let health_reporter_config = RaftstoreReporterConfig {
+        let health_reporter_config: RaftstoreReporterConfig = RaftstoreReporterConfig {
             inspect_interval: cfg.inspect_interval.0,
             inspect_kvdb_interval: cfg.inspect_kvdb_interval.0,
+            inspect_network_interval: cfg.inspect_network_interval.0,
 
             unsensitive_cause: cfg.slow_trend_unsensitive_cause,
             unsensitive_result: cfg.slow_trend_unsensitive_result,
@@ -964,7 +1035,7 @@ where
             pd_client,
             router,
             is_hb_receiver_scheduled: false,
-            region_peers: HashMap::default(),
+            region_peers: Arc::new(RwLock::new(HashMap::default())),
             region_buckets: HashMap::default(),
             store_stat,
             start_ts: UnixSecs::now(),
@@ -980,6 +1051,7 @@ where
             coprocessor_host,
             causal_ts_provider,
             grpc_service_manager,
+            graceful_shutdown_state,
         }
     }
 
@@ -1183,29 +1255,32 @@ where
         dr_autosync_status: Option<StoreDrAutoSyncStatus>,
     ) {
         let mut report_peers = HashMap::default();
-        for (region_id, region_peer) in &mut self.region_peers {
-            let read_bytes = region_peer.read_bytes - region_peer.last_store_report_read_bytes;
-            let read_keys = region_peer.read_keys - region_peer.last_store_report_read_keys;
-            let query_stats = region_peer
-                .query_stats
-                .sub_query_stats(&region_peer.last_store_report_query_stats);
-            region_peer.last_store_report_read_bytes = region_peer.read_bytes;
-            region_peer.last_store_report_read_keys = region_peer.read_keys;
-            region_peer
-                .last_store_report_query_stats
-                .fill_query_stats(&region_peer.query_stats);
-            if read_bytes < hotspot_byte_report_threshold()
-                && read_keys < hotspot_key_report_threshold()
-                && query_stats.get_read_query_num() < hotspot_query_num_report_threshold()
-            {
-                continue;
+        {
+            let mut region_peers = self.region_peers.write().unwrap();
+            for (region_id, region_peer) in region_peers.iter_mut() {
+                let read_bytes = region_peer.read_bytes - region_peer.last_store_report_read_bytes;
+                let read_keys = region_peer.read_keys - region_peer.last_store_report_read_keys;
+                let query_stats = region_peer
+                    .query_stats
+                    .sub_query_stats(&region_peer.last_store_report_query_stats);
+                region_peer.last_store_report_read_bytes = region_peer.read_bytes;
+                region_peer.last_store_report_read_keys = region_peer.read_keys;
+                region_peer
+                    .last_store_report_query_stats
+                    .fill_query_stats(&region_peer.query_stats);
+                if read_bytes < hotspot_byte_report_threshold()
+                    && read_keys < hotspot_key_report_threshold()
+                    && query_stats.get_read_query_num() < hotspot_query_num_report_threshold()
+                {
+                    continue;
+                }
+                let mut read_stat = pdpb::PeerStat::default();
+                read_stat.set_region_id(*region_id);
+                read_stat.set_read_keys(read_keys);
+                read_stat.set_read_bytes(read_bytes);
+                read_stat.set_query_stats(query_stats.0);
+                report_peers.insert(*region_id, read_stat);
             }
-            let mut read_stat = pdpb::PeerStat::default();
-            read_stat.set_region_id(*region_id);
-            read_stat.set_read_keys(read_keys);
-            read_stat.set_read_bytes(read_bytes);
-            read_stat.set_query_stats(query_stats.0);
-            report_peers.insert(*region_id, read_stat);
         }
 
         stats = collect_report_read_peer_stats(HOTSPOT_REPORT_CAPACITY, report_peers, stats);
@@ -1263,8 +1338,16 @@ where
         self.store_stat.region_bytes_read.flush();
         self.store_stat.region_keys_read.flush();
 
-        let slow_score = self.health_reporter.get_slow_score();
-        stats.set_slow_score(slow_score as u64);
+        stats.set_slow_score(self.health_reporter.get_disk_slow_score() as u64);
+        // Filter out network slow scores equal to 1 to reduce message volume
+        let network_scores = self
+            .health_reporter
+            .get_network_slow_score()
+            .into_iter()
+            .filter(|(_, score)| *score != 1)
+            .collect();
+        stats.set_network_slow_scores(network_scores);
+
         let (rps, slow_trend_pb) = self
             .health_reporter
             .update_slow_trend(all_query_num, Instant::now());
@@ -1273,8 +1356,14 @@ where
 
         stats.set_is_grpc_paused(self.grpc_service_manager.is_paused());
 
+        stats.set_is_stopping(
+            self.graceful_shutdown_state
+                .load(std::sync::atomic::Ordering::SeqCst),
+        );
+
         let scheduler = self.scheduler.clone();
         let router = self.router.clone();
+        let region_peers = self.region_peers.clone();
         let mut snap_mgr = self.snap_mgr.clone();
         let resp = self
             .pd_client
@@ -1341,13 +1430,39 @@ where
                             }
                         }
                     }
-                    // Forcely awaken all hibernated regions if there existed slow stores in this
-                    // cluster.
+                    // Force awaken all hibernated regions if there are slow stores in this
+                    // cluster. To mitigate the impact of stalls when awakening too many regions,
+                    // we break up all regions into small batches.
                     if let Some(awaken_regions) = resp.awaken_regions.take() {
                         info!("forcely awaken hibernated regions in this store");
-                        let _ = router.send_store_msg(StoreMsg::AwakenRegions {
-                            abnormal_stores: awaken_regions.get_abnormal_stores().to_vec(),
-                        });
+                        let abnormal_stores = awaken_regions.get_abnormal_stores().to_vec();
+                        // The chunk_size of 1024 is an empirical batch size that balances
+                        // between generating too many `StoreMsg::AwakenRegions` messages and
+                        // keeping each batch small enough to avoid stalling Raftstore for
+                        // extended periods.
+                        let chunk_size = 1024;
+                        let mut region_ids = Vec::with_capacity(chunk_size);
+
+                        for (id, _) in region_peers.read().unwrap().iter() {
+                            region_ids.push(*id);
+
+                            // Send batch when it reaches the chunk size
+                            if region_ids.len() >= chunk_size {
+                                let _ = router.send_store_msg(StoreMsg::AwakenRegions {
+                                    abnormal_stores: abnormal_stores.clone(),
+                                    region_ids: std::mem::take(&mut region_ids),
+                                });
+                                region_ids.reserve(chunk_size);
+                            }
+                        }
+
+                        // Send remaining regions if any
+                        if !region_ids.is_empty() {
+                            let _ = router.send_store_msg(StoreMsg::AwakenRegions {
+                                abnormal_stores: abnormal_stores.clone(),
+                                region_ids,
+                            });
+                        }
                     }
                     // Control grpc server.
                     if let Some(op) = resp.control_grpc.take() {
@@ -1389,7 +1504,7 @@ where
                     }
                 }
                 Err(e) => {
-                    error!("store heartbeat failed"; "err" => ?e);
+                    warn!("store heartbeat failed"; "err" => ?e);
                 }
             }
         };
@@ -1644,15 +1759,18 @@ where
 
     fn handle_read_stats(&mut self, mut read_stats: ReadStats) {
         for (region_id, region_info) in read_stats.region_infos.iter_mut() {
-            let peer_stat = self.region_peers.entry(*region_id).or_default();
-            peer_stat.read_bytes += region_info.flow.read_bytes as u64;
-            peer_stat.read_keys += region_info.flow.read_keys as u64;
-            self.store_stat.engine_total_bytes_read += region_info.flow.read_bytes as u64;
-            self.store_stat.engine_total_keys_read += region_info.flow.read_keys as u64;
-            peer_stat
-                .query_stats
-                .add_query_stats(&region_info.query_stats.0);
-            peer_stat.cop_detail.add(&region_info.cop_detail);
+            {
+                let mut region_peers = self.region_peers.write().unwrap();
+                let peer_stat = region_peers.entry(*region_id).or_default();
+                peer_stat.read_bytes += region_info.flow.read_bytes as u64;
+                peer_stat.read_keys += region_info.flow.read_keys as u64;
+                self.store_stat.engine_total_bytes_read += region_info.flow.read_bytes as u64;
+                self.store_stat.engine_total_keys_read += region_info.flow.read_keys as u64;
+                peer_stat
+                    .query_stats
+                    .add_query_stats(&region_info.query_stats.0);
+                peer_stat.cop_detail.add(&region_info.cop_detail);
+            }
             self.store_stat
                 .engine_total_query_num
                 .add_query_stats(&region_info.query_stats.0);
@@ -1667,8 +1785,11 @@ where
 
     fn handle_write_stats(&mut self, mut write_stats: WriteStats) {
         for (region_id, region_info) in write_stats.region_infos.iter_mut() {
-            let peer_stat = self.region_peers.entry(*region_id).or_default();
-            peer_stat.query_stats.add_query_stats(&region_info.0);
+            {
+                let mut region_peers = self.region_peers.write().unwrap();
+                let peer_stat = region_peers.entry(*region_id).or_default();
+                peer_stat.query_stats.add_query_stats(&region_info.0);
+            }
             self.store_stat
                 .engine_total_query_num
                 .add_query_stats(&region_info.0);
@@ -1676,12 +1797,21 @@ where
     }
 
     fn handle_destroy_peer(&mut self, region_id: u64) {
-        match self.region_peers.remove(&region_id) {
+        match self.region_peers.write().unwrap().remove(&region_id) {
             None => {}
             Some(_) => info!("remove peer statistic record in pd"; "region_id" => region_id),
         }
     }
 
+    fn handle_graceful_shutdown(&mut self, state: bool) {
+        self.graceful_shutdown_state.store(state, Ordering::SeqCst);
+        info!("handle graceful shutdown"; "state" => state);
+        let msg = StoreMsg::Tick(StoreTick::PdStoreHeartbeat);
+        if let Err(e) = self.router.send_control(msg) {
+            warn!("handle graceful shutdown failed"; "err" => ?e);
+        }
+    }
+
     fn handle_store_infos(
         &mut self,
         cpu_usages: RecordPairVec,
@@ -1795,13 +1925,13 @@ where
                     if leader.get_store_id() != 0 {
                         let msg = Box::new(CasualMessage::QueryRegionLeaderResp { region, leader });
                         if let Err(e) = router.send(region_id, PeerMsg::CasualMessage(msg)) {
-                            error!("send region info message failed"; "region_id" => region_id, "err" => ?e);
+                            warn!("send region info message failed"; "region_id" => region_id, "err" => ?e);
                         }
                     }
                 }
                 Ok(None) => {}
                 Err(e) => {
-                    error!("get region failed"; "err" => ?e);
+                    warn!("get region failed"; "err" => ?e);
                 }
             }
         };
@@ -1883,7 +2013,7 @@ where
     fn handle_fake_store_heartbeat(&mut self) {
         let mut stats = pdpb::StoreStats::default();
         stats.set_store_id(self.store_id);
-        stats.set_region_count(self.region_peers.len() as u32);
+        stats.set_region_count(self.region_peers.read().unwrap().len() as u32);
 
         let snap_stats = self.snap_mgr.stats();
         stats.set_sending_snap_count(snap_stats.sending_count as u32);
@@ -1955,6 +2085,7 @@ where
         }
         let id = slow_score_tick_result.tick_id;
         let scheduler = self.scheduler.clone();
+
         let inspector = {
             match factor {
                 InspectFactor::RaftDisk => {
@@ -2015,6 +2146,16 @@ where
                         }
                     }),
                 ),
+                InspectFactor::Network => {
+                    let network_durations = self.health_reporter.record_network_duration(id);
+
+                    for (store_id, network_duration) in &network_durations {
+                        STORE_INSPECT_NETWORK_DURATION_HISTOGRAM
+                            .with_label_values(&[&store_id.to_string()])
+                            .observe(tikv_util::time::duration_to_sec(*network_duration));
+                    }
+                    return;
+                }
             }
         };
         let msg = StoreMsg::LatencyInspect {
@@ -2023,7 +2164,7 @@ where
             inspector,
         };
         if let Err(e) = self.router.send_control(msg) {
-            warn!("pd worker send latency inspecter failed"; "err" => ?e);
+            warn!("pd worker send latency inspector failed"; "err" => ?e);
         }
     }
 }
@@ -2174,7 +2315,8 @@ where
                     cpu_usage,
                 ) = {
                     let region_id = hb_task.region.get_id();
-                    let peer_stat = self.region_peers.entry(region_id).or_default();
+                    let mut region_peers = self.region_peers.write().unwrap();
+                    let peer_stat = region_peers.entry(region_id).or_default();
                     peer_stat.approximate_size = approximate_size;
                     peer_stat.approximate_keys = approximate_keys;
 
@@ -2280,7 +2422,7 @@ where
                 factor,
                 duration,
             } => {
-                self.health_reporter.record_raftstore_duration(
+                self.health_reporter.record_duration(
                     id,
                     factor,
                     duration,
@@ -2301,6 +2443,9 @@ where
             Task::InspectLatency { factor } => {
                 self.handle_inspect_latency(factor);
             }
+            Task::GracefulShutdownState { state } => {
+                self.handle_graceful_shutdown(state);
+            }
         };
     }
 
@@ -2432,7 +2577,7 @@ fn send_admin_request<EK, ER>(
 
     let cmd = RaftCommand::new_ext(req, callback, extra_opts);
     if let Err(e) = router.send_raft_command(cmd) {
-        error!(
+        warn!(
             "send request failed";
             "region_id" => region_id, "cmd_type" => ?cmd_type, "err" => ?e,
         );
@@ -2533,7 +2678,7 @@ mod tests {
     use std::thread::sleep;
 
     use kvproto::{kvrpcpb, pdpb::QueryKind};
-    use pd_client::{new_bucket_stats, BucketMeta};
+    use pd_client::{BucketMeta, new_bucket_stats};
     use tikv_util::worker::LazyWorker;
 
     use super::*;
@@ -2563,6 +2708,7 @@ mod tests {
                     Duration::from_secs(interval),
                     Duration::from_secs(interval),
                     Duration::default(),
+                    Duration::default(),
                     WrappedScheduler(scheduler),
                 );
                 if let Err(e) = stats_monitor.start(
@@ -2696,6 +2842,10 @@ mod tests {
                             cpu_time: 10,
                             read_keys: 0,
                             write_keys: 0,
+                            network_in_bytes: 0,
+                            network_out_bytes: 0,
+                            logical_read_bytes: 0,
+                            logical_write_bytes: 0,
                         },
                     );
                     records
@@ -2807,6 +2957,7 @@ mod tests {
             Duration::from_secs(interval),
             Duration::from_secs(interval),
             Duration::default(),
+            Duration::default(),
             WrappedScheduler(pd_worker.scheduler()),
         );
         stats_monitor
@@ -2839,12 +2990,16 @@ mod tests {
                             region_id: 1,
                             peer_id: 0,
                             key_ranges: vec![],
-                            extra_attachment: b"a".to_vec(),
+                            extra_attachment: Arc::new(b"a".to_vec()),
                         }),
                         RawRecord {
                             cpu_time: 111,
                             read_keys: 1,
                             write_keys: 0,
+                            network_in_bytes: 0,
+                            network_out_bytes: 0,
+                            logical_read_bytes: 0,
+                            logical_write_bytes: 0,
                         },
                     );
                     records
diff --git a/components/raftstore/src/store/worker/raftlog_gc.rs b/components/raftstore/src/store/worker/raftlog_gc.rs
index 3edabae71a0..d5b643734e0 100644
--- a/components/raftstore/src/store/worker/raftlog_gc.rs
+++ b/components/raftstore/src/store/worker/raftlog_gc.rs
@@ -187,7 +187,7 @@ where
 mod tests {
     use std::time::Duration;
 
-    use engine_traits::{RaftEngine, RaftLogBatch, ALL_CFS};
+    use engine_traits::{ALL_CFS, RaftEngine, RaftLogBatch};
     use raft::eraftpb::Entry;
     use tempfile::Builder;
 
diff --git a/components/raftstore/src/store/worker/read.rs b/components/raftstore/src/store/worker/read.rs
index ab4d0c18244..ef58a24f192 100644
--- a/components/raftstore/src/store/worker/read.rs
+++ b/components/raftstore/src/store/worker/read.rs
@@ -6,8 +6,8 @@ use std::{
     fmt::{self, Display, Formatter},
     ops::Deref,
     sync::{
-        atomic::{self, AtomicU64, Ordering},
         Arc, Mutex,
+        atomic::{self, AtomicU64, Ordering},
     },
 };
 
@@ -26,7 +26,7 @@ use tikv_util::{
     debug, error,
     lru::LruCache,
     store::find_peer_by_id,
-    time::{monotonic_raw_now, ThreadReadId},
+    time::{ThreadReadId, monotonic_raw_now},
 };
 use time::Timespec;
 use tracker::GLOBAL_TRACKERS;
@@ -34,17 +34,16 @@ use txn_types::{TimeStamp, WriteBatchFlags};
 
 use super::metrics::*;
 use crate::{
+    Error, Result,
     coprocessor::CoprocessorHost,
     errors::RAFTSTORE_IS_BUSY,
     router::ReadContext,
     store::{
-        cmd_resp,
+        Callback, CasualMessage, CasualRouter, Peer, ProposalRouter, RaftCommand, ReadCallback,
+        ReadResponse, RegionSnapshot, RequestInspector, RequestPolicy, TxnExt, cmd_resp,
         fsm::store::StoreMeta,
         util::{self, LeaseState, RegionReadProgress, RemoteLease},
-        Callback, CasualMessage, CasualRouter, Peer, ProposalRouter, RaftCommand, ReadCallback,
-        ReadResponse, RegionSnapshot, RequestInspector, RequestPolicy, TxnExt,
     },
-    Error, Result,
 };
 
 /// #[RaftstoreCommon]
@@ -1157,7 +1156,7 @@ where
                                 // local peer is a valid leader.
                                 let allow_fallback_leader_read = inspector
                                     .inspect(&req)
-                                    .map_or(false, |r| r == RequestPolicy::ReadLocal);
+                                    .is_ok_and(|r| r == RequestPolicy::ReadLocal);
                                 if !allow_fallback_leader_read {
                                     cb.set_result(ReadResponse {
                                         response: err_resp,
@@ -1209,6 +1208,7 @@ where
                             &mut snap_updated,
                             last_valid_ts,
                         ) {
+                            fail_point!("reading_from_follower_read_cache");
                             TLS_LOCAL_READ_METRICS.with(|m| {
                                 m.borrow_mut().local_executed_follower_read_requests.inc()
                             });
@@ -1314,7 +1314,7 @@ struct Inspector<'r> {
     delegate: &'r ReadDelegate,
 }
 
-impl<'r> RequestInspector for Inspector<'r> {
+impl RequestInspector for Inspector<'_> {
     fn has_applied_to_current_term(&mut self) -> bool {
         if self.delegate.applied_term == self.delegate.term {
             true
@@ -1351,7 +1351,7 @@ mod tests {
 
     use crossbeam::channel::TrySendError;
     use engine_test::kv::{KvTestEngine, KvTestSnapshot};
-    use engine_traits::{MiscExt, Peekable, SyncMutable, ALL_CFS};
+    use engine_traits::{ALL_CFS, MiscExt, Peekable, SyncMutable};
     use kvproto::{metapb::RegionEpoch, raft_cmdpb::*};
     use tempfile::{Builder, TempDir};
     use tikv_util::{codec::number::NumberEncoder, time::monotonic_raw_now};
@@ -1359,7 +1359,7 @@ mod tests {
     use txn_types::WriteBatchFlags;
 
     use super::*;
-    use crate::store::{util::Lease, Callback};
+    use crate::store::{Callback, util::Lease};
 
     struct MockRouter {
         p_router: SyncSender<RaftCommand<KvTestSnapshot>>,
@@ -1523,7 +1523,7 @@ mod tests {
             TLS_LOCAL_READ_METRICS.with(|m| m.borrow().reject_reason.cache_miss.get()),
             1
         );
-        assert!(reader.local_reader.delegates.get(&1).is_none());
+        assert!(!reader.local_reader.delegates.contains_key(&1));
 
         // Register region 1
         lease.renew(monotonic_raw_now());
diff --git a/components/raftstore/src/store/worker/refresh_config.rs b/components/raftstore/src/store/worker/refresh_config.rs
index 066b463e75e..9fa99abe774 100644
--- a/components/raftstore/src/store/worker/refresh_config.rs
+++ b/components/raftstore/src/store/worker/refresh_config.rs
@@ -6,21 +6,21 @@ use std::{
 };
 
 use batch_system::{BatchRouter, Fsm, FsmTypes, HandlerBuilder, Poller, PoolState, Priority};
-use file_system::{set_io_type, IoType};
+use file_system::{IoType, set_io_type};
 use tikv_util::{
     debug, error, info, safe_panic, sys::thread::StdThreadBuildWrapper, thd_name, warn,
     worker::Runnable, yatp_pool::FuturePool,
 };
 
 use crate::store::{
+    PersistedNotifier,
     async_io::write::{StoreWriters, StoreWritersContext},
     fsm::{
+        PeerFsm,
         apply::{ApplyFsm, ControlFsm},
         store::{RaftRouter, StoreFsm},
-        PeerFsm,
     },
     transport::Transport,
-    PersistedNotifier,
 };
 
 pub struct PoolController<N: Fsm, C: Fsm, H: HandlerBuilder<N, C>> {
diff --git a/components/raftstore/src/store/worker/region.rs b/components/raftstore/src/store/worker/region.rs
index 06990d08ec1..5506baec4a1 100644
--- a/components/raftstore/src/store/worker/region.rs
+++ b/components/raftstore/src/store/worker/region.rs
@@ -8,18 +8,22 @@ use std::{
     },
     fmt::{self, Display, Formatter},
     sync::{
+        Arc, Mutex,
         atomic::{AtomicUsize, Ordering},
-        Arc,
     },
     time::Duration,
-    u64,
 };
 
+use collections::HashMap;
 use engine_traits::{
-    DeleteStrategy, KvEngine, Mutable, Range, WriteBatch, WriteOptions, CF_LOCK, CF_RAFT,
+    CF_LOCK, CF_RAFT, DeleteStrategy, Engines, KvEngine, Mutable, RaftEngine, Range, WriteBatch,
+    WriteOptions,
 };
 use fail::fail_point;
-use kvproto::raft_serverpb::{PeerState, RaftApplyState, RegionLocalState};
+use kvproto::{
+    metapb::{Peer, Region},
+    raft_serverpb::{MergeState, PeerState, RaftApplyState, RaftLocalState, RegionLocalState},
+};
 use tikv_util::{
     box_err, box_try,
     config::VersionTrack,
@@ -32,15 +36,18 @@ use tikv_util::{
 use super::metrics::*;
 use crate::{
     coprocessor::CoprocessorHost,
+    errors::Result as RaftstoreResult,
+    router::RaftStoreRouter,
     store::{
+        ApplyOptions, CasualMessage, Config, SignificantMsg, SnapEntry, SnapKey, SnapManager,
         check_abort,
+        fsm::StoreMeta,
+        msg::PeerClearMetaStat,
         peer_storage::{
             JOB_STATUS_CANCELLED, JOB_STATUS_CANCELLING, JOB_STATUS_FAILED, JOB_STATUS_FINISHED,
-            JOB_STATUS_PENDING, JOB_STATUS_RUNNING,
+            JOB_STATUS_PENDING, JOB_STATUS_RUNNING, clear_meta_in_kv_and_raft,
         },
-        snap::{plain_file_used, Error, Result, SNAPSHOT_CFS},
-        transport::CasualRouter,
-        ApplyOptions, CasualMessage, Config, SnapEntry, SnapKey, SnapManager,
+        snap::{Error, Result, SNAPSHOT_CFS, plain_file_used},
     },
 };
 
@@ -64,10 +71,24 @@ pub enum Task {
         start_key: Vec<u8>,
         end_key: Vec<u8>,
     },
+    /// Clears metadata belonging to the corresponding peer.
+    ClearPeerMeta {
+        peer: Peer,
+        region: Region,
+        raft_state: RaftLocalState,
+        merge_state: Option<MergeState>,
+        keep_data: bool,
+        initialized: bool,
+        local_first_replicate: bool,
+        first_index: u64,
+        /// Holds a lock to prevent the apply worker from processing split
+        /// operations during peer destruction to maintain consistency.
+        pending_create_peers: Arc<Mutex<HashMap<u64, (u64, bool)>>>,
+    },
 }
 
 impl Task {
-    pub fn destroy(region_id: u64, start_key: Vec<u8>, end_key: Vec<u8>) -> Task {
+    pub fn destroy(region_id: u64, start_key: Vec<u8>, end_key: Vec<u8>) -> Self {
         Task::Destroy {
             region_id,
             start_key,
@@ -91,6 +112,13 @@ impl Display for Task {
                 log_wrappers::Value::key(start_key),
                 log_wrappers::Value::key(end_key)
             ),
+            Task::ClearPeerMeta {
+                ref peer,
+                ref region,
+                ..
+            } => {
+                write!(f, "Destroy peer {} for {}", peer.get_id(), region.get_id())
+            }
         }
     }
 }
@@ -218,9 +246,10 @@ impl PendingDeleteRanges {
     }
 }
 
-pub struct Runner<EK, R>
+pub struct Runner<EK, ER, R>
 where
     EK: KvEngine,
+    ER: RaftEngine,
 {
     batch_size: usize,
     use_delete_range: bool,
@@ -242,24 +271,27 @@ where
     // whenever we can. Errors while processing them can be ignored.
     pending_delete_ranges: PendingDeleteRanges,
 
-    engine: EK,
+    engines: Engines<EK, ER>,
+    store_meta: Arc<Mutex<StoreMeta>>,
     mgr: SnapManager,
     coprocessor_host: CoprocessorHost<EK>,
     router: R,
 }
 
-impl<EK, R> Runner<EK, R>
+impl<EK, ER, R> Runner<EK, ER, R>
 where
     EK: KvEngine,
-    R: CasualRouter<EK>,
+    ER: RaftEngine,
+    R: RaftStoreRouter<EK>,
 {
     pub fn new(
-        engine: EK,
+        engines: Engines<EK, ER>,
+        store_meta: Arc<Mutex<StoreMeta>>,
         mgr: SnapManager,
         cfg: Arc<VersionTrack<Config>>,
         coprocessor_host: CoprocessorHost<EK>,
         router: R,
-    ) -> Runner<EK, R> {
+    ) -> Runner<EK, ER, R> {
         Runner {
             batch_size: cfg.value().snap_apply_batch_size.0 as usize,
             use_delete_range: cfg.value().use_delete_range,
@@ -271,7 +303,8 @@ where
             clean_stale_ranges_tick: cfg.value().clean_stale_ranges_tick,
             pending_applies: VecDeque::new(),
             pending_delete_ranges: PendingDeleteRanges::default(),
-            engine,
+            engines,
+            store_meta,
             mgr,
             coprocessor_host,
             router,
@@ -281,7 +314,7 @@ where
     fn region_state(&self, region_id: u64) -> Result<RegionLocalState> {
         let region_key = keys::region_state_key(region_id);
         let region_state: RegionLocalState =
-            match box_try!(self.engine.get_msg_cf(CF_RAFT, &region_key)) {
+            match box_try!(self.engines.kv.get_msg_cf(CF_RAFT, &region_key)) {
                 Some(state) => state,
                 None => {
                     return Err(box_err!(
@@ -296,7 +329,7 @@ where
     fn apply_state(&self, region_id: u64) -> Result<RaftApplyState> {
         let state_key = keys::apply_state_key(region_id);
         let apply_state: RaftApplyState =
-            match box_try!(self.engine.get_msg_cf(CF_RAFT, &state_key)) {
+            match box_try!(self.engines.kv.get_msg_cf(CF_RAFT, &state_key)) {
                 Some(state) => state,
                 None => {
                     return Err(box_err!(
@@ -343,7 +376,7 @@ where
         check_abort(&abort)?;
         let timer = Instant::now();
         let options = ApplyOptions {
-            db: self.engine.clone(),
+            db: self.engines.kv.clone(),
             region: region.clone(),
             abort: Arc::clone(&abort),
             write_batch_size: self.batch_size,
@@ -358,7 +391,7 @@ where
         // Delete snapshot state and assure the relative region state and snapshot state
         // is updated and flushed into kvdb.
         region_state.set_state(PeerState::Normal);
-        let mut wb = self.engine.write_batch();
+        let mut wb = self.engines.kv.write_batch();
         box_try!(wb.put_msg_cf(CF_RAFT, &keys::region_state_key(region_id), &region_state));
         box_try!(wb.delete_cf(CF_RAFT, &keys::snapshot_raft_state_key(region_id)));
         let mut wopts = WriteOptions::default();
@@ -425,7 +458,7 @@ where
         SNAP_HISTOGRAM
             .apply
             .observe(start.saturating_elapsed_secs());
-        let _ = self.router.send(
+        let _ = self.router.send_casual_msg(
             region_id,
             CasualMessage::SnapshotApplied { peer_id, tombstone },
         );
@@ -448,7 +481,8 @@ where
         }
         CLEAN_COUNTER_VEC.with_label_values(&["overlap"]).inc();
         let oldest_sequence = self
-            .engine
+            .engines
+            .kv
             .get_oldest_snapshot_sequence_number()
             .unwrap_or(u64::MAX);
         let df_ranges: Vec<_> = overlap_ranges
@@ -475,7 +509,8 @@ where
                 }
             })
             .collect();
-        self.engine
+        self.engines
+            .kv
             .delete_ranges_cfs(
                 &WriteOptions::default(),
                 DeleteStrategy::DeleteFiles,
@@ -518,7 +553,7 @@ where
             "start_key" => log_wrappers::Value::key(&start_key),
             "end_key" => log_wrappers::Value::key(&end_key),
         );
-        let seq = self.engine.get_latest_sequence_number();
+        let seq = self.engines.kv.get_latest_sequence_number();
         self.pending_delete_ranges
             .insert(region_id, start_key, end_key, seq);
     }
@@ -535,7 +570,8 @@ where
             return;
         }
         let oldest_sequence = self
-            .engine
+            .engines
+            .kv
             .get_oldest_snapshot_sequence_number()
             .unwrap_or(u64::MAX);
         let mut region_ranges: Vec<(u64, Vec<u8>, Vec<u8>)> = self
@@ -559,7 +595,8 @@ where
             })
             .collect();
         // Clear sst files belonging to the given range directly.
-        self.engine
+        self.engines
+            .kv
             .delete_ranges_cfs(
                 &WriteOptions::default(),
                 DeleteStrategy::DeleteFiles,
@@ -569,6 +606,7 @@ where
                 error!("failed to delete files in range"; "err" => %e);
             })
             .unwrap();
+        fail_point!("after_delete_files_in_range", |_| {});
         // Remove all overlapped ranges directly without ingesting.
         if let Err(e) = self.delete_all_in_range(&ranges, true, false) {
             warn!("failed to cleanup stale range"; "err" => %e);
@@ -576,7 +614,8 @@ where
         }
         // Clear related blob files belonging to the given range directly after clearing
         // all stale keys in sst files.
-        self.engine
+        self.engines
+            .kv
             .delete_ranges_cfs(
                 &WriteOptions::default(),
                 DeleteStrategy::DeleteBlobs,
@@ -604,7 +643,12 @@ where
             if plain_file_used(cf) {
                 continue;
             }
-            if self.engine.ingest_maybe_slowdown_writes(cf).expect("cf") {
+            if self
+                .engines
+                .kv
+                .ingest_maybe_slowdown_writes(cf, 0)
+                .expect("cf")
+            {
                 return true;
             }
         }
@@ -618,7 +662,7 @@ where
         allow_write_during_ingestion: bool,
     ) -> Result<()> {
         let wopts = WriteOptions::default();
-        for cf in self.engine.cf_names() {
+        for cf in self.engines.kv.cf_names() {
             // CF_LOCK usually contains fewer keys than other CFs, so we delete them by key.
             let (strategy, observer) = if cf == CF_LOCK {
                 (
@@ -651,7 +695,11 @@ where
                 )
             };
             let start = Instant::now();
-            box_try!(self.engine.delete_ranges_cf(&wopts, cf, strategy, ranges));
+            box_try!(
+                self.engines
+                    .kv
+                    .delete_ranges_cf(&wopts, cf, strategy, ranges)
+            );
             observer.observe(start.saturating_elapsed_secs());
         }
 
@@ -713,7 +761,7 @@ where
             }
             if let Some(Task::Apply { region_id, .. }) = self.pending_applies.front() {
                 fail_point!("handle_new_pending_applies", |_| {});
-                if !self.engine.can_apply_snapshot(
+                if !self.engines.kv.can_apply_snapshot(
                     is_timeout,
                     new_batch,
                     *region_id,
@@ -740,12 +788,44 @@ where
         }
         SNAP_PENDING_APPLIES_GAUGE.set(self.pending_applies.len() as i64);
     }
+
+    fn handle_clear_peer_meta(
+        &mut self,
+        peer: Peer,
+        region: Region,
+        raft_state: RaftLocalState,
+        merge_state: Option<MergeState>,
+        initialized: bool,
+        local_first_replicate: bool,
+        first_index: u64,
+        // Holding lock to avoid apply worker applies split.
+        pending_create_peers: Arc<Mutex<HashMap<u64, (u64, bool)>>>,
+    ) -> RaftstoreResult<PeerClearMetaStat> {
+        info!(
+            "handle destroy peer in async mode";
+            "peer_id" => peer.get_id(),
+            "region_id" => region.get_id(),
+        );
+        clear_meta_in_kv_and_raft(
+            &self.engines,
+            peer,
+            region,
+            raft_state,
+            merge_state,
+            initialized,
+            local_first_replicate,
+            first_index,
+            self.store_meta.clone(),
+            pending_create_peers,
+        )
+    }
 }
 
-impl<EK, R> Runnable for Runner<EK, R>
+impl<EK, ER, R> Runnable for Runner<EK, ER, R>
 where
     EK: KvEngine,
-    R: CasualRouter<EK> + Send + Clone + 'static,
+    ER: RaftEngine,
+    R: RaftStoreRouter<EK> + 'static,
 {
     type Task = Task;
 
@@ -776,15 +856,62 @@ where
                 // there might be a coprocessor request related to this range
                 self.insert_pending_delete_range(region_id, start_key, end_key);
                 self.clean_stale_ranges();
+                fail_point!("after_region_worker_destroy");
+            }
+            Task::ClearPeerMeta {
+                peer,
+                region,
+                raft_state,
+                merge_state,
+                keep_data,
+                initialized,
+                local_first_replicate,
+                first_index,
+                pending_create_peers,
+            } => {
+                let peer_id = peer.get_id();
+                let region_id = region.get_id();
+                match self.handle_clear_peer_meta(
+                    peer,
+                    region,
+                    raft_state,
+                    merge_state,
+                    initialized,
+                    local_first_replicate,
+                    first_index,
+                    pending_create_peers,
+                ) {
+                    Err(e) => {
+                        // If not panic here, the peer will be recreated in the next restart,
+                        // then it will be gc again. But if some overlap region is created
+                        // before restarting, the gc action will delete the overlap region's
+                        // data too.
+                        panic!(
+                            "peer_id: {}, region_id: {} failed to destroy err {:?}",
+                            peer_id, region_id, e
+                        );
+                    }
+                    Ok(clear_stat) => {
+                        let _ = self.router.significant_send(
+                            region_id,
+                            SignificantMsg::ReadyToDestroyPeer {
+                                to_peer_id: peer_id,
+                                merged_by_target: keep_data,
+                                clear_stat,
+                            },
+                        );
+                    }
+                }
             }
         }
     }
 }
 
-impl<EK, R> RunnableWithTimer for Runner<EK, R>
+impl<EK, ER, R> RunnableWithTimer for Runner<EK, ER, R>
 where
     EK: KvEngine,
-    R: CasualRouter<EK> + Send + Clone + 'static,
+    ER: RaftEngine,
+    R: RaftStoreRouter<EK> + 'static,
 {
     fn on_timeout(&mut self) {
         self.handle_pending_applies(true);
@@ -805,20 +932,27 @@ pub(crate) mod tests {
     use std::{
         io,
         sync::{
+            Arc,
             atomic::{AtomicBool, AtomicUsize},
-            mpsc, Arc,
+            mpsc::{self, SyncSender},
         },
         thread,
         time::Duration,
     };
 
-    use engine_test::{ctor::CfOptions, kv::KvTestEngine};
+    use crossbeam::channel::TrySendError;
+    use engine_test::{
+        ctor::CfOptions,
+        kv::{KvTestEngine, KvTestSnapshot},
+    };
     use engine_traits::{
-        CompactExt, FlowControlFactorsExt, KvEngine, MiscExt, Mutable, Peekable,
-        RaftEngineReadOnly, SyncMutable, WriteBatch, WriteBatchExt, CF_DEFAULT, CF_WRITE,
+        CF_DEFAULT, CF_WRITE, CompactExt, FlowControlFactorsExt, KvEngine, MiscExt, Mutable,
+        Peekable, RaftEngineReadOnly, SyncMutable, WriteBatch, WriteBatchExt,
     };
     use keys::data_key;
-    use kvproto::raft_serverpb::{PeerState, RaftApplyState, RaftSnapshotData, RegionLocalState};
+    use kvproto::raft_serverpb::{
+        PeerState, RaftApplyState, RaftMessage, RaftSnapshotData, RegionLocalState,
+    };
     use pd_client::RpcClient;
     use protobuf::Message;
     use tempfile::Builder;
@@ -834,13 +968,73 @@ pub(crate) mod tests {
             ObserverContext,
         },
         store::{
+            CasualMessage, CasualRouter, PeerMsg, ProposalRouter, RaftCommand, SignificantRouter,
+            SnapKey, SnapManager, StoreMsg, StoreRouter,
             peer_storage::JOB_STATUS_PENDING,
             snap::tests::get_test_db_for_regions,
             worker::{RegionRunner, SnapGenRunner, SnapGenTask},
-            CasualMessage, SnapKey, SnapManager,
         },
     };
 
+    #[derive(Clone)]
+    pub struct TestRaftStoreRouter {
+        casual_msg_sender: SyncSender<(u64, CasualMessage<KvTestEngine>)>,
+        significant_msg_sender: SyncSender<SignificantMsg<KvTestSnapshot>>,
+    }
+
+    impl TestRaftStoreRouter {
+        pub fn new(
+            casual_msg_sender: SyncSender<(u64, CasualMessage<KvTestEngine>)>,
+            significant_msg_sender: SyncSender<SignificantMsg<KvTestSnapshot>>,
+        ) -> TestRaftStoreRouter {
+            TestRaftStoreRouter {
+                casual_msg_sender,
+                significant_msg_sender,
+            }
+        }
+    }
+
+    impl CasualRouter<KvTestEngine> for TestRaftStoreRouter {
+        fn send(&self, id: u64, msg: CasualMessage<KvTestEngine>) -> RaftstoreResult<()> {
+            let _ = self.casual_msg_sender.send((id, msg));
+            Ok(())
+        }
+    }
+
+    impl SignificantRouter<KvTestEngine> for TestRaftStoreRouter {
+        fn significant_send(
+            &self,
+            _: u64,
+            msg: SignificantMsg<KvTestSnapshot>,
+        ) -> RaftstoreResult<()> {
+            let _ = self.significant_msg_sender.send(msg);
+            Ok(())
+        }
+    }
+
+    impl ProposalRouter<KvTestSnapshot> for TestRaftStoreRouter {
+        fn send(
+            &self,
+            _: RaftCommand<KvTestSnapshot>,
+        ) -> std::result::Result<(), TrySendError<RaftCommand<KvTestSnapshot>>> {
+            Ok(())
+        }
+    }
+
+    impl StoreRouter<KvTestEngine> for TestRaftStoreRouter {
+        fn send(&self, _: StoreMsg<KvTestEngine>) -> RaftstoreResult<()> {
+            Ok(())
+        }
+    }
+
+    impl RaftStoreRouter<KvTestEngine> for TestRaftStoreRouter {
+        fn send_raft_msg(&self, _: RaftMessage) -> RaftstoreResult<()> {
+            Ok(())
+        }
+
+        fn broadcast_normal(&self, _: impl FnMut() -> PeerMsg<KvTestEngine>) {}
+    }
+
     const PENDING_APPLY_CHECK_INTERVAL: Duration = Duration::from_millis(200);
     const STALE_PEER_CHECK_TICK: usize = 1;
 
@@ -948,10 +1142,13 @@ pub(crate) mod tests {
         let bg_worker = Worker::new("region-worker");
         let mut worker: LazyWorker<Task> = bg_worker.lazy_build("region-worker");
         let sched = worker.scheduler();
-        let (router, _) = mpsc::sync_channel(11);
+        let (casual_tx, _) = mpsc::sync_channel(11);
+        let (significant_tx, _) = mpsc::sync_channel(11);
+        let router = TestRaftStoreRouter::new(casual_tx, significant_tx);
         let cfg = make_raftstore_cfg(false);
         let mut runner = RegionRunner::new(
-            engine.kv.clone(),
+            engine.clone(),
+            Arc::new(Mutex::new(StoreMeta::new(1))),
             mgr,
             cfg,
             CoprocessorHost::<KvTestEngine>::default(),
@@ -1009,7 +1206,12 @@ pub(crate) mod tests {
             .register_apply_snapshot_observer(1, BoxApplySnapshotObserver::new(obs.clone()));
 
         let mut cf_opts = CfOptions::new();
+        // `ingest_maybe_slowdown_writes` uses `stop_writes_trigger` to check if ingest
+        // may cause a write stall. We also set `slowdown_writes_trigger` because
+        // RocksDB ignores `stop_writes_trigger` when it is smaller than
+        // `slowdown_writes_trigger`
         cf_opts.set_level_zero_slowdown_writes_trigger(5);
+        cf_opts.set_level_zero_stop_writes_trigger(5);
         cf_opts.set_disable_auto_compactions(true);
         let kv_cfs_opts = vec![
             (CF_DEFAULT, cf_opts.clone()),
@@ -1055,10 +1257,13 @@ pub(crate) mod tests {
         let bg_worker = Worker::new("snap-manager");
         let mut worker = bg_worker.lazy_build("snap-manager");
         let sched = worker.scheduler();
-        let (router, receiver) = mpsc::sync_channel(1);
+        let (casual_sender, casual_receiver) = mpsc::sync_channel(1);
+        let (significant_tx, _) = mpsc::sync_channel(1);
+        let router = TestRaftStoreRouter::new(casual_sender, significant_tx);
         let cfg = make_raftstore_cfg(true);
         let runner = RegionRunner::new(
-            engine.kv.clone(),
+            engine.clone(),
+            Arc::new(Mutex::new(StoreMeta::new(1))),
             mgr.clone(),
             cfg.clone(),
             host,
@@ -1100,7 +1305,7 @@ pub(crate) mod tests {
                 })
                 .unwrap();
             let s1 = rx.recv().unwrap();
-            match receiver.recv() {
+            match casual_receiver.recv() {
                 Ok((region_id, CasualMessage::SnapshotGenerated)) => {
                     assert_eq!(region_id, id);
                 }
@@ -1161,7 +1366,7 @@ pub(crate) mod tests {
 
         let wait_apply_finish = |ids: &[u64]| {
             for id in ids {
-                match receiver.recv_timeout(Duration::from_secs(5)) {
+                match casual_receiver.recv_timeout(Duration::from_secs(5)) {
                     Ok((region_id, CasualMessage::SnapshotApplied { .. })) => {
                         assert_eq!(region_id, *id);
                     }
diff --git a/components/raftstore/src/store/worker/snap_gen.rs b/components/raftstore/src/store/worker/snap_gen.rs
index b791ff6e9e1..f5a8c682aae 100644
--- a/components/raftstore/src/store/worker/snap_gen.rs
+++ b/components/raftstore/src/store/worker/snap_gen.rs
@@ -3,11 +3,10 @@
 use std::{
     fmt::{self, Display, Formatter},
     sync::{
+        Arc,
         atomic::{AtomicBool, Ordering},
         mpsc::SyncSender,
-        Arc,
     },
-    u64,
 };
 
 use collections::HashMap;
@@ -25,7 +24,7 @@ use tikv_util::{
 };
 
 use super::metrics::*;
-use crate::store::{self, snap::Result, transport::CasualRouter, CasualMessage, SnapManager};
+use crate::store::{self, CasualMessage, SnapManager, snap::Result, transport::CasualRouter};
 
 pub const SNAP_GENERATOR_MAX_POOL_SIZE: usize = 16;
 
@@ -221,7 +220,7 @@ where
                     if let Some(is_tiflash) = self.tiflash_stores.get(&to_store_id) {
                         allow_multi_files_snapshot = !is_tiflash;
                     } else {
-                        let is_tiflash = self.pd_client.as_ref().map_or(false, |pd_client| {
+                        let is_tiflash = self.pd_client.as_ref().is_some_and(|pd_client| {
                             if let Ok(s) = pd_client.get_store(to_store_id) {
                                 return s.get_labels().iter().any(|label| {
                                     label.get_key().to_lowercase() == ENGINE
diff --git a/components/raftstore/src/store/worker/split_check.rs b/components/raftstore/src/store/worker/split_check.rs
index ce2b2a6d10f..1eba283159a 100644
--- a/components/raftstore/src/store/worker/split_check.rs
+++ b/components/raftstore/src/store/worker/split_check.rs
@@ -2,14 +2,15 @@
 
 use std::{
     cmp::Ordering,
-    collections::BinaryHeap,
+    collections::{BTreeMap, BinaryHeap},
     fmt::{self, Display, Formatter},
     mem,
     sync::Arc,
 };
 
 use engine_traits::{
-    CfName, IterOptions, Iterable, Iterator, KvEngine, TabletRegistry, CF_WRITE, LARGE_CFS,
+    CF_WRITE, CfName, CompactedEvent, IterOptions, Iterable, Iterator, KvEngine, LARGE_CFS,
+    TabletRegistry,
 };
 use file_system::{IoType, WithIoType};
 use itertools::Itertools;
@@ -20,18 +21,20 @@ use kvproto::{
 use online_config::{ConfigChange, OnlineConfig};
 use pd_client::{BucketMeta, BucketStat};
 use tikv_util::{
-    box_err, debug, error, info, keybuilder::KeyBuilder, warn, worker::Runnable, Either,
+    Either, box_err, debug, error, info, keybuilder::KeyBuilder, warn, worker::Runnable,
 };
 use txn_types::Key;
 
 use super::metrics::*;
 use crate::{
+    Result,
     coprocessor::{
+        Config, CoprocessorHost, SplitCheckerHost,
         dispatcher::StoreHandle,
+        region_info_accessor::RegionInfoProvider,
         split_observer::{is_valid_split_key, strip_timestamp_if_exists},
-        Config, CoprocessorHost, SplitCheckerHost,
     },
-    Result,
+    store::metrics::{COMPACTION_DECLINED_BYTES, COMPACTION_RELATED_REGION_COUNT},
 };
 
 #[derive(PartialEq, Eq)]
@@ -365,7 +368,10 @@ impl BucketStatsInfo {
     }
 }
 
-pub enum Task {
+pub enum Task<EK>
+where
+    EK: KvEngine,
+{
     SplitCheckTask {
         region: Region,
         start_key: Option<Vec<u8>>,
@@ -376,17 +382,25 @@ pub enum Task {
     },
     ApproximateBuckets(Region),
     ChangeConfig(ConfigChange),
+    // Compaction finished event
+    CompactedEvent {
+        event: EK::CompactedEvent,
+        region_split_check_diff: u64,
+    },
     #[cfg(any(test, feature = "testexport"))]
     Validate(Box<dyn FnOnce(&Config) + Send>),
 }
 
-impl Task {
+impl<EK> Task<EK>
+where
+    EK: KvEngine,
+{
     pub fn split_check(
         region: Region,
         auto_split: bool,
         policy: CheckPolicy,
         bucket_ranges: Option<Vec<BucketRange>>,
-    ) -> Task {
+    ) -> Self {
         Task::SplitCheckTask {
             region,
             start_key: None,
@@ -404,7 +418,7 @@ impl Task {
         auto_split: bool,
         policy: CheckPolicy,
         bucket_ranges: Option<Vec<BucketRange>>,
-    ) -> Task {
+    ) -> Self {
         Task::SplitCheckTask {
             region,
             start_key,
@@ -416,7 +430,10 @@ impl Task {
     }
 }
 
-impl Display for Task {
+impl<EK> Display for Task<EK>
+where
+    EK: KvEngine,
+{
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
             Task::SplitCheckTask {
@@ -434,6 +451,9 @@ impl Display for Task {
                 auto_split
             ),
             Task::ChangeConfig(_) => write!(f, "[split check worker] Change Config Task"),
+            Task::CompactedEvent { .. } => {
+                write!(f, "[split check worker] Compaction finished Event")
+            }
             #[cfg(any(test, feature = "testexport"))]
             Task::Validate(_) => write!(f, "[split check worker] Validate config"),
             Task::ApproximateBuckets(_) => write!(f, "[split check worker] Approximate buckets"),
@@ -447,14 +467,21 @@ pub struct Runner<EK: KvEngine, S> {
     engine: Either<EK, TabletRegistry<EK>>,
     router: S,
     coprocessor: CoprocessorHost<EK>,
+    region_info_provider: Option<Arc<dyn RegionInfoProvider>>,
 }
 
 impl<EK: KvEngine, S: StoreHandle> Runner<EK, S> {
-    pub fn new(engine: EK, router: S, coprocessor: CoprocessorHost<EK>) -> Runner<EK, S> {
+    pub fn new(
+        engine: EK,
+        router: S,
+        coprocessor: CoprocessorHost<EK>,
+        region_info_provider: Option<Arc<dyn RegionInfoProvider>>,
+    ) -> Runner<EK, S> {
         Runner {
             engine: Either::Left(engine),
             router,
             coprocessor,
+            region_info_provider,
         }
     }
 
@@ -462,11 +489,13 @@ impl<EK: KvEngine, S: StoreHandle> Runner<EK, S> {
         registry: TabletRegistry<EK>,
         router: S,
         coprocessor: CoprocessorHost<EK>,
+        region_info_provider: Option<Arc<dyn RegionInfoProvider>>,
     ) -> Runner<EK, S> {
         Runner {
             engine: Either::Right(registry),
             router,
             coprocessor,
+            region_info_provider,
         }
     }
 
@@ -876,6 +905,49 @@ impl<EK: KvEngine, S: StoreHandle> Runner<EK, S> {
         Ok(split_keys)
     }
 
+    fn on_compaction_finished(&self, event: EK::CompactedEvent, region_split_check_diff: u64) {
+        if self.region_info_provider.is_none()
+            || event.is_size_declining_trivial(region_split_check_diff)
+        {
+            return;
+        }
+
+        let output_level_str = event.output_level_label();
+        COMPACTION_DECLINED_BYTES
+            .with_label_values(&[&output_level_str])
+            .observe(event.total_bytes_declined() as f64);
+
+        let mut region_declined_bytes = {
+            // Get the target regions and convert the corresponding ranges into
+            // the target format. Then, calculate the influenced ranges.
+            let (start_key, end_key) = event.get_key_range();
+            if let Ok(regions) = self
+                .region_info_provider
+                .as_ref()
+                .unwrap()
+                .get_regions_in_range(&start_key, &end_key)
+            {
+                let mut ranges = BTreeMap::<Vec<u8>, u64>::new();
+                regions.iter().for_each(|r| {
+                    ranges.insert(keys::enc_end_key(r), r.id);
+                });
+                // region_split_check_diff / 16 is an experienced value.
+                event.calc_ranges_declined_bytes(&ranges, region_split_check_diff / 16)
+            } else {
+                vec![]
+            }
+        };
+
+        COMPACTION_RELATED_REGION_COUNT
+            .with_label_values(&[&output_level_str])
+            .observe(region_declined_bytes.len() as f64);
+
+        for (region_id, declined_bytes) in region_declined_bytes.drain(..) {
+            self.router
+                .update_compaction_declined_bytes(region_id, declined_bytes);
+        }
+    }
+
     fn change_cfg(&mut self, change: ConfigChange) {
         if let Err(e) = self.coprocessor.cfg.update(change.clone()) {
             error!("update split check config failed"; "err" => ?e);
@@ -893,8 +965,8 @@ where
     EK: KvEngine,
     S: StoreHandle,
 {
-    type Task = Task;
-    fn run(&mut self, task: Task) {
+    type Task = Task<EK>;
+    fn run(&mut self, task: Task<EK>) {
         let _io_type_guard = WithIoType::new(IoType::LoadBalance);
         match task {
             Task::SplitCheckTask {
@@ -944,6 +1016,10 @@ where
                     }
                 }
             }
+            Task::CompactedEvent {
+                event,
+                region_split_check_diff,
+            } => self.on_compaction_finished(event, region_split_check_diff),
             #[cfg(any(test, feature = "testexport"))]
             Task::Validate(f) => f(&self.coprocessor.cfg),
         }
diff --git a/components/raftstore/src/store/worker/split_config.rs b/components/raftstore/src/store/worker/split_config.rs
index 2d29bd21a89..247a7c4754a 100644
--- a/components/raftstore/src/store/worker/split_config.rs
+++ b/components/raftstore/src/store/worker/split_config.rs
@@ -235,8 +235,8 @@ mod tests {
     use tikv_util::config::VersionTrack;
 
     use crate::store::{
-        worker::split_config::{get_sample_num, DEFAULT_SAMPLE_NUM},
         SplitConfig, SplitConfigManager,
+        worker::split_config::{DEFAULT_SAMPLE_NUM, get_sample_num},
     };
 
     #[test]
diff --git a/components/raftstore/src/store/worker/split_controller.rs b/components/raftstore/src/store/worker/split_controller.rs
index 0a6a19acc91..badef9ccc69 100644
--- a/components/raftstore/src/store/worker/split_controller.rs
+++ b/components/raftstore/src/store/worker/split_controller.rs
@@ -1,10 +1,10 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    cmp::{min, Ordering},
+    cmp::{Ordering, min},
     collections::{BinaryHeap, HashSet},
     slice::{Iter, IterMut},
-    sync::{mpsc::Receiver, Arc},
+    sync::{Arc, mpsc::Receiver},
     time::{Duration, SystemTime},
 };
 
@@ -21,7 +21,7 @@ use tikv_util::{
     config::Tracker,
     debug, info,
     metrics::ThreadInfoStatistics,
-    store::{is_read_query, QueryStats},
+    store::{QueryStats, is_read_query},
     time::Instant,
     warn,
 };
@@ -29,7 +29,7 @@ use tikv_util::{
 use crate::store::{
     metrics::*,
     util::build_key_range,
-    worker::{split_config::get_sample_num, FlowStatistics, SplitConfig, SplitConfigManager},
+    worker::{FlowStatistics, SplitConfig, SplitConfigManager, split_config::get_sample_num},
 };
 
 const DEFAULT_MAX_SAMPLE_LOOP_COUNT: usize = 10000;
@@ -1409,7 +1409,7 @@ mod tests {
                 region_id,
                 peer_id: 0,
                 key_ranges: vec![(key_range.start_key.clone(), key_range.end_key.clone())],
-                extra_attachment: vec![],
+                extra_attachment: Arc::new(vec![]),
             });
             raw_records.records.insert(
                 key_range_tag.clone(),
@@ -1417,6 +1417,10 @@ mod tests {
                     cpu_time: cpu_times[idx],
                     read_keys: 0,
                     write_keys: 0,
+                    network_in_bytes: 0,
+                    network_out_bytes: 0,
+                    logical_read_bytes: 0,
+                    logical_write_bytes: 0,
                 },
             );
         }
@@ -1840,14 +1844,14 @@ mod tests {
             region_id: 1,
             peer_id: 0,
             key_ranges: vec![(b"a".to_vec(), b"b".to_vec())],
-            extra_attachment: vec![],
+            extra_attachment: Arc::new(vec![]),
         });
         let cd_key_range_tag = Arc::new(TagInfos {
             store_id: 0,
             region_id: 1,
             peer_id: 0,
             key_ranges: vec![(b"c".to_vec(), b"d".to_vec())],
-            extra_attachment: vec![],
+            extra_attachment: Arc::new(vec![]),
         });
         let multiple_key_ranges_tag = Arc::new(TagInfos {
             store_id: 0,
@@ -1857,14 +1861,14 @@ mod tests {
                 (b"a".to_vec(), b"b".to_vec()),
                 (b"c".to_vec(), b"d".to_vec()),
             ],
-            extra_attachment: vec![],
+            extra_attachment: Arc::new(vec![]),
         });
         let empty_key_range_tag = Arc::new(TagInfos {
             store_id: 0,
             region_id: 1,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: vec![],
+            extra_attachment: Arc::new(vec![]),
         });
 
         let test_cases = vec![
@@ -1891,6 +1895,10 @@ mod tests {
                     cpu_time: test_case.0,
                     read_keys: 0,
                     write_keys: 0,
+                    network_in_bytes: 0,
+                    network_out_bytes: 0,
+                    logical_read_bytes: 0,
+                    logical_write_bytes: 0,
                 },
             );
             // ["c", "d"] with (test_case.1)ms CPU time.
@@ -1900,6 +1908,10 @@ mod tests {
                     cpu_time: test_case.1,
                     read_keys: 0,
                     write_keys: 0,
+                    network_in_bytes: 0,
+                    network_out_bytes: 0,
+                    logical_read_bytes: 0,
+                    logical_write_bytes: 0,
                 },
             );
             // Multiple key ranges with (test_case.2)ms CPU time.
@@ -1909,6 +1921,10 @@ mod tests {
                     cpu_time: test_case.2,
                     read_keys: 0,
                     write_keys: 0,
+                    network_in_bytes: 0,
+                    network_out_bytes: 0,
+                    logical_read_bytes: 0,
+                    logical_write_bytes: 0,
                 },
             );
             // Empty key range with (test_case.3)ms CPU time.
@@ -1918,6 +1934,10 @@ mod tests {
                     cpu_time: test_case.3,
                     read_keys: 0,
                     write_keys: 0,
+                    network_in_bytes: 0,
+                    network_out_bytes: 0,
+                    logical_read_bytes: 0,
+                    logical_write_bytes: 0,
                 },
             );
 
diff --git a/components/resolved_ts/src/advance.rs b/components/resolved_ts/src/advance.rs
index a20e5c6b80d..00c69c89ad0 100644
--- a/components/resolved_ts/src/advance.rs
+++ b/components/resolved_ts/src/advance.rs
@@ -4,8 +4,8 @@ use std::{
     cmp,
     ffi::CString,
     sync::{
-        atomic::{AtomicI32, Ordering},
         Arc,
+        atomic::{AtomicI32, Ordering},
     },
     time::Duration,
 };
@@ -14,7 +14,7 @@ use collections::{HashMap, HashSet};
 use concurrency_manager::ConcurrencyManager;
 use engine_traits::KvEngine;
 use fail::fail_point;
-use futures::{compat::Future01CompatExt, future::select_all, FutureExt, TryFutureExt};
+use futures::{FutureExt, TryFutureExt, compat::Future01CompatExt, future::select_all};
 use grpcio::{
     ChannelBuilder, CompressionAlgorithms, Environment, Error as GrpcError, RpcStatusCode,
 };
@@ -43,7 +43,7 @@ use tokio::{
 };
 use txn_types::TimeStamp;
 
-use crate::{endpoint::Task, metrics::*, TsSource};
+use crate::{TsSource, endpoint::Task, metrics::*};
 
 pub(crate) const DEFAULT_CHECK_LEADER_TIMEOUT_DURATION: Duration = Duration::from_secs(5); // 5s
 const DEFAULT_GRPC_GZIP_COMPRESSION_LEVEL: usize = 2;
@@ -590,8 +590,8 @@ impl RegionProgress {
 mod tests {
     use std::{
         sync::{
-            mpsc::{channel, Receiver, Sender},
             Arc,
+            mpsc::{Receiver, Sender, channel},
         },
         time::Duration,
     };
diff --git a/components/resolved_ts/src/cmd.rs b/components/resolved_ts/src/cmd.rs
index 7f6a36d9184..778d6d80643 100644
--- a/components/resolved_ts/src/cmd.rs
+++ b/components/resolved_ts/src/cmd.rs
@@ -336,18 +336,18 @@ mod tests {
         raft_cmdpb::{CmdType, Request},
     };
     use tikv::storage::{
+        Engine,
         kv::{MockEngineBuilder, TestEngineBuilder},
-        mvcc::{tests::write, Mutation, MvccTxn, SnapshotReader},
+        mvcc::{Mutation, MvccTxn, SnapshotReader, tests::write},
         txn::{
-            commands::one_pc_commit, prewrite, tests::*, CommitKind, TransactionKind,
-            TransactionProperties,
+            CommitKind, TransactionKind, TransactionProperties, commands::one_pc_commit, prewrite,
+            tests::*,
         },
-        Engine,
     };
     use tikv_kv::Modify;
     use txn_types::{Key, LockType, WriteType};
 
-    use super::{group_row_changes, ChangeLog, ChangeRow};
+    use super::{ChangeLog, ChangeRow, group_row_changes};
 
     #[test]
     fn test_cmd_encode() {
diff --git a/components/resolved_ts/src/endpoint.rs b/components/resolved_ts/src/endpoint.rs
index a02cdc8877e..da200b0b7f6 100644
--- a/components/resolved_ts/src/endpoint.rs
+++ b/components/resolved_ts/src/endpoint.rs
@@ -11,7 +11,7 @@ use std::{
 
 use concurrency_manager::ConcurrencyManager;
 use engine_traits::KvEngine;
-use futures::channel::oneshot::{channel, Receiver, Sender};
+use futures::channel::oneshot::{Receiver, Sender, channel};
 use grpcio::Environment;
 use kvproto::{kvrpcpb::LeaderInfo, metapb::Region, raft_cmdpb::AdminCmdType};
 use online_config::{self, ConfigChange, ConfigManager, OnlineConfig};
@@ -37,12 +37,12 @@ use tokio::sync::{Notify, Semaphore};
 use txn_types::{Key, TimeStamp};
 
 use crate::{
-    advance::{AdvanceTsWorker, LeadershipResolver, DEFAULT_CHECK_LEADER_TIMEOUT_DURATION},
+    Error, ON_DROP_WARN_HEAP_SIZE, Result, TsSource, TxnLocks,
+    advance::{AdvanceTsWorker, DEFAULT_CHECK_LEADER_TIMEOUT_DURATION, LeadershipResolver},
     cmd::{ChangeLog, ChangeRow},
     metrics::*,
     resolver::{LastAttempt, Resolver},
     scanner::{ScanEntries, ScanTask, ScannerPool},
-    Error, Result, TsSource, TxnLocks, ON_DROP_WARN_HEAP_SIZE,
 };
 
 /// grace period for identifying slow resolved-ts and safe-ts.
@@ -144,9 +144,8 @@ impl ResolverStatus {
         let locks = std::mem::take(locks);
         (
             *tracked_index,
-            locks.into_iter().map(|lock| {
+            locks.into_iter().inspect(|lock| {
                 memory_quota.free(lock.approximate_heap_size());
-                lock
             }),
         )
     }
@@ -479,7 +478,7 @@ where
                     }
                     stats.unresolved_count += 1;
                 }
-                ResolverStatus::Ready { .. } => {
+                ResolverStatus::Ready => {
                     stats.heap_size += observed_region.resolver.approximate_heap_bytes() as i64;
                     stats.resolved_count += 1;
                 }
@@ -728,7 +727,7 @@ where
 
     fn register_region(&mut self, region: Region, backoff: Option<Duration>) {
         let region_id = region.get_id();
-        assert!(self.regions.get(&region_id).is_none());
+        assert!(!self.regions.contains_key(&region_id));
         let Some(read_progress) = self.region_read_progress.get(&region_id) else {
             warn!("try register nonexistent region"; "region" => ?region);
             return;
diff --git a/components/resolved_ts/src/observer.rs b/components/resolved_ts/src/observer.rs
index 7421beaad85..48fad04a2b8 100644
--- a/components/resolved_ts/src/observer.rs
+++ b/components/resolved_ts/src/observer.rs
@@ -141,7 +141,7 @@ mod test {
     use engine_traits::{CF_DEFAULT, CF_LOCK, CF_WRITE};
     use kvproto::raft_cmdpb::*;
     use tikv::storage::kv::TestEngineBuilder;
-    use tikv_util::worker::{dummy_scheduler, ReceiverWrapper};
+    use tikv_util::worker::{ReceiverWrapper, dummy_scheduler};
 
     use super::*;
 
diff --git a/components/resolved_ts/src/resolver.rs b/components/resolved_ts/src/resolver.rs
index a90df0f5a1d..48599c45a88 100644
--- a/components/resolved_ts/src/resolver.rs
+++ b/components/resolved_ts/src/resolver.rs
@@ -704,7 +704,7 @@ mod tests {
         ];
 
         for (i, case) in cases.into_iter().enumerate() {
-            let memory_quota = Arc::new(MemoryQuota::new(std::usize::MAX));
+            let memory_quota = Arc::new(MemoryQuota::new(usize::MAX));
             let mut resolver = Resolver::new_for_test(1, memory_quota);
             for e in case.clone() {
                 match e {
@@ -754,7 +754,7 @@ mod tests {
 
     #[test]
     fn test_untrack_lock_shrink_ratio() {
-        let memory_quota = Arc::new(MemoryQuota::new(std::usize::MAX));
+        let memory_quota = Arc::new(MemoryQuota::new(usize::MAX));
         let mut resolver = Resolver::new_for_test(1, memory_quota);
         let mut key = vec![0; 16];
         let mut ts = TimeStamp::default();
@@ -809,7 +809,7 @@ mod tests {
 
     #[test]
     fn test_idempotent_track_and_untrack_lock() {
-        let memory_quota = Arc::new(MemoryQuota::new(std::usize::MAX));
+        let memory_quota = Arc::new(MemoryQuota::new(usize::MAX));
         let mut resolver = Resolver::new_for_test(1, memory_quota);
         let mut key = vec![0; 16];
 
@@ -883,7 +883,7 @@ mod tests {
 
     #[test]
     fn test_large_txn_tracking() {
-        let memory_quota = Arc::new(MemoryQuota::new(std::usize::MAX));
+        let memory_quota = Arc::new(MemoryQuota::new(usize::MAX));
         let txn_status_cache = Arc::new(TxnStatusCache::new(100));
         let mut resolver = Resolver::new(1, memory_quota, txn_status_cache.clone());
         let key1: Vec<u8> = vec![1, 2, 3, 4];
@@ -933,7 +933,7 @@ mod tests {
         // A later commit_ts must be strictly larger than resolved-ts. Equality is not
         // allowed. The case may not happen in real implementation, but we want
         // to ensure the correctness and robustness of every submodule.
-        let memory_quota = Arc::new(MemoryQuota::new(std::usize::MAX));
+        let memory_quota = Arc::new(MemoryQuota::new(usize::MAX));
         let txn_status_cache = Arc::new(TxnStatusCache::new(100));
         let mut resolver = Resolver::new(1, memory_quota, txn_status_cache.clone());
         let key: Vec<u8> = vec![1, 2, 3, 4];
diff --git a/components/resolved_ts/src/scanner.rs b/components/resolved_ts/src/scanner.rs
index 1a98ac001dd..9cdcf389cba 100644
--- a/components/resolved_ts/src/scanner.rs
+++ b/components/resolved_ts/src/scanner.rs
@@ -3,12 +3,12 @@
 use std::{marker::PhantomData, sync::Arc, time::Duration};
 
 use engine_traits::KvEngine;
-use futures::{channel::oneshot::Receiver, compat::Future01CompatExt, FutureExt};
+use futures::{FutureExt, channel::oneshot::Receiver, compat::Future01CompatExt};
 use kvproto::metapb::Region;
 use raftstore::{
     coprocessor::ObserveHandle,
     router::CdcHandle,
-    store::{fsm::ChangeObserver, msg::Callback, RegionSnapshot},
+    store::{RegionSnapshot, fsm::ChangeObserver, msg::Callback},
 };
 use tikv::storage::{
     kv::{ScanMode as MvccScanMode, Snapshot},
@@ -24,9 +24,9 @@ use tokio::{
 use txn_types::{Key, Lock, LockType, TimeStamp};
 
 use crate::{
+    Task,
     errors::{Error, Result},
     metrics::*,
-    Task,
 };
 
 const DEFAULT_SCAN_BATCH_SIZE: usize = 128;
diff --git a/components/resolved_ts/tests/failpoints/mod.rs b/components/resolved_ts/tests/failpoints/mod.rs
index 64b58e0ed22..a44956f9f93 100644
--- a/components/resolved_ts/tests/failpoints/mod.rs
+++ b/components/resolved_ts/tests/failpoints/mod.rs
@@ -3,7 +3,7 @@
 #[path = "../mod.rs"]
 mod testsuite;
 use std::{
-    sync::{mpsc::channel, Mutex},
+    sync::{Mutex, mpsc::channel},
     time::Duration,
 };
 
diff --git a/components/resolved_ts/tests/integrations/mod.rs b/components/resolved_ts/tests/integrations/mod.rs
index 75338517545..a2fee9d7fa8 100644
--- a/components/resolved_ts/tests/integrations/mod.rs
+++ b/components/resolved_ts/tests/integrations/mod.rs
@@ -9,7 +9,7 @@ use kvproto::{kvrpcpb::*, metapb::RegionEpoch};
 use pd_client::PdClient;
 use resolved_ts::Task;
 use tempfile::Builder;
-use test_raftstore::{sleep_ms, IsolationFilterFactory};
+use test_raftstore::{IsolationFilterFactory, sleep_ms};
 use test_sst_importer::*;
 pub use testsuite::*;
 use tikv_util::store::new_peer;
diff --git a/components/resolved_ts/tests/mod.rs b/components/resolved_ts/tests/mod.rs
index 90592de582b..96bb5f83770 100644
--- a/components/resolved_ts/tests/mod.rs
+++ b/components/resolved_ts/tests/mod.rs
@@ -8,7 +8,7 @@ use kvproto::{import_sstpb_grpc::ImportSstClient, kvrpcpb::*, tikvpb::TikvClient
 use online_config::ConfigValue;
 use resolved_ts::Task;
 use test_raftstore::*;
-use tikv_util::{config::ReadableDuration, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration};
 use txn_types::TimeStamp;
 
 static INIT: Once = Once::new();
diff --git a/components/resource_control/src/channel.rs b/components/resource_control/src/channel.rs
index eec0accc259..6bdb962707d 100644
--- a/components/resource_control/src/channel.rs
+++ b/components/resource_control/src/channel.rs
@@ -169,7 +169,7 @@ impl<T: Send + 'static> Receiver<T> {
 
 #[cfg(test)]
 mod tests {
-    use std::{thread, usize};
+    use std::thread;
 
     use test::Bencher;
 
diff --git a/components/resource_control/src/future.rs b/components/resource_control/src/future.rs
index a6eeea04f9f..8c53aec3cf7 100644
--- a/components/resource_control/src/future.rs
+++ b/components/resource_control/src/future.rs
@@ -207,7 +207,7 @@ pub async fn with_resource_limiter<F: Future>(
 
 #[cfg(all(test, feature = "failpoints"))]
 mod tests {
-    use std::sync::mpsc::{channel, Sender};
+    use std::sync::mpsc::{Sender, channel};
 
     use tikv_util::yatp_pool::{DefaultTicker, FuturePool, YatpPoolBuilder};
 
diff --git a/components/resource_control/src/lib.rs b/components/resource_control/src/lib.rs
index 55b0ee10f17..f1389978c0f 100644
--- a/components/resource_control/src/lib.rs
+++ b/components/resource_control/src/lib.rs
@@ -8,12 +8,12 @@ use pd_client::RpcClient;
 
 mod resource_group;
 pub use resource_group::{
-    ResourceConsumeType, ResourceController, ResourceGroupManager, MIN_PRIORITY_UPDATE_INTERVAL,
+    MIN_PRIORITY_UPDATE_INTERVAL, ResourceConsumeType, ResourceController, ResourceGroupManager,
 };
 pub use tikv_util::resource_control::*;
 
 mod future;
-pub use future::{with_resource_limiter, ControlledFuture};
+pub use future::{ControlledFuture, with_resource_limiter};
 
 #[cfg(test)]
 extern crate test;
@@ -29,9 +29,7 @@ pub mod config;
 mod resource_limiter;
 pub use resource_limiter::ResourceLimiter;
 use tikv_util::worker::Worker;
-use worker::{
-    GroupQuotaAdjustWorker, PriorityLimiterAdjustWorker, BACKGROUND_LIMIT_ADJUST_DURATION,
-};
+use worker::{BACKGROUND_LIMIT_ADJUST_DURATION, GroupQuotaAdjustWorker};
 
 mod metrics;
 pub mod worker;
@@ -57,10 +55,12 @@ pub fn start_periodic_tasks(
     // spawn a task to auto adjust background quota limiter and priority quota
     // limiter.
     let mut worker = GroupQuotaAdjustWorker::new(mgr.clone(), io_bandwidth);
-    let mut priority_worker = PriorityLimiterAdjustWorker::new(mgr.clone());
+    // We disable the priority worker by default because the current adjust
+    // algorithm is buggy. We may reenable it only we find a better algorithm.
+    // let mut priority_worker = PriorityLimiterAdjustWorker::new(mgr.clone());
     bg_worker.spawn_interval_task(BACKGROUND_LIMIT_ADJUST_DURATION, move || {
         worker.adjust_quota();
-        priority_worker.adjust();
+        // priority_worker.adjust();
     });
     // spawn a task to periodically upload resource usage statistics to PD.
     bg_worker.spawn_async_task(async move {
diff --git a/components/resource_control/src/resource_group.rs b/components/resource_control/src/resource_group.rs
index 1332ed1950d..533e037421f 100644
--- a/components/resource_control/src/resource_group.rs
+++ b/components/resource_control/src/resource_group.rs
@@ -5,14 +5,14 @@ use std::{
     cmp::{max, min},
     collections::HashSet,
     sync::{
-        atomic::{AtomicBool, AtomicU64, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, AtomicU64, Ordering},
     },
     time::Duration,
 };
 
 use collections::HashMap;
-use dashmap::{mapref::one::Ref, DashMap};
+use dashmap::{DashMap, mapref::one::Ref};
 use fail::fail_point;
 use kvproto::{
     kvrpcpb::{CommandPri, ResourceControlContext},
@@ -22,7 +22,7 @@ use parking_lot::{MappedRwLockReadGuard, RwLock, RwLockReadGuard};
 use tikv_util::{
     config::VersionTrack,
     info,
-    resource_control::{TaskMetadata, TaskPriority, DEFAULT_RESOURCE_GROUP_NAME},
+    resource_control::{DEFAULT_RESOURCE_GROUP_NAME, TaskMetadata, TaskPriority},
     time::Instant,
 };
 use yatp::queue::priority::TaskPriorityProvider;
@@ -277,7 +277,9 @@ impl ResourceGroupManager {
     // resource group.
     #[inline]
     fn enable_priority_limiter(&self) -> bool {
-        self.get_group_count() > 1
+        // TODO: reenable it once when we fix https://github.com/tikv/tikv/issues/18939
+        // self.get_group_count() > 1
+        false
     }
 
     // Always return the background resource limiter if any;
@@ -1086,7 +1088,7 @@ pub(crate) mod tests {
     #[cfg(feature = "failpoints")]
     #[test]
     fn test_reset_resource_group_vt_overflow() {
-        use rand::{thread_rng, RngCore};
+        use rand::{RngCore, thread_rng};
         let resource_manager = ResourceGroupManager::default();
         let resource_ctl = resource_manager.derive_controller("test_write".into(), false);
         let mut rng = thread_rng();
@@ -1263,24 +1265,5 @@ pub(crate) mod tests {
             &mgr.get_resource_limiter("test1", "stats", 0).unwrap(),
             &default_limiter
         ));
-        assert!(Arc::ptr_eq(
-            &mgr.get_resource_limiter("test1", "query", 0).unwrap(),
-            &mgr.priority_limiters[0]
-        ));
-        assert!(Arc::ptr_eq(
-            &mgr.get_resource_limiter("test1", "query", LOW_PRIORITY as u64)
-                .unwrap(),
-            &mgr.priority_limiters[2]
-        ));
-
-        assert!(Arc::ptr_eq(
-            &mgr.get_resource_limiter("default", "query", LOW_PRIORITY as u64)
-                .unwrap(),
-            &mgr.priority_limiters[2]
-        ));
-        assert!(Arc::ptr_eq(
-            &mgr.get_resource_limiter("unknown", "query", 0).unwrap(),
-            &mgr.priority_limiters[1]
-        ));
     }
 }
diff --git a/components/resource_control/src/service.rs b/components/resource_control/src/service.rs
index 87152c3a4d9..9317fbad06f 100644
--- a/components/resource_control/src/service.rs
+++ b/components/resource_control/src/service.rs
@@ -6,20 +6,20 @@ use std::{
     time::Duration,
 };
 
-use futures::{compat::Future01CompatExt, stream, StreamExt};
+use futures::{StreamExt, compat::Future01CompatExt, stream};
 use kvproto::{
     meta_storagepb::EventEventType,
     resource_manager::{ResourceGroup, TokenBucketRequest, TokenBucketsRequest},
 };
 use pd_client::{
+    Error as PdError, PdClient, RESOURCE_CONTROL_CONFIG_PATH,
+    RESOURCE_CONTROL_CONTROLLER_CONFIG_PATH, RpcClient,
     meta_storage::{Checked, Get, MetaStorageClient, Sourced, Watch},
-    Error as PdError, PdClient, RpcClient, RESOURCE_CONTROL_CONFIG_PATH,
-    RESOURCE_CONTROL_CONTROLLER_CONFIG_PATH,
 };
 use serde::{Deserialize, Serialize};
 use tikv_util::{error, info, timer::GLOBAL_TIMER_HANDLE, warn};
 
-use crate::{resource_limiter::ResourceType, ResourceGroupManager};
+use crate::{ResourceGroupManager, resource_limiter::ResourceType};
 
 #[derive(Clone)]
 pub struct ResourceManagerService {
@@ -335,11 +335,11 @@ pub mod tests {
     use file_system::IoBytes;
     use futures::executor::block_on;
     use pd_client::{
-        meta_storage::{Delete, Put},
         RpcClient,
+        meta_storage::{Delete, Put},
     };
     use protobuf::Message;
-    use test_pd::{mocker::MetaStorage, util::*, Server as MockServer};
+    use test_pd::{Server as MockServer, mocker::MetaStorage, util::*};
     use tikv_util::{config::ReadableDuration, worker::Builder};
 
     use crate::resource_group::tests::{
diff --git a/components/resource_control/src/worker.rs b/components/resource_control/src/worker.rs
index 4d85b147fbc..f2977862804 100644
--- a/components/resource_control/src/worker.rs
+++ b/components/resource_control/src/worker.rs
@@ -8,13 +8,13 @@ use std::{
     time::Duration,
 };
 
-use file_system::{fetch_io_bytes, IoBytes, IoType};
+use file_system::{IoBytes, IoType, fetch_io_bytes};
 use prometheus::Histogram;
 use strum::EnumCount;
 use tikv_util::{
     debug,
-    resource_control::{TaskPriority, DEFAULT_RESOURCE_GROUP_NAME},
-    sys::{cpu_time::ProcessStat, SysQuota},
+    resource_control::{DEFAULT_RESOURCE_GROUP_NAME, TaskPriority},
+    sys::{SysQuota, cpu_time::ProcessStat},
     time::Instant,
     warn,
     yatp_pool::metrics::YATP_POOL_SCHEDULE_WAIT_DURATION_VEC,
diff --git a/components/resource_metering/src/config.rs b/components/resource_metering/src/config.rs
index 090768a9493..66ee9a3600c 100644
--- a/components/resource_metering/src/config.rs
+++ b/components/resource_metering/src/config.rs
@@ -1,20 +1,24 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::error::Error;
+use std::{error::Error, sync::atomic::AtomicBool};
 
 use online_config::{ConfigChange, OnlineConfig};
 use serde_derive::{Deserialize, Serialize};
 use tikv_util::config::ReadableDuration;
 
 use crate::{
-    recorder::ConfigChangeNotifier as RecorderConfigChangeNotifier,
-    reporter::ConfigChangeNotifier as ReporterConfigChangeNotifier, AddressChangeNotifier,
+    AddressChangeNotifier, recorder::ConfigChangeNotifier as RecorderConfigChangeNotifier,
+    reporter::ConfigChangeNotifier as ReporterConfigChangeNotifier,
 };
 
 const MIN_PRECISION: ReadableDuration = ReadableDuration::millis(100);
 const MAX_PRECISION: ReadableDuration = ReadableDuration::hours(1);
 const MAX_MAX_RESOURCE_GROUPS: usize = 5_000;
 const MIN_REPORT_RECEIVER_INTERVAL: ReadableDuration = ReadableDuration::millis(500);
+const DEFAULT_ENABLE_NETWORK_IO_COLLECTION: bool = false;
+
+pub static ENABLE_NETWORK_IO_COLLECTION: AtomicBool =
+    AtomicBool::new(DEFAULT_ENABLE_NETWORK_IO_COLLECTION);
 
 /// Public configuration of resource metering module.
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, OnlineConfig)]
@@ -34,6 +38,9 @@ pub struct Config {
 
     /// Sampling window. (only for cpu module)
     pub precision: ReadableDuration,
+
+    /// Whether to collect network traffic and logical io
+    pub enable_network_io_collection: bool,
 }
 
 impl Default for Config {
@@ -43,6 +50,7 @@ impl Default for Config {
             report_receiver_interval: ReadableDuration::minutes(1),
             max_resource_groups: 100,
             precision: ReadableDuration::secs(1),
+            enable_network_io_collection: DEFAULT_ENABLE_NETWORK_IO_COLLECTION,
         }
     }
 }
@@ -139,6 +147,7 @@ mod tests {
             report_receiver_interval: ReadableDuration::minutes(1),
             max_resource_groups: 2000,
             precision: ReadableDuration::secs(1),
+            enable_network_io_collection: false,
         };
         cfg.validate().unwrap();
         let cfg = Config {
@@ -146,6 +155,7 @@ mod tests {
             report_receiver_interval: ReadableDuration::days(999), // invalid
             max_resource_groups: 2000,
             precision: ReadableDuration::secs(1),
+            enable_network_io_collection: false,
         };
         cfg.validate().unwrap_err();
         let cfg = Config {
@@ -153,6 +163,7 @@ mod tests {
             report_receiver_interval: ReadableDuration::minutes(1),
             max_resource_groups: usize::MAX, // invalid
             precision: ReadableDuration::secs(1),
+            enable_network_io_collection: false,
         };
         cfg.validate().unwrap_err();
         let cfg = Config {
@@ -160,6 +171,7 @@ mod tests {
             report_receiver_interval: ReadableDuration::minutes(1),
             max_resource_groups: 2000,
             precision: ReadableDuration::days(999), // invalid
+            enable_network_io_collection: false,
         };
         cfg.validate().unwrap_err();
     }
diff --git a/components/resource_metering/src/lib.rs b/components/resource_metering/src/lib.rs
index 3d837b35ba2..162f364acee 100644
--- a/components/resource_metering/src/lib.rs
+++ b/components/resource_metering/src/lib.rs
@@ -2,7 +2,6 @@
 
 // TODO(mornyx): crate doc.
 
-#![feature(hash_extract_if)]
 #![allow(internal_features)]
 #![feature(core_intrinsics)]
 
@@ -10,28 +9,29 @@ use std::{
     intrinsics::unlikely,
     pin::Pin,
     sync::{
-        atomic::Ordering::{Relaxed, SeqCst},
         Arc,
+        atomic::Ordering::{Relaxed, SeqCst},
     },
     task::{Context, Poll},
 };
 
 pub use collector::Collector;
-pub use config::{Config, ConfigManager};
+pub use config::{Config, ConfigManager, ENABLE_NETWORK_IO_COLLECTION};
 pub use model::*;
 pub use recorder::{
-    init_recorder, record_read_keys, record_write_keys, CollectorGuard, CollectorId,
-    CollectorRegHandle, ConfigChangeNotifier as RecorderConfigChangeNotifier, CpuRecorder,
-    Recorder, RecorderBuilder, SummaryRecorder,
+    CollectorGuard, CollectorId, CollectorRegHandle,
+    ConfigChangeNotifier as RecorderConfigChangeNotifier, CpuRecorder, Recorder, RecorderBuilder,
+    SummaryRecorder, init_recorder, record_logical_read_bytes, record_logical_write_bytes,
+    record_network_in_bytes, record_network_out_bytes, record_read_keys, record_write_keys,
 };
 use recorder::{LocalStorage, LocalStorageRef, STORAGE};
 pub use reporter::{
+    ConfigChangeNotifier as ReporterConfigChangeNotifier, Reporter, Task,
     data_sink::DataSink,
     data_sink_reg::DataSinkRegHandle,
     init_reporter,
     pubsub::PubSubService,
-    single_target::{init_single_target, AddressChangeNotifier, SingleTargetDataSink},
-    ConfigChangeNotifier as ReporterConfigChangeNotifier, Reporter, Task,
+    single_target::{AddressChangeNotifier, SingleTargetDataSink, init_single_target},
 };
 use tikv_util::{
     memory::HeapSize,
@@ -147,7 +147,10 @@ impl Drop for Guard {
                 return;
             }
             let cur_record = ls.summary_cur_record.take_and_reset();
-            if cur_record.read_keys.load(Relaxed) == 0 && cur_record.write_keys.load(Relaxed) == 0 {
+            if cur_record.read_keys.load(Relaxed) == 0
+                && cur_record.logical_read_bytes.load(Relaxed) == 0
+                && cur_record.logical_write_bytes.load(Relaxed) == 0
+            {
                 return;
             }
             let mut records = ls.summary_records.lock().unwrap();
@@ -296,7 +299,7 @@ pub struct TagInfos {
     pub peer_id: u64,
     // Only a read request contains the key ranges.
     pub key_ranges: Vec<(Vec<u8>, Vec<u8>)>,
-    pub extra_attachment: Vec<u8>,
+    pub extra_attachment: Arc<Vec<u8>>,
 }
 
 impl TagInfos {
@@ -307,7 +310,7 @@ impl TagInfos {
             peer_id: peer.get_id(),
             region_id: context.get_region_id(),
             key_ranges: vec![],
-            extra_attachment: Vec::from(context.get_resource_group_tag()),
+            extra_attachment: Arc::new(Vec::from(context.get_resource_group_tag())),
         }
     }
 
@@ -322,7 +325,7 @@ impl TagInfos {
             peer_id: peer.get_id(),
             region_id: context.get_region_id(),
             key_ranges,
-            extra_attachment: Vec::from(context.get_resource_group_tag()),
+            extra_attachment: Arc::new(Vec::from(context.get_resource_group_tag())),
         }
     }
 }
@@ -349,7 +352,7 @@ mod tests {
                     region_id: 2,
                     peer_id: 3,
                     key_ranges: vec![],
-                    extra_attachment: b"12345".to_vec(),
+                    extra_attachment: Arc::new(b"12345".to_vec()),
                 }),
                 resource_tag_factory,
             };
diff --git a/components/resource_metering/src/model.rs b/components/resource_metering/src/model.rs
index 07396bbec50..fffcd109dfd 100644
--- a/components/resource_metering/src/model.rs
+++ b/components/resource_metering/src/model.rs
@@ -2,21 +2,200 @@
 
 use std::{
     cell::Cell,
+    hash::Hash,
     sync::{
-        atomic::{AtomicU32, Ordering::Relaxed},
         Arc,
+        atomic::{AtomicU32, AtomicU64, Ordering::Relaxed},
     },
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
 
 use collections::HashMap;
-use kvproto::resource_usage_agent::{GroupTagRecord, GroupTagRecordItem, ResourceUsageRecord};
+use kvproto::resource_usage_agent::{
+    GroupTagRecord, GroupTagRecordItem, RegionRecord, ResourceUsageRecord,
+};
 use tikv_util::warn;
 
 use crate::TagInfos;
 
 thread_local! {
-    static STATIC_BUF: Cell<Vec<u32>> = const {Cell::new(vec![])};
+    static STATIC_CPU_BUF: Cell<Vec<u32>> = const {Cell::new(vec![])};
+    static STATIC_NETWORK_BUF: Cell<Vec<u64>> = const {Cell::new(vec![])};
+    static STATIC_LOGICAL_IO_BUF: Cell<Vec<u64>> = const {Cell::new(vec![])};
+}
+
+/// Find the kth values in the iterator, returns (kth_cpu_time,
+/// kth_network_traffic, kth_logical_io)
+pub fn find_kth_values<'a, T: 'a>(
+    iter: impl Iterator<Item = (&'a T, &'a RawRecord)>,
+    k: usize,
+) -> (u32, u64, u64) {
+    let mut cpu_buf = STATIC_CPU_BUF.with(|b| b.take());
+    let mut network_buf = STATIC_NETWORK_BUF.with(|b| b.take());
+    let mut logical_io_buf = STATIC_LOGICAL_IO_BUF.with(|b| b.take());
+    cpu_buf.clear();
+    network_buf.clear();
+    logical_io_buf.clear();
+    for (_, record) in iter {
+        cpu_buf.push(record.cpu_time);
+        network_buf.push(record.network_in_bytes + record.network_out_bytes);
+        logical_io_buf.push(record.logical_read_bytes + record.logical_write_bytes);
+    }
+    pdqselect::select_by(&mut cpu_buf, k, |a, b| b.cmp(a));
+    let kth_cpu = cpu_buf[k];
+    STATIC_CPU_BUF.with(move |b| b.set(cpu_buf));
+
+    pdqselect::select_by(&mut network_buf, k, |a, b| b.cmp(a));
+    let kth_network = network_buf[k];
+    STATIC_NETWORK_BUF.with(move |b| b.set(network_buf));
+
+    pdqselect::select_by(&mut logical_io_buf, k, |a, b| b.cmp(a));
+    let kth_logical_io = logical_io_buf[k];
+    STATIC_LOGICAL_IO_BUF.with(move |b| b.set(logical_io_buf));
+
+    (kth_cpu, kth_network, kth_logical_io)
+}
+
+/// Find the kth cpu time in the iterator.
+pub fn find_kth_cpu_time<'a, T: 'a>(
+    iter: impl Iterator<Item = (&'a T, &'a RawRecord)>,
+    k: usize,
+) -> u32 {
+    let mut buf = STATIC_CPU_BUF.with(|b| b.take());
+    buf.clear();
+    for (_, record) in iter {
+        buf.push(record.cpu_time);
+    }
+    pdqselect::select_by(&mut buf, k, |a, b| b.cmp(a));
+    let kth = buf[k];
+    STATIC_CPU_BUF.with(move |b| b.set(buf));
+    kth
+}
+
+/// Get two iterators: first is the one whose cpu_time > kth_cpu,
+/// second is the one whose cpu_time <= kth_cpu.
+pub fn get_iter_for_cpu_time<'a, T: 'a>(
+    records: &'a HashMap<T, RawRecord>,
+    kth_cpu: u32,
+) -> (
+    impl Iterator<Item = (&'a T, &'a RawRecord)>,
+    impl Iterator<Item = (&'a T, &'a RawRecord)>,
+) {
+    (
+        records.iter().filter(move |(_, v)| v.cpu_time > kth_cpu),
+        records.iter().filter(move |(_, v)| v.cpu_time <= kth_cpu),
+    )
+}
+
+/// Get two iterators, first is the one whose cpu_time > kth_cpu or network_io >
+/// kth_network or logical_io > kth_logical_io, second is the one whose cpu_time
+/// <= kth_cpu and network_io <= kth_network and logical_io <= kth_logical_io.
+pub fn get_iter_for_cpu_network_io<'a, T: 'a>(
+    records: &'a HashMap<T, RawRecord>,
+    kth_cpu: u32,
+    kth_network: u64,
+    kth_logical_io: u64,
+) -> (
+    impl Iterator<Item = (&'a T, &'a RawRecord)>,
+    impl Iterator<Item = (&'a T, &'a RawRecord)>,
+) {
+    (
+        records.iter().filter(move |(_, v)| {
+            v.cpu_time > kth_cpu
+                || v.network_in_bytes + v.network_out_bytes > kth_network
+                || v.logical_read_bytes + v.logical_write_bytes > kth_logical_io
+        }),
+        records.iter().filter(move |(_, v)| {
+            v.cpu_time <= kth_cpu
+                && v.network_in_bytes + v.network_out_bytes <= kth_network
+                && v.logical_read_bytes + v.logical_write_bytes <= kth_logical_io
+        }),
+    )
+}
+
+/// Append raw_record to records[key] at timestamp ts.
+fn append_impl<T>(records: &mut HashMap<T, Record>, ts: u64, key: &T, raw_record: &RawRecord)
+where
+    T: Clone + Eq + Hash,
+{
+    let record_value = records.get_mut(key);
+    if record_value.is_none() {
+        records.insert(
+            key.clone(),
+            Record {
+                timestamps: vec![ts],
+                cpu_time_list: vec![raw_record.cpu_time],
+                read_keys_list: vec![raw_record.read_keys],
+                write_keys_list: vec![raw_record.write_keys],
+                total_cpu_time: raw_record.cpu_time,
+                logical_read_bytes_list: vec![raw_record.logical_read_bytes],
+                logical_write_bytes_list: vec![raw_record.logical_write_bytes],
+                network_in_bytes_list: vec![raw_record.network_in_bytes],
+                network_out_bytes_list: vec![raw_record.network_out_bytes],
+            },
+        );
+        return;
+    }
+    let record = record_value.unwrap();
+    record.total_cpu_time += raw_record.cpu_time;
+    if *record.timestamps.last().unwrap() == ts {
+        *record.cpu_time_list.last_mut().unwrap() += raw_record.cpu_time;
+        *record.read_keys_list.last_mut().unwrap() += raw_record.read_keys;
+        *record.write_keys_list.last_mut().unwrap() += raw_record.write_keys;
+        *record.logical_read_bytes_list.last_mut().unwrap() += raw_record.logical_read_bytes;
+        *record.logical_write_bytes_list.last_mut().unwrap() += raw_record.logical_write_bytes;
+        *record.network_in_bytes_list.last_mut().unwrap() += raw_record.network_in_bytes;
+        *record.network_out_bytes_list.last_mut().unwrap() += raw_record.network_out_bytes;
+    } else {
+        record.timestamps.push(ts);
+        record.cpu_time_list.push(raw_record.cpu_time);
+        record.read_keys_list.push(raw_record.read_keys);
+        record.write_keys_list.push(raw_record.write_keys);
+        record
+            .logical_read_bytes_list
+            .push(raw_record.logical_read_bytes);
+        record
+            .logical_write_bytes_list
+            .push(raw_record.logical_write_bytes);
+        record
+            .network_in_bytes_list
+            .push(raw_record.network_in_bytes);
+        record
+            .network_out_bytes_list
+            .push(raw_record.network_out_bytes);
+    }
+}
+
+/// Pick top n agged raw records, then append picked topN records and merge
+/// unpicked ones to others. If enable_network_io_collection is true, pick top n
+/// records by cpu_time, network_io and logical_io, otherwise, pick top n
+/// records by cpu_time only.
+pub fn handle_records_impl<'a, K, T>(
+    records: &'a mut T,
+    enable_network_io_collection: bool,
+    agg_map: &'a HashMap<K, crate::RawRecord>,
+    ts: u64,
+    n: usize,
+) where
+    T: AppendableRecords<K>,
+    K: Clone + Eq + Hash,
+{
+    if n >= agg_map.len() {
+        records.append(ts, agg_map.iter());
+        return;
+    }
+    if enable_network_io_collection {
+        let (kth_cpu, kth_network, kth_logical_io) = find_kth_values(agg_map.iter(), n);
+        let (picked_iter, unpicked_iter) =
+            get_iter_for_cpu_network_io(agg_map, kth_cpu, kth_network, kth_logical_io);
+        records.append(ts, picked_iter);
+        records.merge_other(ts, unpicked_iter);
+    } else {
+        let kth_cpu = find_kth_cpu_time(agg_map.iter(), n);
+        let (picked_iter, unpicked_iter) = get_iter_for_cpu_time(agg_map, kth_cpu);
+        records.append(ts, picked_iter);
+        records.merge_other(ts, unpicked_iter);
+    }
 }
 
 /// Raw resource statistics record.
@@ -25,6 +204,10 @@ pub struct RawRecord {
     pub cpu_time: u32, // ms
     pub read_keys: u32,
     pub write_keys: u32,
+    pub logical_read_bytes: u64,
+    pub logical_write_bytes: u64,
+    pub network_in_bytes: u64,
+    pub network_out_bytes: u64,
 }
 
 impl RawRecord {
@@ -32,11 +215,19 @@ impl RawRecord {
         self.cpu_time += other.cpu_time;
         self.read_keys += other.read_keys;
         self.write_keys += other.write_keys;
+        self.logical_read_bytes += other.logical_read_bytes;
+        self.logical_write_bytes += other.logical_write_bytes;
+        self.network_in_bytes += other.network_in_bytes;
+        self.network_out_bytes += other.network_out_bytes;
     }
 
     pub fn merge_summary(&mut self, r: &SummaryRecord) {
         self.read_keys += r.read_keys.load(Relaxed);
         self.write_keys += r.write_keys.load(Relaxed);
+        self.logical_read_bytes += r.logical_read_bytes.load(Relaxed);
+        self.logical_write_bytes += r.logical_write_bytes.load(Relaxed);
+        self.network_in_bytes += r.network_in_bytes.load(Relaxed);
+        self.network_out_bytes += r.network_out_bytes.load(Relaxed);
     }
 }
 
@@ -71,53 +262,53 @@ impl Default for RawRecords {
 }
 
 impl RawRecords {
-    /// Keep a maximum of `k` self.records and aggregate the others into
-    /// returned [RawRecord].
-    pub fn keep_top_k(&mut self, k: usize) -> RawRecord {
-        let mut others = RawRecord::default();
-        if self.records.len() <= k {
-            return others;
-        }
-        let mut buf = STATIC_BUF.with(|b| b.take());
-        buf.clear();
-        // Find kth top cpu time.
-        for record in self.records.values() {
-            buf.push(record.cpu_time);
-        }
-        pdqselect::select_by(&mut buf, k, |a, b| b.cmp(a));
-        let kth = buf[k];
-        // Evict records with cpu time less or equal than `kth`
-        let evicted_records = self.records.extract_if(|_, r| r.cpu_time <= kth);
-        // Record evicted into others
-        for (_, record) in evicted_records {
-            others.merge(&record);
+    /// Returns RawRecord aggregated by extra tag.
+    pub fn aggregate_by_extra_tag(&self) -> HashMap<Arc<Vec<u8>>, RawRecord> {
+        let mut raw_map: HashMap<Arc<Vec<u8>>, RawRecord> = HashMap::default();
+        for (tag_info, record) in self.records.iter() {
+            let tag = &tag_info.extra_attachment;
+            if tag.is_empty() {
+                continue;
+            }
+            let value = raw_map.get_mut(tag);
+            if value.is_none() {
+                raw_map.insert(tag.clone(), *record);
+                continue;
+            }
+            value.unwrap().merge(record);
         }
-        STATIC_BUF.with(move |b| b.set(buf));
-        others
+        raw_map
     }
-
-    /// Returns (TopK, Evicted).
-    /// It is caller's responsibility to ensure that k < records.len().
-    pub fn top_k(
+    /// Returns (RawRecord aggregated by extra tag, RawRecord aggregated by
+    /// region id). Merge these two aggregations together to save one
+    /// iteration.
+    pub fn aggregate_by_extra_tag_and_region(
         &self,
-        k: usize,
-    ) -> (
-        impl Iterator<Item = (&Arc<TagInfos>, &RawRecord)>,
-        impl Iterator<Item = (&Arc<TagInfos>, &RawRecord)>,
-    ) {
-        assert!(self.records.len() > k);
-        let mut buf = STATIC_BUF.with(|b| b.take());
-        buf.clear();
-        for record in self.records.values() {
-            buf.push(record.cpu_time);
+    ) -> (HashMap<Arc<Vec<u8>>, RawRecord>, HashMap<u64, RawRecord>) {
+        let mut raw_map: HashMap<Arc<Vec<u8>>, RawRecord> = HashMap::default();
+        let mut region_raw_map: HashMap<u64, RawRecord> = HashMap::default();
+        for (tag_info, record) in self.records.iter() {
+            let tag = &tag_info.extra_attachment;
+            if !tag.is_empty() {
+                let value = raw_map.get_mut(tag);
+                if let Some(val) = value {
+                    val.merge(record);
+                } else {
+                    raw_map.insert(tag.clone(), *record);
+                }
+            }
+
+            let region_id = tag_info.region_id;
+            if region_id != 0 {
+                let value = region_raw_map.get_mut(&region_id);
+                if let Some(val) = value {
+                    val.merge(record);
+                } else {
+                    region_raw_map.insert(region_id, *record);
+                }
+            }
         }
-        pdqselect::select_by(&mut buf, k, |a, b| b.cmp(a));
-        let kth = buf[k];
-        STATIC_BUF.with(move |b| b.set(buf));
-        (
-            self.records.iter().filter(move |(_, v)| v.cpu_time > kth),
-            self.records.iter().filter(move |(_, v)| v.cpu_time <= kth),
-        )
+        (raw_map, region_raw_map)
     }
 }
 
@@ -130,6 +321,10 @@ pub struct Record {
     pub cpu_time_list: Vec<u32>,
     pub read_keys_list: Vec<u32>,
     pub write_keys_list: Vec<u32>,
+    pub logical_read_bytes_list: Vec<u64>,
+    pub logical_write_bytes_list: Vec<u64>,
+    pub network_in_bytes_list: Vec<u64>,
+    pub network_out_bytes_list: Vec<u64>,
     pub total_cpu_time: u32,
 }
 
@@ -142,6 +337,10 @@ impl From<Record> for Vec<GroupTagRecordItem> {
             item.set_cpu_time_ms(record.cpu_time_list[n]);
             item.set_read_keys(record.read_keys_list[n]);
             item.set_write_keys(record.write_keys_list[n]);
+            item.set_logical_read_bytes(record.logical_read_bytes_list[n]);
+            item.set_logical_write_bytes(record.logical_write_bytes_list[n]);
+            item.set_network_in_bytes(record.network_in_bytes_list[n]);
+            item.set_network_out_bytes(record.network_out_bytes_list[n]);
             items.push(item);
         }
         items
@@ -153,9 +352,23 @@ impl Record {
         self.timestamps.len() == self.cpu_time_list.len()
             && self.timestamps.len() == self.read_keys_list.len()
             && self.timestamps.len() == self.write_keys_list.len()
+            && self.timestamps.len() == self.logical_read_bytes_list.len()
+            && self.timestamps.len() == self.logical_write_bytes_list.len()
+            && self.timestamps.len() == self.network_in_bytes_list.len()
+            && self.timestamps.len() == self.network_out_bytes_list.len()
     }
 }
 
+pub trait AppendableRecords<K> {
+    /// Append picked aggregated [RawRecords].
+    fn append<'a>(&mut self, ts: u64, iter: impl Iterator<Item = (&'a K, &'a RawRecord)>)
+    where
+        K: 'a;
+    /// Merge unpicked aggregated [RawRecords].
+    fn merge_other<'a>(&mut self, ts: u64, iter: impl Iterator<Item = (&'a K, &'a RawRecord)>)
+    where
+        K: 'a;
+}
 /// Resource statistics map.
 ///
 /// This structure is used for final aggregation in the [Reporter] and also
@@ -165,7 +378,7 @@ impl Record {
 /// [Client]: crate::client::Client
 #[derive(Debug, Default)]
 pub struct Records {
-    pub records: HashMap<Vec<u8>, Record>,
+    pub records: HashMap<Arc<Vec<u8>>, Record>,
     pub others: HashMap<u64, RawRecord>,
 }
 
@@ -179,7 +392,7 @@ impl From<Records> for Vec<ResourceUsageRecord> {
             }
             let items: Vec<GroupTagRecordItem> = record.into();
             let mut tag_record = GroupTagRecord::new();
-            tag_record.set_resource_group_tag(tag);
+            tag_record.set_resource_group_tag(tag.to_vec());
             tag_record.set_items(items.into());
             let mut r = ResourceUsageRecord::new();
             r.set_record(tag_record);
@@ -194,6 +407,10 @@ impl From<Records> for Vec<ResourceUsageRecord> {
                     cpu_time,
                     read_keys,
                     write_keys,
+                    logical_read_bytes,
+                    logical_write_bytes,
+                    network_in_bytes,
+                    network_out_bytes,
                 },
             ) in records.others
             {
@@ -202,6 +419,10 @@ impl From<Records> for Vec<ResourceUsageRecord> {
                 item.set_cpu_time_ms(cpu_time);
                 item.set_read_keys(read_keys);
                 item.set_write_keys(write_keys);
+                item.set_logical_read_bytes(logical_read_bytes);
+                item.set_logical_write_bytes(logical_write_bytes);
+                item.set_network_in_bytes(network_in_bytes);
+                item.set_network_out_bytes(network_out_bytes);
                 items.push(item);
             }
             let mut tag_record = GroupTagRecord::new();
@@ -215,12 +436,61 @@ impl From<Records> for Vec<ResourceUsageRecord> {
     }
 }
 
+impl AppendableRecords<Arc<Vec<u8>>> for Records {
+    fn append<'a>(
+        &mut self,
+        ts: u64,
+        iter: impl Iterator<Item = (&'a Arc<Vec<u8>>, &'a RawRecord)>,
+    ) {
+        // # Before
+        //
+        // ts: 1630464417
+        // records: | tag | cpu time |
+        //          | --- | -------- |
+        //          | t1  |  500     |
+        //          | t2  |  600     |
+        //          | t3  |  200     |
+
+        // # After
+        //
+        // t1: | ts       | ... | 1630464417 |
+        //     | cpu time | ... |    500     |
+        //     | total    | $total + 500     |
+        //
+        // t2: | ts       | ... | 1630464417 |
+        //     | cpu time | ... |    600     |
+        //     | total    | $total + 600     |
+        //
+        // t3: | ts       | ... | 1630464417 |
+        //     | cpu time | ... |    200     |
+        //     | total    | $total + 200     |
+
+        for (tag, raw_record) in iter {
+            if tag.is_empty() {
+                continue;
+            }
+            append_impl(&mut self.records, ts, tag, raw_record);
+        }
+    }
+
+    fn merge_other<'a>(
+        &mut self,
+        ts: u64,
+        iter: impl Iterator<Item = (&'a Arc<Vec<u8>>, &'a RawRecord)>,
+    ) {
+        let others = self.others.entry(ts).or_default();
+        iter.for_each(|(_, v)| {
+            others.merge(v);
+        });
+    }
+}
+
 impl Records {
-    /// Aggregates [RawRecords] into [Records].
+    /// Append aggregated [RawRecords] into [Records].
     pub fn append<'a>(
         &mut self,
         ts: u64,
-        iter: impl Iterator<Item = (&'a Arc<TagInfos>, &'a RawRecord)>,
+        iter: impl Iterator<Item = (&'a Arc<Vec<u8>>, &'a RawRecord)>,
     ) {
         // # Before
         //
@@ -230,7 +500,6 @@ impl Records {
         //          | t1  |  500     |
         //          | t2  |  600     |
         //          | t3  |  200     |
-        //          | t2  |  100     |
 
         // # After
         //
@@ -239,47 +508,142 @@ impl Records {
         //     | total    | $total + 500     |
         //
         // t2: | ts       | ... | 1630464417 |
-        //     | cpu time | ... |    700     |
-        //     | total    | $total + 700     |
+        //     | cpu time | ... |    600     |
+        //     | total    | $total + 600     |
         //
         // t3: | ts       | ... | 1630464417 |
         //     | cpu time | ... |    200     |
         //     | total    | $total + 200     |
 
         for (tag, raw_record) in iter {
-            let tag = &tag.extra_attachment;
             if tag.is_empty() {
                 continue;
             }
-            let record_value = self.records.get_mut(tag);
-            if record_value.is_none() {
-                self.records.insert(
-                    tag.clone(),
-                    Record {
-                        timestamps: vec![ts],
-                        cpu_time_list: vec![raw_record.cpu_time],
-                        read_keys_list: vec![raw_record.read_keys],
-                        write_keys_list: vec![raw_record.write_keys],
-                        total_cpu_time: raw_record.cpu_time,
-                    },
-                );
+            append_impl(&mut self.records, ts, tag, raw_record);
+        }
+    }
+
+    /// Clear all internal data.
+    pub fn clear(&mut self) {
+        self.records.clear();
+        self.others.clear();
+    }
+
+    /// Whether `Records` is empty.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.records.is_empty() && self.others.is_empty()
+    }
+}
+
+/// Resource statistics map.
+///
+/// This structure is used for final aggregation in the [Reporter] and also
+/// for uploading to the remote side through [Client].
+///
+/// [Reporter]: crate::reporter::CpuReporter
+/// [Client]: crate::client::Client
+#[derive(Debug, Default)]
+pub struct RegionRecords {
+    pub records: HashMap<u64, Record>,
+    pub others: HashMap<u64, RawRecord>,
+}
+
+impl From<RegionRecords> for Vec<ResourceUsageRecord> {
+    fn from(records: RegionRecords) -> Vec<ResourceUsageRecord> {
+        let mut res = Vec::with_capacity(records.records.len() + 1);
+        for (key, record) in records.records {
+            if !record.valid() {
+                warn!("invalid record"); // should not happen
                 continue;
             }
-            let record = record_value.unwrap();
-            record.total_cpu_time += raw_record.cpu_time;
-            if *record.timestamps.last().unwrap() == ts {
-                *record.cpu_time_list.last_mut().unwrap() += raw_record.cpu_time;
-                *record.read_keys_list.last_mut().unwrap() += raw_record.read_keys;
-                *record.write_keys_list.last_mut().unwrap() += raw_record.write_keys;
-            } else {
-                record.timestamps.push(ts);
-                record.cpu_time_list.push(raw_record.cpu_time);
-                record.read_keys_list.push(raw_record.read_keys);
-                record.write_keys_list.push(raw_record.write_keys);
+            let items: Vec<GroupTagRecordItem> = record.into();
+            let mut region_record = RegionRecord::new();
+            region_record.set_region_id(key);
+            region_record.set_items(items.into());
+            let mut r = ResourceUsageRecord::new();
+            r.set_region_record(region_record);
+            res.push(r);
+        }
+
+        if !records.others.is_empty() {
+            let mut items = Vec::with_capacity(records.others.len());
+            for (
+                ts,
+                RawRecord {
+                    cpu_time,
+                    read_keys,
+                    write_keys,
+                    logical_read_bytes,
+                    logical_write_bytes,
+                    network_in_bytes,
+                    network_out_bytes,
+                },
+            ) in records.others
+            {
+                let mut item = GroupTagRecordItem::new();
+                item.set_timestamp_sec(ts);
+                item.set_cpu_time_ms(cpu_time);
+                item.set_read_keys(read_keys);
+                item.set_write_keys(write_keys);
+                item.set_logical_read_bytes(logical_read_bytes);
+                item.set_logical_write_bytes(logical_write_bytes);
+                item.set_network_in_bytes(network_in_bytes);
+                item.set_network_out_bytes(network_out_bytes);
+                items.push(item);
             }
+            let mut region_record = RegionRecord::new();
+            region_record.set_items(items.into());
+            let mut r = ResourceUsageRecord::new();
+            r.set_region_record(region_record);
+            res.push(r);
         }
+
+        res
     }
+}
 
+impl AppendableRecords<u64> for RegionRecords {
+    fn append<'a>(&mut self, ts: u64, iter: impl Iterator<Item = (&'a u64, &'a RawRecord)>) {
+        // # Before
+        //
+        // ts: 1630464417
+        // records: | region_id | cpu time |
+        //          | --------- | -------- |
+        //          | 1         |  500     |
+        //          | 2         |  600     |
+        //          | 3         |  200     |
+
+        // # After
+        //
+        // 1:  | ts       | ... | 1630464417 |
+        //     | cpu time | ... |    500     |
+        //     | total    | $total + 500     |
+        //
+        // 2:  | ts       | ... | 1630464417 |
+        //     | cpu time | ... |    600     |
+        //     | total    | $total + 600     |
+        //
+        // 3:  | ts       | ... | 1630464417 |
+        //     | cpu time | ... |    200     |
+        //     | total    | $total + 200     |
+        for (region_id, raw_record) in iter {
+            if *region_id == 0 {
+                continue;
+            }
+            append_impl(&mut self.records, ts, region_id, raw_record);
+        }
+    }
+
+    fn merge_other<'a>(&mut self, ts: u64, iter: impl Iterator<Item = (&'a u64, &'a RawRecord)>) {
+        let others = self.others.entry(ts).or_default();
+        iter.for_each(|(_, v)| {
+            others.merge(v);
+        });
+    }
+}
+
+impl RegionRecords {
     /// Clear all internal data.
     pub fn clear(&mut self) {
         self.records.clear();
@@ -300,6 +664,19 @@ pub struct SummaryRecord {
 
     /// Number of keys that have been written.
     pub write_keys: AtomicU32,
+
+    /// Logical read bytes. TableScan executor's total read bytes recorded in
+    /// execution summary.
+    pub logical_read_bytes: AtomicU64,
+
+    /// Logical write bytes.
+    pub logical_write_bytes: AtomicU64,
+
+    /// Network input bytes.
+    pub network_in_bytes: AtomicU64,
+
+    /// Network output bytes.
+    pub network_out_bytes: AtomicU64,
 }
 
 impl Clone for SummaryRecord {
@@ -307,6 +684,10 @@ impl Clone for SummaryRecord {
         Self {
             read_keys: AtomicU32::new(self.read_keys.load(Relaxed)),
             write_keys: AtomicU32::new(self.write_keys.load(Relaxed)),
+            logical_read_bytes: AtomicU64::new(self.logical_read_bytes.load(Relaxed)),
+            logical_write_bytes: AtomicU64::new(self.logical_write_bytes.load(Relaxed)),
+            network_in_bytes: AtomicU64::new(self.network_in_bytes.load(Relaxed)),
+            network_out_bytes: AtomicU64::new(self.network_out_bytes.load(Relaxed)),
         }
     }
 }
@@ -316,6 +697,10 @@ impl SummaryRecord {
     pub fn reset(&self) {
         self.read_keys.store(0, Relaxed);
         self.write_keys.store(0, Relaxed);
+        self.logical_read_bytes.store(0, Relaxed);
+        self.logical_write_bytes.store(0, Relaxed);
+        self.network_in_bytes.store(0, Relaxed);
+        self.network_out_bytes.store(0, Relaxed);
     }
 
     /// Add two items.
@@ -324,6 +709,14 @@ impl SummaryRecord {
             .fetch_add(other.read_keys.load(Relaxed), Relaxed);
         self.write_keys
             .fetch_add(other.write_keys.load(Relaxed), Relaxed);
+        self.logical_read_bytes
+            .fetch_add(other.logical_read_bytes.load(Relaxed), Relaxed);
+        self.logical_write_bytes
+            .fetch_add(other.logical_write_bytes.load(Relaxed), Relaxed);
+        self.network_in_bytes
+            .fetch_add(other.network_in_bytes.load(Relaxed), Relaxed);
+        self.network_out_bytes
+            .fetch_add(other.network_out_bytes.load(Relaxed), Relaxed);
     }
 
     /// Gets the value and writes it to zero.
@@ -332,6 +725,10 @@ impl SummaryRecord {
         Self {
             read_keys: AtomicU32::new(self.read_keys.swap(0, Relaxed)),
             write_keys: AtomicU32::new(self.write_keys.swap(0, Relaxed)),
+            logical_read_bytes: AtomicU64::new(self.logical_read_bytes.swap(0, Relaxed)),
+            logical_write_bytes: AtomicU64::new(self.logical_write_bytes.swap(0, Relaxed)),
+            network_in_bytes: AtomicU64::new(self.network_in_bytes.swap(0, Relaxed)),
+            network_out_bytes: AtomicU64::new(self.network_out_bytes.swap(0, Relaxed)),
         }
     }
 }
@@ -348,26 +745,58 @@ mod tests {
         let record = SummaryRecord {
             read_keys: AtomicU32::new(1),
             write_keys: AtomicU32::new(2),
+            network_in_bytes: AtomicU64::new(10),
+            network_out_bytes: AtomicU64::new(20),
+            logical_read_bytes: AtomicU64::new(100),
+            logical_write_bytes: AtomicU64::new(200),
         };
         assert_eq!(record.read_keys.load(Relaxed), 1);
         assert_eq!(record.write_keys.load(Relaxed), 2);
+        assert_eq!(record.network_in_bytes.load(Relaxed), 10);
+        assert_eq!(record.network_out_bytes.load(Relaxed), 20);
+        assert_eq!(record.logical_read_bytes.load(Relaxed), 100);
+        assert_eq!(record.logical_write_bytes.load(Relaxed), 200);
         let record2 = record.clone();
         assert_eq!(record2.read_keys.load(Relaxed), 1);
         assert_eq!(record2.write_keys.load(Relaxed), 2);
+        assert_eq!(record2.network_in_bytes.load(Relaxed), 10);
+        assert_eq!(record2.network_out_bytes.load(Relaxed), 20);
+        assert_eq!(record2.logical_read_bytes.load(Relaxed), 100);
+        assert_eq!(record2.logical_write_bytes.load(Relaxed), 200);
         record.merge(&SummaryRecord {
             read_keys: AtomicU32::new(3),
             write_keys: AtomicU32::new(4),
+            network_in_bytes: AtomicU64::new(30),
+            network_out_bytes: AtomicU64::new(40),
+            logical_read_bytes: AtomicU64::new(300),
+            logical_write_bytes: AtomicU64::new(400),
         });
         assert_eq!(record.read_keys.load(Relaxed), 4);
         assert_eq!(record.write_keys.load(Relaxed), 6);
+        assert_eq!(record.network_in_bytes.load(Relaxed), 40);
+        assert_eq!(record.network_out_bytes.load(Relaxed), 60);
+        assert_eq!(record.logical_read_bytes.load(Relaxed), 400);
+        assert_eq!(record.logical_write_bytes.load(Relaxed), 600);
         let record2 = record.take_and_reset();
         assert_eq!(record.read_keys.load(Relaxed), 0);
         assert_eq!(record.write_keys.load(Relaxed), 0);
+        assert_eq!(record.network_in_bytes.load(Relaxed), 0);
+        assert_eq!(record.network_out_bytes.load(Relaxed), 0);
+        assert_eq!(record.logical_read_bytes.load(Relaxed), 0);
+        assert_eq!(record.logical_write_bytes.load(Relaxed), 0);
         assert_eq!(record2.read_keys.load(Relaxed), 4);
         assert_eq!(record2.write_keys.load(Relaxed), 6);
+        assert_eq!(record2.network_in_bytes.load(Relaxed), 40);
+        assert_eq!(record2.network_out_bytes.load(Relaxed), 60);
+        assert_eq!(record2.logical_read_bytes.load(Relaxed), 400);
+        assert_eq!(record2.logical_write_bytes.load(Relaxed), 600);
         record2.reset();
         assert_eq!(record2.read_keys.load(Relaxed), 0);
         assert_eq!(record2.write_keys.load(Relaxed), 0);
+        assert_eq!(record2.network_in_bytes.load(Relaxed), 0);
+        assert_eq!(record2.network_out_bytes.load(Relaxed), 0);
+        assert_eq!(record2.logical_read_bytes.load(Relaxed), 0);
+        assert_eq!(record2.logical_write_bytes.load(Relaxed), 0);
     }
 
     #[test]
@@ -377,21 +806,21 @@ mod tests {
             region_id: 0,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: b"a".to_vec(),
+            extra_attachment: Arc::new(b"a".to_vec()),
         });
         let tag2 = Arc::new(TagInfos {
             store_id: 0,
             region_id: 0,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: b"b".to_vec(),
+            extra_attachment: Arc::new(b"b".to_vec()),
         });
         let tag3 = Arc::new(TagInfos {
             store_id: 0,
             region_id: 0,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: b"c".to_vec(),
+            extra_attachment: Arc::new(b"c".to_vec()),
         });
         let mut records = Records::default();
         let mut raw_map = HashMap::default();
@@ -401,6 +830,10 @@ mod tests {
                 cpu_time: 111,
                 read_keys: 222,
                 write_keys: 333,
+                network_in_bytes: 1111,
+                network_out_bytes: 2222,
+                logical_read_bytes: 3333,
+                logical_write_bytes: 4444,
             },
         );
         raw_map.insert(
@@ -409,6 +842,10 @@ mod tests {
                 cpu_time: 444,
                 read_keys: 555,
                 write_keys: 666,
+                network_in_bytes: 4444,
+                network_out_bytes: 5555,
+                logical_read_bytes: 6666,
+                logical_write_bytes: 7777,
             },
         );
         raw_map.insert(
@@ -417,6 +854,10 @@ mod tests {
                 cpu_time: 777,
                 read_keys: 888,
                 write_keys: 999,
+                network_in_bytes: 7777,
+                network_out_bytes: 8888,
+                logical_read_bytes: 9999,
+                logical_write_bytes: 11110,
             },
         );
         let raw = RawRecords {
@@ -424,33 +865,34 @@ mod tests {
             duration: Duration::from_secs(1),
             records: raw_map,
         };
+        let agg_map = raw.aggregate_by_extra_tag();
         assert_eq!(records.records.len(), 0);
-        records.append(raw.begin_unix_time_secs, raw.records.iter());
+        records.append(raw.begin_unix_time_secs, agg_map.iter());
         assert_eq!(records.records.len(), 3);
     }
 
     #[test]
-    fn test_raw_records_top_k() {
+    fn test_raw_records_agg_and_top_k() {
         let tag1 = Arc::new(TagInfos {
             store_id: 0,
             region_id: 0,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: b"a".to_vec(),
+            extra_attachment: Arc::new(b"a".to_vec()),
         });
         let tag2 = Arc::new(TagInfos {
             store_id: 0,
             region_id: 0,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: b"b".to_vec(),
+            extra_attachment: Arc::new(b"b".to_vec()),
         });
         let tag3 = Arc::new(TagInfos {
             store_id: 0,
             region_id: 0,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: b"c".to_vec(),
+            extra_attachment: Arc::new(b"c".to_vec()),
         });
         let mut records = HashMap::default();
         records.insert(
@@ -459,6 +901,10 @@ mod tests {
                 cpu_time: 111,
                 read_keys: 222,
                 write_keys: 333,
+                network_in_bytes: 1111,
+                network_out_bytes: 2222,
+                logical_read_bytes: 3333,
+                logical_write_bytes: 4444,
             },
         );
         records.insert(
@@ -467,6 +913,10 @@ mod tests {
                 cpu_time: 444,
                 read_keys: 555,
                 write_keys: 666,
+                network_in_bytes: 4444,
+                network_out_bytes: 5555,
+                logical_read_bytes: 6666,
+                logical_write_bytes: 7777,
             },
         );
         records.insert(
@@ -475,6 +925,10 @@ mod tests {
                 cpu_time: 777,
                 read_keys: 888,
                 write_keys: 999,
+                network_in_bytes: 7777,
+                network_out_bytes: 8888,
+                logical_read_bytes: 9999,
+                logical_write_bytes: 11110,
             },
         );
         let rs = RawRecords {
@@ -482,7 +936,10 @@ mod tests {
             duration: Duration::from_secs(1),
             records,
         };
-        let (top, evicted) = rs.top_k(2);
+
+        let agg_map = rs.aggregate_by_extra_tag();
+        let kth = find_kth_cpu_time(agg_map.iter(), 2);
+        let (top, evicted) = get_iter_for_cpu_time(&agg_map, kth);
         let others = evicted
             .map(|(_, v)| v)
             .fold(RawRecord::default(), |mut others, r| {
@@ -493,7 +950,13 @@ mod tests {
         assert_eq!(others.cpu_time, 111);
         assert_eq!(others.read_keys, 222);
         assert_eq!(others.write_keys, 333);
-        let (top, evicted) = rs.top_k(0);
+        assert_eq!(others.network_in_bytes, 1111);
+        assert_eq!(others.network_out_bytes, 2222);
+        assert_eq!(others.logical_read_bytes, 3333);
+        assert_eq!(others.logical_write_bytes, 4444);
+
+        let kth = find_kth_cpu_time(agg_map.iter(), 0);
+        let (top, evicted) = get_iter_for_cpu_time(&agg_map, kth);
         // let top = top.collect::<Vec<(&Arc<TagInfos>, &RawRecord)>>();
         let others = evicted
             .map(|(_, v)| v)
@@ -505,6 +968,10 @@ mod tests {
         assert_eq!(others.cpu_time, 111 + 444 + 777);
         assert_eq!(others.read_keys, 222 + 555 + 888);
         assert_eq!(others.write_keys, 333 + 666 + 999);
+        assert_eq!(others.network_in_bytes, 1111 + 4444 + 7777);
+        assert_eq!(others.network_out_bytes, 2222 + 5555 + 8888);
+        assert_eq!(others.logical_read_bytes, 3333 + 6666 + 9999);
+        assert_eq!(others.logical_write_bytes, 4444 + 7777 + 11110);
     }
 
     // Issue: https://github.com/tikv/tikv/issues/12234
@@ -515,21 +982,21 @@ mod tests {
             region_id: 0,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: b"a".to_vec(),
+            extra_attachment: Arc::new(b"a".to_vec()),
         });
         let tag2 = Arc::new(TagInfos {
             store_id: 0,
             region_id: 0,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: b"b".to_vec(),
+            extra_attachment: Arc::new(b"b".to_vec()),
         });
         let tag3 = Arc::new(TagInfos {
             store_id: 0,
             region_id: 0,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: b"c".to_vec(),
+            extra_attachment: Arc::new(b"c".to_vec()),
         });
 
         // Keep cpu_time same for all tags.
@@ -544,6 +1011,10 @@ mod tests {
                 cpu_time: 111,
                 read_keys: 111,
                 write_keys: 111,
+                network_in_bytes: 111,
+                network_out_bytes: 111,
+                logical_read_bytes: 111,
+                logical_write_bytes: 111,
             },
         );
         raw_records.records.insert(
@@ -552,6 +1023,10 @@ mod tests {
                 cpu_time: 111,
                 read_keys: 111,
                 write_keys: 111,
+                network_in_bytes: 111,
+                network_out_bytes: 111,
+                logical_read_bytes: 111,
+                logical_write_bytes: 111,
             },
         );
         raw_records.records.insert(
@@ -560,12 +1035,21 @@ mod tests {
                 cpu_time: 111,
                 read_keys: 111,
                 write_keys: 111,
+                network_in_bytes: 111,
+                network_out_bytes: 111,
+                logical_read_bytes: 111,
+                logical_write_bytes: 111,
             },
         );
 
+        let agg_map = raw_records.aggregate_by_extra_tag();
+        let kth = find_kth_cpu_time(agg_map.iter(), 1);
         // top.len() == 0
         // evicted.len() == 3
-        let (top, evicted) = raw_records.top_k(1);
+        let (top, evicted) = (
+            agg_map.iter().filter(move |(_, v)| v.cpu_time > kth),
+            agg_map.iter().filter(move |(_, v)| v.cpu_time <= kth),
+        );
 
         let mut records = Records::default();
         records.append(0, top);
@@ -575,4 +1059,488 @@ mod tests {
         });
         assert!(!records.is_empty());
     }
+
+    #[test]
+    fn test_raw_records_agg() {
+        let tag1 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 0,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"a".to_vec()),
+        });
+        let tag2 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 0,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"b".to_vec()),
+        });
+        let tag3 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 0,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"c".to_vec()),
+        });
+        // tag4's extra tag is equal to tag1's
+        let tag4 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 2,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"a".to_vec()),
+        });
+        // tag5's extra tag is equal to tag1's
+        let tag5 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 3,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"a".to_vec()),
+        });
+        // tag6's extra tag is equal to tag2's
+        let tag6 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 5,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"b".to_vec()),
+        });
+        let mut records = HashMap::default();
+        records.insert(
+            tag1.clone(),
+            RawRecord {
+                cpu_time: 111,
+                read_keys: 222,
+                write_keys: 333,
+                network_in_bytes: 1111,
+                network_out_bytes: 2222,
+                logical_read_bytes: 3333,
+                logical_write_bytes: 4444,
+            },
+        );
+        records.insert(
+            tag2.clone(),
+            RawRecord {
+                cpu_time: 444,
+                read_keys: 555,
+                write_keys: 666,
+                network_in_bytes: 4444,
+                network_out_bytes: 5555,
+                logical_read_bytes: 6666,
+                logical_write_bytes: 7777,
+            },
+        );
+        records.insert(
+            tag3.clone(),
+            RawRecord {
+                cpu_time: 777,
+                read_keys: 888,
+                write_keys: 999,
+                network_in_bytes: 7777,
+                network_out_bytes: 8888,
+                logical_read_bytes: 9999,
+                logical_write_bytes: 11110,
+            },
+        );
+        records.insert(
+            tag4.clone(),
+            RawRecord {
+                cpu_time: 1110,
+                read_keys: 2220,
+                write_keys: 3330,
+                network_in_bytes: 11110,
+                network_out_bytes: 22220,
+                logical_read_bytes: 33330,
+                logical_write_bytes: 44440,
+            },
+        );
+        records.insert(
+            tag5.clone(),
+            RawRecord {
+                cpu_time: 4440,
+                read_keys: 5550,
+                write_keys: 6660,
+                network_in_bytes: 44440,
+                network_out_bytes: 55550,
+                logical_read_bytes: 66660,
+                logical_write_bytes: 77770,
+            },
+        );
+        records.insert(
+            tag6.clone(),
+            RawRecord {
+                cpu_time: 7770,
+                read_keys: 8880,
+                write_keys: 9990,
+                network_in_bytes: 77770,
+                network_out_bytes: 88880,
+                logical_read_bytes: 99990,
+                logical_write_bytes: 111110,
+            },
+        );
+        let rs = RawRecords {
+            begin_unix_time_secs: 1,
+            duration: Duration::from_secs(1),
+            records,
+        };
+
+        let agg_map = rs.aggregate_by_extra_tag();
+        assert_eq!(agg_map.len(), 3);
+        assert_eq!(
+            agg_map.get(&tag1.extra_attachment).unwrap().cpu_time,
+            111 + 1110 + 4440
+        );
+        assert_eq!(
+            agg_map.get(&tag1.extra_attachment).unwrap().read_keys,
+            222 + 2220 + 5550
+        );
+        assert_eq!(
+            agg_map.get(&tag1.extra_attachment).unwrap().write_keys,
+            333 + 3330 + 6660
+        );
+        assert_eq!(
+            agg_map
+                .get(&tag1.extra_attachment)
+                .unwrap()
+                .network_in_bytes,
+            1111 + 11110 + 44440
+        );
+        assert_eq!(
+            agg_map
+                .get(&tag1.extra_attachment)
+                .unwrap()
+                .network_out_bytes,
+            2222 + 22220 + 55550
+        );
+        assert_eq!(
+            agg_map
+                .get(&tag1.extra_attachment)
+                .unwrap()
+                .logical_read_bytes,
+            3333 + 33330 + 66660
+        );
+        assert_eq!(
+            agg_map
+                .get(&tag1.extra_attachment)
+                .unwrap()
+                .logical_write_bytes,
+            4444 + 44440 + 77770
+        );
+        assert_eq!(
+            agg_map.get(&tag2.extra_attachment).unwrap().cpu_time,
+            444 + 7770
+        );
+        assert_eq!(agg_map.get(&tag3.extra_attachment).unwrap().cpu_time, 777);
+    }
+
+    #[test]
+    fn test_raw_records_agg_by_region() {
+        let tag1 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 1,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"a".to_vec()),
+        });
+        let tag2 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 2,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"b".to_vec()),
+        });
+        let tag3 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 3,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"c".to_vec()),
+        });
+        // tag4's region_id is equal to tag1's
+        let tag4 = Arc::new(TagInfos {
+            store_id: 1,
+            region_id: 1,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"a".to_vec()),
+        });
+        // tag5's region_id is equal to tag1's
+        let tag5 = Arc::new(TagInfos {
+            store_id: 2,
+            region_id: 1,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"a".to_vec()),
+        });
+        // tag6's region_id is equal to tag2's
+        let tag6 = Arc::new(TagInfos {
+            store_id: 3,
+            region_id: 2,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"b".to_vec()),
+        });
+        let mut records = HashMap::default();
+        records.insert(
+            tag1.clone(),
+            RawRecord {
+                cpu_time: 111,
+                read_keys: 222,
+                write_keys: 333,
+                network_in_bytes: 1111,
+                network_out_bytes: 2222,
+                logical_read_bytes: 3333,
+                logical_write_bytes: 4444,
+            },
+        );
+        records.insert(
+            tag2.clone(),
+            RawRecord {
+                cpu_time: 444,
+                read_keys: 555,
+                write_keys: 666,
+                network_in_bytes: 4444,
+                network_out_bytes: 5555,
+                logical_read_bytes: 6666,
+                logical_write_bytes: 7777,
+            },
+        );
+        records.insert(
+            tag3.clone(),
+            RawRecord {
+                cpu_time: 777,
+                read_keys: 888,
+                write_keys: 999,
+                network_in_bytes: 7777,
+                network_out_bytes: 8888,
+                logical_read_bytes: 9999,
+                logical_write_bytes: 11110,
+            },
+        );
+        records.insert(
+            tag4.clone(),
+            RawRecord {
+                cpu_time: 1110,
+                read_keys: 2220,
+                write_keys: 3330,
+                network_in_bytes: 11110,
+                network_out_bytes: 22220,
+                logical_read_bytes: 33330,
+                logical_write_bytes: 44440,
+            },
+        );
+        records.insert(
+            tag5.clone(),
+            RawRecord {
+                cpu_time: 4440,
+                read_keys: 5550,
+                write_keys: 6660,
+                network_in_bytes: 44440,
+                network_out_bytes: 55550,
+                logical_read_bytes: 66660,
+                logical_write_bytes: 77770,
+            },
+        );
+        records.insert(
+            tag6.clone(),
+            RawRecord {
+                cpu_time: 7770,
+                read_keys: 8880,
+                write_keys: 9990,
+                network_in_bytes: 77770,
+                network_out_bytes: 88880,
+                logical_read_bytes: 99990,
+                logical_write_bytes: 111110,
+            },
+        );
+        let rs = RawRecords {
+            begin_unix_time_secs: 1,
+            duration: Duration::from_secs(1),
+            records,
+        };
+
+        let (_, agg_map) = rs.aggregate_by_extra_tag_and_region();
+        assert_eq!(agg_map.len(), 3);
+        assert_eq!(
+            agg_map.get(&tag1.region_id).unwrap().cpu_time,
+            111 + 1110 + 4440
+        );
+        assert_eq!(
+            agg_map.get(&tag1.region_id).unwrap().read_keys,
+            222 + 2220 + 5550
+        );
+        assert_eq!(
+            agg_map.get(&tag1.region_id).unwrap().write_keys,
+            333 + 3330 + 6660
+        );
+        assert_eq!(
+            agg_map.get(&tag1.region_id).unwrap().network_in_bytes,
+            1111 + 11110 + 44440
+        );
+        assert_eq!(
+            agg_map.get(&tag1.region_id).unwrap().network_out_bytes,
+            2222 + 22220 + 55550
+        );
+        assert_eq!(
+            agg_map.get(&tag1.region_id).unwrap().logical_read_bytes,
+            3333 + 33330 + 66660
+        );
+        assert_eq!(
+            agg_map.get(&tag1.region_id).unwrap().logical_write_bytes,
+            4444 + 44440 + 77770
+        );
+        assert_eq!(agg_map.get(&tag2.region_id).unwrap().cpu_time, 444 + 7770);
+        assert_eq!(agg_map.get(&tag3.region_id).unwrap().cpu_time, 777);
+    }
+
+    #[test]
+    fn test_pick_top_k_cpu_network_io() {
+        let tag1 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 0,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"a".to_vec()),
+        });
+        let tag2 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 0,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"b".to_vec()),
+        });
+        let tag3 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 0,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"c".to_vec()),
+        });
+        let mut records = HashMap::default();
+        // tag1 largest network
+        records.insert(
+            tag1,
+            RawRecord {
+                cpu_time: 111,
+                read_keys: 222,
+                write_keys: 333,
+                network_in_bytes: 9999,
+                network_out_bytes: 8888,
+                logical_read_bytes: 7777,
+                logical_write_bytes: 6666,
+            },
+        );
+        // tag2 largest logical io
+        records.insert(
+            tag2,
+            RawRecord {
+                cpu_time: 444,
+                read_keys: 555,
+                write_keys: 666,
+                network_in_bytes: 7777,
+                network_out_bytes: 6666,
+                logical_read_bytes: 9999,
+                logical_write_bytes: 9999,
+            },
+        );
+        // tag3 largest cpu
+        records.insert(
+            tag3,
+            RawRecord {
+                cpu_time: 777,
+                read_keys: 888,
+                write_keys: 999,
+                network_in_bytes: 1111,
+                network_out_bytes: 2222,
+                logical_read_bytes: 3333,
+                logical_write_bytes: 4444,
+            },
+        );
+        let rs = RawRecords {
+            begin_unix_time_secs: 1,
+            duration: Duration::from_secs(1),
+            records,
+        };
+
+        let agg_map = rs.aggregate_by_extra_tag();
+        let (kth_cpu, kth_network, kth_logical_io) = find_kth_values(agg_map.iter(), 2);
+        let (top, evicted) =
+            get_iter_for_cpu_network_io(&agg_map, kth_cpu, kth_network, kth_logical_io);
+        let others = evicted
+            .map(|(_, v)| v)
+            .fold(RawRecord::default(), |mut others, r| {
+                others.merge(r);
+                others
+            });
+        assert_eq!(top.count(), 3);
+        assert_eq!(others.cpu_time, 0);
+
+        // With unpicked tags
+        let tag4 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 0,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"d".to_vec()),
+        });
+        let tag5 = Arc::new(TagInfos {
+            store_id: 0,
+            region_id: 0,
+            peer_id: 0,
+            key_ranges: vec![],
+            extra_attachment: Arc::new(b"ad".to_vec()),
+        });
+        let mut records = rs.records.clone();
+        // tag4 won't be picked
+        records.insert(
+            tag4,
+            RawRecord {
+                cpu_time: 77,
+                read_keys: 88,
+                write_keys: 99,
+                network_in_bytes: 111,
+                network_out_bytes: 222,
+                logical_read_bytes: 333,
+                logical_write_bytes: 444,
+            },
+        );
+        // tag5 won't be picked
+        records.insert(
+            tag5,
+            RawRecord {
+                cpu_time: 66,
+                read_keys: 55,
+                write_keys: 44,
+                network_in_bytes: 11,
+                network_out_bytes: 22,
+                logical_read_bytes: 33,
+                logical_write_bytes: 44,
+            },
+        );
+        let rs = RawRecords {
+            begin_unix_time_secs: 1,
+            duration: Duration::from_secs(1),
+            records,
+        };
+        let agg_map = rs.aggregate_by_extra_tag();
+        let (kth_cpu, kth_network, kth_logical_io) = find_kth_values(agg_map.iter(), 2);
+        let (top, evicted) =
+            get_iter_for_cpu_network_io(&agg_map, kth_cpu, kth_network, kth_logical_io);
+        let others = evicted
+            .map(|(_, v)| v)
+            .fold(RawRecord::default(), |mut others, r| {
+                others.merge(r);
+                others
+            });
+        assert_eq!(top.count(), 3);
+        assert_eq!(others.cpu_time, 77 + 66);
+        assert_eq!(others.read_keys, 88 + 55);
+        assert_eq!(others.write_keys, 99 + 44);
+        assert_eq!(others.network_in_bytes, 111 + 11);
+        assert_eq!(others.network_out_bytes, 222 + 22);
+        assert_eq!(others.logical_read_bytes, 333 + 33);
+        assert_eq!(others.logical_write_bytes, 444 + 44);
+    }
 }
diff --git a/components/resource_metering/src/recorder/collector_reg.rs b/components/resource_metering/src/recorder/collector_reg.rs
index f166101dfe5..6d79a09c743 100644
--- a/components/resource_metering/src/recorder/collector_reg.rs
+++ b/components/resource_metering/src/recorder/collector_reg.rs
@@ -7,7 +7,7 @@ use tikv_util::{
     worker::{Scheduler, Worker},
 };
 
-use crate::{recorder::Task, Collector};
+use crate::{Collector, recorder::Task};
 
 /// `CollectorRegHandle` accepts registrations of [Collector].
 ///
diff --git a/components/resource_metering/src/recorder/localstorage.rs b/components/resource_metering/src/recorder/localstorage.rs
index c9f0b25b478..b8de99ebd17 100644
--- a/components/resource_metering/src/recorder/localstorage.rs
+++ b/components/resource_metering/src/recorder/localstorage.rs
@@ -2,14 +2,14 @@
 
 use std::{
     cell::RefCell,
-    sync::{atomic::AtomicBool, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::AtomicBool},
 };
 
 use collections::HashMap;
 use crossbeam::atomic::AtomicCell;
 use tikv_util::sys::thread::Pid;
 
-use crate::{model::SummaryRecord, TagInfos};
+use crate::{TagInfos, model::SummaryRecord};
 
 thread_local! {
     /// `STORAGE` is a thread-localized instance of [LocalStorage].
diff --git a/components/resource_metering/src/recorder/mod.rs b/components/resource_metering/src/recorder/mod.rs
index f0b2e88ee4e..ec37d9ab227 100644
--- a/components/resource_metering/src/recorder/mod.rs
+++ b/components/resource_metering/src/recorder/mod.rs
@@ -2,7 +2,7 @@
 
 use std::{
     fmt::{self, Display, Formatter},
-    sync::Arc,
+    sync::{Arc, atomic::Ordering::Relaxed},
     time::Duration,
 };
 
@@ -15,8 +15,10 @@ use tikv_util::{
 };
 
 use self::{collector_reg::CollectorReg, sub_recorder::SubRecorder};
-use crate::{collector::Collector, Config, RawRecords, ResourceTagFactory};
-
+use crate::{
+    Config, RawRecords, ResourceTagFactory, collector::Collector,
+    config::ENABLE_NETWORK_IO_COLLECTION,
+};
 mod collector_reg;
 mod localstorage;
 mod sub_recorder;
@@ -26,7 +28,10 @@ pub use self::{
     localstorage::{LocalStorage, LocalStorageRef, STORAGE},
     sub_recorder::{
         cpu::CpuRecorder,
-        summary::{record_read_keys, record_write_keys, SummaryRecorder},
+        summary::{
+            SummaryRecorder, record_logical_read_bytes, record_logical_write_bytes,
+            record_network_in_bytes, record_network_out_bytes, record_read_keys, record_write_keys,
+        },
     },
 };
 
@@ -123,6 +128,7 @@ impl Recorder {
 
     fn handle_config_change(&mut self, config: Config) {
         self.precision_ms = config.precision.as_millis();
+        ENABLE_NETWORK_IO_COLLECTION.store(config.enable_network_io_collection, Relaxed);
     }
 
     fn tick(&mut self) {
@@ -328,8 +334,8 @@ pub fn init_recorder(
 mod tests {
     use std::{
         sync::{
-            atomic::{AtomicUsize, Ordering::SeqCst},
             Mutex,
+            atomic::{AtomicUsize, Ordering::SeqCst},
         },
         thread::sleep,
     };
@@ -338,8 +344,8 @@ mod tests {
 
     use super::*;
     use crate::{
-        recorder::localstorage::{LocalStorage, LocalStorageRef},
         TagInfos,
+        recorder::localstorage::{LocalStorage, LocalStorageRef},
     };
 
     #[derive(Clone, Default)]
@@ -364,9 +370,14 @@ mod tests {
             records: &mut RawRecords,
             _thread_stores: &mut HashMap<Pid, LocalStorage>,
         ) {
-            let mut tag = TagInfos::default();
-            tag.extra_attachment.push(1);
-            records.records.entry(Arc::new(tag)).or_default().cpu_time = 2;
+            let tag = Arc::new(TagInfos {
+                store_id: 0,
+                region_id: 0,
+                peer_id: 0,
+                key_ranges: vec![],
+                extra_attachment: [1].to_vec().into(),
+            });
+            records.records.entry(tag).or_default().cpu_time = 2;
         }
 
         fn pause(
@@ -445,7 +456,7 @@ mod tests {
         assert_eq!(records.records.len(), 1);
         assert_eq!(
             &records.records.keys().next().unwrap().extra_attachment,
-            &[1]
+            &Arc::new([1].to_vec())
         );
 
         // deregister collector
@@ -510,7 +521,7 @@ mod tests {
         assert_eq!(records.records.len(), 1);
         assert_eq!(
             &records.records.keys().next().unwrap().extra_attachment,
-            &[1]
+            &Arc::new([1].to_vec())
         );
         assert_eq!(records, {
             collector2.records.lock().unwrap().take().unwrap()
@@ -565,7 +576,7 @@ mod tests {
         assert_eq!(records.records.len(), 1);
         assert_eq!(
             &records.records.keys().next().unwrap().extra_attachment,
-            &[1]
+            &Arc::new([1].to_vec())
         );
         assert_eq!(records, {
             observer.records.lock().unwrap().take().unwrap()
diff --git a/components/resource_metering/src/recorder/sub_recorder/cpu.rs b/components/resource_metering/src/recorder/sub_recorder/cpu.rs
index 08675bb6153..7216e2148ec 100644
--- a/components/resource_metering/src/recorder/sub_recorder/cpu.rs
+++ b/components/resource_metering/src/recorder/sub_recorder/cpu.rs
@@ -4,12 +4,12 @@ use collections::HashMap;
 use tikv_util::sys::thread::{self, Pid};
 
 use crate::{
+    RawRecords,
     metrics::STAT_TASK_COUNT,
     recorder::{
-        localstorage::{LocalStorage, SharedTagInfos},
         SubRecorder,
+        localstorage::{LocalStorage, SharedTagInfos},
     },
-    RawRecords,
 };
 
 /// An implementation of [SubRecorder] for collecting cpu statistics.
@@ -130,7 +130,7 @@ mod tests {
             region_id: 0,
             peer_id: 0,
             key_ranges: vec![],
-            extra_attachment: b"abc".to_vec(),
+            extra_attachment: Arc::new(b"abc".to_vec()),
         });
         let store = LocalStorage {
             attached_tag: SharedTagInfos::new(info),
diff --git a/components/resource_metering/src/recorder/sub_recorder/mod.rs b/components/resource_metering/src/recorder/sub_recorder/mod.rs
index 42647f3486d..ef6cd500b5b 100644
--- a/components/resource_metering/src/recorder/sub_recorder/mod.rs
+++ b/components/resource_metering/src/recorder/sub_recorder/mod.rs
@@ -3,7 +3,7 @@
 use collections::HashMap;
 use tikv_util::sys::thread::Pid;
 
-use crate::{recorder::localstorage::LocalStorage, RawRecords};
+use crate::{RawRecords, recorder::localstorage::LocalStorage};
 
 pub mod cpu;
 pub mod summary;
diff --git a/components/resource_metering/src/recorder/sub_recorder/summary.rs b/components/resource_metering/src/recorder/sub_recorder/summary.rs
index 93ba95080e3..eab3216c3bb 100644
--- a/components/resource_metering/src/recorder/sub_recorder/summary.rs
+++ b/components/resource_metering/src/recorder/sub_recorder/summary.rs
@@ -6,11 +6,11 @@ use collections::HashMap;
 use tikv_util::sys::thread::Pid;
 
 use crate::{
+    ENABLE_NETWORK_IO_COLLECTION, RawRecords,
     recorder::{
-        localstorage::{LocalStorage, STORAGE},
         SubRecorder,
+        localstorage::{LocalStorage, STORAGE},
     },
-    RawRecords,
 };
 
 /// Records how many keys have been read in the current context.
@@ -33,6 +33,58 @@ pub fn record_write_keys(count: u32) {
     })
 }
 
+/// Records how many bytes have been received in the current context.
+pub fn record_network_in_bytes(bytes: u64) {
+    if !ENABLE_NETWORK_IO_COLLECTION.load(Relaxed) {
+        return;
+    }
+    STORAGE.with(|s| {
+        s.borrow()
+            .summary_cur_record
+            .network_in_bytes
+            .fetch_add(bytes, Relaxed);
+    })
+}
+
+/// Records how many bytes have been sent in the current context.
+pub fn record_network_out_bytes(bytes: u64) {
+    if !ENABLE_NETWORK_IO_COLLECTION.load(Relaxed) {
+        return;
+    }
+    STORAGE.with(|s| {
+        s.borrow()
+            .summary_cur_record
+            .network_out_bytes
+            .fetch_add(bytes, Relaxed);
+    })
+}
+
+/// Records how many bytes have been read in the current context.
+pub fn record_logical_read_bytes(bytes: u64) {
+    if !ENABLE_NETWORK_IO_COLLECTION.load(Relaxed) {
+        return;
+    }
+    STORAGE.with(|s| {
+        s.borrow()
+            .summary_cur_record
+            .logical_read_bytes
+            .fetch_add(bytes, Relaxed);
+    })
+}
+
+/// Records how many bytes have been written in the current context.
+pub fn record_logical_write_bytes(bytes: u64) {
+    if !ENABLE_NETWORK_IO_COLLECTION.load(Relaxed) {
+        return;
+    }
+    STORAGE.with(|s| {
+        s.borrow()
+            .summary_cur_record
+            .logical_write_bytes
+            .fetch_add(bytes, Relaxed);
+    })
+}
+
 /// An implementation of [SubRecorder] for collecting summary data.
 ///
 /// `SummaryRecorder` uses some special methods
diff --git a/components/resource_metering/src/reporter/collector_impl.rs b/components/resource_metering/src/reporter/collector_impl.rs
index 5bba601807c..53d9b93befc 100644
--- a/components/resource_metering/src/reporter/collector_impl.rs
+++ b/components/resource_metering/src/reporter/collector_impl.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use tikv_util::{warn, worker::Scheduler};
 
-use crate::{metrics::IGNORED_DATA_COUNTER, Collector, RawRecords, Task};
+use crate::{Collector, RawRecords, Task, metrics::IGNORED_DATA_COUNTER};
 
 /// A [Collector] implementation for scheduling [RawRecords].
 ///
diff --git a/components/resource_metering/src/reporter/mod.rs b/components/resource_metering/src/reporter/mod.rs
index 721fb570b22..7bc569ac8bd 100644
--- a/components/resource_metering/src/reporter/mod.rs
+++ b/components/resource_metering/src/reporter/mod.rs
@@ -20,12 +20,12 @@ use tikv_util::{
 };
 
 use crate::{
+    Config, DataSink, RawRecords, Records, RegionRecords, handle_records_impl,
     recorder::{CollectorGuard, CollectorRegHandle},
     reporter::{
         collector_impl::CollectorImpl,
         data_sink_reg::{DataSinkId, DataSinkReg, DataSinkRegHandle},
     },
-    Config, DataSink, RawRecords, Records,
 };
 
 /// A structure for reporting statistics through [Client].
@@ -47,6 +47,7 @@ pub struct Reporter {
 
     data_sinks: HashMap<DataSinkId, Box<dyn DataSink>>,
     records: Records,
+    region_records: RegionRecords,
 }
 
 impl Runnable for Reporter {
@@ -89,21 +90,21 @@ impl Reporter {
 
             data_sinks: HashMap::default(),
             records: Records::default(),
+            region_records: RegionRecords::default(),
         }
     }
 
     fn handle_records(&mut self, records: Arc<RawRecords>) {
         let ts = records.begin_unix_time_secs;
-        if self.config.max_resource_groups >= records.records.len() {
-            self.records.append(ts, records.records.iter());
-            return;
+        let n = self.config.max_resource_groups;
+        if self.config.enable_network_io_collection {
+            let (agg_tag_map, agg_region_map) = records.aggregate_by_extra_tag_and_region();
+            handle_records_impl(&mut self.records, true, &agg_tag_map, ts, n);
+            handle_records_impl(&mut self.region_records, true, &agg_region_map, ts, n);
+        } else {
+            let agg_map = records.aggregate_by_extra_tag();
+            handle_records_impl(&mut self.records, false, &agg_map, ts, n);
         }
-        let (top, evicted) = records.top_k(self.config.max_resource_groups);
-        self.records.append(ts, top);
-        let others = self.records.others.entry(ts).or_default();
-        evicted.for_each(|(_, v)| {
-            others.merge(v);
-        });
     }
 
     fn handle_config_change(&mut self, config: Config) {
@@ -134,7 +135,7 @@ impl Reporter {
         }
     }
 
-    fn upload(&mut self) {
+    fn upload_grouptag_record(&mut self) {
         // When either of records.records and records.others is not empty, we
         // will report it. Only when the cpu_time of all tags is equal, and the
         // number of tags exceeds the max_resource_group limit, will records.records
@@ -150,17 +151,38 @@ impl Reporter {
         // Whether endpoint exists or not, records should be taken in order to reset.
         let records = std::mem::take(&mut self.records);
         let report_data: Arc<Vec<ResourceUsageRecord>> = Arc::new(records.into());
+        for data_sink in self.data_sinks.values_mut() {
+            if let Err(err) = data_sink.try_send(report_data.clone()) {
+                warn!("failed to send data to datasink"; "group_by" => "tag", "error" => ?err);
+            }
+        }
+    }
 
+    fn upload_region_record(&mut self) {
+        if !self.config.enable_network_io_collection || self.region_records.is_empty() {
+            return;
+        }
+
+        warn!("upload region record");
+        // Whether endpoint exists or not, records should be taken in order to reset.
+        let region_records = std::mem::take(&mut self.region_records);
+        let report_data: Arc<Vec<ResourceUsageRecord>> = Arc::new(region_records.into());
         for data_sink in self.data_sinks.values_mut() {
             if let Err(err) = data_sink.try_send(report_data.clone()) {
-                warn!("failed to send data to datasink"; "error" => ?err);
+                warn!("failed to send data to datasink"; "group_by" => "region" ,"error" => ?err);
             }
         }
     }
 
+    fn upload(&mut self) {
+        self.upload_grouptag_record();
+        self.upload_region_record();
+    }
+
     fn reset(&mut self) {
         self.collector.take();
         self.records.clear();
+        self.region_records.clear();
     }
 }
 
@@ -244,16 +266,20 @@ mod tests {
     };
 
     use super::*;
-    use crate::{error::Result, RawRecord, TagInfos};
+    use crate::{RawRecord, TagInfos, error::Result};
 
     #[derive(Default, Clone)]
     struct MockDataSink {
         op_count: Arc<AtomicUsize>,
+        region_op_count: Arc<AtomicUsize>,
     }
 
     impl DataSink for MockDataSink {
         fn try_send(&mut self, _records: Arc<Vec<ResourceUsageRecord>>) -> Result<()> {
             self.op_count.fetch_add(1, SeqCst);
+            if !_records.is_empty() && _records[0].has_region_record() {
+                self.region_op_count.fetch_add(1, SeqCst);
+            }
             Ok(())
         }
     }
@@ -274,6 +300,7 @@ mod tests {
             report_receiver_interval: ReadableDuration::minutes(2),
             max_resource_groups: 3000,
             precision: ReadableDuration::secs(2),
+            enable_network_io_collection: false,
         }));
         assert_eq!(r.get_interval(), Duration::from_secs(120));
         let mut records = HashMap::default();
@@ -283,12 +310,16 @@ mod tests {
                 region_id: 0,
                 peer_id: 0,
                 key_ranges: vec![],
-                extra_attachment: b"12345".to_vec(),
+                extra_attachment: Arc::new(b"12345".to_vec()),
             }),
             RawRecord {
                 cpu_time: 1,
                 read_keys: 2,
                 write_keys: 3,
+                network_in_bytes: 4,
+                network_out_bytes: 5,
+                logical_read_bytes: 6,
+                logical_write_bytes: 7,
             },
         );
         r.run(Task::Records(Arc::new(RawRecords {
@@ -329,12 +360,16 @@ mod tests {
                 region_id: 0,
                 peer_id: 0,
                 key_ranges: vec![],
-                extra_attachment: b"12345".to_vec(),
+                extra_attachment: Arc::new(b"12345".to_vec()),
             }),
             RawRecord {
                 cpu_time: 1,
                 read_keys: 2,
                 write_keys: 3,
+                network_in_bytes: 4,
+                network_out_bytes: 5,
+                logical_read_bytes: 6,
+                logical_write_bytes: 7,
             },
         );
 
@@ -366,4 +401,53 @@ mod tests {
 
         r.shutdown();
     }
+
+    #[test]
+    fn test_reporter_region_data() {
+        let scheduler = LazyWorker::new("test-worker").scheduler();
+        let collector_reg_handle = CollectorRegHandle::new_for_test();
+        let mut r = Reporter::new(Config::default(), collector_reg_handle, scheduler);
+
+        let client = MockDataSink::default();
+        r.run(Task::DataSinkReg(DataSinkReg::Register {
+            id: DataSinkId(1),
+            data_sink: Box::new(client.clone()),
+        }));
+        r.run(Task::ConfigChange(Config {
+            receiver_address: "abc".to_string(),
+            report_receiver_interval: ReadableDuration::minutes(2),
+            max_resource_groups: 3000,
+            precision: ReadableDuration::secs(2),
+            enable_network_io_collection: true,
+        }));
+        assert_eq!(r.get_interval(), Duration::from_secs(120));
+        let mut records = HashMap::default();
+        records.insert(
+            Arc::new(TagInfos {
+                store_id: 0,
+                region_id: 1,
+                peer_id: 0,
+                key_ranges: vec![],
+                extra_attachment: Arc::new(b"12345".to_vec()),
+            }),
+            RawRecord {
+                cpu_time: 1,
+                read_keys: 2,
+                write_keys: 3,
+                network_in_bytes: 4,
+                network_out_bytes: 5,
+                logical_read_bytes: 6,
+                logical_write_bytes: 7,
+            },
+        );
+        r.run(Task::Records(Arc::new(RawRecords {
+            begin_unix_time_secs: 123,
+            duration: Duration::default(),
+            records,
+        })));
+        r.on_timeout();
+        r.shutdown();
+        assert_eq!(client.op_count.load(SeqCst), 2);
+        assert_eq!(client.region_op_count.load(SeqCst), 1);
+    }
 }
diff --git a/components/resource_metering/src/reporter/pubsub.rs b/components/resource_metering/src/reporter/pubsub.rs
index 62144ec920c..2dc3cc4376f 100644
--- a/components/resource_metering/src/reporter/pubsub.rs
+++ b/components/resource_metering/src/reporter/pubsub.rs
@@ -3,8 +3,8 @@
 use std::sync::Arc;
 
 use futures::{
-    channel::mpsc::{channel, Sender},
     SinkExt, StreamExt,
+    channel::mpsc::{Sender, channel},
 };
 use grpcio::{RpcContext, ServerStreamingSink, WriteFlags};
 use kvproto::{
@@ -15,9 +15,9 @@ use tikv_util::{info, warn};
 
 use super::DataSinkRegHandle;
 use crate::{
+    DataSink,
     error::Result,
     metrics::{IGNORED_DATA_COUNTER, REPORT_DATA_COUNTER, REPORT_DURATION_HISTOGRAM},
-    DataSink,
 };
 
 /// `PubSubService` implements [ResourceMeteringPubSub].
diff --git a/components/resource_metering/src/reporter/single_target.rs b/components/resource_metering/src/reporter/single_target.rs
index 09609b84462..c6113c51778 100644
--- a/components/resource_metering/src/reporter/single_target.rs
+++ b/components/resource_metering/src/reporter/single_target.rs
@@ -3,8 +3,8 @@
 use std::{
     fmt::{self, Display, Formatter},
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     },
     time::Duration,
 };
diff --git a/components/resource_metering/tests/recorder_test.rs b/components/resource_metering/tests/recorder_test.rs
index 9f0ec504917..0d75b6b7566 100644
--- a/components/resource_metering/tests/recorder_test.rs
+++ b/components/resource_metering/tests/recorder_test.rs
@@ -8,10 +8,10 @@ mod tests {
         time::Duration,
     };
 
+    use Operation::*;
     use collections::HashMap;
-    use resource_metering::{init_recorder, Collector, RawRecord, RawRecords, ResourceTagFactory};
+    use resource_metering::{Collector, RawRecord, RawRecords, ResourceTagFactory, init_recorder};
     use tikv_util::sys::thread;
-    use Operation::*;
 
     enum Operation {
         SetContext(&'static str),
diff --git a/components/resource_metering/tests/summary_test.rs b/components/resource_metering/tests/summary_test.rs
index ae647055206..c99ff29111a 100644
--- a/components/resource_metering/tests/summary_test.rs
+++ b/components/resource_metering/tests/summary_test.rs
@@ -8,7 +8,7 @@ use std::{
 
 use collections::HashMap;
 use kvproto::{kvrpcpb::Context, resource_usage_agent::ResourceUsageRecord};
-use resource_metering::{error::Result, init_recorder, init_reporter, Config, DataSink};
+use resource_metering::{Config, DataSink, error::Result, init_recorder, init_reporter};
 use tikv_util::config::ReadableDuration;
 
 const PRECISION_MS: u64 = 1000;
diff --git a/components/server/Cargo.toml b/components/server/Cargo.toml
index 5e844aa16fa..0db75fb32c3 100644
--- a/components/server/Cargo.toml
+++ b/components/server/Cargo.toml
@@ -14,7 +14,7 @@ portable = ["tikv/portable"]
 sse = ["tikv/sse"]
 memory-engine = []
 mem-profiling = ["tikv/mem-profiling"]
-failpoints = ["tikv/failpoints"]
+failpoints = ["tikv/failpoints", "cdc/failpoints"]
 test-engine-kv-rocksdb = ["tikv/test-engine-kv-rocksdb"]
 test-engine-raft-raft-engine = ["tikv/test-engine-raft-raft-engine"]
 test-engines-rocksdb = ["tikv/test-engines-rocksdb"]
diff --git a/components/server/src/common.rs b/components/server/src/common.rs
index 89769de17d4..a41405a5724 100644
--- a/components/server/src/common.rs
+++ b/components/server/src/common.rs
@@ -8,30 +8,29 @@ use std::{
     net::SocketAddr,
     path::{Path, PathBuf},
     sync::{
+        Arc,
         atomic::{AtomicU32, Ordering},
-        mpsc, Arc,
+        mpsc,
     },
     time::Duration,
-    u64,
 };
 
-use encryption_export::{data_key_manager_from_config, DataKeyManager};
+use encryption_export::{DataKeyManager, data_key_manager_from_config};
 use engine_rocks::{
-    flush_engine_statistics,
+    FlowInfo, RocksEngine, RocksStatistics, flush_engine_statistics,
     raw::{Cache, Env},
-    FlowInfo, RocksEngine, RocksStatistics,
 };
 use engine_traits::{
-    data_cf_offset, CachedTablet, CfOptions, CfOptionsExt, FlowControlFactorsExt, KvEngine,
-    RaftEngine, RegionCacheEngine, StatisticsReporter, TabletRegistry, CF_DEFAULT, DATA_CFS,
+    CF_DEFAULT, CachedTablet, CfOptions, CfOptionsExt, DATA_CFS, FlowControlFactorsExt, KvEngine,
+    RaftEngine, RegionCacheEngine, StatisticsReporter, TabletRegistry, data_cf_offset,
 };
 use error_code::ErrorCodeExt;
-use file_system::{get_io_rate_limiter, set_io_rate_limiter, BytesFetcher, File, IoBudgetAdjustor};
+use file_system::{BytesFetcher, File, IoBudgetAdjustor, get_io_rate_limiter, set_io_rate_limiter};
 use grpcio::Environment;
 use hybrid_engine::HybridEngine;
 use in_memory_engine::{
-    flush_in_memory_engine_statistics, InMemoryEngineContext, InMemoryEngineStatistics,
-    RegionCacheMemoryEngine,
+    InMemoryEngineContext, InMemoryEngineStatistics, RegionCacheMemoryEngine,
+    flush_in_memory_engine_statistics,
 };
 use pd_client::{PdClient, RpcClient};
 use raft_log_engine::RaftLogEngine;
@@ -40,15 +39,15 @@ use security::SecurityManager;
 use tikv::{
     config::{ConfigController, DbConfigManger, DbType, TikvConfig},
     server::{
-        gc_worker::compaction_filter::GC_CONTEXT, status_server::StatusServer, DEFAULT_CLUSTER_ID,
+        DEFAULT_CLUSTER_ID, gc_worker::compaction_filter::GC_CONTEXT, status_server::StatusServer,
     },
 };
 use tikv_util::{
-    config::{ensure_dir_exist, RaftDataStateMachine},
+    config::{RaftDataStateMachine, ensure_dir_exist},
     math::MovingAvgU32,
     metrics::INSTANCE_BACKEND_CPU_QUOTA,
     quota_limiter::QuotaLimiter,
-    sys::{cpu_time::ProcessStat, disk, path_in_diff_mount_point, SysQuota},
+    sys::{SysQuota, cpu_time::ProcessStat, disk, path_in_diff_mount_point},
     time::Instant,
     worker::{LazyWorker, Worker},
 };
@@ -258,6 +257,7 @@ impl TikvServerCore {
         prometheus::register(Box::new(yatp::metrics::MULTILEVEL_LEVEL0_CHANCE.clone())).unwrap();
         prometheus::register(Box::new(yatp::metrics::MULTILEVEL_LEVEL_ELAPSED.clone())).unwrap();
         prometheus::register(Box::new(yatp::metrics::TASK_EXEC_DURATION.clone())).unwrap();
+        prometheus::register(Box::new(yatp::metrics::TASK_WAIT_DURATION.clone())).unwrap();
         prometheus::register(Box::new(yatp::metrics::TASK_POLL_DURATION.clone())).unwrap();
         prometheus::register(Box::new(yatp::metrics::TASK_EXEC_TIMES.clone())).unwrap();
     }
@@ -646,7 +646,7 @@ impl EnginesResourceInfo {
         );
     }
 
-    #[cfg(any(test, feature = "testexport"))]
+    #[cfg(test)]
     pub fn latest_normalized_pending_bytes(&self) -> u32 {
         self.latest_normalized_pending_bytes.load(Ordering::Relaxed)
     }
@@ -1021,7 +1021,7 @@ impl DiskUsageChecker {
                             // If the auxiliary directory of raft engine is not separated from
                             // kv engine, returns u64::MAX to indicate that the disk space of
                             // the raft engine should not be checked.
-                            (std::u64::MAX, std::u64::MAX)
+                            (u64::MAX, u64::MAX)
                         } else if self.separated_raft_auxiliary_and_kvdb_mount_path {
                             // If the auxiliary directory of raft engine is separated from kv
                             // engine and the main directory of
diff --git a/components/server/src/raft_engine_switch.rs b/components/server/src/raft_engine_switch.rs
index 729029d4c8f..52320a36ea8 100644
--- a/components/server/src/raft_engine_switch.rs
+++ b/components/server/src/raft_engine_switch.rs
@@ -1,13 +1,13 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::sync::{
-    atomic::{AtomicUsize, Ordering},
     Arc,
+    atomic::{AtomicUsize, Ordering},
 };
 
-use crossbeam::channel::{unbounded, Receiver};
+use crossbeam::channel::{Receiver, unbounded};
 use engine_rocks::{self, RocksEngine};
-use engine_traits::{Iterable, Iterator, RaftEngine, RaftEngineReadOnly, RaftLogBatch, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, Iterable, Iterator, RaftEngine, RaftEngineReadOnly, RaftLogBatch};
 use kvproto::raft_serverpb::RaftLocalState;
 use protobuf::Message;
 use raft::eraftpb::Entry;
diff --git a/components/server/src/server.rs b/components/server/src/server.rs
index 15542321873..8cf7526c5f5 100644
--- a/components/server/src/server.rs
+++ b/components/server/src/server.rs
@@ -16,28 +16,27 @@ use std::{
     convert::TryFrom,
     path::{Path, PathBuf},
     str::FromStr,
-    sync::{atomic::AtomicU64, mpsc, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::AtomicU64, mpsc},
     time::Duration,
-    u64,
 };
 
-use api_version::{dispatch_api_version, KvFormat};
+use api_version::{KvFormat, dispatch_api_version};
 use backup_stream::{
-    config::BackupStreamConfigManager, metadata::store::PdStore, observer::BackupStreamObserver,
-    BackupStreamResolver,
+    BackupStreamResolver, config::BackupStreamConfigManager, metadata::store::PdStore,
+    observer::BackupStreamObserver,
 };
 use causal_ts::CausalTsProviderImpl;
 use cdc::CdcConfigManager;
 use concurrency_manager::{ConcurrencyManager, LIMIT_VALID_TIME_MULTIPLIER};
 use engine_rocks::{
-    from_rocks_compression_type, RocksCompactedEvent, RocksEngine, RocksStatistics,
+    RocksCompactedEvent, RocksEngine, RocksStatistics, from_rocks_compression_type,
 };
-use engine_rocks_helper::sst_recovery::{RecoveryRunner, DEFAULT_CHECK_INTERVAL};
+use engine_rocks_helper::sst_recovery::{DEFAULT_CHECK_INTERVAL, RecoveryRunner};
 use engine_traits::{
-    Engines, KvEngine, MiscExt, RaftEngine, SingletonFactory, TabletContext, TabletRegistry,
-    CF_DEFAULT, CF_WRITE,
+    CF_DEFAULT, CF_WRITE, Engines, KvEngine, MiscExt, RaftEngine, SingletonFactory, TabletContext,
+    TabletRegistry,
 };
-use file_system::{get_io_rate_limiter, BytesFetcher, MetricsManager as IoMetricsManager};
+use file_system::{BytesFetcher, MetricsManager as IoMetricsManager, get_io_rate_limiter};
 use futures::executor::block_on;
 use grpcio::{EnvBuilder, Environment};
 use health_controller::HealthController;
@@ -46,8 +45,8 @@ use hybrid_engine::observer::{
     RegionCacheWriteBatchObserver,
 };
 use in_memory_engine::{
-    config::InMemoryEngineConfigManager, InMemoryEngineContext, InMemoryEngineStatistics,
-    RegionCacheMemoryEngine,
+    InMemoryEngineContext, InMemoryEngineStatistics, RegionCacheMemoryEngine,
+    config::InMemoryEngineConfigManager,
 };
 use kvproto::{
     brpb::create_backup, cdcpb::create_change_data, deadlock::create_deadlock,
@@ -56,32 +55,36 @@ use kvproto::{
     resource_usage_agent::create_resource_metering_pub_sub,
 };
 use pd_client::{
+    PdClient, RpcClient,
     meta_storage::{Checked, Sourced},
     metrics::STORE_SIZE_EVENT_INT_VEC,
-    PdClient, RpcClient,
 };
 use raft_log_engine::RaftLogEngine;
 use raftstore::{
+    RaftRouterCompactedEventSender,
     coprocessor::{
-        config::SplitCheckConfigManager, BoxConsistencyCheckObserver, ConsistencyCheckMethod,
-        CoprocessorHost, RawConsistencyCheckObserver, RegionInfoAccessor,
+        BoxConsistencyCheckObserver, ConsistencyCheckMethod, CoprocessorHost,
+        RawConsistencyCheckObserver, RegionInfoAccessor, config::SplitCheckConfigManager,
     },
     router::{CdcRaftRouter, ServerRaftStoreRouter},
     store::{
+        AutoSplitController, CheckLeaderRunner, DiskCheckRunner, ForcePartitionRangeManager,
+        LocalReader, SnapManager, SnapManagerBuilder, SplitCheckRunner, SplitConfigManager,
+        StoreMetaDelegate,
         config::RaftstoreConfigManager,
-        fsm,
-        fsm::store::{
-            RaftBatchSystem, RaftRouter, StoreMeta, MULTI_FILES_SNAPSHOT_FEATURE, PENDING_MSG_CAP,
+        fsm::{
+            self,
+            store::{
+                MULTI_FILES_SNAPSHOT_FEATURE, PENDING_MSG_CAP, RaftBatchSystem, RaftRouter,
+                StoreMeta,
+            },
         },
         memory::MEMTRACE_ROOT as MEMTRACE_RAFTSTORE,
         snapshot_backup::PrepareDiskSnapObserver,
-        AutoSplitController, CheckLeaderRunner, DiskCheckRunner, LocalReader, SnapManager,
-        SnapManagerBuilder, SplitCheckRunner, SplitConfigManager, StoreMetaDelegate,
     },
-    RaftRouterCompactedEventSender,
 };
 use resolved_ts::{LeadershipResolver, Task};
-use resource_control::{config::ResourceContrlCfgMgr, ResourceGroupManager};
+use resource_control::{ResourceGroupManager, config::ResourceContrlCfgMgr};
 use security::{SecurityConfigManager, SecurityManager};
 use service::{service_event::ServiceEvent, service_manager::GrpcServiceManager};
 use snap_recovery::RecoveryService;
@@ -93,9 +96,11 @@ use tikv::{
     coprocessor_v2,
     import::{ImportSstService, SstImporter},
     read_pool::{
-        build_yatp_read_pool, ReadPool, ReadPoolConfigManager, UPDATE_EWMA_TIME_SLICE_INTERVAL,
+        ReadPool, ReadPoolConfigManager, UPDATE_EWMA_TIME_SLICE_INTERVAL, build_yatp_read_pool,
     },
     server::{
+        CPU_CORES_QUOTA_GAUGE, GRPC_THREAD_PREFIX, KvEngineFactoryBuilder, MEMORY_LIMIT_GAUGE,
+        MultiRaftServer, RaftKv, Server,
         config::{Config as ServerConfig, ServerConfigManager},
         debug::{Debugger, DebuggerImpl},
         gc_worker::{AutoGcConfig, GcWorker},
@@ -106,11 +111,9 @@ use tikv::{
         status_server::StatusServer,
         tablet_snap::NoSnapshotCache,
         ttl::TtlChecker,
-        KvEngineFactoryBuilder, MultiRaftServer, RaftKv, Server, CPU_CORES_QUOTA_GAUGE,
-        GRPC_THREAD_PREFIX, MEMORY_LIMIT_GAUGE,
     },
     storage::{
-        self,
+        self, Engine, Storage,
         config::EngineType,
         config_manager::StorageConfigManger,
         kv::LocalTablets,
@@ -119,31 +122,29 @@ use tikv::{
             flow_controller::{EngineFlowController, FlowController},
             txn_status_cache::TxnStatusCache,
         },
-        Engine, Storage,
     },
 };
 use tikv_alloc::{
     add_thread_memory_accessor, remove_thread_memory_accessor, thread_allocate_exclusive_arena,
 };
 use tikv_util::{
-    check_environment_variables,
+    Either, check_environment_variables,
     config::VersionTrack,
     memory::MemoryQuota,
     mpsc as TikvMpsc,
     quota_limiter::{QuotaLimitConfigManager, QuotaLimiter},
-    sys::{disk, path_in_diff_mount_point, register_memory_usage_high_water, SysQuota},
+    sys::{SysQuota, disk, path_in_diff_mount_point, register_memory_usage_high_water},
     thread_group::GroupProperties,
     time::{Instant, Monitor},
     worker::{Builder as WorkerBuilder, LazyWorker, Scheduler, Worker},
     yatp_pool::CleanupMethod,
-    Either,
 };
 use tokio::runtime::Builder;
 
 use crate::{
     common::{
-        build_hybrid_engine, ConfiguredRaftEngine, DiskUsageChecker, EngineMetricsManager,
-        EnginesResourceInfo, TikvServerCore,
+        ConfiguredRaftEngine, DiskUsageChecker, EngineMetricsManager, EnginesResourceInfo,
+        TikvServerCore, build_hybrid_engine,
     },
     memory::*,
     setup::*,
@@ -165,6 +166,7 @@ fn run_impl<CER, F>(
     // Must be called after `TikvServer::init`.
     let memory_limit = tikv.core.config.memory_usage_limit.unwrap().0;
     let high_water = (tikv.core.config.memory_usage_high_water * memory_limit as f64) as u64;
+    let config_controller = tikv.cfg_controller.clone().unwrap();
     register_memory_usage_high_water(high_water);
 
     tikv.core.check_conflict_addr();
@@ -195,6 +197,7 @@ fn run_impl<CER, F>(
                 Some(engines),
                 kv_statistics,
                 raft_statistics,
+                config_controller,
                 Some(service_event_tx),
             )
         });
@@ -208,6 +211,10 @@ fn run_impl<CER, F>(
                 ServiceEvent::ResumeGrpc => {
                     tikv.resume();
                 }
+                ServiceEvent::GracefulShutdown => {
+                    tikv.graceful_shutdown();
+                    break;
+                }
                 ServiceEvent::Exit => {
                     break;
                 }
@@ -244,7 +251,9 @@ pub fn run_tikv(
 
 const DEFAULT_METRICS_FLUSH_INTERVAL: Duration = Duration::from_millis(10_000);
 const DEFAULT_MEMTRACE_FLUSH_INTERVAL: Duration = Duration::from_millis(1_000);
-const DEFAULT_STORAGE_STATS_INTERVAL: Duration = Duration::from_secs(1);
+// Collecting storage stats requires reading SST properties, which can be
+// expensive in case of many SSTs. So we use a larger interval for it.
+const DEFAULT_STORAGE_STATS_INTERVAL: Duration = Duration::from_secs(60);
 const DEFAULT_CGROUP_MONITOR_INTERVAL: Duration = Duration::from_secs(10);
 
 /// A complete TiKV server.
@@ -280,6 +289,7 @@ where
     resolved_ts_scheduler: Option<Scheduler<Task>>,
     grpc_service_mgr: GrpcServiceManager,
     snap_br_rejector: Option<Arc<PrepareDiskSnapObserver>>,
+    force_partition_range_mgr: ForcePartitionRangeManager,
 }
 
 struct TikvEngines<RocksEngine: KvEngine, ER: RaftEngine> {
@@ -487,6 +497,7 @@ where
             resolved_ts_scheduler: None,
             grpc_service_mgr: GrpcServiceManager::new(tx),
             snap_br_rejector: None,
+            force_partition_range_mgr: ForcePartitionRangeManager::default(),
         }
     }
 
@@ -503,6 +514,7 @@ where
                 ),
             ),
             engines.kv.clone(),
+            self.region_info_accessor.clone(),
             self.region_info_accessor.as_ref().unwrap().region_leaders(),
         );
 
@@ -831,13 +843,13 @@ where
         let server_config = Arc::new(VersionTrack::new(self.core.config.server.clone()));
 
         self.core.config.raft_store.optimize_for(false);
-        self.core
-            .config
-            .raft_store
-            .optimize_inspector(path_in_diff_mount_point(
+        self.core.config.raft_store.tune_inspector_configs(
+            path_in_diff_mount_point(
                 engines.engines.raft.get_engine_path().to_string().as_str(),
                 engines.engines.kv.path(),
-            ));
+            ),
+            self.core.config.server.inspect_network_interval,
+        );
         self.core
             .config
             .raft_store
@@ -898,6 +910,7 @@ where
             Arc::new(DefaultGrpcMessageFilter::new(
                 server_config.value().reject_messages_on_memory_ratio,
             )),
+            self.core.background_worker.clone(),
         )
         .unwrap_or_else(|e| fatal!("failed to create server: {}", e));
         cfg_controller.register(
@@ -1013,6 +1026,7 @@ where
             engines.engines.kv.clone(),
             self.router.clone(),
             self.coprocessor_host.clone().unwrap(),
+            Some(Arc::new(self.region_info_accessor.clone().unwrap())),
         );
         let split_check_scheduler = self
             .core
@@ -1094,6 +1108,14 @@ where
             fatal!("failed to start auto_gc on storage, error: {}", e);
         }
 
+        // Start auto compaction
+        if let Err(e) = gc_worker.start_auto_compaction(
+            self.pd_client.clone(),
+            self.region_info_accessor.clone().unwrap(),
+        ) {
+            fatal!("failed to start auto_compaction on storage, error: {}", e);
+        }
+
         initial_metric(&self.core.config.metric);
         if self.core.config.storage.enable_ttl {
             ttl_checker.start_with_timer(TtlChecker::new(
@@ -1212,6 +1234,7 @@ where
             None,
             self.resource_manager.clone(),
             Arc::new(self.region_info_accessor.clone().unwrap()),
+            self.force_partition_range_mgr.clone(),
         );
         let import_cfg_mgr = import_service.get_config_manager();
 
@@ -1331,6 +1354,7 @@ where
         let cdc_service = cdc::Service::new(
             servers.cdc_scheduler.clone(),
             servers.cdc_memory_quota.clone(),
+            Arc::new(self.core.background_worker.clone()),
         );
         if servers
             .server
@@ -1384,7 +1408,7 @@ where
             self.tablet_registry.clone().unwrap(),
             self.kv_statistics.clone(),
             self.in_memory_engine_statistics.clone(),
-            self.core.config.rocksdb.titan.enabled.map_or(false, |v| v),
+            self.core.config.rocksdb.titan.enabled.is_some_and(|v| v),
             self.engines.as_ref().unwrap().engines.raft.clone(),
             self.raft_statistics.clone(),
         );
@@ -1586,12 +1610,13 @@ where
         if status_enabled {
             let mut status_server = match StatusServer::new(
                 self.core.config.server.status_thread_pool_size,
-                self.cfg_controller.take().unwrap(),
+                self.cfg_controller.clone().unwrap(),
                 Arc::new(self.core.config.security.clone()),
                 self.engines.as_ref().unwrap().engine.raft_extension(),
                 self.resource_manager.clone(),
                 self.grpc_service_mgr.clone(),
                 in_memory_engine,
+                self.force_partition_range_mgr.clone(),
             ) {
                 Ok(status_server) => Box::new(status_server),
                 Err(e) => {
@@ -1657,6 +1682,62 @@ where
             );
         }
     }
+
+    fn graceful_shutdown(&mut self) {
+        let now = Instant::now();
+        self.set_state(true);
+        self.wait_for_leader_eviction(now);
+        // set state to false to trigger a storeheartbeat and let PD remove the
+        // evict-leader scheduler.
+        self.set_state(false);
+        std::thread::sleep(Duration::from_millis(200));
+        info!("Graceful shutdown completed");
+    }
+
+    fn wait_for_leader_eviction(&self, now: Instant) {
+        let timeout = self
+            .cfg_controller
+            .as_ref()
+            .unwrap()
+            .get_current()
+            .server
+            .graceful_shutdown_timeout
+            .0;
+        let region_info_accessor = self.region_info_accessor.as_ref().unwrap();
+        let check_interval = Duration::from_secs(1);
+
+        loop {
+            let leaders_count = region_info_accessor.region_leaders().read().unwrap().len();
+
+            if leaders_count == 0 {
+                info!("All leaders evicted, completing graceful shutdown");
+                break;
+            }
+
+            if now.saturating_elapsed() >= timeout {
+                warn!(
+                    "Graceful shutdown timeout reached with {} leaders remaining",
+                    leaders_count
+                );
+                break;
+            }
+
+            info!("Waiting for leader eviction"; 
+                  "leaders_count" => leaders_count, 
+                  "elapsed" => ?now.saturating_elapsed());
+            std::thread::sleep(check_interval);
+        }
+    }
+
+    fn set_state(&self, state: bool) {
+        if let Some(server) = &self.servers {
+            let scheduler = server.raft_server.pd_scheduler();
+            let task = raftstore::store::PdTask::GracefulShutdownState { state };
+            if let Err(e) = scheduler.schedule(task) {
+                warn!("Failed to set graceful shutdown state for PD worker"; "error" => ?e);
+            }
+        }
+    }
 }
 
 impl<CER, F> TikvServer<CER, F>
@@ -1721,6 +1802,7 @@ where
             &self.core.config,
             block_cache,
             self.core.encryption_key_manager.clone(),
+            self.force_partition_range_mgr.clone(),
         )
         .compaction_event_sender(Arc::new(RaftRouterCompactedEventSender {
             router: Mutex::new(self.router.clone()),
@@ -1835,7 +1917,7 @@ mod test {
 
     use engine_rocks::raw::Env;
     use engine_traits::{
-        FlowControlFactorsExt, MiscExt, SyncMutable, TabletContext, TabletRegistry, CF_DEFAULT,
+        CF_DEFAULT, FlowControlFactorsExt, MiscExt, SyncMutable, TabletContext, TabletRegistry,
     };
     use tempfile::Builder;
     use tikv::{config::TikvConfig, server::KvEngineFactoryBuilder};
@@ -1847,15 +1929,16 @@ mod test {
     fn test_engines_resource_info_update() {
         let mut config = TikvConfig::default();
         config.rocksdb.defaultcf.disable_auto_compactions = true;
-        config.rocksdb.defaultcf.soft_pending_compaction_bytes_limit = Some(ReadableSize(1));
-        config.rocksdb.writecf.soft_pending_compaction_bytes_limit = Some(ReadableSize(1));
-        config.rocksdb.lockcf.soft_pending_compaction_bytes_limit = Some(ReadableSize(1));
+        config.rocksdb.defaultcf.soft_pending_compaction_bytes_limit = ReadableSize(1);
+        config.rocksdb.writecf.soft_pending_compaction_bytes_limit = ReadableSize(1);
+        config.rocksdb.lockcf.soft_pending_compaction_bytes_limit = ReadableSize(1);
         let env = Arc::new(Env::default());
         let path = Builder::new().prefix("test-update").tempdir().unwrap();
         config.validate().unwrap();
         let cache = config.storage.block_cache.build_shared_cache();
 
-        let factory = KvEngineFactoryBuilder::new(env, &config, cache, None).build();
+        let factory =
+            KvEngineFactoryBuilder::new(env, &config, cache, None, Default::default()).build();
         let reg = TabletRegistry::new(Box::new(factory), path.path().join("tablets")).unwrap();
 
         for i in 1..6 {
diff --git a/components/server/src/server2.rs b/components/server/src/server2.rs
index af46c6bdc0e..e80659f8b84 100644
--- a/components/server/src/server2.rs
+++ b/components/server/src/server2.rs
@@ -17,26 +17,25 @@ use std::{
     path::{Path, PathBuf},
     str::FromStr,
     sync::{
+        Arc,
         atomic::AtomicU64,
         mpsc::{self, sync_channel},
-        Arc,
     },
     time::Duration,
-    u64,
 };
 
-use api_version::{dispatch_api_version, KvFormat};
+use api_version::{KvFormat, dispatch_api_version};
 use backup::disk_snap::Env;
 use backup_stream::{
-    config::BackupStreamConfigManager, metadata::store::PdStore, observer::BackupStreamObserver,
-    BackupStreamResolver,
+    BackupStreamResolver, config::BackupStreamConfigManager, metadata::store::PdStore,
+    observer::BackupStreamObserver,
 };
 use causal_ts::CausalTsProviderImpl;
 use cdc::CdcConfigManager;
 use concurrency_manager::{ConcurrencyManager, LIMIT_VALID_TIME_MULTIPLIER};
-use engine_rocks::{from_rocks_compression_type, RocksEngine, RocksStatistics};
-use engine_traits::{Engines, KvEngine, MiscExt, RaftEngine, TabletRegistry, CF_DEFAULT, CF_WRITE};
-use file_system::{get_io_rate_limiter, BytesFetcher, MetricsManager as IoMetricsManager};
+use engine_rocks::{RocksEngine, RocksStatistics, from_rocks_compression_type};
+use engine_traits::{CF_DEFAULT, CF_WRITE, Engines, KvEngine, MiscExt, RaftEngine, TabletRegistry};
+use file_system::{BytesFetcher, MetricsManager as IoMetricsManager, get_io_rate_limiter};
 use futures::executor::block_on;
 use grpcio::{EnvBuilder, Environment};
 use health_controller::HealthController;
@@ -48,42 +47,44 @@ use kvproto::{
     resource_usage_agent::create_resource_metering_pub_sub,
 };
 use pd_client::{
+    PdClient, RpcClient,
     meta_storage::{Checked, Sourced},
     metrics::STORE_SIZE_EVENT_INT_VEC,
-    PdClient, RpcClient,
 };
 use raft_log_engine::RaftLogEngine;
 use raftstore::{
+    RegionInfoAccessor,
     coprocessor::{
         BoxConsistencyCheckObserver, ConsistencyCheckMethod, CoprocessorHost,
         RawConsistencyCheckObserver,
     },
     store::{
-        config::RaftstoreConfigManager, memory::MEMTRACE_ROOT as MEMTRACE_RAFTSTORE,
         AutoSplitController, CheckLeaderRunner, SplitConfigManager, TabletSnapManager,
+        config::RaftstoreConfigManager, memory::MEMTRACE_ROOT as MEMTRACE_RAFTSTORE,
     },
-    RegionInfoAccessor,
 };
 use raftstore_v2::{
-    router::{DiskSnapBackupHandle, PeerMsg, RaftRouter},
     StateStorage,
+    router::{DiskSnapBackupHandle, PeerMsg, RaftRouter},
 };
 use resolved_ts::Task;
-use resource_control::{config::ResourceContrlCfgMgr, ResourceGroupManager};
+use resource_control::{ResourceGroupManager, config::ResourceContrlCfgMgr};
 use security::{SecurityConfigManager, SecurityManager};
 use service::{service_event::ServiceEvent, service_manager::GrpcServiceManager};
 use tikv::{
     config::{
-        loop_registry, ConfigController, ConfigurableDb, DbConfigManger, DbType, LogConfigManager,
-        MemoryConfigManager, TikvConfig,
+        ConfigController, ConfigurableDb, DbConfigManger, DbType, LogConfigManager,
+        MemoryConfigManager, TikvConfig, loop_registry,
     },
     coprocessor::{self, MEMTRACE_ROOT as MEMTRACE_COPROCESSOR},
     coprocessor_v2,
     import::{ImportSstService, SstImporter},
     read_pool::{
-        build_yatp_read_pool, ReadPool, ReadPoolConfigManager, UPDATE_EWMA_TIME_SLICE_INTERVAL,
+        ReadPool, ReadPoolConfigManager, UPDATE_EWMA_TIME_SLICE_INTERVAL, build_yatp_read_pool,
     },
     server::{
+        CPU_CORES_QUOTA_GAUGE, GRPC_THREAD_PREFIX, KvEngineFactoryBuilder, MEMORY_LIMIT_GAUGE,
+        NodeV2, RaftKv2, Server,
         config::{Config as ServerConfig, ServerConfigManager},
         debug::Debugger,
         debug2::DebuggerImplV2,
@@ -93,11 +94,9 @@ use tikv::{
         resolve,
         service::{DebugService, DefaultGrpcMessageFilter, DiagnosticsService},
         status_server::StatusServer,
-        KvEngineFactoryBuilder, NodeV2, RaftKv2, Server, CPU_CORES_QUOTA_GAUGE, GRPC_THREAD_PREFIX,
-        MEMORY_LIMIT_GAUGE,
     },
     storage::{
-        self,
+        self, Engine, Storage,
         config::EngineType,
         config_manager::StorageConfigManger,
         kv::LocalTablets,
@@ -106,24 +105,22 @@ use tikv::{
             flow_controller::{FlowController, TabletFlowController},
             txn_status_cache::TxnStatusCache,
         },
-        Engine, Storage,
     },
 };
 use tikv_alloc::{
     add_thread_memory_accessor, remove_thread_memory_accessor, thread_allocate_exclusive_arena,
 };
 use tikv_util::{
-    check_environment_variables,
+    Either, check_environment_variables,
     config::VersionTrack,
     memory::MemoryQuota,
     mpsc as TikvMpsc,
     quota_limiter::{QuotaLimitConfigManager, QuotaLimiter},
-    sys::{disk, path_in_diff_mount_point, register_memory_usage_high_water, SysQuota},
+    sys::{SysQuota, disk, path_in_diff_mount_point, register_memory_usage_high_water},
     thread_group::GroupProperties,
     time::{Instant, Monitor},
     worker::{Builder as WorkerBuilder, LazyWorker, Scheduler},
     yatp_pool::CleanupMethod,
-    Either,
 };
 use tokio::runtime::Builder;
 
@@ -150,6 +147,7 @@ fn run_impl<CER: ConfiguredRaftEngine, F: KvFormat>(
     // Must be called after `TikvServer::init`.
     let memory_limit = tikv.core.config.memory_usage_limit.unwrap().0;
     let high_water = (tikv.core.config.memory_usage_high_water * memory_limit as f64) as u64;
+    let config_controller = tikv.cfg_controller.clone().unwrap();
     register_memory_usage_high_water(high_water);
 
     tikv.core.check_conflict_addr();
@@ -179,6 +177,7 @@ fn run_impl<CER: ConfiguredRaftEngine, F: KvFormat>(
                 None as Option<Engines<RocksEngine, CER>>,
                 kv_statistics,
                 raft_statistics,
+                config_controller,
                 Some(service_event_tx),
             )
         });
@@ -192,6 +191,10 @@ fn run_impl<CER: ConfiguredRaftEngine, F: KvFormat>(
                 ServiceEvent::ResumeGrpc => {
                     tikv.resume();
                 }
+                ServiceEvent::GracefulShutdown => {
+                    tikv.graceful_shutdown();
+                    break;
+                }
                 ServiceEvent::Exit => {
                     break;
                 }
@@ -836,6 +839,7 @@ where
             Arc::new(DefaultGrpcMessageFilter::new(
                 server_config.value().reject_messages_on_memory_ratio,
             )),
+            self.core.background_worker.clone(),
         )
         .unwrap_or_else(|e| fatal!("failed to create server: {}", e));
         cfg_controller.register(
@@ -1039,6 +1043,7 @@ where
             Some(self.router.as_ref().unwrap().store_meta().clone()),
             self.resource_manager.clone(),
             Arc::new(region_info_accessor),
+            Default::default(),
         );
         let import_cfg_mgr = import_service.get_config_manager();
 
@@ -1108,6 +1113,7 @@ where
         let cdc_service = cdc::Service::new(
             self.cdc_scheduler.as_ref().unwrap().clone(),
             self.cdc_memory_quota.as_ref().unwrap().clone(),
+            Arc::new(self.core.background_worker.clone()),
         );
         if servers
             .server
@@ -1171,7 +1177,7 @@ where
             self.tablet_registry.clone().unwrap(),
             self.kv_statistics.clone(),
             self.in_memory_engine_statistics.clone(),
-            self.core.config.rocksdb.titan.enabled.map_or(false, |v| v),
+            self.core.config.rocksdb.titan.enabled.is_some_and(|v| v),
             self.engines.as_ref().unwrap().raft_engine.clone(),
             self.raft_statistics.clone(),
         );
@@ -1387,6 +1393,7 @@ where
                 self.resource_manager.clone(),
                 self.grpc_service_mgr.clone(),
                 None,
+                Default::default(),
             ) {
                 Ok(status_server) => Box::new(status_server),
                 Err(e) => {
@@ -1514,6 +1521,54 @@ where
             );
         }
     }
+
+    fn graceful_shutdown(&mut self) {
+        let now = Instant::now();
+        self.set_state(true);
+        self.wait_for_leader_eviction(now);
+        self.set_state(false);
+        std::thread::sleep(Duration::from_millis(200));
+        info!("Graceful shutdown completed");
+    }
+
+    fn wait_for_leader_eviction(&self, now: Instant) {
+        let timeout = self.core.config.server.graceful_shutdown_timeout.0;
+        let region_info_accessor = self.region_info_accessor.as_ref().unwrap();
+        let check_interval = Duration::from_secs(1);
+
+        loop {
+            let leaders_count = region_info_accessor.region_leaders().read().unwrap().len();
+
+            if leaders_count == 0 {
+                info!("All leaders evicted, completing graceful shutdown");
+                break;
+            }
+
+            if now.saturating_elapsed() >= timeout {
+                warn!(
+                    "Graceful shutdown timeout reached with {} leaders remaining",
+                    leaders_count
+                );
+                break;
+            }
+
+            info!("Waiting for leader eviction"; 
+                  "leaders_count" => leaders_count, 
+                  "elapsed" => ?now.saturating_elapsed());
+            std::thread::sleep(check_interval);
+        }
+    }
+
+    fn set_state(&self, state: bool) {
+        if let Some(node) = self.node.as_ref() {
+            let system = node.system();
+            let task = raftstore_v2::PdTask::GracefulShutdownState { state };
+
+            if let Err(e) = system.pd_scheduler().schedule(task) {
+                warn!("Failed to set graceful shutdown state for PD worker"; "error" => ?e);
+            }
+        }
+    }
 }
 
 impl<CER: ConfiguredRaftEngine> TikvServer<CER> {
@@ -1546,6 +1601,7 @@ impl<CER: ConfiguredRaftEngine> TikvServer<CER> {
             &self.core.config,
             block_cache,
             self.core.encryption_key_manager.clone(),
+            Default::default(),
         )
         .sst_recovery_sender(self.init_sst_recovery_sender())
         .flow_listener(flow_listener);
@@ -1669,7 +1725,7 @@ mod test {
 
     use engine_rocks::raw::Env;
     use engine_traits::{
-        FlowControlFactorsExt, MiscExt, SyncMutable, TabletContext, TabletRegistry, CF_DEFAULT,
+        CF_DEFAULT, FlowControlFactorsExt, MiscExt, SyncMutable, TabletContext, TabletRegistry,
     };
     use tempfile::Builder;
     use tikv::{config::TikvConfig, server::KvEngineFactoryBuilder};
@@ -1681,14 +1737,15 @@ mod test {
     fn test_engines_resource_info_update() {
         let mut config = TikvConfig::default();
         config.rocksdb.defaultcf.disable_auto_compactions = true;
-        config.rocksdb.defaultcf.soft_pending_compaction_bytes_limit = Some(ReadableSize(1));
-        config.rocksdb.writecf.soft_pending_compaction_bytes_limit = Some(ReadableSize(1));
-        config.rocksdb.lockcf.soft_pending_compaction_bytes_limit = Some(ReadableSize(1));
+        config.rocksdb.defaultcf.soft_pending_compaction_bytes_limit = ReadableSize(1);
+        config.rocksdb.writecf.soft_pending_compaction_bytes_limit = ReadableSize(1);
+        config.rocksdb.lockcf.soft_pending_compaction_bytes_limit = ReadableSize(1);
         let env = Arc::new(Env::default());
         let path = Builder::new().prefix("test-update").tempdir().unwrap();
         let cache = config.storage.block_cache.build_shared_cache();
 
-        let factory = KvEngineFactoryBuilder::new(env, &config, cache, None).build();
+        let factory =
+            KvEngineFactoryBuilder::new(env, &config, cache, None, Default::default()).build();
         let reg = TabletRegistry::new(Box::new(factory), path.path().join("tablets")).unwrap();
 
         for i in 1..6 {
diff --git a/components/server/src/signal_handler.rs b/components/server/src/signal_handler.rs
index d68dfa98d6f..9141608f0c7 100644
--- a/components/server/src/signal_handler.rs
+++ b/components/server/src/signal_handler.rs
@@ -9,12 +9,15 @@ pub use self::imp::wait_for_signal;
 
 #[cfg(unix)]
 mod imp {
+    use std::time::Duration;
+
     use engine_traits::MiscExt;
     use service::service_event::ServiceEvent;
     use signal_hook::{
         consts::{SIGHUP, SIGINT, SIGTERM, SIGUSR1, SIGUSR2},
         iterator::Signals,
     };
+    use tikv::config::ConfigController;
     use tikv_util::{metrics, mpsc as TikvMpsc};
 
     use super::*;
@@ -24,12 +27,37 @@ mod imp {
         engines: Option<Engines<impl KvEngine, impl RaftEngine>>,
         kv_statistics: Option<Arc<RocksStatistics>>,
         raft_statistics: Option<Arc<RocksStatistics>>,
+        config_controller: ConfigController,
         service_event_tx: Option<TikvMpsc::Sender<ServiceEvent>>,
     ) {
         let mut signals = Signals::new([SIGTERM, SIGINT, SIGHUP, SIGUSR1, SIGUSR2]).unwrap();
         for signal in &mut signals {
+            let enable_graceful_shutdown = config_controller
+                .get_current()
+                .server
+                .graceful_shutdown_timeout
+                .0
+                != Duration::ZERO;
             match signal {
-                SIGTERM | SIGINT | SIGHUP => {
+                SIGTERM => {
+                    if enable_graceful_shutdown {
+                        info!("receive signal {}, starting graceful shutdown...", signal);
+                        if let Some(tx) = service_event_tx {
+                            if let Err(e) = tx.send(ServiceEvent::GracefulShutdown) {
+                                warn!("failed to notify graceful shutdown, {:?}", e);
+                            }
+                        }
+                    } else {
+                        info!("receive signal {}, stopping server...", signal);
+                        if let Some(tx) = service_event_tx {
+                            if let Err(e) = tx.send(ServiceEvent::Exit) {
+                                warn!("failed to notify grpc server exit, {:?}", e);
+                            }
+                        }
+                    }
+                    break;
+                }
+                SIGINT | SIGHUP => {
                     info!("receive signal {}, stopping server...", signal);
                     if let Some(tx) = service_event_tx {
                         if let Err(e) = tx.send(ServiceEvent::Exit) {
diff --git a/components/service/src/service_event.rs b/components/service/src/service_event.rs
index f9423f28df5..f50c995b819 100644
--- a/components/service/src/service_event.rs
+++ b/components/service/src/service_event.rs
@@ -7,7 +7,8 @@ pub enum ServiceEvent {
     // For grpc service.
     PauseGrpc,
     ResumeGrpc,
-    // ...
+    // For graceful shutdown.
+    GracefulShutdown,
     Exit,
 }
 
@@ -16,6 +17,7 @@ impl fmt::Debug for ServiceEvent {
         match self {
             ServiceEvent::PauseGrpc => f.debug_tuple("PauseGrpc").finish(),
             ServiceEvent::ResumeGrpc => f.debug_tuple("ResumeGrpc").finish(),
+            ServiceEvent::GracefulShutdown => f.debug_tuple("GracefulShutdown").finish(),
             ServiceEvent::Exit => f.debug_tuple("Exit").finish(),
         }
     }
diff --git a/components/service/src/service_manager.rs b/components/service/src/service_manager.rs
index 0b69fc00c93..212117374c6 100644
--- a/components/service/src/service_manager.rs
+++ b/components/service/src/service_manager.rs
@@ -1,4 +1,4 @@
-use std::sync::{atomic::Ordering, Arc};
+use std::sync::{Arc, atomic::Ordering};
 
 use atomic::Atomic;
 use crossbeam::channel::SendError;
diff --git a/components/snap_recovery/Cargo.toml b/components/snap_recovery/Cargo.toml
index 557fec0a2cf..aa48453e6bb 100644
--- a/components/snap_recovery/Cargo.toml
+++ b/components/snap_recovery/Cargo.toml
@@ -23,7 +23,7 @@ keys = { workspace = true }
 kvproto = { workspace = true }
 lazy_static = "1.4"
 pd_client = { workspace = true }
-prometheus = { version = "0.13", default_features = false, features = ["nightly"] }
+prometheus = { version = "0.13", default-features = false, features = ["nightly"] }
 prometheus-static-metric = "0.5"
 raft_log_engine = { workspace = true }
 raftstore = { workspace = true }
diff --git a/components/snap_recovery/src/data_resolver.rs b/components/snap_recovery/src/data_resolver.rs
index 90edb8d6348..810676b6cbf 100644
--- a/components/snap_recovery/src/data_resolver.rs
+++ b/components/snap_recovery/src/data_resolver.rs
@@ -11,8 +11,8 @@ use std::{
 
 use engine_rocks::{RocksEngine, RocksEngineIterator, RocksWriteBatchVec};
 use engine_traits::{
-    IterOptions, Iterable, Iterator, Mutable, WriteBatch, WriteBatchExt, WriteOptions, CF_DEFAULT,
-    CF_LOCK, CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_WRITE, IterOptions, Iterable, Iterator, Mutable, WriteBatch,
+    WriteBatchExt, WriteOptions,
 };
 use futures::channel::mpsc::UnboundedSender;
 use kvproto::recoverdatapb::ResolveKvDataResponse;
@@ -306,7 +306,7 @@ impl WriteResolverWorker {
 }
 #[cfg(test)]
 mod tests {
-    use engine_traits::{WriteBatch, WriteBatchExt, ALL_CFS, CF_LOCK};
+    use engine_traits::{ALL_CFS, CF_LOCK, WriteBatch, WriteBatchExt};
     use futures::channel::mpsc;
     use tempfile::Builder;
     use txn_types::{Lock, LockType, WriteType};
diff --git a/components/snap_recovery/src/init_cluster.rs b/components/snap_recovery/src/init_cluster.rs
index c6a14c1e0d3..94366f5c22c 100644
--- a/components/snap_recovery/src/init_cluster.rs
+++ b/components/snap_recovery/src/init_cluster.rs
@@ -1,6 +1,6 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{cmp, error::Error as StdError, i32, result, sync::Arc, thread, time::Duration};
+use std::{cmp, error::Error as StdError, result, sync::Arc, thread, time::Duration};
 
 use encryption_export::data_key_manager_from_config;
 use engine_rocks::util::new_engine_opt;
@@ -12,7 +12,7 @@ use raftstore::store::initial_region;
 use thiserror::Error;
 use tikv::{
     config::TikvConfig,
-    server::{config::Config as ServerConfig, KvEngineFactoryBuilder},
+    server::{KvEngineFactoryBuilder, config::Config as ServerConfig},
 };
 use tikv_util::{
     config::{ReadableDuration, ReadableSize, VersionTrack},
@@ -53,7 +53,7 @@ const MAX_SPLIT_KEY: u64 = 1 << 31;
 /// 2. peer valid during a recovery time even without leader in its region
 /// 3. PD can not put any peer into tombstone
 /// 4. must ensure all region data with ts less than backup ts (below commit
-/// index) are safe
+///    index) are safe
 pub fn enter_snap_recovery_mode(config: &mut TikvConfig) {
     // TOOD: if we do not have to restart TiKV, then, we need exit the recovery mode
     // and bring the following parameter back.
@@ -338,10 +338,15 @@ pub fn create_local_engine_service(
     let block_cache = config.storage.block_cache.build_shared_cache();
 
     // init rocksdb / kv db
-    let factory =
-        KvEngineFactoryBuilder::new(env.clone(), config, block_cache, key_manager.clone())
-            .lite(true)
-            .build();
+    let factory = KvEngineFactoryBuilder::new(
+        env.clone(),
+        config,
+        block_cache,
+        key_manager.clone(),
+        Default::default(),
+    )
+    .lite(true)
+    .build();
     let kv_db = match factory.create_shared_db(&config.storage.data_dir) {
         Ok(db) => db,
         Err(e) => handle_engine_error(e),
diff --git a/components/snap_recovery/src/leader_keeper.rs b/components/snap_recovery/src/leader_keeper.rs
index 3c046f6d7dd..1f1f913e82d 100644
--- a/components/snap_recovery/src/leader_keeper.rs
+++ b/components/snap_recovery/src/leader_keeper.rs
@@ -12,7 +12,7 @@ use futures::compat::Future01CompatExt;
 use raftstore::{
     errors::{Error, Result},
     store::{
-        msg::CampaignType, Callback, CasualMessage, CasualRouter, SignificantMsg, SignificantRouter,
+        Callback, CasualMessage, CasualRouter, SignificantMsg, SignificantRouter, msg::CampaignType,
     },
 };
 use tikv_util::{future::paired_future_callback, timer::GLOBAL_TIMER_HANDLE};
@@ -152,7 +152,7 @@ mod test {
         leaders: RefCell<HashSet<u64>>,
     }
 
-    impl<'a, EK, Router> LeaderKeeper<'a, EK, Router> {
+    impl<EK, Router> LeaderKeeper<'_, EK, Router> {
         fn mut_router(&mut self) -> &mut Router {
             &mut self.router
         }
diff --git a/components/snap_recovery/src/region_meta_collector.rs b/components/snap_recovery/src/region_meta_collector.rs
index 3a88931fae4..929689ce6fb 100644
--- a/components/snap_recovery/src/region_meta_collector.rs
+++ b/components/snap_recovery/src/region_meta_collector.rs
@@ -2,7 +2,7 @@
 
 use std::{cell::RefCell, error::Error as StdError, result, thread::JoinHandle};
 
-use engine_traits::{Engines, KvEngine, RaftEngine, CF_RAFT};
+use engine_traits::{CF_RAFT, Engines, KvEngine, RaftEngine};
 use futures::channel::mpsc::UnboundedSender;
 use kvproto::{
     raft_serverpb::{PeerState, RaftApplyState, RaftLocalState, RegionLocalState},
diff --git a/components/snap_recovery/src/services.rs b/components/snap_recovery/src/services.rs
index 931870a8ae4..6dec1f454bd 100644
--- a/components/snap_recovery/src/services.rs
+++ b/components/snap_recovery/src/services.rs
@@ -6,24 +6,24 @@ use std::{
     future::Future,
     result,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, Ordering},
     },
     thread::Builder,
     time::Instant,
 };
 
 use engine_rocks::{
+    RocksEngine,
     raw::{CompactOptions, DBBottommostLevelCompaction},
     util::get_cf_handle,
-    RocksEngine,
 };
 use engine_traits::{CfNamesExt, CfOptionsExt, Engines, KvEngine, RaftEngine};
 use futures::{
+    FutureExt, SinkExt, StreamExt,
     channel::mpsc,
     executor::{ThreadPool, ThreadPoolBuilder},
     stream::{AbortHandle, Aborted},
-    FutureExt, SinkExt, StreamExt,
 };
 use grpcio::{
     ClientStreamingSink, RequestStream, RpcContext, RpcStatus, RpcStatusCode, ServerStreamingSink,
@@ -33,11 +33,11 @@ use kvproto::{raft_serverpb::StoreIdent, recoverdatapb::*};
 use raftstore::{
     router::RaftStoreRouter,
     store::{
+        SnapshotBrWaitApplySyncer,
         fsm::RaftRouter,
         msg::{PeerMsg, SignificantMsg},
         snapshot_backup::{SnapshotBrWaitApplyRequest, SyncReport},
         transport::SignificantRouter,
-        SnapshotBrWaitApplySyncer,
     },
 };
 use thiserror::Error;
diff --git a/components/sst_importer/Cargo.toml b/components/sst_importer/Cargo.toml
index f3b260a7e87..648c85ad918 100644
--- a/components/sst_importer/Cargo.toml
+++ b/components/sst_importer/Cargo.toml
@@ -7,6 +7,7 @@ license = "Apache-2.0"
 
 [features]
 default = ["test-engine-kv-rocksdb", "test-engine-raft-raft-engine"]
+failpoints = ["fail/failpoints"]
 
 test-engines-rocksdb = [
   "engine_test/test-engines-rocksdb",
@@ -32,6 +33,7 @@ engine_rocks = { workspace = true }
 engine_traits = { workspace = true }
 error_code = { workspace = true }
 external_storage ={ workspace = true }
+fail = "0.5"
 file_system = { workspace = true }
 futures = { version = "0.3", features = ["thread-pool"] }
 futures-util = { version = "0.3", default-features = false, features = ["io"] }
@@ -57,7 +59,7 @@ txn_types = { workspace = true }
 uuid = { version = "0.8.1", features = ["serde", "v4"] }
 
 [dev-dependencies]
-async-compression = { version = "0.4.12", features = ["tokio", "zstd"] }
+async-compression = { version = "0.4.27", features = ["tokio", "zstd"] }
 engine_test = { workspace = true }
 tempfile = "3.0"
 test_sst_importer = { workspace = true }
diff --git a/components/sst_importer/src/caching/cache_map.rs b/components/sst_importer/src/caching/cache_map.rs
index e88e5c3545d..f275f84cbdb 100644
--- a/components/sst_importer/src/caching/cache_map.rs
+++ b/components/sst_importer/src/caching/cache_map.rs
@@ -2,13 +2,13 @@
 
 use std::{
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
     time::Duration,
 };
 
-use dashmap::{mapref::entry::Entry, DashMap};
+use dashmap::{DashMap, mapref::entry::Entry};
 use futures::Future;
 
 use crate::metrics::EXT_STORAGE_CACHE_COUNT;
diff --git a/components/sst_importer/src/caching/storage_cache.rs b/components/sst_importer/src/caching/storage_cache.rs
index 585772c2552..39553b72a7c 100644
--- a/components/sst_importer/src/caching/storage_cache.rs
+++ b/components/sst_importer/src/caching/storage_cache.rs
@@ -34,6 +34,12 @@ impl StoragePool {
             let s = external_storage::create_storage(backend, Default::default())?;
             r.push(Arc::from(s));
         }
+        fail::fail_point!("create_storage_slowly", |_| {
+            futures::executor::block_on(async {
+                tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+            });
+            Err(Error::ErrorWrapper(String::from("failpoint")))
+        });
         Ok(Self(r.into_boxed_slice()))
     }
 
diff --git a/components/sst_importer/src/config.rs b/components/sst_importer/src/config.rs
index 741c90c8e65..61e01aa03af 100644
--- a/components/sst_importer/src/config.rs
+++ b/components/sst_importer/src/config.rs
@@ -6,7 +6,7 @@ use std::{
 };
 
 use online_config::{self, OnlineConfig};
-use tikv_util::{config::ReadableDuration, resizable_threadpool::ResizableRuntime, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration, resizable_threadpool::ResizableRuntime};
 
 #[derive(Clone, Serialize, Deserialize, PartialEq, Debug, OnlineConfig)]
 #[serde(default)]
diff --git a/components/sst_importer/src/errors.rs b/components/sst_importer/src/errors.rs
index 2e6126042ea..b8d5e7ff0fb 100644
--- a/components/sst_importer/src/errors.rs
+++ b/components/sst_importer/src/errors.rs
@@ -1,7 +1,11 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    error::Error as StdError, io::Error as IoError, num::ParseIntError, path::PathBuf, result,
+    error::{Error as StdError, Report},
+    io::Error as IoError,
+    num::ParseIntError,
+    path::PathBuf,
+    result,
     time::Duration,
 };
 
@@ -77,7 +81,7 @@ pub enum Error {
     #[error("{0}")]
     Engine(Box<dyn StdError + Send + Sync + 'static>),
 
-    #[error("Cannot read {url}/{name} into {}: {err}", local_path.display())]
+    #[error("Cannot read {url}/{name} into {}: {}", local_path.display(), Report::new(err))]
     CannotReadExternalStorage {
         url: String,
         name: String,
diff --git a/components/sst_importer/src/import_file.rs b/components/sst_importer/src/import_file.rs
index a7770ddbad5..1c41f71dff7 100644
--- a/components/sst_importer/src/import_file.rs
+++ b/components/sst_importer/src/import_file.rs
@@ -12,14 +12,14 @@ use std::{
 
 use api_version::api_v2::TIDB_RANGES_COMPLEMENT;
 use encryption::{DataKeyManager, EncrypterWriter};
-use engine_traits::{iter_option, Iterator, KvEngine, RefIterable, SstMetaInfo, SstReader};
-use file_system::{sync_dir, File, OpenOptions};
+use engine_traits::{Iterator, KvEngine, RefIterable, SstMetaInfo, SstReader, iter_option};
+use file_system::{File, OpenOptions, sync_dir};
 use keys::data_key;
 use kvproto::{import_sstpb::*, kvrpcpb::ApiVersion};
 use tikv_util::time::Instant;
 use uuid::{Builder as UuidBuilder, Uuid};
 
-use crate::{metrics::*, Error, Result};
+use crate::{Error, Result, metrics::*};
 
 // `SyncableWrite` extends io::Write with sync
 trait SyncableWrite: io::Write + Send {
@@ -413,8 +413,10 @@ impl<E: KvEngine> ImportDir<E> {
 
         for (cf, cf_paths) in paths {
             let files: Vec<&str> = cf_paths.iter().map(|p| p.clone.to_str().unwrap()).collect();
-            // TODO(hwy): Use RocksDB IngestExternalFileOptions.allow_write = true.
-            engine.ingest_external_file_cf(cf, &files, None)?;
+            // TiDB guarantees that region will not receive writes during ingestion.
+            // Set `force_allow_write` to true to minimize the impact on foreground
+            // performance. Refer to https://github.com/tikv/tikv/issues/18081.
+            engine.ingest_external_file_cf(cf, &files, None, true /* force_allow_write */)?;
         }
         INPORTER_INGEST_COUNT.observe(metas.len() as _);
         IMPORTER_INGEST_BYTES.observe(ingest_bytes as _);
diff --git a/components/sst_importer/src/import_mode.rs b/components/sst_importer/src/import_mode.rs
index 0070462892d..756e86f565e 100644
--- a/components/sst_importer/src/import_mode.rs
+++ b/components/sst_importer/src/import_mode.rs
@@ -2,8 +2,8 @@
 
 use std::{
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, Ordering},
     },
     time::{Duration, Instant},
 };
@@ -242,7 +242,7 @@ impl ImportModeCfOptions {
 mod tests {
     use std::thread;
 
-    use engine_traits::{KvEngine, CF_DEFAULT};
+    use engine_traits::{CF_DEFAULT, KvEngine};
     use tempfile::Builder;
     use test_sst_importer::{new_test_engine, new_test_engine_with_options};
     use tikv_util::{config::ReadableDuration, resizable_threadpool::ResizableRuntime};
diff --git a/components/sst_importer/src/lib.rs b/components/sst_importer/src/lib.rs
index 3a7a54a650c..8ad34b29848 100644
--- a/components/sst_importer/src/lib.rs
+++ b/components/sst_importer/src/lib.rs
@@ -2,6 +2,7 @@
 
 //! Importing RocksDB SST files into TiKV
 #![feature(min_specialization)]
+#![feature(error_reporter)]
 
 #[macro_use]
 extern crate serde_derive;
@@ -24,8 +25,8 @@ pub mod sst_importer;
 
 pub use self::{
     config::{Config, ConfigManager},
-    errors::{error_inc, Error, Result},
-    import_file::{sst_meta_to_path, API_VERSION_2},
+    errors::{Error, Result, error_inc},
+    import_file::{API_VERSION_2, sst_meta_to_path},
     import_mode2::range_overlaps,
     sst_importer::SstImporter,
     sst_writer::{RawSstWriter, TxnSstWriter},
diff --git a/components/sst_importer/src/metrics.rs b/components/sst_importer/src/metrics.rs
index f8785f721b2..2519a91c978 100644
--- a/components/sst_importer/src/metrics.rs
+++ b/components/sst_importer/src/metrics.rs
@@ -1,5 +1,6 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
+use lazy_static::lazy_static;
 use prometheus::*;
 
 lazy_static! {
diff --git a/components/sst_importer/src/sst_importer.rs b/components/sst_importer/src/sst_importer.rs
index 432277f8109..d08066ce929 100644
--- a/components/sst_importer/src/sst_importer.rs
+++ b/components/sst_importer/src/sst_importer.rs
@@ -12,17 +12,17 @@ use std::{
 };
 
 use collections::HashSet;
-use dashmap::{mapref::entry::Entry, DashMap};
+use dashmap::{DashMap, mapref::entry::Entry};
 use encryption::{DataKeyManager, FileEncryptionInfo, MultiMasterKeyBackend};
 use encryption_export::create_async_backend;
 use engine_traits::{
-    name_to_cf, util::check_key_in_range, CfName, IterOptions, Iterator, KvEngine, RefIterable,
-    SstCompressionType, SstExt, SstMetaInfo, SstReader, SstWriter, SstWriterBuilder, CF_DEFAULT,
-    CF_WRITE,
+    CF_DEFAULT, CF_WRITE, CfName, IterOptions, Iterator, KvEngine, RefIterable, SstCompressionType,
+    SstExt, SstMetaInfo, SstReader, SstWriter, SstWriterBuilder, name_to_cf,
+    util::check_key_in_range,
 };
 use external_storage::{
-    compression_reader_dispatcher, encrypt_wrap_reader, wrap_with_checksum_reader_if_needed,
-    ExternalStorage, RestoreConfig,
+    ExternalStorage, RestoreConfig, compression_reader_dispatcher, encrypt_wrap_reader,
+    wrap_with_checksum_reader_if_needed,
 };
 use file_system::{IoType, OpenOptions};
 use kvproto::{
@@ -33,6 +33,7 @@ use kvproto::{
     metapb::Region,
 };
 use tikv_util::{
+    Either, HandyRwLock,
     codec::{
         bytes::{decode_bytes_in_place, encode_bytes},
         stream_event::{EventEncoder, EventIterator, Iterator as EIterator},
@@ -40,21 +41,21 @@ use tikv_util::{
     future::RescheduleChecker,
     memory::{MemoryQuota, OwnedAllocated},
     resizable_threadpool::DeamonRuntimeHandle,
-    sys::{thread::ThreadBuildWrapper, SysQuota},
+    sys::{SysQuota, thread::ThreadBuildWrapper},
     time::{Instant, Limiter},
-    Either, HandyRwLock,
 };
 use tokio::{runtime::Runtime, sync::OnceCell};
 use txn_types::{Key, TimeStamp, WriteRef};
 
 use crate::{
+    Config, ConfigManager as ImportConfigManager, Error, Result,
     caching::cache_map::{CacheMap, ShareOwned},
     import_file::{ImportDir, ImportFile},
     import_mode::{ImportModeSwitcher, RocksDbMetricsFn},
     import_mode2::{HashRange, ImportModeSwitcherV2},
     metrics::*,
     sst_writer::{RawSstWriter, TxnSstWriter},
-    util, Config, ConfigManager as ImportConfigManager, Error, Result,
+    util,
 };
 
 pub struct LoadedFile {
@@ -110,10 +111,10 @@ pub enum CacheKvFile {
 /// returns an error on an invalid internal state.
 /// pass the error back to the client side for further debugging.
 fn error(message: impl std::fmt::Display) -> Error {
-    Error::Io(io::Error::new(
-        ErrorKind::Other,
-        format!("internal error in TiKV: {}", message),
-    ))
+    Error::Io(io::Error::other(format!(
+        "internal error in TiKV: {}",
+        message
+    )))
 }
 
 impl CacheKvFile {
@@ -425,7 +426,7 @@ impl<E: KvEngine> SstImporter<E> {
                     "download failed";
                     "meta" => ?meta,
                     "name" => name,
-                    "err" => ?e,
+                    "err" => %e,
                 );
                 Err(e)
             }
@@ -486,6 +487,18 @@ impl<E: KvEngine> SstImporter<E> {
         &self,
         backend: &StorageBackend,
         cache_id: &str,
+    ) -> Result<Arc<dyn ExternalStorage>> {
+        // The `DashMap` locks the entry to ensure that only one thread loads the
+        // credentials at a time. However, if the thread gets blocked during the
+        // loading process, it can lead to a deadlock. To avoid this, blocking
+        // operations must be performed outside of the `DashMap`.
+        tokio::task::block_in_place(|| self.external_storage_or_cache_internal(backend, cache_id))
+    }
+
+    fn external_storage_or_cache_internal(
+        &self,
+        backend: &StorageBackend,
+        cache_id: &str,
     ) -> Result<Arc<dyn ExternalStorage>> {
         // prepare to download the file from the external_storage
         // TODO: pass a config to support hdfs
@@ -520,13 +533,7 @@ impl<E: KvEngine> SstImporter<E> {
             })?;
         }
 
-        // The `DashMap` locks the entry to ensure that only one thread loads the
-        // credentials at a time. However, if the thread gets blocked during the
-        // loading process, it can lead to a deadlock. To avoid this, blocking
-        // operations must be performed outside of the `DashMap`.
-        let ext_storage = tokio::task::block_in_place(move || {
-            self.external_storage_or_cache(backend, cache_key)
-        })?;
+        let ext_storage = self.external_storage_or_cache(backend, cache_key)?;
         let ext_storage = self.auto_encrypt_local_file_if_needed(ext_storage);
 
         let result = ext_storage
@@ -538,7 +545,35 @@ impl<E: KvEngine> SstImporter<E> {
                 restore_config,
             )
             .await;
-        IMPORTER_DOWNLOAD_BYTES.observe(file_length as _);
+
+        // Clean up temporary file if download failed
+        if let Err(ref err) = result {
+            warn!("download failed, cleaning up temporary file";
+                "src_file" => src_file_name,
+                "dst_file" => %dst_file.display(),
+                "error" => %err
+            );
+
+            // Attempt to remove the partially downloaded file
+            if dst_file.exists() {
+                if let Some(ref manager) = self.key_manager {
+                    if let Err(cleanup_err) = manager.delete_file(dst_file.to_str().unwrap(), None)
+                    {
+                        warn!("failed to remove encryption metadata for temporary file";
+                            "file" => %dst_file.display(),
+                            "error" => %cleanup_err
+                        );
+                    }
+                }
+                if let Err(cleanup_err) = file_system::remove_file(&dst_file) {
+                    warn!("failed to remove temporary file after download failure";
+                        "file" => %dst_file.display(),
+                        "error" => %cleanup_err
+                    );
+                }
+            }
+        }
+
         result.map_err(|e| Error::CannotReadExternalStorage {
             url: util::url_for(&ext_storage),
             name: src_file_name.to_owned(),
@@ -546,6 +581,9 @@ impl<E: KvEngine> SstImporter<E> {
             err: e,
         })?;
 
+        // Only record successful download bytes
+        IMPORTER_DOWNLOAD_BYTES.observe(file_length as _);
+
         OpenOptions::new()
             .append(true)
             .open(dst_file)?
@@ -1735,18 +1773,17 @@ mod tests {
         io::{self, Cursor},
         ops::Sub,
         sync::{
-            atomic::{AtomicUsize, Ordering},
             Mutex,
+            atomic::{AtomicUsize, Ordering},
         },
-        usize,
     };
 
     use async_compression::tokio::write::ZstdEncoder;
     use encryption::{EncrypterWriter, Iv};
     use engine_rocks::get_env;
     use engine_traits::{
-        collect, Error as TraitError, ExternalSstFileInfo, Iterable, Iterator, RefIterable,
-        SstCompressionType::Zstd, SstReader, SstWriter, CF_DEFAULT, DATA_CFS,
+        CF_DEFAULT, DATA_CFS, Error as TraitError, ExternalSstFileInfo, Iterable, Iterator,
+        RefIterable, SstCompressionType::Zstd, SstReader, SstWriter, collect,
     };
     use external_storage::read_external_storage_info_buff;
     use file_system::Sha256Reader;
@@ -2311,7 +2348,7 @@ mod tests {
 
     #[test]
     fn test_read_external_storage_into_file_timed_out() {
-        use futures_util::stream::{pending, TryStreamExt};
+        use futures_util::stream::{TryStreamExt, pending};
 
         let mut input = pending::<io::Result<&[u8]>>().into_async_read();
         let mut output = Vec::new();
@@ -2398,7 +2435,7 @@ mod tests {
 
     #[test]
     fn test_read_external_storage_info_buff_timed_out() {
-        use futures_util::stream::{pending, TryStreamExt};
+        use futures_util::stream::{TryStreamExt, pending};
 
         let mut input = pending::<io::Result<&[u8]>>().into_async_read();
         let err = block_on_external_io(read_external_storage_info_buff(
@@ -3446,6 +3483,53 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_download_cleanup_on_failure() {
+        let ext_sst_dir = tempfile::tempdir().unwrap();
+        // Create an invalid/corrupted SST file that will cause download to fail
+        file_system::write(
+            ext_sst_dir.path().join("invalid.sst"),
+            b"invalid sst content",
+        )
+        .unwrap();
+
+        let mut meta = SstMeta::default();
+        meta.set_uuid(vec![0u8; 16]);
+        meta.set_length(100); // Set expected length different from actual file size
+
+        let importer_dir = tempfile::tempdir().unwrap();
+        let cfg = Config::default();
+        let importer =
+            SstImporter::<TestEngine>::new(&cfg, &importer_dir, None, ApiVersion::V1, false)
+                .unwrap();
+
+        let db = create_sst_test_engine().unwrap();
+        let backend = external_storage::make_local_backend(ext_sst_dir.path());
+
+        // Get the expected temporary file path
+        let temp_path = importer.dir.join_for_write(&meta).unwrap().temp;
+
+        // Attempt download - this should fail due to length mismatch
+        let result = importer.download(
+            &meta,
+            &backend,
+            "invalid.sst",
+            &RewriteRule::default(),
+            None,
+            Limiter::new(f64::INFINITY),
+            db,
+        );
+
+        // Verify download failed
+        result.unwrap_err();
+
+        // Verify temporary file was cleaned up
+        assert!(
+            !temp_path.exists(),
+            "temporary file should be cleaned up after download failure"
+        );
+    }
+
     #[test]
     fn test_download_sst_empty() {
         let (_ext_sst_dir, backend, mut meta) = create_sample_external_sst_file().unwrap();
@@ -3977,4 +4061,39 @@ mod tests {
             check_file_exists(&path.save, opt_key_manager.as_deref());
         }
     }
+
+    #[test]
+    fn test_download_stuck() {
+        let rt = tokio::runtime::Builder::new_multi_thread()
+            .worker_threads(4)
+            .enable_all()
+            .build()
+            .unwrap();
+        let importer = SstImporter::<TestEngine>::new(
+            &Config::default(),
+            tempfile::tempdir().unwrap(),
+            None,
+            ApiVersion::V1,
+            false,
+        )
+        .unwrap();
+        let importer = Arc::from(importer);
+        fail::cfg("create_storage_slowly", "return").unwrap();
+        let mut joins = Vec::new();
+        for _ in 0..10 {
+            let importer_cloned = importer.clone();
+            let j = rt.spawn(async move {
+                let mut backend = StorageBackend::new();
+                backend.set_noop(Default::default());
+                importer_cloned.external_storage_or_cache(&backend, "test")
+            });
+            joins.push(j);
+        }
+        rt.block_on(async {
+            for j in joins {
+                let _ = j.await.unwrap();
+            }
+        });
+        fail::remove("create_storage_slowly");
+    }
 }
diff --git a/components/sst_importer/src/sst_writer.rs b/components/sst_importer/src/sst_writer.rs
index 75d0d312a9e..a7ba5b0262c 100644
--- a/components/sst_importer/src/sst_writer.rs
+++ b/components/sst_importer/src/sst_writer.rs
@@ -2,14 +2,14 @@
 
 use std::sync::Arc;
 
-use api_version::{dispatch_api_version, match_template_api_version, KeyMode, KvFormat, RawValue};
+use api_version::{KeyMode, KvFormat, RawValue, dispatch_api_version, match_template_api_version};
 use encryption::DataKeyManager;
-use engine_traits::{raw_ttl::ttl_to_expire_ts, KvEngine, SstWriter};
+use engine_traits::{KvEngine, SstWriter, raw_ttl::ttl_to_expire_ts};
 use kvproto::{import_sstpb::*, kvrpcpb::ApiVersion};
 use tikv_util::time::Instant;
-use txn_types::{is_short_value, Key, TimeStamp, Write as KvWrite, WriteType};
+use txn_types::{Key, TimeStamp, Write as KvWrite, WriteType, is_short_value};
 
-use crate::{import_file::ImportPath, metrics::*, Error, Result};
+use crate::{Error, Result, import_file::ImportPath, metrics::*};
 
 #[derive(Debug)]
 pub enum SstWriterType {
diff --git a/components/sst_importer/src/util.rs b/components/sst_importer/src/util.rs
index c20ef14ea28..08f5d556a48 100644
--- a/components/sst_importer/src/util.rs
+++ b/components/sst_importer/src/util.rs
@@ -123,12 +123,12 @@ mod tests {
 
     use encryption::DataKeyManager;
     use engine_rocks::{
-        util::new_engine_opt, RocksCfOptions, RocksDbOptions, RocksEngine, RocksSstWriterBuilder,
-        RocksTitanDbOptions,
+        RocksCfOptions, RocksDbOptions, RocksEngine, RocksSstWriterBuilder, RocksTitanDbOptions,
+        util::new_engine_opt,
     };
     use engine_traits::{
-        CfName, CfOptions, DbOptions, ImportExt, Peekable, SstWriter, SstWriterBuilder,
-        TitanCfOptions, CF_DEFAULT,
+        CF_DEFAULT, CfName, CfOptions, DbOptions, ImportExt, Peekable, SstWriter, SstWriterBuilder,
+        TitanCfOptions,
     };
     use tempfile::Builder;
     use test_util::encryption::new_test_key_manager;
@@ -210,8 +210,13 @@ mod tests {
         prepare_sst_for_ingestion(&sst_path, &sst_clone, key_manager).unwrap();
         check_hard_link(&sst_path, 2);
         check_hard_link(&sst_clone, 2);
-        db.ingest_external_file_cf(CF_DEFAULT, &[sst_clone.to_str().unwrap()], None)
-            .unwrap();
+        db.ingest_external_file_cf(
+            CF_DEFAULT,
+            &[sst_clone.to_str().unwrap()],
+            None,
+            false, // force_allow_write
+        )
+        .unwrap();
         check_db_with_kvs(&db, CF_DEFAULT, &kvs);
         assert!(!sst_clone.exists());
         // Since we are not using key_manager in db, simulate the db deleting the file
@@ -227,8 +232,13 @@ mod tests {
         prepare_sst_for_ingestion(&sst_path, &sst_clone, key_manager).unwrap();
         check_hard_link(&sst_path, 2);
         check_hard_link(&sst_clone, 1);
-        db.ingest_external_file_cf(CF_DEFAULT, &[sst_clone.to_str().unwrap()], None)
-            .unwrap();
+        db.ingest_external_file_cf(
+            CF_DEFAULT,
+            &[sst_clone.to_str().unwrap()],
+            None,
+            false, // force_allow_write
+        )
+        .unwrap();
         check_db_with_kvs(&db, CF_DEFAULT, &kvs);
         assert!(!sst_clone.exists());
     }
@@ -305,8 +315,13 @@ mod tests {
         check_hard_link(&sst_path, 1);
         check_hard_link(&sst_clone, 1);
 
-        db.ingest_external_file_cf(CF_DEFAULT, &[sst_clone.to_str().unwrap()], None)
-            .unwrap();
+        db.ingest_external_file_cf(
+            CF_DEFAULT,
+            &[sst_clone.to_str().unwrap()],
+            None,
+            false, // force_allow_write
+        )
+        .unwrap();
         check_db_with_kvs(&db, CF_DEFAULT, &kvs);
         assert!(!sst_clone.exists());
     }
diff --git a/components/test_backup/src/disk_snap.rs b/components/test_backup/src/disk_snap.rs
index 0f06efa53a8..8b5574b8b52 100644
--- a/components/test_backup/src/disk_snap.rs
+++ b/components/test_backup/src/disk_snap.rs
@@ -24,12 +24,12 @@ use kvproto::{
     metapb::Region,
     raft_cmdpb::RaftCmdResponse,
 };
-use raftstore::store::{snapshot_backup::PrepareDiskSnapObserver, Callback, WriteResponse};
+use raftstore::store::{Callback, WriteResponse, snapshot_backup::PrepareDiskSnapObserver};
 use test_raftstore::*;
 use tikv_util::{
+    HandyRwLock,
     future::{block_on_timeout, paired_future_callback},
     worker::dummy_scheduler,
-    HandyRwLock,
 };
 
 pub struct Node {
diff --git a/components/test_backup/src/lib.rs b/components/test_backup/src/lib.rs
index cf68db05833..58b63f3b976 100644
--- a/components/test_backup/src/lib.rs
+++ b/components/test_backup/src/lib.rs
@@ -8,12 +8,12 @@ use std::{
     time::Duration,
 };
 
-use api_version::{dispatch_api_version, keyspace::KvPair, ApiV1, KvFormat, RawValue};
+use api_version::{ApiV1, KvFormat, RawValue, dispatch_api_version, keyspace::KvPair};
 use backup::Task;
 use collections::HashMap;
 // NOTE: Perhaps we'd better use test engine here. But it seems for now we cannot initialize a
 // mock cluster with `PanicEngine` and in our CI environment clippy will complain that.
-use engine_traits::{CfName, IterOptions, CF_DEFAULT, CF_WRITE, DATA_KEY_PREFIX_LEN};
+use engine_traits::{CF_DEFAULT, CF_WRITE, CfName, DATA_KEY_PREFIX_LEN, IterOptions};
 use external_storage::make_local_backend;
 use futures::{channel::mpsc as future_mpsc, executor::block_on};
 use grpcio::{ChannelBuilder, Environment};
@@ -21,22 +21,22 @@ use kvproto::{brpb::*, kvrpcpb::*, tikvpb::TikvClient};
 use rand::Rng;
 use test_raftstore::*;
 use tidb_query_common::storage::{
-    scanner::{RangesScanner, RangesScannerOptions},
     IntervalRange, Range,
+    scanner::{RangesScanner, RangesScannerOptions},
 };
 use tikv::{
     config::BackupConfig,
     coprocessor::{checksum_crc64_xor, dag::TikvStorage},
     storage::{
-        kv::{Engine, LocalTablets, SnapContext},
         SnapshotStore,
+        kv::{Engine, LocalTablets, SnapContext},
     },
 };
 use tikv_util::{
+    HandyRwLock,
     config::ReadableSize,
     time::Instant,
     worker::{LazyWorker, Worker},
-    HandyRwLock,
 };
 use txn_types::TimeStamp;
 
diff --git a/components/test_coprocessor/src/column.rs b/components/test_coprocessor/src/column.rs
index 0fb40aa871f..9162b83f08e 100644
--- a/components/test_coprocessor/src/column.rs
+++ b/components/test_coprocessor/src/column.rs
@@ -1,7 +1,7 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 use tidb_query_datatype::{
-    codec::{datum, Datum},
+    codec::{Datum, datum},
     expr::EvalContext,
 };
 use tipb::{ColumnInfo, FieldType};
diff --git a/components/test_coprocessor/src/dag.rs b/components/test_coprocessor/src/dag.rs
index 07f7155b2f9..d9726b02d4c 100644
--- a/components/test_coprocessor/src/dag.rs
+++ b/components/test_coprocessor/src/dag.rs
@@ -1,16 +1,18 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
+use std::mem;
+
 use kvproto::{
     coprocessor::{KeyRange, Request},
     kvrpcpb::Context,
 };
 use protobuf::Message;
-use tidb_query_datatype::codec::{datum, Datum};
+use tidb_query_datatype::codec::{Datum, datum};
 use tikv::coprocessor::REQ_TYPE_DAG;
 use tikv_util::codec::number::NumberEncoder;
 use tipb::{
     Aggregation, ByItem, Chunk, ColumnInfo, DagRequest, ExecType, Executor, Expr, ExprType,
-    IndexScan, Limit, Selection, TableScan, TopN,
+    IndexLookUp, IndexScan, IntermediateOutputChannel, Limit, Selection, TableScan, TopN,
 };
 use txn_types::TimeStamp;
 
@@ -27,6 +29,7 @@ pub struct DagSelect {
     pub output_offsets: Option<Vec<u32>>,
     pub paging_size: Option<u64>,
     pub start_ts: Option<u64>,
+    pub intermediate_outputs: Vec<IntermediateOutputChannel>,
 }
 
 impl DagSelect {
@@ -51,6 +54,7 @@ impl DagSelect {
             output_offsets: None,
             paging_size: None,
             start_ts: None,
+            intermediate_outputs: vec![],
         }
     }
 
@@ -79,9 +83,50 @@ impl DagSelect {
             output_offsets: None,
             paging_size: None,
             start_ts: None,
+            intermediate_outputs: vec![],
         }
     }
 
+    pub fn index_lookup(mut self, table: &Table, handle_offset: Vec<u32>) -> DagSelect {
+        if let Some(l) = self.limit.take() {
+            let mut exec = Executor::default();
+            exec.set_tp(ExecType::TypeLimit);
+            exec.set_limit({
+                let mut limit = Limit::default();
+                limit.set_limit(l);
+                limit
+            });
+            self.execs.push(exec);
+        }
+        let exec_len = self.execs.len() + 2;
+        self.execs[exec_len - 3].set_parent_idx(exec_len as u32 - 1);
+        let table_scan_dag = Self::from(table);
+        self.execs.push(table_scan_dag.execs[0].clone());
+        self.execs.push({
+            let mut exec = Executor::default();
+            exec.set_tp(ExecType::TypeIndexLookUp);
+            exec.set_index_lookup({
+                let mut index_lookup = IndexLookUp::default();
+                index_lookup.set_index_handle_offsets(handle_offset);
+                index_lookup
+            });
+            exec
+        });
+        self.intermediate_outputs.push({
+            let mut channel = IntermediateOutputChannel::default();
+            channel.set_executor_idx(exec_len as u32 - 1);
+            if let Some(output_offsets) = self.output_offsets.take() {
+                channel.set_output_offsets(output_offsets);
+            } else {
+                channel.set_output_offsets((0..self.cols.len() as u32).collect());
+            }
+            channel
+        });
+        self.cols = table_scan_dag.cols;
+        self.output_offsets = table_scan_dag.output_offsets;
+        self
+    }
+
     #[must_use]
     pub fn limit(mut self, n: u64) -> DagSelect {
         self.limit = Some(n);
@@ -198,6 +243,17 @@ impl DagSelect {
         self
     }
 
+    #[must_use]
+    pub fn projection(mut self, exprs: Vec<Expr>) -> DagSelect {
+        let mut exec = Executor::default();
+        exec.set_tp(ExecType::TypeProjection);
+        let mut projection = tipb::Projection::default();
+        projection.set_exprs(exprs.into());
+        exec.set_projection(projection);
+        self.execs.push(exec);
+        self
+    }
+
     #[must_use]
     pub fn desc(mut self, desc: bool) -> DagSelect {
         self.execs[0].mut_tbl_scan().set_desc(desc);
@@ -274,6 +330,7 @@ impl DagSelect {
             (0..self.cols.len() as u32).collect()
         };
         dag.set_output_offsets(output_offsets);
+        dag.set_intermediate_output_channels(mem::take(&mut self.intermediate_outputs).into());
 
         let mut req = Request::default();
         req.set_start_ts(self.start_ts.unwrap_or_else(|| next_id() as u64));
diff --git a/components/test_coprocessor/src/fixture.rs b/components/test_coprocessor/src/fixture.rs
index 863e24b980f..acd39b8e5d0 100644
--- a/components/test_coprocessor/src/fixture.rs
+++ b/components/test_coprocessor/src/fixture.rs
@@ -6,15 +6,15 @@ use concurrency_manager::ConcurrencyManager;
 use kvproto::kvrpcpb::Context;
 use pd_client::PdClient;
 use resource_metering::ResourceTagFactory;
-use tidb_query_datatype::codec::{row::v2::CODEC_VERSION, Datum};
+use tidb_query_datatype::codec::{Datum, row::v2::CODEC_VERSION};
 use tikv::{
     config::CoprReadPoolConfig,
-    coprocessor::{readpool_impl, Endpoint},
+    coprocessor::{Endpoint, readpool_impl},
     read_pool::ReadPool,
     server::Config,
     storage::{
-        kv::RocksEngine, lock_manager::MockLockManager, Engine, TestEngineBuilder,
-        TestStorageBuilderApiV1,
+        Engine, TestEngineBuilder, TestStorageBuilderApiV1, kv::RocksEngine,
+        lock_manager::MockLockManager,
     },
 };
 use tikv_util::{quota_limiter::QuotaLimiter, thread_group::GroupProperties};
diff --git a/components/test_coprocessor/src/store.rs b/components/test_coprocessor/src/store.rs
index 72d4c3ce157..e2b690aef21 100644
--- a/components/test_coprocessor/src/store.rs
+++ b/components/test_coprocessor/src/store.rs
@@ -8,20 +8,21 @@ use pd_client::PdClient;
 use test_storage::SyncTestStorageApiV1;
 use tidb_query_datatype::{
     codec::{
+        Datum,
         data_type::ScalarValue,
         datum,
         row::v2::encoder_for_test::{Column as ColumnV2, RowEncoder},
-        table, Datum,
+        table,
     },
     expr::EvalContext,
 };
 use tikv::{
     server::gc_worker::GcConfig,
     storage::{
+        SnapshotStore, StorageApiV1, TestStorageBuilderApiV1,
         kv::{Engine, RocksEngine},
         lock_manager::MockLockManager,
         txn::FixtureStore,
-        SnapshotStore, StorageApiV1, TestStorageBuilderApiV1,
     },
 };
 use tikv_util::future::block_on_timeout;
@@ -238,6 +239,7 @@ impl<E: Engine> Store<E> {
     }
 
     pub fn delete(&mut self, ctx: Context, mut keys: Vec<Vec<u8>>) {
+        keys.dedup();
         self.handles.extend(keys.clone());
         let pk = keys[0].clone();
         let mutations = keys
diff --git a/components/test_pd/src/lib.rs b/components/test_pd/src/lib.rs
index bd768e58318..0313a91c1bb 100644
--- a/components/test_pd/src/lib.rs
+++ b/components/test_pd/src/lib.rs
@@ -1,6 +1,4 @@
 // Copyright 2017 TiKV Project Authors. Licensed under Apache-2.0.
-#![feature(slice_group_by)]
-
 #[macro_use]
 extern crate tikv_util;
 #[macro_use]
diff --git a/components/test_pd/src/mocker/etcd.rs b/components/test_pd/src/mocker/etcd.rs
index d0fe3f43e68..651e3e2fc3c 100644
--- a/components/test_pd/src/mocker/etcd.rs
+++ b/components/test_pd/src/mocker/etcd.rs
@@ -45,7 +45,7 @@ impl Etcd {
             ))
             .collect::<Vec<_>>()
             .as_slice()
-            .group_by(|item1, item2| item1.0.0 == item2.0.0)
+            .chunk_by(|item1, item2| item1.0.0 == item2.0.0)
             .filter_map(|group| {
                 let (k, v) = group.last()?;
                 match v {
diff --git a/components/test_pd/src/mocker/meta_storage.rs b/components/test_pd/src/mocker/meta_storage.rs
index 360e496f44e..9657a110c34 100644
--- a/components/test_pd/src/mocker/meta_storage.rs
+++ b/components/test_pd/src/mocker/meta_storage.rs
@@ -2,7 +2,7 @@
 
 use std::sync::{Arc, Mutex};
 
-use futures::{executor::block_on, SinkExt, StreamExt};
+use futures::{SinkExt, StreamExt, executor::block_on};
 use grpcio::{RpcStatus, RpcStatusCode};
 use kvproto::meta_storagepb as mpb;
 
@@ -123,16 +123,6 @@ impl PdMocker for MetaStorage {
                 let mut resp = mpb::WatchResponse::default();
                 resp.set_events(vec![event].into());
                 sink.send((resp, Default::default())).await.unwrap();
-
-                #[cfg(feature = "failpoints")]
-                {
-                    use futures::executor::block_on;
-                    let cli_clone = cli.clone();
-                    fail_point!("watch_meta_storage_return", |_| {
-                        block_on(async move { cli_clone.lock().await.clear_subs() });
-                        watcher.close();
-                    });
-                }
             }
         });
         true
diff --git a/components/test_pd/src/mocker/service.rs b/components/test_pd/src/mocker/service.rs
index 92a5107c873..05ae79983dd 100644
--- a/components/test_pd/src/mocker/service.rs
+++ b/components/test_pd/src/mocker/service.rs
@@ -1,8 +1,8 @@
 // Copyright 2017 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::sync::{
-    atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
     Mutex,
+    atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
 };
 
 use collections::HashMap;
diff --git a/components/test_pd/src/server.rs b/components/test_pd/src/server.rs
index 8c42ea642f5..577a6990bb3 100644
--- a/components/test_pd/src/server.rs
+++ b/components/test_pd/src/server.rs
@@ -2,21 +2,21 @@
 
 use std::{
     sync::{
-        atomic::{AtomicI64, Ordering},
         Arc,
+        atomic::{AtomicI64, Ordering},
     },
     thread,
     time::Duration,
 };
 
 use fail::fail_point;
-use futures::{future, SinkExt, TryFutureExt, TryStreamExt};
+use futures::{SinkExt, TryFutureExt, TryStreamExt, future};
 use grpcio::{
     ClientStreamingSink, DuplexSink, EnvBuilder, RequestStream, RpcContext, RpcStatus,
     RpcStatusCode, Server as GrpcServer, ServerBuilder, UnarySink, WriteFlags,
 };
 use kvproto::{
-    meta_storagepb_grpc::{create_meta_storage, MetaStorage},
+    meta_storagepb_grpc::{MetaStorage, create_meta_storage},
     pdpb::*,
     resource_manager,
     resource_manager_grpc::create_resource_manager,
diff --git a/components/test_pd_client/src/pd.rs b/components/test_pd_client/src/pd.rs
index e8e6ef0b715..ca2890725c6 100644
--- a/components/test_pd_client/src/pd.rs
+++ b/components/test_pd_client/src/pd.rs
@@ -7,8 +7,8 @@ use std::{
         Bound::{Excluded, Unbounded},
     },
     sync::{
-        atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
         Arc, RwLock,
+        atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
     },
     time::Duration,
 };
@@ -19,7 +19,7 @@ use futures::{
     channel::mpsc::{self, UnboundedReceiver, UnboundedSender},
     compat::Future01CompatExt,
     executor::block_on,
-    future::{err, ok, ready, BoxFuture, FutureExt},
+    future::{BoxFuture, FutureExt, err, ok, ready},
     stream,
     stream::StreamExt,
 };
@@ -40,13 +40,13 @@ use pd_client::{
 };
 use raft::eraftpb::ConfChangeType;
 use tikv_util::{
-    store::{check_key_in_region, find_peer, find_peer_by_id, is_learner, new_peer, QueryStats},
+    Either, HandyRwLock,
+    store::{QueryStats, check_key_in_region, find_peer, find_peer_by_id, is_learner, new_peer},
     time::{Instant, UnixSecs},
     timer::GLOBAL_TIMER_HANDLE,
-    Either, HandyRwLock,
 };
 use tokio_timer::timer::Handle;
-use txn_types::{TimeStamp, TSO_PHYSICAL_SHIFT_BITS};
+use txn_types::{TSO_PHYSICAL_SHIFT_BITS, TimeStamp};
 
 use super::*;
 
@@ -529,7 +529,7 @@ impl PdCluster {
         if self
             .stores
             .get(&store_id)
-            .map_or(true, |s| s.store.get_id() != 0)
+            .is_none_or(|s| s.store.get_id() != 0)
         {
             self.stores.insert(
                 store_id,
@@ -1079,10 +1079,10 @@ impl TestPdClient {
             };
             let add = add_peers
                 .iter()
-                .all(|peer| find_peer(&region, peer.get_store_id()).map_or(false, |p| p == peer));
+                .all(|peer| find_peer(&region, peer.get_store_id()).is_some_and(|p| p == peer));
             let remove = remove_peers
                 .iter()
-                .all(|peer| find_peer(&region, peer.get_store_id()).map_or(true, |p| p != peer));
+                .all(|peer| find_peer(&region, peer.get_store_id()) != Some(peer));
             if add && remove {
                 return;
             }
@@ -1395,7 +1395,7 @@ impl TestPdClient {
             .rl()
             .leaders
             .get(&region_id)
-            .map_or(false, |p| *p == peer)
+            .is_some_and(|p| *p == peer)
     }
 
     // check whether region is split by split_key or not.
diff --git a/components/test_raftstore-v2/src/cluster.rs b/components/test_raftstore-v2/src/cluster.rs
index cf61dbfdcdd..6e259f2c041 100644
--- a/components/test_raftstore-v2/src/cluster.rs
+++ b/components/test_raftstore-v2/src/cluster.rs
@@ -13,12 +13,12 @@ use encryption_export::DataKeyManager;
 use engine_rocks::{RocksSnapshot, RocksStatistics};
 use engine_test::raft::RaftTestEngine;
 use engine_traits::{
-    KvEngine, Peekable, RaftEngine, RaftEngineReadOnly, RaftLogBatch, ReadOptions, SyncMutable,
-    TabletRegistry, CF_DEFAULT,
+    CF_DEFAULT, KvEngine, Peekable, RaftEngine, RaftEngineReadOnly, RaftLogBatch, ReadOptions,
+    SyncMutable, TabletRegistry,
 };
 use file_system::IoRateLimiter;
-use futures::{executor::block_on, future::BoxFuture, Future};
-use keys::{data_key, validate_data_key, DATA_PREFIX_KEY};
+use futures::{Future, executor::block_on, future::BoxFuture};
+use keys::{DATA_PREFIX_KEY, data_key, validate_data_key};
 use kvproto::{
     errorpb::Error as PbError,
     kvrpcpb::ApiVersion,
@@ -35,37 +35,37 @@ use kvproto::{
 };
 use pd_client::PdClient;
 use raftstore::{
+    Error, Result,
     store::{
-        cmd_resp, initial_region, region_meta::RegionMeta, util::check_key_in_region, Bucket,
-        BucketRange, Callback, RaftCmdExtraOpts, RegionSnapshot, TabletSnapManager, WriteResponse,
-        INIT_EPOCH_CONF_VER, INIT_EPOCH_VER,
+        Bucket, BucketRange, Callback, INIT_EPOCH_CONF_VER, INIT_EPOCH_VER, RaftCmdExtraOpts,
+        RegionSnapshot, TabletSnapManager, WriteResponse, cmd_resp, initial_region,
+        region_meta::RegionMeta, util::check_key_in_region,
     },
-    Error, Result,
 };
 use raftstore_v2::{
+    SimpleWriteEncoder, StoreMeta, StoreRouter,
     router::{DebugInfoChannel, PeerMsg, QueryResult, StoreMsg, StoreTick},
-    write_initial_states, SimpleWriteEncoder, StoreMeta, StoreRouter,
+    write_initial_states,
 };
 use resource_control::ResourceGroupManager;
 use tempfile::TempDir;
 use test_pd_client::TestPdClient;
 use test_raftstore::{
-    check_raft_cmd_request, is_error_response, new_admin_request, new_delete_cmd,
-    new_delete_range_cmd, new_get_cf_cmd, new_peer, new_prepare_merge, new_put_cf_cmd, new_put_cmd,
-    new_region_detail_cmd, new_region_leader_cmd, new_request, new_status_request, new_store,
-    new_tikv_config_with_api_ver, new_transfer_leader_cmd, sleep_ms, Config, Filter, FilterFactory,
-    PartitionFilterFactory, RawEngine,
+    Config, Filter, FilterFactory, PartitionFilterFactory, RawEngine, check_raft_cmd_request,
+    is_error_response, new_admin_request, new_delete_cmd, new_delete_range_cmd, new_get_cf_cmd,
+    new_peer, new_prepare_merge, new_put_cf_cmd, new_put_cmd, new_region_detail_cmd,
+    new_region_leader_cmd, new_request, new_status_request, new_store,
+    new_tikv_config_with_api_ver, new_transfer_leader_cmd, sleep_ms,
 };
 use tikv::{config::TikvConfig, server::Result as ServerResult, storage::config::EngineType};
 use tikv_util::{
-    box_err, box_try, debug, error,
+    HandyRwLock, box_err, box_try, debug, error,
     future::block_on_timeout,
     safe_panic,
     thread_group::GroupProperties,
     time::{Instant, ThreadReadId},
     warn,
     worker::LazyWorker,
-    HandyRwLock,
 };
 use txn_types::WriteBatchFlags;
 
diff --git a/components/test_raftstore-v2/src/node.rs b/components/test_raftstore-v2/src/node.rs
index 2bb96622066..24a13cd6451 100644
--- a/components/test_raftstore-v2/src/node.rs
+++ b/components/test_raftstore-v2/src/node.rs
@@ -17,19 +17,19 @@ use kvproto::{
     raft_cmdpb::{RaftCmdRequest, RaftCmdResponse},
     raft_serverpb::RaftMessage,
 };
-use raft::{prelude::MessageType, SnapshotStatus};
+use raft::{SnapshotStatus, prelude::MessageType};
 use raftstore::{
+    Result,
     coprocessor::CoprocessorHost,
     errors::Error as RaftError,
     store::{
-        config::RaftstoreConfigManager, AutoSplitController, GlobalReplicationState,
-        RegionSnapshot, SplitConfigManager, TabletSnapKey, TabletSnapManager, Transport,
+        AutoSplitController, GlobalReplicationState, RegionSnapshot, SplitConfigManager,
+        TabletSnapKey, TabletSnapManager, Transport, config::RaftstoreConfigManager,
     },
-    Result,
 };
 use raftstore_v2::{
-    router::{PeerMsg, RaftRouter},
     StateStorage, StoreMeta, StoreRouter,
+    router::{PeerMsg, RaftRouter},
 };
 use resource_control::ResourceGroupManager;
 use resource_metering::CollectorRegHandle;
@@ -41,8 +41,8 @@ use tikv::{
     config::{ConfigController, Module},
     import::SstImporter,
     server::{
-        raftkv::ReplicaReadLockChecker, tablet_snap::copy_tablet_snapshot, NodeV2,
-        Result as ServerResult,
+        NodeV2, Result as ServerResult, raftkv::ReplicaReadLockChecker,
+        tablet_snap::copy_tablet_snapshot,
     },
 };
 use tikv_util::{
diff --git a/components/test_raftstore-v2/src/server.rs b/components/test_raftstore-v2/src/server.rs
index 8be0cc57dc4..c2345c96919 100644
--- a/components/test_raftstore-v2/src/server.rs
+++ b/components/test_raftstore-v2/src/server.rs
@@ -7,7 +7,7 @@ use std::{
     time::Duration,
 };
 
-use api_version::{dispatch_api_version, KvFormat};
+use api_version::{KvFormat, dispatch_api_version};
 use causal_ts::CausalTsProviderImpl;
 use collections::{HashMap, HashSet};
 use concurrency_manager::ConcurrencyManager;
@@ -15,13 +15,13 @@ use encryption_export::DataKeyManager;
 use engine_rocks::RocksEngine;
 use engine_test::raft::RaftTestEngine;
 use engine_traits::{KvEngine, RaftEngine, TabletRegistry};
-use futures::{executor::block_on, future::BoxFuture, Future};
+use futures::{Future, executor::block_on, future::BoxFuture};
 use grpcio::{ChannelBuilder, EnvBuilder, Environment, Error as GrpcError, Service};
 use grpcio_health::HealthService;
 use health_controller::HealthController;
 use kvproto::{
     deadlock_grpc::create_deadlock,
-    debugpb_grpc::{create_debug, DebugClient},
+    debugpb_grpc::{DebugClient, create_debug},
     diagnosticspb_grpc::create_diagnostics,
     import_sstpb_grpc::create_import_sst,
     kvrpcpb::{ApiVersion, Context},
@@ -32,15 +32,15 @@ use kvproto::{
 };
 use pd_client::PdClient;
 use raftstore::{
+    RegionInfoAccessor,
     coprocessor::CoprocessorHost,
     errors::Error as RaftError,
     store::{
-        region_meta, AutoSplitController, CheckLeaderRunner, FlowStatsReporter, ReadStats,
-        RegionSnapshot, TabletSnapManager, WriteStats,
+        AutoSplitController, CheckLeaderRunner, FlowStatsReporter, ReadStats, RegionSnapshot,
+        TabletSnapManager, WriteStats, region_meta,
     },
-    RegionInfoAccessor,
 };
-use raftstore_v2::{router::RaftRouter, StateStorage, StoreMeta, StoreRouter};
+use raftstore_v2::{StateStorage, StoreMeta, StoreRouter, router::RaftRouter};
 use resource_control::ResourceGroupManager;
 use resource_metering::{CollectorRegHandle, ResourceTagFactory};
 use security::SecurityManager;
@@ -48,13 +48,15 @@ use service::service_manager::GrpcServiceManager;
 use slog_global::debug;
 use tempfile::TempDir;
 use test_pd_client::TestPdClient;
-use test_raftstore::{filter_send, AddressMap, Config, Filter};
+use test_raftstore::{AddressMap, Config, Filter, filter_send};
 use tikv::{
     config::ConfigController,
     coprocessor, coprocessor_v2,
     import::{ImportSstService, SstImporter},
     read_pool::ReadPool,
     server::{
+        ConnectionBuilder, Error, Extension, NodeV2, PdStoreAddrResolver, RaftClient, RaftKv2,
+        Result as ServerResult, Server, ServerTransport,
         debug2::DebuggerImplV2,
         gc_worker::GcWorker,
         load_statistics::ThreadLoadPool,
@@ -62,27 +64,23 @@ use tikv::{
         raftkv::ReplicaReadLockChecker,
         resolve,
         service::{DebugService, DefaultGrpcMessageFilter, DiagnosticsService},
-        ConnectionBuilder, Error, Extension, NodeV2, PdStoreAddrResolver, RaftClient, RaftKv2,
-        Result as ServerResult, Server, ServerTransport,
     },
     storage::{
-        self,
+        self, Engine, Storage,
         kv::{FakeExtension, LocalTablets, RaftExtension, SnapContext},
         txn::{
             flow_controller::{EngineFlowController, FlowController},
             txn_status_cache::TxnStatusCache,
         },
-        Engine, Storage,
     },
 };
 use tikv_util::{
-    box_err,
+    Either, HandyRwLock, box_err,
     config::VersionTrack,
     quota_limiter::QuotaLimiter,
     sys::thread::ThreadBuildWrapper,
     thd_name,
-    worker::{Builder as WorkerBuilder, LazyWorker},
-    Either, HandyRwLock,
+    worker::{Builder as WorkerBuilder, LazyWorker, Worker},
 };
 use tokio::runtime::{Builder as TokioBuilder, Handle};
 use txn_types::TxnExtraScheduler;
@@ -582,6 +580,7 @@ impl<EK: KvEngine> ServerCluster<EK> {
             Some(store_meta),
             resource_manager.clone(),
             Arc::new(region_info_accessor.clone()),
+            Default::default(),
         );
 
         // Create deadlock service.
@@ -647,6 +646,7 @@ impl<EK: KvEngine> ServerCluster<EK> {
                 Arc::new(DefaultGrpcMessageFilter::new(
                     server_cfg.value().reject_messages_on_memory_ratio,
                 )),
+                Worker::new("test-background-worker"),
             )
             .unwrap();
             svr.register_service(create_diagnostics(diag_service.clone()));
@@ -748,7 +748,12 @@ impl<EK: KvEngine> ServerCluster<EK> {
         self.concurrency_managers
             .insert(node_id, concurrency_manager);
 
-        let client = RaftClient::new(node_id, self.conn_builder.clone());
+        let client = RaftClient::new(
+            node_id,
+            self.conn_builder.clone(),
+            Duration::from_millis(10),
+            Worker::new("test-worker"),
+        );
         self.raft_clients.insert(node_id, client);
         Ok(node_id)
     }
diff --git a/components/test_raftstore-v2/src/transport_simulate.rs b/components/test_raftstore-v2/src/transport_simulate.rs
index 995662ac484..ca369a5706c 100644
--- a/components/test_raftstore-v2/src/transport_simulate.rs
+++ b/components/test_raftstore-v2/src/transport_simulate.rs
@@ -10,12 +10,12 @@ use kvproto::{
 };
 use raft::SnapshotStatus;
 use raftstore::{
+    Result, Result as RaftStoreResult,
     router::handle_send_error,
     store::{RegionSnapshot, Transport},
-    Result, Result as RaftStoreResult,
 };
 use raftstore_v2::router::{PeerMsg, RaftRouter};
-use test_raftstore::{filter_send, Filter};
+use test_raftstore::{Filter, filter_send};
 use tikv_util::HandyRwLock;
 
 #[derive(Clone)]
diff --git a/components/test_raftstore-v2/src/util.rs b/components/test_raftstore-v2/src/util.rs
index 5d87a3f5b02..03c1155e828 100644
--- a/components/test_raftstore-v2/src/util.rs
+++ b/components/test_raftstore-v2/src/util.rs
@@ -7,10 +7,10 @@ use std::{
     time::{Duration, Instant},
 };
 
-use encryption_export::{data_key_manager_from_config, DataKeyManager};
+use encryption_export::{DataKeyManager, data_key_manager_from_config};
 use engine_rocks::{RocksEngine, RocksStatistics};
 use engine_test::raft::RaftTestEngine;
-use engine_traits::{CfName, KvEngine, TabletRegistry, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, CfName, KvEngine, TabletRegistry};
 use file_system::IoRateLimiter;
 use futures::future::BoxFuture;
 use grpcio::{ChannelBuilder, Environment};
@@ -21,26 +21,27 @@ use kvproto::{
     raft_cmdpb::{CmdType, RaftCmdRequest, RaftCmdResponse},
     tikvpb::TikvClient,
 };
-use raftstore::{store::ReadResponse, Result};
-use rand::{prelude::SliceRandom, RngCore};
+use raftstore::{Result, store::ReadResponse};
+use rand::{RngCore, prelude::SliceRandom};
 use server::common::ConfiguredRaftEngine;
 use tempfile::TempDir;
 use test_pd_client::TestPdClient;
-use test_raftstore::{new_get_cmd, new_put_cf_cmd, new_request, new_snap_cmd, sleep_ms, Config};
+use test_raftstore::{Config, new_get_cmd, new_put_cf_cmd, new_request, new_snap_cmd, sleep_ms};
 use tikv::{
     server::KvEngineFactoryBuilder,
     storage::{
+        Engine, Snapshot,
         kv::{SnapContext, SnapshotExt},
-        point_key_range, Engine, Snapshot,
+        point_key_range,
     },
 };
 use tikv_util::{
-    config::ReadableDuration, escape, future::block_on_timeout, time::InstantExt,
-    worker::LazyWorker, HandyRwLock,
+    HandyRwLock, config::ReadableDuration, escape, future::block_on_timeout, time::InstantExt,
+    worker::LazyWorker,
 };
 use txn_types::Key;
 
-use crate::{bootstrap_store, cluster::Cluster, ServerCluster, Simulator};
+use crate::{ServerCluster, Simulator, bootstrap_store, cluster::Cluster};
 
 pub fn create_test_engine(
     // TODO: pass it in for all cases.
@@ -80,8 +81,14 @@ pub fn create_test_engine(
         bootstrap_store(&raft_engine, cluster_id, store_id).unwrap();
     }
 
-    let builder = KvEngineFactoryBuilder::new(env, &cfg.tikv, cache, key_manager.clone())
-        .sst_recovery_sender(Some(scheduler));
+    let builder = KvEngineFactoryBuilder::new(
+        env,
+        &cfg.tikv,
+        cache,
+        key_manager.clone(),
+        Default::default(),
+    )
+    .sst_recovery_sender(Some(scheduler));
 
     let factory = Box::new(builder.build());
     let rocks_statistics = factory.rocks_statistics();
@@ -459,7 +466,7 @@ pub fn wait_down_peers<T: Simulator<EK>, EK: KvEngine>(
 ) {
     let mut peers = cluster.get_down_peers();
     for _ in 1..1000 {
-        if peers.len() == count as usize && peer.as_ref().map_or(true, |p| peers.contains_key(p)) {
+        if peers.len() == count as usize && peer.as_ref().is_none_or(|p| peers.contains_key(p)) {
             return;
         }
         std::thread::sleep(Duration::from_millis(10));
diff --git a/components/test_raftstore/src/cluster.rs b/components/test_raftstore/src/cluster.rs
index 374533b427c..6b2848b9224 100644
--- a/components/test_raftstore/src/cluster.rs
+++ b/components/test_raftstore/src/cluster.rs
@@ -4,7 +4,7 @@ use std::{
     collections::hash_map::Entry as MapEntry,
     error::Error as StdError,
     result,
-    sync::{mpsc, Arc, Mutex, RwLock},
+    sync::{Arc, Mutex, RwLock, mpsc},
     thread,
     time::Duration,
 };
@@ -15,11 +15,11 @@ use encryption_export::DataKeyManager;
 use engine_rocks::{RocksEngine, RocksSnapshot, RocksStatistics};
 use engine_test::raft::RaftTestEngine;
 use engine_traits::{
-    CompactExt, Engines, Iterable, ManualCompactionOptions, MiscExt, Mutable, Peekable,
-    RaftEngineReadOnly, SyncMutable, WriteBatch, WriteBatchExt, CF_DEFAULT, CF_RAFT,
+    CF_DEFAULT, CF_RAFT, CompactExt, Engines, Iterable, ManualCompactionOptions, MiscExt, Mutable,
+    Peekable, RaftEngineReadOnly, SyncMutable, WriteBatch, WriteBatchExt,
 };
 use file_system::IoRateLimiter;
-use futures::{self, channel::oneshot, executor::block_on, future::BoxFuture, StreamExt};
+use futures::{self, StreamExt, channel::oneshot, executor::block_on, future::BoxFuture};
 use kvproto::{
     errorpb::Error as PbError,
     kvrpcpb::{ApiVersion, Context, DiskFullOpt},
@@ -34,27 +34,26 @@ use kvproto::{
 use pd_client::{BucketStat, PdClient};
 use raft::eraftpb::ConfChangeType;
 use raftstore::{
+    Error, Result,
     router::RaftStoreRouter,
     store::{
         fsm::{
-            create_raft_batch_system,
-            store::{StoreMeta, PENDING_MSG_CAP},
-            ApplyRouter, RaftBatchSystem, RaftRouter,
+            ApplyRouter, RaftBatchSystem, RaftRouter, create_raft_batch_system,
+            store::{PENDING_MSG_CAP, StoreMeta},
         },
         transport::CasualRouter,
         *,
     },
-    Error, Result,
 };
 use resource_control::ResourceGroupManager;
 use tempfile::TempDir;
 use test_pd_client::TestPdClient;
 use tikv::{config::TikvConfig, server::Result as ServerResult};
 use tikv_util::{
+    HandyRwLock,
     thread_group::GroupProperties,
     time::{Instant, ThreadReadId},
     worker::LazyWorker,
-    HandyRwLock,
 };
 use txn_types::WriteBatchFlags;
 
@@ -81,6 +80,7 @@ pub trait Simulator {
         router: RaftRouter<RocksEngine, RaftTestEngine>,
         system: RaftBatchSystem<RocksEngine, RaftTestEngine>,
         resource_manager: &Option<Arc<ResourceGroupManager>>,
+        force_partition_mgr: &ForcePartitionRangeManager,
     ) -> ServerResult<u64>;
     fn stop_node(&mut self, node_id: u64);
     fn get_node_ids(&self) -> HashSet<u64>;
@@ -177,6 +177,7 @@ pub struct Cluster<T: Simulator> {
     pub sim: Arc<RwLock<T>>,
     pub pd_client: Arc<TestPdClient>,
     resource_manager: Option<Arc<ResourceGroupManager>>,
+    pub force_partition_mgr: ForcePartitionRangeManager,
 }
 
 impl<T: Simulator> Cluster<T> {
@@ -210,6 +211,7 @@ impl<T: Simulator> Cluster<T> {
             resource_manager: Some(Arc::new(ResourceGroupManager::default())),
             kv_statistics: vec![],
             raft_statistics: vec![],
+            force_partition_mgr: Default::default(),
         }
     }
 
@@ -251,7 +253,12 @@ impl<T: Simulator> Cluster<T> {
 
     fn create_engine(&mut self, router: Option<RaftRouter<RocksEngine, RaftTestEngine>>) {
         let (engines, key_manager, dir, sst_worker, kv_statistics, raft_statistics) =
-            create_test_engine(router, self.io_rate_limiter.clone(), &self.cfg);
+            create_test_engine(
+                router,
+                self.io_rate_limiter.clone(),
+                &self.cfg,
+                &self.force_partition_mgr,
+            );
         self.dbs.push(engines);
         self.key_managers.push(key_manager);
         self.paths.push(dir);
@@ -260,6 +267,35 @@ impl<T: Simulator> Cluster<T> {
         self.raft_statistics.push(raft_statistics);
     }
 
+    pub fn restart_engine(&mut self, node_id: u64) {
+        let idx = node_id as usize - 1;
+        let path = self.paths.remove(idx);
+        {
+            self.dbs.remove(idx);
+            self.key_managers.remove(idx);
+            self.sst_workers.remove(idx);
+            self.kv_statistics.remove(idx);
+            self.raft_statistics.remove(idx);
+            self.engines.remove(&node_id);
+        }
+        let (engines, key_manager, dir, sst_worker, kv_statistics, raft_statistics) =
+            start_test_engine(
+                None,
+                self.io_rate_limiter.clone(),
+                &self.cfg,
+                &self.force_partition_mgr,
+                path,
+            );
+        self.dbs.insert(idx, engines);
+        self.key_managers.insert(idx, key_manager);
+        self.paths.insert(idx, dir);
+        self.sst_workers.insert(idx, sst_worker);
+        self.kv_statistics.insert(idx, kv_statistics);
+        self.raft_statistics.insert(idx, raft_statistics);
+        self.engines
+            .insert(node_id, self.dbs.last().unwrap().clone());
+    }
+
     pub fn create_engines(&mut self) {
         self.io_rate_limiter = Some(Arc::new(
             self.cfg
@@ -302,6 +338,7 @@ impl<T: Simulator> Cluster<T> {
                 router,
                 system,
                 &self.resource_manager,
+                &self.force_partition_mgr,
             )?;
             self.group_props.insert(node_id, props);
             self.engines.insert(node_id, engines);
@@ -388,6 +425,7 @@ impl<T: Simulator> Cluster<T> {
             router,
             system,
             &self.resource_manager,
+            &self.force_partition_mgr,
         )?;
         debug!("node {} started", node_id);
         Ok(())
diff --git a/components/test_raftstore/src/common-test.toml b/components/test_raftstore/src/common-test.toml
index 3eba26403ad..8e4bed8b62b 100644
--- a/components/test_raftstore/src/common-test.toml
+++ b/components/test_raftstore/src/common-test.toml
@@ -73,7 +73,6 @@ store-io-pool-size = 0
 apply-pool-size = 1
 store-pool-size = 1
 snap-generator-pool-size = 2
-skip-manual-compaction-in-clean_up-worker = false
 [coprocessor]
 
 [rocksdb]
diff --git a/components/test_raftstore/src/node.rs b/components/test_raftstore/src/node.rs
index 68fd05134f6..7db9348f5ae 100644
--- a/components/test_raftstore/src/node.rs
+++ b/components/test_raftstore/src/node.rs
@@ -2,13 +2,13 @@
 
 use std::{
     path::{Path, PathBuf},
-    sync::{atomic::AtomicU64, Arc, Mutex, RwLock},
+    sync::{Arc, Mutex, RwLock, atomic::AtomicU64},
 };
 
 use collections::{HashMap, HashSet};
 use concurrency_manager::ConcurrencyManager;
 use encryption_export::DataKeyManager;
-use engine_rocks::{RocksEngine, RocksSnapshot};
+use engine_rocks::{RocksEngine, RocksSnapshot, util};
 use engine_test::raft::RaftTestEngine;
 use engine_traits::{Engines, MiscExt, Peekable};
 use health_controller::HealthController;
@@ -19,17 +19,18 @@ use kvproto::{
     raft_serverpb::{self, RaftMessage},
 };
 use protobuf::Message;
-use raft::{eraftpb::MessageType, SnapshotStatus};
+use raft::{SnapshotStatus, eraftpb::MessageType};
 use raftstore::{
-    coprocessor::{config::SplitCheckConfigManager, CoprocessorHost},
+    Result,
+    coprocessor::{CoprocessorHost, config::SplitCheckConfigManager},
     errors::Error as RaftError,
     router::{LocalReadRouter, RaftStoreRouter, ReadContext, ServerRaftStoreRouter},
     store::{
+        SnapManagerBuilder,
         config::RaftstoreConfigManager,
-        fsm::{store::StoreMeta, ApplyRouter, RaftBatchSystem, RaftRouter},
-        SnapManagerBuilder, *,
+        fsm::{ApplyRouter, RaftBatchSystem, RaftRouter, store::StoreMeta},
+        *,
     },
-    Result,
 };
 use resource_control::ResourceGroupManager;
 use resource_metering::CollectorRegHandle;
@@ -39,7 +40,7 @@ use test_pd_client::TestPdClient;
 use tikv::{
     config::{ConfigController, Module},
     import::SstImporter,
-    server::{raftkv::ReplicaReadLockChecker, MultiRaftServer, Result as ServerResult},
+    server::{MultiRaftServer, Result as ServerResult, raftkv::ReplicaReadLockChecker},
 };
 use tikv_util::{
     config::VersionTrack,
@@ -240,6 +241,7 @@ impl Simulator for NodeCluster {
         router: RaftRouter<RocksEngine, RaftTestEngine>,
         system: RaftBatchSystem<RocksEngine, RaftTestEngine>,
         _resource_manager: &Option<Arc<ResourceGroupManager>>,
+        _force_partition_mgr: &ForcePartitionRangeManager,
     ) -> ServerResult<u64> {
         assert!(node_id == 0 || !self.nodes.contains_key(&node_id));
         let pd_worker = LazyWorker::new("test-pd-worker");
@@ -299,8 +301,30 @@ impl Simulator for NodeCluster {
         self.snap_mgrs.insert(node_id, snap_mgr.clone());
 
         // Create coprocessor.
+        let enable_region_stats_mgr_cb: Arc<dyn Fn() -> bool + Send + Sync> =
+            if cfg.in_memory_engine.enable {
+                Arc::new(|| true)
+            } else {
+                Arc::new(|| false)
+            };
         let mut coprocessor_host = CoprocessorHost::new(router.clone(), cfg.coprocessor.clone());
 
+        // In-memory engine
+        let mut in_memory_engine_config = cfg.in_memory_engine.clone();
+        in_memory_engine_config.expected_region_size = cfg.coprocessor.region_split_size();
+        let in_memory_engine_config = Arc::new(VersionTrack::new(in_memory_engine_config));
+        let in_memory_engine_config_clone = in_memory_engine_config.clone();
+
+        let region_info_accessor = raftstore::RegionInfoAccessor::new(
+            &mut coprocessor_host,
+            enable_region_stats_mgr_cb,
+            Box::new(move || {
+                in_memory_engine_config_clone
+                    .value()
+                    .mvcc_amplification_threshold
+            }),
+        );
+
         if let Some(f) = self.post_create_coprocessor_host.as_ref() {
             f(node_id, &mut coprocessor_host);
         }
@@ -325,8 +349,12 @@ impl Simulator for NodeCluster {
         );
         let cfg_controller = ConfigController::new(cfg.tikv.clone());
 
-        let split_check_runner =
-            SplitCheckRunner::new(engines.kv.clone(), router.clone(), coprocessor_host.clone());
+        let split_check_runner = SplitCheckRunner::new(
+            engines.kv.clone(),
+            router.clone(),
+            coprocessor_host.clone(),
+            Some(Arc::new(region_info_accessor)),
+        );
         let split_scheduler = bg_worker.start("test-split-check", split_check_runner);
         cfg_controller.register(
             Module::Coprocessor,
@@ -334,21 +362,21 @@ impl Simulator for NodeCluster {
         );
         // Spawn a task to update the disk status periodically.
         {
-            let engines = engines.clone();
             let data_dir = PathBuf::from(engines.kv.path());
+            let rocks_engine = Arc::downgrade(engines.kv.as_inner());
             let snap_mgr = snap_mgr.clone();
             bg_worker.spawn_interval_task(std::time::Duration::from_millis(1000), move || {
-                let snap_size = snap_mgr.get_total_snap_size().unwrap();
-                let kv_size = engines
-                    .kv
-                    .get_engine_used_size()
-                    .expect("get kv engine size");
-                let used_size = snap_size + kv_size;
-                let (capacity, available) = disk::get_disk_space_stats(&data_dir).unwrap();
-
-                disk::set_disk_capacity(capacity);
-                disk::set_disk_used_size(used_size);
-                disk::set_disk_available_size(std::cmp::min(available, capacity - used_size));
+                if let Some(rocks_engine) = rocks_engine.upgrade() {
+                    let snap_size = snap_mgr.get_total_snap_size().unwrap();
+                    let kv_size = util::get_engine_cfs_used_size(rocks_engine.as_ref())
+                        .expect("get kv engine size");
+                    let used_size = snap_size + kv_size;
+                    let (capacity, available) = disk::get_disk_space_stats(&data_dir).unwrap();
+
+                    disk::set_disk_capacity(capacity);
+                    disk::set_disk_used_size(used_size);
+                    disk::set_disk_available_size(std::cmp::min(available, capacity - used_size));
+                }
             });
         }
 
diff --git a/components/test_raftstore/src/router.rs b/components/test_raftstore/src/router.rs
index d6a135c9f9a..1bfb1752ba6 100644
--- a/components/test_raftstore/src/router.rs
+++ b/components/test_raftstore/src/router.rs
@@ -8,13 +8,13 @@ use engine_rocks::{RocksEngine, RocksSnapshot};
 use kvproto::raft_serverpb::RaftMessage;
 use raftstore::{
     errors::{Error as RaftStoreError, Result as RaftStoreResult},
-    router::{handle_send_error, RaftStoreRouter},
+    router::{RaftStoreRouter, handle_send_error},
     store::{
-        msg::{CasualMessage, PeerMsg, SignificantMsg},
         CasualRouter, ProposalRouter, RaftCommand, SignificantRouter, StoreMsg, StoreRouter,
+        msg::{CasualMessage, PeerMsg, SignificantMsg},
     },
 };
-use tikv_util::mpsc::{loose_bounded, LooseBoundedSender, Receiver};
+use tikv_util::mpsc::{LooseBoundedSender, Receiver, loose_bounded};
 
 #[derive(Clone)]
 #[allow(clippy::type_complexity)]
diff --git a/components/test_raftstore/src/server.rs b/components/test_raftstore/src/server.rs
index 3e8220271f4..d32dabb13d4 100644
--- a/components/test_raftstore/src/server.rs
+++ b/components/test_raftstore/src/server.rs
@@ -2,14 +2,13 @@
 
 use std::{
     path::Path,
-    sync::{atomic::AtomicU64, mpsc::Receiver, Arc, Mutex, RwLock},
+    sync::{Arc, Mutex, RwLock, atomic::AtomicU64, mpsc::Receiver},
     thread,
     time::Duration,
-    usize,
 };
 
 use ::server::common::build_hybrid_engine;
-use api_version::{dispatch_api_version, KvFormat};
+use api_version::{KvFormat, dispatch_api_version};
 use causal_ts::CausalTsProviderImpl;
 use collections::{HashMap, HashSet};
 use concurrency_manager::ConcurrencyManager;
@@ -26,7 +25,7 @@ use hybrid_engine::observer::{
 use in_memory_engine::{InMemoryEngineConfig, InMemoryEngineContext, RegionCacheMemoryEngine};
 use kvproto::{
     deadlock::create_deadlock,
-    debugpb::{create_debug, DebugClient},
+    debugpb::{DebugClient, create_debug},
     import_sstpb::create_import_sst,
     kvrpcpb::{ApiVersion, Context},
     metapb,
@@ -36,17 +35,17 @@ use kvproto::{
 };
 use pd_client::PdClient;
 use raftstore::{
+    Result,
     coprocessor::{CoprocessorHost, RegionInfoAccessor},
     errors::Error as RaftError,
     router::{CdcRaftRouter, LocalReadRouter, RaftStoreRouter, ReadContext, ServerRaftStoreRouter},
     store::{
-        fsm::{store::StoreMeta, ApplyRouter, RaftBatchSystem, RaftRouter},
+        AutoSplitController, Callback, CheckLeaderRunner, DiskCheckRunner,
+        ForcePartitionRangeManager, LocalReader, RegionSnapshot, SnapManager, SnapManagerBuilder,
+        SplitCheckRunner, SplitConfigManager, StoreMetaDelegate,
+        fsm::{ApplyRouter, RaftBatchSystem, RaftRouter, store::StoreMeta},
         msg::RaftCmdExtraOpts,
-        AutoSplitController, Callback, CheckLeaderRunner, DiskCheckRunner, LocalReader,
-        RegionSnapshot, SnapManager, SnapManagerBuilder, SplitCheckRunner, SplitConfigManager,
-        StoreMetaDelegate,
     },
-    Result,
 };
 use resource_control::ResourceGroupManager;
 use resource_metering::{CollectorRegHandle, ResourceTagFactory};
@@ -61,6 +60,8 @@ use tikv::{
     import::{ImportSstService, SstImporter},
     read_pool::ReadPool,
     server::{
+        ConnectionBuilder, Error, MultiRaftServer, PdStoreAddrResolver, RaftClient, RaftKv,
+        Result as ServerResult, Server, ServerTransport,
         debug::DebuggerImpl,
         gc_worker::GcWorker,
         load_statistics::ThreadLoadPool,
@@ -69,26 +70,23 @@ use tikv::{
         resolve::{self, StoreAddrResolver},
         service::{DebugService, DefaultGrpcMessageFilter},
         tablet_snap::NoSnapshotCache,
-        ConnectionBuilder, Error, MultiRaftServer, PdStoreAddrResolver, RaftClient, RaftKv,
-        Result as ServerResult, Server, ServerTransport,
     },
     storage::{
-        self,
+        self, Engine, Storage,
         kv::{FakeExtension, LocalTablets, SnapContext},
         txn::{
             flow_controller::{EngineFlowController, FlowController},
             txn_status_cache::TxnStatusCache,
         },
-        Engine, Storage,
     },
 };
 use tikv_util::{
+    HandyRwLock,
     config::VersionTrack,
     quota_limiter::QuotaLimiter,
     sys::thread::ThreadBuildWrapper,
     time::ThreadReadId,
-    worker::{Builder as WorkerBuilder, LazyWorker, Scheduler},
-    HandyRwLock,
+    worker::{Builder as WorkerBuilder, LazyWorker, Scheduler, Worker},
 };
 use tokio::runtime::Builder as TokioBuilder;
 use txn_types::TxnExtraScheduler;
@@ -175,6 +173,7 @@ pub struct ServerCluster {
     pub causal_ts_providers: HashMap<u64, Arc<CausalTsProviderImpl>>,
     pub encryption: Option<Arc<DataKeyManager>>,
     pub in_memory_engines: HashMap<u64, Option<HybridEngineImpl>>,
+    pub gc_safe_point: Arc<AtomicU64>,
 }
 
 impl ServerCluster {
@@ -221,6 +220,7 @@ impl ServerCluster {
             txn_extra_schedulers: HashMap::default(),
             causal_ts_providers: HashMap::default(),
             encryption: None,
+            gc_safe_point: Arc::new(AtomicU64::new(0)),
         }
     }
 
@@ -283,6 +283,7 @@ impl ServerCluster {
         router: RaftRouter<RocksEngine, RaftTestEngine>,
         system: RaftBatchSystem<RocksEngine, RaftTestEngine>,
         resource_manager: &Option<Arc<ResourceGroupManager>>,
+        force_partition_mgr: &ForcePartitionRangeManager,
     ) -> ServerResult<u64> {
         self.encryption = key_manager.clone();
 
@@ -376,6 +377,7 @@ impl ServerCluster {
         let mut raft_kv = RaftKv::new(
             sim_router.clone(),
             engines.kv.clone(),
+            Some(region_info_accessor.clone()),
             region_info_accessor.region_leaders(),
         );
 
@@ -406,6 +408,14 @@ impl ServerCluster {
         );
         gc_worker.start(node_id, coprocessor_host.clone()).unwrap();
 
+        if let Err(e) =
+            gc_worker.start_auto_compaction(self.pd_client.clone(), region_info_accessor.clone())
+        {
+            warn!("failed to start auto_compaction: {}", e);
+        } else {
+            info!("Auto compaction started successfully for node {}", node_id);
+        }
+
         let txn_status_cache = Arc::new(TxnStatusCache::new_for_test());
         let rts_worker = if cfg.resolved_ts.enable {
             // Resolved ts worker
@@ -514,6 +524,7 @@ impl ServerCluster {
             None,
             resource_manager.clone(),
             Arc::new(region_info_accessor.clone()),
+            force_partition_mgr.clone(),
         );
 
         // Create deadlock service.
@@ -620,6 +631,7 @@ impl ServerCluster {
                 Arc::new(DefaultGrpcMessageFilter::new(
                     server_cfg.value().reject_messages_on_memory_ratio,
                 )),
+                Worker::new("test-background-worker"),
             )
             .unwrap();
             svr.register_service(create_import_sst(import_service.clone()));
@@ -659,8 +671,12 @@ impl ServerCluster {
         let max_unified_read_pool_thread_count = cfg.readpool.unified.max_thread_count;
         let pessimistic_txn_cfg = cfg.tikv.pessimistic_txn;
 
-        let split_check_runner =
-            SplitCheckRunner::new(engines.kv.clone(), router.clone(), coprocessor_host.clone());
+        let split_check_runner = SplitCheckRunner::new(
+            engines.kv.clone(),
+            router.clone(),
+            coprocessor_host.clone(),
+            Some(Arc::new(region_info_accessor.clone())),
+        );
         let split_check_scheduler = bg_worker.start("split-check", split_check_runner);
         let split_config_manager =
             SplitConfigManager::new(Arc::new(VersionTrack::new(cfg.tikv.split)));
@@ -687,7 +703,7 @@ impl ServerCluster {
             causal_ts_provider,
             DiskCheckRunner::dummy(),
             GrpcServiceManager::dummy(),
-            Arc::new(AtomicU64::new(0)),
+            self.gc_safe_point.clone(),
         )?;
         assert!(node_id == 0 || node_id == node.id());
         let node_id = node.id();
@@ -732,7 +748,12 @@ impl ServerCluster {
         self.concurrency_managers
             .insert(node_id, concurrency_manager);
 
-        let client = RaftClient::new(node_id, self.conn_builder.clone());
+        let client = RaftClient::new(
+            node_id,
+            self.conn_builder.clone(),
+            Duration::from_millis(10),
+            Worker::new("test-worker"),
+        );
         self.raft_clients.insert(node_id, client);
         Ok(node_id)
     }
@@ -765,6 +786,7 @@ impl Simulator for ServerCluster {
         router: RaftRouter<RocksEngine, RaftTestEngine>,
         system: RaftBatchSystem<RocksEngine, RaftTestEngine>,
         resource_manager: &Option<Arc<ResourceGroupManager>>,
+        force_partition_mgr: &ForcePartitionRangeManager,
     ) -> ServerResult<u64> {
         dispatch_api_version!(
             cfg.storage.api_version(),
@@ -777,6 +799,7 @@ impl Simulator for ServerCluster {
                 router,
                 system,
                 resource_manager,
+                force_partition_mgr,
             )
         )
     }
@@ -915,7 +938,7 @@ impl Cluster<ServerCluster> {
             ctx.set_peer(leader);
             ctx.set_region_epoch(epoch);
 
-            let mut storage = self.sim.rl().storages.get(&store_id).unwrap().clone();
+            let mut storage = self.must_get_raft_engine(store_id);
             let snap_ctx = SnapContext {
                 pb_ctx: &ctx,
                 ..snap_ctx.clone()
@@ -931,6 +954,10 @@ impl Cluster<ServerCluster> {
         panic!("failed to get snapshot of region {}", region_id);
     }
 
+    pub fn must_get_raft_engine(&self, store_id: u64) -> SimulateEngine {
+        self.sim.rl().storages.get(&store_id).unwrap().clone()
+    }
+
     pub fn raft_extension(&self, node_id: u64) -> SimulateRaftExtension {
         self.sim.rl().storages[&node_id].raft_extension()
     }
diff --git a/components/test_raftstore/src/transport_simulate.rs b/components/test_raftstore/src/transport_simulate.rs
index 050f735aac3..d68d057d919 100644
--- a/components/test_raftstore/src/transport_simulate.rs
+++ b/components/test_raftstore/src/transport_simulate.rs
@@ -3,10 +3,9 @@
 use std::{
     marker::PhantomData,
     mem,
-    sync::{atomic::*, mpsc::Sender, Arc, Mutex, RwLock},
+    sync::{Arc, Mutex, RwLock, atomic::*, mpsc::Sender},
     thread, time,
     time::Duration,
-    usize,
 };
 
 use collections::{HashMap, HashSet};
@@ -18,12 +17,12 @@ use kvproto::{
 };
 use raft::eraftpb::MessageType;
 use raftstore::{
+    DiscardReason, Error, Result as RaftStoreResult, Result,
     router::{LocalReadRouter, RaftStoreRouter, ReadContext},
     store::{
         Callback, CasualMessage, CasualRouter, PeerMsg, ProposalRouter, RaftCommand,
         SignificantMsg, SignificantRouter, StoreMsg, StoreRouter, Transport,
     },
-    DiscardReason, Error, Result as RaftStoreResult, Result,
 };
 use tikv_util::{Either, HandyRwLock};
 
@@ -748,7 +747,7 @@ impl Filter for LeadingDuplicatedSnapshotFilter {
         let mut to_send = vec![];
         for msg in msgs.drain(..) {
             if msg.get_message().get_msg_type() == MessageType::MsgSnapshot && !stale {
-                if last_msg.as_ref().map_or(false, |l| l != &msg) {
+                if last_msg.as_ref().is_some_and(|l| l != &msg) {
                     to_send.push(last_msg.take().unwrap());
                     if self.together {
                         to_send.push(msg);
diff --git a/components/test_raftstore/src/util.rs b/components/test_raftstore/src/util.rs
index 523608e938f..785d6655f6a 100644
--- a/components/test_raftstore/src/util.rs
+++ b/components/test_raftstore/src/util.rs
@@ -4,24 +4,24 @@ use std::{
     fmt::Write,
     path::Path,
     str::FromStr,
-    sync::{mpsc, Arc, Mutex},
+    sync::{Arc, Mutex, mpsc},
     thread,
     time::Duration,
 };
 
 use collections::HashMap;
 use encryption_export::{
-    data_key_manager_from_config, DataKeyManager, FileConfig, MasterKeyConfig,
+    DataKeyManager, FileConfig, MasterKeyConfig, data_key_manager_from_config,
 };
-use engine_rocks::{config::BlobRunMode, RocksEngine, RocksSnapshot, RocksStatistics};
+use engine_rocks::{RocksEngine, RocksSnapshot, RocksStatistics, config::BlobRunMode};
 use engine_test::raft::RaftTestEngine;
 use engine_traits::{
-    CfName, CfNamesExt, Engines, Iterable, KvEngine, Peekable, RaftEngineDebug, RaftEngineReadOnly,
-    CF_DEFAULT, CF_RAFT, CF_WRITE,
+    CF_DEFAULT, CF_RAFT, CF_WRITE, CfName, CfNamesExt, Engines, Iterable, KvEngine, Peekable,
+    RaftEngineDebug, RaftEngineReadOnly,
 };
 use fail::fail_point;
 use file_system::IoRateLimiter;
-use futures::{executor::block_on, future::BoxFuture, StreamExt};
+use futures::{StreamExt, executor::block_on, future::BoxFuture};
 use grpcio::{ChannelBuilder, Environment};
 use hybrid_engine::HybridEngine;
 use in_memory_engine::RegionCacheMemoryEngine;
@@ -38,14 +38,16 @@ use kvproto::{
     },
     tikvpb::TikvClient,
 };
+use lazy_static::lazy_static;
 use pd_client::PdClient;
 use protobuf::RepeatedField;
 use raft::eraftpb::ConfChangeType;
 use raftstore::{
+    RaftRouterCompactedEventSender, RegionInfoAccessor, Result,
+    coprocessor::CoprocessorHost,
     store::{fsm::RaftRouter, util::encode_start_ts_into_flag_data, *},
-    RaftRouterCompactedEventSender, Result,
 };
-use rand::{seq::SliceRandom, RngCore};
+use rand::{RngCore, seq::SliceRandom};
 use server::common::ConfiguredRaftEngine;
 use tempfile::TempDir;
 use test_pd_client::TestPdClient;
@@ -54,19 +56,20 @@ use tikv::{
     config::*,
     server::KvEngineFactoryBuilder,
     storage::{
+        Engine, Snapshot,
         kv::{SnapContext, SnapshotExt},
-        point_key_range, Engine, Snapshot,
+        point_key_range,
     },
 };
 pub use tikv_util::store::{find_peer, new_learner_peer, new_peer};
 use tikv_util::{
+    HandyRwLock,
     config::*,
     escape,
     future::block_on_timeout,
     mpsc::future,
     time::{Instant, ThreadReadId},
     worker::LazyWorker,
-    HandyRwLock,
 };
 use txn_types::Key;
 
@@ -723,6 +726,7 @@ pub fn create_test_engine(
     router: Option<RaftRouter<RocksEngine, RaftTestEngine>>,
     limiter: Option<Arc<IoRateLimiter>>,
     cfg: &Config,
+    force_partition_mgr: &ForcePartitionRangeManager,
 ) -> (
     Engines<RocksEngine, RaftTestEngine>,
     Option<Arc<DataKeyManager>>,
@@ -732,6 +736,24 @@ pub fn create_test_engine(
     Option<Arc<RocksStatistics>>,
 ) {
     let dir = test_util::temp_dir("test_cluster", cfg.prefer_mem);
+    start_test_engine(router, limiter, cfg, force_partition_mgr, dir)
+}
+
+pub fn start_test_engine(
+    // TODO: pass it in for all cases.
+    router: Option<RaftRouter<RocksEngine, RaftTestEngine>>,
+    limiter: Option<Arc<IoRateLimiter>>,
+    cfg: &Config,
+    force_partition_mgr: &ForcePartitionRangeManager,
+    dir: TempDir,
+) -> (
+    Engines<RocksEngine, RaftTestEngine>,
+    Option<Arc<DataKeyManager>>,
+    TempDir,
+    LazyWorker<String>,
+    Arc<RocksStatistics>,
+    Option<Arc<RocksStatistics>>,
+) {
     let mut cfg = cfg.clone();
     cfg.storage.data_dir = dir.path().to_str().unwrap().to_string();
     cfg.raft_store.raftdb_path = cfg.infer_raft_db_path(None).unwrap();
@@ -750,8 +772,17 @@ pub fn create_test_engine(
 
     let (raft_engine, raft_statistics) = RaftTestEngine::build(&cfg, &env, &key_manager, &cache);
 
-    let mut builder = KvEngineFactoryBuilder::new(env, &cfg, cache, key_manager.clone())
-        .sst_recovery_sender(Some(scheduler));
+    let mut host: CoprocessorHost<RocksEngine> = CoprocessorHost::default();
+    let accessor = RegionInfoAccessor::new(&mut host, Arc::new(|| true), Box::new(|| 1));
+    let mut builder = KvEngineFactoryBuilder::new(
+        env,
+        &cfg,
+        cache,
+        key_manager.clone(),
+        force_partition_mgr.clone(),
+    )
+    .sst_recovery_sender(Some(scheduler))
+    .region_info_accessor(accessor);
     if let Some(router) = router {
         builder = builder.compaction_event_sender(Arc::new(RaftRouterCompactedEventSender {
             router: Mutex::new(router),
@@ -1867,7 +1898,7 @@ pub fn put_with_timeout<T: Simulator>(
 pub fn wait_down_peers<T: Simulator>(cluster: &Cluster<T>, count: u64, peer: Option<u64>) {
     let mut peers = cluster.get_down_peers();
     for _ in 1..1000 {
-        if peers.len() == count as usize && peer.as_ref().map_or(true, |p| peers.contains_key(p)) {
+        if peers.len() == count as usize && peer.as_ref().is_none_or(|p| peers.contains_key(p)) {
             return;
         }
         std::thread::sleep(Duration::from_millis(10));
@@ -1878,3 +1909,13 @@ pub fn wait_down_peers<T: Simulator>(cluster: &Cluster<T>, count: u64, peer: Opt
         peers, count, peer
     );
 }
+
+pub fn get_region_read_index_safe_ts<T: Simulator>(
+    cluster: &Cluster<T>,
+    store_id: u64,
+    region_id: u64,
+) -> u64 {
+    let store_meta = cluster.store_metas.get(&store_id).unwrap().lock().unwrap();
+    let region_read_progress = store_meta.region_read_progress.get(&region_id).unwrap();
+    region_read_progress.read_index_safe_ts()
+}
diff --git a/components/test_raftstore_macro/src/lib.rs b/components/test_raftstore_macro/src/lib.rs
index 39db5427bc2..982de63fce4 100644
--- a/components/test_raftstore_macro/src/lib.rs
+++ b/components/test_raftstore_macro/src/lib.rs
@@ -2,8 +2,8 @@
 
 use proc_macro::TokenStream;
 use proc_macro2::{TokenStream as TokenStream2, TokenTree};
-use quote::{quote, ToTokens};
-use syn::{parse_macro_input, parse_quote, Ident, ItemFn, Path};
+use quote::{ToTokens, quote};
+use syn::{Ident, ItemFn, Path, parse_macro_input, parse_quote};
 
 /// test_case generate test cases using cluster creation method provided.
 /// It also import the package related util module, which means we should locate
diff --git a/components/test_sst_importer/src/lib.rs b/components/test_sst_importer/src/lib.rs
index 721add2b58d..caaeab324af 100644
--- a/components/test_sst_importer/src/lib.rs
+++ b/components/test_sst_importer/src/lib.rs
@@ -3,13 +3,14 @@
 use std::{collections::HashMap, fs, path::Path, sync::Arc};
 
 use engine_rocks::{
+    RocksCfOptions, RocksDbOptions, RocksEngine, RocksSstReader, RocksSstWriterBuilder,
     raw::{DBEntryType, Env, TablePropertiesCollector, TablePropertiesCollectorFactory},
     util::new_engine_opt,
-    RocksCfOptions, RocksDbOptions, RocksEngine, RocksSstReader, RocksSstWriterBuilder,
 };
 pub use engine_rocks::{RocksEngine as TestEngine, RocksSstWriter};
 use engine_traits::{KvEngine, SstWriter, SstWriterBuilder};
 use kvproto::import_sstpb::*;
+use txn_types::Key;
 use uuid::Uuid;
 
 mod util;
@@ -110,6 +111,28 @@ pub fn gen_sst_file_by_db<P: AsRef<Path>>(
     read_sst_file(path, (&[range.0], &[range.1]))
 }
 
+pub fn gen_sst_file_with_tidb_kvs<P: AsRef<Path>>(
+    path: P,
+    raw_kvs: &[(&[u8], &[u8])],
+    db: Option<&RocksEngine>,
+) -> (SstMeta, Vec<u8>) {
+    let mut builder = RocksSstWriterBuilder::new();
+    if let Some(db) = db {
+        builder = builder.set_db(db);
+    }
+    let mut w = builder.build(path.as_ref().to_str().unwrap()).unwrap();
+    for (k, v) in raw_kvs {
+        let k = keys::data_key(Key::from_raw(k).as_encoded());
+        w.put(&k, v).unwrap();
+    }
+    w.finish().unwrap();
+
+    // set end to the `next_key` of the largest key.
+    let mut end = raw_kvs[raw_kvs.len() - 1].0.to_vec();
+    end.push(0);
+    read_sst_file(path, (raw_kvs[0].0, &end))
+}
+
 pub fn gen_sst_file<P: AsRef<Path>>(path: P, range: (u8, u8)) -> (SstMeta, Vec<u8>) {
     gen_sst_file_by_db(path, range, None)
 }
diff --git a/components/test_sst_importer/src/util.rs b/components/test_sst_importer/src/util.rs
index bc954279b1f..3fc7839dd02 100644
--- a/components/test_sst_importer/src/util.rs
+++ b/components/test_sst_importer/src/util.rs
@@ -9,7 +9,7 @@ use std::{
 
 use engine_traits::CF_DEFAULT;
 use external_storage::{ExternalStorage, UnpinReader};
-use futures::{executor::block_on, io::Cursor as AsyncCursor, stream, SinkExt};
+use futures::{SinkExt, executor::block_on, io::Cursor as AsyncCursor, stream};
 use grpcio::{Result, WriteFlags};
 use kvproto::{
     brpb::{Local, StorageBackend},
@@ -126,6 +126,13 @@ pub fn must_ingest_sst_error(client: &ImportSstClient, context: Context, meta: S
     assert!(resp.has_error(), "{:?}", resp);
 }
 
+pub fn ingest_sst(client: &ImportSstClient, context: Context, meta: SstMeta) -> IngestResponse {
+    let mut ingest_request = IngestRequest::default();
+    ingest_request.set_context(context);
+    ingest_request.set_sst(meta);
+    client.ingest(&ingest_request).unwrap()
+}
+
 pub fn check_ingested_kvs(tikv: &TikvClient, ctx: &Context, sst_range: (u8, u8)) {
     check_ingested_kvs_cf(tikv, ctx, "", sst_range);
 }
diff --git a/components/test_storage/src/assert_storage.rs b/components/test_storage/src/assert_storage.rs
index 3a641a322a2..21986f54c70 100644
--- a/components/test_storage/src/assert_storage.rs
+++ b/components/test_storage/src/assert_storage.rs
@@ -7,11 +7,10 @@ use kvproto::{
 };
 use test_raftstore::{Cluster, ServerCluster, SimulateEngine};
 use tikv::storage::{
-    self,
+    self, Engine, Error as StorageError, ErrorInner as StorageErrorInner, TxnStatus,
     kv::{Error as KvError, ErrorInner as KvErrorInner, RocksEngine},
     mvcc::{Error as MvccError, ErrorInner as MvccErrorInner, MAX_TXN_WRITE_SIZE},
     txn::{Error as TxnError, ErrorInner as TxnErrorInner},
-    Engine, Error as StorageError, ErrorInner as StorageErrorInner, TxnStatus,
 };
 use tikv_util::HandyRwLock;
 use txn_types::{self, Key, KvPair, Mutation, TimeStamp, Value};
diff --git a/components/test_storage/src/lib.rs b/components/test_storage/src/lib.rs
index 40cf5b3a337..da8c4245c76 100644
--- a/components/test_storage/src/lib.rs
+++ b/components/test_storage/src/lib.rs
@@ -1,7 +1,6 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 #![feature(box_patterns)]
-#![feature(associated_type_bounds)]
 
 #[macro_use]
 extern crate tikv_util;
diff --git a/components/test_storage/src/sync_storage.rs b/components/test_storage/src/sync_storage.rs
index b562d8fc9b6..63685532d77 100644
--- a/components/test_storage/src/sync_storage.rs
+++ b/components/test_storage/src/sync_storage.rs
@@ -2,7 +2,7 @@
 
 use std::{
     marker::PhantomData,
-    sync::{atomic::AtomicU64, Arc},
+    sync::{Arc, atomic::AtomicU64},
 };
 
 use api_version::{ApiV1, KvFormat};
@@ -14,14 +14,14 @@ use kvproto::{
     metapb,
 };
 use raftstore::coprocessor::{
-    region_info_accessor::MockRegionInfoProvider, CoprocessorHost, RegionInfoProvider,
+    CoprocessorHost, RegionInfoProvider, region_info_accessor::MockRegionInfoProvider,
 };
 use tikv::{
     server::gc_worker::{AutoGcConfig, GcConfig, GcSafePointProvider, GcWorker},
     storage::{
-        config::Config, kv::RocksEngine, lock_manager::MockLockManager, test_util::GetConsumer,
-        txn::commands, Engine, KvGetStatistics, PrewriteResult, Result, Storage, TestEngineBuilder,
-        TestStorageBuilder, TxnStatus,
+        Engine, KvGetStatistics, PrewriteResult, Result, Storage, TestEngineBuilder,
+        TestStorageBuilder, TxnStatus, config::Config, kv::RocksEngine,
+        lock_manager::MockLockManager, test_util::GetConsumer, txn::commands,
     },
 };
 use tikv_util::time::Instant;
diff --git a/components/test_storage/src/util.rs b/components/test_storage/src/util.rs
index e91125ba001..2be7bffb8ae 100644
--- a/components/test_storage/src/util.rs
+++ b/components/test_storage/src/util.rs
@@ -2,7 +2,7 @@
 
 use api_version::KvFormat;
 use kvproto::kvrpcpb::Context;
-use test_raftstore::{new_server_cluster, Cluster, ServerCluster, SimulateEngine};
+use test_raftstore::{Cluster, ServerCluster, SimulateEngine, new_server_cluster};
 use tikv_util::HandyRwLock;
 
 use super::*;
diff --git a/components/test_util/src/encryption.rs b/components/test_util/src/encryption.rs
index 3f1691b3d21..d03a313eea4 100644
--- a/components/test_util/src/encryption.rs
+++ b/components/test_util/src/encryption.rs
@@ -3,8 +3,8 @@
 use std::{fs::File, io::Write, path::Path, time::Duration};
 
 use encryption_export::{
-    create_backend, DataKeyManager, DataKeyManagerArgs, EncryptionConfig, FileConfig,
-    MasterKeyConfig, Result,
+    DataKeyManager, DataKeyManagerArgs, EncryptionConfig, FileConfig, MasterKeyConfig, Result,
+    create_backend,
 };
 use kvproto::encryptionpb::EncryptionMethod;
 use tikv_util::config::ReadableDuration;
diff --git a/components/test_util/src/lib.rs b/components/test_util/src/lib.rs
index 653d246e0fb..1435990aea6 100644
--- a/components/test_util/src/lib.rs
+++ b/components/test_util/src/lib.rs
@@ -28,7 +28,7 @@ pub use crate::{
     encryption::*,
     kv_generator::*,
     logging::*,
-    runner::{clear_failpoints, run_failpoint_tests, run_test_with_hook, run_tests, TestHook},
+    runner::{TestHook, clear_failpoints, run_failpoint_tests, run_test_with_hook, run_tests},
     security::*,
 };
 
diff --git a/components/test_util/src/logging.rs b/components/test_util/src/logging.rs
index 4212102df38..f1175b9fa3f 100644
--- a/components/test_util/src/logging.rs
+++ b/components/test_util/src/logging.rs
@@ -9,12 +9,12 @@ use std::{
     time::SystemTime,
 };
 
-use chrono::{offset::Local, DateTime};
+use chrono::{DateTime, offset::Local};
 use slog::{self, Drain, OwnedKVList, Record};
 
 struct Serializer<'a>(&'a mut dyn std::io::Write);
 
-impl<'a> slog::Serializer for Serializer<'a> {
+impl slog::Serializer for Serializer<'_> {
     fn emit_arguments(&mut self, key: slog::Key, val: &std::fmt::Arguments<'_>) -> slog::Result {
         write!(self.0, ", {}: {}", key, val)?;
         Ok(())
diff --git a/components/tidb_query_aggr/src/impl_avg.rs b/components/tidb_query_aggr/src/impl_avg.rs
index c67a72ee9a3..b48503f1a30 100644
--- a/components/tidb_query_aggr/src/impl_avg.rs
+++ b/components/tidb_query_aggr/src/impl_avg.rs
@@ -3,8 +3,8 @@
 use tidb_query_codegen::AggrFunction;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
-    builder::FieldTypeBuilder, codec::data_type::*, expr::EvalContext, EvalType, FieldTypeFlag,
-    FieldTypeTp,
+    EvalType, FieldTypeFlag, FieldTypeTp, builder::FieldTypeBuilder, codec::data_type::*,
+    expr::EvalContext,
 };
 use tidb_query_expr::RpnExpression;
 use tipb::{Expr, ExprType, FieldType};
@@ -312,8 +312,8 @@ mod tests {
     use std::sync::Arc;
 
     use tidb_query_datatype::{
-        codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
         FieldTypeAccessor,
+        codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
     };
     use tikv_util::buffer_vec::BufferVec;
     use tipb_helper::ExprDefBuilder;
diff --git a/components/tidb_query_aggr/src/impl_bit_op.rs b/components/tidb_query_aggr/src/impl_bit_op.rs
index e69f7fff2b6..5f1fbf8dae3 100644
--- a/components/tidb_query_aggr/src/impl_bit_op.rs
+++ b/components/tidb_query_aggr/src/impl_bit_op.rs
@@ -132,8 +132,8 @@ impl<T: BitOp> super::ConcreteAggrFunctionState for AggrFnStateBitOp<T> {
 #[cfg(test)]
 mod tests {
     use tidb_query_datatype::{
-        codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
         EvalType, FieldTypeAccessor, FieldTypeTp,
+        codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
     };
     use tipb_helper::ExprDefBuilder;
 
diff --git a/components/tidb_query_aggr/src/impl_count.rs b/components/tidb_query_aggr/src/impl_count.rs
index 3d49d8b25af..15254322f3b 100644
--- a/components/tidb_query_aggr/src/impl_count.rs
+++ b/components/tidb_query_aggr/src/impl_count.rs
@@ -3,7 +3,7 @@
 use tidb_query_codegen::AggrFunction;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
-    builder::FieldTypeBuilder, codec::data_type::*, expr::EvalContext, FieldTypeFlag, FieldTypeTp,
+    FieldTypeFlag, FieldTypeTp, builder::FieldTypeBuilder, codec::data_type::*, expr::EvalContext,
 };
 use tidb_query_expr::RpnExpression;
 use tipb::{Expr, ExprType, FieldType};
diff --git a/components/tidb_query_aggr/src/impl_first.rs b/components/tidb_query_aggr/src/impl_first.rs
index fbd23822f1f..f9fb0c76ef7 100644
--- a/components/tidb_query_aggr/src/impl_first.rs
+++ b/components/tidb_query_aggr/src/impl_first.rs
@@ -4,7 +4,7 @@ use std::marker::PhantomData;
 
 use tidb_query_codegen::AggrFunction;
 use tidb_query_common::Result;
-use tidb_query_datatype::{codec::data_type::*, expr::EvalContext, EvalType};
+use tidb_query_datatype::{EvalType, codec::data_type::*, expr::EvalContext};
 use tidb_query_expr::RpnExpression;
 use tipb::{Expr, ExprType, FieldType};
 
@@ -297,6 +297,7 @@ mod tests {
         let mut state = function.create_state();
         let mut result = [VectorValue::with_capacity(0, EvalType::Int)];
 
+        #[allow(clippy::zero_repeat_side_effects)]
         update_vector!(
             state,
             &mut ctx,
diff --git a/components/tidb_query_aggr/src/impl_max_min.rs b/components/tidb_query_aggr/src/impl_max_min.rs
index aada14e7bfa..4714ae1ffdd 100644
--- a/components/tidb_query_aggr/src/impl_max_min.rs
+++ b/components/tidb_query_aggr/src/impl_max_min.rs
@@ -5,9 +5,10 @@ use std::{cmp::Ordering, convert::TryFrom};
 use tidb_query_codegen::AggrFunction;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
+    Collation, EvalType, FieldTypeAccessor, FieldTypeFlag,
     codec::{collation::Collator, data_type::*},
     expr::EvalContext,
-    match_template_collator, Collation, EvalType, FieldTypeAccessor, FieldTypeFlag,
+    match_template_collator,
 };
 use tidb_query_expr::RpnExpression;
 use tipb::{Expr, ExprType, FieldType};
@@ -259,10 +260,12 @@ where
         _ctx: &mut EvalContext,
         value: Option<EnumRef<'_>>,
     ) -> Result<()> {
-        let extreme_ref = self
-            .extremum
-            .as_ref()
-            .map(|x| EnumRef::from_owned_value(unsafe { std::mem::transmute(x) }));
+        let extreme_ref = self.extremum.as_ref().map(|x| {
+            EnumRef::from_owned_value(unsafe {
+                #[allow(clippy::missing_transmute_annotations)]
+                std::mem::transmute(x)
+            })
+        });
 
         if value.is_some()
             && (self.extremum.is_none()
@@ -344,10 +347,12 @@ where
     /// ref: https://dev.mysql.com/doc/refman/5.7/en/aggregate-functions.html#function_max
     #[inline]
     fn update_concrete(&mut self, _ctx: &mut EvalContext, value: Option<SetRef<'_>>) -> Result<()> {
-        let extreme_ref = self
-            .extremum
-            .as_ref()
-            .map(|x| SetRef::from_owned_value(unsafe { std::mem::transmute(x) }));
+        let extreme_ref = self.extremum.as_ref().map(|x| {
+            SetRef::from_owned_value(unsafe {
+                #[allow(clippy::missing_transmute_annotations)]
+                std::mem::transmute(x)
+            })
+        });
 
         if value.is_some()
             && (self.extremum.is_none()
@@ -434,10 +439,12 @@ where
     where
         TT: EvaluableRef<'a, EvaluableType = T::EvaluableType> + Ord,
     {
-        let extreme_ref = self
-            .extremum_value
-            .as_ref()
-            .map(|x| TT::from_owned_value(unsafe { std::mem::transmute(x) }));
+        let extreme_ref = self.extremum_value.as_ref().map(|x| {
+            TT::from_owned_value(unsafe {
+                #[allow(clippy::missing_transmute_annotations)]
+                std::mem::transmute(x)
+            })
+        });
         if value.is_some() && (self.extremum_value.is_none() || extreme_ref.cmp(&value) == E::ORD) {
             self.extremum_value = value.map(|x| x.into_owned_value());
         }
@@ -553,14 +560,14 @@ mod tests {
     use std::sync::Arc;
 
     use tidb_query_datatype::{
-        codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
         EvalType, FieldTypeAccessor, FieldTypeTp,
+        codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
     };
     use tikv_util::buffer_vec::BufferVec;
     use tipb_helper::ExprDefBuilder;
 
     use super::*;
-    use crate::{parser::AggrDefinitionParser, AggrFunction};
+    use crate::{AggrFunction, parser::AggrDefinitionParser};
 
     #[test]
     fn test_max() {
diff --git a/components/tidb_query_aggr/src/impl_sum.rs b/components/tidb_query_aggr/src/impl_sum.rs
index be2affd304b..5ee8d2f5a82 100644
--- a/components/tidb_query_aggr/src/impl_sum.rs
+++ b/components/tidb_query_aggr/src/impl_sum.rs
@@ -2,7 +2,7 @@
 
 use tidb_query_codegen::AggrFunction;
 use tidb_query_common::Result;
-use tidb_query_datatype::{codec::data_type::*, expr::EvalContext, EvalType};
+use tidb_query_datatype::{EvalType, codec::data_type::*, expr::EvalContext};
 use tidb_query_expr::RpnExpression;
 use tipb::{Expr, ExprType, FieldType};
 
@@ -306,8 +306,8 @@ mod tests {
     use std::sync::Arc;
 
     use tidb_query_datatype::{
-        codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
         FieldTypeAccessor, FieldTypeTp,
+        codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
     };
     use tikv_util::buffer_vec::BufferVec;
     use tipb_helper::ExprDefBuilder;
diff --git a/components/tidb_query_aggr/src/impl_variance.rs b/components/tidb_query_aggr/src/impl_variance.rs
index 40b85e07f23..50c44c9499b 100644
--- a/components/tidb_query_aggr/src/impl_variance.rs
+++ b/components/tidb_query_aggr/src/impl_variance.rs
@@ -3,8 +3,8 @@
 use tidb_query_codegen::AggrFunction;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
-    builder::FieldTypeBuilder, codec::data_type::*, expr::EvalContext, EvalType, FieldTypeFlag,
-    FieldTypeTp,
+    EvalType, FieldTypeFlag, FieldTypeTp, builder::FieldTypeBuilder, codec::data_type::*,
+    expr::EvalContext,
 };
 use tidb_query_expr::RpnExpression;
 use tipb::{Expr, ExprType, FieldType};
@@ -453,8 +453,8 @@ mod tests {
     use std::sync::Arc;
 
     use tidb_query_datatype::{
-        codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
         FieldTypeAccessor, FieldTypeTp,
+        codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
     };
     use tikv_util::buffer_vec::BufferVec;
     use tipb_helper::ExprDefBuilder;
diff --git a/components/tidb_query_aggr/src/lib.rs b/components/tidb_query_aggr/src/lib.rs
index 8b53c8a078d..ce1133250a3 100644
--- a/components/tidb_query_aggr/src/lib.rs
+++ b/components/tidb_query_aggr/src/lib.rs
@@ -3,8 +3,10 @@
 //! This crate provides aggregate functions for batch executors.
 
 #![allow(incomplete_features)]
+#![allow(clippy::macro_metavars_in_unsafe)]
 #![feature(proc_macro_hygiene)]
 #![feature(specialization)]
+#![feature(stmt_expr_attributes)]
 
 #[macro_use(box_try)]
 extern crate tikv_util;
@@ -35,13 +37,13 @@ pub use self::parser::{AggrDefinitionParser, AllAggrDefinitionParser};
 /// incremental update model:
 ///
 /// - Each aggregate function associates a state structure, storing partially
-/// computed aggregate results.
+///   computed aggregate results.
 ///
 /// - The caller calls `update()` or `update_vector()` for each row to update
-/// the state.
+///   the state.
 ///
 /// - The caller finally calls `push_result()` to aggregate a summary value and
-/// push it into the given data container.
+///   push it into the given data container.
 ///
 /// This trait can be auto derived by using `tidb_query_codegen::AggrFunction`.
 pub trait AggrFunction: std::fmt::Debug + Send + 'static {
@@ -129,6 +131,7 @@ macro_rules! update_vector {
 }
 
 #[macro_export]
+#[allow(clippy::macro_metavars_in_unsafe)]
 macro_rules! update_repeat {
     ($state:expr, $ctx:expr, $value:expr, $repeat_times:expr) => {
         unsafe { $state.update_repeat_unsafe($ctx, $value.unsafe_into(), $repeat_times) }
@@ -138,7 +141,10 @@ macro_rules! update_repeat {
 #[macro_export]
 macro_rules! update {
     ($state:expr, $ctx:expr, $value:expr) => {
-        unsafe { $state.update_unsafe($ctx, $value.unsafe_into()) }
+        #[allow(clippy::macro_metavars_in_unsafe)]
+        unsafe {
+            $state.update_unsafe($ctx, $value.unsafe_into())
+        }
     };
 }
 
diff --git a/components/tidb_query_aggr/src/parser.rs b/components/tidb_query_aggr/src/parser.rs
index 600326edb2f..78558912623 100644
--- a/components/tidb_query_aggr/src/parser.rs
+++ b/components/tidb_query_aggr/src/parser.rs
@@ -5,7 +5,7 @@ use tidb_query_datatype::expr::EvalContext;
 use tidb_query_expr::{RpnExpression, RpnExpressionBuilder};
 use tipb::{Expr, ExprType, FieldType};
 
-use crate::{impl_bit_op::*, impl_max_min::*, impl_variance::*, AggrFunction};
+use crate::{AggrFunction, impl_bit_op::*, impl_max_min::*, impl_variance::*};
 
 /// Parse a specific aggregate function definition from protobuf.
 ///
diff --git a/components/tidb_query_aggr/src/summable.rs b/components/tidb_query_aggr/src/summable.rs
index dd8b802644a..1f304a2bd4e 100644
--- a/components/tidb_query_aggr/src/summable.rs
+++ b/components/tidb_query_aggr/src/summable.rs
@@ -13,6 +13,7 @@ pub trait Summable: Evaluable + EvaluableRet {
     /// Adds assign another value.
     fn add_assign(&mut self, ctx: &mut EvalContext, other: &Self) -> Result<()>;
 
+    #[allow(dead_code)]
     fn add(&self, other: &Self) -> Result<Self>;
     fn sub(&self, other: &Self) -> Result<Self>;
     fn mul(&self, other: &Self) -> Result<Self>;
diff --git a/components/tidb_query_aggr/src/util.rs b/components/tidb_query_aggr/src/util.rs
index c4361e685a5..0d83cfaac98 100644
--- a/components/tidb_query_aggr/src/util.rs
+++ b/components/tidb_query_aggr/src/util.rs
@@ -1,8 +1,8 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
 use tidb_query_common::Result;
-use tidb_query_datatype::{builder::FieldTypeBuilder, EvalType, FieldTypeAccessor, FieldTypeTp};
-use tidb_query_expr::{impl_cast::get_cast_fn_rpn_node, RpnExpression, RpnExpressionBuilder};
+use tidb_query_datatype::{EvalType, FieldTypeAccessor, FieldTypeTp, builder::FieldTypeBuilder};
+use tidb_query_expr::{RpnExpression, RpnExpressionBuilder, impl_cast::get_cast_fn_rpn_node};
 use tipb::{Expr, FieldType};
 
 /// Checks whether or not there is only one child and the child expression is
diff --git a/components/tidb_query_codegen/src/lib.rs b/components/tidb_query_codegen/src/lib.rs
index feee1c6afb3..9053fa8c9ff 100644
--- a/components/tidb_query_codegen/src/lib.rs
+++ b/components/tidb_query_codegen/src/lib.rs
@@ -20,7 +20,7 @@ mod rpn_function;
 
 use darling::FromDeriveInput;
 use proc_macro::TokenStream;
-use syn::{parse_macro_input, DeriveInput};
+use syn::{DeriveInput, parse_macro_input};
 
 /// The `AggrFunction` custom derive.
 #[proc_macro_derive(AggrFunction, attributes(aggr_function))]
diff --git a/components/tidb_query_codegen/src/rpn_function.rs b/components/tidb_query_codegen/src/rpn_function.rs
index 8b414b64a63..00494f2f216 100644
--- a/components/tidb_query_codegen/src/rpn_function.rs
+++ b/components/tidb_query_codegen/src/rpn_function.rs
@@ -200,7 +200,7 @@
 //! ```
 use heck::CamelCase;
 use proc_macro2::{Span, TokenStream};
-use quote::{quote, ToTokens};
+use quote::{ToTokens, quote};
 use syn::{punctuated::Punctuated, *};
 
 /// Entry point for the `rpn_fn` attribute.
diff --git a/components/tidb_query_common/Cargo.toml b/components/tidb_query_common/Cargo.toml
index 80bd380b9d7..94998aa9b5f 100644
--- a/components/tidb_query_common/Cargo.toml
+++ b/components/tidb_query_common/Cargo.toml
@@ -9,6 +9,7 @@ license = "Apache-2.0"
 [dependencies]
 anyhow = "1.0"
 api_version = { workspace = true }
+async-trait = "0.1"
 derive_more = "0.99.3"
 error_code = { workspace = true }
 futures = "0.3"
@@ -17,6 +18,7 @@ lazy_static = "1.3"
 log_wrappers = { workspace = true }
 prometheus = { version = "0.13", features = ["nightly"] }
 prometheus-static-metric = "0.5"
+raft = { workspace = true }
 serde_json = "1.0"
 thiserror = "1.0"
 tikv_util = { workspace = true }
diff --git a/components/tidb_query_common/src/execute_stats.rs b/components/tidb_query_common/src/execute_stats.rs
index 122363eed98..0816443fb70 100644
--- a/components/tidb_query_common/src/execute_stats.rs
+++ b/components/tidb_query_common/src/execute_stats.rs
@@ -45,6 +45,13 @@ pub struct ExecSummaryCollectorEnabled {
     counts: ExecSummary,
 }
 
+impl ExecSummaryCollectorEnabled {
+    #[inline]
+    pub fn get_output_index(&self) -> usize {
+        self.output_index
+    }
+}
+
 impl ExecSummaryCollector for ExecSummaryCollectorEnabled {
     type DurationRecorder = tikv_util::time::Instant;
 
@@ -98,14 +105,6 @@ impl ExecSummaryCollector for ExecSummaryCollectorDisabled {
     fn collect(&mut self, _target: &mut [ExecSummary]) {}
 }
 
-/// Combines an `ExecSummaryCollector` with another type. This inner type `T`
-/// typically `Executor`/`BatchExecutor`, such that `WithSummaryCollector<C, T>`
-/// would implement the same trait and collects the statistics into `C`.
-pub struct WithSummaryCollector<C: ExecSummaryCollector, T> {
-    pub summary_collector: C,
-    pub inner: T,
-}
-
 /// Execution statistics to be flowed between parent and child executors at once
 /// during `collect_exec_stats()` invocation.
 pub struct ExecuteStats {
diff --git a/components/tidb_query_common/src/metrics.rs b/components/tidb_query_common/src/metrics.rs
index 24340aa5e4e..dacf247e43f 100644
--- a/components/tidb_query_common/src/metrics.rs
+++ b/components/tidb_query_common/src/metrics.rs
@@ -22,6 +22,8 @@ make_auto_flush_static_metric! {
         stream_aggr,
         top_n,
         limit,
+        batch_index_lookup,
+        batch_index_lookup_table_scan,
     }
 
     pub struct LocalCoprExecutorCount: LocalIntCounter {
diff --git a/components/tidb_query_common/src/storage/mod.rs b/components/tidb_query_common/src/storage/mod.rs
index f8d9f37723d..499b9e61cb5 100644
--- a/components/tidb_query_common/src/storage/mod.rs
+++ b/components/tidb_query_common/src/storage/mod.rs
@@ -5,6 +5,10 @@ pub mod ranges_iter;
 pub mod scanner;
 pub mod test_fixture;
 
+use async_trait::async_trait;
+use kvproto::{coprocessor::KeyRange, metapb::Region};
+use raft;
+
 pub use self::range::*;
 
 pub type Result<T> = std::result::Result<T, crate::error::StorageError>;
@@ -64,3 +68,109 @@ impl<T: Storage + ?Sized> Storage for Box<T> {
         (**self).collect_statistics(dest);
     }
 }
+
+pub type StateRole = raft::StateRole;
+
+/// The result of find_region_by_key
+#[derive(Debug, Clone, PartialEq)]
+pub enum FindRegionResult {
+    /// A region that contains the specified key is found.
+    Found { region: Region, role: StateRole },
+    /// No region that contains the specified key is found.
+    /// The field `next_region_start` indicates the start key of the nearest
+    /// region in the local store after the specified key.
+    /// For example, if the regions are distributed in the local store as
+    /// follows: | ------------- [a, b) ------- c ------ [d, e) ------------- |
+    ///                            |            |          |
+    ///                         region1        key       region2
+    /// Because the region of the key is found in the local store,
+    /// NotFound { next_region_start: "d" } will be returned.
+    /// It is useful to get the "hole" after the specified key in the local
+    /// store, and the caller can use it to determine whether the following keys
+    /// can be located in the local store or not without accessing the
+    /// storage.
+    NotFound { next_region_start: Option<Vec<u8>> },
+}
+
+impl FindRegionResult {
+    /// Creates a `FindRegionResult` with the found region and its role.
+    #[inline]
+    pub fn with_found(region: Region, role: StateRole) -> Self {
+        FindRegionResult::Found { region, role }
+    }
+
+    /// Creates a `FindRegionResult` with no region found; the next region start
+    /// key is attached.
+    #[inline]
+    pub fn with_not_found(next_region_start: Option<Vec<u8>>) -> Self {
+        FindRegionResult::NotFound { next_region_start }
+    }
+
+    #[inline]
+    pub fn is_found(&self) -> bool {
+        matches!(self, FindRegionResult::Found { .. })
+    }
+}
+
+/// The abstract interface for accessing some extra region storages in the
+/// cop-task.
+/// For example, in the `IndexLookUp` executor can use it to find the regions
+/// and storages where the primary keys are located.
+#[async_trait]
+pub trait RegionStorageAccessor: Sync + Send + Clone {
+    type Storage;
+
+    /// Find the region that contains the specified key.
+    /// If found, `FindRegionResult::Found`, which contains the region and its
+    /// role will be returned.
+    /// Otherwise, `FindRegionResult::NotFound` will be returned.
+    /// The argument `key` should be the comparable format, you should use
+    /// `Key::from_raw` encode the raw key.
+    async fn find_region_by_key(&self, key: &[u8]) -> Result<FindRegionResult>;
+    /// Get the local storage for the specified region.
+    /// It receives a region and a list of key ranges which need to be scanned.
+    async fn get_local_region_storage(
+        &self,
+        region: &Region,
+        key_ranges: &[KeyRange],
+    ) -> Result<Self::Storage>;
+}
+
+/// StubAccessor is only a placeholder that does not provide any real
+/// functionality.
+/// It should not be instantiated.
+#[derive(Debug)]
+pub struct StubAccessor<S> {
+    _phantom: std::marker::PhantomData<fn() -> S>,
+}
+
+impl<S> StubAccessor<S> {
+    pub fn none() -> Option<Self> {
+        None
+    }
+}
+
+impl<S> Clone for StubAccessor<S> {
+    fn clone(&self) -> Self {
+        StubAccessor {
+            _phantom: std::marker::PhantomData,
+        }
+    }
+}
+
+#[async_trait]
+impl<S> RegionStorageAccessor for StubAccessor<S> {
+    type Storage = S;
+
+    async fn find_region_by_key(&self, _key: &[u8]) -> Result<FindRegionResult> {
+        unimplemented!()
+    }
+
+    async fn get_local_region_storage(
+        &self,
+        _region: &Region,
+        _key_ranges: &[KeyRange],
+    ) -> Result<Self::Storage> {
+        unimplemented!()
+    }
+}
diff --git a/components/tidb_query_common/src/storage/scanner.rs b/components/tidb_query_common/src/storage/scanner.rs
index d0d2345a09e..75e5e6d180f 100644
--- a/components/tidb_query_common/src/storage/scanner.rs
+++ b/components/tidb_query_common/src/storage/scanner.rs
@@ -6,7 +6,7 @@ use api_version::KvFormat;
 use tikv_util::time::Instant;
 use yatp::task::future::reschedule;
 
-use super::{range::*, ranges_iter::*, OwnedKvPair, Storage};
+use super::{OwnedKvPair, Storage, range::*, ranges_iter::*};
 use crate::error::StorageError;
 
 const KEY_BUFFER_CAPACITY: usize = 64;
@@ -292,11 +292,11 @@ impl<T: Storage, F: KvFormat> RangesScanner<T, F> {
 
 #[cfg(test)]
 mod tests {
-    use api_version::{keyspace::KvPair, ApiV1};
+    use api_version::{ApiV1, keyspace::KvPair};
     use futures::executor::block_on;
 
     use super::*;
-    use crate::storage::{test_fixture::FixtureStorage, IntervalRange, PointRange, Range};
+    use crate::storage::{IntervalRange, PointRange, Range, test_fixture::FixtureStorage};
 
     fn create_storage() -> FixtureStorage {
         let data: &[(&'static [u8], &'static [u8])] = &[
diff --git a/components/tidb_query_common/src/storage/test_fixture.rs b/components/tidb_query_common/src/storage/test_fixture.rs
index 305bc5bf168..948bf093ce2 100644
--- a/components/tidb_query_common/src/storage/test_fixture.rs
+++ b/components/tidb_query_common/src/storage/test_fixture.rs
@@ -1,15 +1,15 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    collections::{btree_map, BTreeMap},
+    collections::{BTreeMap, btree_map},
     sync::Arc,
 };
 
-use super::{range::*, Result};
+use super::{Result, range::*};
 
-type ErrorBuilder = Box<dyn Send + Sync + Fn() -> crate::error::StorageError>;
+pub type ErrorBuilder = Box<dyn Send + Sync + Fn() -> crate::error::StorageError>;
 
-type FixtureValue = std::result::Result<Vec<u8>, ErrorBuilder>;
+pub type FixtureValue = std::result::Result<Vec<u8>, ErrorBuilder>;
 
 /// A `Storage` implementation that returns fixed source data (i.e. fixture).
 /// Useful in tests.
@@ -61,8 +61,12 @@ impl super::Storage for FixtureStorage {
         let data_view = self
             .data
             .range(range.lower_inclusive..range.upper_exclusive);
+
         // Erase the lifetime to be 'static.
-        self.data_view_unsafe = unsafe { Some(std::mem::transmute(data_view)) };
+        self.data_view_unsafe = unsafe {
+            #[allow(clippy::missing_transmute_annotations)]
+            Some(std::mem::transmute(data_view))
+        };
         self.is_backward_scan = is_backward_scan;
         self.is_key_only = is_key_only;
         Ok(())
diff --git a/components/tidb_query_datatype/Cargo.toml b/components/tidb_query_datatype/Cargo.toml
index 6c0ebcf82fd..931508d062d 100644
--- a/components/tidb_query_datatype/Cargo.toml
+++ b/components/tidb_query_datatype/Cargo.toml
@@ -28,14 +28,13 @@ log_wrappers = { workspace = true }
 match-template = "0.0.1"
 nom = { version = "7.1.0", default-features = false, features = ["std"] }
 num = { version = "0.3", default-features = false }
-num-derive = "0.3"
+num-derive = "0.4"
 num-traits = "0.2"
 ordered-float = "2.0"
 protobuf = "2"
 regex = "1.1"
 serde = "1.0"
 serde_json = "1.0"
-simsimd = "6.2.3"
 slog = { workspace = true }
 slog-global = { workspace = true }
 static_assertions = { version = "1.0", features = ["nightly"] }
diff --git a/components/tidb_query_datatype/benches/bench_vector_distance.rs b/components/tidb_query_datatype/benches/bench_vector_distance.rs
index e2169e2df3b..4a2675e3e9f 100644
--- a/components/tidb_query_datatype/benches/bench_vector_distance.rs
+++ b/components/tidb_query_datatype/benches/bench_vector_distance.rs
@@ -1,110 +1,191 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use tidb_query_datatype::codec::mysql::VectorFloat32Ref;
 
-static TEST_CASES: &[(&str, &[f32])] = &[
-    ("3d", &[1.1, 2.2, 3.3]),
-    ("10d", &[1.0; 10]),
-    ("100d", &[1.0; 100]),
-    ("400d", &[1.0; 400]),
-    ("784d", &[1.0; 784]),
-    ("1000d", &[1.0; 1000]),
-    ("4000d", &[1.0; 4000]),
-];
-
-fn bench_l1_distance(c: &mut Criterion) {
-    for (label, va) in TEST_CASES {
-        let vec_va = VectorFloat32Ref::from_f32(va);
-        let vec_vb = VectorFloat32Ref::from_f32(va);
-
-        c.bench_function(&format!("l1_distance_{}", label), |b| {
-            b.iter(|| {
-                black_box(black_box(vec_va).l1_distance(black_box(vec_vb)).unwrap());
-            });
+fn bench_l1_distance_3d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.1, 2.2, 3.3];
+    let vb: Vec<f32> = vec![1.1, 2.2, 3.3];
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+    let vec_vb = VectorFloat32Ref::from_f32(vb.as_slice()).unwrap();
+
+    c.bench_function("l1_distance_3d", |b| {
+        b.iter(|| {
+            black_box(black_box(vec_va).l1_distance(black_box(vec_vb)).unwrap());
+        });
+    });
+}
+
+fn bench_l1_distance_784d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.0; 784];
+    let vb: Vec<f32> = vec![1.0; 784];
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+    let vec_vb = VectorFloat32Ref::from_f32(vb.as_slice()).unwrap();
+
+    c.bench_function("l1_distance_784d", |b| {
+        b.iter(|| {
+            black_box(black_box(vec_va).l1_distance(black_box(vec_vb)).unwrap());
         });
-    }
+    });
 }
 
-fn bench_l2_squared_distance(c: &mut Criterion) {
-    for (label, va) in TEST_CASES {
-        let vec_va = VectorFloat32Ref::from_f32(va);
-        let vec_vb = VectorFloat32Ref::from_f32(va);
-
-        c.bench_function(&format!("l2_squared_distance_{}", label), |b| {
-            b.iter(|| {
-                black_box(
-                    black_box(vec_va)
-                        .l2_squared_distance(black_box(vec_vb))
-                        .unwrap(),
-                );
-            });
+fn bench_l2_squared_distance_3d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.1, 2.2, 3.3];
+    let vb: Vec<f32> = vec![1.1, 2.2, 3.3];
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+    let vec_vb = VectorFloat32Ref::from_f32(vb.as_slice()).unwrap();
+
+    c.bench_function("l2_squared_distance_3d", |b| {
+        b.iter(|| {
+            black_box(
+                black_box(vec_va)
+                    .l2_squared_distance(black_box(vec_vb))
+                    .unwrap(),
+            );
         });
-    }
+    });
 }
 
-fn bench_l2_distance(c: &mut Criterion) {
-    for (label, va) in TEST_CASES {
-        let vec_va = VectorFloat32Ref::from_f32(va);
-        let vec_vb = VectorFloat32Ref::from_f32(va);
+fn bench_l2_squared_distance_784d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.0; 784];
+    let vb: Vec<f32> = vec![1.0; 784];
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+    let vec_vb = VectorFloat32Ref::from_f32(vb.as_slice()).unwrap();
 
-        c.bench_function(&format!("bench_l2_distance_{}", label), |b| {
-            b.iter(|| {
-                black_box(black_box(vec_va).l2_distance(black_box(vec_vb)).unwrap());
-            });
+    c.bench_function("l2_squared_distance_784d", |b| {
+        b.iter(|| {
+            black_box(
+                black_box(vec_va)
+                    .l2_squared_distance(black_box(vec_vb))
+                    .unwrap(),
+            );
         });
-    }
+    });
 }
 
-fn bench_inner_product(c: &mut Criterion) {
-    for (label, va) in TEST_CASES {
-        let vec_va = VectorFloat32Ref::from_f32(va);
-        let vec_vb = VectorFloat32Ref::from_f32(va);
+fn bench_l2_distance_3d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.1, 2.2, 3.3];
+    let vb: Vec<f32> = vec![1.1, 2.2, 3.3];
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+    let vec_vb = VectorFloat32Ref::from_f32(vb.as_slice()).unwrap();
 
-        c.bench_function(&format!("bench_inner_product_{}", label), |b| {
-            b.iter(|| {
-                black_box(black_box(vec_va).inner_product(black_box(vec_vb)).unwrap());
-            });
+    c.bench_function("l2_distance_3d", |b| {
+        b.iter(|| {
+            black_box(black_box(vec_va).l2_distance(black_box(vec_vb)).unwrap());
         });
-    }
+    });
 }
 
-fn bench_cosine_distance(c: &mut Criterion) {
-    for (label, va) in TEST_CASES {
-        let vec_va = VectorFloat32Ref::from_f32(va);
-        let vec_vb = VectorFloat32Ref::from_f32(va);
-
-        c.bench_function(&format!("bench_cosine_distance_{}", label), |b| {
-            b.iter(|| {
-                black_box(
-                    black_box(vec_va)
-                        .cosine_distance(black_box(vec_vb))
-                        .unwrap(),
-                );
-            });
+fn bench_l2_distance_784d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.0; 784];
+    let vb: Vec<f32> = vec![1.0; 784];
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+    let vec_vb = VectorFloat32Ref::from_f32(vb.as_slice()).unwrap();
+
+    c.bench_function("l2_distance_784d", |b| {
+        b.iter(|| {
+            black_box(black_box(vec_va).l2_distance(black_box(vec_vb)).unwrap());
+        });
+    });
+}
+
+fn bench_inner_product_3d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.1, 2.2, 3.3];
+    let vb: Vec<f32> = vec![1.1, 2.2, 3.3];
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+    let vec_vb = VectorFloat32Ref::from_f32(vb.as_slice()).unwrap();
+
+    c.bench_function("inner_product_3d", |b| {
+        b.iter(|| {
+            black_box(black_box(vec_va).inner_product(black_box(vec_vb)).unwrap());
+        });
+    });
+}
+
+fn bench_inner_product_784d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.0; 784];
+    let vb: Vec<f32> = vec![1.0; 784];
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+    let vec_vb = VectorFloat32Ref::from_f32(vb.as_slice()).unwrap();
+
+    c.bench_function("inner_product_784d", |b| {
+        b.iter(|| {
+            black_box(black_box(vec_va).inner_product(black_box(vec_vb)).unwrap());
         });
-    }
+    });
 }
 
-fn bench_l2_norm(c: &mut Criterion) {
-    for (label, va) in TEST_CASES {
-        let vec_va = VectorFloat32Ref::from_f32(va);
+fn bench_cosine_distance_3d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.1, 2.2, 3.3];
+    let vb: Vec<f32> = vec![1.1, 2.2, 3.3];
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+    let vec_vb = VectorFloat32Ref::from_f32(vb.as_slice()).unwrap();
+
+    c.bench_function("cosine_distance_3d", |b| {
+        b.iter(|| {
+            black_box(
+                black_box(vec_va)
+                    .cosine_distance(black_box(vec_vb))
+                    .unwrap(),
+            );
+        });
+    });
+}
+
+fn bench_cosine_distance_784d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.0; 784];
+    let vb: Vec<f32> = vec![1.0; 784];
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+    let vec_vb = VectorFloat32Ref::from_f32(vb.as_slice()).unwrap();
+
+    c.bench_function("cosine_distance_784d", |b| {
+        b.iter(|| {
+            black_box(
+                black_box(vec_va)
+                    .cosine_distance(black_box(vec_vb))
+                    .unwrap(),
+            );
+        });
+    });
+}
+
+fn bench_l2_norm_3d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.1, 2.2, 3.3];
+
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
+
+    c.bench_function("l2_norm_3d", |b| {
+        b.iter(|| {
+            black_box(black_box(vec_va).l2_norm());
+        });
+    });
+}
+
+fn bench_l2_norm_784d(c: &mut Criterion) {
+    let va: Vec<f32> = vec![1.0; 784];
+
+    let vec_va = VectorFloat32Ref::from_f32(va.as_slice()).unwrap();
 
-        c.bench_function(&format!("bench_l2_norm_{}", label), |b| {
-            b.iter(|| {
-                black_box(black_box(vec_va).l2_norm()).unwrap();
-            });
+    c.bench_function("l2_norm_784d", |b| {
+        b.iter(|| {
+            black_box(black_box(vec_va).l2_norm());
         });
-    }
+    });
 }
 
 criterion_group!(
     benches,
-    bench_l1_distance,
-    bench_l2_squared_distance,
-    bench_l2_distance,
-    bench_inner_product,
-    bench_cosine_distance,
-    bench_l2_norm,
+    bench_l1_distance_3d,
+    bench_l1_distance_784d,
+    bench_l2_squared_distance_3d,
+    bench_l2_squared_distance_784d,
+    bench_l2_distance_3d,
+    bench_l2_distance_784d,
+    bench_inner_product_3d,
+    bench_inner_product_784d,
+    bench_cosine_distance_3d,
+    bench_cosine_distance_784d,
+    bench_l2_norm_3d,
+    bench_l2_norm_784d,
 );
 criterion_main!(benches);
diff --git a/components/tidb_query_datatype/src/codec/batch/lazy_column.rs b/components/tidb_query_datatype/src/codec/batch/lazy_column.rs
index b95b892e3f0..03c20162771 100644
--- a/components/tidb_query_datatype/src/codec/batch/lazy_column.rs
+++ b/components/tidb_query_datatype/src/codec/batch/lazy_column.rs
@@ -4,14 +4,15 @@ use tikv_util::buffer_vec::BufferVec;
 use tipb::FieldType;
 
 use crate::{
+    EvalType, FieldTypeAccessor,
     codec::{
+        Result,
         chunk::{ChunkColumnEncoder, Column},
         data_type::{ChunkedVec, LogicalRows, VectorValue},
         datum_codec::RawDatumDecoder,
-        Result,
     },
     expr::EvalContext,
-    match_template_evaltype, EvalType, FieldTypeAccessor,
+    match_template_evaltype,
 };
 
 /// A container stores an array of datums, which can be either raw (not
@@ -412,8 +413,8 @@ mod benches {
     #[bench]
     fn bench_lazy_batch_column_clone_decoded(b: &mut test::Bencher) {
         use crate::{
-            codec::datum::{Datum, DatumEncoder},
             FieldTypeTp,
+            codec::datum::{Datum, DatumEncoder},
         };
 
         let mut column = LazyBatchColumn::raw_with_capacity(1000);
@@ -445,8 +446,8 @@ mod benches {
     #[bench]
     fn bench_lazy_batch_column_clone_and_decode(b: &mut test::Bencher) {
         use crate::{
-            codec::datum::{Datum, DatumEncoder},
             FieldTypeTp,
+            codec::datum::{Datum, DatumEncoder},
         };
 
         let mut ctx = EvalContext::default();
@@ -482,8 +483,8 @@ mod benches {
     #[bench]
     fn bench_lazy_batch_column_clone_and_decode_decoded(b: &mut test::Bencher) {
         use crate::{
-            codec::datum::{Datum, DatumEncoder},
             FieldTypeTp,
+            codec::datum::{Datum, DatumEncoder},
         };
 
         let mut column = LazyBatchColumn::raw_with_capacity(1000);
diff --git a/components/tidb_query_datatype/src/codec/batch/lazy_column_vec.rs b/components/tidb_query_datatype/src/codec/batch/lazy_column_vec.rs
index 2bd5ebaa99a..a6f5b97b5cb 100644
--- a/components/tidb_query_datatype/src/codec/batch/lazy_column_vec.rs
+++ b/components/tidb_query_datatype/src/codec/batch/lazy_column_vec.rs
@@ -6,7 +6,7 @@ use tipb::FieldType;
 
 use super::LazyBatchColumn;
 use crate::{
-    codec::{data_type::VectorValue, Result},
+    codec::{Result, data_type::VectorValue},
     expr::EvalContext,
 };
 
diff --git a/components/tidb_query_datatype/src/codec/chunk/chunk.rs b/components/tidb_query_datatype/src/codec/chunk/chunk.rs
index b4478c8a4d3..f423cf3694b 100644
--- a/components/tidb_query_datatype/src/codec/chunk/chunk.rs
+++ b/components/tidb_query_datatype/src/codec/chunk/chunk.rs
@@ -4,10 +4,10 @@ use codec::buffer::BufferWriter;
 use tipb::FieldType;
 
 use super::{
-    column::{ChunkColumnEncoder, Column},
     Result,
+    column::{ChunkColumnEncoder, Column},
 };
-use crate::{codec::Datum, FieldTypeAccessor};
+use crate::{FieldTypeAccessor, codec::Datum};
 
 /// `Chunk` stores multiple rows of data.
 /// Values are appended in compact format and can be directly accessed without
@@ -79,8 +79,8 @@ impl Chunk {
         RowIterator::new(self)
     }
 
-    #[cfg(test)]
-    pub fn decode(
+    /// Only use for test
+    pub fn decode_for_test(
         buf: &mut tikv_util::codec::BytesSlice<'_>,
         field_types: &[FieldType],
     ) -> Result<Chunk> {
@@ -90,7 +90,7 @@ impl Chunk {
         for ft in field_types {
             chunk
                 .columns
-                .push(Column::decode(buf, ft.as_accessor().tp())?);
+                .push(Column::decode_for_test(buf, ft.as_accessor().tp())?);
         }
         Ok(chunk)
     }
@@ -145,7 +145,7 @@ pub struct RowIterator<'a> {
 }
 
 impl<'a> RowIterator<'a> {
-    fn new(chunk: &'a Chunk) -> RowIterator<'a> {
+    pub fn new(chunk: &'a Chunk) -> RowIterator<'a> {
         RowIterator { c: chunk, idx: 0 }
     }
 }
@@ -166,17 +166,17 @@ impl<'a> Iterator for RowIterator<'a> {
 
 #[cfg(test)]
 mod tests {
-    use test::{black_box, Bencher};
+    use test::{Bencher, black_box};
 
     use super::*;
     use crate::{
+        FieldTypeTp,
         codec::{
             batch::LazyBatchColumn,
             datum::{Datum, DatumEncoder},
             mysql::*,
         },
         expr::EvalContext,
-        FieldTypeTp,
     };
 
     #[test]
@@ -359,7 +359,7 @@ mod tests {
         }
         let mut data = vec![];
         data.write_chunk(&chunk).unwrap();
-        let got = Chunk::decode(&mut data.as_slice(), &fields).unwrap();
+        let got = Chunk::decode_for_test(&mut data.as_slice(), &fields).unwrap();
         assert_eq!(got.num_cols(), fields.len());
         assert_eq!(got.num_rows(), rows);
         for row_id in 0..rows {
diff --git a/components/tidb_query_datatype/src/codec/chunk/column.rs b/components/tidb_query_datatype/src/codec/chunk/column.rs
index 1068f0d7ba5..41624d7cb89 100644
--- a/components/tidb_query_datatype/src/codec/chunk/column.rs
+++ b/components/tidb_query_datatype/src/codec/chunk/column.rs
@@ -9,14 +9,16 @@ use tipb::FieldType;
 
 use super::{Error, Result};
 use crate::{
+    EvalType, FieldTypeFlag, FieldTypeTp,
     codec::{
+        Datum,
         data_type::{ChunkRef, VectorFloat32Ref, VectorValue},
         datum,
         datum_codec::DatumPayloadDecoder,
         mysql::{
             decimal::{
-                Decimal, DecimalDatumPayloadChunkEncoder, DecimalDecoder, DecimalEncoder,
-                DECIMAL_STRUCT_SIZE,
+                DECIMAL_STRUCT_SIZE, Decimal, DecimalDatumPayloadChunkEncoder, DecimalDecoder,
+                DecimalEncoder,
             },
             duration::{
                 Duration, DurationDatumPayloadChunkEncoder, DurationDecoder, DurationEncoder,
@@ -29,11 +31,9 @@ use crate::{
                 VectorFloat32Encoder,
             },
         },
-        Datum,
     },
     expr::EvalContext,
     prelude::*,
-    EvalType, FieldTypeFlag, FieldTypeTp,
 };
 
 /// `Column` stores the same column data of multi rows in one chunk.
@@ -1017,13 +1017,16 @@ impl Column {
         self.len() == 0
     }
 
-    #[cfg(test)]
-    pub fn decode(buf: &mut tikv_util::codec::BytesSlice<'_>, tp: FieldTypeTp) -> Result<Column> {
+    /// Only used for test
+    pub fn decode_for_test(
+        buf: &mut tikv_util::codec::BytesSlice<'_>,
+        tp: FieldTypeTp,
+    ) -> Result<Column> {
         let length = buf.read_u32_le()? as usize;
         let mut col = Column::new(tp, length);
         col.length = length;
         col.null_cnt = buf.read_u32_le()? as usize;
-        let null_length = (col.length + 7) / 8_usize;
+        let null_length = col.length.div_ceil(8);
         if col.null_cnt > 0 {
             col.null_bitmap = buf.read_bytes(null_length)?.to_vec();
         } else {
@@ -1053,7 +1056,7 @@ pub trait ChunkColumnEncoder: NumberEncoder {
         self.write_u32_le(col.null_cnt as u32)?;
         // bitmap
         if col.null_cnt > 0 {
-            let length = (col.length + 7) / 8;
+            let length = col.length.div_ceil(8);
             self.write_bytes(&col.null_bitmap[0..length])?;
         }
         // offsets
@@ -1073,7 +1076,7 @@ impl<T: BufferWriter> ChunkColumnEncoder for T {}
 
 #[cfg(test)]
 mod tests {
-    use std::{f64, u64};
+    use std::f64;
 
     use tipb::FieldType;
 
diff --git a/components/tidb_query_datatype/src/codec/chunk/mod.rs b/components/tidb_query_datatype/src/codec/chunk/mod.rs
index 8d1c2bf264a..a5e0aea2158 100644
--- a/components/tidb_query_datatype/src/codec/chunk/mod.rs
+++ b/components/tidb_query_datatype/src/codec/chunk/mod.rs
@@ -4,7 +4,7 @@ mod chunk;
 mod column;
 
 pub use self::{
-    chunk::{Chunk, ChunkEncoder},
+    chunk::{Chunk, ChunkEncoder, RowIterator},
     column::{ChunkColumnEncoder, Column},
 };
 pub use crate::codec::{Error, Result};
diff --git a/components/tidb_query_datatype/src/codec/collation/collator/gb18030_collation.rs b/components/tidb_query_datatype/src/codec/collation/collator/gb18030_collation.rs
index ff21559ded6..f1c4860666b 100644
--- a/components/tidb_query_datatype/src/codec/collation/collator/gb18030_collation.rs
+++ b/components/tidb_query_datatype/src/codec/collation/collator/gb18030_collation.rs
@@ -27,19 +27,29 @@ impl Collator for CollatorGb18030Bin {
 
     #[inline]
     fn write_sort_key<W: BufferWriter>(writer: &mut W, bstr: &[u8]) -> Result<usize> {
-        let s = str::from_utf8(bstr)?.trim_end_matches(PADDING_SPACE);
+        let mut bstr_rest = trim_end_padding(bstr);
         let mut n = 0;
-        for ch in s.chars() {
-            let weight = Self::char_weight(ch);
-            if weight > 0xFFFF {
-                writer.write_u32_be(weight)?;
-                n += 4;
-            } else if weight > 0xFF {
-                writer.write_u16_be(weight as u16)?;
-                n += 2;
-            } else {
-                writer.write_u8(weight as u8)?;
-                n += 1;
+        while !bstr_rest.is_empty() {
+            match next_utf8_char(bstr_rest) {
+                Some((ch, b_next)) => {
+                    let weight = Self::char_weight(ch);
+                    if weight > 0xFFFF {
+                        writer.write_u32_be(weight)?;
+                        n += 4;
+                    } else if weight > 0xFF {
+                        writer.write_u16_be(weight as u16)?;
+                        n += 2;
+                    } else {
+                        writer.write_u8(weight as u8)?;
+                        n += 1;
+                    }
+                    bstr_rest = b_next
+                }
+                None => {
+                    writer.write_u8(b'?')?;
+                    n += 1;
+                    bstr_rest = &bstr_rest[1..]
+                }
             }
         }
         Ok(n * std::mem::size_of::<u8>())
@@ -47,23 +57,41 @@ impl Collator for CollatorGb18030Bin {
 
     #[inline]
     fn sort_compare(a: &[u8], b: &[u8], force_no_pad: bool) -> Result<Ordering> {
-        let mut sa = str::from_utf8(a)?;
-        let mut sb = str::from_utf8(b)?;
-        if !force_no_pad {
-            sa = sa.trim_end_matches(PADDING_SPACE);
-            sb = sb.trim_end_matches(PADDING_SPACE);
+        let sa = if force_no_pad { a } else { trim_end_padding(a) };
+        let sb = if force_no_pad { b } else { trim_end_padding(b) };
+        let mut a_rest = sa;
+        let mut b_rest = sb;
+
+        while !a_rest.is_empty() && !b_rest.is_empty() {
+            let (ch_a, a_next) = next_utf8_char(a_rest).unwrap_or(('?', &a_rest[1..]));
+            let (ch_b, b_next) = next_utf8_char(b_rest).unwrap_or(('?', &b_rest[1..]));
+
+            let ord = Self::char_weight(ch_a).cmp(&Self::char_weight(ch_b));
+            if ord != Ordering::Equal {
+                return Ok(ord);
+            }
+
+            a_rest = a_next;
+            b_rest = b_next;
         }
-        Ok(sa
-            .chars()
-            .map(Self::char_weight)
-            .cmp(sb.chars().map(Self::char_weight)))
+
+        Ok(a_rest.len().cmp(&b_rest.len()))
     }
 
     #[inline]
     fn sort_hash<H: Hasher>(state: &mut H, bstr: &[u8]) -> Result<()> {
-        let s = str::from_utf8(bstr)?.trim_end_matches(PADDING_SPACE);
-        for ch in s.chars().map(Self::char_weight) {
-            ch.hash(state);
+        let mut bstr_rest = trim_end_padding(bstr);
+        while !bstr_rest.is_empty() {
+            match next_utf8_char(bstr_rest) {
+                Some((ch_b, b_next)) => {
+                    Self::char_weight(ch_b).hash(state);
+                    bstr_rest = b_next
+                }
+                None => {
+                    Self::char_weight('?').hash(state);
+                    bstr_rest = &bstr_rest[1..];
+                }
+            }
         }
         Ok(())
     }
@@ -94,19 +122,25 @@ impl Collator for CollatorGb18030ChineseCi {
 
     #[inline]
     fn write_sort_key<W: BufferWriter>(writer: &mut W, bstr: &[u8]) -> Result<usize> {
-        let s = str::from_utf8(bstr)?.trim_end_matches(PADDING_SPACE);
+        let mut bstr_rest = trim_end_padding(bstr);
         let mut n = 0;
-        for ch in s.chars() {
-            let weight = Self::char_weight(ch);
-            if weight > 0xFFFF {
-                writer.write_u32_be(weight)?;
-                n += 4;
-            } else if weight > 0xFF {
-                writer.write_u16_be(weight as u16)?;
-                n += 2;
-            } else {
-                writer.write_u8(weight as u8)?;
-                n += 1;
+        while !bstr_rest.is_empty() {
+            match next_utf8_char(bstr_rest) {
+                Some((ch, b_next)) => {
+                    let weight = Self::char_weight(ch);
+                    if weight > 0xFFFF {
+                        writer.write_u32_be(weight)?;
+                        n += 4;
+                    } else if weight > 0xFF {
+                        writer.write_u16_be(weight as u16)?;
+                        n += 2;
+                    } else {
+                        writer.write_u8(weight as u8)?;
+                        n += 1;
+                    }
+                    bstr_rest = b_next
+                }
+                _ => break,
             }
         }
         Ok(n * std::mem::size_of::<u8>())
@@ -114,23 +148,39 @@ impl Collator for CollatorGb18030ChineseCi {
 
     #[inline]
     fn sort_compare(a: &[u8], b: &[u8], force_no_pad: bool) -> Result<Ordering> {
-        let mut sa = str::from_utf8(a)?;
-        let mut sb = str::from_utf8(b)?;
-        if !force_no_pad {
-            sa = sa.trim_end_matches(PADDING_SPACE);
-            sb = sb.trim_end_matches(PADDING_SPACE);
+        let sa = if force_no_pad { a } else { trim_end_padding(a) };
+        let sb = if force_no_pad { b } else { trim_end_padding(b) };
+        let mut a_rest = sa;
+        let mut b_rest = sb;
+
+        while !a_rest.is_empty() && !b_rest.is_empty() {
+            match (next_utf8_char(a_rest), next_utf8_char(b_rest)) {
+                (Some((ch_a, a_next)), Some((ch_b, b_next))) => {
+                    let ord = Self::char_weight(ch_a).cmp(&Self::char_weight(ch_b));
+                    if ord != Ordering::Equal {
+                        return Ok(ord);
+                    }
+                    a_rest = a_next;
+                    b_rest = b_next;
+                }
+                _ => return Ok(Ordering::Equal),
+            }
         }
-        Ok(sa
-            .chars()
-            .map(Self::char_weight)
-            .cmp(sb.chars().map(Self::char_weight)))
+
+        Ok(a_rest.len().cmp(&b_rest.len()))
     }
 
     #[inline]
     fn sort_hash<H: Hasher>(state: &mut H, bstr: &[u8]) -> Result<()> {
-        let s = str::from_utf8(bstr)?.trim_end_matches(PADDING_SPACE);
-        for ch in s.chars().map(Self::char_weight) {
-            ch.hash(state);
+        let mut bstr_rest = trim_end_padding(bstr);
+        while !bstr_rest.is_empty() {
+            match next_utf8_char(bstr_rest) {
+                Some((ch_b, b_next)) => {
+                    Self::char_weight(ch_b).hash(state);
+                    bstr_rest = b_next
+                }
+                _ => break,
+            }
         }
         Ok(())
     }
@@ -148,8 +198,8 @@ const GB18030_CHINESE_CI_TABLE: &[u8; TABLE_SIZE_FOR_GB18030] =
 #[cfg(test)]
 mod tests {
     use crate::codec::collation::{
-        collator::{CollatorGb18030Bin, CollatorGb18030ChineseCi},
         Collator,
+        collator::{CollatorGb18030Bin, CollatorGb18030ChineseCi},
     };
 
     #[test]
diff --git a/components/tidb_query_datatype/src/codec/collation/collator/gbk_collation.rs b/components/tidb_query_datatype/src/codec/collation/collator/gbk_collation.rs
index fe71e8e1713..6f7c099a060 100644
--- a/components/tidb_query_datatype/src/codec/collation/collator/gbk_collation.rs
+++ b/components/tidb_query_datatype/src/codec/collation/collator/gbk_collation.rs
@@ -4,6 +4,7 @@ use super::*;
 
 trait GbkCollator: 'static + Send + Sync + std::fmt::Debug {
     const IS_CASE_INSENSITIVE: bool;
+    const NEED_TRUNCATE_INVALID_UTF8_RUNE: bool;
     const WEIGHT_TABLE: &'static [u8; TABLE_SIZE_FOR_GBK];
 }
 
@@ -27,16 +28,29 @@ impl<T: GbkCollator> Collator for T {
 
     #[inline]
     fn write_sort_key<W: BufferWriter>(writer: &mut W, bstr: &[u8]) -> Result<usize> {
-        let s = str::from_utf8(bstr)?.trim_end_matches(PADDING_SPACE);
+        let mut bstr_rest = trim_end_padding(bstr);
         let mut n = 0;
-        for ch in s.chars() {
-            let weight = Self::char_weight(ch);
-            if weight > 0xFF {
-                writer.write_u16_be(weight)?;
-                n += 2;
-            } else {
-                writer.write_u8(weight as u8)?;
-                n += 1;
+        while !bstr_rest.is_empty() {
+            match next_utf8_char(bstr_rest) {
+                Some((ch, b_next)) => {
+                    let weight = Self::char_weight(ch);
+                    if weight > 0xFF {
+                        writer.write_u16_be(weight)?;
+                        n += 2;
+                    } else {
+                        writer.write_u8(weight as u8)?;
+                        n += 1;
+                    }
+                    bstr_rest = b_next
+                }
+                _ => {
+                    if Self::NEED_TRUNCATE_INVALID_UTF8_RUNE {
+                        break;
+                    }
+                    writer.write_u8(b'?')?;
+                    n += 1;
+                    bstr_rest = &bstr_rest[1..]
+                }
             }
         }
         Ok(n * std::mem::size_of::<u8>())
@@ -44,23 +58,63 @@ impl<T: GbkCollator> Collator for T {
 
     #[inline]
     fn sort_compare(a: &[u8], b: &[u8], force_no_pad: bool) -> Result<Ordering> {
-        let mut sa = str::from_utf8(a)?;
-        let mut sb = str::from_utf8(b)?;
-        if !force_no_pad {
-            sa = sa.trim_end_matches(PADDING_SPACE);
-            sb = sb.trim_end_matches(PADDING_SPACE);
+        let sa = if force_no_pad { a } else { trim_end_padding(a) };
+        let sb = if force_no_pad { b } else { trim_end_padding(b) };
+        let mut a_rest = sa;
+        let mut b_rest = sb;
+
+        while !a_rest.is_empty() && !b_rest.is_empty() {
+            let (ch_a, a_next) = match next_utf8_char(a_rest) {
+                Some((ch, next)) => (ch, next),
+                None => {
+                    if Self::NEED_TRUNCATE_INVALID_UTF8_RUNE {
+                        return Ok(Ordering::Equal);
+                    } else {
+                        ('?', &a_rest[1..])
+                    }
+                }
+            };
+
+            let (ch_b, b_next) = match next_utf8_char(b_rest) {
+                Some((ch, next)) => (ch, next),
+                None => {
+                    if Self::NEED_TRUNCATE_INVALID_UTF8_RUNE {
+                        return Ok(Ordering::Equal);
+                    } else {
+                        ('?', &b_rest[1..])
+                    }
+                }
+            };
+
+            let ord = Self::char_weight(ch_a).cmp(&Self::char_weight(ch_b));
+            if ord != Ordering::Equal {
+                return Ok(ord);
+            }
+
+            a_rest = a_next;
+            b_rest = b_next;
         }
-        Ok(sa
-            .chars()
-            .map(Self::char_weight)
-            .cmp(sb.chars().map(Self::char_weight)))
+
+        Ok(a_rest.len().cmp(&b_rest.len()))
     }
 
     #[inline]
     fn sort_hash<H: Hasher>(state: &mut H, bstr: &[u8]) -> Result<()> {
-        let s = str::from_utf8(bstr)?.trim_end_matches(PADDING_SPACE);
-        for ch in s.chars().map(Self::char_weight) {
-            ch.hash(state);
+        let mut bstr_rest = trim_end_padding(bstr);
+        while !bstr_rest.is_empty() {
+            match next_utf8_char(bstr_rest) {
+                Some((ch_b, b_next)) => {
+                    Self::char_weight(ch_b).hash(state);
+                    bstr_rest = b_next
+                }
+                _ => {
+                    if Self::NEED_TRUNCATE_INVALID_UTF8_RUNE {
+                        break;
+                    }
+                    Self::char_weight('?').hash(state);
+                    bstr_rest = &bstr_rest[1..]
+                }
+            }
         }
         Ok(())
     }
@@ -72,6 +126,7 @@ pub struct CollatorGbkBin;
 
 impl GbkCollator for CollatorGbkBin {
     const IS_CASE_INSENSITIVE: bool = false;
+    const NEED_TRUNCATE_INVALID_UTF8_RUNE: bool = false;
     const WEIGHT_TABLE: &'static [u8; TABLE_SIZE_FOR_GBK] = GBK_BIN_TABLE;
 }
 
@@ -82,6 +137,7 @@ pub struct CollatorGbkChineseCi;
 
 impl GbkCollator for CollatorGbkChineseCi {
     const IS_CASE_INSENSITIVE: bool = true;
+    const NEED_TRUNCATE_INVALID_UTF8_RUNE: bool = true;
     const WEIGHT_TABLE: &'static [u8; TABLE_SIZE_FOR_GBK] = GBK_CHINESE_CI_TABLE;
 }
 
diff --git a/components/tidb_query_datatype/src/codec/collation/collator/latin1_bin.rs b/components/tidb_query_datatype/src/codec/collation/collator/latin1_bin.rs
index a63a5aed7e2..f4ba576340a 100644
--- a/components/tidb_query_datatype/src/codec/collation/collator/latin1_bin.rs
+++ b/components/tidb_query_datatype/src/codec/collation/collator/latin1_bin.rs
@@ -1,6 +1,6 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
-use bstr::{ByteSlice, B};
+use bstr::{B, ByteSlice};
 
 use super::*;
 
diff --git a/components/tidb_query_datatype/src/codec/collation/collator/mod.rs b/components/tidb_query_datatype/src/codec/collation/collator/mod.rs
index 4385f83e74b..cf197b2a482 100644
--- a/components/tidb_query_datatype/src/codec/collation/collator/mod.rs
+++ b/components/tidb_query_datatype/src/codec/collation/collator/mod.rs
@@ -11,7 +11,6 @@ mod utf8mb4_uca;
 use std::{
     cmp::Ordering,
     hash::{Hash, Hasher},
-    str,
 };
 
 pub use binary::*;
@@ -23,14 +22,37 @@ pub use utf8mb4_binary::*;
 pub use utf8mb4_general_ci::*;
 pub use utf8mb4_uca::*;
 
-use super::{charset::*, Collator};
+use super::{Collator, charset::*};
 use crate::codec::Result;
 
 pub const PADDING_SPACE: char = 0x20 as char;
 
+pub(crate) fn trim_end_padding(mut s: &[u8]) -> &[u8] {
+    while s.ends_with(&[PADDING_SPACE as u8]) {
+        s = &s[..s.len() - 1];
+    }
+    s
+}
+
+pub(crate) fn next_utf8_char(s: &[u8]) -> Option<(char, &[u8])> {
+    let len = match s.first()? {
+        0x00..=0x7F => 1,
+        0xC2..=0xDF => 2,
+        0xE0..=0xEF => 3,
+        0xF0..=0xF4 => 4,
+        _ => return None,
+    };
+    if s.len() < len {
+        return None;
+    }
+    let (head, tail) = s.split_at(len);
+    let ch = std::str::from_utf8(head).ok()?.chars().next()?;
+    Some((ch, tail))
+}
+
 #[cfg(test)]
 mod tests {
-    use crate::{codec::collation::Collator, match_template_collator, Collation};
+    use crate::{Collation, codec::collation::Collator, match_template_collator};
 
     #[test]
     #[allow(clippy::string_lit_as_bytes)]
@@ -223,6 +245,40 @@ mod tests {
                     Ordering::Less,
                 ],
             ),
+            (
+                &[0x3e, 0xfe, 0x3e, 0x3e],
+                &[0x3e, 0xff],
+                [
+                    Ordering::Less,
+                    Ordering::Less,
+                    Ordering::Equal,
+                    Ordering::Equal,
+                    Ordering::Less,
+                    Ordering::Greater,
+                    Ordering::Equal,
+                    Ordering::Equal,
+                    Ordering::Less,
+                    Ordering::Greater,
+                    Ordering::Equal,
+                ],
+            ),
+            (
+                "ʩ".as_bytes(),
+                "F".as_bytes(),
+                [
+                    Ordering::Greater,
+                    Ordering::Greater,
+                    Ordering::Greater,
+                    Ordering::Greater,
+                    Ordering::Greater,
+                    Ordering::Less, // `ʩ` is invalid character in GBK.
+                    Ordering::Less, // `ʩ` is invalid character in GBK.
+                    Ordering::Greater,
+                    Ordering::Greater,
+                    Ordering::Greater,
+                    Ordering::Greater,
+                ],
+            ),
         ];
 
         for (sa, sb, expected) in cases {
diff --git a/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_binary.rs b/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_binary.rs
index e5333411cdb..bd20ced7b12 100644
--- a/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_binary.rs
+++ b/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_binary.rs
@@ -20,26 +20,22 @@ impl Collator for CollatorUtf8Mb4Bin {
 
     #[inline]
     fn write_sort_key<W: BufferWriter>(writer: &mut W, bstr: &[u8]) -> Result<usize> {
-        let s = str::from_utf8(bstr)?.trim_end_matches(PADDING_SPACE);
-        writer.write_bytes(s.as_bytes())?;
-        Ok(s.len())
+        let bstr = trim_end_padding(bstr);
+        writer.write_bytes(bstr)?;
+        Ok(bstr.len())
     }
 
     #[inline]
     fn sort_compare(a: &[u8], b: &[u8], force_no_pad: bool) -> Result<Ordering> {
-        let mut sa = str::from_utf8(a)?;
-        let mut sb = str::from_utf8(b)?;
-        if !force_no_pad {
-            sa = sa.trim_end_matches(PADDING_SPACE);
-            sb = sb.trim_end_matches(PADDING_SPACE);
-        }
-        Ok(sa.as_bytes().cmp(sb.as_bytes()))
+        let a = if force_no_pad { a } else { trim_end_padding(a) };
+        let b = if force_no_pad { b } else { trim_end_padding(b) };
+        Ok(a.cmp(b))
     }
 
     #[inline]
     fn sort_hash<H: Hasher>(state: &mut H, bstr: &[u8]) -> Result<()> {
-        let s = str::from_utf8(bstr)?.trim_end_matches(PADDING_SPACE);
-        s.hash(state);
+        let bstr = trim_end_padding(bstr);
+        bstr.hash(state);
         Ok(())
     }
 }
@@ -61,21 +57,17 @@ impl Collator for CollatorUtf8Mb4BinNoPadding {
 
     #[inline]
     fn write_sort_key<W: BufferWriter>(writer: &mut W, bstr: &[u8]) -> Result<usize> {
-        str::from_utf8(bstr)?;
         writer.write_bytes(bstr)?;
         Ok(bstr.len())
     }
 
     #[inline]
     fn sort_compare(a: &[u8], b: &[u8], _force_no_pad: bool) -> Result<Ordering> {
-        str::from_utf8(a)?;
-        str::from_utf8(b)?;
         Ok(a.cmp(b))
     }
 
     #[inline]
     fn sort_hash<H: Hasher>(state: &mut H, bstr: &[u8]) -> Result<()> {
-        str::from_utf8(bstr)?;
         bstr.hash(state);
         Ok(())
     }
diff --git a/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_general_ci.rs b/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_general_ci.rs
index 7b0f27d70d0..6522d7519a3 100644
--- a/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_general_ci.rs
+++ b/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_general_ci.rs
@@ -28,34 +28,58 @@ impl Collator for CollatorUtf8Mb4GeneralCi {
 
     #[inline]
     fn write_sort_key<W: BufferWriter>(writer: &mut W, bstr: &[u8]) -> Result<usize> {
-        let s = str::from_utf8(bstr)?.trim_end_matches(PADDING_SPACE);
+        let mut bstr_rest = trim_end_padding(bstr);
         let mut n = 0;
-        for ch in s.chars() {
-            writer.write_u16_be(Self::char_weight(ch))?;
-            n += 1;
+
+        while !bstr_rest.is_empty() {
+            match next_utf8_char(bstr_rest) {
+                Some((ch_b, b_next)) => {
+                    writer.write_u16_be(Self::char_weight(ch_b))?;
+                    n += 1;
+                    bstr_rest = b_next
+                }
+                _ => break,
+            }
         }
         Ok(n * std::mem::size_of::<u16>())
     }
 
     #[inline]
     fn sort_compare(a: &[u8], b: &[u8], force_no_pad: bool) -> Result<Ordering> {
-        let mut sa = str::from_utf8(a)?;
-        let mut sb = str::from_utf8(b)?;
-        if !force_no_pad {
-            sa = sa.trim_end_matches(PADDING_SPACE);
-            sb = sb.trim_end_matches(PADDING_SPACE);
+        let a = if force_no_pad { a } else { trim_end_padding(a) };
+        let b = if force_no_pad { b } else { trim_end_padding(b) };
+
+        let mut a_rest = a;
+        let mut b_rest = b;
+
+        while !a_rest.is_empty() && !b_rest.is_empty() {
+            match (next_utf8_char(a_rest), next_utf8_char(b_rest)) {
+                (Some((ch_a, a_next)), Some((ch_b, b_next))) => {
+                    let ord = Self::char_weight(ch_a).cmp(&Self::char_weight(ch_b));
+                    if ord != Ordering::Equal {
+                        return Ok(ord);
+                    }
+                    a_rest = a_next;
+                    b_rest = b_next;
+                }
+                _ => return Ok(Ordering::Equal),
+            }
         }
-        Ok(sa
-            .chars()
-            .map(Self::char_weight)
-            .cmp(sb.chars().map(Self::char_weight)))
+
+        Ok(a_rest.len().cmp(&b_rest.len()))
     }
 
     #[inline]
     fn sort_hash<H: Hasher>(state: &mut H, bstr: &[u8]) -> Result<()> {
-        let s = str::from_utf8(bstr)?.trim_end_matches(PADDING_SPACE);
-        for ch in s.chars().map(Self::char_weight) {
-            ch.hash(state);
+        let mut bstr_rest = trim_end_padding(bstr);
+        while !bstr_rest.is_empty() {
+            match next_utf8_char(bstr_rest) {
+                Some((ch_b, b_next)) => {
+                    Self::char_weight(ch_b).hash(state);
+                    bstr_rest = b_next
+                }
+                _ => break,
+            }
         }
         Ok(())
     }
diff --git a/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/data_0400.rs b/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/data_0400.rs
index b117170a70a..7f7a33b8ac6 100644
--- a/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/data_0400.rs
+++ b/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/data_0400.rs
@@ -2,7 +2,8 @@
 
 // Created from https://www.unicode.org/Public/UCA/4.0.0/allkeys-4.0.0.txt
 
-use super::{super::PADDING_SPACE, UnicodeVersion};
+use super::UnicodeVersion;
+use crate::codec::collation::collator::trim_end_padding;
 
 static LONG_RUNE: u64 = 0xFFFD;
 
@@ -11,8 +12,8 @@ pub struct Unicode0400 {}
 
 impl UnicodeVersion for Unicode0400 {
     #[inline]
-    fn preprocess(s: &str) -> &str {
-        s.trim_end_matches(PADDING_SPACE)
+    fn preprocess(s: &[u8]) -> &[u8] {
+        trim_end_padding(s)
     }
 
     #[inline]
diff --git a/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/data_0900.rs b/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/data_0900.rs
index 974eb8103c7..17c425f5074 100644
--- a/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/data_0900.rs
+++ b/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/data_0900.rs
@@ -11,7 +11,7 @@ pub struct Unicode0900 {}
 
 impl UnicodeVersion for Unicode0900 {
     #[inline]
-    fn preprocess(s: &str) -> &str {
+    fn preprocess(s: &[u8]) -> &[u8] {
         s
     }
 
diff --git a/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/mod.rs b/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/mod.rs
index cb653f5170d..ae6af3c7c8d 100644
--- a/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/mod.rs
+++ b/components/tidb_query_datatype/src/codec/collation/collator/utf8mb4_uca/mod.rs
@@ -15,7 +15,7 @@ pub type CollatorUtf8Mb4UnicodeCi = CollatorUca<data_0400::Unicode0400>;
 pub type CollatorUtf8Mb40900AiCi = CollatorUca<data_0900::Unicode0900>;
 
 pub trait UnicodeVersion: 'static + Send + Sync + Debug {
-    fn preprocess(s: &str) -> &str;
+    fn preprocess(s: &[u8]) -> &[u8];
 
     fn char_weight(ch: char) -> u128;
 }
@@ -38,15 +38,22 @@ impl<T: UnicodeVersion> Collator for CollatorUca<T> {
 
     #[inline]
     fn write_sort_key<W: BufferWriter>(writer: &mut W, bstr: &[u8]) -> Result<usize> {
-        let s = T::preprocess(str::from_utf8(bstr)?);
+        let mut bstr_rest = T::preprocess(bstr);
 
         let mut n = 0;
-        for ch in s.chars() {
-            let mut weight = Self::char_weight(ch);
-            while weight != 0 {
-                writer.write_u16_be((weight & 0xFFFF) as u16)?;
-                n += 1;
-                weight >>= 16
+
+        while !bstr_rest.is_empty() {
+            match next_utf8_char(bstr_rest) {
+                Some((ch_b, b_next)) => {
+                    let mut weight = Self::char_weight(ch_b);
+                    while weight != 0 {
+                        writer.write_u16_be((weight & 0xFFFF) as u16)?;
+                        n += 1;
+                        weight >>= 16
+                    }
+                    bstr_rest = b_next
+                }
+                _ => break,
             }
         }
         Ok(n * std::mem::size_of::<u16>())
@@ -54,34 +61,30 @@ impl<T: UnicodeVersion> Collator for CollatorUca<T> {
 
     #[inline]
     fn sort_compare(a: &[u8], b: &[u8], force_no_pad: bool) -> Result<Ordering> {
-        let mut sa = str::from_utf8(a)?;
-        let mut sb = str::from_utf8(b)?;
-        if !force_no_pad {
-            sa = T::preprocess(sa);
-            sb = T::preprocess(sb);
-        }
+        let mut sa = if force_no_pad { a } else { T::preprocess(a) };
+        let mut sb = if force_no_pad { b } else { T::preprocess(b) };
 
-        let mut ca = sa.chars();
-        let mut cb = sb.chars();
         let mut an = 0;
         let mut bn = 0;
 
         loop {
-            if an == 0 {
-                for ach in &mut ca {
-                    an = Self::char_weight(ach);
-                    if an != 0 {
-                        break;
+            while an == 0 && !sa.is_empty() {
+                match next_utf8_char(sa) {
+                    Some((ch_a, a_next)) => {
+                        an = Self::char_weight(ch_a);
+                        sa = a_next;
                     }
+                    _ => return Ok(Ordering::Equal),
                 }
             }
 
-            if bn == 0 {
-                for bch in &mut cb {
-                    bn = Self::char_weight(bch);
-                    if bn != 0 {
-                        break;
+            while bn == 0 && !sb.is_empty() {
+                match next_utf8_char(sb) {
+                    Some((ch_b, b_next)) => {
+                        bn = Self::char_weight(ch_b);
+                        sb = b_next;
                     }
+                    _ => return Ok(Ordering::Equal),
                 }
             }
 
@@ -96,24 +99,29 @@ impl<T: UnicodeVersion> Collator for CollatorUca<T> {
             }
 
             while an != 0 && bn != 0 {
-                if (an ^ bn) & 0xFFFF == 0 {
-                    an >>= 16;
-                    bn >>= 16;
-                } else {
+                if (an ^ bn) & 0xFFFF != 0 {
                     return Ok((an & 0xFFFF).cmp(&(bn & 0xFFFF)));
                 }
+                an >>= 16;
+                bn >>= 16;
             }
         }
     }
 
     #[inline]
     fn sort_hash<H: Hasher>(state: &mut H, bstr: &[u8]) -> Result<()> {
-        let s = T::preprocess(str::from_utf8(bstr)?);
-        for ch in s.chars() {
-            let mut weight = Self::char_weight(ch);
-            while weight != 0 {
-                (weight & 0xFFFF).hash(state);
-                weight >>= 16;
+        let mut bstr_rest = T::preprocess(bstr);
+        while !bstr_rest.is_empty() {
+            match next_utf8_char(bstr_rest) {
+                Some((ch_b, b_next)) => {
+                    let mut weight = Self::char_weight(ch_b);
+                    while weight != 0 {
+                        (weight & 0xFFFF).hash(state);
+                        weight >>= 16;
+                    }
+                    bstr_rest = b_next
+                }
+                _ => break,
             }
         }
         Ok(())
diff --git a/components/tidb_query_datatype/src/codec/collation/encoding/gb18030.rs b/components/tidb_query_datatype/src/codec/collation/encoding/gb18030.rs
index b66512af0f7..44077975064 100644
--- a/components/tidb_query_datatype/src/codec/collation/encoding/gb18030.rs
+++ b/components/tidb_query_datatype/src/codec/collation/encoding/gb18030.rs
@@ -275,7 +275,7 @@ impl Encoding for EncodingGb18030 {
 mod tests {
     use bstr::ByteSlice;
 
-    use crate::codec::collation::{encoding::EncodingGb18030, Encoding};
+    use crate::codec::collation::{Encoding, encoding::EncodingGb18030};
 
     #[test]
     fn test_encode() {
diff --git a/components/tidb_query_datatype/src/codec/collation/encoding/mod.rs b/components/tidb_query_datatype/src/codec/collation/encoding/mod.rs
index ba7d5d75ec2..5a713248b56 100644
--- a/components/tidb_query_datatype/src/codec/collation/encoding/mod.rs
+++ b/components/tidb_query_datatype/src/codec/collation/encoding/mod.rs
@@ -17,8 +17,8 @@ pub use utf8::*;
 
 use super::Encoding;
 use crate::codec::{
-    data_type::{Bytes, BytesRef},
     Error, Result,
+    data_type::{Bytes, BytesRef},
 };
 
 fn format_invalid_char(data: BytesRef<'_>) -> String {
diff --git a/components/tidb_query_datatype/src/codec/collation/mod.rs b/components/tidb_query_datatype/src/codec/collation/mod.rs
index 98284ac5463..159245099be 100644
--- a/components/tidb_query_datatype/src/codec/collation/mod.rs
+++ b/components/tidb_query_datatype/src/codec/collation/mod.rs
@@ -15,8 +15,8 @@ use codec::prelude::*;
 use num::Unsigned;
 
 use crate::codec::{
-    data_type::{Bytes, BytesGuard, BytesRef, BytesWriter},
     Result,
+    data_type::{Bytes, BytesGuard, BytesRef, BytesWriter},
 };
 
 #[macro_export]
@@ -197,7 +197,10 @@ where
     #[allow(clippy::transmute_ptr_to_ptr)]
     pub fn new_ref(inner: &T) -> Result<&Self> {
         C::Charset::validate(inner.as_ref())?;
-        Ok(unsafe { std::mem::transmute(inner) })
+        Ok(unsafe {
+            #[allow(clippy::missing_transmute_annotations)]
+            std::mem::transmute(inner)
+        })
     }
 
     #[inline]
@@ -206,7 +209,10 @@ where
         if let Some(inner) = inner {
             C::Charset::validate(inner.as_ref())?;
         }
-        Ok(unsafe { std::mem::transmute(inner) })
+        Ok(unsafe {
+            #[allow(clippy::missing_transmute_annotations)]
+            std::mem::transmute(inner)
+        })
     }
 
     #[inline]
diff --git a/components/tidb_query_datatype/src/codec/convert.rs b/components/tidb_query_datatype/src/codec/convert.rs
index 94fd1fbe253..49ac916f8f9 100644
--- a/components/tidb_query_datatype/src/codec/convert.rs
+++ b/components/tidb_query_datatype/src/codec/convert.rs
@@ -5,18 +5,18 @@ use std::{borrow::Cow, fmt::Display};
 use tipb::FieldType;
 
 use super::{
-    mysql::{charset::MULTI_BYTES_CHARSETS, RoundMode, DEFAULT_FSP},
     Error, Result,
+    mysql::{DEFAULT_FSP, RoundMode, charset::MULTI_BYTES_CHARSETS},
 };
 // use crate::{self, FieldTypeTp, UNSPECIFIED_LENGTH};
 use crate::{
+    Collation, FieldTypeAccessor, FieldTypeTp, UNSPECIFIED_LENGTH,
     codec::{
         data_type::*,
         error::ERR_DATA_OUT_OF_RANGE,
-        mysql::{decimal::max_or_min_dec, Res},
+        mysql::{Res, decimal::max_or_min_dec},
     },
     expr::{EvalContext, Flag},
-    Collation, FieldTypeAccessor, FieldTypeTp, UNSPECIFIED_LENGTH,
 };
 
 /// A trait for converting a value to an `Int`.
@@ -27,6 +27,20 @@ pub trait ToInt {
     fn to_uint(&self, ctx: &mut EvalContext, tp: FieldTypeTp) -> Result<u64>;
 }
 
+/// A trait for converting a value to a `String`.
+///
+/// NOTE: we can't resue the `ToString` trait becuase this trait may return
+/// different value with `fmt::Display`.
+pub trait ToStringValue {
+    fn to_string_value(&self) -> String;
+}
+
+impl<T: ToString> ToStringValue for T {
+    default fn to_string_value(&self) -> String {
+        self.to_string()
+    }
+}
+
 /// A trait for converting a value to `T`
 pub trait ConvertTo<T> {
     /// Converts the given value to `T` value
@@ -78,26 +92,26 @@ where
 
 impl<T> ConvertTo<String> for T
 where
-    T: ToString + EvaluableRet,
+    T: ToStringValue + EvaluableRet,
 {
     #[inline]
     fn convert(&self, _: &mut EvalContext) -> Result<String> {
         // FIXME: There is an additional step `ProduceStrWithSpecifiedTp` in TiDB.
-        Ok(self.to_string())
+        Ok(self.to_string_value())
     }
 }
 
 impl<T> ConvertTo<Bytes> for T
 where
-    T: ToString + EvaluableRet,
+    T: ToStringValue + EvaluableRet,
 {
     #[inline]
     fn convert(&self, _: &mut EvalContext) -> Result<Bytes> {
-        Ok(self.to_string().into_bytes())
+        Ok(self.to_string_value().into_bytes())
     }
 }
 
-impl<'a> ConvertTo<Real> for JsonRef<'a> {
+impl ConvertTo<Real> for JsonRef<'_> {
     #[inline]
     fn convert(&self, ctx: &mut EvalContext) -> Result<Real> {
         let val = self.convert(ctx)?;
@@ -106,25 +120,25 @@ impl<'a> ConvertTo<Real> for JsonRef<'a> {
     }
 }
 
-impl<'a> ConvertTo<String> for JsonRef<'a> {
+impl ConvertTo<String> for JsonRef<'_> {
     #[inline]
     fn convert(&self, _: &mut EvalContext) -> Result<String> {
         // FIXME: There is an additional step `ProduceStrWithSpecifiedTp` in TiDB.
-        Ok(self.to_string())
+        Ok(self.to_string_value())
     }
 }
 
-impl<'a> ConvertTo<Bytes> for JsonRef<'a> {
+impl ConvertTo<Bytes> for JsonRef<'_> {
     #[inline]
     fn convert(&self, _: &mut EvalContext) -> Result<Bytes> {
-        Ok(self.to_string().into_bytes())
+        Ok(self.to_string_value().into_bytes())
     }
 }
 
-impl<'a> ConvertTo<Bytes> for EnumRef<'a> {
+impl ConvertTo<Bytes> for EnumRef<'_> {
     #[inline]
     fn convert(&self, _: &mut EvalContext) -> Result<Bytes> {
-        Ok(self.to_string().into_bytes())
+        Ok(self.to_string_value().into_bytes())
     }
 }
 
@@ -500,7 +514,7 @@ impl ToInt for Json {
     }
 }
 
-impl<'a> ToInt for JsonRef<'a> {
+impl ToInt for JsonRef<'_> {
     // Port from TiDB's types.ConvertJSONToInt
     #[inline]
     fn to_int(&self, ctx: &mut EvalContext, tp: FieldTypeTp) -> Result<i64> {
@@ -516,7 +530,10 @@ impl<'a> ToInt for JsonRef<'a> {
             JsonType::Double => self.get_double().to_int(ctx, tp),
             JsonType::String => self.get_str_bytes()?.to_int(ctx, tp),
             _ => Ok(ctx
-                .handle_truncate_err(Error::truncated_wrong_val("Integer", self.to_string()))
+                .handle_truncate_err(Error::truncated_wrong_val(
+                    "Integer",
+                    self.to_string_value(),
+                ))
                 .map(|_| 0)?),
         }?;
         val.to_int(ctx, tp)
@@ -532,7 +549,10 @@ impl<'a> ToInt for JsonRef<'a> {
             JsonType::Double => self.get_double().to_uint(ctx, tp),
             JsonType::String => self.get_str_bytes()?.to_uint(ctx, tp),
             _ => Ok(ctx
-                .handle_truncate_err(Error::truncated_wrong_val("Integer", self.to_string()))
+                .handle_truncate_err(Error::truncated_wrong_val(
+                    "Integer",
+                    self.to_string_value(),
+                ))
                 .map(|_| 0)?),
         }?;
         val.to_uint(ctx, tp)
@@ -1011,7 +1031,7 @@ fn exp_float_str_to_int_str<'a>(
     let int_cnt: i64;
     match dot_idx {
         None => {
-            digits.extend_from_slice(valid_float[..e_idx].as_bytes());
+            digits.extend_from_slice(&valid_float.as_bytes()[..e_idx]);
             // if digits.len() > i64::MAX,
             // then the input str has at least 9223372036854775808 chars,
             // which make the str >= 8388608.0 TB,
@@ -1019,9 +1039,9 @@ fn exp_float_str_to_int_str<'a>(
             int_cnt = digits.len() as i64;
         }
         Some(dot_idx) => {
-            digits.extend_from_slice(valid_float[..dot_idx].as_bytes());
+            digits.extend_from_slice(&valid_float.as_bytes()[..dot_idx]);
             int_cnt = digits.len() as i64;
-            digits.extend_from_slice(valid_float[(dot_idx + 1)..e_idx].as_bytes());
+            digits.extend_from_slice(&valid_float.as_bytes()[(dot_idx + 1)..e_idx]);
         }
     }
     // make `digits` immutable
@@ -1138,15 +1158,15 @@ mod tests {
 
     use super::*;
     use crate::{
+        Collation, FieldTypeFlag,
         codec::{
             error::{
                 ERR_DATA_OUT_OF_RANGE, ERR_M_BIGGER_THAN_D, ERR_TRUNCATE_WRONG_VALUE,
                 WARN_DATA_TRUNCATED,
             },
-            mysql::{charset, Res, UNSPECIFIED_FSP},
+            mysql::{Res, UNSPECIFIED_FSP, charset},
         },
         expr::{EvalConfig, EvalContext, Flag},
-        Collation, FieldTypeFlag,
     };
 
     #[test]
@@ -2383,7 +2403,11 @@ mod tests {
                 nd.frac_cnt(),
                 nd.result_frac_cnt()
             );
-            assert_eq!(nd, want, "{}, {}, {}, {}, {}", dec, nd, want, flen, decimal);
+            assert_eq!(
+                nd, want,
+                "{:?}, {:?}, {:?}, {}, {}",
+                dec, nd, want, flen, decimal
+            );
         }
     }
 
@@ -2771,8 +2795,8 @@ mod tests {
                 let r = produce_dec_with_specified_tp(&mut ctx, input, &rft);
 
                 // make log
-                let rs = r.as_ref().map(|x| x.to_string());
-                let expect_str = expect.as_ref().map(|x| x.to_string());
+                let rs = r.as_ref().map(|x| x.to_string_value());
+                let expect_str = expect.as_ref().map(|x| x.to_string_value());
                 let log = format!(
                     "input: {}, origin_flen: {}, origin_decimal: {}, \
                      res_flen: {}, res_decimal: {}, is_unsigned: {}, \
diff --git a/components/tidb_query_datatype/src/codec/data_type/bit_vec.rs b/components/tidb_query_datatype/src/codec/data_type/bit_vec.rs
index 65a466c1710..f080fb38dfd 100644
--- a/components/tidb_query_datatype/src/codec/data_type/bit_vec.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/bit_vec.rs
@@ -106,7 +106,7 @@ impl<'a> BitAndIterator<'a> {
     }
 }
 
-impl<'a> Iterator for BitAndIterator<'a> {
+impl Iterator for BitAndIterator<'_> {
     type Item = bool;
 
     fn next(&mut self) -> Option<Self::Item> {
diff --git a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_bytes.rs b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_bytes.rs
index c4f5abbc122..f5e0e37372d 100644
--- a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_bytes.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_bytes.rs
@@ -1,6 +1,6 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
-use super::{bit_vec::BitVec, Bytes, BytesRef, ChunkRef, ChunkedVec, UnsafeRefInto};
+use super::{Bytes, BytesRef, ChunkRef, ChunkedVec, UnsafeRefInto, bit_vec::BitVec};
 use crate::impl_chunked_vec_common;
 
 #[derive(Debug, PartialEq, Clone)]
@@ -213,7 +213,7 @@ impl From<Vec<Option<Bytes>>> for ChunkedVecBytes {
     }
 }
 
-impl<'a> UnsafeRefInto<&'static ChunkedVecBytes> for &'a ChunkedVecBytes {
+impl UnsafeRefInto<&'static ChunkedVecBytes> for &ChunkedVecBytes {
     unsafe fn unsafe_into(self) -> &'static ChunkedVecBytes {
         std::mem::transmute(self)
     }
diff --git a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_enum.rs b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_enum.rs
index 632adfedc29..33360b0db97 100644
--- a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_enum.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_enum.rs
@@ -1,8 +1,8 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
-use super::{bit_vec::BitVec, ChunkRef, ChunkedVec, Enum, EnumRef, UnsafeRefInto};
+use super::{ChunkRef, ChunkedVec, Enum, EnumRef, UnsafeRefInto, bit_vec::BitVec};
 use crate::{
-    codec::data_type::{retain_lifetime_transmute, ChunkedVecBytes, ChunkedVecSized, Int},
+    codec::data_type::{ChunkedVecBytes, ChunkedVecSized, Int, retain_lifetime_transmute},
     impl_chunked_vec_common,
 };
 
@@ -150,7 +150,7 @@ impl From<Vec<Option<Enum>>> for ChunkedVecEnum {
     }
 }
 
-impl<'a> UnsafeRefInto<&'static ChunkedVecEnum> for &'a ChunkedVecEnum {
+impl UnsafeRefInto<&'static ChunkedVecEnum> for &ChunkedVecEnum {
     unsafe fn unsafe_into(self) -> &'static ChunkedVecEnum {
         std::mem::transmute(self)
     }
diff --git a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_json.rs b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_json.rs
index 4d6ac39c006..686fc12c093 100644
--- a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_json.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_json.rs
@@ -1,6 +1,6 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
-use super::{bit_vec::BitVec, ChunkRef, ChunkedVec, Json, JsonRef, JsonType, UnsafeRefInto};
+use super::{ChunkRef, ChunkedVec, Json, JsonRef, JsonType, UnsafeRefInto, bit_vec::BitVec};
 use crate::impl_chunked_vec_common;
 
 /// A vector storing `Option<Json>` with a compact layout.
@@ -121,7 +121,7 @@ impl From<Vec<Option<Json>>> for ChunkedVecJson {
     }
 }
 
-impl<'a> UnsafeRefInto<&'static ChunkedVecJson> for &'a ChunkedVecJson {
+impl UnsafeRefInto<&'static ChunkedVecJson> for &ChunkedVecJson {
     unsafe fn unsafe_into(self) -> &'static ChunkedVecJson {
         std::mem::transmute(self)
     }
diff --git a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_set.rs b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_set.rs
index 1a3f6838e96..a9dcb55e546 100644
--- a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_set.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_set.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use tikv_util::buffer_vec::BufferVec;
 
-use super::{bit_vec::BitVec, ChunkRef, ChunkedVec, Set, SetRef, UnsafeRefInto};
+use super::{ChunkRef, ChunkedVec, Set, SetRef, UnsafeRefInto, bit_vec::BitVec};
 use crate::impl_chunked_vec_common;
 
 /// `ChunkedVecSet` stores set in a compact way.
@@ -142,7 +142,7 @@ impl From<Vec<Option<Set>>> for ChunkedVecSet {
     }
 }
 
-impl<'a> UnsafeRefInto<&'static ChunkedVecSet> for &'a ChunkedVecSet {
+impl UnsafeRefInto<&'static ChunkedVecSet> for &ChunkedVecSet {
     unsafe fn unsafe_into(self) -> &'static ChunkedVecSet {
         std::mem::transmute(self)
     }
diff --git a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_sized.rs b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_sized.rs
index 4f614d00be0..8ea71e28e16 100644
--- a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_sized.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_sized.rs
@@ -1,6 +1,6 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
-use super::{bit_vec::BitVec, ChunkRef, ChunkedVec, Evaluable, EvaluableRet, UnsafeRefInto};
+use super::{ChunkRef, ChunkedVec, Evaluable, EvaluableRet, UnsafeRefInto, bit_vec::BitVec};
 use crate::impl_chunked_vec_common;
 
 /// A vector storing `Option<T>` with a compact layout.
@@ -105,7 +105,7 @@ impl<T: Clone> From<Vec<Option<T>>> for ChunkedVecSized<T> {
     }
 }
 
-impl<'a, T: Evaluable> UnsafeRefInto<&'static ChunkedVecSized<T>> for &'a ChunkedVecSized<T> {
+impl<T: Evaluable> UnsafeRefInto<&'static ChunkedVecSized<T>> for &ChunkedVecSized<T> {
     unsafe fn unsafe_into(self) -> &'static ChunkedVecSized<T> {
         std::mem::transmute(self)
     }
diff --git a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_vector_float32.rs b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_vector_float32.rs
index 93886107e75..4fab500c778 100644
--- a/components/tidb_query_datatype/src/codec/data_type/chunked_vec_vector_float32.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/chunked_vec_vector_float32.rs
@@ -1,9 +1,12 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
 use super::{
-    bit_vec::BitVec, ChunkRef, ChunkedVec, UnsafeRefInto, VectorFloat32, VectorFloat32Ref,
+    ChunkRef, ChunkedVec, UnsafeRefInto, VectorFloat32, VectorFloat32Ref, bit_vec::BitVec,
+};
+use crate::{
+    codec::mysql::{VectorFloat32Decoder, VectorFloat32Encoder},
+    impl_chunked_vec_common,
 };
-use crate::impl_chunked_vec_common;
 
 /// A vector storing `Option<VectorFloat32>` with a compact layout.
 ///
@@ -15,7 +18,7 @@ use crate::impl_chunked_vec_common;
 /// each element.
 #[derive(Debug, PartialEq, Clone)]
 pub struct ChunkedVecVectorFloat32 {
-    data: Vec<f32>, // Only contains the data part, without any length prefix
+    data: Vec<u8>,
     bitmap: BitVec,
     length: usize,
     var_offset: Vec<usize>,
@@ -26,8 +29,12 @@ impl ChunkedVecVectorFloat32 {
     pub fn get(&self, idx: usize) -> Option<VectorFloat32Ref<'_>> {
         assert!(idx < self.len());
         if self.bitmap.get(idx) {
-            let sliced_data = &self.data[self.var_offset[idx]..self.var_offset[idx + 1]];
-            Some(VectorFloat32Ref::from_f32(sliced_data))
+            let mut sliced_data = &self.data[self.var_offset[idx]..self.var_offset[idx + 1]];
+            let v: VectorFloat32Ref<'_> = sliced_data.read_vector_float32_ref().unwrap();
+            unsafe {
+                let v_with_static_lifetime = v.unsafe_into();
+                Some(v_with_static_lifetime)
+            }
         } else {
             None
         }
@@ -49,7 +56,7 @@ impl ChunkedVec<VectorFloat32> for ChunkedVecVectorFloat32 {
     #[inline]
     fn push_data(&mut self, value: VectorFloat32) {
         self.bitmap.push(true);
-        self.data.extend_from_slice(value.as_ref().data());
+        self.data.write_vector_float32(value.as_ref()).unwrap();
         self.var_offset.push(self.data.len());
         self.length += 1;
     }
@@ -121,38 +128,8 @@ impl From<Vec<Option<VectorFloat32>>> for ChunkedVecVectorFloat32 {
     }
 }
 
-impl<'a> UnsafeRefInto<&'static ChunkedVecVectorFloat32> for &'a ChunkedVecVectorFloat32 {
+impl UnsafeRefInto<&'static ChunkedVecVectorFloat32> for &ChunkedVecVectorFloat32 {
     unsafe fn unsafe_into(self) -> &'static ChunkedVecVectorFloat32 {
         std::mem::transmute(self)
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_push_data_and_get() {
-        let mut chunked_vec = ChunkedVecVectorFloat32::with_capacity(5);
-
-        chunked_vec.push_data(VectorFloat32::copy_from_f32(&[1.1, 2.2, 3.3]));
-        chunked_vec.push_data(VectorFloat32::copy_from_f32(&[4.4, 5.5]));
-        // push a null value
-        chunked_vec.push_null();
-        chunked_vec.push_data(VectorFloat32::copy_from_f32(&[6.6, 7.7, 8.8, 9.9]));
-
-        assert_eq!(chunked_vec.len(), 4);
-
-        let vector1 = chunked_vec.get(0).unwrap().to_string();
-        assert_eq!(vector1, "[1.1,2.2,3.3]");
-
-        let vector2 = chunked_vec.get(1).unwrap().to_string();
-        assert_eq!(vector2, "[4.4,5.5]");
-
-        // check if null value is right
-        assert!(chunked_vec.get(2).is_none());
-
-        let vector3 = chunked_vec.get(3).unwrap().to_string();
-        assert_eq!(vector3, "[6.6,7.7,8.8,9.9]");
-    }
-}
diff --git a/components/tidb_query_datatype/src/codec/data_type/logical_rows.rs b/components/tidb_query_datatype/src/codec/data_type/logical_rows.rs
index 46b5a64b010..ab156800d9d 100644
--- a/components/tidb_query_datatype/src/codec/data_type/logical_rows.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/logical_rows.rs
@@ -90,7 +90,7 @@ pub struct LogicalRowsIterator<'a> {
     idx: usize,
 }
 
-impl<'a> Iterator for LogicalRowsIterator<'a> {
+impl Iterator for LogicalRowsIterator<'_> {
     type Item = usize;
     fn next(&mut self) -> Option<Self::Item> {
         let result = if self.idx < self.logical_rows.len() {
diff --git a/components/tidb_query_datatype/src/codec/data_type/mod.rs b/components/tidb_query_datatype/src/codec/data_type/mod.rs
index 5a11a5f295e..2c259b06891 100644
--- a/components/tidb_query_datatype/src/codec/data_type/mod.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/mod.rs
@@ -12,7 +12,7 @@ mod logical_rows;
 mod scalar;
 mod vector;
 
-pub use logical_rows::{LogicalRows, BATCH_MAX_SIZE, IDENTICAL_LOGICAL_ROWS};
+pub use logical_rows::{BATCH_MAX_SIZE, IDENTICAL_LOGICAL_ROWS, LogicalRows};
 
 #[macro_export]
 macro_rules! match_template_evaltype {
@@ -48,10 +48,10 @@ pub use self::{
 };
 use super::Result;
 pub use crate::codec::mysql::{
-    json::JsonRef, Decimal, Duration, Enum, EnumRef, Json, JsonType, Set, SetRef, Time as DateTime,
-    VectorFloat32, VectorFloat32Ref,
+    Decimal, Duration, Enum, EnumRef, Json, JsonType, Set, SetRef, Time as DateTime, VectorFloat32,
+    VectorFloat32Ref, json::JsonRef,
 };
-use crate::{codec::convert::ConvertTo, expr::EvalContext, EvalType};
+use crate::{EvalType, codec::convert::ConvertTo, expr::EvalContext};
 
 /// A trait of evaluating current concrete eval type into a MySQL logic value,
 /// represented by Rust's `bool` type.
@@ -74,7 +74,7 @@ impl AsMySqlBool for Real {
     }
 }
 
-impl<'a, T: AsMySqlBool> AsMySqlBool for &'a T {
+impl<T: AsMySqlBool> AsMySqlBool for &T {
     #[inline]
     fn as_mysql_bool(&self, context: &mut EvalContext) -> Result<bool> {
         (**self).as_mysql_bool(context)
@@ -88,14 +88,14 @@ impl AsMySqlBool for Bytes {
     }
 }
 
-impl<'a> AsMySqlBool for BytesRef<'a> {
+impl AsMySqlBool for BytesRef<'_> {
     #[inline]
     fn as_mysql_bool(&self, context: &mut EvalContext) -> Result<bool> {
         Ok(!self.is_empty() && ConvertTo::<f64>::convert(self, context)? != 0f64)
     }
 }
 
-impl<'a, T> AsMySqlBool for Option<&'a T>
+impl<T> AsMySqlBool for Option<&T>
 where
     T: AsMySqlBool,
 {
@@ -113,31 +113,31 @@ impl AsMySqlBool for VectorFloat32 {
     }
 }
 
-impl<'a> AsMySqlBool for JsonRef<'a> {
+impl AsMySqlBool for JsonRef<'_> {
     fn as_mysql_bool(&self, _context: &mut EvalContext) -> Result<bool> {
         Ok(!self.is_zero())
     }
 }
 
-impl<'a> AsMySqlBool for VectorFloat32Ref<'a> {
+impl AsMySqlBool for VectorFloat32Ref<'_> {
     fn as_mysql_bool(&self, _context: &mut EvalContext) -> Result<bool> {
         Ok(!self.is_empty())
     }
 }
 
-impl<'a> AsMySqlBool for EnumRef<'a> {
+impl AsMySqlBool for EnumRef<'_> {
     fn as_mysql_bool(&self, _context: &mut EvalContext) -> Result<bool> {
         Ok(!self.is_empty())
     }
 }
 
-impl<'a> AsMySqlBool for SetRef<'a> {
+impl AsMySqlBool for SetRef<'_> {
     fn as_mysql_bool(&self, _context: &mut EvalContext) -> Result<bool> {
         Ok(!self.is_empty())
     }
 }
 
-impl<'a> AsMySqlBool for Option<BytesRef<'a>> {
+impl AsMySqlBool for Option<BytesRef<'_>> {
     fn as_mysql_bool(&self, context: &mut EvalContext) -> Result<bool> {
         match self {
             None => Ok(false),
@@ -146,7 +146,7 @@ impl<'a> AsMySqlBool for Option<BytesRef<'a>> {
     }
 }
 
-impl<'a> AsMySqlBool for Option<JsonRef<'a>> {
+impl AsMySqlBool for Option<JsonRef<'_>> {
     fn as_mysql_bool(&self, context: &mut EvalContext) -> Result<bool> {
         match self {
             None => Ok(false),
@@ -155,7 +155,7 @@ impl<'a> AsMySqlBool for Option<JsonRef<'a>> {
     }
 }
 
-impl<'a> AsMySqlBool for Option<VectorFloat32Ref<'a>> {
+impl AsMySqlBool for Option<VectorFloat32Ref<'_>> {
     fn as_mysql_bool(&self, context: &mut EvalContext) -> Result<bool> {
         match self {
             None => Ok(false),
@@ -164,7 +164,7 @@ impl<'a> AsMySqlBool for Option<VectorFloat32Ref<'a>> {
     }
 }
 
-impl<'a> AsMySqlBool for Option<EnumRef<'a>> {
+impl AsMySqlBool for Option<EnumRef<'_>> {
     fn as_mysql_bool(&self, context: &mut EvalContext) -> Result<bool> {
         match self {
             None => Ok(false),
@@ -173,7 +173,7 @@ impl<'a> AsMySqlBool for Option<EnumRef<'a>> {
     }
 }
 
-impl<'a> AsMySqlBool for Option<SetRef<'a>> {
+impl AsMySqlBool for Option<SetRef<'_>> {
     fn as_mysql_bool(&self, context: &mut EvalContext) -> Result<bool> {
         match self {
             None => Ok(false),
@@ -441,7 +441,7 @@ impl<A: UnsafeRefInto<B>, B> UnsafeRefInto<Option<B>> for Option<A> {
     }
 }
 
-impl<'a, T: Evaluable + EvaluableRet> UnsafeRefInto<&'static T> for &'a T {
+impl<T: Evaluable + EvaluableRet> UnsafeRefInto<&'static T> for &T {
     unsafe fn unsafe_into(self) -> &'static T {
         std::mem::transmute(self)
     }
@@ -502,31 +502,31 @@ impl<'a> EvaluableRef<'a> for BytesRef<'a> {
     }
 }
 
-impl<'a> UnsafeRefInto<BytesRef<'static>> for BytesRef<'a> {
+impl UnsafeRefInto<BytesRef<'static>> for BytesRef<'_> {
     unsafe fn unsafe_into(self) -> BytesRef<'static> {
         std::mem::transmute(self)
     }
 }
 
-impl<'a> UnsafeRefInto<JsonRef<'static>> for JsonRef<'a> {
+impl UnsafeRefInto<JsonRef<'static>> for JsonRef<'_> {
     unsafe fn unsafe_into(self) -> JsonRef<'static> {
         std::mem::transmute(self)
     }
 }
 
-impl<'a> UnsafeRefInto<EnumRef<'static>> for EnumRef<'a> {
+impl UnsafeRefInto<EnumRef<'static>> for EnumRef<'_> {
     unsafe fn unsafe_into(self) -> EnumRef<'static> {
         std::mem::transmute(self)
     }
 }
 
-impl<'a> UnsafeRefInto<SetRef<'static>> for SetRef<'a> {
+impl UnsafeRefInto<SetRef<'static>> for SetRef<'_> {
     unsafe fn unsafe_into(self) -> SetRef<'static> {
         std::mem::transmute(self)
     }
 }
 
-impl<'a> UnsafeRefInto<VectorFloat32Ref<'static>> for VectorFloat32Ref<'a> {
+impl UnsafeRefInto<VectorFloat32Ref<'static>> for VectorFloat32Ref<'_> {
     unsafe fn unsafe_into(self) -> VectorFloat32Ref<'static> {
         std::mem::transmute(self)
     }
@@ -711,7 +711,7 @@ impl<'a> EvaluableRef<'a> for SetRef<'a> {
         }
     }
     #[inline]
-    fn borrow_vector_value(v: &'a VectorValue) -> &ChunkedVecSet {
+    fn borrow_vector_value(v: &'a VectorValue) -> &'a ChunkedVecSet {
         match v {
             VectorValue::Set(x) => x,
             other => panic!(
@@ -733,7 +733,6 @@ impl<'a> EvaluableRef<'a> for SetRef<'a> {
 
 #[cfg(test)]
 mod tests {
-    use std::f64;
 
     use super::*;
 
diff --git a/components/tidb_query_datatype/src/codec/data_type/scalar.rs b/components/tidb_query_datatype/src/codec/data_type/scalar.rs
index 397ffbe0619..b0137fffe08 100644
--- a/components/tidb_query_datatype/src/codec/data_type/scalar.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/scalar.rs
@@ -7,8 +7,8 @@ use tipb::FieldType;
 
 use super::*;
 use crate::{
-    codec::collation::Collator, match_template_collator, match_template_evaltype, Collation,
-    EvalType, FieldTypeAccessor,
+    Collation, EvalType, FieldTypeAccessor, codec::collation::Collator, match_template_collator,
+    match_template_evaltype,
 };
 
 /// A scalar value container, a.k.a. datum, for all concrete eval types.
@@ -208,7 +208,7 @@ pub enum ScalarValueRef<'a> {
     VectorFloat32(Option<VectorFloat32Ref<'a>>),
 }
 
-impl<'a> ScalarValueRef<'a> {
+impl ScalarValueRef<'_> {
     #[inline]
     #[allow(clippy::clone_on_copy)]
     pub fn to_owned(self) -> ScalarValue {
@@ -500,14 +500,14 @@ impl<'a> ScalarValueRef<'a> {
     }
 }
 
-impl<'a> Ord for ScalarValueRef<'a> {
+impl Ord for ScalarValueRef<'_> {
     fn cmp(&self, other: &Self) -> Ordering {
         self.partial_cmp(other)
             .expect("Cannot compare two ScalarValueRef in different type")
     }
 }
 
-impl<'a> PartialOrd for ScalarValueRef<'a> {
+impl PartialOrd for ScalarValueRef<'_> {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         match_template_evaltype! {
             TT, match (self, other) {
@@ -520,13 +520,13 @@ impl<'a> PartialOrd for ScalarValueRef<'a> {
     }
 }
 
-impl<'a> PartialEq<ScalarValue> for ScalarValueRef<'a> {
+impl PartialEq<ScalarValue> for ScalarValueRef<'_> {
     fn eq(&self, other: &ScalarValue) -> bool {
         self == &other.as_scalar_value_ref()
     }
 }
 
-impl<'a> PartialEq<ScalarValueRef<'a>> for ScalarValue {
+impl PartialEq<ScalarValueRef<'_>> for ScalarValue {
     fn eq(&self, other: &ScalarValueRef<'_>) -> bool {
         other == self
     }
diff --git a/components/tidb_query_datatype/src/codec/data_type/vector.rs b/components/tidb_query_datatype/src/codec/data_type/vector.rs
index 9086ac3f7b9..2b52aa6c13f 100644
--- a/components/tidb_query_datatype/src/codec/data_type/vector.rs
+++ b/components/tidb_query_datatype/src/codec/data_type/vector.rs
@@ -2,8 +2,9 @@
 
 use super::{scalar::ScalarValueRef, *};
 use crate::{
-    codec::{mysql::decimal::DECIMAL_STRUCT_SIZE, Result},
-    match_template_collator, match_template_evaltype, EvalType, FieldTypeAccessor,
+    EvalType, FieldTypeAccessor,
+    codec::{Result, mysql::decimal::DECIMAL_STRUCT_SIZE},
+    match_template_collator, match_template_evaltype,
 };
 
 /// A vector value container, a.k.a. column, for all concrete eval types.
@@ -482,8 +483,8 @@ impl VectorValue {
         output: &mut Vec<u8>,
     ) -> Result<()> {
         use crate::{
-            codec::{collation::Collator, datum_codec::EvaluableDatumEncoder},
             Collation,
+            codec::{collation::Collator, datum_codec::EvaluableDatumEncoder},
         };
 
         match self {
diff --git a/components/tidb_query_datatype/src/codec/datum.rs b/components/tidb_query_datatype/src/codec/datum.rs
index 3b6520b8e66..f4600a0c286 100644
--- a/components/tidb_query_datatype/src/codec/datum.rs
+++ b/components/tidb_query_datatype/src/codec/datum.rs
@@ -4,7 +4,7 @@ use std::{
     borrow::Cow,
     cmp::Ordering,
     fmt::{self, Debug, Display, Formatter},
-    i64, str,
+    str,
 };
 
 use codec::{
@@ -16,20 +16,20 @@ use mysql::VectorFloat32;
 use tikv_util::{codec::BytesSlice, escape};
 
 use super::{
+    Result,
     mysql::{
-        self, parse_json_path_expr, Decimal, DecimalDecoder, DecimalEncoder, Duration, Enum, Json,
-        JsonDecoder, JsonEncoder, PathExpression, Set, Time, VectorFloat32Decoder,
-        VectorFloat32Encoder, DEFAULT_FSP, MAX_FSP,
+        self, DEFAULT_FSP, Decimal, DecimalDecoder, DecimalEncoder, Duration, Enum, Json,
+        JsonDecoder, JsonEncoder, MAX_FSP, PathExpression, Set, Time, VectorFloat32Decoder,
+        VectorFloat32Encoder, parse_json_path_expr,
     },
-    Result,
 };
 use crate::{
+    FieldTypeTp,
     codec::{
-        convert::{ConvertTo, ToInt},
+        convert::{ConvertTo, ToInt, ToStringValue},
         data_type::AsMySqlBool,
     },
     expr::EvalContext,
-    FieldTypeTp,
 };
 
 pub const NIL_FLAG: u8 = 0;
@@ -409,9 +409,9 @@ impl Datum {
             Datum::Time(t) => format!("{}", t),
             Datum::Dur(ref d) => format!("{}", d),
             Datum::Dec(ref d) => format!("{}", d),
-            Datum::Json(ref d) => d.to_string(),
-            Datum::Enum(ref e) => e.to_string(),
-            Datum::Set(ref s) => s.to_string(),
+            Datum::Json(ref d) => d.to_string_value(),
+            Datum::Enum(ref e) => e.to_string_value(),
+            Datum::Set(ref s) => s.to_string_value(),
             ref d => return Err(invalid_type!("can't convert {} to string", d)),
         };
         Ok(s)
@@ -746,7 +746,7 @@ impl Datum {
     pub fn checked_rem(self, _: &mut EvalContext, d: Datum) -> Result<Datum> {
         match d {
             Datum::I64(0) | Datum::U64(0) => return Ok(Datum::Null),
-            Datum::F64(f) if f == 0f64 => return Ok(Datum::Null),
+            Datum::F64(0f64) => return Ok(Datum::Null),
             _ => {}
         }
         match (self, d) {
@@ -854,7 +854,7 @@ impl<'a> From<&'a [u8]> for Datum {
     }
 }
 
-impl<'a> From<Cow<'a, [u8]>> for Datum {
+impl From<Cow<'_, [u8]>> for Datum {
     fn from(data: Cow<'_, [u8]>) -> Datum {
         data.into_owned().into()
     }
@@ -1176,14 +1176,11 @@ pub fn skip_n(buf: &mut &[u8], n: usize) -> Result<()> {
 
 #[cfg(test)]
 mod tests {
-    use std::{
-        cmp::Ordering, i16, i32, i64, i8, slice::from_ref, str::FromStr, sync::Arc, u16, u32, u64,
-        u8,
-    };
+    use std::{cmp::Ordering, slice::from_ref, str::FromStr, sync::Arc};
 
     use super::*;
     use crate::{
-        codec::mysql::{Decimal, Duration, Time, MAX_FSP},
+        codec::mysql::{Decimal, Duration, MAX_FSP, Time},
         expr::{EvalConfig, EvalContext},
     };
 
@@ -1267,8 +1264,8 @@ mod tests {
                 ),
             ],
             vec![
-                Datum::VectorFloat32(VectorFloat32::copy_from_f32(&[1.0, 2.0, 3.0])),
-                Datum::VectorFloat32(VectorFloat32::copy_from_f32(&[])),
+                Datum::VectorFloat32(VectorFloat32::from_f32(vec![1.0, 2.0, 3.0]).unwrap()),
+                Datum::VectorFloat32(VectorFloat32::from_f32(vec![]).unwrap()),
             ],
         ];
         for vs in table {
diff --git a/components/tidb_query_datatype/src/codec/datum_codec.rs b/components/tidb_query_datatype/src/codec/datum_codec.rs
index 930a9986a86..c4be8f4af3f 100644
--- a/components/tidb_query_datatype/src/codec/datum_codec.rs
+++ b/components/tidb_query_datatype/src/codec/datum_codec.rs
@@ -9,16 +9,15 @@ use tipb::FieldType;
 
 use super::data_type::*;
 use crate::{
+    FieldTypeAccessor, FieldTypeTp,
     codec::{
-        datum,
+        Error, Result, datum,
         mysql::{
             DecimalDecoder, DecimalEncoder, DurationDecoder, EnumDecoder, EnumEncoder, JsonDecoder,
             JsonEncoder, TimeDecoder, VectorFloat32Decoder, VectorFloat32Encoder,
         },
-        Error, Result,
     },
     expr::EvalContext,
-    FieldTypeAccessor, FieldTypeTp,
 };
 
 /// A decoder to decode the payload part of a datum.
@@ -606,49 +605,49 @@ pub trait RawDatumDecoder<T> {
     fn decode(self, field_type: &FieldType, ctx: &mut EvalContext) -> Result<Option<T>>;
 }
 
-impl<'a> RawDatumDecoder<Int> for &'a [u8] {
+impl RawDatumDecoder<Int> for &[u8] {
     fn decode(self, _field_type: &FieldType, _ctx: &mut EvalContext) -> Result<Option<Int>> {
         decode_int_datum(self)
     }
 }
 
-impl<'a> RawDatumDecoder<Real> for &'a [u8] {
+impl RawDatumDecoder<Real> for &[u8] {
     fn decode(self, field_type: &FieldType, _ctx: &mut EvalContext) -> Result<Option<Real>> {
         decode_real_datum(self, field_type)
     }
 }
 
-impl<'a> RawDatumDecoder<Decimal> for &'a [u8] {
+impl RawDatumDecoder<Decimal> for &[u8] {
     fn decode(self, _field_type: &FieldType, _ctx: &mut EvalContext) -> Result<Option<Decimal>> {
         decode_decimal_datum(self)
     }
 }
 
-impl<'a> RawDatumDecoder<Bytes> for &'a [u8] {
+impl RawDatumDecoder<Bytes> for &[u8] {
     fn decode(self, _field_type: &FieldType, _ctx: &mut EvalContext) -> Result<Option<Bytes>> {
         decode_bytes_datum(self)
     }
 }
 
-impl<'a> RawDatumDecoder<DateTime> for &'a [u8] {
+impl RawDatumDecoder<DateTime> for &[u8] {
     fn decode(self, field_type: &FieldType, ctx: &mut EvalContext) -> Result<Option<DateTime>> {
         decode_date_time_datum(self, field_type, ctx)
     }
 }
 
-impl<'a> RawDatumDecoder<Duration> for &'a [u8] {
+impl RawDatumDecoder<Duration> for &[u8] {
     fn decode(self, field_type: &FieldType, _ctx: &mut EvalContext) -> Result<Option<Duration>> {
         decode_duration_datum(self, field_type)
     }
 }
 
-impl<'a> RawDatumDecoder<Json> for &'a [u8] {
+impl RawDatumDecoder<Json> for &[u8] {
     fn decode(self, _field_type: &FieldType, _ctx: &mut EvalContext) -> Result<Option<Json>> {
         decode_json_datum(self)
     }
 }
 
-impl<'a> RawDatumDecoder<VectorFloat32> for &'a [u8] {
+impl RawDatumDecoder<VectorFloat32> for &[u8] {
     fn decode(
         self,
         _field_type: &FieldType,
@@ -658,13 +657,13 @@ impl<'a> RawDatumDecoder<VectorFloat32> for &'a [u8] {
     }
 }
 
-impl<'a> RawDatumDecoder<Enum> for &'a [u8] {
+impl RawDatumDecoder<Enum> for &[u8] {
     fn decode(self, field_type: &FieldType, _ctx: &mut EvalContext) -> Result<Option<Enum>> {
         decode_enum_datum(self, field_type)
     }
 }
 
-impl<'a> RawDatumDecoder<Set> for &'a [u8] {
+impl RawDatumDecoder<Set> for &[u8] {
     fn decode(self, _field_type: &FieldType, _ctx: &mut EvalContext) -> Result<Option<Set>> {
         unimplemented!()
     }
diff --git a/components/tidb_query_datatype/src/codec/mysql/binary_literal.rs b/components/tidb_query_datatype/src/codec/mysql/binary_literal.rs
index 3ab44ad40df..bcde61f5823 100644
--- a/components/tidb_query_datatype/src/codec/mysql/binary_literal.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/binary_literal.rs
@@ -2,11 +2,12 @@
 
 use std::{
     cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd},
+    fmt,
     string::ToString,
 };
 
 use crate::{
-    codec::{error::Error, Result},
+    codec::{Result, error::Error},
     expr::EvalContext,
 };
 
@@ -171,12 +172,12 @@ impl BinaryLiteral {
     }
 }
 
-impl ToString for BinaryLiteral {
-    fn to_string(&self) -> String {
+impl fmt::Display for BinaryLiteral {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if self.0.is_empty() {
-            return String::new();
+            return Ok(());
         }
-        format!("0x{}", hex::encode(self.0.as_slice()))
+        write!(f, "0x{}", hex::encode(self.0.as_slice()))
     }
 }
 
diff --git a/components/tidb_query_datatype/src/codec/mysql/decimal.rs b/components/tidb_query_datatype/src/codec/mysql/decimal.rs
index 8d3e291fa4e..7fb38213831 100644
--- a/components/tidb_query_datatype/src/codec/mysql/decimal.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/decimal.rs
@@ -3,13 +3,12 @@
 use std::{
     cmp,
     cmp::Ordering,
-    fmt::{self, Display, Formatter},
+    fmt,
     hash::{Hash, Hasher},
     intrinsics::copy_nonoverlapping,
     mem,
     ops::{Add, Deref, DerefMut, Div, Mul, Neg, Rem, Sub},
     str::{self, FromStr},
-    string::ToString,
 };
 
 use codec::prelude::*;
@@ -17,10 +16,10 @@ use tikv_util::escape;
 
 use crate::{
     codec::{
-        convert::{self, ConvertTo},
+        Error, Result, TEN_POW,
+        convert::{self, ConvertTo, ToStringValue},
         data_type::*,
         mysql::DEFAULT_DIV_FRAC_INCR,
-        Error, Result, TEN_POW,
     },
     expr::EvalContext,
 };
@@ -157,7 +156,11 @@ macro_rules! word_cnt {
             // when $len is negative and $t is unsigned
             0 as $t
         } else {
-            ($len as $t + DIGITS_PER_WORD as $t - 1) / (DIGITS_PER_WORD as $t)
+            // feature `int_roundings` is not stable.
+            #[allow(clippy::manual_div_ceil)]
+            {
+                ($len as $t + DIGITS_PER_WORD as $t - 1) / (DIGITS_PER_WORD as $t)
+            }
         }
     }};
 }
@@ -996,9 +999,9 @@ impl Decimal {
 
     /// Given a precision count 'prec', get:
     ///  1. the index of first non-zero word in self.word_buf to hold the
-    /// leading 'prec' number of     digits
+    ///     leading 'prec' number of     digits
     ///  2. the number of remained digits if we remove all leading zeros for the
-    /// leading 'prec'     number of digits
+    ///     leading 'prec'     number of digits
     fn remove_leading_zeroes(&self, prec: u8) -> (usize, u8) {
         let mut cnt = prec;
         let mut i = ((cnt + DIGITS_PER_WORD - 1) % DIGITS_PER_WORD) + 1;
@@ -1775,7 +1778,7 @@ impl ConvertTo<f64> for Decimal {
     /// Port from TiDB's MyDecimal::ToFloat64.
     #[inline]
     fn convert(&self, _: &mut EvalContext) -> Result<f64> {
-        let r = self.to_string().parse::<f64>();
+        let r = self.to_string_value().parse::<f64>();
         debug_assert!(r.is_ok());
         Ok(r?)
     }
@@ -1876,7 +1879,7 @@ impl ConvertTo<Decimal> for Json {
     }
 }
 
-impl<'a> ConvertTo<Decimal> for JsonRef<'a> {
+impl ConvertTo<Decimal> for JsonRef<'_> {
     /// Port from TiDB's types.ConvertJSONToDecimal
     #[inline]
     fn convert(&self, ctx: &mut EvalContext) -> Result<Decimal> {
@@ -1919,8 +1922,8 @@ impl FromStr for Decimal {
     }
 }
 
-impl ToString for Decimal {
-    fn to_string(&self) -> String {
+impl ToStringValue for Decimal {
+    fn to_string_value(&self) -> String {
         let (mut buf, word_start_idx, int_len, int_cnt, frac_cnt) = self.prepare_buf();
         if self.negative {
             buf.push(b'-');
@@ -1964,13 +1967,13 @@ impl ToString for Decimal {
     }
 }
 
-impl Display for Decimal {
-    fn fmt(&self, fmt: &mut Formatter<'_>) -> fmt::Result {
+impl fmt::Display for Decimal {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut dec = *self;
         dec = dec
             .round(self.result_frac_cnt as i8, RoundMode::HalfEven)
             .unwrap();
-        fmt.write_str(&dec.to_string())
+        fmt.write_str(&dec.to_string_value())
     }
 }
 
@@ -2334,7 +2337,7 @@ impl Ord for Decimal {
     }
 }
 
-impl<'a, 'b> Add<&'a Decimal> for &'b Decimal {
+impl<'a> Add<&'a Decimal> for &Decimal {
     type Output = Res<Decimal>;
 
     fn add(self, rhs: &'a Decimal) -> Res<Decimal> {
@@ -2349,7 +2352,7 @@ impl<'a, 'b> Add<&'a Decimal> for &'b Decimal {
     }
 }
 
-impl<'a, 'b> Sub<&'a Decimal> for &'b Decimal {
+impl<'a> Sub<&'a Decimal> for &Decimal {
     type Output = Res<Decimal>;
 
     fn sub(self, rhs: &'a Decimal) -> Res<Decimal> {
@@ -2364,7 +2367,7 @@ impl<'a, 'b> Sub<&'a Decimal> for &'b Decimal {
     }
 }
 
-impl<'a, 'b> Mul<&'a Decimal> for &'b Decimal {
+impl<'a> Mul<&'a Decimal> for &Decimal {
     type Output = Res<Decimal>;
 
     fn mul(self, rhs: &'a Decimal) -> Res<Decimal> {
@@ -2372,7 +2375,7 @@ impl<'a, 'b> Mul<&'a Decimal> for &'b Decimal {
     }
 }
 
-impl<'a, 'b> Div<&'a Decimal> for &'b Decimal {
+impl<'a> Div<&'a Decimal> for &Decimal {
     type Output = Option<Res<Decimal>>;
 
     fn div(self, rhs: &'a Decimal) -> Self::Output {
@@ -2389,7 +2392,7 @@ impl Rem for Decimal {
     }
 }
 
-impl<'a, 'b> Rem<&'a Decimal> for &'b Decimal {
+impl<'a> Rem<&'a Decimal> for &Decimal {
     type Output = Option<Res<Decimal>>;
     fn rem(self, rhs: &'a Decimal) -> Self::Output {
         let result_frac_cnt = cmp::max(self.result_frac_cnt, rhs.result_frac_cnt);
@@ -2460,7 +2463,7 @@ mod tests {
 
         for (num, exp) in cases {
             let dec: Decimal = num.into();
-            let dec_str = format!("{}", dec);
+            let dec_str = dec.to_string_value();
             assert_eq!(dec_str, exp);
         }
     }
@@ -2475,7 +2478,7 @@ mod tests {
 
         for (num, exp) in cases {
             let dec: Decimal = num.into();
-            let dec_str = format!("{}", dec);
+            let dec_str = dec.to_string_value();
             assert_eq!(dec_str, exp);
         }
     }
@@ -2521,8 +2524,8 @@ mod tests {
             let log = format!(
                 "input: {}, expect: {:?}, output: {:?}",
                 input,
-                expect.as_ref().map(|x| x.to_string()),
-                r.as_ref().map(|x| x.to_string())
+                expect.as_ref().map(|x| x.to_string_value()),
+                r.as_ref().map(|x| x.to_string_value())
             );
             match expect {
                 Err(e) => {
@@ -2620,7 +2623,7 @@ mod tests {
         let mut ctx = EvalContext::default();
         for (dec_str, exp) in cases {
             let dec = dec_str.parse::<Decimal>().unwrap();
-            let res = format!("{}", dec);
+            let res = dec.to_string_value();
             assert_eq!(res, dec_str);
 
             let f: f64 = dec.convert(&mut ctx).unwrap();
@@ -2929,7 +2932,7 @@ mod tests {
                 .unwrap()
                 .unwrap();
             let shifted = dec.shift_with_word_buf_len(shift, word_buf_len);
-            let res = shifted.map(|d| d.to_string());
+            let res = shifted.map(|d| d.to_string_value());
             assert_eq!(res, exp.map(ToOwned::to_owned));
         }
     }
@@ -2982,15 +2985,15 @@ mod tests {
             let dec = dec_str.parse::<Decimal>().unwrap();
             let round_dec = dec.round(scale, RoundMode::HalfEven);
             assert_eq!(round_dec.frac_cnt, round_dec.result_frac_cnt);
-            let res = round_dec.map(|d| d.to_string());
+            let res = round_dec.map(|d| d.to_string_value());
             assert_eq!(res, half_exp.map(|s| s.to_owned()));
             let round_dec = dec.round(scale, RoundMode::Truncate);
             assert_eq!(round_dec.frac_cnt, round_dec.result_frac_cnt);
-            let res = round_dec.map(|d| d.to_string());
+            let res = round_dec.map(|d| d.to_string_value());
             assert_eq!(res, trunc_exp.map(|s| s.to_owned()));
             let round_dec = dec.round(scale, RoundMode::Ceiling);
             assert_eq!(round_dec.frac_cnt, round_dec.result_frac_cnt);
-            let res = round_dec.map(|d| d.to_string());
+            let res = round_dec.map(|d| d.to_string_value());
             assert_eq!(res, ceil_exp.map(|s| s.to_owned()));
         }
     }
@@ -3078,7 +3081,7 @@ mod tests {
 
         for (word_buf_len, dec, exp) in cases {
             let d = Decimal::from_bytes_with_word_buf(dec, word_buf_len).unwrap();
-            let res = d.map(|d| d.to_string());
+            let res = d.map(|d| d.to_string_value());
             assert_eq!(res, exp.map(|s| s.to_owned()));
         }
 
@@ -3140,7 +3143,7 @@ mod tests {
             let mut buf = vec![];
             let res = buf.write_decimal(&dec, prec, frac).unwrap();
             let decoded = buf.as_slice().read_decimal().unwrap();
-            let res = res.map(|_| decoded.to_string());
+            let res = res.map(|_| decoded.to_string_value());
             assert_eq!(res, exp.map(|s| s.to_owned()));
         }
     }
@@ -3251,7 +3254,7 @@ mod tests {
 
         for (prec, frac, exp) in cases {
             let dec = super::max_decimal(prec, frac);
-            let res = dec.to_string();
+            let res = dec.to_string_value();
             assert_eq!(&res, exp);
         }
     }
@@ -3298,12 +3301,12 @@ mod tests {
             let rhs = rhs_str.parse::<Decimal>().unwrap();
 
             let res_dec = &lhs + &rhs;
-            let res = res_dec.map(|s| s.to_string());
+            let res = res_dec.map(|s| s.to_string_value());
             let exp_str = exp.map(|s| s.to_owned());
             assert_eq!(res, exp_str);
 
             let res_dec = &rhs + &lhs;
-            let res = res_dec.map(|s| s.to_string());
+            let res = res_dec.map(|s| s.to_string_value());
             assert_eq!(res, exp_str);
         }
     }
@@ -3346,7 +3349,7 @@ mod tests {
             let lhs = lhs_str.parse::<Decimal>().unwrap();
             let rhs = rhs_str.parse::<Decimal>().unwrap();
             let res_dec = &lhs - &rhs;
-            let res = res_dec.map(|s| s.to_string());
+            let res = res_dec.map(|s| s.to_string_value());
             assert_eq!(res, exp.map(|s| s.to_owned()));
         }
     }
@@ -3380,10 +3383,10 @@ mod tests {
             let lhs: Decimal = lhs_str.parse().unwrap();
             let rhs: Decimal = rhs_str.parse().unwrap();
             let exp = exp_str.map(|s| s.to_owned());
-            let res = (&lhs * &rhs).map(|d| d.to_string());
+            let res = (&lhs * &rhs).map(|d| d.to_string_value());
             assert_eq!(res, exp);
 
-            let res = (&rhs * &lhs).map(|d| d.to_string());
+            let res = (&rhs * &lhs).map(|d| d.to_string_value());
             assert_eq!(res, exp);
         }
     }
@@ -3405,11 +3408,11 @@ mod tests {
             let lhs: Decimal = lhs_str.parse().unwrap();
             let rhs: Decimal = rhs_str.parse().unwrap();
             let exp = exp_str.map(|s| s.to_owned());
-            let res = (&lhs * &rhs).map(|d| d.to_string());
+            let res = (&lhs * &rhs).map(|d| d.to_string_value());
             assert_eq!(res, exp);
 
             let exp = rev_exp_str.map(|s| s.to_owned());
-            let res = (&rhs * &lhs).map(|d| d.to_string());
+            let res = (&rhs * &lhs).map(|d| d.to_string_value());
             assert_eq!(res, exp);
         }
     }
@@ -3602,12 +3605,12 @@ mod tests {
         for (frac_incr, lhs_str, rhs_str, div_exp, rem_exp) in cases {
             let lhs: Decimal = lhs_str.parse().unwrap();
             let rhs: Decimal = rhs_str.parse().unwrap();
-            let res =
-                super::do_div_mod(&lhs, &rhs, frac_incr, false).map(|d| d.unwrap().to_string());
+            let res = super::do_div_mod(&lhs, &rhs, frac_incr, false)
+                .map(|d| d.unwrap().to_string_value());
             assert_eq!(res, div_exp.map(|s| s.to_owned()));
 
-            let res =
-                super::do_div_mod(&lhs, &rhs, frac_incr, true).map(|d| d.unwrap().to_string());
+            let res = super::do_div_mod(&lhs, &rhs, frac_incr, true)
+                .map(|d| d.unwrap().to_string_value());
             assert_eq!(res, rem_exp.map(|s| s.to_owned()));
         }
 
@@ -3624,7 +3627,7 @@ mod tests {
         for (lhs_str, rhs_str, div_exp) in div_cases {
             let lhs: Decimal = lhs_str.parse().unwrap();
             let rhs: Decimal = rhs_str.parse().unwrap();
-            let res = (&lhs / &rhs).unwrap().map(|d| d.to_string());
+            let res = (&lhs / &rhs).unwrap().map(|d| d.to_string_value());
             assert_eq!(res, div_exp.map(|s| s.to_owned()))
         }
 
@@ -3632,7 +3635,7 @@ mod tests {
         for (lhs_str, rhs_str, rem_exp) in rem_cases {
             let lhs: Decimal = lhs_str.parse().unwrap();
             let rhs: Decimal = rhs_str.parse().unwrap();
-            let res = (lhs % rhs).unwrap().map(|d| d.to_string());
+            let res = (lhs % rhs).unwrap().map(|d| d.to_string_value());
             assert_eq!(res, rem_exp.map(|s| s.to_owned()))
         }
     }
@@ -3653,12 +3656,12 @@ mod tests {
         for (pos, neg) in cases {
             let pos_dec: Decimal = pos.parse().unwrap();
             let res = -pos_dec;
-            assert_eq!(format!("{}", res), neg);
+            assert_eq!(res.to_string_value(), neg);
             assert!((&pos_dec + &res).is_zero());
 
             let neg_dec: Decimal = neg.parse().unwrap();
             let res = -neg_dec;
-            assert_eq!(format!("{}", res), pos);
+            assert_eq!(res.to_string_value(), pos);
             assert!((&neg_dec + &res).is_zero());
         }
 
@@ -3690,12 +3693,12 @@ mod tests {
 
         for (prec, frac, exp) in cases {
             let positive = super::max_or_min_dec(false, prec, frac);
-            let res = positive.to_string();
+            let res = positive.to_string_value();
             assert_eq!(&res, exp);
             let negative = super::max_or_min_dec(true, prec, frac);
             let mut negative_exp = String::from("-");
             negative_exp.push_str(exp);
-            let res = negative.to_string();
+            let res = negative.to_string_value();
             assert_eq!(res, negative_exp);
         }
     }
@@ -3771,7 +3774,11 @@ mod tests {
         ];
         for (s, expect) in cases {
             let got: Decimal = s.convert(&mut ctx).unwrap();
-            assert_eq!(got, expect, "from {:?}, expect: {} got: {}", s, expect, got);
+            assert_eq!(
+                got, expect,
+                "from {:?}, expect: {:?} got: {:?}",
+                s, expect, got
+            );
         }
 
         // OVERFLOWING
@@ -3784,7 +3791,7 @@ mod tests {
         let mut ctx = EvalContext::new(Arc::new(EvalConfig::from_flag(Flag::OVERFLOW_AS_WARNING)));
         let val: Decimal = big.as_bytes().convert(&mut ctx).unwrap();
         let max = max_decimal(WORD_BUF_LEN * DIGITS_PER_WORD, 0);
-        assert_eq!(val, max, "expect: {}, got: {}", val, max);
+        assert_eq!(val, max, "expect: {:?}, got: {:?}", val, max);
         assert_eq!(ctx.warnings.warning_cnt, 1);
         assert_eq!(ctx.warnings.warnings[0].get_code(), ERR_DATA_OUT_OF_RANGE);
 
@@ -3814,7 +3821,11 @@ mod tests {
                 EvalConfig::from_flag(Flag::TRUNCATE_AS_WARNING),
             ));
             let got: Decimal = s.convert(&mut truncate_as_warning_ctx).unwrap();
-            assert_eq!(got, expect, "from {:?}, expect: {} got: {}", s, expect, got);
+            assert_eq!(
+                got, expect,
+                "from {:?}, expect: {:?} got: {:?}",
+                s, expect, got
+            );
             assert_eq!(truncate_as_warning_ctx.warnings.warning_cnt, 1);
         }
     }
diff --git a/components/tidb_query_datatype/src/codec/mysql/duration.rs b/components/tidb_query_datatype/src/codec/mysql/duration.rs
index 6b08c756d24..719ee5522ec 100644
--- a/components/tidb_query_datatype/src/codec/mysql/duration.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/duration.rs
@@ -8,16 +8,16 @@ use std::{
 use codec::prelude::*;
 use tipb::FieldType;
 
-use super::{check_fsp, Decimal, DEFAULT_FSP};
+use super::{DEFAULT_FSP, Decimal, check_fsp};
 use crate::{
+    FieldTypeAccessor,
     codec::{
+        Error, Result, TEN_POW,
         convert::ConvertTo,
         error::{ERR_DATA_OUT_OF_RANGE, ERR_TRUNCATE_WRONG_VALUE},
-        mysql::{Time as DateTime, TimeType, MAX_FSP, MIN_FSP},
-        Error, Result, TEN_POW,
+        mysql::{MAX_FSP, MIN_FSP, Time as DateTime, TimeType},
     },
     expr::EvalContext,
-    FieldTypeAccessor,
 };
 
 pub const NANOS_PER_MICRO: i64 = 1_000;
@@ -95,9 +95,9 @@ fn check_nanos(nanos: i64) -> Result<i64> {
 
 mod parser {
     use nom::{
+        IResult,
         character::complete::{anychar, char, digit0, digit1, space0, space1},
         combinator::opt,
-        IResult,
     };
 
     use super::*;
diff --git a/components/tidb_query_datatype/src/codec/mysql/enums.rs b/components/tidb_query_datatype/src/codec/mysql/enums.rs
index 6c39d7f8a95..efceaf489a3 100644
--- a/components/tidb_query_datatype/src/codec/mysql/enums.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/enums.rs
@@ -9,9 +9,12 @@ use codec::prelude::*;
 use tipb::FieldType;
 
 use crate::{
-    codec::{convert::ToInt, Result},
-    expr::EvalContext,
     FieldTypeTp,
+    codec::{
+        Result,
+        convert::{ToInt, ToStringValue},
+    },
+    expr::EvalContext,
 };
 
 #[derive(Clone, Debug)]
@@ -145,7 +148,7 @@ impl<'a> EnumRef<'a> {
     }
 }
 
-impl<'a> Display for EnumRef<'a> {
+impl Display for EnumRef<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         if *self.value == 0 {
             return Ok(());
@@ -155,27 +158,27 @@ impl<'a> Display for EnumRef<'a> {
     }
 }
 
-impl<'a> Eq for EnumRef<'a> {}
+impl Eq for EnumRef<'_> {}
 
-impl<'a> PartialEq for EnumRef<'a> {
+impl PartialEq for EnumRef<'_> {
     fn eq(&self, other: &Self) -> bool {
         self.value == other.value
     }
 }
 
-impl<'a> Ord for EnumRef<'a> {
+impl Ord for EnumRef<'_> {
     fn cmp(&self, other: &Self) -> Ordering {
         self.value.cmp(other.value)
     }
 }
 
-impl<'a> PartialOrd for EnumRef<'a> {
+impl PartialOrd for EnumRef<'_> {
     fn partial_cmp(&self, right: &Self) -> Option<Ordering> {
         Some(self.cmp(right))
     }
 }
 
-impl<'a> ToInt for EnumRef<'a> {
+impl ToInt for EnumRef<'_> {
     fn to_int(&self, _ctx: &mut EvalContext, _tp: FieldTypeTp) -> Result<i64> {
         Ok(*self.value as i64)
     }
@@ -185,8 +188,8 @@ impl<'a> ToInt for EnumRef<'a> {
     }
 }
 
-impl<'a> ToString for EnumRef<'a> {
-    fn to_string(&self) -> String {
+impl ToStringValue for EnumRef<'_> {
+    fn to_string_value(&self) -> String {
         String::from_utf8_lossy(self.name).to_string()
     }
 }
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/binary.rs b/components/tidb_query_datatype/src/codec/mysql/json/binary.rs
index 5028967ac59..4ac4fe6efec 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/binary.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/binary.rs
@@ -4,8 +4,8 @@ use std::convert::TryInto;
 
 use codec::number::NumberCodec;
 
-use super::{constants::*, JsonRef, JsonType, ERR_CONVERT_FAILED};
-use crate::codec::{mysql::json::path_expr::ArrayIndex, Result};
+use super::{ERR_CONVERT_FAILED, JsonRef, JsonType, constants::*};
+use crate::codec::{Result, convert::ToStringValue, mysql::json::path_expr::ArrayIndex};
 
 impl<'a> JsonRef<'a> {
     /// Gets the index from the ArrayIndex
@@ -136,7 +136,7 @@ impl<'a> JsonRef<'a> {
             _ => Err(invalid_type!(
                 "{} from {} to literal",
                 ERR_CONVERT_FAILED,
-                self.to_string()
+                self.to_string_value()
             )),
         }
     }
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/comparison.rs b/components/tidb_query_datatype/src/codec/mysql/json/comparison.rs
index d9104385bc6..950fb5527f5 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/comparison.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/comparison.rs
@@ -5,7 +5,8 @@ use std::{
     f64,
 };
 
-use super::{super::Result, constants::*, Json, JsonRef, JsonType, ERR_CONVERT_FAILED};
+use super::{super::Result, ERR_CONVERT_FAILED, Json, JsonRef, JsonType, constants::*};
+use crate::codec::convert::ToStringValue;
 
 fn compare<T: Ord>(x: T, y: T) -> Ordering {
     x.cmp(&y)
@@ -27,7 +28,7 @@ fn compare_f64_with_epsilon(x: f64, y: f64) -> Option<Ordering> {
     }
 }
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     fn get_precedence(&self) -> i32 {
         match self.get_type() {
             JsonType::Object => PRECEDENCE_OBJECT,
@@ -57,27 +58,27 @@ impl<'a> JsonRef<'a> {
             _ => Err(invalid_type!(
                 "{} from {} to f64",
                 ERR_CONVERT_FAILED,
-                self.to_string()
+                self.to_string_value()
             )),
         }
     }
 }
 
-impl<'a> Eq for JsonRef<'a> {}
+impl Eq for JsonRef<'_> {}
 
-impl<'a> Ord for JsonRef<'a> {
+impl Ord for JsonRef<'_> {
     fn cmp(&self, right: &JsonRef<'_>) -> Ordering {
         self.partial_cmp(right).unwrap()
     }
 }
 
-impl<'a> PartialEq for JsonRef<'a> {
+impl PartialEq for JsonRef<'_> {
     fn eq(&self, right: &JsonRef<'_>) -> bool {
         self.partial_cmp(right)
-            .map_or(false, |r| r == Ordering::Equal)
+            .is_some_and(|r| r == Ordering::Equal)
     }
 }
-impl<'a> PartialOrd for JsonRef<'a> {
+impl PartialOrd for JsonRef<'_> {
     // See `CompareBinary` in TiDB `types/json/binary_functions.go`
     fn partial_cmp(&self, right: &JsonRef<'_>) -> Option<Ordering> {
         let precedence_diff = self.get_precedence() - right.get_precedence();
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/jcodec.rs b/components/tidb_query_datatype/src/codec/mysql/json/jcodec.rs
index f76b29790f9..b9bfda86099 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/jcodec.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/jcodec.rs
@@ -4,13 +4,13 @@ use std::{collections::BTreeMap, convert::TryInto, f64, str};
 
 use codec::{number::NumberCodec, prelude::*};
 
-use super::{constants::*, Json, JsonRef, JsonType};
+use super::{Json, JsonRef, JsonType, constants::*};
 use crate::{
-    codec::{Error, Result},
     FieldTypeTp,
+    codec::{Error, Result},
 };
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     fn encoded_len(&self) -> usize {
         match self.type_code {
             // Literal is encoded inline with value-entry, so nothing will be
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_contains.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_contains.rs
index db8ec3331eb..022473199bd 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_contains.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_contains.rs
@@ -4,7 +4,7 @@ use std::cmp::Ordering;
 
 use super::{super::Result, JsonRef, JsonType};
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     /// `json_contains` is the implementation for JSON_CONTAINS in mysql
     /// <https://dev.mysql.com/doc/refman/5.7/en/json-search-functions.html#function_json-contains>
     /// See `ContainsBinaryJSON()` in TiDB `types/json_binary_functions.go`
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_depth.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_depth.rs
index f8924a63f2e..cc73ea1c3cf 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_depth.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_depth.rs
@@ -2,7 +2,7 @@
 
 use super::{super::Result, JsonRef, JsonType};
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     /// Returns maximum depth of JSON document
     pub fn depth(&self) -> Result<i64> {
         depth_json(self)
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_extract.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_extract.rs
index 7e619e74c32..49ae5bcb208 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_extract.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_extract.rs
@@ -4,12 +4,12 @@ use collections::HashSet;
 
 use super::{
     super::Result,
-    path_expr::{PathExpression, PathLeg},
     Json, JsonRef, JsonType,
+    path_expr::{PathExpression, PathLeg},
 };
 use crate::codec::mysql::json::path_expr::{ArrayIndex, ArraySelection, KeySelection};
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     /// `extract` receives several path expressions as arguments, matches them
     /// in j, and returns the target JSON matched any path expressions, which
     /// may be autowrapped as an array. If there is no any expression matched,
@@ -42,13 +42,13 @@ impl<'a> JsonRef<'a> {
 #[derive(Eq)]
 struct RefEqualJsonWrapper<'a>(JsonRef<'a>);
 
-impl<'a> PartialEq for RefEqualJsonWrapper<'a> {
+impl PartialEq for RefEqualJsonWrapper<'_> {
     fn eq(&self, other: &Self) -> bool {
         self.0.ref_eq(&other.0)
     }
 }
 
-impl<'a> std::hash::Hash for RefEqualJsonWrapper<'a> {
+impl std::hash::Hash for RefEqualJsonWrapper<'_> {
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
         self.0.value.as_ptr().hash(state)
     }
@@ -200,8 +200,8 @@ mod tests {
 
     use super::{
         super::path_expr::{
-            PathExpressionFlag, PATH_EXPRESSION_CONTAINS_ASTERISK,
-            PATH_EXPRESSION_CONTAINS_DOUBLE_ASTERISK,
+            PATH_EXPRESSION_CONTAINS_ASTERISK, PATH_EXPRESSION_CONTAINS_DOUBLE_ASTERISK,
+            PathExpressionFlag,
         },
         *,
     };
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_keys.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_keys.rs
index 68c361321ad..6b23a8fbe7a 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_keys.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_keys.rs
@@ -2,9 +2,9 @@
 
 use std::str;
 
-use super::{super::Result, path_expr::PathExpression, Json, JsonRef, JsonType};
+use super::{super::Result, Json, JsonRef, JsonType, path_expr::PathExpression};
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     /// Evaluates a (possibly empty) list of values and returns a JSON array
     /// containing those values specified by `path_expr_list`
     pub fn keys(&self, path_expr_list: &[PathExpression]) -> Result<Option<Json>> {
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_length.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_length.rs
index f4c120d866f..e975a193778 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_length.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_length.rs
@@ -1,8 +1,8 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use super::{super::Result, path_expr::PathExpression, JsonRef, JsonType};
+use super::{super::Result, JsonRef, JsonType, path_expr::PathExpression};
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     fn len(&self) -> i64 {
         match self.get_type() {
             JsonType::Array | JsonType::Object => self.get_elem_count() as i64,
@@ -25,7 +25,7 @@ impl<'a> JsonRef<'a> {
 
 #[cfg(test)]
 mod tests {
-    use super::super::{path_expr::parse_json_path_expr, Json};
+    use super::super::{Json, path_expr::parse_json_path_expr};
     #[test]
     fn test_json_length() {
         let mut test_cases = vec![
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_memberof.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_memberof.rs
index d85b1e57af8..9f61cc90cfc 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_memberof.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_memberof.rs
@@ -4,7 +4,7 @@ use std::cmp::Ordering;
 
 use super::{super::Result, JsonRef, JsonType};
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     /// `member_of` is the implementation for MEMBER OF in mysql
     /// <https://dev.mysql.com/doc/refman/8.0/en/json-search-functions.html#operator_member-of>
     /// See `builtinJSONMemberOfSig` in TiDB `expression/builtin_json.go`
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_merge.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_merge.rs
index b8c82382d6a..08c2e5064c1 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_merge.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_merge.rs
@@ -14,7 +14,7 @@ impl Json {
     /// 2. adjacent object are merged to a single object;
     /// 3. a scalar value is autowrapped as an array before merge;
     /// 4. an adjacent array and object are merged by autowrapping the object as
-    /// an array.
+    ///    an array.
     ///
     /// See `MergeBinary()` in TiDB `json/binary_function.go`
     #[allow(clippy::comparison_chain)]
@@ -94,7 +94,7 @@ enum MergeUnit<'a> {
     Owned(Json),
 }
 
-impl<'a> MergeUnit<'a> {
+impl MergeUnit<'_> {
     fn as_ref(&self) -> JsonRef<'_> {
         match self {
             MergeUnit::Ref(r) => *r,
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_modify.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_modify.rs
index b359158d06b..39a76611abe 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_modify.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_modify.rs
@@ -1,6 +1,6 @@
 // Copyright 2017 TiKV Project Authors. Licensed under Apache-2.0.
 
-use super::{super::Result, modifier::BinaryModifier, path_expr::PathExpression, Json, JsonRef};
+use super::{super::Result, Json, JsonRef, modifier::BinaryModifier, path_expr::PathExpression};
 
 /// `ModifyType` is for modify a JSON.
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -13,7 +13,7 @@ pub enum ModifyType {
     Set,
 }
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     /// Modifies a Json object by insert, replace or set.
     /// All path expressions cannot contain * or ** wildcard.
     /// If any error occurs, the input won't be changed.
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_remove.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_remove.rs
index bcb6fd01716..6dd9249616e 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_remove.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_remove.rs
@@ -1,8 +1,8 @@
 // Copyright 2017 TiKV Project Authors. Licensed under Apache-2.0.
 
-use super::{super::Result, modifier::BinaryModifier, path_expr::PathExpression, Json, JsonRef};
+use super::{super::Result, Json, JsonRef, modifier::BinaryModifier, path_expr::PathExpression};
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     /// Removes elements from Json,
     /// All path expressions cannot contain * or ** wildcard.
     /// If any error occurs, the input won't be changed.
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_type.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_type.rs
index bf48791b298..948ab463722 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_type.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_type.rs
@@ -18,7 +18,7 @@ const JSON_TYPE_DATE: &[u8] = b"DATE";
 const JSON_TYPE_DATETIME: &[u8] = b"DATETIME";
 const JSON_TYPE_TIME: &[u8] = b"TIME";
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     /// `json_type` is the implementation for
     /// <https://dev.mysql.com/doc/refman/5.7/en/json-attribute-functions.html#function_json-type>
     pub fn json_type(&self) -> &'static [u8] {
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/json_unquote.rs b/components/tidb_query_datatype/src/codec/mysql/json/json_unquote.rs
index f95c08cf958..485f92e11f3 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/json_unquote.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/json_unquote.rs
@@ -1,8 +1,9 @@
 // Copyright 2017 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{char, str, u32};
+use std::{char, str};
 
 use super::{super::Result, JsonRef, JsonType};
+use crate::codec::convert::ToStringValue;
 
 const ESCAPED_UNICODE_BYTES_SIZE: usize = 4;
 
@@ -12,7 +13,7 @@ const CHAR_LINEFEED: char = '\x0A';
 const CHAR_FORMFEED: char = '\x0C';
 const CHAR_CARRIAGE_RETURN: char = '\x0D';
 
-impl<'a> JsonRef<'a> {
+impl JsonRef<'_> {
     /// `unquote` recognizes the escape sequences shown in:
     /// <https://dev.mysql.com/doc/refman/5.7/en/json-modification-functions.html>
     /// json-unquote-character-escape-sequences
@@ -29,12 +30,12 @@ impl<'a> JsonRef<'a> {
             | JsonType::Timestamp
             | JsonType::Time
             | JsonType::Opaque => {
-                let s = self.to_string();
+                let s = self.to_string_value();
                 // Remove the quotes of output
                 assert!(s.len() > 2);
                 Ok(s[1..s.len() - 1].to_string())
             }
-            _ => Ok(self.to_string()),
+            _ => Ok(self.to_string_value()),
         }
     }
 }
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/mod.rs b/components/tidb_query_datatype/src/codec/mysql/json/mod.rs
index e6d2a391fae..9e2a553a64a 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/mod.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/mod.rs
@@ -80,27 +80,27 @@ pub mod json_unquote;
 use std::{
     collections::BTreeMap,
     convert::{TryFrom, TryInto},
-    str,
+    fmt, str,
 };
 
-use codec::number::{NumberCodec, F64_SIZE, I64_SIZE};
+use codec::number::{F64_SIZE, I64_SIZE, NumberCodec};
 use constants::{JSON_LITERAL_FALSE, JSON_LITERAL_NIL, JSON_LITERAL_TRUE};
 use tikv_util::is_even;
 
 pub use self::{
     jcodec::{JsonDatumPayloadChunkEncoder, JsonDecoder, JsonEncoder},
     json_modify::ModifyType,
-    path_expr::{parse_json_path_expr, PathExpression},
+    path_expr::{PathExpression, parse_json_path_expr},
 };
-use super::super::{datum::Datum, Error, Result};
+use super::super::{Error, Result, datum::Datum};
 use crate::{
+    FieldTypeTp,
     codec::{
-        convert::ConvertTo,
+        convert::{ConvertTo, ToStringValue},
         data_type::{BytesRef, Decimal, Real},
         mysql::{Duration, Time, TimeType},
     },
     expr::EvalContext,
-    FieldTypeTp,
 };
 
 const ERR_CONVERT_FAILED: &str = "Can not covert from ";
@@ -300,14 +300,12 @@ pub struct Json {
     pub value: Vec<u8>,
 }
 
-use std::fmt::{Display, Formatter};
-
 use codec::prelude::NumberEncoder;
 
 use crate::codec::mysql::{TimeDecoder, TimeEncoder};
 
-impl Display for Json {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+impl fmt::Display for Json {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let s = serde_json::to_string(&self.as_ref()).unwrap();
         write!(f, "{}", s)
     }
@@ -492,7 +490,7 @@ impl ConvertTo<f64> for Json {
     }
 }
 
-impl<'a> ConvertTo<f64> for JsonRef<'a> {
+impl ConvertTo<f64> for JsonRef<'_> {
     ///  Keep compatible with TiDB's `ConvertJSONToFloat` function.
     #[inline]
     fn convert(&self, ctx: &mut EvalContext) -> Result<f64> {
@@ -505,7 +503,7 @@ impl<'a> ConvertTo<f64> for JsonRef<'a> {
                 .map_or(0f64, |x| if x { 1f64 } else { 0f64 }),
             JsonType::String => self.get_str_bytes()?.convert(ctx)?,
             _ => ctx
-                .handle_truncate_err(Error::truncated_wrong_val("Float", self.to_string()))
+                .handle_truncate_err(Error::truncated_wrong_val("Float", self.to_string_value()))
                 .map(|_| 0f64)?,
         };
         Ok(d)
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/modifier.rs b/components/tidb_query_datatype/src/codec/mysql/json/modifier.rs
index 58fe8fbbbcb..dec36b853b6 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/modifier.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/modifier.rs
@@ -6,10 +6,10 @@ use codec::number::NumberCodec;
 
 use super::{
     super::Result,
+    Json, JsonRef, JsonType,
     constants::*,
     json_extract::extract_json,
     path_expr::{PathExpression, PathLeg},
-    Json, JsonRef, JsonType,
 };
 use crate::codec::mysql::json::path_expr::{ArraySelection, KeySelection};
 
@@ -30,7 +30,7 @@ pub struct BinaryModifier<'a> {
 
 impl<'a> BinaryModifier<'a> {
     /// Creates a new `BinaryModifier` from a `JsonRef`
-    pub fn new(old: JsonRef<'a>) -> BinaryModifier<'_> {
+    pub fn new(old: JsonRef<'a>) -> BinaryModifier<'a> {
         Self {
             // The initial offset is 0 by `as_ref()` call
             old,
@@ -219,7 +219,7 @@ impl<'a> BinaryModifier<'a> {
     // Returns the old JSON's `JsonType` if the old is untouched or
     // returns the new appended JSON's `JsonType` if the old has been modified
     fn rebuild_to(&mut self, buf: &mut Vec<u8>) -> Result<JsonType> {
-        if self.to_be_modified_ptr == self.old.as_ptr() {
+        if ptr::eq(self.to_be_modified_ptr, self.old.as_ptr()) {
             // Replace the old directly
             self.to_be_modified_ptr = ptr::null();
             buf.extend_from_slice(&self.new_value.as_ref().unwrap().value);
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/path_expr.rs b/components/tidb_query_datatype/src/codec/mysql/json/path_expr.rs
index fb707887885..e9ced08558a 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/path_expr.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/path_expr.rs
@@ -26,6 +26,7 @@
 // ```
 
 use nom::{
+    IResult,
     branch::alt,
     bytes::complete::tag,
     character::{
@@ -35,7 +36,6 @@ use nom::{
     combinator::{map, map_opt},
     multi::{many0, many1},
     sequence::{delimited, pair, tuple},
-    IResult,
 };
 
 use super::json_unquote::unquote_string;
diff --git a/components/tidb_query_datatype/src/codec/mysql/json/serde.rs b/components/tidb_query_datatype/src/codec/mysql/json/serde.rs
index 598e27347c8..00a0491fb0c 100644
--- a/components/tidb_query_datatype/src/codec/mysql/json/serde.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/json/serde.rs
@@ -9,7 +9,7 @@ use serde::{
 use serde_json::Serializer as JsonSerializer;
 
 use super::{Json, JsonRef, JsonType};
-use crate::codec::Error;
+use crate::codec::{Error, convert::ToStringValue};
 
 /// MySQL formatter follows the implementation in TiDB
 /// https://github.com/pingcap/tidb/blob/master/types/json/binary.go
@@ -57,10 +57,10 @@ impl MySqlFormatter {
     }
 }
 
-impl<'a> ToString for JsonRef<'a> {
+impl ToStringValue for JsonRef<'_> {
     /// This function is a simple combination and rewrite of serde_json's
     /// `to_writer_pretty`
-    fn to_string(&self) -> String {
+    fn to_string_value(&self) -> String {
         let mut writer = Vec::with_capacity(128);
         let mut ser = JsonSerializer::with_formatter(&mut writer, MySqlFormatter::new());
         self.serialize(&mut ser).unwrap();
@@ -71,7 +71,7 @@ impl<'a> ToString for JsonRef<'a> {
     }
 }
 
-impl<'a> Serialize for JsonRef<'a> {
+impl Serialize for JsonRef<'_> {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
@@ -144,9 +144,9 @@ impl<'a> Serialize for JsonRef<'a> {
     }
 }
 
-impl ToString for Json {
-    fn to_string(&self) -> String {
-        self.as_ref().to_string()
+impl ToStringValue for Json {
+    fn to_string_value(&self) -> String {
+        self.as_ref().to_string_value()
     }
 }
 
@@ -255,7 +255,7 @@ mod tests {
     fn test_from_str_for_object() {
         let jstr1 = r#"{"a": [1, "2", {"aa": "bb"}, 4.0, null], "c": null,"b": true}"#;
         let j1: Json = jstr1.parse().unwrap();
-        let jstr2 = j1.to_string();
+        let jstr2 = j1.to_string_value();
         let expect_str = r#"{"a": [1, "2", {"aa": "bb"}, 4.0, null], "b": true, "c": null}"#;
         assert_eq!(jstr2, expect_str);
     }
@@ -336,7 +336,7 @@ mod tests {
         ];
 
         for (json, json_str) in legal_cases {
-            assert_eq!(json.to_string(), json_str);
+            assert_eq!(json.to_string_value(), json_str);
         }
     }
 }
diff --git a/components/tidb_query_datatype/src/codec/mysql/mod.rs b/components/tidb_query_datatype/src/codec/mysql/mod.rs
index 2bcfeb8ee23..087e838d54f 100644
--- a/components/tidb_query_datatype/src/codec/mysql/mod.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/mod.rs
@@ -36,12 +36,12 @@ pub mod time;
 pub mod vector;
 
 pub use self::{
-    decimal::{dec_encoded_len, Decimal, DecimalDecoder, DecimalEncoder, Res, RoundMode},
+    decimal::{Decimal, DecimalDecoder, DecimalEncoder, Res, RoundMode, dec_encoded_len},
     duration::{Duration, DurationDecoder, DurationEncoder},
     enums::{Enum, EnumDecoder, EnumEncoder, EnumRef},
     json::{
-        parse_json_path_expr, Json, JsonDatumPayloadChunkEncoder, JsonDecoder, JsonEncoder,
-        JsonType, ModifyType, PathExpression,
+        Json, JsonDatumPayloadChunkEncoder, JsonDecoder, JsonEncoder, JsonType, ModifyType,
+        PathExpression, parse_json_path_expr,
     },
     set::{Set, SetRef},
     time::{Time, TimeDecoder, TimeEncoder, TimeType, Tz},
diff --git a/components/tidb_query_datatype/src/codec/mysql/set.rs b/components/tidb_query_datatype/src/codec/mysql/set.rs
index 62539c1ff2c..022effac203 100644
--- a/components/tidb_query_datatype/src/codec/mysql/set.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/set.rs
@@ -103,7 +103,7 @@ impl<'a> SetRef<'a> {
     }
 }
 
-impl<'a> Display for SetRef<'a> {
+impl Display for SetRef<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         let mut buf: Vec<u8> = Vec::new();
         if self.value > 0 {
@@ -124,21 +124,21 @@ impl<'a> Display for SetRef<'a> {
     }
 }
 
-impl<'a> Eq for SetRef<'a> {}
+impl Eq for SetRef<'_> {}
 
-impl<'a> PartialEq for SetRef<'a> {
+impl PartialEq for SetRef<'_> {
     fn eq(&self, other: &Self) -> bool {
         self.value == other.value
     }
 }
 
-impl<'a> Ord for SetRef<'a> {
+impl Ord for SetRef<'_> {
     fn cmp(&self, other: &Self) -> Ordering {
         self.value.cmp(&other.value)
     }
 }
 
-impl<'a> PartialOrd for SetRef<'a> {
+impl PartialOrd for SetRef<'_> {
     fn partial_cmp(&self, right: &Self) -> Option<Ordering> {
         Some(self.cmp(right))
     }
diff --git a/components/tidb_query_datatype/src/codec/mysql/time/extension.rs b/components/tidb_query_datatype/src/codec/mysql/time/extension.rs
index 9289625ad84..bd93e0117d2 100644
--- a/components/tidb_query_datatype/src/codec/mysql/time/extension.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/time/extension.rs
@@ -2,7 +2,7 @@
 
 use chrono::Weekday;
 
-use super::{weekmode::WeekMode, Time};
+use super::{Time, weekmode::WeekMode};
 
 pub trait WeekdayExtension {
     fn name(&self) -> &'static str;
diff --git a/components/tidb_query_datatype/src/codec/mysql/time/interval.rs b/components/tidb_query_datatype/src/codec/mysql/time/interval.rs
index 2f74c919fc0..4c9a9893d74 100644
--- a/components/tidb_query_datatype/src/codec/mysql/time/interval.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/time/interval.rs
@@ -7,9 +7,9 @@ use regex::Regex;
 
 use crate::{
     codec::{
-        data_type::{BytesRef, Decimal, Real},
-        mysql::{duration::*, RoundMode, DEFAULT_FSP, MAX_FSP, MIN_FSP},
         Error, Result,
+        data_type::{BytesRef, Decimal, Real},
+        mysql::{DEFAULT_FSP, MAX_FSP, MIN_FSP, RoundMode, duration::*},
     },
     expr::EvalContext,
 };
@@ -472,7 +472,7 @@ impl Interval {
 
         // Populate fields in reverse order
         for (i, &matched) in matches.iter().rev().enumerate() {
-            fields[index as usize - i] = &matched;
+            fields[index as usize - i] = matched;
         }
 
         // Helper to parse integer fields and handle errors
@@ -637,7 +637,7 @@ pub trait ConvertToIntervalStr {
     ) -> Result<String>;
 }
 
-impl<'a> ConvertToIntervalStr for BytesRef<'a> {
+impl ConvertToIntervalStr for BytesRef<'_> {
     #[inline]
     fn to_interval_string(
         &self,
diff --git a/components/tidb_query_datatype/src/codec/mysql/time/mod.rs b/components/tidb_query_datatype/src/codec/mysql/time/mod.rs
index efc3d80afab..e5ad6a9d34e 100644
--- a/components/tidb_query_datatype/src/codec/mysql/time/mod.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/time/mod.rs
@@ -21,14 +21,14 @@ use tipb::FieldType;
 
 pub use self::{extension::*, interval::IntervalUnit, tz::Tz, weekmode::WeekMode};
 use crate::{
+    FieldTypeAccessor, FieldTypeTp,
     codec::{
+        Error, Result, TEN_POW,
         convert::ConvertTo,
         data_type::Real,
-        mysql::{check_fsp, duration::*, Decimal, Duration, Res, DEFAULT_FSP, MAX_FSP},
-        Error, Result, TEN_POW,
+        mysql::{DEFAULT_FSP, Decimal, Duration, MAX_FSP, Res, check_fsp, duration::*},
     },
     expr::{EvalContext, Flag, SqlMode},
-    FieldTypeAccessor, FieldTypeTp,
 };
 
 const MIN_TIMESTAMP: i64 = 0;
@@ -1485,7 +1485,7 @@ impl Time {
         round: bool,
     ) -> Result<Time> {
         parser::parse_from_float_string(ctx, input.to_string(), time_type, check_fsp(fsp)?, round)
-            .ok_or_else(|| Error::incorrect_datetime_value(input))
+            .ok_or_else(|| Error::incorrect_datetime_value(input.to_string()))
     }
 
     pub fn parse_from_i64_default(ctx: &mut EvalContext, input: i64) -> Result<Time> {
@@ -1498,7 +1498,7 @@ impl Time {
     }
     pub fn parse_from_decimal_default(ctx: &mut EvalContext, input: &Decimal) -> Result<Time> {
         parser::parse_from_decimal_default(ctx, input)
-            .ok_or_else(|| Error::incorrect_datetime_value(input))
+            .ok_or_else(|| Error::incorrect_datetime_value(input.to_string()))
     }
 
     pub fn parse_from_string_with_format(
@@ -2492,7 +2492,7 @@ impl Time {
             'X' => {
                 let (year, _) = self.year_week(WeekMode::from_bits_truncate(2));
                 if year < 0 {
-                    write!(output, "{}", u32::max_value()).unwrap();
+                    write!(output, "{}", u32::MAX).unwrap();
                 } else {
                     write!(output, "{:04}", year).unwrap();
                 }
@@ -2500,7 +2500,7 @@ impl Time {
             'x' => {
                 let (year, _) = self.year_week(WeekMode::from_bits_truncate(3));
                 if year < 0 {
-                    write!(output, "{}", u32::max_value()).unwrap();
+                    write!(output, "{}", u32::MAX).unwrap();
                 } else {
                     write!(output, "{:04}", year).unwrap();
                 }
@@ -2944,7 +2944,7 @@ mod tests {
 
     use super::*;
     use crate::{
-        codec::mysql::{duration::*, MAX_FSP, UNSPECIFIED_FSP},
+        codec::mysql::{MAX_FSP, UNSPECIFIED_FSP, duration::*},
         expr::EvalConfig,
     };
 
diff --git a/components/tidb_query_datatype/src/codec/mysql/vector.rs b/components/tidb_query_datatype/src/codec/mysql/vector.rs
index 9ed8209b39e..ef619eeaae5 100644
--- a/components/tidb_query_datatype/src/codec/mysql/vector.rs
+++ b/components/tidb_query_datatype/src/codec/mysql/vector.rs
@@ -1,31 +1,44 @@
 // Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
 
+use std::cmp::Ordering;
+
 use codec::prelude::*;
-use ordered_float::OrderedFloat;
-use simsimd::SpatialSimilarity;
-use static_assertions::assert_eq_size;
 
 use crate::codec::Result;
 
-const LEN_PREFIX_SIZE: usize = std::mem::size_of::<u32>();
-const ELEMENT_SIZE: usize = std::mem::size_of::<f32>();
+const F32_SIZE: usize = std::mem::size_of::<f32>();
 
-/// Aligned, Owned.
-#[derive(Clone, Hash, Eq, PartialEq, Ord, PartialOrd)]
+// TODO: Implement generic version
+#[derive(Clone, Eq, Hash, PartialEq)]
 pub struct VectorFloat32 {
-    pub value: Vec<OrderedFloat<f32>>, // Data must be aligned
+    // Use Vec<u8> instead of Vec<f32> to avoid reading from unaligned bytes. For example,
+    // bytes read from protobuf is usually not aligned by f32.
+    pub value: Vec<u8>,
+}
+
+impl Ord for VectorFloat32 {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.as_ref().cmp(&other.as_ref())
+    }
+}
+
+impl PartialOrd for VectorFloat32 {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
 }
 
 impl VectorFloat32 {
-    pub fn copy_from_f32(value: &[f32]) -> Self {
-        let ordered_value: Vec<OrderedFloat<f32>> =
-            value.iter().map(|v| OrderedFloat(*v)).collect();
-        VectorFloat32 {
-            value: ordered_value,
-        }
+    pub fn new(value: Vec<u8>) -> Result<Self> {
+        _ = VectorFloat32Ref::new(&value[..])?;
+        Ok(VectorFloat32 { value })
+    }
+
+    pub fn from_f32(value: Vec<f32>) -> Result<Self> {
+        let value_u8: &[u8] = bytemuck::cast_slice(&value);
+        VectorFloat32::new(value_u8.to_owned())
     }
 
-    #[inline]
     pub fn as_ref(&self) -> VectorFloat32Ref<'_> {
         VectorFloat32Ref { value: &self.value }
     }
@@ -43,58 +56,110 @@ impl std::fmt::Debug for VectorFloat32 {
     }
 }
 
-/// Aligned, Ref.
-#[derive(Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct VectorFloat32Ref<'a> {
-    value: &'a [OrderedFloat<f32>], // Data must be aligned
+pub trait VectorFloat32DatumPayloadChunkEncoder: BufferWriter {
+    fn write_vector_float32_to_chunk_by_datum_payload(&mut self, src_payload: &[u8]) -> Result<()> {
+        // VectorFloat32's chunk format is same as binary format.
+        self.write_bytes(src_payload)?;
+        Ok(())
+    }
 }
 
-impl<'a> std::ops::Index<usize> for VectorFloat32Ref<'a> {
-    type Output = f32;
+impl<T: BufferWriter> VectorFloat32DatumPayloadChunkEncoder for T {}
+
+impl<T: BufferWriter> VectorFloat32Encoder for T {}
 
-    #[inline]
-    fn index(&self, index: usize) -> &Self::Output {
-        &self.value[index].0
+pub trait VectorFloat32Decoder: NumberDecoder {
+    // `read_vector_float32_ref` decodes value encoded by `write_vector_float32`
+    // before.
+    fn read_vector_float32_ref(&mut self) -> Result<VectorFloat32Ref<'_>> {
+        if !cfg!(target_endian = "little") {
+            return Err(box_err!("VectorFloat32 only support Little Endian"));
+        }
+
+        if self.bytes().is_empty() {
+            return VectorFloat32Ref::new(&[]);
+        }
+        let n = self.read_u32_le()? as usize;
+        let data_size = n * F32_SIZE;
+        let data = self.read_bytes(data_size)?;
+        VectorFloat32Ref::new(data)
+    }
+
+    // `read_vector_float32` decodes value encoded by `write_vector_float32` before.
+    fn read_vector_float32(&mut self) -> Result<VectorFloat32> {
+        let r = self.read_vector_float32_ref()?;
+        Ok(r.to_owned())
     }
 }
 
-assert_eq_size!(OrderedFloat<f32>, f32);
+impl<T: BufferReader> VectorFloat32Decoder for T {}
+
+/// Represents a reference of VectorFloat32 value aiming to reduce memory copy.
+#[derive(Clone, Copy, Eq, PartialEq, Hash)]
+pub struct VectorFloat32Ref<'a> {
+    // Use &[u8] instead of &[u32] to allow reading from unaligned bytes. For example,
+    // bytes read from protobuf is usually not aligned by f32.
+    value: &'a [u8],
+}
+
+impl Ord for VectorFloat32Ref<'_> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        let la = self.len();
+        let lb = other.len();
+        let common_len = std::cmp::min(la, lb);
+        for i in 0..common_len {
+            if self.index(i) > other.index(i) {
+                return Ordering::Greater;
+            } else if self.index(i) < other.index(i) {
+                return Ordering::Less;
+            }
+        }
+        la.cmp(&lb)
+    }
+}
+
+impl PartialOrd for VectorFloat32Ref<'_> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
 
 impl<'a> VectorFloat32Ref<'a> {
-    pub fn from_f32(value: &[f32]) -> VectorFloat32Ref<'_> {
-        // OrderedFloat is POD, so it is safe.
-        let ordered_value = unsafe {
-            std::slice::from_raw_parts(value.as_ptr() as *const OrderedFloat<f32>, value.len())
-        };
-        VectorFloat32Ref {
-            value: ordered_value,
+    pub fn new(value: &[u8]) -> Result<VectorFloat32Ref<'_>> {
+        if value.len() % F32_SIZE != 0 {
+            return Err(box_err!("Vector length error. Please check the input."));
         }
+        let check_vec = VectorFloat32Ref { value };
+        for i in 0..check_vec.len() {
+            if check_vec.index(i).is_nan() {
+                return Err(box_err!("NaN not allowed in vector"));
+            }
+            if check_vec.index(i).is_infinite() {
+                return Err(box_err!("infinite value not allowed in vector"));
+            }
+        }
+        Ok(check_vec)
     }
 
-    #[inline]
-    pub fn data(&self) -> &[f32] {
-        // OrderedFloat is POD, so it is safe.
-        unsafe { std::slice::from_raw_parts(self.value.as_ptr() as *const f32, self.value.len()) }
+    pub fn from_f32(value: &[f32]) -> Result<VectorFloat32Ref<'_>> {
+        let vec_u8: &[u8] = bytemuck::cast_slice(value);
+        VectorFloat32Ref::new(vec_u8)
     }
 
-    #[inline]
     pub fn encoded_len(&self) -> usize {
-        self.value.len() * ELEMENT_SIZE + LEN_PREFIX_SIZE
+        self.value.len() + std::mem::size_of::<u32>()
     }
 
-    #[inline]
     pub fn to_owned(&self) -> VectorFloat32 {
         VectorFloat32 {
             value: self.value.to_owned(),
         }
     }
 
-    #[inline]
     pub fn len(&self) -> usize {
-        self.value.len()
+        self.value.len() / F32_SIZE
     }
 
-    #[inline]
     pub fn is_empty(&self) -> bool {
         self.len() == 0
     }
@@ -109,211 +174,227 @@ impl<'a> VectorFloat32Ref<'a> {
         }
         Ok(())
     }
-}
 
-impl std::fmt::Display for VectorFloat32Ref<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "[")?;
-        for i in 0..self.len() {
-            if i == 0 {
-                write!(f, "{}", self[i])?;
-            } else {
-                write!(f, ",{}", self[i])?;
-            }
+    fn index(&self, idx: usize) -> f32 {
+        if idx > self.len() {
+            panic!(
+                "Index out of bounds: index = {}, length = {}",
+                idx,
+                self.len()
+            );
+        }
+        let byte_index: usize = idx * F32_SIZE;
+        unsafe {
+            let float_ptr = self.value.as_ptr().add(byte_index) as *const f32;
+            float_ptr.read_unaligned()
         }
-        write!(f, "]")?;
-        Ok(())
-    }
-}
-
-impl std::fmt::Debug for VectorFloat32Ref<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self)
     }
-}
 
-impl ToString for VectorFloat32Ref<'_> {
-    fn to_string(&self) -> String {
-        format!("{}", self)
+    // An unsafe function to get the 'f32' value without boundary check.
+    // it will check the bounding in debug model and remove the check in
+    // release.
+    unsafe fn index_unchecked(&self, idx: usize) -> f32 {
+        #[cfg(debug_assertions)]
+        {
+            if idx > self.len() {
+                panic!(
+                    "Index out of bounds: index = {}, length = {}",
+                    idx,
+                    self.len()
+                );
+            }
+        }
+        let byte_index: usize = idx * 4;
+        let float_ptr = self.value.as_ptr().add(byte_index) as *const f32;
+        float_ptr.read_unaligned()
     }
-}
 
-// Vector distance and functions
-impl<'a> VectorFloat32Ref<'a> {
-    #[inline]
     pub fn l2_squared_distance(&self, b: VectorFloat32Ref<'a>) -> Result<f64> {
-        match SpatialSimilarity::sqeuclidean(self.data(), b.data()) {
-            Some(l2_distance) => Ok(l2_distance),
-            None => Err(box_err!("Vectors must be of the same length")),
+        self.check_dims(b)?;
+        let mut distance: f32 = 0.0;
+
+        for i in 0..self.len() {
+            let diff = unsafe { self.index_unchecked(i) - b.index_unchecked(i) };
+            distance += diff * diff;
         }
+
+        Ok(distance as f64)
     }
 
-    #[inline]
     pub fn l2_distance(&self, b: VectorFloat32Ref<'a>) -> Result<f64> {
         Ok(self.l2_squared_distance(b)?.sqrt())
     }
 
-    #[inline]
     pub fn inner_product(&self, b: VectorFloat32Ref<'a>) -> Result<f64> {
-        match SpatialSimilarity::dot(self.data(), b.data()) {
-            Some(inner_product) => Ok(inner_product),
-            None => Err(box_err!("Vectors must be of the same length")),
+        self.check_dims(b)?;
+        let mut distance: f32 = 0.0;
+        for i in 0..self.len() {
+            distance += unsafe { self.index_unchecked(i) * b.index_unchecked(i) };
         }
+
+        Ok(distance as f64)
     }
 
-    #[inline]
     pub fn cosine_distance(&self, b: VectorFloat32Ref<'a>) -> Result<f64> {
-        match SpatialSimilarity::cosine(self.data(), b.data()) {
-            Some(cosine_similarity) => Ok(cosine_similarity),
-            None => Err(box_err!("Vectors must be of the same length")),
+        self.check_dims(b)?;
+        let mut distance: f32 = 0.0;
+        let mut norma: f32 = 0.0;
+        let mut normb: f32 = 0.0;
+        for i in 0..self.len() {
+            unsafe {
+                distance += self.index_unchecked(i) * b.index_unchecked(i);
+                norma += self.index_unchecked(i) * self.index_unchecked(i);
+                normb += b.index_unchecked(i) * b.index_unchecked(i);
+            }
+        }
+
+        let similarity = (distance as f64) / ((norma as f64) * (normb as f64)).sqrt();
+        if similarity.is_nan() {
+            // Divide by zero
+            return Ok(f64::NAN);
         }
+        let similarity = similarity.clamp(-1.0, 1.0);
+        Ok(1.0 - similarity)
     }
 
     pub fn l1_distance(&self, b: VectorFloat32Ref<'a>) -> Result<f64> {
         self.check_dims(b)?;
         let mut distance: f32 = 0.0;
         for i in 0..self.len() {
-            let diff = self[i] - b[i];
+            let diff = unsafe { self.index_unchecked(i) - b.index_unchecked(i) };
             distance += diff.abs();
         }
 
         Ok(distance as f64)
     }
 
-    #[inline]
-    pub fn l2_norm(&self) -> Result<f64> {
+    pub fn l2_norm(&self) -> f64 {
         // Note: We align the impl with pgvector: Only l2_norm use double
         // precision during calculation.
-        match SpatialSimilarity::dot(self.data(), self.data()) {
-            Some(norm) => Ok(norm.sqrt()),
-            None => Err(box_err!("Vectors must be of the same length")),
+        let mut norm: f64 = 0.0;
+        for i in 0..self.len() {
+            let v = unsafe { self.index_unchecked(i) as f64 };
+            norm += v * v;
         }
-    }
-}
-
-pub trait VectorFloat32DatumPayloadChunkEncoder: BufferWriter {
-    fn write_vector_float32_to_chunk_by_datum_payload(&mut self, src_payload: &[u8]) -> Result<()> {
-        // VectorFloat32's chunk format is same as binary format.
-        self.write_bytes(src_payload)?;
-        Ok(())
-    }
-}
-
-impl<T: BufferWriter> VectorFloat32DatumPayloadChunkEncoder for T {}
-
-impl<T: BufferWriter> VectorFloat32Encoder for T {}
-
-/// Unaligned, Ref.
-#[derive(Clone, Copy, Debug)]
-pub struct VectorFloat32RefUnaligned<'a> {
-    value: &'a [u8], // Data could be notaligned. Does not contain length prefix.
-}
-
-impl<'a> VectorFloat32RefUnaligned<'a> {
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.value.len() / ELEMENT_SIZE
-    }
 
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.value.len() == 0
-    }
-
-    /// It's safe to convert a unaligned ref to an aligned owned value. We will
-    /// copy data with proper alignment.
-    pub fn to_owned(&self) -> VectorFloat32 {
-        let mut aligned_data: Vec<OrderedFloat<f32>> = Vec::new();
-        aligned_data.resize(self.len(), OrderedFloat(0.0f32));
-        unsafe {
-            std::ptr::copy_nonoverlapping(
-                self.value.as_ptr(),              // Aligned by u8
-                aligned_data.as_mut_ptr().cast(), // Aligned by f32 → u8
-                self.value.len(),
-            )
-        }
-        VectorFloat32 {
-            value: aligned_data,
-        }
+        norm.sqrt()
     }
 }
 
-pub trait VectorFloat32Decoder: NumberDecoder {
-    // `read_vector_float32_ref` decodes value encoded by `write_vector_float32`
-    // before.
-    fn read_vector_float32_ref(&mut self) -> Result<VectorFloat32RefUnaligned<'_>> {
+pub trait VectorFloat32Encoder: NumberEncoder {
+    fn write_vector_float32(&mut self, data: VectorFloat32Ref<'_>) -> Result<()> {
         if !cfg!(target_endian = "little") {
             return Err(box_err!("VectorFloat32 only support Little Endian"));
         }
 
-        if self.bytes().is_empty() {
-            return Ok(VectorFloat32RefUnaligned { value: &[] });
-        }
-        let n = self.read_u32_le()? as usize;
-        let data_size = n * ELEMENT_SIZE;
-        let data = self.read_bytes(data_size)?;
-        Ok(VectorFloat32RefUnaligned { value: data })
-    }
+        self.write_u32_le(data.len() as u32)?;
+        self.write_bytes(data.value)?;
 
-    // `read_vector_float32` decodes value encoded by `write_vector_float32` before.
-    fn read_vector_float32(&mut self) -> Result<VectorFloat32> {
-        let r = self.read_vector_float32_ref()?;
-        Ok(r.to_owned())
+        Ok(())
     }
 }
 
-impl<T: BufferReader> VectorFloat32Decoder for T {}
-
-pub trait VectorFloat32Encoder: NumberEncoder {
-    fn write_vector_float32(&mut self, data: VectorFloat32Ref<'_>) -> Result<()> {
-        if !cfg!(target_endian = "little") {
-            return Err(box_err!("VectorFloat32 only support Little Endian"));
+impl std::fmt::Display for VectorFloat32Ref<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "[")?;
+        let mut is_first = true;
+        for i in 0..self.len() {
+            if is_first {
+                write!(f, "{}", self.index(i))?;
+                is_first = false;
+            } else {
+                write!(f, ",{}", self.index(i))?;
+            }
         }
-        self.write_u32_le(data.len() as u32)?;
-        self.write_bytes(bytemuck::cast_slice(data.data()))?;
+        write!(f, "]")?;
         Ok(())
     }
 }
 
+impl std::fmt::Debug for VectorFloat32Ref<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self)
+    }
+}
+
 #[cfg(test)]
 mod tests {
-
     use super::*;
 
+    #[test]
+    fn test_nan_inf() {
+        let v = VectorFloat32::from_f32(vec![1.0, f32::NAN]);
+        v.unwrap_err();
+
+        let v = VectorFloat32::from_f32(vec![1.0, f32::INFINITY]);
+        v.unwrap_err();
+
+        let v = VectorFloat32::from_f32(vec![1.0, f32::NEG_INFINITY]);
+        v.unwrap_err();
+
+        let v = VectorFloat32Ref::from_f32(&[1.0, f32::NAN]);
+        v.unwrap_err();
+
+        let v = VectorFloat32Ref::from_f32(&[1.0, f32::INFINITY]);
+        v.unwrap_err();
+
+        let v = VectorFloat32Ref::from_f32(&[1.0, f32::NEG_INFINITY]);
+        v.unwrap_err();
+    }
+
     #[test]
     fn test_to_string() {
-        let v = VectorFloat32::copy_from_f32(&[1.0, 2.0]);
+        let v = VectorFloat32::from_f32(vec![1.0, 2.0]).unwrap();
         assert_eq!("[1,2]", v.to_string());
 
-        let v = VectorFloat32::copy_from_f32(&[1.1, 2.2]);
+        let v = VectorFloat32::from_f32(vec![1.1, 2.2]).unwrap();
         assert_eq!("[1.1,2.2]", v.to_string());
 
-        let v = VectorFloat32::copy_from_f32(&[]);
+        let v = VectorFloat32::from_f32(vec![]).unwrap();
         assert_eq!("[]", v.to_string());
     }
 
+    #[test]
+    fn test_input_length() {
+        let buf: Vec<u8> = vec![
+            0xcd, 0xcc, 0x8c, 0x3f, // Element 1 = 0x3f8ccccd
+            0xcd, 0xcc, 0x0c, 0x40, // Element 2 = 0x400ccccd
+            0xcd, 0xcc, 0x0c,
+        ];
+        let v = VectorFloat32Ref::new(&buf[..]);
+        v.unwrap_err();
+
+        let buf: Vec<u8> = vec![
+            0xcd, 0xcc, 0x8c, 0x3f, // Element 1 = 0x3f8ccccd
+            0xcd, 0xcc, 0x0c, 0x40, // Element 2 = 0x400ccccd
+            0xcd, 0xcc, 0x0c, 0x40,
+        ];
+        let v = VectorFloat32Ref::new(&buf[..]);
+        v.unwrap();
+    }
+
     #[test]
     fn test_compare() {
-        let v1 = VectorFloat32::copy_from_f32(&[1.0, 2.0]);
-        let v2 = VectorFloat32::copy_from_f32(&[1.1, 2.2]);
+        let v1 = VectorFloat32::from_f32(vec![1.0, 2.0]).unwrap();
+        let v2 = VectorFloat32::from_f32(vec![1.1, 2.2]).unwrap();
         assert!(v1 < v2);
 
-        let v3 = VectorFloat32::copy_from_f32(&[1.0, 2.0]);
+        let v3 = VectorFloat32::from_f32(vec![1.0, 2.0]).unwrap();
         assert!(v1 == v3);
 
-        let v4 = VectorFloat32::copy_from_f32(&[0.3, 0.4]);
+        let v4 = VectorFloat32::from_f32(vec![0.3, 0.4]).unwrap();
         assert!(v1 > v4);
 
-        let v4 = VectorFloat32::copy_from_f32(&[1.0]);
+        let v4 = VectorFloat32::from_f32(vec![1.0]).unwrap();
         assert!(v1 > v4);
 
-        let v5 = VectorFloat32::copy_from_f32(&[1.0, 2.0, 0.5]);
+        let v5 = VectorFloat32::from_f32(vec![1.0, 2.0, 0.5]).unwrap();
         assert!(v1 < v5);
     }
 
     #[test]
     fn test_encode() {
-        let v = VectorFloat32::copy_from_f32(&[1.1, 2.2]);
+        let v = VectorFloat32::from_f32(vec![1.1, 2.2]).unwrap();
         let mut encoded = Vec::new();
 
         encoded.write_vector_float32(v.as_ref()).unwrap();
@@ -342,7 +423,7 @@ mod tests {
         let v = buf_slice.read_vector_float32_ref().unwrap();
 
         assert_eq!(v.len(), 2);
-        assert_eq!(v.to_owned().as_ref().to_string(), "[1.1,2.2]");
+        assert_eq!(v.to_string(), "[1.1,2.2]");
 
         assert_eq!(buf_slice.len(), 1);
         assert_eq!(buf_slice, &[0xff]);
@@ -354,11 +435,9 @@ mod tests {
         buf_slice = &[];
         let v = buf_slice.read_vector_float32_ref().unwrap();
         assert_eq!(v.len(), 0);
-        assert_eq!(v.to_owned().as_ref().to_string(), "[]");
+        assert_eq!(v.to_string(), "[]");
         let mut encode_buf = Vec::new();
-        encode_buf
-            .write_vector_float32(v.to_owned().as_ref())
-            .unwrap();
+        encode_buf.write_vector_float32(v).unwrap();
         assert_eq!(encode_buf, vec![0x00, 0x00, 0x00, 0x00]);
     }
 }
diff --git a/components/tidb_query_datatype/src/codec/overflow.rs b/components/tidb_query_datatype/src/codec/overflow.rs
index 4a81b23a995..7d814966a5f 100644
--- a/components/tidb_query_datatype/src/codec/overflow.rs
+++ b/components/tidb_query_datatype/src/codec/overflow.rs
@@ -65,8 +65,6 @@ pub fn div_i64_with_u64(a: i64, b: u64) -> Result<u64> {
 
 #[cfg(test)]
 mod tests {
-    use std::{i64, u64};
-
     use crate::codec::error::{ERR_DATA_OUT_OF_RANGE, ERR_DIVISION_BY_ZERO};
 
     macro_rules! do_test {
diff --git a/components/tidb_query_datatype/src/codec/row/v2/compat_v1.rs b/components/tidb_query_datatype/src/codec/row/v2/compat_v1.rs
index 3afc9b2ebbe..66ff3380d76 100644
--- a/components/tidb_query_datatype/src/codec/row/v2/compat_v1.rs
+++ b/components/tidb_query_datatype/src/codec/row/v2/compat_v1.rs
@@ -5,8 +5,8 @@
 use codec::{number::NumberCodec, prelude::BufferWriter};
 
 use crate::{
-    codec::{datum, datum_codec::DatumFlagAndPayloadEncoder, Error, Result},
     FieldTypeAccessor, FieldTypeTp,
+    codec::{Error, Result, datum, datum_codec::DatumFlagAndPayloadEncoder},
 };
 
 #[inline]
@@ -141,16 +141,14 @@ impl<T: BufferWriter> V1CompatibleEncoder for T {}
 /// not always equals the encoded-bytes using v1 directly.
 #[cfg(test)]
 mod tests {
-    use std::{f64, i16, i32, i64, i8, u16, u32, u64, u8};
-
     use super::{
         super::encoder_for_test::{Column, ScalarValueEncoder},
         V1CompatibleEncoder,
     };
     use crate::{
+        FieldTypeTp,
         codec::{data_type::*, datum_codec::RawDatumDecoder},
         expr::EvalContext,
-        FieldTypeTp,
     };
 
     fn encode_to_v1_compatible(ctx: &mut EvalContext, col: &Column) -> Vec<u8> {
diff --git a/components/tidb_query_datatype/src/codec/row/v2/encoder_for_test.rs b/components/tidb_query_datatype/src/codec/row/v2/encoder_for_test.rs
index 5ac1cad3b32..ced64a38924 100644
--- a/components/tidb_query_datatype/src/codec/row/v2/encoder_for_test.rs
+++ b/components/tidb_query_datatype/src/codec/row/v2/encoder_for_test.rs
@@ -21,20 +21,19 @@
 //! * null column ids: when flag == 1 (big), id is 4 bytes, otherwise 1 byte
 //! * non-null values offset: when big, offset is 4 bytes, otherwise 2 bytes
 
-use std::{i16, i32, i8, u16, u32, u8};
-
 use codec::prelude::*;
 use num_traits::Zero;
 use tipb::FieldType;
 
 use crate::{
+    FieldTypeAccessor, FieldTypeFlag, FieldTypeTp,
     codec::{
-        data_type::ScalarValue,
-        mysql::{decimal::DecimalEncoder, json::JsonEncoder, Duration},
         Error, Result,
+        convert::ToStringValue,
+        data_type::ScalarValue,
+        mysql::{Duration, decimal::DecimalEncoder, json::JsonEncoder},
     },
     expr::EvalContext,
-    FieldTypeAccessor, FieldTypeFlag, FieldTypeTp,
 };
 
 const MAX_I8: i64 = i8::MAX as i64;
@@ -219,7 +218,7 @@ impl Column {
                         "invalid type: {:?}",
                         self.ft,
                     )))?
-                    .to_string();
+                    .to_string_value();
                 buf.write_u32_le(res.len() as u32)?;
                 buf.write_bytes(res.as_bytes())?;
             }
@@ -531,10 +530,10 @@ mod tests {
     use crate::{
         codec::{
             data_type::ScalarValue,
-            mysql::{duration::NANOS_PER_SEC, Decimal, Duration, Json, Time},
+            mysql::{Decimal, Duration, Json, Time, duration::NANOS_PER_SEC},
             row::v2::encoder_for_test::{
-                get_non_null_columns, prepare_cols_for_test, ChecksumHandler,
-                Crc32RowChecksumHandler,
+                ChecksumHandler, Crc32RowChecksumHandler, get_non_null_columns,
+                prepare_cols_for_test,
             },
         },
         expr::EvalContext,
diff --git a/components/tidb_query_datatype/src/codec/row/v2/row_slice.rs b/components/tidb_query_datatype/src/codec/row/v2/row_slice.rs
index e86ebe28802..bb8340f1bb0 100644
--- a/components/tidb_query_datatype/src/codec/row/v2/row_slice.rs
+++ b/components/tidb_query_datatype/src/codec/row/v2/row_slice.rs
@@ -183,9 +183,9 @@ impl RowSlice<'_> {
     #[inline]
     fn id_valid(&self, id: i64) -> bool {
         let upper: i64 = if self.is_big() {
-            i64::from(u32::max_value())
+            i64::from(u32::MAX)
         } else {
-            i64::from(u8::max_value())
+            i64::from(u8::MAX)
         };
         id > 0 && id <= upper
     }
@@ -359,19 +359,17 @@ impl<'a, T: PrimInt> LeBytes<'a, T> {
 
 #[cfg(test)]
 mod tests {
-    use std::u16;
-
     use codec::prelude::NumberEncoder;
     use tipb::FieldType;
 
     use super::{
         super::encoder_for_test::{Column, RowEncoder},
-        read_le_bytes, RowSlice,
+        RowSlice, read_le_bytes,
     };
     use crate::{
+        FieldTypeTp,
         codec::data_type::{Duration, ScalarValue},
         expr::EvalContext,
-        FieldTypeTp,
     };
 
     #[test]
@@ -423,7 +421,7 @@ mod tests {
         assert_eq!(big_row.search_in_non_null_ids(333).unwrap(), None);
         assert_eq!(
             big_row
-                .search_in_non_null_ids(i64::from(u32::max_value()) + 2)
+                .search_in_non_null_ids(i64::from(u32::MAX) + 2)
                 .unwrap(),
             None
         );
@@ -438,8 +436,7 @@ mod tests {
         assert_eq!(row.search_in_non_null_ids(33).unwrap(), None);
         assert_eq!(row.search_in_non_null_ids(35).unwrap(), None);
         assert_eq!(
-            row.search_in_non_null_ids(i64::from(u8::max_value()) + 2)
-                .unwrap(),
+            row.search_in_non_null_ids(i64::from(u8::MAX) + 2).unwrap(),
             None
         );
         assert_eq!(Some((0, 2)), row.search_in_non_null_ids(1).unwrap());
diff --git a/components/tidb_query_datatype/src/codec/table.rs b/components/tidb_query_datatype/src/codec/table.rs
index 5712a50f66f..b63ee547713 100644
--- a/components/tidb_query_datatype/src/codec/table.rs
+++ b/components/tidb_query_datatype/src/codec/table.rs
@@ -1,21 +1,26 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{cmp, convert::TryInto, io::Write, sync::Arc, u8};
+use std::{cmp, convert::TryInto, fmt::Debug, io::Write, sync::Arc};
 
 use api_version::KvFormat;
 use codec::prelude::*;
 use collections::{HashMap, HashSet};
 use kvproto::coprocessor::KeyRange;
+use tidb_query_common::util::convert_to_prefix_next;
 use tikv_util::codec::BytesSlice;
-use tipb::ColumnInfo;
+use tipb::{ColumnInfo, FieldType};
 
 use super::{
-    datum,
+    Datum, Error, Result, datum,
     datum::DatumDecoder,
     mysql::{Duration, Time},
-    Datum, Error, Result,
 };
-use crate::{expr::EvalContext, prelude::*, FieldTypeTp};
+use crate::{
+    FieldTypeTp,
+    codec::{batch::LazyBatchColumnVec, data_type::ScalarValueRef},
+    expr::EvalContext,
+    prelude::*,
+};
 
 // handle or index id
 pub const ID_LEN: usize = 8;
@@ -322,7 +327,7 @@ pub fn decode_row(
     cols: &HashMap<i64, ColumnInfo>,
 ) -> Result<HashMap<i64, Datum>> {
     let mut values = datum::decode(data)?;
-    if values.first().map_or(true, |d| *d == Datum::Null) {
+    if values.first().is_none_or(|d| *d == Datum::Null) {
         return Ok(HashMap::default());
     }
     if values.len() & 1 == 1 {
@@ -547,16 +552,131 @@ pub fn generate_index_data_for_test(
     (expect_row, idx_key)
 }
 
+/// RowHandle is trait to provide a common interface for different types of row
+/// handles.
+pub trait RowHandle: Eq + Ord + Clone + Debug + Send + Sync {
+    /// creates a new handle from LazyBatchColumnVec
+    fn from_lazy_batch_column_vec(
+        ctx: &EvalContext,
+        rows: &LazyBatchColumnVec,
+        row_offset: usize,
+        col_offsets: &[usize],
+        col_types: &[FieldType],
+    ) -> Result<Self>;
+    /// encode the row key for the handle in the give physical table ID.
+    /// The return row key is in a raw format without mvcc comparable encoding.
+    fn encode_row_key(&self, table_id: i64) -> Vec<u8>;
+    /// encode the point-range end key for the handle.
+    /// The point-range is used to scan a single row in storage, and its start
+    /// key is the handle row key.
+    /// The return row key is in a raw format without mvcc comparable encoding.
+    fn encode_point_range_end(&self, table_id: i64) -> Vec<u8>;
+    /// checks if the current handle is the next of the previous handle.
+    fn is_next_of(&self, prev: &Self) -> bool;
+}
+
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub struct IntHandle(i64);
+
+impl IntHandle {
+    pub fn as_i64(&self) -> i64 {
+        self.0
+    }
+}
+
+impl From<i64> for IntHandle {
+    fn from(value: i64) -> Self {
+        IntHandle(value)
+    }
+}
+
+impl RowHandle for IntHandle {
+    #[inline]
+    fn from_lazy_batch_column_vec(
+        _ctx: &EvalContext,
+        vec: &LazyBatchColumnVec,
+        row_offset: usize,
+        col_offsets: &[usize],
+        col_types: &[FieldType],
+    ) -> Result<Self> {
+        if col_offsets.len() != 1 || col_types.len() != 1 {
+            return Err(box_err!(
+                "The IntHandle columns len should be 1, but got col_offsets: {}, col_types: {}",
+                col_offsets.len(),
+                col_types.len()
+            ));
+        }
+
+        let col_offset = col_offsets[0];
+        if col_offset > vec.columns_len() {
+            return Err(box_err!(
+                "The column offset for IntHandle {} is out of range, the column count is {}",
+                col_offset,
+                vec.columns_len()
+            ));
+        }
+
+        if !matches!(
+            col_types[0].tp(),
+            FieldTypeTp::Tiny
+                | FieldTypeTp::Short
+                | FieldTypeTp::Long
+                | FieldTypeTp::LongLong
+                | FieldTypeTp::Int24
+        ) {
+            return Err(box_err!(
+                "The column type for IntHandle should be int types, but got {:?}",
+                col_types[0].tp()
+            ));
+        }
+
+        let col = &vec[col_offset];
+        if !col.is_decoded() {
+            return Err(box_err!("column {} not decoded", col_offsets[0]));
+        }
+        match col.decoded().get_scalar_ref(row_offset) {
+            ScalarValueRef::Int(Some(&val)) => Ok(IntHandle(val)),
+            scalar => Err(box_err!(
+                "column {} at row {} is not valid, col_type: {:?}, expect Int, but is other type or None",
+                col_offset,
+                row_offset,
+                scalar.eval_type()
+            )),
+        }
+    }
+
+    #[inline]
+    fn encode_row_key(&self, table_id: i64) -> Vec<u8> {
+        encode_row_key(table_id, self.0)
+    }
+
+    #[inline]
+    fn encode_point_range_end(&self, table_id: i64) -> Vec<u8> {
+        let mut key = self.encode_row_key(table_id);
+        convert_to_prefix_next(&mut key);
+        key
+    }
+
+    #[inline]
+    fn is_next_of(&self, prev: &Self) -> bool {
+        self.0 == prev.0 + 1
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use std::{i64, iter::FromIterator};
+    use std::iter::FromIterator;
 
     use api_version::ApiV1;
     use collections::{HashMap, HashSet};
+    use tidb_query_common::util::is_prefix_next;
     use tipb::ColumnInfo;
 
     use super::*;
-    use crate::codec::datum::{self, Datum};
+    use crate::codec::{
+        data_type::{Real, VectorValue},
+        datum::{self, Datum},
+    };
 
     const TABLE_ID: i64 = 1;
     const INDEX_ID: i64 = 1;
@@ -839,4 +959,149 @@ mod tests {
         check_key_type(too_small_key.as_slice(), RECORD_PREFIX_SEP).unwrap_err();
         check_key_type(too_small_key.as_slice(), INDEX_PREFIX_SEP).unwrap_err();
     }
+
+    #[test]
+    fn test_int_handle_from_lazy_batch_column_vec() {
+        let int_values1 = VectorValue::Int(vec![Some(123), None, Some(234), Some(567)].into());
+        let int_values2 = VectorValue::Int(vec![Some(1001), Some(1002), None, None].into());
+        let byte_values = VectorValue::Bytes(
+            vec![
+                Some("a".as_bytes().to_vec()),
+                Some("b".as_bytes().to_vec()),
+                None,
+                Some(b"c".to_vec()),
+            ]
+            .into(),
+        );
+        let real_values = VectorValue::Real(
+            vec![
+                Real::new(5.0).ok(),
+                Real::new(7.0).ok(),
+                Real::new(4.0).ok(),
+                None,
+            ]
+            .into(),
+        );
+
+        let vec =
+            LazyBatchColumnVec::from(vec![byte_values, int_values1, real_values, int_values2]);
+        let create_handle = |col_offset, row_offset| {
+            IntHandle::from_lazy_batch_column_vec(
+                &EvalContext::default(),
+                &vec,
+                row_offset,
+                &[col_offset],
+                &[FieldTypeTp::Long.into()],
+            )
+        };
+
+        // valid
+        assert_eq!(create_handle(1, 0).unwrap().as_i64(), 123);
+        assert_eq!(create_handle(1, 2).unwrap().as_i64(), 234);
+        assert_eq!(create_handle(1, 3).unwrap().as_i64(), 567);
+        assert_eq!(create_handle(3, 0).unwrap().as_i64(), 1001);
+        assert_eq!(create_handle(3, 1).unwrap().as_i64(), 1002);
+
+        // invalid data
+        create_handle(0, 0).unwrap_err();
+        create_handle(1, 1).unwrap_err();
+        create_handle(3, 2).unwrap_err();
+        create_handle(2, 0).unwrap_err();
+        create_handle(3, 3).unwrap_err();
+
+        // test col_offsets and col_types
+        let create_handle = |col_offsets, col_types: &[FieldTypeTp]| {
+            let tps = col_types.iter().map(|tp| (*tp).into()).collect::<Vec<_>>();
+            IntHandle::from_lazy_batch_column_vec(
+                &EvalContext::default(),
+                &vec,
+                0,
+                col_offsets,
+                &tps,
+            )
+        };
+
+        // valid col types
+        for tp in &[
+            FieldTypeTp::Tiny,
+            FieldTypeTp::Short,
+            FieldTypeTp::Long,
+            FieldTypeTp::LongLong,
+            FieldTypeTp::Int24,
+        ] {
+            assert_eq!(create_handle(&[1], &[*tp]).unwrap().as_i64(), 123);
+        }
+
+        // invalid col types
+        for tp in &[
+            FieldTypeTp::Unspecified,
+            FieldTypeTp::Float,
+            FieldTypeTp::Double,
+            FieldTypeTp::String,
+            FieldTypeTp::VarChar,
+            FieldTypeTp::NewDecimal,
+            FieldTypeTp::Json,
+            FieldTypeTp::Duration,
+            FieldTypeTp::Bit,
+            FieldTypeTp::Enum,
+            FieldTypeTp::Set,
+            FieldTypeTp::Date,
+            FieldTypeTp::DateTime,
+            FieldTypeTp::Timestamp,
+            FieldTypeTp::Year,
+            FieldTypeTp::TinyBlob,
+            FieldTypeTp::MediumBlob,
+            FieldTypeTp::Blob,
+            FieldTypeTp::LongBlob,
+            FieldTypeTp::TiDbVectorFloat32,
+        ] {
+            let err = create_handle(&[1], &[*tp]).unwrap_err();
+            assert!(
+                err.to_string()
+                    .contains("The column type for IntHandle should be int types")
+            );
+        }
+
+        // invalid length of col_offsets or col_types
+        for (offsets, types) in &[
+            (vec![], vec![]),
+            (vec![0, 1], vec![FieldTypeTp::Long]),
+            (vec![1], vec![FieldTypeTp::Long, FieldTypeTp::Long]),
+            (vec![0, 1], vec![FieldTypeTp::Long, FieldTypeTp::Long]),
+        ] {
+            let err = create_handle(offsets, types).unwrap_err();
+            assert!(
+                err.to_string()
+                    .contains("The IntHandle columns len should be 1")
+            );
+        }
+    }
+
+    #[test]
+    fn test_int_handle_methods() {
+        // test encode_row_key and encode_point_range_end
+        for (table_id, id) in [
+            (123, 456),
+            (789, i64::MAX),
+            (1024, i64::MIN),
+            (999, -1),
+            (100, 0),
+        ] {
+            let h = IntHandle::from(id);
+            let key = h.encode_row_key(table_id);
+            assert_eq!(decode_table_id(&key).unwrap(), table_id);
+            assert_eq!(decode_int_handle(&key).unwrap(), id);
+            let point_range_end = h.encode_point_range_end(table_id);
+            assert!(is_prefix_next(&key, &point_range_end));
+        }
+
+        // test is_next_of
+        assert!(IntHandle::from(1).is_next_of(&IntHandle::from(0)));
+        assert!(IntHandle::from(0).is_next_of(&IntHandle::from(-1)));
+        assert!(IntHandle::from(4).is_next_of(&IntHandle::from(3)));
+        assert!(!IntHandle::from(1).is_next_of(&IntHandle::from(1)));
+        assert!(!IntHandle::from(2).is_next_of(&IntHandle::from(3)));
+        assert!(!IntHandle::from(3).is_next_of(&IntHandle::from(1)));
+        assert!(!IntHandle::from(4).is_next_of(&IntHandle::from(6)));
+    }
 }
diff --git a/components/tidb_query_datatype/src/def/field_type.rs b/components/tidb_query_datatype/src/def/field_type.rs
index 5210d368dd3..c734f9d8fb8 100644
--- a/components/tidb_query_datatype/src/def/field_type.rs
+++ b/components/tidb_query_datatype/src/def/field_type.rs
@@ -467,8 +467,6 @@ impl FieldTypeAccessor for ColumnInfo {
 
 #[cfg(test)]
 mod tests {
-    use std::i32;
-
     use super::*;
     use crate::builder::FieldTypeBuilder;
 
diff --git a/components/tidb_query_datatype/src/expr/ctx.rs b/components/tidb_query_datatype/src/expr/ctx.rs
index e459a538b0f..d113ecf6d09 100644
--- a/components/tidb_query_datatype/src/expr/ctx.rs
+++ b/components/tidb_query_datatype/src/expr/ctx.rs
@@ -1,12 +1,12 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{i64, mem, sync::Arc, u64};
+use std::{mem, sync::Arc};
 
 use bitflags::bitflags;
 use tipb::DagRequest;
 
 use super::{Error, Result};
-use crate::codec::mysql::{Tz, DEFAULT_DIV_FRAC_INCR};
+use crate::codec::mysql::{DEFAULT_DIV_FRAC_INCR, Tz};
 
 bitflags! {
     /// Please refer to SQLMode in `mysql/const.go` in repo `pingcap/parser` for details.
diff --git a/components/tidb_query_datatype/src/lib.rs b/components/tidb_query_datatype/src/lib.rs
index 090d43e2062..e6106f858cb 100644
--- a/components/tidb_query_datatype/src/lib.rs
+++ b/components/tidb_query_datatype/src/lib.rs
@@ -8,7 +8,6 @@
 #![allow(internal_features)]
 #![feature(str_internals)]
 #![feature(core_intrinsics)]
-#![feature(round_ties_even)]
 
 #[macro_use]
 extern crate num_derive;
diff --git a/components/tidb_query_executors/Cargo.toml b/components/tidb_query_executors/Cargo.toml
index 379db221424..b2517412417 100644
--- a/components/tidb_query_executors/Cargo.toml
+++ b/components/tidb_query_executors/Cargo.toml
@@ -27,6 +27,7 @@ tidb_query_datatype = { workspace = true }
 tidb_query_expr = { workspace = true }
 tikv_util = { workspace = true }
 tipb = { workspace = true }
+txn_types = { workspace = true }
 
 [dev-dependencies]
 anyhow = "1.0"
diff --git a/components/tidb_query_executors/src/fast_hash_aggr_executor.rs b/components/tidb_query_executors/src/fast_hash_aggr_executor.rs
index 4f5156510a0..fa4150c4ff4 100644
--- a/components/tidb_query_executors/src/fast_hash_aggr_executor.rs
+++ b/components/tidb_query_executors/src/fast_hash_aggr_executor.rs
@@ -5,15 +5,16 @@ use std::{convert::TryFrom, hash::Hash, sync::Arc};
 use async_trait::async_trait;
 use collections::HashMap;
 use tidb_query_aggr::*;
-use tidb_query_common::{storage::IntervalRange, Result};
+use tidb_query_common::{Result, storage::IntervalRange};
 use tidb_query_datatype::{
+    Collation, EvalType, FieldTypeAccessor,
     codec::{
         batch::{LazyBatchColumn, LazyBatchColumnVec},
         collation::SortKey,
         data_type::*,
     },
     expr::{EvalConfig, EvalContext},
-    match_template_collator, Collation, EvalType, FieldTypeAccessor,
+    match_template_collator,
 };
 use tidb_query_expr::{RpnExpression, RpnExpressionBuilder, RpnStackNode};
 use tikv_util::box_try;
@@ -48,6 +49,19 @@ impl<Src: BatchExecutor> BatchExecutor for BatchFastHashAggregationExecutor<Src>
         self.0.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.0.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.0.consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         self.0.next_batch(scan_rows).await
@@ -469,18 +483,18 @@ where
 #[cfg(test)]
 mod tests {
     use futures::executor::block_on;
-    use tidb_query_datatype::{expr::EvalWarnings, FieldTypeTp};
+    use tidb_query_datatype::{FieldTypeTp, expr::EvalWarnings};
     use tidb_query_expr::{
-        impl_arithmetic::{arithmetic_fn_meta, RealPlus},
         RpnExpression, RpnExpressionBuilder,
+        impl_arithmetic::{RealPlus, arithmetic_fn_meta},
     };
     use tipb::{ExprType, ScalarFuncSig};
     use tipb_helper::ExprDefBuilder;
 
     use super::*;
     use crate::{
-        util::{aggr_executor::tests::*, mock_executor::MockExecutor},
         BatchSlowHashAggregationExecutor,
+        util::{aggr_executor::tests::*, mock_executor::MockExecutor},
     };
 
     // Test cases also cover BatchSlowHashAggregationExecutor.
diff --git a/components/tidb_query_executors/src/index_lookup_executor.rs b/components/tidb_query_executors/src/index_lookup_executor.rs
new file mode 100644
index 00000000000..c7e30c18c40
--- /dev/null
+++ b/components/tidb_query_executors/src/index_lookup_executor.rs
@@ -0,0 +1,2526 @@
+// Copyright 2025 TiKV Project Authors. Licensed under Apache-2.0.
+
+use std::{
+    cmp::{Ordering, min},
+    collections::HashSet,
+    mem,
+    sync::Arc,
+};
+
+use api_version::{ApiV1, KvFormat};
+use async_trait::async_trait;
+use kvproto::{coprocessor::KeyRange, metapb};
+use tidb_query_common::{
+    Error,
+    error::Result,
+    execute_stats::{ExecSummary, ExecSummaryCollector, ExecSummaryCollectorEnabled, ExecuteStats},
+    metrics::EXECUTOR_COUNT_METRICS,
+    storage::{FindRegionResult, IntervalRange, RegionStorageAccessor, StateRole, Storage},
+};
+use tidb_query_datatype::{
+    codec::{
+        batch::LazyBatchColumnVec,
+        data_type::{BATCH_MAX_SIZE, LogicalRows},
+        table::RowHandle,
+    },
+    expr::{EvalConfig, EvalContext, EvalWarnings},
+};
+use tikv_util::{
+    Either,
+    Either::{Left, Right},
+};
+use tipb::{ColumnInfo, FieldType, IndexLookUp, TableScan};
+use txn_types::Key;
+
+use crate::{
+    BatchTableScanExecutor,
+    interface::{BatchExecIsDrain, BatchExecuteResult, BatchExecutor, WithSummaryCollector},
+    util::scan_executor::field_type_from_column_info,
+};
+
+#[derive(Default)]
+struct IndexScanState {
+    results: Vec<BatchExecuteResult>,
+    row_count: usize,
+}
+
+struct TableLookUpState<Iter, S: Storage, F: KvFormat> {
+    table_task_iter: Option<Iter>,
+    table_scan:
+        Option<WithSummaryCollector<ExecSummaryCollectorEnabled, BatchTableScanExecutor<S, F>>>,
+}
+
+enum IndexLookUpPhase<Iter, S: Storage, F: KvFormat> {
+    IndexScan(IndexScanState),
+    TableLookUp(TableLookUpState<Iter, S, F>),
+    Done,
+}
+
+impl<Iter, S: Storage, F: KvFormat> Default for IndexLookUpPhase<Iter, S, F> {
+    fn default() -> Self {
+        IndexLookUpPhase::IndexScan(IndexScanState::default())
+    }
+}
+
+impl<Iter, S: Storage, F: KvFormat> IndexLookUpPhase<Iter, S, F> {
+    fn mut_index_scan_or_err(&mut self) -> Result<&mut IndexScanState> {
+        match self {
+            IndexLookUpPhase::IndexScan(ref mut s) => Ok(s),
+            _ => Err(other_err!("The current phase is not IndexScan")),
+        }
+    }
+
+    fn mut_table_lookup_or_err(&mut self) -> Result<&mut TableLookUpState<Iter, S, F>> {
+        match self {
+            IndexLookUpPhase::TableLookUp(ref mut s) => Ok(s),
+            _ => Err(other_err!("The current phase is not TableLookUp")),
+        }
+    }
+}
+
+#[derive(Clone, PartialEq, Debug)]
+pub struct TableScanParams {
+    pub columns_info: Vec<ColumnInfo>,
+    pub primary_column_ids: Vec<i64>,
+    pub primary_prefix_column_ids: Vec<i64>,
+}
+
+#[derive(Clone, PartialEq, Debug)]
+pub struct IndexLayout {
+    pub handle_types: Vec<FieldType>,
+    pub handle_offsets: Vec<usize>,
+}
+
+pub struct BatchIndexLookUpExecutor<S, Src, Builder, F>
+where
+    S: Storage,
+    Src: BatchExecutor<StorageStats = S::Statistics>,
+    Builder: TableTaskIterBuilder,
+    F: KvFormat,
+{
+    src: Src,
+    src_is_drained: BatchExecIsDrain,
+
+    config: Arc<EvalConfig>,
+    output_schema: Vec<FieldType>,
+    force_no_index_lookup: bool,
+    table_lookup_batch_size: usize,
+    table_lookup_max_batch_size: usize,
+    table_task_iter_builder: Option<Builder>,
+    table_scan_params: TableScanParams,
+
+    phase: IndexLookUpPhase<Builder::Iterator, S, F>,
+    intermediate_results: Vec<BatchExecuteResult>,
+    intermediate_channel_index: usize,
+    table_scan_child_index: usize,
+    table_scan_exec_summary: [ExecSummary; 1],
+}
+
+#[inline]
+pub fn build_index_lookup_executor<
+    S: Storage + 'static,
+    Handle: RowHandle + 'static,
+    F: KvFormat,
+>(
+    config: Arc<EvalConfig>,
+    src: impl BatchExecutor<StorageStats = S::Statistics> + 'static,
+    mut index_lookup: IndexLookUp,
+    mut tbl_scan: TableScan,
+    accessor: Option<impl RegionStorageAccessor<Storage = S> + 'static>,
+    intermediate_channel_index: usize,
+    table_scan_child_index: usize,
+) -> Result<impl BatchExecutor<StorageStats = S::Statistics>> {
+    if index_lookup.get_keep_order() {
+        return Err(other_err!(
+            "IndexLookupExecutor does not support keep order currently"
+        ));
+    }
+
+    let src_schema = src.schema();
+    let handle_offsets = index_lookup
+        .take_index_handle_offsets()
+        .into_iter()
+        .map(|offset| offset as usize)
+        .collect::<Vec<_>>();
+
+    let handle_types = handle_offsets
+        .iter()
+        .map(|&offset| src_schema[offset].clone())
+        .collect();
+
+    Ok(BatchIndexLookUpExecutor::<_, _, _, F>::new(
+        config,
+        src,
+        TableScanParams {
+            columns_info: tbl_scan.take_columns().into(),
+            primary_column_ids: tbl_scan.take_primary_column_ids(),
+            primary_prefix_column_ids: tbl_scan.take_primary_prefix_column_ids(),
+        },
+        accessor.map(|acc| {
+            AccessorTableTaskIterBuilder::<_, Handle>::new(
+                tbl_scan.get_table_id(),
+                acc,
+                IndexLayout {
+                    handle_types,
+                    handle_offsets,
+                },
+            )
+        }),
+        intermediate_channel_index,
+        table_scan_child_index,
+    ))
+}
+
+// We assign a dummy type `Box<dyn Storage<Statistics = ()>>` so that we can
+// omit the type when calling `check_supported`.
+impl
+    BatchIndexLookUpExecutor<
+        Box<dyn Storage<Statistics = ()>>,
+        Box<dyn BatchExecutor<StorageStats = ()>>,
+        Box<dyn TableTaskIterBuilder<Iterator = ()>>,
+        ApiV1,
+    >
+{
+    /// Checks whether this executor can be used.
+    #[inline]
+    pub fn check_supported(_descriptor: &IndexLookUp) -> Result<()> {
+        Ok(())
+    }
+}
+
+impl<S, Src, Builder, F> BatchIndexLookUpExecutor<S, Src, Builder, F>
+where
+    S: Storage,
+    Src: BatchExecutor<StorageStats = S::Statistics>,
+    Builder: TableTaskIterBuilder<Iterator: TableTaskIterator<Storage = S>>,
+    F: KvFormat,
+{
+    #[inline]
+    pub fn new(
+        config: Arc<EvalConfig>,
+        src: Src,
+        table_scan_params: TableScanParams,
+        table_task_iter_builder: Option<Builder>,
+        intermediate_channel_index: usize,
+        table_scan_child_index: usize,
+    ) -> Self {
+        let force_no_index_lookup =
+            if config.paging_size.is_some() || table_task_iter_builder.is_none() {
+                // We did not support index lookup when paging is enabled.
+                // TODO: support paging
+                // some times we do not have table_task_iter_builder, such as
+                // - CommonHandle
+                // TODO: support CommonHandle
+                true
+            } else {
+                false
+            };
+
+        let output_schema = table_scan_params
+            .columns_info
+            .iter()
+            .map(field_type_from_column_info)
+            .collect::<Vec<_>>();
+
+        BatchIndexLookUpExecutor {
+            output_schema,
+            config,
+            force_no_index_lookup,
+            table_lookup_batch_size: 0,
+            table_lookup_max_batch_size: BATCH_MAX_SIZE,
+            src,
+            src_is_drained: BatchExecIsDrain::Remain,
+            intermediate_results: vec![],
+            table_task_iter_builder,
+            phase: IndexLookUpPhase::default(),
+            table_scan_params,
+            intermediate_channel_index,
+            table_scan_child_index,
+            table_scan_exec_summary: [ExecSummary::default()],
+        }
+    }
+
+    #[cfg(test)]
+    pub fn into_index_child(self) -> Src {
+        self.src
+    }
+
+    #[inline]
+    pub fn config(&self) -> Arc<EvalConfig> {
+        self.config.clone()
+    }
+
+    #[inline]
+    pub fn get_table_scan_params(&self) -> &TableScanParams {
+        &self.table_scan_params
+    }
+
+    #[inline]
+    pub fn get_table_task_builder(&self) -> Option<&Builder> {
+        self.table_task_iter_builder.as_ref()
+    }
+
+    #[inline]
+    pub fn intermediate_channel_index(&self) -> usize {
+        self.intermediate_channel_index
+    }
+
+    #[inline]
+    pub fn table_scan_child_index(&self) -> usize {
+        self.table_scan_child_index
+    }
+
+    #[inline]
+    fn empty_result(is_drained: BatchExecIsDrain) -> BatchExecuteResult {
+        BatchExecuteResult {
+            physical_columns: LazyBatchColumnVec::empty(),
+            logical_rows: vec![],
+            warnings: EvalWarnings::default(),
+            is_drained: Ok(is_drained),
+        }
+    }
+
+    #[inline]
+    fn err_result(err: Error) -> BatchExecuteResult {
+        BatchExecuteResult {
+            physical_columns: LazyBatchColumnVec::empty(),
+            logical_rows: vec![],
+            warnings: EvalWarnings::default(),
+            is_drained: Err(err),
+        }
+    }
+
+    #[inline]
+    fn step_to_table_lookup(&mut self, warnings: &mut EvalWarnings) -> Result<()> {
+        let state = self.phase.mut_index_scan_or_err()?;
+        let builder = self.table_task_iter_builder.as_ref().ok_or(other_err!(
+            "No table task builder available for index lookup"
+        ))?;
+
+        let mut ctx = EvalContext {
+            cfg: self.config.clone(),
+            warnings: EvalWarnings::default(),
+        };
+
+        let results = mem::take(&mut state.results);
+        self.phase = IndexLookUpPhase::TableLookUp(TableLookUpState {
+            table_task_iter: Some(builder.build_iterator(&mut ctx, results)?),
+            table_scan: None,
+        });
+
+        if ctx.warnings.warning_cnt > 0 {
+            warnings.merge(&mut ctx.warnings);
+        }
+
+        Ok(())
+    }
+
+    #[inline]
+    fn finish_table_task_iter(&mut self) -> Result<Vec<BatchExecuteResult>> {
+        let table_lookup = self.phase.mut_table_lookup_or_err()?;
+        if let Some(iter) = table_lookup.table_task_iter.take() {
+            let mut results = iter.take_left_results();
+            self.intermediate_results.append(&mut results);
+            Ok(results)
+        } else {
+            Ok(vec![])
+        }
+    }
+
+    #[inline]
+    fn step_to_index_scan(&mut self) -> Result<()> {
+        let results = self.finish_table_task_iter()?;
+        let mut index_scan = IndexScanState::default();
+        // reuses results
+        index_scan.results = results;
+        self.phase = IndexLookUpPhase::IndexScan(index_scan);
+        Ok(())
+    }
+
+    #[inline]
+    fn step_to_done_from_table_lookup(&mut self) -> Result<()> {
+        self.finish_table_task_iter()?;
+        self.phase = IndexLookUpPhase::Done;
+        Ok(())
+    }
+
+    async fn on_phase_index_scan(&mut self, scan_rows: usize) -> Result<BatchExecuteResult> {
+        if self.src_is_drained.stop() {
+            return Err(other_err!(
+                "src is already drained, cannot continue index scan"
+            ));
+        }
+
+        let state = self.phase.mut_index_scan_or_err()?;
+        let mut result = self.src.next_batch(scan_rows).await;
+        let src_drained = match result.is_drained {
+            Ok(is_drained) if is_drained.stop() => {
+                self.src_is_drained = is_drained;
+                true
+            }
+            _ => false,
+        };
+
+        let mut output_result = Self::empty_result(BatchExecIsDrain::Remain);
+        mem::swap(&mut result.is_drained, &mut output_result.is_drained);
+        if result.warnings.warning_cnt > 0 {
+            mem::swap(&mut result.warnings, &mut output_result.warnings);
+        }
+        if self.force_no_index_lookup {
+            if !result.logical_rows.is_empty() {
+                self.intermediate_results.push(result);
+            }
+            if src_drained {
+                self.phase = IndexLookUpPhase::Done;
+            }
+            return Ok(output_result);
+        }
+
+        if !result.logical_rows.is_empty() {
+            state.row_count += result.logical_rows.len();
+            state.results.push(result);
+        }
+
+        if src_drained && state.results.is_empty() {
+            self.phase = IndexLookUpPhase::Done;
+            return Ok(output_result);
+        }
+
+        if self.table_lookup_batch_size == 0 {
+            self.table_lookup_batch_size = scan_rows
+        }
+
+        if src_drained || state.row_count >= self.table_lookup_batch_size {
+            if self.table_lookup_batch_size < self.table_lookup_max_batch_size {
+                self.table_lookup_batch_size = min(
+                    self.table_lookup_batch_size * 2,
+                    self.table_lookup_max_batch_size,
+                );
+            }
+            self.step_to_table_lookup(&mut output_result.warnings)?;
+            output_result.is_drained = Ok(BatchExecIsDrain::Remain);
+        }
+
+        Ok(output_result)
+    }
+
+    async fn on_phase_table_lookup(&mut self, scan_rows: usize) -> Result<BatchExecuteResult> {
+        let state = self.phase.mut_table_lookup_or_err()?;
+        let executor = match state.table_scan.as_mut() {
+            Some(e) => e,
+            _ => {
+                let table_task_iter = state
+                    .table_task_iter
+                    .as_mut()
+                    .ok_or(other_err!("table task iter is not valid"))?;
+
+                match table_task_iter.next().await {
+                    Some(task) => {
+                        EXECUTOR_COUNT_METRICS.batch_index_lookup_table_scan.inc();
+                        state.table_scan = Some(
+                            task.build_table_scan_executor::<F>(
+                                self.config.clone(),
+                                self.table_scan_params.clone(),
+                            )?
+                            .collect_summary(0),
+                        );
+                        state.table_scan.as_mut().unwrap()
+                    }
+                    None => {
+                        if self.src_is_drained.stop() {
+                            self.step_to_done_from_table_lookup()?;
+                            return Ok(Self::empty_result(self.src_is_drained));
+                        }
+                        self.step_to_index_scan()?;
+                        return Ok(Self::empty_result(BatchExecIsDrain::Remain));
+                    }
+                }
+            }
+        };
+
+        let mut result = executor.next_batch(scan_rows).await;
+        if let Ok(is_drained) = result.is_drained {
+            if is_drained.stop() {
+                state
+                    .table_scan
+                    .as_mut()
+                    .unwrap()
+                    .summary_collector
+                    .collect(&mut self.table_scan_exec_summary);
+                state.table_scan = None;
+                result.is_drained = Ok(BatchExecIsDrain::Remain);
+            }
+        }
+        Ok(result)
+    }
+}
+
+#[async_trait]
+impl<S, Src, Builder, F> BatchExecutor for BatchIndexLookUpExecutor<S, Src, Builder, F>
+where
+    S: Storage,
+    Src: BatchExecutor<StorageStats = S::Statistics>,
+    Builder: TableTaskIterBuilder<Iterator: TableTaskIterator<Storage = S>>,
+    F: KvFormat,
+{
+    type StorageStats = Src::StorageStats;
+
+    #[inline]
+    fn schema(&self) -> &[FieldType] {
+        &self.output_schema
+    }
+
+    // TODO: A concurrent execution implementation so that the index-scan and
+    // table-lookup does not block each-other.
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        if index == self.intermediate_channel_index {
+            Ok(self.src.schema())
+        } else {
+            self.src.intermediate_schema(index)
+        }
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        match results.get_mut(self.intermediate_channel_index) {
+            Some(v) => {
+                if !self.intermediate_results.is_empty() {
+                    v.append(&mut self.intermediate_results);
+                }
+                self.src.consume_and_fill_intermediate_results(results)
+            }
+            _ => Err(other_err!(
+                "intermediate_channel_index {} exceeds the bound: {}",
+                self.intermediate_channel_index,
+                results.len()
+            )),
+        }
+    }
+
+    #[inline]
+    async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
+        if scan_rows == 0 {
+            return Self::err_result(other_err!("scan_rows cannot be 0"));
+        }
+
+        let result = match self.phase {
+            IndexLookUpPhase::IndexScan(..) => self.on_phase_index_scan(scan_rows).await,
+            IndexLookUpPhase::TableLookUp(..) => self.on_phase_table_lookup(scan_rows).await,
+            IndexLookUpPhase::Done => {
+                return Self::empty_result(self.src_is_drained);
+            }
+        };
+        result.unwrap_or_else(Self::err_result)
+    }
+
+    #[inline]
+    fn collect_exec_stats(&mut self, dest: &mut ExecuteStats) {
+        self.src.collect_exec_stats(dest);
+        // to collect the second child TableScan's stats, we need to dump the running
+        // executor's stats to `self.table_scan_exec_stats` first.
+        let mut summary = mem::take(&mut self.table_scan_exec_summary);
+        if let IndexLookUpPhase::TableLookUp(TableLookUpState {
+            table_scan: Some(exec),
+            ..
+        }) = &mut self.phase
+        {
+            exec.summary_collector.collect(&mut summary);
+        }
+        dest.summary_per_executor[self.table_scan_child_index] += summary[0];
+        // TODO: how to handle `scanned_rows_per_range`
+    }
+
+    #[inline]
+    fn collect_storage_stats(&mut self, dest: &mut Self::StorageStats) {
+        // TODO: support collecting storage stats for index lookup executors.
+        self.src.collect_storage_stats(dest)
+    }
+
+    #[inline]
+    fn take_scanned_range(&mut self) -> IntervalRange {
+        self.src.take_scanned_range()
+    }
+
+    #[inline]
+    fn can_be_cached(&self) -> bool {
+        // The index lookup executor is not cacheable because it also evolves the data
+        // from other regions except for the source region.
+        // The cop-cache mechanism is not designed to handle this case.
+        false
+    }
+}
+
+/// produce table tasks for the index lookup executor
+pub trait TableTaskIterBuilder: Send {
+    type Iterator;
+    // builds an iterator to produce table tasks
+    fn build_iterator(
+        &self,
+        ctx: &mut EvalContext,
+        results: Vec<BatchExecuteResult>,
+    ) -> Result<Self::Iterator>;
+}
+
+impl<T: TableTaskIterBuilder + ?Sized> TableTaskIterBuilder for Box<T> {
+    type Iterator = T::Iterator;
+
+    #[inline]
+    fn build_iterator(
+        &self,
+        ctx: &mut EvalContext,
+        results: Vec<BatchExecuteResult>,
+    ) -> Result<Self::Iterator> {
+        (**self).build_iterator(ctx, results)
+    }
+}
+
+pub struct AccessorTableTaskIterBuilder<Accessor, Handle>
+where
+    Accessor: RegionStorageAccessor,
+    Handle: RowHandle,
+{
+    table_id: i64,
+    accessor: Accessor,
+    index_layout: IndexLayout,
+    _phantom: std::marker::PhantomData<Handle>,
+}
+
+impl<Accessor, Handle> AccessorTableTaskIterBuilder<Accessor, Handle>
+where
+    Accessor: RegionStorageAccessor<Storage: Storage>,
+    Handle: RowHandle,
+{
+    #[inline]
+    pub fn new(table_id: i64, accessor: Accessor, index_layout: IndexLayout) -> Self {
+        AccessorTableTaskIterBuilder {
+            table_id,
+            accessor,
+            index_layout,
+            _phantom: std::marker::PhantomData,
+        }
+    }
+
+    #[inline]
+    #[cfg(test)]
+    pub fn table_id(&self) -> i64 {
+        self.table_id
+    }
+
+    #[inline]
+    #[cfg(test)]
+    pub fn get_index_layout(&self) -> &IndexLayout {
+        &self.index_layout
+    }
+}
+
+impl<Accessor, Handle> TableTaskIterBuilder for AccessorTableTaskIterBuilder<Accessor, Handle>
+where
+    Accessor: RegionStorageAccessor<Storage: Storage>,
+    Handle: RowHandle,
+{
+    type Iterator = AccessorTableTaskIterator<Accessor, Handle>;
+
+    #[inline]
+    fn build_iterator(
+        &self,
+        ctx: &mut EvalContext,
+        results: Vec<BatchExecuteResult>,
+    ) -> Result<Self::Iterator> {
+        AccessorTableTaskIterator::new(
+            self.table_id,
+            ctx,
+            self.accessor.clone(),
+            &self.index_layout,
+            results,
+        )
+    }
+}
+
+pub struct TableTask<S> {
+    storage: S,
+    key_ranges: Vec<KeyRange>,
+}
+
+impl<S: Storage> TableTask<S> {
+    pub fn build_table_scan_executor<F>(
+        self,
+        cfg: Arc<EvalConfig>,
+        TableScanParams {
+            columns_info,
+            primary_column_ids,
+            primary_prefix_column_ids,
+        }: TableScanParams,
+    ) -> Result<BatchTableScanExecutor<S, F>>
+    where
+        F: KvFormat,
+    {
+        BatchTableScanExecutor::new(
+            self.storage,
+            cfg,
+            columns_info,
+            self.key_ranges,
+            primary_column_ids,
+            // The read order is not required for the table scans in IndexLookupExecutor.
+            // Just set is_backward as false to make it easy.
+            false,
+            // The inner table scan in IndexLookupExecutor does not need to aware scan ranges,
+            // because it will be read to drain.
+            false,
+            primary_prefix_column_ids,
+        )
+    }
+}
+
+/// used for iterating table tasks
+#[async_trait]
+pub trait TableTaskIterator: Send + Sized {
+    type Storage: Storage;
+    /// returns the next table task, or None if there are no more tasks
+    async fn next(&mut self) -> Option<TableTask<Self::Storage>>;
+    /// returns the left results that are not processed by the table tasks.
+    fn take_left_results(self) -> Vec<BatchExecuteResult>;
+}
+
+pub struct AccessorTableTaskIterator<Accessor, Handle> {
+    // Physical table ID.
+    table_id: i64,
+    // Used to locate the region and the snapshot storage for each handle.
+    accessor: Accessor,
+    // All the scanned index results.
+    results: Vec<BatchExecuteResult>,
+    // The handle for each index.
+    // Layout: result_index => (logical_row_index => Handle)
+    handles: Vec<Vec<Handle>>,
+    // The handle orders in asc.
+    // Layout: order => (result_index, logical_row_index)
+    handle_orders: Vec<(usize, usize)>,
+    // The current cursor when iterating the handles to create the table task.
+    // We can use handle_orders[cursor_in_handle_orders] to get the handle position we need
+    // to process next.
+    cursor_in_handle_orders: usize,
+    // The rows that are failed to find regions.
+    // Layout: result_index => { physical_row_index => () }
+    left_rows: Vec<Option<HashSet<usize>>>,
+}
+
+impl<Accessor, Handle> AccessorTableTaskIterator<Accessor, Handle>
+where
+    Handle: RowHandle,
+    Accessor: RegionStorageAccessor,
+{
+    fn new(
+        table_id: i64,
+        ctx: &mut EvalContext,
+        accessor: Accessor,
+        index_layout: &IndexLayout,
+        mut results: Vec<BatchExecuteResult>,
+    ) -> Result<Self> {
+        let mut handles = Vec::with_capacity(results.len());
+        let mut orders = vec![];
+        for (result_index, result) in results.iter_mut().enumerate() {
+            // reserve space for the orders
+            let logical_rows_len = result.logical_rows.len();
+            if logical_rows_len > 0 {
+                orders.reserve(logical_rows_len);
+            }
+
+            for (i, &handle_offset) in index_layout.handle_offsets.iter().enumerate() {
+                let columns_len = result.physical_columns.columns_len();
+                if handle_offset >= columns_len {
+                    return Err(other_err!(
+                        "Invalid handle offset {} for result columns len: {}",
+                        handle_offset,
+                        columns_len
+                    ));
+                }
+                result.physical_columns[handle_offset].ensure_decoded(
+                    ctx,
+                    &index_layout.handle_types[i],
+                    LogicalRows::from_slice(&result.logical_rows),
+                )?
+            }
+
+            let mut result_handles = Vec::with_capacity(logical_rows_len);
+            for (logical_row_index, &physical_row_index) in result.logical_rows.iter().enumerate() {
+                let handle = Handle::from_lazy_batch_column_vec(
+                    ctx,
+                    &result.physical_columns,
+                    physical_row_index,
+                    &index_layout.handle_offsets,
+                    &index_layout.handle_types,
+                )?;
+                result_handles.push(handle);
+                orders.push((result_index, logical_row_index));
+            }
+            handles.push(result_handles);
+        }
+
+        orders.sort_by(|&a, &b| -> Ordering {
+            let h1 = &handles[a.0][a.1];
+            let h2 = &handles[b.0][b.1];
+            h1.cmp(h2)
+        });
+
+        Ok(Self {
+            table_id,
+            accessor,
+            results,
+            handles,
+            handle_orders: orders,
+            cursor_in_handle_orders: 0,
+            left_rows: vec![],
+        })
+    }
+
+    #[inline]
+    fn is_exhausted(&self) -> bool {
+        self.cursor_in_handle_orders >= self.handle_orders.len()
+    }
+
+    /// Get a tuple (result_index, logical_row_index) with the index in
+    /// `handle_orders`
+    #[inline]
+    pub fn get_row_logical_index_with_order_index(&self, order_index: usize) -> (usize, usize) {
+        self.handle_orders[order_index]
+    }
+
+    #[inline]
+    fn get_handle_with_order_index(&self, order_index: usize) -> &Handle {
+        let (result_index, logical_index) =
+            self.get_row_logical_index_with_order_index(order_index);
+        &self.handles[result_index][logical_index]
+    }
+
+    #[inline]
+    fn new_key_range(start: Vec<u8>, end: Vec<u8>) -> KeyRange {
+        let mut range = KeyRange::new();
+        range.set_start(start);
+        range.set_end(end);
+        range
+    }
+
+    #[inline]
+    fn is_key_before_region_end(key: &[u8], region_end: &[u8]) -> bool {
+        region_end.is_empty() || Key::from_raw(key).into_encoded().as_slice() < region_end
+    }
+
+    #[inline]
+    fn is_key_before_or_eq_region_end(key: &[u8], region_end: &[u8]) -> bool {
+        region_end.is_empty() || Key::from_raw(key).into_encoded().as_slice() <= region_end
+    }
+
+    async fn find_region_by_handle_index(
+        &self,
+        order_index: usize,
+    ) -> Result<
+        Either<
+            // The region is found and is valid.
+            // layout: (Region, Handle ref, point range of the handle)
+            (metapb::Region, &Handle, KeyRange),
+            // The region is not found or not valued
+            // layout: (The invalid range end, handle)
+            (Vec<u8>, &Handle),
+        >,
+    > {
+        let handle = self.get_handle_with_order_index(order_index);
+        let key = handle.encode_row_key(self.table_id);
+        let result = self
+            .accessor
+            .find_region_by_key(Key::from_raw(&key).as_encoded())
+            .await?;
+
+        let region = match result {
+            FindRegionResult::Found { region, role } => {
+                if role != StateRole::Leader {
+                    return Ok(Right((region.end_key, handle)));
+                }
+                region
+            }
+            FindRegionResult::NotFound { next_region_start } => {
+                return Ok(Right((next_region_start.unwrap_or(vec![]), handle)));
+            }
+        };
+
+        Ok(Left((
+            region,
+            handle,
+            Self::new_key_range(key, handle.encode_point_range_end(self.table_id)),
+        )))
+    }
+
+    // next_task finds the next table task
+    // The return value None does not mean there is no more task, you should use
+    // is_exhausted to determine whether the iterator is exhausted.
+    async fn next_task(&mut self) -> Option<TableTask<Accessor::Storage>> {
+        if self.is_exhausted() {
+            return None;
+        }
+
+        let mut scanned = 1usize;
+        let mut previous_handle;
+        let mut region = Option::<metapb::Region>::None;
+        let mut key_ranges = vec![];
+        let invalid_end;
+        let end_exclusive;
+        match self
+            .find_region_by_handle_index(self.cursor_in_handle_orders)
+            .await
+        {
+            Ok(Left((r, handle, key_range))) => {
+                region = Some(r);
+                previous_handle = handle;
+                key_ranges = vec![key_range];
+                end_exclusive = region.as_ref().unwrap().get_end_key();
+            }
+            Ok(Right((end, handle))) => {
+                invalid_end = end;
+                previous_handle = handle;
+                end_exclusive = invalid_end.as_slice();
+            }
+            Err(_) => {
+                // TODO: handle error
+                self.advance_orders_index(1, false);
+                return None;
+            }
+        }
+
+        for i in self.cursor_in_handle_orders + 1..self.handle_orders.len() {
+            let handle = self.get_handle_with_order_index(i);
+            let key = handle.encode_row_key(self.table_id);
+            if !Self::is_key_before_region_end(&key, end_exclusive) {
+                break;
+            }
+
+            if region.is_some() {
+                let point_range_end = handle.encode_point_range_end(self.table_id);
+                if handle.is_next_of(previous_handle) {
+                    key_ranges.last_mut().unwrap().end = point_range_end;
+                } else {
+                    key_ranges.push(Self::new_key_range(key, point_range_end));
+                }
+            }
+
+            scanned += 1;
+            previous_handle = handle;
+        }
+
+        if let Some(key_range) = key_ranges.last_mut() {
+            // The point_range_end may exceed the region end even if the key is in the
+            // region. For example, the IntHandle has a point range end of
+            // encode_row_key(v + 1), but the region end may be
+            // encode_row_key(v) + b'\0' which is before the point range end. To
+            // handle this case, just use the region end as the end of the key range to
+            // avoid error.
+            if !Self::is_key_before_or_eq_region_end(key_range.get_end(), end_exclusive) {
+                key_range.end = end_exclusive.to_vec();
+            }
+        }
+
+        let task = match region {
+            Some(region) => {
+                match self
+                    .accessor
+                    .get_local_region_storage(&region, &key_ranges)
+                    .await
+                {
+                    Ok(storage) => Some(TableTask {
+                        storage,
+                        key_ranges,
+                    }),
+                    Err(_) => {
+                        // TODO: handle error
+                        None
+                    }
+                }
+            }
+            _ => None,
+        };
+        self.advance_orders_index(scanned, task.is_some());
+        task
+    }
+
+    fn advance_orders_index(&mut self, count: usize, table_task_ok: bool) {
+        let results_len = self.results.len();
+        if count == 0 || results_len == 0 {
+            return;
+        }
+
+        if !table_task_ok {
+            if self.left_rows.is_empty() {
+                self.left_rows.resize(results_len, None);
+            }
+
+            for i in self.cursor_in_handle_orders..self.cursor_in_handle_orders + count {
+                let (result_index, logical_row_index) =
+                    self.get_row_logical_index_with_order_index(i);
+                let physical_row_index = self.results[result_index].logical_rows[logical_row_index];
+                match &mut self.left_rows[result_index] {
+                    Some(rows) => {
+                        rows.insert(physical_row_index);
+                    }
+                    None => {
+                        let mut rows = HashSet::new();
+                        rows.insert(physical_row_index);
+                        self.left_rows[result_index] = Some(rows);
+                    }
+                };
+            }
+        }
+
+        self.cursor_in_handle_orders += count;
+    }
+}
+
+#[async_trait]
+impl<Accessor, Handle> TableTaskIterator for AccessorTableTaskIterator<Accessor, Handle>
+where
+    Accessor: RegionStorageAccessor<Storage: Storage>,
+    Handle: RowHandle,
+{
+    type Storage = Accessor::Storage;
+    async fn next(&mut self) -> Option<TableTask<Self::Storage>> {
+        while !self.is_exhausted() {
+            let task = self.next_task().await;
+            if task.is_some() {
+                return task;
+            }
+        }
+        None
+    }
+
+    fn take_left_results(mut self) -> Vec<BatchExecuteResult> {
+        if self.left_rows.is_empty() {
+            return vec![];
+        }
+
+        for (result_index, left_physical_rows) in self.left_rows.iter().enumerate() {
+            match left_physical_rows {
+                Some(rows) => {
+                    self.results[result_index]
+                        .logical_rows
+                        .retain(|&physical_row| rows.contains(&physical_row));
+                }
+                None => {
+                    self.results[result_index].logical_rows = vec![];
+                }
+            }
+        }
+
+        let mut results = self.results;
+        results.retain(|r| !r.logical_rows.is_empty());
+        results
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use std::{collections::HashSet, iter};
+
+    use anyhow::anyhow;
+    use api_version::ApiV1;
+    use futures::executor::block_on;
+    use kvproto::metapb::Region;
+    use tidb_query_common::{
+        error::StorageError,
+        storage::{
+            StateRole,
+            test_fixture::{ErrorBuilder, FixtureStorage},
+        },
+    };
+    use tidb_query_datatype::{
+        Collation, FieldTypeAccessor, FieldTypeTp,
+        codec::{
+            Datum,
+            batch::{LazyBatchColumn, LazyBatchColumnVec},
+            data_type::VectorValue,
+            datum::DatumEncoder,
+            table::{IntHandle, encode_row, encode_row_key},
+        },
+        expr::{EvalContext, EvalWarnings, Flag},
+    };
+
+    use super::*;
+    use crate::{
+        interface::{BatchExecIsDrain, BatchExecuteResult},
+        util::mock_executor::{MockExecutor, MockRegionStorageAccessor, MockStorage},
+    };
+
+    const TEST_TABLE_ID: i64 = 13579;
+
+    fn get_bytes_vec_values(from: &[i64], f: impl Fn(i64) -> i64) -> VectorValue {
+        let v = from
+            .iter()
+            .map(|&x| Some(f(x).to_string().into_bytes()))
+            .collect::<Vec<_>>();
+        VectorValue::Bytes(v.into())
+    }
+
+    fn get_int_raw_column(from: &[i64]) -> LazyBatchColumn {
+        let mut ctx = EvalContext::default();
+        let mut col = LazyBatchColumn::raw_with_capacity(3);
+        for &v in from {
+            let mut datum_raw = Vec::new();
+            datum_raw
+                .write_datum(&mut ctx, &[Datum::I64(v)], false)
+                .unwrap();
+            col.mut_raw().push(&datum_raw);
+        }
+        col
+    }
+
+    fn build_index_result(
+        handles: Vec<i64>,
+        logical_rows: Vec<usize>,
+        layout: (&IndexLayout, &[FieldType]),
+    ) -> BatchExecuteResult {
+        assert_eq!(
+            layout.0.handle_types[0].get_tp(),
+            FieldTypeTp::Long.to_u8().unwrap() as i32
+        );
+        assert_eq!(layout.0.handle_offsets.len(), 1);
+        assert_eq!(layout.0.handle_types.len(), 1);
+        assert_eq!(
+            layout.0.handle_types[0],
+            layout.1[layout.0.handle_offsets[0]]
+        );
+        let mut dedup = HashSet::new();
+        for &i in logical_rows.iter() {
+            assert!(
+                i < handles.len(),
+                "index in logical_rows: {} should < {} which is the handles len",
+                i,
+                logical_rows.len()
+            );
+            assert!(!dedup.contains(&i), "{} id duplicated in logical_rows", i);
+            dedup.insert(i);
+        }
+        let mut columns = Vec::with_capacity(handles.len());
+        for (i, ft) in layout.1.iter().enumerate() {
+            match FieldTypeTp::from_i32(ft.get_tp()).unwrap() {
+                FieldTypeTp::String => {
+                    columns.push(
+                        get_bytes_vec_values(&handles, |x| x + ((i as i64 + 1) * 1000000)).into(),
+                    );
+                }
+                FieldTypeTp::Long => {
+                    // use raw column for the handle column to test the table task iterator
+                    // should ensure the column is decoded first.
+                    columns.push(get_int_raw_column(&handles));
+                }
+                _ => panic!("Unsupported field type: {:?}", ft),
+            }
+        }
+
+        BatchExecuteResult {
+            physical_columns: LazyBatchColumnVec::from(columns),
+            logical_rows,
+            is_drained: Ok(BatchExecIsDrain::Remain),
+            warnings: EvalWarnings::default(),
+        }
+    }
+
+    fn build_table_task_iter(
+        accessor: MockRegionStorageAccessor,
+        index_layout: IndexLayout,
+        results: Vec<BatchExecuteResult>,
+    ) -> AccessorTableTaskIterator<MockRegionStorageAccessor, IntHandle> {
+        AccessorTableTaskIterBuilder::<MockRegionStorageAccessor, IntHandle>::new(
+            TEST_TABLE_ID,
+            accessor,
+            index_layout,
+        )
+        .build_iterator(&mut EvalContext::default(), results)
+        .unwrap()
+    }
+
+    fn encode_cmp_key(h: i64) -> Vec<u8> {
+        Key::from_raw(&encode_row_key(TEST_TABLE_ID, h))
+            .as_encoded()
+            .to_vec()
+    }
+
+    fn encode_cmp_key_and_push(h: i64, b: u8) -> Vec<u8> {
+        let mut raw_key = encode_row_key(TEST_TABLE_ID, h);
+        raw_key.push(b);
+        Key::from_raw(&raw_key).as_encoded().to_vec()
+    }
+
+    fn make_region(id: u64, start: Vec<u8>, end: Vec<u8>) -> Region {
+        let mut region = Region::default();
+        region.set_id(id);
+        region.set_start_key(start);
+        region.set_end_key(end);
+        region
+    }
+
+    fn make_scan_key_range(start: i64, end: i64) -> KeyRange {
+        let mut range = KeyRange::default();
+        range.set_start(encode_row_key(TEST_TABLE_ID, start));
+        range.set_end(encode_row_key(TEST_TABLE_ID, end));
+        range
+    }
+
+    #[test]
+    fn test_build_table_task_iterator() {
+        let index_layout = IndexLayout {
+            handle_types: vec![FieldTypeTp::Long.into()],
+            handle_offsets: vec![1],
+        };
+
+        let index_scan_layout: (&IndexLayout, &[FieldType]) = (
+            &index_layout,
+            &[
+                FieldTypeTp::String.into(),
+                FieldTypeTp::Long.into(),
+                FieldTypeTp::String.into(),
+            ],
+        );
+
+        let iter = build_table_task_iter(
+            MockRegionStorageAccessor::with_expect_mode(),
+            index_layout.clone(),
+            vec![
+                // 5 physical rows, 4 logical rows
+                build_index_result(
+                    vec![1, 10, 100, 10000, 1000],
+                    vec![3, 2, 4, 0],
+                    index_scan_layout,
+                ),
+                // 4 physical rows, 4 logical rows
+                build_index_result(vec![102, 11, 12, 103], vec![3, 2, 1, 0], index_scan_layout),
+                // 4 physical rows, 2 logical rows
+                build_index_result(vec![13, 104, 105, 14], vec![0, 3], index_scan_layout),
+                // empty
+                build_index_result(vec![], vec![], index_scan_layout),
+            ],
+        );
+
+        assert_eq!(iter.table_id, TEST_TABLE_ID);
+        assert_eq!(iter.results.len(), 4);
+        assert_eq!(iter.cursor_in_handle_orders, 0);
+        assert!(iter.left_rows.is_empty());
+        assert_eq!(iter.results[0].logical_rows, vec![3, 2, 4, 0]);
+        assert_eq!(iter.results[1].logical_rows, vec![3, 2, 1, 0]);
+        assert_eq!(iter.results[2].logical_rows, vec![0, 3]);
+        assert!(iter.results[3].logical_rows.is_empty());
+        // Some function's return should order it by the handle value
+        // `get_row_logical_index_with_order_index` should be ordered and return the
+        // logical position
+        // `get_handle_with_order_index` should be ordered and return the handle value.
+        let mut orders = Vec::with_capacity(iter.handle_orders.len());
+        for i in 0..iter.handle_orders.len() {
+            let item = (
+                iter.get_row_logical_index_with_order_index(i),
+                iter.get_handle_with_order_index(i).clone(),
+            );
+            assert_eq!(iter.handle_orders[i], item.0);
+            orders.push(item);
+        }
+        assert_eq!(
+            orders,
+            vec![
+                ((0, 3), IntHandle::from(1)),
+                ((1, 2), IntHandle::from(11)),
+                ((1, 1), IntHandle::from(12)),
+                ((2, 0), IntHandle::from(13)),
+                ((2, 1), IntHandle::from(14)),
+                ((0, 1), IntHandle::from(100)),
+                ((1, 3), IntHandle::from(102)),
+                ((1, 0), IntHandle::from(103)),
+                ((0, 2), IntHandle::from(1000)),
+                ((0, 0), IntHandle::from(10000)),
+            ]
+        );
+    }
+
+    #[test]
+    fn test_table_task_iterator_next_task() {
+        let index_layout = IndexLayout {
+            handle_types: vec![FieldTypeTp::Long.into()],
+            handle_offsets: vec![1],
+        };
+        let index_scan_layout: (&IndexLayout, &[FieldType]) = (
+            &index_layout,
+            &[FieldTypeTp::String.into(), FieldTypeTp::Long.into()],
+        );
+
+        let mut iter = build_table_task_iter(
+            MockRegionStorageAccessor::with_expect_mode(),
+            index_layout.clone(),
+            // order: [6, 11, 12, 13, 14, 15, 19, 50, 60, 61, 63, 70, 71, 100, 101, 200, 300]
+            // 22 is mark as removed
+            vec![
+                build_index_result(vec![6], vec![0], index_scan_layout),
+                build_index_result(
+                    vec![
+                        13, 11, 50, 70, 12, 14, 60, 22, 15, 19, 61, 63, 300, 101, 100, 71, 200,
+                    ],
+                    vec![4, 6, 13, 3, 2, 12, 5, 1, 0, 16, 14, 15, 8, 10, 9, 11],
+                    index_scan_layout,
+                ),
+            ],
+        );
+        let orig_logical_rows = iter.results[1].logical_rows.clone();
+
+        // leader found, the ranges include both point range and normal range.
+        iter.accessor.assert_no_exceptions();
+        let region = make_region(1, b"".to_vec(), encode_cmp_key(13));
+        iter.accessor
+            .expect_find_region(encode_cmp_key(6), region.clone(), StateRole::Leader);
+        iter.accessor.expect_get_local_region_storage(true);
+        let task = block_on(iter.next_task()).unwrap();
+        let expected_ranges = vec![make_scan_key_range(6, 7), make_scan_key_range(11, 13)];
+        assert_eq!(task.storage, MockStorage(region, expected_ranges.clone()));
+        assert_eq!(task.key_ranges, expected_ranges);
+        assert_eq!(iter.cursor_in_handle_orders, 3);
+        assert!(iter.left_rows.is_empty());
+
+        // leader found, in this case, the key 14's point range is across the region
+        // end, like:
+        // |----------- region -----------|
+        //          |key(13) -- key(14)----- point_range_end(14)|
+        // We still need to add 14 to this region but should set the end of the key
+        // range to the region end.
+        // We get the key range: [key(13), region_end)
+        iter.accessor.assert_no_exceptions();
+        let region = make_region(2, encode_cmp_key(13), encode_cmp_key_and_push(14, 0u8));
+        iter.accessor
+            .expect_find_region(encode_cmp_key(13), region.clone(), StateRole::Leader);
+        iter.accessor.expect_get_local_region_storage(true);
+        let task = block_on(iter.next_task()).unwrap();
+        let mut expected_ranges = vec![make_scan_key_range(13, 15)];
+        // The end key of the range should be the region end because the point range end
+        // of handle 14 exceeds the region.
+        expected_ranges.last_mut().unwrap().end = region.get_end_key().to_vec();
+        assert_eq!(task.storage, MockStorage(region, expected_ranges.clone()));
+        assert_eq!(task.key_ranges, expected_ranges);
+        assert_eq!(iter.cursor_in_handle_orders, 5);
+        assert!(iter.left_rows.is_empty());
+
+        // leader found, in this case, the region start exceeds the point range
+        // end of 14 but still before point range start of 15:
+        // |------- region --------|
+        //               |key(15)----- point_range_end(15)|
+        // We need to get one range with [key(15), region_end)
+        iter.accessor.assert_no_exceptions();
+        let region = make_region(
+            3,
+            encode_cmp_key_and_push(14, 0u8),
+            encode_cmp_key_and_push(15, 0u8),
+        );
+        iter.accessor
+            .expect_find_region(encode_cmp_key(15), region.clone(), StateRole::Leader);
+        iter.accessor.expect_get_local_region_storage(true);
+        let task = block_on(iter.next_task()).unwrap();
+        let mut expected_range = make_scan_key_range(15, 16);
+        // The end key of the range should be the region end because the point range end
+        // of handle 15 exceeds the region.
+        expected_range.set_end(region.get_end_key().to_vec());
+        let expected_ranges = vec![expected_range];
+        assert_eq!(task.storage, MockStorage(region, expected_ranges.clone()));
+        assert_eq!(task.key_ranges, expected_ranges.clone());
+        assert_eq!(iter.cursor_in_handle_orders, 6);
+        assert!(iter.left_rows.is_empty());
+
+        // region found, but not leader
+        iter.accessor.assert_no_exceptions();
+        let region = make_region(4, encode_cmp_key(17), encode_cmp_key(52));
+        iter.accessor
+            .expect_find_region(encode_cmp_key(19), region.clone(), StateRole::Follower);
+        assert!(block_on(iter.next_task()).is_none());
+        assert_eq!(iter.cursor_in_handle_orders, 8);
+        // left rows should be filled with the left physical row indexes
+        assert!(iter.left_rows[0].is_none());
+        let left_rows = iter.left_rows[1].as_ref().unwrap();
+        assert_eq!(left_rows.len(), 2);
+        assert!(left_rows.contains(&9));
+        assert!(left_rows.contains(&2));
+
+        // region not found
+        iter.accessor.assert_no_exceptions();
+        iter.accessor
+            .expect_region_not_found(encode_cmp_key(60), Some(encode_cmp_key(63)));
+        assert!(block_on(iter.next_task()).is_none());
+        assert_eq!(iter.cursor_in_handle_orders, 10);
+        assert!(iter.left_rows[0].is_none());
+        let left_rows = iter.left_rows[1].as_ref().unwrap();
+        assert_eq!(left_rows.len(), 4);
+        assert!(left_rows.contains(&6));
+        assert!(left_rows.contains(&10));
+
+        // region found, but get get storage error
+        iter.accessor.assert_no_exceptions();
+        let region = make_region(5, encode_cmp_key(63), encode_cmp_key(101));
+        iter.accessor
+            .expect_find_region(encode_cmp_key(63), region, StateRole::Leader);
+        iter.accessor.expect_get_local_region_storage(false);
+        assert!(block_on(iter.next_task()).is_none());
+        assert_eq!(iter.cursor_in_handle_orders, 14);
+        assert!(iter.left_rows[0].is_none());
+        let left_rows = iter.left_rows[1].as_ref().unwrap();
+        assert_eq!(left_rows.len(), 8);
+        assert!(left_rows.contains(&11));
+        assert!(left_rows.contains(&3));
+        assert!(left_rows.contains(&15));
+        assert!(left_rows.contains(&14));
+
+        // find region error
+        iter.accessor.assert_no_exceptions();
+        iter.accessor.expect_find_region_error(encode_cmp_key(101));
+        assert!(block_on(iter.next_task()).is_none());
+        assert_eq!(iter.cursor_in_handle_orders, 15);
+        assert!(iter.left_rows[0].is_none());
+        let left_rows = iter.left_rows[1].as_ref().unwrap();
+        assert_eq!(left_rows.len(), 9);
+        assert!(left_rows.contains(&13));
+
+        // find reset regions with a region end ""
+        iter.accessor.assert_no_exceptions();
+        let region = make_region(6, encode_cmp_key(120), vec![]);
+        iter.accessor
+            .expect_find_region(encode_cmp_key(200), region.clone(), StateRole::Leader);
+        iter.accessor.expect_get_local_region_storage(true);
+        let task = block_on(iter.next_task()).unwrap();
+        let expected_ranges = vec![make_scan_key_range(200, 201), make_scan_key_range(300, 301)];
+        assert_eq!(task.storage, MockStorage(region, expected_ranges.clone()));
+        assert_eq!(task.key_ranges, expected_ranges);
+        assert_eq!(iter.cursor_in_handle_orders, 17);
+        assert!(iter.left_rows[0].is_none());
+        assert_eq!(iter.left_rows[1].as_ref().unwrap().len(), 9);
+
+        // The iterator exhausted, call seek_once again should return None
+        iter.accessor.assert_no_exceptions();
+        assert!(iter.is_exhausted());
+        assert!(block_on(iter.next_task()).is_none());
+        assert_eq!(iter.cursor_in_handle_orders, 17);
+        let left_results = iter.take_left_results();
+        assert_eq!(left_results.len(), 1);
+        let mut expected_logical_rows = orig_logical_rows.clone();
+        expected_logical_rows.retain(|&i| [9, 2, 6, 10, 11, 3, 15, 14, 13].contains(&(i)));
+        assert_eq!(left_results[0].logical_rows, expected_logical_rows);
+    }
+
+    #[test]
+    fn test_table_task_iterator_next() {
+        let index_layout = IndexLayout {
+            handle_types: vec![FieldTypeTp::Long.into()],
+            handle_offsets: vec![0],
+        };
+        let index_scan_layout: (&IndexLayout, &[FieldType]) =
+            (&index_layout, &[FieldTypeTp::Long.into()]);
+
+        let regions = vec![
+            (
+                make_region(1, encode_cmp_key(100), encode_cmp_key(200)),
+                StateRole::Leader,
+            ),
+            (
+                make_region(2, encode_cmp_key(300), encode_cmp_key(400)),
+                StateRole::Leader,
+            ),
+            (
+                make_region(3, encode_cmp_key(500), encode_cmp_key(600)),
+                StateRole::Leader,
+            ),
+            (
+                make_region(3, encode_cmp_key(700), encode_cmp_key(800)),
+                StateRole::Leader,
+            ),
+            (
+                make_region(3, encode_cmp_key(900), encode_cmp_key(1000)),
+                StateRole::Leader,
+            ),
+        ];
+
+        let handles = vec![
+            1, 2, 3, 200, 201, 202, 500, 501, 502, 600, 601, 800, 801, 1000, 1001,
+        ];
+
+        let logical_rows = (0..handles.len()).collect::<Vec<_>>();
+        let mut iter = build_table_task_iter(
+            MockRegionStorageAccessor::with_regions_data(regions.clone()),
+            index_layout.clone(),
+            vec![build_index_result(
+                handles.clone(),
+                logical_rows.clone(),
+                index_scan_layout,
+            )],
+        );
+
+        // first next returns a task
+        let task = block_on(iter.next()).unwrap();
+        let expected_ranges = vec![make_scan_key_range(500, 503)];
+        assert_eq!(
+            task.storage,
+            MockStorage(regions[2].0.clone(), expected_ranges.clone())
+        );
+        assert_eq!(task.key_ranges, expected_ranges);
+
+        // second next exhausted
+        assert!(block_on(iter.next()).is_none());
+        assert!(iter.is_exhausted());
+
+        // next when exhausted does nothing
+        assert!(block_on(iter.next()).is_none());
+        assert!(iter.is_exhausted());
+
+        // check left rows
+        let mut expected_logical_rows = logical_rows.clone();
+        expected_logical_rows.retain(|&i| handles[i] < 500 || handles[i] >= 503);
+        assert_eq!(
+            iter.take_left_results()[0].logical_rows,
+            expected_logical_rows
+        )
+    }
+
+    #[test]
+    fn test_table_task_iterator_take_left_results() {
+        let index_layout = IndexLayout {
+            handle_types: vec![FieldTypeTp::Long.into()],
+            handle_offsets: vec![0],
+        };
+        let index_scan_layout: (&IndexLayout, &[FieldType]) =
+            (&index_layout, &[FieldTypeTp::Long.into()]);
+
+        // no result left
+        let mut iter = build_table_task_iter(
+            MockRegionStorageAccessor::with_regions_data(vec![(
+                make_region(1, vec![], vec![]),
+                StateRole::Leader,
+            )]),
+            index_layout.clone(),
+            vec![
+                build_index_result((0..10).collect(), (0..10).collect(), index_scan_layout),
+                build_index_result((10..20).collect(), (0..10).collect(), index_scan_layout),
+            ],
+        );
+        assert!(block_on(iter.next()).is_some());
+        assert!(iter.is_exhausted());
+        assert!(iter.left_rows.is_empty());
+        assert!(iter.take_left_results().is_empty());
+
+        // some rows left
+        let r2 = build_index_result((10..20).collect(), (0..10).collect(), index_scan_layout);
+        let r4 = build_index_result((30..40).collect(), (0..10).collect(), index_scan_layout);
+        let mut iter = build_table_task_iter(
+            MockRegionStorageAccessor::with_regions_data(vec![
+                (
+                    make_region(1, encode_cmp_key(5), encode_cmp_key(10)),
+                    StateRole::Leader,
+                ),
+                (
+                    make_region(2, encode_cmp_key(11), vec![]),
+                    StateRole::Leader,
+                ),
+            ]),
+            index_layout.clone(),
+            vec![
+                build_index_result((0..10).collect(), (0..10).collect(), index_scan_layout),
+                r2,
+                build_index_result((20..30).collect(), (0..10).collect(), index_scan_layout),
+                r4,
+            ],
+        );
+        assert!(block_on(iter.next()).is_some());
+        assert!(block_on(iter.next()).is_some());
+        assert!(iter.is_exhausted());
+        let left_results = iter.take_left_results();
+        assert_eq!(left_results.len(), 2);
+        let r = left_results.first().unwrap();
+        assert_eq!(r.logical_rows, vec![0, 1, 2, 3, 4]);
+        let r = left_results.get(1).unwrap();
+        assert_eq!(r.logical_rows, vec![0]);
+    }
+
+    fn int_handle_table_columns(types: Vec<FieldTypeTp>, handle_index: usize) -> Vec<ColumnInfo> {
+        assert!(handle_index < types.len());
+        let mut columns = Vec::with_capacity(types.len());
+        for (i, &tp) in types.iter().enumerate() {
+            let mut ci = ColumnInfo::default();
+            if i == handle_index {
+                assert_eq!(tp, FieldTypeTp::LongLong);
+                ci.set_pk_handle(i == 0);
+            }
+            ci.as_mut_accessor().set_tp(tp);
+            ci.set_column_id(i as i64 + 1);
+            if tp == FieldTypeTp::String {
+                ci.set_flen(64);
+                ci.as_mut_accessor()
+                    .set_collation(Collation::Utf8Mb4GeneralCi);
+            }
+            columns.push(ci);
+        }
+        columns
+    }
+
+    #[test]
+    fn test_table_task_build_table_scan_executor() {
+        let columns_info =
+            int_handle_table_columns(vec![FieldTypeTp::LongLong, FieldTypeTp::Long], 0);
+        let mut ctx = EvalContext::default();
+        let storage = FixtureStorage::from(vec![
+            (
+                encode_row_key(TEST_TABLE_ID, 10),
+                encode_row(&mut ctx, vec![Datum::I64(10), Datum::I64(100)], &[1, 2]).unwrap(),
+            ),
+            (
+                encode_row_key(TEST_TABLE_ID, 11),
+                encode_row(&mut ctx, vec![Datum::I64(11), Datum::I64(101)], &[1, 2]).unwrap(),
+            ),
+            (
+                encode_row_key(TEST_TABLE_ID, 20),
+                encode_row(&mut ctx, vec![Datum::I64(20), Datum::I64(200)], &[1, 2]).unwrap(),
+            ),
+            (
+                encode_row_key(TEST_TABLE_ID, 21),
+                encode_row(&mut ctx, vec![Datum::I64(21), Datum::I64(201)], &[1, 2]).unwrap(),
+            ),
+            (
+                encode_row_key(TEST_TABLE_ID, 22),
+                encode_row(&mut ctx, vec![Datum::I64(22), Datum::I64(202)], &[1, 2]).unwrap(),
+            ),
+        ]);
+        let key_ranges = vec![make_scan_key_range(10, 11), make_scan_key_range(20, 22)];
+
+        let task = TableTask {
+            storage,
+            key_ranges,
+        };
+
+        let expected_schema = columns_info
+            .iter()
+            .map(field_type_from_column_info)
+            .collect::<Vec<_>>();
+
+        let cfg = Arc::new(EvalConfig::default_for_test());
+        let mut executor = task
+            .build_table_scan_executor::<ApiV1>(
+                cfg.clone(),
+                TableScanParams {
+                    columns_info,
+                    primary_column_ids: vec![],
+                    primary_prefix_column_ids: vec![],
+                },
+            )
+            .unwrap();
+
+        assert_eq!(executor.schema(), expected_schema);
+        let mut result = block_on(executor.next_batch(128));
+        check_batch_execute_result(
+            &mut result,
+            vec![
+                vec![Datum::I64(10), Datum::I64(20), Datum::I64(21)],
+                vec![Datum::I64(100), Datum::I64(200), Datum::I64(201)],
+            ],
+            BatchExecIsDrain::Drain,
+            0,
+        );
+    }
+
+    struct MockTableTaskIterator {
+        source_results: Vec<BatchExecuteResult>,
+        expect_next: Option<Option<TableTask<FixtureStorage>>>,
+        expect_take_left_results: Option<Vec<BatchExecuteResult>>,
+    }
+
+    impl MockTableTaskIterator {
+        fn expect_next_task_err_storage(&mut self) {
+            let key_ranges = vec![make_scan_key_range(i64::MIN, i64::MAX)];
+            let row_key = encode_row_key(TEST_TABLE_ID, 1);
+            let err_builder: ErrorBuilder =
+                Box::new(|| StorageError::from(anyhow!("mock storage error")));
+
+            self.expect_next = Some(Some(TableTask {
+                storage: FixtureStorage::new(iter::once((row_key, Err(err_builder))).collect()),
+                key_ranges,
+            }));
+        }
+
+        fn expect_next_task(
+            &mut self,
+            columns_info: Vec<ColumnInfo>,
+            columns: Vec<Vec<Datum>>,
+            key_ranges: Vec<KeyRange>,
+        ) {
+            let pk_index = columns_info
+                .iter()
+                .enumerate()
+                .find(|(_, info)| info.get_pk_handle())
+                .unwrap()
+                .0;
+            let col_ids = columns_info
+                .iter()
+                .map(|ci| ci.get_column_id())
+                .collect::<Vec<_>>();
+
+            let mut ctx = EvalContext::default();
+            let mut rows = Vec::with_capacity(columns[0].len());
+            for (i, d) in columns[pk_index].iter().enumerate() {
+                let h = d.as_int().unwrap().unwrap();
+                let key = encode_row_key(TEST_TABLE_ID, h);
+                let row_vals = columns.iter().map(|col| col[i].clone()).collect::<Vec<_>>();
+                let value = encode_row(&mut ctx, row_vals, col_ids.as_slice()).unwrap();
+                rows.push((key, value));
+            }
+
+            self.expect_next = Some(Some(TableTask {
+                storage: FixtureStorage::from(rows),
+                key_ranges,
+            }));
+        }
+
+        fn expect_next_none(&mut self) {
+            self.expect_next = Some(None);
+        }
+
+        fn expect_take_left_results(&mut self, results: Vec<BatchExecuteResult>) {
+            self.expect_take_left_results = Some(results);
+        }
+    }
+
+    #[async_trait]
+    impl TableTaskIterator for MockTableTaskIterator {
+        type Storage = FixtureStorage;
+
+        async fn next(&mut self) -> Option<TableTask<Self::Storage>> {
+            self.expect_next.take().unwrap()
+        }
+
+        fn take_left_results(self) -> Vec<BatchExecuteResult> {
+            self.expect_take_left_results.unwrap()
+        }
+    }
+
+    struct MockTableTaskIterBuilder;
+
+    impl TableTaskIterBuilder for MockTableTaskIterBuilder {
+        type Iterator = MockTableTaskIterator;
+        fn build_iterator(
+            &self,
+            ctx: &mut EvalContext,
+            results: Vec<BatchExecuteResult>,
+        ) -> Result<Self::Iterator> {
+            if ctx.cfg.flag.contains(Flag::TRUNCATE_AS_WARNING) {
+                // for testing purpose, we append a warning
+                ctx.warnings
+                    .append_warning(tidb_query_datatype::codec::Error::truncated());
+            }
+            Ok(MockTableTaskIterator {
+                source_results: results,
+                expect_next: None,
+                expect_take_left_results: None,
+            })
+        }
+    }
+
+    fn build_int_array_results(int_results: Vec<Vec<i64>>) -> Vec<BatchExecuteResult> {
+        let index_layout = IndexLayout {
+            handle_types: vec![FieldType::from(FieldTypeTp::Long)],
+            handle_offsets: vec![0],
+        };
+        let index_scan_layout: (&IndexLayout, &[FieldType]) =
+            (&index_layout, &[FieldTypeTp::Long.into()]);
+        let mut results = int_results
+            .iter()
+            .map(|row| build_index_result(row.clone(), (0..row.len()).collect(), index_scan_layout))
+            .collect::<Vec<_>>();
+
+        if let Some(r) = results.last_mut() {
+            r.is_drained = Ok(BatchExecIsDrain::Drain);
+        }
+        results
+    }
+
+    fn new_index_lookup_executor_for_test(
+        cfg: EvalConfig,
+        src_results: Vec<BatchExecuteResult>,
+        builder: Option<MockTableTaskIterBuilder>,
+        table_columns_info: Vec<ColumnInfo>,
+    ) -> BatchIndexLookUpExecutor<FixtureStorage, MockExecutor, MockTableTaskIterBuilder, ApiV1>
+    {
+        let src = MockExecutor::new(vec![FieldType::from(FieldTypeTp::Long)], src_results);
+        BatchIndexLookUpExecutor::new(
+            Arc::new(cfg),
+            src,
+            TableScanParams {
+                columns_info: table_columns_info,
+                primary_column_ids: vec![],
+                primary_prefix_column_ids: vec![],
+            },
+            builder,
+            2,
+            3,
+        )
+    }
+
+    fn check_batch_execute_result(
+        result: &mut BatchExecuteResult,
+        expected: Vec<Vec<Datum>>,
+        is_drained: BatchExecIsDrain,
+        warning_cnt: usize,
+    ) {
+        assert_eq!(*result.is_drained.as_ref().unwrap(), is_drained);
+        assert_eq!(result.warnings.warning_cnt, warning_cnt);
+        for i in 0..result.physical_columns.columns_len() {
+            let col = &mut result.physical_columns[i];
+            col.ensure_decoded(
+                &mut EvalContext::default(),
+                &FieldTypeTp::Long.into(),
+                LogicalRows::from_slice(&result.logical_rows),
+            )
+            .unwrap();
+
+            let expect = &expected[i];
+            match expect[0] {
+                Datum::I64(_) => {
+                    let expect_i64 = expect
+                        .iter()
+                        .map(|d| d.as_int().unwrap().unwrap())
+                        .collect::<Vec<_>>();
+                    let values = col
+                        .decoded()
+                        .to_int_vec()
+                        .iter()
+                        .map(|v| v.unwrap())
+                        .collect::<Vec<_>>();
+                    assert_eq!(values, expect_i64);
+                }
+                Datum::Bytes(_) => {
+                    let expect_bs = expect
+                        .iter()
+                        .map(|d| d.as_string().unwrap().unwrap().to_vec())
+                        .collect::<Vec<_>>();
+                    let values = col
+                        .decoded()
+                        .to_bytes_vec()
+                        .iter()
+                        .map(|v| v.as_ref().unwrap().to_vec())
+                        .collect::<Vec<_>>();
+                    assert_eq!(values, expect_bs);
+                }
+                _ => panic!("Unsupported datum type in expected result"),
+            }
+            assert_eq!(*result.is_drained.as_ref().unwrap(), is_drained);
+            assert_eq!(result.warnings.warning_cnt, warning_cnt);
+        }
+    }
+
+    fn check_int_column_batch_execute_result(
+        result: &mut BatchExecuteResult,
+        expected: Vec<i64>,
+        is_drained: BatchExecIsDrain,
+        warning_cnt: usize,
+    ) {
+        check_batch_execute_result(
+            result,
+            vec![expected.iter().map(|v| Datum::I64(*v)).collect::<Vec<_>>()],
+            is_drained,
+            warning_cnt,
+        );
+    }
+
+    #[test]
+    fn test_index_lookup_executor_on_index_scan_phase() {
+        fn get_index_scan_phase_batch(
+            e: &mut BatchIndexLookUpExecutor<
+                FixtureStorage,
+                MockExecutor,
+                MockTableTaskIterBuilder,
+                ApiV1,
+            >,
+        ) -> (&mut Vec<BatchExecuteResult>, usize) {
+            let index_scan = e.phase.mut_index_scan_or_err().unwrap();
+            (&mut index_scan.results, index_scan.row_count)
+        }
+
+        // Drain case, and the result is empty, enter Done directly.
+        for is_drain in [BatchExecIsDrain::Drain, BatchExecIsDrain::PagingDrain] {
+            let mut src_results = build_int_array_results(vec![vec![]]);
+            src_results[0].warnings.warning_cnt = 10;
+            src_results[0].is_drained = Ok(is_drain);
+            let mut index_lookup = new_index_lookup_executor_for_test(
+                EvalConfig::default_for_test(),
+                src_results,
+                Some(MockTableTaskIterBuilder),
+                int_handle_table_columns(vec![FieldTypeTp::LongLong, FieldTypeTp::String], 0),
+            );
+            // The first phase should be IndexScan, and it should be empty.
+            let index_scan = index_lookup.phase.mut_index_scan_or_err().unwrap();
+            assert_eq!(index_scan.row_count, 0);
+            assert!(index_scan.results.is_empty());
+            let mut r = block_on(index_lookup.next_batch(128));
+            check_int_column_batch_execute_result(&mut r, vec![], is_drain, 10);
+            match index_lookup.phase {
+                IndexLookUpPhase::Done => {
+                    // next_batch when Done phase.
+                    // should return an empty result with the is_drain.
+                    let r = block_on(index_lookup.next_batch(128));
+                    assert!(r.logical_rows.is_empty());
+                    assert_eq!(r.is_drained.unwrap(), is_drain);
+                }
+                _ => {
+                    panic!("expect phase to be Done");
+                }
+            }
+        }
+
+        let mut src_results = build_int_array_results(vec![
+            // index 0, empty result, warning_cnt: 1
+            vec![],
+            // index 1, result with 5 rows, warning_cnt: 2
+            vec![1, 3, 5, 7, 9],
+            // index 2, result with 2 rows
+            vec![10, 11],
+            // index 3, error case
+            vec![],
+            // index 4, trigger batch full
+            vec![100],
+            // index 5, 6 continues to add results
+            vec![1000, 1001],
+            vec![2000],
+            // index 7, drain case
+            vec![],
+        ]);
+        src_results[0].warnings.warning_cnt = 1;
+        src_results[1].warnings.warning_cnt = 2;
+        src_results[3].is_drained = Err(other_err!("mock error"));
+
+        let mut cfg = EvalConfig::default_for_test();
+        // set TRUNCATE_AS_WARNING to test warning when build table task iterator
+        cfg.flag.set(Flag::TRUNCATE_AS_WARNING, true);
+        let mut index_lookup = new_index_lookup_executor_for_test(
+            cfg,
+            src_results,
+            Some(MockTableTaskIterBuilder),
+            int_handle_table_columns(vec![FieldTypeTp::LongLong, FieldTypeTp::String], 0),
+        );
+
+        // scan_rows == 0 not allowed
+        let err = block_on(index_lookup.next_batch(0)).is_drained.unwrap_err();
+        assert!(err.to_string().contains("scan_rows cannot be 0"));
+
+        // The first phase should be IndexScan, and it should be empty.
+        let index_state = index_lookup.phase.mut_index_scan_or_err().unwrap();
+        assert_eq!(index_state.row_count, 0);
+        assert!(index_state.results.is_empty());
+        assert_eq!(index_lookup.table_lookup_batch_size, 0);
+
+        // if the result is empty, it should be return an empty result with the warnings
+        // without adding the result to the batch.
+        let mut r = block_on(index_lookup.next_batch(128));
+        check_int_column_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Remain, 1);
+        let (batch, batch_cnt) = get_index_scan_phase_batch(&mut index_lookup);
+        assert!(batch.is_empty());
+        assert_eq!(batch_cnt, 0);
+
+        // the first result will set the batch size as the first scan rows
+        assert_eq!(index_lookup.table_lookup_batch_size, 128);
+        assert_eq!(index_lookup.table_lookup_max_batch_size, BATCH_MAX_SIZE);
+
+        // if the result contains some rows, it should be added to the batch.
+        let mut r = block_on(index_lookup.next_batch(128));
+        check_int_column_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Remain, 2);
+        let (batch, batch_cnt) = get_index_scan_phase_batch(&mut index_lookup);
+        assert_eq!(batch.len(), 1);
+        assert_eq!(batch_cnt, 5);
+        check_int_column_batch_execute_result(
+            &mut batch[0],
+            vec![1, 3, 5, 7, 9],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+
+        // another result
+        let mut r = block_on(index_lookup.next_batch(128));
+        check_int_column_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Remain, 0);
+        let (batch, batch_cnt) = get_index_scan_phase_batch(&mut index_lookup);
+        assert_eq!(batch.len(), 2);
+        assert_eq!(batch_cnt, 7);
+        check_int_column_batch_execute_result(
+            &mut batch[1],
+            vec![10, 11],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+
+        // error case, should output an error
+        let r = block_on(index_lookup.next_batch(128));
+        let err = r.is_drained.unwrap_err();
+        assert!(err.to_string().contains("mock error"));
+        let (batch, batch_cnt) = get_index_scan_phase_batch(&mut index_lookup);
+        assert_eq!(batch.len(), 2);
+        assert_eq!(batch_cnt, 7);
+
+        // if lookup phase not triggered, the index_lookup_batch_size should not change
+        assert_eq!(index_lookup.table_lookup_batch_size, 128);
+
+        // trigger batch full, step to TableLookup phase
+        index_lookup.table_lookup_batch_size = batch_cnt;
+        let mut r = block_on(index_lookup.next_batch(128));
+        // the mock MockTableTaskIterBuilder::build_iterator will produce 1 test warn.
+        check_int_column_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Remain, 1);
+        let table_lookup = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        assert!(table_lookup.table_scan.is_none());
+        let batch = &mut table_lookup
+            .table_task_iter
+            .as_mut()
+            .unwrap()
+            .source_results;
+        assert_eq!(batch.len(), 3);
+        check_int_column_batch_execute_result(
+            &mut batch[2],
+            vec![100],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+
+        // index_lookup_batch_size should grow after lookup phase not triggered
+        let batch_size = batch_cnt * 2;
+        assert_eq!(index_lookup.table_lookup_batch_size, batch_size);
+
+        // set index_lookup.table_lookup_batch_max_size to a small value to test growing
+        let max_batch_size = batch_size + 2;
+        assert!(max_batch_size < batch_size * 2);
+        index_lookup.table_lookup_max_batch_size = max_batch_size;
+
+        // go back to IndexLookUp and add more results
+        index_lookup.phase = IndexLookUpPhase::IndexScan(IndexScanState::default());
+        assert_eq!(index_lookup.src_is_drained, BatchExecIsDrain::Remain);
+        let mut r = block_on(index_lookup.next_batch(128));
+        check_int_column_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Remain, 0);
+        r = block_on(index_lookup.next_batch(128));
+        check_int_column_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Remain, 0);
+        let (batch, batch_cnt) = get_index_scan_phase_batch(&mut index_lookup);
+        assert_eq!(batch.len(), 2);
+        assert_eq!(batch_cnt, 3);
+        check_int_column_batch_execute_result(
+            &mut batch[0],
+            vec![1000, 1001],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        check_int_column_batch_execute_result(
+            &mut batch[1],
+            vec![2000],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+
+        // should enter TableLookup phase because src is drained
+        assert_eq!(index_lookup.src_is_drained, BatchExecIsDrain::Remain);
+        let mut r = block_on(index_lookup.next_batch(128));
+        check_int_column_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Remain, 1);
+        let table_lookup = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        assert!(table_lookup.table_scan.is_none());
+        let batch = &mut table_lookup
+            .table_task_iter
+            .as_mut()
+            .unwrap()
+            .source_results;
+        assert_eq!(batch.len(), 2);
+        check_int_column_batch_execute_result(
+            &mut batch[0],
+            vec![1000, 1001],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        check_int_column_batch_execute_result(
+            &mut batch[1],
+            vec![2000],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        assert_eq!(index_lookup.src_is_drained, BatchExecIsDrain::Drain);
+
+        // the index_lookup_batch_size should grow to the max value
+        assert_eq!(index_lookup.table_lookup_batch_size, max_batch_size);
+
+        // PagingDrain should also trigger the TableLookup phase
+        let mut src_results = build_int_array_results(vec![vec![99, 101]]);
+        src_results[0].is_drained = Ok(BatchExecIsDrain::PagingDrain);
+        let mut index_lookup = new_index_lookup_executor_for_test(
+            EvalConfig::default_for_test(),
+            src_results,
+            Some(MockTableTaskIterBuilder),
+            int_handle_table_columns(vec![FieldTypeTp::LongLong, FieldTypeTp::String], 0),
+        );
+        let mut r = block_on(index_lookup.next_batch(128));
+        check_int_column_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Remain, 0);
+        let table_lookup = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        assert!(table_lookup.table_scan.is_none());
+        let batch = &mut table_lookup
+            .table_task_iter
+            .as_mut()
+            .unwrap()
+            .source_results;
+        assert_eq!(batch.len(), 1);
+        check_int_column_batch_execute_result(
+            &mut batch[0],
+            vec![99, 101],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        assert_eq!(index_lookup.src_is_drained, BatchExecIsDrain::PagingDrain);
+    }
+
+    #[test]
+    fn test_index_lookup_executor_on_table_lookup_phase() {
+        let src_results = build_int_array_results(vec![vec![1, 2, 3, 4], vec![2]]);
+        let columns = int_handle_table_columns(vec![FieldTypeTp::LongLong], 0);
+        let mut index_lookup = new_index_lookup_executor_for_test(
+            EvalConfig::default_for_test(),
+            src_results,
+            Some(MockTableTaskIterBuilder),
+            columns.clone(),
+        );
+
+        // make sure the index lookup executor is in TableLookup phase
+        index_lookup.table_lookup_batch_size = 2;
+        block_on(index_lookup.next_batch(4)).is_drained.unwrap();
+        assert_eq!(index_lookup.src_is_drained, BatchExecIsDrain::Remain);
+        let state = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        assert!(state.table_scan.is_none());
+
+        let full_ranges = vec![make_scan_key_range(i64::MIN, i64::MAX)];
+        // When TableScan executor is none, build executor first and then call
+        // next_batch
+        assert!(state.table_scan.is_none());
+        let iter = state.table_task_iter.as_mut().unwrap();
+        iter.expect_next_task(
+            columns.clone(),
+            vec![vec![
+                Datum::I64(1),
+                Datum::I64(2),
+                Datum::I64(3),
+                Datum::I64(4),
+                Datum::I64(5),
+            ]],
+            full_ranges.clone(),
+        );
+        let mut r = block_on(index_lookup.next_batch(2));
+        check_batch_execute_result(
+            &mut r,
+            vec![vec![Datum::I64(1), Datum::I64(2)]],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        let state = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        assert!(state.table_scan.is_some());
+
+        // After TableScan executor is created, next_batch will continue return
+        // the result from the iterator.
+        let mut r = block_on(index_lookup.next_batch(2));
+        check_batch_execute_result(
+            &mut r,
+            vec![vec![Datum::I64(3), Datum::I64(4)]],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        let state = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        assert!(state.table_scan.is_some());
+
+        // After TableScan drained, the executor should be released and the
+        // return result.is_drained should not stop because the task
+        // iterator is still not drained.
+        let mut r = block_on(index_lookup.next_batch(2));
+        check_batch_execute_result(
+            &mut r,
+            vec![vec![Datum::I64(5)]],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        let state = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        assert!(state.table_scan.is_none());
+
+        // the next task, the table scan executor is drained after the first
+        // next_batch.
+        let state = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        let iter = state.table_task_iter.as_mut().unwrap();
+        iter.expect_next_task(
+            columns.clone(),
+            vec![vec![Datum::I64(10)]],
+            full_ranges.clone(),
+        );
+        let mut r = block_on(index_lookup.next_batch(2));
+        check_batch_execute_result(
+            &mut r,
+            vec![vec![Datum::I64(10)]],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        let state = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        assert!(state.table_scan.is_none());
+
+        // iter exhausted
+        let index_layout = IndexLayout {
+            handle_types: vec![FieldTypeTp::Long.into()],
+            handle_offsets: vec![0],
+        };
+        let index_scan_layout: (&IndexLayout, &[FieldType]) =
+            (&index_layout, &[FieldTypeTp::Long.into()]);
+        let state = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        let iter = state.table_task_iter.as_mut().unwrap();
+        iter.expect_next_none();
+        iter.expect_take_left_results(vec![
+            build_index_result(vec![7, 8], vec![0, 1], index_scan_layout),
+            build_index_result(vec![3, 4], vec![0, 1], index_scan_layout),
+        ]);
+        assert!(index_lookup.intermediate_results.is_empty());
+        let r = block_on(index_lookup.next_batch(2));
+        assert_eq!(r.is_drained.unwrap(), BatchExecIsDrain::Remain);
+        assert_eq!(index_lookup.intermediate_results.len(), 2);
+        check_batch_execute_result(
+            &mut index_lookup.intermediate_results[0],
+            vec![vec![Datum::I64(7), Datum::I64(8)]],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        check_batch_execute_result(
+            &mut index_lookup.intermediate_results[1],
+            vec![vec![Datum::I64(3), Datum::I64(4)]],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+
+        // continue to next batch
+        let index_scan = index_lookup.phase.mut_index_scan_or_err().unwrap();
+        assert_eq!(index_scan.results.capacity(), 2); // reuse results vec
+        assert_eq!(index_scan.row_count, 0);
+        let r = block_on(index_lookup.next_batch(2));
+        assert_eq!(r.is_drained.unwrap(), BatchExecIsDrain::Remain);
+        assert_eq!(index_lookup.src_is_drained, BatchExecIsDrain::Drain);
+        let state = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        let iter = state.table_task_iter.as_mut().unwrap();
+        iter.expect_next_none();
+        iter.expect_take_left_results(vec![build_index_result(
+            vec![200, 300],
+            vec![0, 1],
+            index_scan_layout,
+        )]);
+        let mut r = block_on(index_lookup.next_batch(2));
+        check_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Drain, 0);
+        assert!(matches!(index_lookup.phase, IndexLookUpPhase::Done));
+        assert_eq!(index_lookup.intermediate_results.len(), 3);
+        check_batch_execute_result(
+            &mut index_lookup.intermediate_results[2],
+            vec![vec![Datum::I64(200), Datum::I64(300)]],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+
+        // test iter exhausted when PageDrain
+        let mut src_results = build_int_array_results(vec![vec![1]]);
+        src_results[0].is_drained = Ok(BatchExecIsDrain::PagingDrain);
+        let mut index_lookup = new_index_lookup_executor_for_test(
+            EvalConfig::default_for_test(),
+            src_results,
+            Some(MockTableTaskIterBuilder),
+            columns.clone(),
+        );
+        let r = block_on(index_lookup.next_batch(128)).is_drained.unwrap();
+        assert_eq!(r, BatchExecIsDrain::Remain);
+        assert_eq!(index_lookup.src_is_drained, BatchExecIsDrain::PagingDrain);
+        let state = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        let iter = state.table_task_iter.as_mut().unwrap();
+        assert!(state.table_scan.is_none());
+        iter.expect_next_none();
+        iter.expect_take_left_results(vec![build_index_result(
+            vec![100, 101],
+            vec![0, 1],
+            index_scan_layout,
+        )]);
+        let mut r = block_on(index_lookup.next_batch(2));
+        check_batch_execute_result(&mut r, vec![], BatchExecIsDrain::PagingDrain, 0);
+        assert!(matches!(index_lookup.phase, IndexLookUpPhase::Done));
+        assert_eq!(index_lookup.intermediate_results.len(), 1);
+        check_batch_execute_result(
+            &mut index_lookup.intermediate_results[0],
+            vec![vec![Datum::I64(100), Datum::I64(101)]],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+
+        // error case
+        let src_results = build_int_array_results(vec![vec![1]]);
+        let mut index_lookup = new_index_lookup_executor_for_test(
+            EvalConfig::default_for_test(),
+            src_results,
+            Some(MockTableTaskIterBuilder),
+            columns.clone(),
+        );
+        block_on(index_lookup.next_batch(128)).is_drained.unwrap();
+        let state = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        let iter = state.table_task_iter.as_mut().unwrap();
+        iter.expect_next_task_err_storage();
+        let r = block_on(index_lookup.next_batch(2));
+        assert!(
+            r.is_drained
+                .unwrap_err()
+                .to_string()
+                .contains("mock storage error")
+        );
+    }
+
+    #[test]
+    fn test_force_no_lookup() {
+        let columns = int_handle_table_columns(vec![FieldTypeTp::LongLong], 0);
+        // default should not enable force_no_index_lookup
+        let index_lookup = new_index_lookup_executor_for_test(
+            EvalConfig::default_for_test(),
+            build_int_array_results(vec![vec![1]]),
+            Some(MockTableTaskIterBuilder),
+            columns.clone(),
+        );
+        assert!(!index_lookup.force_no_index_lookup);
+
+        // does not support paging currently
+        let mut cfg = EvalConfig::default_for_test();
+        cfg.paging_size = Some(128);
+        let index_lookup = new_index_lookup_executor_for_test(
+            cfg,
+            build_int_array_results(vec![vec![1]]),
+            Some(MockTableTaskIterBuilder),
+            columns.clone(),
+        );
+        assert!(index_lookup.force_no_index_lookup);
+
+        // When table task builder is not provided, disable index lookup
+        let mut results = build_int_array_results(vec![vec![123, 456], vec![], vec![789]]);
+        results[1].is_drained = Err(other_err!("mock error"));
+        let mut index_lookup = new_index_lookup_executor_for_test(
+            EvalConfig::default_for_test(),
+            results,
+            None,
+            columns.clone(),
+        );
+        assert!(index_lookup.force_no_index_lookup);
+
+        // when force_no_index_lookup the results should into intermediate_results
+        // directly
+        let mut r = block_on(index_lookup.next_batch(128));
+        check_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Remain, 0);
+        let r = block_on(index_lookup.next_batch(128));
+        assert!(r.is_drained.unwrap_err().to_string().contains("mock error"));
+        let mut r = block_on(index_lookup.next_batch(128));
+        check_batch_execute_result(&mut r, vec![], BatchExecIsDrain::Drain, 0);
+        assert_eq!(index_lookup.intermediate_results.len(), 2);
+        check_batch_execute_result(
+            &mut index_lookup.intermediate_results[0],
+            vec![vec![Datum::I64(123), Datum::I64(456)]],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        check_batch_execute_result(
+            &mut index_lookup.intermediate_results[1],
+            vec![vec![Datum::I64(789)]],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+    }
+
+    #[test]
+    fn test_consume_and_fill_intermediate_results() {
+        let mut index_lookup = new_index_lookup_executor_for_test(
+            EvalConfig::default_for_test(),
+            build_int_array_results(vec![vec![]]),
+            None,
+            int_handle_table_columns(vec![FieldTypeTp::LongLong], 0),
+        );
+
+        assert_eq!(index_lookup.intermediate_channel_index, 2);
+        assert!(index_lookup.intermediate_results.is_empty());
+
+        index_lookup.intermediate_results = build_int_array_results(vec![vec![1, 2], vec![3]]);
+
+        // when the channel len does not match, return error
+        let err = index_lookup
+            .consume_and_fill_intermediate_results(&mut [vec![], vec![]])
+            .unwrap_err();
+        assert!(err.to_string().contains("exceeds the bound"));
+
+        // take results successfully
+        let mut channels = iter::repeat_with(Vec::new).take(4).collect::<Vec<_>>();
+        index_lookup
+            .consume_and_fill_intermediate_results(&mut channels)
+            .unwrap();
+        assert!(index_lookup.intermediate_results.is_empty());
+        assert!(channels[0].is_empty());
+        assert!(channels[1].is_empty());
+        assert!(channels[3].is_empty());
+        let results = &mut channels[2];
+        assert_eq!(results.len(), 2);
+        check_int_column_batch_execute_result(
+            &mut results[0],
+            vec![1, 2],
+            BatchExecIsDrain::Remain,
+            0,
+        );
+        check_int_column_batch_execute_result(&mut results[1], vec![3], BatchExecIsDrain::Drain, 0);
+
+        // take results should append to existing results
+        index_lookup.intermediate_results = build_int_array_results(vec![vec![7, 4]]);
+        index_lookup
+            .consume_and_fill_intermediate_results(&mut channels)
+            .unwrap();
+        assert!(index_lookup.intermediate_results.is_empty());
+        assert!(channels[0].is_empty());
+        assert!(channels[1].is_empty());
+        assert!(channels[3].is_empty());
+        let results = &mut channels[2];
+        assert_eq!(results.len(), 3);
+        check_int_column_batch_execute_result(
+            &mut results[2],
+            vec![7, 4],
+            BatchExecIsDrain::Drain,
+            0,
+        );
+
+        // take results should also take the child executor's intermediate
+        // results
+        index_lookup.src.intermediate_schema = Some((1, vec![FieldType::from(FieldTypeTp::Long)]));
+        index_lookup
+            .src
+            .set_next_intermediate_results(build_int_array_results(vec![vec![100]]));
+        index_lookup
+            .consume_and_fill_intermediate_results(&mut channels)
+            .unwrap();
+        assert!(channels[0].is_empty());
+        assert!(channels[3].is_empty());
+        assert_eq!(channels[2].len(), 3);
+        assert_eq!(channels[1].len(), 1);
+        let results = &mut channels[1];
+        assert_eq!(results.len(), 1);
+        check_int_column_batch_execute_result(
+            &mut results[0],
+            vec![100],
+            BatchExecIsDrain::Drain,
+            0,
+        );
+
+        index_lookup.intermediate_results = build_int_array_results(vec![vec![300]]);
+        index_lookup
+            .src
+            .set_next_intermediate_results(build_int_array_results(vec![vec![200]]));
+        index_lookup
+            .consume_and_fill_intermediate_results(&mut channels)
+            .unwrap();
+        assert!(channels[0].is_empty());
+        assert!(channels[3].is_empty());
+        let results = &mut channels[2];
+        assert_eq!(results.len(), 4);
+        check_int_column_batch_execute_result(
+            &mut results[3],
+            vec![300],
+            BatchExecIsDrain::Drain,
+            0,
+        );
+        let results = &mut channels[1];
+        assert_eq!(results.len(), 2);
+        check_int_column_batch_execute_result(
+            &mut results[1],
+            vec![200],
+            BatchExecIsDrain::Drain,
+            0,
+        );
+    }
+
+    #[test]
+    fn test_intermediate_schema() {
+        let mut index_lookup = new_index_lookup_executor_for_test(
+            EvalConfig::default_for_test(),
+            build_int_array_results(vec![vec![]]),
+            None,
+            int_handle_table_columns(vec![FieldTypeTp::LongLong], 0),
+        );
+
+        let schema1 = vec![
+            FieldType::from(FieldTypeTp::Long),
+            FieldType::from(FieldTypeTp::VarChar),
+        ];
+        let schema2 = vec![FieldType::from(FieldTypeTp::Long)];
+
+        assert_eq!(index_lookup.intermediate_channel_index, 2);
+        index_lookup.src.schema = schema1.clone();
+        index_lookup.src.intermediate_schema = Some((1, schema2.clone()));
+
+        // test missing intermediate schema
+        assert!(
+            index_lookup
+                .intermediate_schema(0)
+                .unwrap_err()
+                .to_string()
+                .contains("no intermediate schema for index")
+        );
+
+        // test index lookup's intermediate schema
+        assert_eq!(schema1, index_lookup.intermediate_schema(2).unwrap());
+
+        // test index lookup's child's intermediate schema
+        assert_eq!(schema2, index_lookup.intermediate_schema(1).unwrap());
+    }
+
+    #[test]
+    fn test_collect_table_scan_summary() {
+        let columns = int_handle_table_columns(vec![FieldTypeTp::LongLong], 0);
+        let src_results = build_int_array_results(vec![vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]);
+        let mut index_lookup = new_index_lookup_executor_for_test(
+            EvalConfig::default_for_test(),
+            src_results,
+            Some(MockTableTaskIterBuilder),
+            int_handle_table_columns(vec![FieldTypeTp::LongLong, FieldTypeTp::String], 0),
+        );
+
+        // Test the below case
+        // 1. run next_batch to trigger table scan phase
+        // 2. table scan phase loops twice, the first time exhausts the first task,
+        // and the second time consumes 3 rows without exhausting the second task.
+        // 3. collect the summary info
+        assert_eq!(
+            BatchExecIsDrain::Remain,
+            block_on(index_lookup.next_batch(128)).is_drained.unwrap()
+        );
+        let s = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        s.table_task_iter.as_mut().unwrap().expect_next_task(
+            columns.clone(),
+            vec![vec![
+                Datum::I64(1),
+                Datum::I64(2),
+                Datum::I64(3),
+                Datum::I64(4),
+                Datum::I64(5),
+            ]],
+            vec![make_scan_key_range(i64::MIN, i64::MAX)],
+        );
+        assert_eq!(
+            BatchExecIsDrain::Remain,
+            block_on(index_lookup.next_batch(128)).is_drained.unwrap()
+        );
+        let s = index_lookup.phase.mut_table_lookup_or_err().unwrap();
+        s.table_task_iter.as_mut().unwrap().expect_next_task(
+            columns.clone(),
+            vec![vec![
+                Datum::I64(6),
+                Datum::I64(7),
+                Datum::I64(8),
+                Datum::I64(9),
+                Datum::I64(10),
+            ]],
+            vec![make_scan_key_range(i64::MIN, i64::MAX)],
+        );
+        assert_eq!(
+            BatchExecIsDrain::Remain,
+            block_on(index_lookup.next_batch(2)).is_drained.unwrap()
+        );
+
+        // check summary
+        let mut stats = ExecuteStats::new(index_lookup.table_scan_child_index + 2);
+        index_lookup.collect_exec_stats(&mut stats);
+        let summary = stats.summary_per_executor[index_lookup.table_scan_child_index];
+        assert_eq!(7, summary.num_produced_rows);
+        assert_eq!(2, summary.num_iterations);
+    }
+}
diff --git a/components/tidb_query_executors/src/index_scan_executor.rs b/components/tidb_query_executors/src/index_scan_executor.rs
index 97b7971196f..ad2c20bf1ca 100644
--- a/components/tidb_query_executors/src/index_scan_executor.rs
+++ b/components/tidb_query_executors/src/index_scan_executor.rs
@@ -2,31 +2,31 @@
 
 use std::sync::Arc;
 
+use DecodeHandleStrategy::*;
 use api_version::{ApiV1, KvFormat};
 use async_trait::async_trait;
 use codec::{number::NumberCodec, prelude::NumberDecoder};
 use itertools::izip;
 use kvproto::coprocessor::KeyRange;
 use tidb_query_common::{
-    storage::{IntervalRange, Storage},
     Result,
+    storage::{IntervalRange, Storage},
 };
 use tidb_query_datatype::{
+    EvalType, FieldTypeAccessor,
     codec::{
+        Datum,
         batch::{LazyBatchColumn, LazyBatchColumnVec},
         collation::collator::PADDING_SPACE,
         datum,
         datum::DatumDecoder,
-        row::v2::{decode_v2_u64, RowSlice, V1CompatibleEncoder},
+        row::v2::{RowSlice, V1CompatibleEncoder, decode_v2_u64},
         table,
-        table::{check_index_key, INDEX_VALUE_VERSION_FLAG, MAX_OLD_ENCODED_VALUE_LEN},
-        Datum,
+        table::{INDEX_VALUE_VERSION_FLAG, MAX_OLD_ENCODED_VALUE_LEN, check_index_key},
     },
     expr::{EvalConfig, EvalContext},
-    EvalType, FieldTypeAccessor,
 };
 use tipb::{ColumnInfo, FieldType, IndexScan};
-use DecodeHandleStrategy::*;
 
 use super::util::scan_executor::*;
 use crate::interface::*;
@@ -93,7 +93,7 @@ impl<S: Storage, F: KvFormat> BatchIndexScanExecutor<S, F> {
             });
         let is_int_handle = columns_info
             .get(columns_info.len() - 1 - pid_column_cnt - physical_table_id_column_cnt)
-            .map_or(false, |ci| ci.get_pk_handle());
+            .is_some_and(|ci| ci.get_pk_handle());
         let is_common_handle = primary_column_ids_len > 0;
         let (decode_handle_strategy, handle_column_cnt) = match (is_int_handle, is_common_handle) {
             (false, false) => (NoDecode, 0),
@@ -165,6 +165,19 @@ impl<S: Storage, F: KvFormat> BatchExecutor for BatchIndexScanExecutor<S, F> {
         self.0.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.0.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.0.consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         self.0.next_batch(scan_rows).await
@@ -557,7 +570,7 @@ impl IndexScanExecutorImpl {
                 truncate_str
                     .iter()
                     .cloned()
-                    .chain(std::iter::repeat(PADDING_SPACE as _).take(space_num as _))
+                    .chain(std::iter::repeat_n(PADDING_SPACE as _, space_num as _))
                     .collect::<Vec<_>>()
             } else {
                 let original_data = row
@@ -850,7 +863,7 @@ impl IndexScanExecutorImpl {
     fn split_common_handle(value: &[u8]) -> Result<(&[u8], &[u8])> {
         if value
             .first()
-            .map_or(false, |c| *c == table::INDEX_VALUE_COMMON_HANDLE_FLAG)
+            .is_some_and(|c| *c == table::INDEX_VALUE_COMMON_HANDLE_FLAG)
         {
             let handle_len = (&value[1..]).read_u16().map_err(|_| {
                 other_err!(
@@ -872,7 +885,7 @@ impl IndexScanExecutorImpl {
     fn split_partition_id(value: &[u8]) -> Result<(&[u8], &[u8])> {
         if value
             .first()
-            .map_or(false, |c| *c == table::INDEX_VALUE_PARTITION_ID_FLAG)
+            .is_some_and(|c| *c == table::INDEX_VALUE_PARTITION_ID_FLAG)
         {
             if value.len() < 9 {
                 return Err(other_err!(
@@ -891,7 +904,7 @@ impl IndexScanExecutorImpl {
         Ok(
             if value
                 .first()
-                .map_or(false, |c| *c == table::INDEX_VALUE_RESTORED_DATA_FLAG)
+                .is_some_and(|c| *c == table::INDEX_VALUE_RESTORED_DATA_FLAG)
             {
                 (value, &value[value.len()..])
             } else {
@@ -910,14 +923,15 @@ mod tests {
     use kvproto::coprocessor::KeyRange;
     use tidb_query_common::{storage::test_fixture::FixtureStorage, util::convert_to_prefix_next};
     use tidb_query_datatype::{
+        Collation, FieldTypeAccessor, FieldTypeTp,
         codec::{
+            Datum,
             data_type::*,
             datum,
             row::v2::encoder_for_test::{Column, RowEncoder},
-            table, Datum,
+            table,
         },
         expr::EvalConfig,
-        Collation, FieldTypeAccessor, FieldTypeTp,
     };
     use tipb::ColumnInfo;
 
diff --git a/components/tidb_query_executors/src/interface.rs b/components/tidb_query_executors/src/interface.rs
index 352fbab4720..b69316a7df2 100644
--- a/components/tidb_query_executors/src/interface.rs
+++ b/components/tidb_query_executors/src/interface.rs
@@ -6,15 +6,30 @@
 //! Batch executor common structures.
 
 use async_trait::async_trait;
-pub use tidb_query_common::execute_stats::{
-    ExecSummaryCollector, ExecuteStats, WithSummaryCollector,
-};
+pub use tidb_query_common::execute_stats::{ExecSummaryCollector, ExecuteStats};
 use tidb_query_common::{
-    execute_stats::ExecSummaryCollectorEnabled, storage::IntervalRange, Result,
+    Result, execute_stats::ExecSummaryCollectorEnabled, storage::IntervalRange,
 };
 use tidb_query_datatype::{codec::batch::LazyBatchColumnVec, expr::EvalWarnings};
 use tipb::FieldType;
 
+/// Combines an `ExecSummaryCollector` with another type. This inner type `T`
+/// typically `Executor`/`BatchExecutor`, such that `WithSummaryCollector<C, T>`
+/// would implement the same trait and collects the statistics into `C`.
+pub struct WithSummaryCollector<C: ExecSummaryCollector, T> {
+    pub summary_collector: C,
+    pub inner: T,
+    #[cfg(test)]
+    pub inner_type: &'static str,
+}
+
+impl<C: ExecSummaryCollector, T> WithSummaryCollector<C, T> {
+    #[cfg(test)]
+    pub fn into_inner(self) -> T {
+        self.inner
+    }
+}
+
 /// The interface for pull-based executors. It is similar to the Volcano
 /// Iterator model, but pulls data in batch and stores data by column.
 #[async_trait]
@@ -24,6 +39,15 @@ pub trait BatchExecutor: Send {
     /// Gets the schema of the output.
     fn schema(&self) -> &[FieldType];
 
+    /// Gets the schema of intermediate result
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]>;
+
+    /// Consumes the inner intermediate results and fills the arguments vector.
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()>;
+
     /// Pulls next several rows of data (stored by column).
     ///
     /// This function might return zero rows, which doesn't mean that there is
@@ -66,6 +90,8 @@ pub trait BatchExecutor: Send {
         WithSummaryCollector {
             summary_collector: ExecSummaryCollectorEnabled::new(output_index),
             inner: self,
+            #[cfg(test)]
+            inner_type: std::any::type_name::<Self>(),
         }
     }
 }
@@ -78,6 +104,19 @@ impl<T: BatchExecutor + ?Sized> BatchExecutor for Box<T> {
         (**self).schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        (**self).intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        (**self).consume_and_fill_intermediate_results(results)
+    }
+
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         (**self).next_batch(scan_rows).await
     }
@@ -109,6 +148,19 @@ impl<C: ExecSummaryCollector + Send, T: BatchExecutor> BatchExecutor
         self.inner.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.inner.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.inner.consume_and_fill_intermediate_results(results)
+    }
+
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         let timer = self.summary_collector.on_start_iterate();
         let result = self.inner.next_batch(scan_rows).await;
diff --git a/components/tidb_query_executors/src/lib.rs b/components/tidb_query_executors/src/lib.rs
index 2ce85f90111..4bbedd8dc5a 100644
--- a/components/tidb_query_executors/src/lib.rs
+++ b/components/tidb_query_executors/src/lib.rs
@@ -11,7 +11,7 @@
 #![allow(incomplete_features)]
 #![feature(proc_macro_hygiene)]
 #![feature(specialization)]
-#![feature(const_mut_refs)]
+#![feature(stmt_expr_attributes)]
 
 #[macro_use(box_try, warn)]
 extern crate tikv_util;
@@ -26,6 +26,7 @@ pub use tidb_query_expr::function::*;
 #[cfg(test)]
 pub use tidb_query_expr::*;
 mod fast_hash_aggr_executor;
+mod index_lookup_executor;
 mod index_scan_executor;
 pub mod interface;
 mod limit_executor;
@@ -42,8 +43,8 @@ mod util;
 
 pub use self::{
     fast_hash_aggr_executor::BatchFastHashAggregationExecutor,
-    index_scan_executor::BatchIndexScanExecutor, limit_executor::BatchLimitExecutor,
-    partition_top_n_executor::BatchPartitionTopNExecutor,
+    index_lookup_executor::BatchIndexLookUpExecutor, index_scan_executor::BatchIndexScanExecutor,
+    limit_executor::BatchLimitExecutor, partition_top_n_executor::BatchPartitionTopNExecutor,
     projection_executor::BatchProjectionExecutor, selection_executor::BatchSelectionExecutor,
     simple_aggr_executor::BatchSimpleAggregationExecutor,
     slow_hash_aggr_executor::BatchSlowHashAggregationExecutor,
diff --git a/components/tidb_query_executors/src/limit_executor.rs b/components/tidb_query_executors/src/limit_executor.rs
index bbbe5d576d0..1996a9657e4 100644
--- a/components/tidb_query_executors/src/limit_executor.rs
+++ b/components/tidb_query_executors/src/limit_executor.rs
@@ -1,7 +1,7 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
 use async_trait::async_trait;
-use tidb_query_common::{storage::IntervalRange, Result};
+use tidb_query_common::{Result, storage::IntervalRange};
 use tipb::FieldType;
 
 use crate::interface::*;
@@ -22,6 +22,11 @@ impl<Src: BatchExecutor> BatchLimitExecutor<Src> {
             is_src_scan_executor,
         })
     }
+
+    #[cfg(test)]
+    pub fn into_child(self) -> Src {
+        self.src
+    }
 }
 
 #[async_trait]
@@ -33,6 +38,19 @@ impl<Src: BatchExecutor> BatchExecutor for BatchLimitExecutor<Src> {
         self.src.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.src.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.src.consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         let real_scan_rows = if self.is_src_scan_executor {
@@ -78,9 +96,9 @@ impl<Src: BatchExecutor> BatchExecutor for BatchLimitExecutor<Src> {
 mod tests {
     use futures::executor::block_on;
     use tidb_query_datatype::{
+        FieldTypeTp,
         codec::{batch::LazyBatchColumnVec, data_type::VectorValue},
         expr::EvalWarnings,
-        FieldTypeTp,
     };
 
     use super::*;
diff --git a/components/tidb_query_executors/src/partition_top_n_executor.rs b/components/tidb_query_executors/src/partition_top_n_executor.rs
index 980adb3e459..0d3bd6acab6 100644
--- a/components/tidb_query_executors/src/partition_top_n_executor.rs
+++ b/components/tidb_query_executors/src/partition_top_n_executor.rs
@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use tidb_query_common::{storage::IntervalRange, Result};
+use tidb_query_common::{Result, storage::IntervalRange};
 use tidb_query_datatype::{
     codec::{batch::LazyBatchColumnVec, data_type::BATCH_MAX_SIZE},
     expr::{EvalConfig, EvalContext, EvalWarnings},
@@ -306,6 +306,19 @@ impl<Src: BatchExecutor> BatchExecutor for BatchPartitionTopNExecutor<Src> {
         self.src.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.src.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.src.consume_and_fill_intermediate_results(results)
+    }
+
     /// Implementation of BatchExecutor::next_batch
     /// Memory Control Analysis:
     /// 1. if n > paging_size(1024), this operator won't do anything and just
@@ -383,14 +396,14 @@ impl<Src: BatchExecutor> BatchExecutor for BatchPartitionTopNExecutor<Src> {
 mod tests {
     use futures::executor::block_on;
     use tidb_query_datatype::{
+        Collation, FieldTypeFlag, FieldTypeTp,
         builder::FieldTypeBuilder,
         codec::{batch::LazyBatchColumnVec, data_type::*},
         expr::EvalWarnings,
-        Collation, FieldTypeFlag, FieldTypeTp,
     };
     use tidb_query_expr::{
-        impl_arithmetic::{IntDivideInt, IntIntPlus},
         RpnExpressionBuilder,
+        impl_arithmetic::{IntDivideInt, IntIntPlus},
     };
 
     use super::*;
@@ -1496,7 +1509,7 @@ mod tests {
     #[test]
     fn test_no_partition_integration_3() {
         use tidb_query_expr::{
-            impl_arithmetic::{arithmetic_fn_meta, IntIntPlus},
+            impl_arithmetic::{IntIntPlus, arithmetic_fn_meta},
             impl_op::is_null_fn_meta,
         };
 
diff --git a/components/tidb_query_executors/src/projection_executor.rs b/components/tidb_query_executors/src/projection_executor.rs
index f1971cf138d..062184a1b52 100644
--- a/components/tidb_query_executors/src/projection_executor.rs
+++ b/components/tidb_query_executors/src/projection_executor.rs
@@ -3,7 +3,7 @@
 use std::{collections::HashSet, sync::Arc};
 
 use async_trait::async_trait;
-use tidb_query_common::{storage::IntervalRange, Result};
+use tidb_query_common::{Result, storage::IntervalRange};
 use tidb_query_datatype::{
     codec::{
         batch::{LazyBatchColumn, LazyBatchColumnVec},
@@ -53,6 +53,11 @@ fn get_schema_from_exprs(child_schema: &[FieldType], exprs: &[RpnExpression]) ->
 }
 
 impl<Src: BatchExecutor> BatchProjectionExecutor<Src> {
+    #[cfg(test)]
+    pub fn into_child(self) -> Src {
+        self.src
+    }
+
     #[cfg(test)]
     pub fn new_for_test(src: Src, exprs: Vec<RpnExpression>) -> Self {
         let schema = get_schema_from_exprs(src.schema(), &exprs);
@@ -149,6 +154,19 @@ impl<Src: BatchExecutor> BatchExecutor for BatchProjectionExecutor<Src> {
         &self.schema
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.src.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.src.consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         let mut src_result = self.src.next_batch(scan_rows).await;
@@ -243,7 +261,7 @@ impl<Src: BatchExecutor> BatchExecutor for BatchProjectionExecutor<Src> {
 mod tests {
     use futures::executor::block_on;
     use tidb_query_codegen::rpn_fn;
-    use tidb_query_datatype::{codec::batch::LazyBatchColumnVec, expr::EvalWarnings, FieldTypeTp};
+    use tidb_query_datatype::{FieldTypeTp, codec::batch::LazyBatchColumnVec, expr::EvalWarnings};
 
     use super::*;
     use crate::util::mock_executor::MockExecutor;
diff --git a/components/tidb_query_executors/src/runner.rs b/components/tidb_query_executors/src/runner.rs
index 4c87434d1a9..f7432117ecd 100644
--- a/components/tidb_query_executors/src/runner.rs
+++ b/components/tidb_query_executors/src/runner.rs
@@ -1,6 +1,6 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{convert::TryFrom, sync::Arc};
+use std::{convert::TryFrom, iter, sync::Arc};
 
 use api_version::KvFormat;
 use fail::fail_point;
@@ -8,18 +8,19 @@ use itertools::Itertools;
 use kvproto::coprocessor::KeyRange;
 use protobuf::Message;
 use tidb_query_common::{
+    Result,
     execute_stats::ExecSummary,
     metrics::*,
-    storage::{IntervalRange, Storage},
-    Result,
+    storage::{IntervalRange, RegionStorageAccessor, Storage},
 };
 use tidb_query_datatype::{
-    expr::{EvalConfig, EvalContext, EvalWarnings},
     EvalType, FieldTypeAccessor,
+    codec::table::IntHandle,
+    expr::{EvalConfig, EvalContext, EvalWarnings},
 };
 use tikv_util::{
     deadline::Deadline,
-    metrics::{ThrottleType, NON_TXN_COMMAND_THROTTLE_TIME_COUNTER_VEC_STATIC},
+    metrics::{NON_TXN_COMMAND_THROTTLE_TIME_COUNTER_VEC_STATIC, ThrottleType},
     quota_limiter::QuotaLimiter,
 };
 use tipb::{
@@ -41,9 +42,18 @@ const BATCH_INITIAL_SIZE: usize = 32;
 // benchmarks.
 pub use tidb_query_expr::types::BATCH_MAX_SIZE;
 
+use crate::{index_lookup_executor::build_index_lookup_executor, interface::BatchExecuteResult};
+
 // TODO: Maybe there can be some better strategy. Needs benchmarks and tunes.
 const BATCH_GROW_FACTOR: usize = 2;
 
+#[derive(Clone, Debug, PartialEq)]
+struct IntermediateOutputChannel {
+    encode_type: EncodeType,
+    output_offsets: Vec<u32>,
+    schema: Vec<FieldType>,
+}
+
 pub struct BatchExecutorsRunner<SS> {
     /// The deadline of this handler. For each check point (e.g. each iteration)
     /// we need to check whether or not the deadline is exceeded and break
@@ -79,6 +89,15 @@ pub struct BatchExecutorsRunner<SS> {
     paging_size: Option<u64>,
 
     quota_limiter: Arc<QuotaLimiter>,
+
+    /// Information for intermediate output channels.
+    /// For example, the `BatchIndexLookupExecutor` may output the index scan
+    /// results if the primary rows cannot be founded in the local store.
+    intermediate_channels: Vec<IntermediateOutputChannel>,
+    /// Reserved for intermediate results, used to avoid re-allocation.
+    /// It is None when BatchExecutorsRunner is created
+    /// and will be set to Some by the inner code by demand
+    reserved_intermediate_results: Option<Vec<Vec<BatchExecuteResult>>>,
 }
 
 // We assign a dummy type `()` so that we can omit the type when calling
@@ -136,6 +155,11 @@ impl BatchExecutorsRunner<()> {
                     BatchProjectionExecutor::check_supported(descriptor)
                         .map_err(|e| other_err!("BatchProjectionExecutor: {}", e))?;
                 }
+                ExecType::TypeIndexLookUp => {
+                    let descriptor = ed.get_index_lookup();
+                    BatchIndexLookUpExecutor::check_supported(descriptor)
+                        .map_err(|e| other_err!("BatchIndexLookUpExecutor: {}", e))?;
+                }
                 ExecType::TypeJoin => {
                     return Err(other_err!("Join executor not implemented"));
                 }
@@ -163,6 +187,15 @@ impl BatchExecutorsRunner<()> {
                 ExecType::TypeExpand2 => {
                     return Err(other_err!("Expand2 executor not implemented"));
                 }
+                ExecType::TypeBroadcastQuery => {
+                    return Err(other_err!("TypeBroadcastQuery executor not implemented"));
+                }
+                ExecType::TypeCteSink => {
+                    return Err(other_err!("TypeCteSink executor not implemented"));
+                }
+                ExecType::TypeCteSource => {
+                    return Err(other_err!("TypeCteSource executor not implemented"));
+                }
             }
         }
 
@@ -178,11 +211,14 @@ fn is_arrow_encodable<'a>(mut schema: impl Iterator<Item = &'a FieldType>) -> bo
 #[allow(clippy::explicit_counter_loop)]
 pub fn build_executors<S: Storage + 'static, F: KvFormat>(
     executor_descriptors: Vec<tipb::Executor>,
+    intermediate_output_descriptors: &[tipb::IntermediateOutputChannel],
     storage: S,
+    extra_storage_accessor: Option<impl RegionStorageAccessor<Storage = S> + 'static>,
     ranges: Vec<KeyRange>,
     config: Arc<EvalConfig>,
     is_scanned_range_aware: bool,
 ) -> Result<Box<dyn BatchExecutor<StorageStats = S::Statistics>>> {
+    let executors_len = executor_descriptors.len();
     let mut executor_descriptors = executor_descriptors.into_iter();
     let mut first_ed = executor_descriptors
         .next()
@@ -245,8 +281,24 @@ pub fn build_executors<S: Storage + 'static, F: KvFormat>(
         }
     };
 
-    for mut ed in executor_descriptors {
+    let mut next_parent_index = if first_ed.get_parent_idx() > 0 {
+        first_ed.get_parent_idx() as usize
+    } else {
+        1
+    };
+
+    let mut children = vec![];
+    for item in executor_descriptors.enumerate() {
         summary_slot_index += 1;
+        if summary_slot_index != next_parent_index {
+            if children.is_empty() {
+                children.reserve(next_parent_index - summary_slot_index);
+            }
+            children.push(item);
+            continue;
+        }
+
+        let mut ed = item.1;
 
         executor = match ed.get_tp() {
             ExecType::TypeSelection => {
@@ -406,6 +458,55 @@ pub fn build_executors<S: Storage + 'static, F: KvFormat>(
                     )
                 }
             }
+            ExecType::TypeIndexLookUp => {
+                EXECUTOR_COUNT_METRICS.batch_index_lookup.inc();
+                if children.len() != 1 {
+                    return Err(other_err!(
+                        "IndexLookUp should have one child executor, but got {}",
+                        children.len()
+                    ));
+                }
+
+                let (_, mut child) = children.pop().unwrap();
+                if child.get_tp() != ExecType::TypeTableScan {
+                    return Err(other_err!(
+                        "IndexLookup's child should be TableScan, but got {:?}",
+                        child.get_tp()
+                    ));
+                }
+
+                let channel_ids = intermediate_output_descriptors
+                    .iter()
+                    .enumerate()
+                    .filter(|(_, ch)| {
+                        ch.has_executor_idx() && ch.get_executor_idx() == summary_slot_index as u32
+                    })
+                    .map(|(i, _)| i)
+                    .collect_vec();
+                if channel_ids.len() != 1 {
+                    return Err(other_err!(
+                        "IndexLookup should have exactly one intermediate output channel, but got {}, {:?}",
+                        channel_ids.len(),
+                        channel_ids
+                    ));
+                }
+
+                let tbl_scan = child.take_tbl_scan();
+                if !tbl_scan.get_primary_column_ids().is_empty() {
+                    return Err(other_err!("Common handle is not supported in index lookup"));
+                } else {
+                    let e = build_index_lookup_executor::<_, IntHandle, F>(
+                        config.clone(),
+                        executor,
+                        ed.take_index_lookup(),
+                        tbl_scan,
+                        extra_storage_accessor.clone(),
+                        channel_ids[0],
+                        summary_slot_index - 1,
+                    )?;
+                    Box::new(e.collect_summary(summary_slot_index))
+                }
+            }
             _ => {
                 return Err(other_err!(
                     "Unexpected non-first executor {:?}",
@@ -413,6 +514,30 @@ pub fn build_executors<S: Storage + 'static, F: KvFormat>(
                 ));
             }
         };
+
+        if !children.is_empty() {
+            return Err(other_err!(
+                "Children not handled for executor: {:?}, index: {}",
+                ed.get_tp(),
+                summary_slot_index
+            ));
+        }
+
+        next_parent_index = match ed.get_parent_idx() as usize {
+            // 0 means the natural next executor.
+            0 => summary_slot_index + 1,
+            parent_idx if parent_idx > summary_slot_index && parent_idx < executors_len => {
+                parent_idx
+            }
+            parent_idx => {
+                return Err(other_err!(
+                    "Invalid parent index: {} for executor at index {}",
+                    parent_idx,
+                    summary_slot_index
+                ));
+            }
+        };
+
         is_src_scan_executor = false;
     }
 
@@ -424,6 +549,7 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
         mut req: DagRequest,
         ranges: Vec<KeyRange>,
         storage: S,
+        extra_storage_accessor: Option<impl RegionStorageAccessor<Storage = S> + 'static>,
         deadline: Deadline,
         stream_row_limit: usize,
         is_streaming: bool,
@@ -435,10 +561,12 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
         let mut config = EvalConfig::from_request(&req)?;
         config.paging_size = paging_size;
         let config = Arc::new(config);
-
+        let intermediate_output_descriptors = req.take_intermediate_output_channels();
         let out_most_executor = build_executors::<_, F>(
             req.take_executors().into(),
+            &intermediate_output_descriptors,
             storage,
+            extra_storage_accessor,
             ranges,
             config.clone(),
             is_streaming || paging_size.is_some(), /* For streaming and paging request,
@@ -446,31 +574,62 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
                                                     * end where last scan is finished */
         )?;
 
-        // Check output offsets
+        let req_encode_type = req.get_encode_type();
+        let get_encode_type_with_check =
+            |schema: &[FieldType], output_offsets: &[u32]| -> Result<EncodeType> {
+                // Check output offsets
+                let schema_len = schema.len();
+                for offset in output_offsets {
+                    if (*offset as usize) >= schema_len {
+                        return Err(other_err!(
+                            "Invalid output offset (schema has {} columns, access index {})",
+                            schema_len,
+                            offset
+                        ));
+                    }
+                }
+
+                // Only check output schema field types
+                let new_schema = output_offsets.iter().map(|&i| &schema[i as usize]);
+                Ok(if !is_arrow_encodable(new_schema) {
+                    EncodeType::TypeDefault
+                } else {
+                    req_encode_type
+                })
+            };
+
         let output_offsets = req.take_output_offsets();
-        let schema_len = out_most_executor.schema().len();
-        for offset in &output_offsets {
-            if (*offset as usize) >= schema_len {
-                return Err(other_err!(
-                    "Invalid output offset (schema has {} columns, access index {})",
-                    schema_len,
-                    offset
-                ));
-            }
-        }
+        let encode_type = get_encode_type_with_check(out_most_executor.schema(), &output_offsets)?;
+        let exec_stats = ExecuteStats::new(executors_len);
+        let intermediate_channels = if !intermediate_output_descriptors.is_empty() {
+            let mut channels = Vec::with_capacity(intermediate_output_descriptors.len());
+            for (idx, mut ch) in intermediate_output_descriptors.into_iter().enumerate() {
+                if !ch.has_executor_idx() || ch.get_executor_idx() >= executors_len as u32 {
+                    return Err(other_err!(
+                        "Invalid intermediate output channel idx: {}, executors len: {}",
+                        if ch.has_executor_idx() {
+                            format!("{}", ch.get_executor_idx())
+                        } else {
+                            "None".to_string()
+                        },
+                        executors_len
+                    ));
+                }
 
-        // Only check output schema field types
-        let new_schema = output_offsets
-            .iter()
-            .map(|&i| &out_most_executor.schema()[i as usize]);
-        let encode_type = if !is_arrow_encodable(new_schema) {
-            EncodeType::TypeDefault
+                let schema = out_most_executor.intermediate_schema(idx)?.to_vec();
+                let encode_type = get_encode_type_with_check(&schema, ch.get_output_offsets())?;
+                let output_offsets = ch.take_output_offsets();
+                channels.push(IntermediateOutputChannel {
+                    encode_type,
+                    output_offsets,
+                    schema,
+                });
+            }
+            channels
         } else {
-            req.get_encode_type()
+            vec![]
         };
 
-        let exec_stats = ExecuteStats::new(executors_len);
-
         Ok(Self {
             deadline,
             out_most_executor,
@@ -482,6 +641,8 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
             encode_type,
             paging_size,
             quota_limiter,
+            intermediate_channels,
+            reserved_intermediate_results: None,
         })
     }
 
@@ -491,6 +652,26 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
         BATCH_INITIAL_SIZE
     }
 
+    #[inline]
+    fn set_response_intermediate_outputs(
+        &self,
+        sel_resp: &mut SelectResponse,
+        chunks: Vec<Vec<Chunk>>,
+    ) {
+        sel_resp.set_intermediate_outputs(
+            self.intermediate_channels
+                .iter()
+                .zip(chunks)
+                .map(|(ch, chunks)| {
+                    let mut inter_output = tipb::IntermediateOutput::default();
+                    inter_output.set_encode_type(ch.encode_type);
+                    inter_output.set_chunks(chunks.into());
+                    inter_output
+                })
+                .collect(),
+        )
+    }
+
     /// handle_request returns the response of selection and an optional range,
     /// only paging request will return Some(IntervalRange),
     /// this should be used when calculating ranges of the next batch.
@@ -503,16 +684,24 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
         let mut warnings = self.config.new_eval_warnings();
         let mut ctx = EvalContext::new(self.config.clone());
         let mut record_all = 0;
+        let mut intermediate_output_chunks = if self.intermediate_channels.is_empty() {
+            vec![]
+        } else {
+            iter::repeat_with(Vec::new)
+                .take(self.intermediate_channels.len())
+                .collect_vec()
+        };
 
         loop {
             let mut chunk = Chunk::default();
             let mut sample = self.quota_limiter.new_sample(true);
-            let (drained, record_len) = {
+            let (drained, record_len, read_bytes_len) = {
                 let (cpu_time, res) = sample
                     .observe_cpu_async(self.internal_handle_request(
                         false,
                         batch_size,
                         &mut chunk,
+                        &mut intermediate_output_chunks,
                         &mut warnings,
                         &mut ctx,
                     ))
@@ -520,8 +709,9 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
                 sample.add_cpu_time(cpu_time);
                 res?
             };
-            if chunk.has_rows_data() {
-                sample.add_read_bytes(chunk.get_rows_data().len());
+
+            if read_bytes_len > 0 {
+                sample.add_read_bytes(read_bytes_len);
             }
 
             let quota_delay = self.quota_limiter.consume_sample(sample, true).await;
@@ -532,11 +722,14 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
             }
 
             if record_len > 0 {
-                chunks.push(chunk);
                 record_all += record_len;
             }
 
-            if drained.stop() || self.paging_size.map_or(false, |p| record_all >= p as usize) {
+            if chunk.has_rows_data() {
+                chunks.push(chunk);
+            }
+
+            if drained.stop() || self.paging_size.is_some_and(|p| record_all >= p as usize) {
                 self.out_most_executor
                     .collect_exec_stats(&mut self.exec_stats);
                 let range = if drained == BatchExecIsDrain::Drain {
@@ -550,6 +743,12 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
                 let mut sel_resp = SelectResponse::default();
                 sel_resp.set_chunks(chunks.into());
                 sel_resp.set_encode_type(self.encode_type);
+                if !self.intermediate_channels.is_empty() {
+                    self.set_response_intermediate_outputs(
+                        &mut sel_resp,
+                        intermediate_output_chunks,
+                    );
+                }
 
                 // TODO: output_counts should not be i64. Let's fix it in Coprocessor DAG V2.
                 sel_resp.set_output_counts(
@@ -589,6 +788,12 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
     pub async fn handle_streaming_request(
         &mut self,
     ) -> Result<(Option<(StreamResponse, IntervalRange)>, bool)> {
+        if !self.intermediate_channels.is_empty() {
+            return Err(other_err!(
+                "Intermediate result is not supported in streaming request"
+            ));
+        }
+
         let mut warnings = self.config.new_eval_warnings();
 
         let (mut record_len, mut is_drained) = (0, false);
@@ -600,11 +805,12 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
         while record_len < self.stream_row_limit && !is_drained {
             let mut current_chunk = Chunk::default();
             // TODO: Streaming coprocessor on TiKV is just not enabled in TiDB now.
-            let (drained, len) = self
+            let (drained, len, _) = self
                 .internal_handle_request(
                     true,
                     batch_size.min(self.stream_row_limit - record_len),
                     &mut current_chunk,
+                    &mut [],
                     &mut warnings,
                     &mut ctx,
                 )
@@ -640,64 +846,105 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
         }
     }
 
+    #[inline]
+    fn consume_and_encode_intermediate_results(
+        &mut self,
+        chunks: &mut [Vec<Chunk>],
+        ctx: &mut EvalContext,
+        is_streaming: bool,
+    ) -> Result<(usize, usize)> {
+        if self.reserved_intermediate_results.is_none() {
+            self.reserved_intermediate_results = Some(
+                iter::repeat_with(Vec::new)
+                    .take(self.intermediate_channels.len())
+                    .collect(),
+            );
+        }
+
+        let reserved_intermediate_results = self.reserved_intermediate_results.as_mut().unwrap();
+        let mut intermediate_record_len = 0;
+        let mut chk_byte_size = 0;
+        self.out_most_executor
+            .consume_and_fill_intermediate_results(reserved_intermediate_results)?;
+        for (i, results) in reserved_intermediate_results.iter_mut().enumerate() {
+            if results.is_empty() {
+                continue;
+            }
+
+            let ch = &self.intermediate_channels[i];
+            for mut r in results.drain(..) {
+                let local_rows_len = r.logical_rows.len();
+                if local_rows_len > 0 {
+                    let mut chk = Chunk::default();
+                    encode_result_to_chunk(
+                        ctx,
+                        is_streaming,
+                        ch.encode_type,
+                        &ch.schema,
+                        &ch.output_offsets,
+                        &mut r,
+                        &mut chk,
+                    )?;
+                    intermediate_record_len += local_rows_len;
+                    chk_byte_size += chk.get_rows_data().len();
+                    chunks[i].push(chk);
+                }
+            }
+        }
+        Ok((intermediate_record_len, chk_byte_size))
+    }
+
     async fn internal_handle_request(
         &mut self,
         is_streaming: bool,
         batch_size: usize,
         chunk: &mut Chunk,
+        intermediate_chunks: &mut [Vec<Chunk>],
         warnings: &mut EvalWarnings,
         ctx: &mut EvalContext,
-    ) -> Result<(BatchExecIsDrain, usize)> {
+    ) -> Result<(BatchExecIsDrain, usize, usize)> {
         let mut record_len = 0;
+        let mut read_bytes_len = 0;
 
         self.deadline.check()?;
 
         let mut result = self.out_most_executor.next_batch(batch_size).await;
-
-        let is_drained = result.is_drained?;
+        let is_drained = match result.is_drained {
+            Err(err) => return Err(err),
+            Ok(is_drained) => is_drained,
+        };
 
         if !result.logical_rows.is_empty() {
             assert_eq!(
                 result.physical_columns.columns_len(),
                 self.out_most_executor.schema().len()
             );
-            {
-                let data = chunk.mut_rows_data();
-                // Although `schema()` can be deeply nested, it is ok since we process data in
-                // batch.
-                if is_streaming || self.encode_type == EncodeType::TypeDefault {
-                    data.reserve(
-                        result
-                            .physical_columns
-                            .maximum_encoded_size(&result.logical_rows, &self.output_offsets),
-                    );
-                    result.physical_columns.encode(
-                        &result.logical_rows,
-                        &self.output_offsets,
-                        self.out_most_executor.schema(),
-                        data,
-                        ctx,
-                    )?;
-                } else {
-                    data.reserve(
-                        result
-                            .physical_columns
-                            .maximum_encoded_size_chunk(&result.logical_rows, &self.output_offsets),
-                    );
-                    result.physical_columns.encode_chunk(
-                        &result.logical_rows,
-                        &self.output_offsets,
-                        self.out_most_executor.schema(),
-                        data,
-                        ctx,
-                    )?;
-                }
-            }
+            encode_result_to_chunk(
+                ctx,
+                is_streaming,
+                self.encode_type,
+                self.out_most_executor.schema(),
+                &self.output_offsets,
+                &mut result,
+                chunk,
+            )?;
             record_len += result.logical_rows.len();
+            if chunk.has_rows_data() {
+                read_bytes_len += chunk.get_rows_data().len();
+            }
         }
 
         warnings.merge(&mut result.warnings);
-        Ok((is_drained, record_len))
+        if !self.intermediate_channels.is_empty() {
+            let (r_len, bytes_len) = self.consume_and_encode_intermediate_results(
+                intermediate_chunks,
+                ctx,
+                is_streaming,
+            )?;
+            record_len += r_len;
+            read_bytes_len += bytes_len;
+        }
+        Ok((is_drained, record_len, read_bytes_len))
     }
 
     fn make_stream_response(
@@ -728,6 +975,46 @@ impl<SS: 'static> BatchExecutorsRunner<SS> {
     }
 }
 
+#[inline]
+fn encode_result_to_chunk(
+    ctx: &mut EvalContext,
+    is_streaming: bool,
+    encode_type: EncodeType,
+    schema: &[FieldType],
+    output_offsets: &[u32],
+    result: &mut BatchExecuteResult,
+    chunk: &mut Chunk,
+) -> Result<()> {
+    let data = chunk.mut_rows_data();
+    // Although `schema()` can be deeply nested, it is ok since we process data in
+    // batch.
+    if is_streaming || encode_type == EncodeType::TypeDefault {
+        data.reserve(
+            result
+                .physical_columns
+                .maximum_encoded_size(&result.logical_rows, output_offsets),
+        );
+        result
+            .physical_columns
+            .encode(&result.logical_rows, output_offsets, schema, data, ctx)?;
+    } else {
+        data.reserve(
+            result
+                .physical_columns
+                .maximum_encoded_size_chunk(&result.logical_rows, output_offsets),
+        );
+        result.physical_columns.encode_chunk(
+            &result.logical_rows,
+            output_offsets,
+            schema,
+            data,
+            ctx,
+        )?;
+    }
+
+    Ok(())
+}
+
 #[inline]
 fn batch_grow_factor() -> usize {
     fail_point!("copr_batch_grow_size", |r| r
@@ -744,3 +1031,1081 @@ fn grow_batch_size(batch_size: &mut usize) {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::{any::type_name, time::Duration};
+
+    use api_version::ApiV1;
+    use futures::executor::block_on;
+    use kvproto::metapb::Region;
+    use tidb_query_common::execute_stats::ExecSummaryCollectorEnabled;
+    use tidb_query_datatype::{
+        FieldTypeTp,
+        codec::{
+            Datum,
+            batch::LazyBatchColumnVec,
+            chunk,
+            data_type::{Real, VectorValue},
+            datum,
+            mysql::{Time, TimeType},
+        },
+        expr::{Flag, SqlMode},
+    };
+    use tipb::*;
+    use tipb_helper::ExprDefBuilder;
+
+    use super::*;
+    use crate::{
+        index_lookup_executor::{AccessorTableTaskIterBuilder, IndexLayout, TableScanParams},
+        interface::WithSummaryCollector,
+        util::{
+            mock_executor::{MockExecutor, MockRegionStorageAccessor, MockStorage},
+            scan_executor::field_type_from_column_info,
+        },
+    };
+
+    fn check_chunk(
+        ctx: &mut EvalContext,
+        expect_rows: Vec<Vec<Datum>>,
+        chk: Chunk,
+        field_types: &[FieldType],
+        encode_type: EncodeType,
+    ) {
+        let mut expect_rows_iter = expect_rows.into_iter();
+        let mut rows_data = chk.get_rows_data();
+        assert!(!rows_data.is_empty());
+        match encode_type {
+            EncodeType::TypeDefault => {
+                let mut datum_iter = datum::decode(&mut rows_data).unwrap().into_iter();
+                for expect_row in expect_rows_iter {
+                    let mut actual_row = Vec::with_capacity(field_types.len());
+                    for field_type in field_types {
+                        let mut datum = datum_iter.next().unwrap();
+                        if field_type.tp() == FieldTypeTp::Date
+                            || field_type.tp() == FieldTypeTp::DateTime
+                            || field_type.tp() == FieldTypeTp::Timestamp
+                        {
+                            if let Datum::U64(n) = &mut datum {
+                                let t = Time::from_packed_u64(
+                                    ctx,
+                                    *n,
+                                    TimeType::try_from(field_type.tp()).unwrap(),
+                                    0,
+                                )
+                                .unwrap();
+                                datum = Datum::Time(t);
+                            } else {
+                                panic!("expect u64, got {:?}", datum);
+                            }
+                        }
+                        actual_row.push(datum);
+                    }
+                    assert_eq!(expect_row, actual_row);
+                }
+                assert!(datum_iter.next().is_none());
+            }
+            EncodeType::TypeChunk => {
+                let rows = chunk::Chunk::decode_for_test(&mut rows_data, field_types).unwrap();
+                let row_iter = chunk::RowIterator::new(&rows);
+                for row in row_iter {
+                    assert_eq!(row.len(), field_types.len());
+                    let actual_row = (0..field_types.len())
+                        .map(|i| row.get_datum(i, &field_types[i]).unwrap())
+                        .collect_vec();
+                    let expect_row = expect_rows_iter.next().unwrap();
+                    assert_eq!(expect_row, actual_row);
+                }
+                assert!(expect_rows_iter.next().is_none());
+            }
+            _ => {
+                panic!("unsupported encode type {:?}", encode_type);
+            }
+        }
+    }
+
+    type BoxedExecutor = Box<dyn BatchExecutor<StorageStats = ()>>;
+
+    type IndexScanExecutor = BatchIndexScanExecutor<MockStorage, ApiV1>;
+
+    fn index_scan_descriptor(
+        table_id: i64,
+        index_id: i64,
+        columns_info: Vec<ColumnInfo>,
+    ) -> Executor {
+        let mut exec = Executor::default();
+        exec.set_tp(ExecType::TypeIndexScan);
+        let mut idx_scan = IndexScan::default();
+        idx_scan.set_table_id(table_id);
+        idx_scan.set_index_id(index_id);
+        idx_scan.set_columns(columns_info.into());
+        exec.set_idx_scan(idx_scan);
+        exec
+    }
+
+    fn table_scan_descriptor(table_id: i64, columns_info: Vec<ColumnInfo>) -> Executor {
+        let mut exec = Executor::default();
+        exec.set_tp(ExecType::TypeTableScan);
+        let mut tbl_scan = TableScan::default();
+        tbl_scan.set_table_id(table_id);
+        tbl_scan.set_columns(columns_info.into());
+        exec.set_tbl_scan(tbl_scan);
+        exec
+    }
+
+    type IndexLookupExecutor = BatchIndexLookUpExecutor<
+        MockStorage,
+        BoxedExecutor,
+        AccessorTableTaskIterBuilder<MockRegionStorageAccessor, IntHandle>,
+        ApiV1,
+    >;
+
+    fn index_lookup_descriptor(index_handle_offsets: Vec<u32>) -> Executor {
+        use tipb::{ExecType, IndexLookUp};
+        let mut exec = Executor::default();
+        exec.set_tp(ExecType::TypeIndexLookUp);
+        let mut idx_lookup = IndexLookUp::default();
+        idx_lookup.set_index_handle_offsets(index_handle_offsets);
+        exec.set_index_lookup(idx_lookup);
+        exec
+    }
+
+    type LimitExecutor = BatchLimitExecutor<BoxedExecutor>;
+
+    fn limit_descriptor(limit: u64) -> Executor {
+        let mut exec = Executor::default();
+        exec.set_tp(ExecType::TypeLimit);
+        let mut limit_exec = Limit::default();
+        limit_exec.set_limit(limit);
+        exec.set_limit(limit_exec);
+        exec
+    }
+
+    type SelectionExecutor = BatchSelectionExecutor<BoxedExecutor>;
+
+    fn selection_descriptor(conditions: Vec<Expr>) -> Executor {
+        let mut exec = Executor::default();
+        exec.set_tp(ExecType::TypeSelection);
+        let mut selection = Selection::default();
+        selection.set_conditions(conditions.into());
+        exec.set_selection(selection);
+        exec
+    }
+
+    type ProjectionExecutor = BatchProjectionExecutor<BoxedExecutor>;
+
+    fn projection_descriptor(exprs: Vec<Expr>) -> Executor {
+        let mut exec = Executor::default();
+        exec.set_tp(ExecType::TypeProjection);
+        let mut projection = Projection::default();
+        projection.set_exprs(exprs.into());
+        exec.set_projection(projection);
+        exec
+    }
+
+    fn column_with_type(col_id: i64, tp: FieldTypeTp) -> ColumnInfo {
+        let mut col = ColumnInfo::default();
+        col.set_column_id(col_id);
+        col.set_tp(tp as i32);
+        col
+    }
+
+    fn cast_as_summary<T: BatchExecutor<StorageStats = ()>>(
+        executor: Box<dyn BatchExecutor<StorageStats = ()>>,
+    ) -> Box<WithSummaryCollector<ExecSummaryCollectorEnabled, T>> {
+        unsafe {
+            let exec = Box::into_raw(executor)
+                as *mut WithSummaryCollector<ExecSummaryCollectorEnabled, T>;
+            let summary = Box::from_raw(exec);
+            assert_eq!(type_name::<T>(), summary.inner_type);
+            summary
+        }
+    }
+
+    fn build_runner_for_test(req: DagRequest) -> Result<BatchExecutorsRunner<()>> {
+        BatchExecutorsRunner::from_request::<_, ApiV1>(
+            req,
+            vec![],
+            MockStorage(Region::default(), vec![]),
+            Some(MockRegionStorageAccessor::with_expect_mode()),
+            Deadline::from_now(Duration::from_secs(300)),
+            1024,
+            false,
+            None,
+            Arc::new(QuotaLimiter::default()),
+        )
+    }
+
+    fn build_simple_runner_for_test() -> BatchExecutorsRunner<()> {
+        let mut dag = DagRequest::default();
+        dag.set_executors(
+            vec![table_scan_descriptor(
+                1,
+                vec![column_with_type(1, FieldTypeTp::Long)],
+            )]
+            .into(),
+        );
+        dag.set_output_offsets(vec![0]);
+        dag.set_encode_type(EncodeType::TypeChunk);
+        build_runner_for_test(dag).unwrap()
+    }
+
+    fn build_simple_result_for_test(cols: Vec<VectorValue>) -> BatchExecuteResult {
+        let logical_rows = if cols.is_empty() {
+            vec![]
+        } else {
+            (0..cols[0].len()).collect()
+        };
+        BatchExecuteResult {
+            physical_columns: LazyBatchColumnVec::from(cols),
+            logical_rows,
+            warnings: EvalWarnings::default(),
+            is_drained: Ok(BatchExecIsDrain::Remain),
+        }
+    }
+
+    fn build_int_result_for_test(vals: Vec<i64>) -> BatchExecuteResult {
+        build_simple_result_for_test(vec![VectorValue::Int(
+            vals.iter().map(|&v| Some(v)).collect_vec().into(),
+        )])
+    }
+
+    fn build_n_rows_int_result(base: i64, n: i64) -> BatchExecuteResult {
+        build_int_result_for_test((0..n).map(|v| v + base).collect())
+    }
+
+    #[test]
+    fn test_build_index_lookup_executors() {
+        let index_columns = vec![
+            column_with_type(2, FieldTypeTp::String),
+            column_with_type(1, FieldTypeTp::LongLong),
+        ];
+        let table_columns = vec![
+            column_with_type(1, FieldTypeTp::LongLong),
+            column_with_type(2, FieldTypeTp::String),
+        ];
+        let descriptors = vec![
+            index_scan_descriptor(123, 456, index_columns.clone()),
+            {
+                let mut descriptor = limit_descriptor(128);
+                descriptor.set_parent_idx(3);
+                descriptor
+            },
+            table_scan_descriptor(456, table_columns.clone()),
+            index_lookup_descriptor(vec![1]),
+            selection_descriptor(vec![
+                ExprDefBuilder::column_ref(0, FieldTypeTp::LongLong).build(),
+            ]),
+            projection_descriptor(vec![
+                ExprDefBuilder::column_ref(0, FieldTypeTp::LongLong).build(),
+            ]),
+        ];
+
+        let intermediate_output_channels = vec![
+            {
+                let mut ch = tipb::IntermediateOutputChannel::default();
+                ch.set_executor_idx(2);
+                ch.set_output_offsets(vec![2, 3]);
+                ch
+            },
+            {
+                let mut ch = tipb::IntermediateOutputChannel::default();
+                ch.set_executor_idx(3);
+                ch.set_output_offsets(vec![2, 3]);
+                ch
+            },
+        ];
+
+        let mut cfg = EvalConfig::default();
+        cfg.set_sql_mode(SqlMode::NO_ZERO_DATE | SqlMode::INVALID_DATES);
+        cfg.set_flag(Flag::IN_UPDATE_OR_DELETE_STMT);
+        cfg.set_div_precision_incr(1);
+
+        fn build_executors_for_test(
+            cfg: &EvalConfig,
+            descriptors: Vec<Executor>,
+            intermediate_output_channels: &[tipb::IntermediateOutputChannel],
+        ) -> Result<Box<dyn BatchExecutor<StorageStats = ()>>> {
+            build_executors::<_, ApiV1>(
+                descriptors,
+                intermediate_output_channels,
+                MockStorage(Region::default(), vec![]),
+                Some(MockRegionStorageAccessor::with_expect_mode()),
+                vec![],
+                Arc::new(cfg.clone()),
+                false,
+            )
+        }
+
+        let mut executor =
+            build_executors_for_test(&cfg, descriptors.clone(), &intermediate_output_channels)
+                .unwrap();
+
+        // intermediate_schema 1 should work
+        assert_eq!(
+            executor.intermediate_schema(1).unwrap(),
+            index_columns
+                .iter()
+                .map(field_type_from_column_info)
+                .collect_vec()
+                .as_slice()
+        );
+
+        // other intermediate_schema should return error
+        let err = executor.intermediate_schema(0).unwrap_err();
+        assert!(
+            err.to_string()
+                .contains("The intermediate schema is not found until root executor, index: 0")
+        );
+        let err = executor.intermediate_schema(2).unwrap_err();
+        assert!(
+            err.to_string()
+                .contains("The intermediate schema is not found until root executor, index: 2")
+        );
+
+        let check_index_lookup_executor =
+            |executor: &IndexLookupExecutor, table_scan_child_idx: usize| {
+                // schema should use the table scan's schema
+                assert_eq!(
+                    executor.schema(),
+                    table_columns
+                        .iter()
+                        .map(field_type_from_column_info)
+                        .collect_vec()
+                        .as_slice()
+                );
+
+                // cfg should equal
+                let config = executor.config();
+                assert_eq!(config.flag, cfg.flag);
+                assert_eq!(config.div_precision_increment, cfg.div_precision_increment);
+                assert_eq!(config.sql_mode, cfg.sql_mode);
+
+                // check table scan params
+                assert_eq!(
+                    &TableScanParams {
+                        columns_info: table_columns.clone(),
+                        primary_column_ids: vec![],
+                        primary_prefix_column_ids: vec![],
+                    },
+                    executor.get_table_scan_params()
+                );
+
+                // check table task iter builder
+                let builder = executor.get_table_task_builder().unwrap();
+                assert_eq!(456, builder.table_id());
+                assert_eq!(
+                    &IndexLayout {
+                        handle_types: vec![field_type_from_column_info(
+                            index_columns.get(1).unwrap()
+                        )],
+                        handle_offsets: vec![1],
+                    },
+                    builder.get_index_layout()
+                );
+
+                // check intermediate channel index
+                assert_eq!(1, executor.intermediate_channel_index());
+
+                // check the lookup executor's index
+                assert_eq!(table_scan_child_idx, executor.table_scan_child_index());
+            };
+
+        // check the executors from top to down:
+        // Projection <- Selection <- IndexLookUp <- Limit <- IndexScan
+        let summary = cast_as_summary::<ProjectionExecutor>(executor);
+        assert_eq!(5, summary.summary_collector.get_output_index());
+        executor = summary.into_inner().into_child();
+        let summary = cast_as_summary::<SelectionExecutor>(executor);
+        assert_eq!(4, summary.summary_collector.get_output_index());
+        executor = summary.into_inner().into_child();
+        let summary = cast_as_summary::<IndexLookupExecutor>(executor);
+        assert_eq!(3, summary.summary_collector.get_output_index());
+        let index_lookup = summary.into_inner();
+        check_index_lookup_executor(&index_lookup, 2);
+        executor = index_lookup.into_index_child();
+        let summary = cast_as_summary::<LimitExecutor>(executor);
+        assert_eq!(1, summary.summary_collector.get_output_index());
+        executor = summary.into_inner().into_child();
+        let summary = cast_as_summary::<IndexScanExecutor>(executor);
+        assert_eq!(0, summary.summary_collector.get_output_index());
+
+        // intermediate channels don't match
+        assert!(
+            build_executors_for_test(&cfg, descriptors.clone(), &[])
+                .err()
+                .unwrap()
+                .to_string()
+                .contains("IndexLookup should have exactly one intermediate output channel")
+        );
+        assert!(
+            build_executors_for_test(
+                &cfg,
+                descriptors.clone(),
+                &[intermediate_output_channels[0].clone()],
+            )
+            .err()
+            .unwrap()
+            .to_string()
+            .contains("IndexLookup should have exactly one intermediate output channel")
+        );
+        assert!(
+            build_executors_for_test(
+                &cfg,
+                descriptors.clone(),
+                &[intermediate_output_channels[1].clone(), {
+                    let mut ch = tipb::IntermediateOutputChannel::default();
+                    ch.set_executor_idx(3);
+                    ch.set_output_offsets(vec![2, 3]);
+                    ch
+                }],
+            )
+            .err()
+            .unwrap()
+            .to_string()
+            .contains("IndexLookup should have exactly one intermediate output channel")
+        );
+
+        // the IndexLookup's probe side has more than 1 executor
+        let err = build_executors_for_test(
+            &cfg,
+            vec![
+                index_scan_descriptor(123, 456, index_columns.clone()),
+                {
+                    let mut descriptor = limit_descriptor(128);
+                    descriptor.set_parent_idx(4);
+                    descriptor
+                },
+                table_scan_descriptor(456, table_columns.clone()),
+                limit_descriptor(10),
+                index_lookup_descriptor(vec![1]),
+                selection_descriptor(vec![
+                    ExprDefBuilder::column_ref(0, FieldTypeTp::LongLong).build(),
+                ]),
+            ],
+            &intermediate_output_channels,
+        )
+        .err()
+        .unwrap();
+        assert!(
+            err.to_string()
+                .contains("IndexLookUp should have one child executor, but got 2")
+        );
+
+        // the IndexLookup's probe side executor is not TableScan
+        let mut err_descriptors = descriptors.clone();
+        err_descriptors[2] = index_scan_descriptor(123, 123, index_columns.clone());
+        assert!(
+            build_executors_for_test(&cfg, err_descriptors, &intermediate_output_channels)
+                .err()
+                .unwrap()
+                .to_string()
+                .contains("IndexLookup's child should be TableScan, but got TypeIndexScan")
+        );
+    }
+
+    #[test]
+    fn test_build_runner_with_index_lookup() {
+        let index_columns = vec![
+            column_with_type(3, FieldTypeTp::String),
+            column_with_type(1, FieldTypeTp::LongLong),
+            column_with_type(5, FieldTypeTp::Geometry),
+        ];
+        let table_columns = vec![
+            column_with_type(1, FieldTypeTp::LongLong),
+            column_with_type(2, FieldTypeTp::Float),
+            column_with_type(3, FieldTypeTp::String),
+            column_with_type(4, FieldTypeTp::Timestamp),
+            column_with_type(5, FieldTypeTp::Geometry),
+        ];
+        let descriptors = vec![
+            {
+                let mut descriptor = index_scan_descriptor(123, 456, index_columns.clone());
+                descriptor.set_parent_idx(2);
+                descriptor
+            },
+            table_scan_descriptor(456, table_columns.clone()),
+            index_lookup_descriptor(vec![1]),
+        ];
+
+        let mut req = DagRequest::default();
+        req.set_executors(descriptors.clone().into());
+        req.set_output_offsets(vec![0, 3]);
+        req.set_intermediate_output_channels(
+            vec![{
+                let mut ch = tipb::IntermediateOutputChannel::default();
+                ch.set_executor_idx(2);
+                ch.set_output_offsets(vec![1, 0]);
+                ch
+            }]
+            .into(),
+        );
+        req.set_encode_type(EncodeType::TypeChunk);
+        // normal build
+        let runner = build_runner_for_test(req.clone()).unwrap();
+        assert_eq!(runner.encode_type, EncodeType::TypeChunk);
+        assert_eq!(runner.output_offsets, vec![0, 3]);
+        let mut expected_intermediate_channels = vec![runner::IntermediateOutputChannel {
+            encode_type: EncodeType::TypeChunk,
+            output_offsets: vec![1, 0],
+            schema: index_columns
+                .iter()
+                .map(field_type_from_column_info)
+                .collect(),
+        }];
+        assert_eq!(runner.intermediate_channels, expected_intermediate_channels);
+        assert!(runner.reserved_intermediate_results.is_none());
+
+        // main output falls back to default encode
+        req.set_output_offsets(vec![0, 4]);
+        let runner = build_runner_for_test(req.clone()).unwrap();
+        assert_eq!(runner.encode_type, EncodeType::TypeDefault);
+        assert_eq!(runner.output_offsets, vec![0, 4]);
+        assert_eq!(runner.intermediate_channels, expected_intermediate_channels);
+        assert!(runner.reserved_intermediate_results.is_none());
+
+        // intermediate output falls back to default encode
+        req.set_output_offsets(vec![0, 3]);
+        req.mut_intermediate_output_channels()
+            .get_mut(0)
+            .unwrap()
+            .set_output_offsets(vec![2, 0]);
+        let runner = build_runner_for_test(req.clone()).unwrap();
+        assert_eq!(runner.encode_type, EncodeType::TypeChunk);
+        assert_eq!(runner.output_offsets, vec![0, 3]);
+        expected_intermediate_channels[0].encode_type = EncodeType::TypeDefault;
+        expected_intermediate_channels[0].output_offsets = vec![2, 0];
+        assert_eq!(runner.intermediate_channels, expected_intermediate_channels);
+        assert!(runner.reserved_intermediate_results.is_none());
+
+        // both fall back to default encode
+        req.set_output_offsets(vec![0, 4]);
+        let runner = build_runner_for_test(req.clone()).unwrap();
+        assert_eq!(runner.encode_type, EncodeType::TypeDefault);
+        assert_eq!(runner.output_offsets, vec![0, 4]);
+        assert_eq!(runner.intermediate_channels, expected_intermediate_channels);
+        assert!(runner.reserved_intermediate_results.is_none());
+
+        // an intermediate channel doesn't refer to any executor
+        req.mut_intermediate_output_channels().push({
+            let mut ch = tipb::IntermediateOutputChannel::default();
+            ch.set_executor_idx(3);
+            ch.set_output_offsets(vec![0]);
+            ch
+        });
+        let err = build_runner_for_test(req.clone()).err().unwrap();
+        assert!(
+            err.to_string()
+                .contains("Invalid intermediate output channel idx: 3")
+        );
+        req.mut_intermediate_output_channels()[1].clear_executor_idx();
+        let err = build_runner_for_test(req.clone()).err().unwrap();
+        assert!(
+            err.to_string()
+                .contains("Invalid intermediate output channel idx: None")
+        );
+    }
+
+    fn parse_timestamp(s: &str) -> Time {
+        Time::parse_timestamp(&mut EvalContext::default(), s, 0, false).unwrap()
+    }
+
+    #[test]
+    fn test_encode_result_to_chunk() {
+        let mut cfg = EvalConfig::default();
+        // set the time zone to test the time zone conversion
+        cfg.set_time_zone_by_offset(3 * 3600).unwrap();
+        let mut ctx = EvalContext::new(Arc::new(cfg));
+
+        let field_types: Vec<FieldType> = vec![
+            FieldTypeTp::LongLong.into(),
+            FieldTypeTp::String.into(),
+            FieldTypeTp::LongLong.into(),
+            FieldTypeTp::Timestamp.into(),
+        ];
+        let output_offsets = vec![3, 0, 1];
+        let output_field_types = output_offsets
+            .iter()
+            .map(|&i| field_types[i as usize].clone())
+            .collect_vec();
+
+        let mut result = BatchExecuteResult {
+            physical_columns: LazyBatchColumnVec::from(vec![
+                VectorValue::Int(vec![Some(1), Some(2), Some(3), Some(4), Some(5)].into()),
+                VectorValue::Bytes(
+                    vec![
+                        Some(b"1a".to_vec()),
+                        Some(b"2b".to_vec()),
+                        Some(b"3c".to_vec()),
+                        Some(b"4d".to_vec()),
+                        Some(b"5e".to_vec()),
+                    ]
+                    .into(),
+                ),
+                VectorValue::Int(vec![Some(11), Some(21), Some(31), Some(14), Some(15)].into()),
+                VectorValue::DateTime(
+                    vec![
+                        Some(parse_timestamp("2021-07-01 01:02:01")),
+                        Some(parse_timestamp("2021-07-01 01:02:02")),
+                        Some(parse_timestamp("2021-07-01 01:02:03")),
+                        Some(parse_timestamp("2021-07-01 01:02:04")),
+                        Some(parse_timestamp("2021-07-01 01:02:05")),
+                    ]
+                    .into(),
+                ),
+            ]),
+            logical_rows: vec![4, 1, 2],
+            warnings: EvalWarnings::default(),
+            is_drained: Ok(BatchExecIsDrain::Remain),
+        };
+
+        let expected_rows = vec![
+            vec![
+                Datum::Time(parse_timestamp("2021-07-01 01:02:05")),
+                Datum::I64(5),
+                Datum::Bytes(b"5e".to_vec()),
+            ],
+            vec![
+                Datum::Time(parse_timestamp("2021-07-01 01:02:02")),
+                Datum::I64(2),
+                Datum::Bytes(b"2b".to_vec()),
+            ],
+            vec![
+                Datum::Time(parse_timestamp("2021-07-01 01:02:03")),
+                Datum::I64(3),
+                Datum::Bytes(b"3c".to_vec()),
+            ],
+        ];
+
+        let mut check_encode_with_type = |tp| {
+            let mut chk = Chunk::default();
+            encode_result_to_chunk(
+                &mut ctx,
+                false,
+                tp,
+                &field_types,
+                &output_offsets,
+                &mut result,
+                &mut chk,
+            )
+            .unwrap();
+            check_chunk(
+                &mut ctx,
+                expected_rows.clone(),
+                chk,
+                &output_field_types,
+                tp,
+            )
+        };
+
+        check_encode_with_type(EncodeType::TypeDefault);
+        check_encode_with_type(EncodeType::TypeChunk);
+    }
+
+    #[test]
+    fn test_consume_and_encode_intermediate_results() {
+        let mut runner = build_simple_runner_for_test();
+        runner.intermediate_channels = vec![
+            runner::IntermediateOutputChannel {
+                encode_type: EncodeType::TypeDefault,
+                output_offsets: vec![0, 2],
+                schema: vec![
+                    FieldTypeTp::Long.into(),
+                    FieldTypeTp::Float.into(),
+                    FieldTypeTp::String.into(),
+                ],
+            },
+            runner::IntermediateOutputChannel {
+                encode_type: EncodeType::TypeChunk,
+                output_offsets: vec![2, 1],
+                schema: vec![
+                    FieldTypeTp::String.into(),
+                    FieldTypeTp::Long.into(),
+                    FieldTypeTp::Timestamp.into(),
+                ],
+            },
+        ];
+
+        let output_types = [
+            vec![FieldTypeTp::Long.into(), FieldTypeTp::String.into()],
+            vec![FieldTypeTp::Timestamp.into(), FieldTypeTp::Long.into()],
+        ];
+
+        let mut executor1 = MockExecutor::new(
+            vec![FieldTypeTp::Long.into()],
+            vec![BatchExecuteResult {
+                physical_columns: LazyBatchColumnVec::empty(),
+                logical_rows: vec![],
+                warnings: EvalWarnings::default(),
+                is_drained: Ok(BatchExecIsDrain::Remain),
+            }],
+        );
+        executor1.intermediate_schema = Some((1, runner.intermediate_channels[1].schema.clone()));
+        executor1.set_next_intermediate_results(vec![build_simple_result_for_test(vec![
+            VectorValue::Bytes(
+                vec![
+                    Some(b"10a".to_vec()),
+                    Some(b"20b".to_vec()),
+                    Some(b"30c".to_vec()),
+                ]
+                .into(),
+            ),
+            VectorValue::Int(vec![Some(101), Some(102), Some(103)].into()),
+            VectorValue::DateTime(
+                vec![
+                    Some(parse_timestamp("2025-07-01 01:02:01")),
+                    Some(parse_timestamp("2025-07-01 01:02:02")),
+                    Some(parse_timestamp("2025-07-01 01:02:03")),
+                ]
+                .into(),
+            ),
+        ])]);
+
+        let mut executor0 = MockExecutor::new_with_child(executor1);
+        executor0.intermediate_schema = Some((0, runner.intermediate_channels[0].schema.clone()));
+        executor0.set_next_intermediate_results(vec![
+            build_simple_result_for_test(vec![
+                VectorValue::Int(vec![Some(1), Some(2), Some(3)].into()),
+                VectorValue::Real(
+                    vec![
+                        Real::new(2.1).ok(),
+                        Real::new(2.2).ok(),
+                        Real::new(2.3).ok(),
+                    ]
+                    .into(),
+                ),
+                VectorValue::Bytes(
+                    vec![
+                        Some(b"1a".to_vec()),
+                        Some(b"2b".to_vec()),
+                        Some(b"3c".to_vec()),
+                    ]
+                    .into(),
+                ),
+            ]),
+            // empty result should not encode to chunk
+            build_simple_result_for_test(vec![]),
+            build_simple_result_for_test(vec![
+                VectorValue::Int(vec![Some(11), Some(12), Some(13)].into()),
+                VectorValue::Real(
+                    vec![
+                        Real::new(12.1).ok(),
+                        Real::new(12.2).ok(),
+                        Real::new(12.3).ok(),
+                    ]
+                    .into(),
+                ),
+                VectorValue::Bytes(
+                    vec![
+                        Some(b"1d".to_vec()),
+                        Some(b"2e".to_vec()),
+                        Some(b"3f".to_vec()),
+                    ]
+                    .into(),
+                ),
+            ]),
+        ]);
+
+        let mut exist_chk = Chunk::default();
+        exist_chk.mut_rows_data().push(97);
+        runner.out_most_executor = Box::new(executor0);
+        let mut ctx = EvalContext::default();
+        let mut chunks = vec![vec![exist_chk], vec![]];
+        let (record_len, bytes_len) = runner
+            .consume_and_encode_intermediate_results(&mut chunks, &mut ctx, false)
+            .unwrap();
+
+        assert_eq!(record_len, 9);
+        assert_eq!(
+            bytes_len,
+            chunks[0][1].get_rows_data().len()
+                + chunks[0][2].get_rows_data().len()
+                + chunks[1][0].get_rows_data().len()
+        );
+        assert_eq!(chunks[0].len(), 3);
+        assert_eq!(chunks[1].len(), 1);
+
+        // exist chunk should not change
+        assert_eq!(chunks[0][0].get_rows_data(), &[97]);
+        check_chunk(
+            &mut ctx,
+            vec![
+                vec![Datum::I64(1), Datum::Bytes(b"1a".to_vec())],
+                vec![Datum::I64(2), Datum::Bytes(b"2b".to_vec())],
+                vec![Datum::I64(3), Datum::Bytes(b"3c".to_vec())],
+            ],
+            chunks[0][1].clone(),
+            &output_types[0],
+            runner.intermediate_channels[0].encode_type,
+        );
+        check_chunk(
+            &mut ctx,
+            vec![
+                vec![Datum::I64(11), Datum::Bytes(b"1d".to_vec())],
+                vec![Datum::I64(12), Datum::Bytes(b"2e".to_vec())],
+                vec![Datum::I64(13), Datum::Bytes(b"3f".to_vec())],
+            ],
+            chunks[0][2].clone(),
+            &output_types[0],
+            runner.intermediate_channels[0].encode_type,
+        );
+        check_chunk(
+            &mut ctx,
+            vec![
+                vec![
+                    Datum::Time(parse_timestamp("2025-07-01 01:02:01")),
+                    Datum::I64(101),
+                ],
+                vec![
+                    Datum::Time(parse_timestamp("2025-07-01 01:02:02")),
+                    Datum::I64(102),
+                ],
+                vec![
+                    Datum::Time(parse_timestamp("2025-07-01 01:02:03")),
+                    Datum::I64(103),
+                ],
+            ],
+            chunks[1][0].clone(),
+            &output_types[1],
+            runner.intermediate_channels[1].encode_type,
+        );
+        // reserved_intermediate_results should be cleared
+        runner
+            .reserved_intermediate_results
+            .unwrap()
+            .iter()
+            .for_each(|r| {
+                assert!(r.is_empty());
+            });
+    }
+
+    #[test]
+    fn test_set_response_intermediate_outputs() {
+        let mut runner = build_simple_runner_for_test();
+        runner.intermediate_channels = vec![
+            runner::IntermediateOutputChannel {
+                encode_type: EncodeType::TypeDefault,
+                output_offsets: vec![1, 0],
+                schema: vec![FieldTypeTp::Long.into(), FieldTypeTp::Float.into()],
+            },
+            runner::IntermediateOutputChannel {
+                encode_type: EncodeType::TypeChunk,
+                output_offsets: vec![0],
+                schema: vec![FieldTypeTp::Timestamp.into()],
+            },
+        ];
+
+        let mut resp = SelectResponse::default();
+        let chunks = vec![
+            vec![
+                {
+                    let mut chk = Chunk::default();
+                    chk.mut_rows_data().extend_from_slice(&[1, 2, 3]);
+                    chk
+                },
+                {
+                    let mut chk = Chunk::default();
+                    chk.mut_rows_data().extend_from_slice(&[11, 12, 13, 14]);
+                    chk
+                },
+            ],
+            vec![{
+                let mut chk = Chunk::default();
+                chk.mut_rows_data().extend_from_slice(&[21, 22]);
+                chk
+            }],
+        ];
+        runner.set_response_intermediate_outputs(&mut resp, chunks);
+        assert_eq!(2, resp.get_intermediate_outputs().len());
+        let output0 = &resp.get_intermediate_outputs()[0];
+        assert_eq!(EncodeType::TypeDefault, output0.get_encode_type());
+        assert_eq!(vec![1, 2, 3], output0.get_chunks()[0].get_rows_data());
+        assert_eq!(
+            vec![11, 12, 13, 14],
+            output0.get_chunks()[1].get_rows_data()
+        );
+        let output1 = &resp.get_intermediate_outputs()[1];
+        assert_eq!(EncodeType::TypeChunk, output1.get_encode_type());
+        assert_eq!(vec![21, 22], output1.get_chunks()[0].get_rows_data());
+    }
+
+    #[test]
+    fn test_handle_request() {
+        let mut runner = build_simple_runner_for_test();
+        let mut ctx = EvalContext {
+            cfg: runner.config.clone(),
+            ..Default::default()
+        };
+        let field_types = vec![FieldTypeTp::Long.into()];
+        let mut mock_executor = MockExecutor::new(
+            field_types.clone(),
+            vec![
+                // first loop, empty main result, some intermediate results
+                build_simple_result_for_test(vec![]),
+                // second loop, main result with 3 rows, some intermediate results
+                build_n_rows_int_result(0, 3),
+                // third loop, main result with 2 rows, no intermediate result
+                {
+                    let mut r = build_n_rows_int_result(10, 2);
+                    r.is_drained = Ok(BatchExecIsDrain::Drain);
+                    r
+                },
+            ],
+        );
+        mock_executor.intermediate_schema = Some((0, field_types.clone()));
+        mock_executor.intermediate_results = vec![
+            // first loop, 2 intermediate result with 1 and 2 rows
+            vec![
+                build_n_rows_int_result(1000, 1),
+                build_n_rows_int_result(1010, 2),
+            ],
+            // second loop, 1 intermediate result with 3 rows
+            vec![build_n_rows_int_result(1100, 3)],
+            // third loop, no intermediate result
+        ]
+        .into_iter();
+
+        runner.out_most_executor = Box::new(mock_executor);
+        runner.intermediate_channels = vec![runner::IntermediateOutputChannel {
+            encode_type: EncodeType::TypeChunk,
+            output_offsets: vec![0],
+            schema: field_types.clone(),
+        }];
+        let (mut resp, range) = block_on(runner.handle_request()).unwrap();
+        // no paging
+        assert!(range.is_none());
+        // check the main result
+        let main_chunks = resp.take_chunks();
+        assert_eq!(2, main_chunks.len());
+        check_chunk(
+            &mut ctx,
+            vec![
+                vec![Datum::I64(0)],
+                vec![Datum::I64(1)],
+                vec![Datum::I64(2)],
+            ],
+            main_chunks[0].clone(),
+            &field_types,
+            resp.get_encode_type(),
+        );
+        check_chunk(
+            &mut ctx,
+            vec![vec![Datum::I64(10)], vec![Datum::I64(11)]],
+            main_chunks[1].clone(),
+            &field_types,
+            resp.get_encode_type(),
+        );
+        // check the intermediate result
+        assert_eq!(1, resp.get_intermediate_outputs().len());
+        let mut outputs = resp.take_intermediate_outputs().to_vec();
+        let chunks = outputs[0].take_chunks().to_vec();
+        let encode_type = outputs[0].get_encode_type();
+        assert_eq!(3, chunks.len());
+        check_chunk(
+            &mut ctx,
+            vec![vec![Datum::I64(1000)]],
+            chunks[0].clone(),
+            &field_types,
+            encode_type,
+        );
+        check_chunk(
+            &mut ctx,
+            vec![vec![Datum::I64(1010)], vec![Datum::I64(1011)]],
+            chunks[1].clone(),
+            &field_types,
+            encode_type,
+        );
+        check_chunk(
+            &mut ctx,
+            vec![
+                vec![Datum::I64(1100)],
+                vec![Datum::I64(1101)],
+                vec![Datum::I64(1102)],
+            ],
+            chunks[2].clone(),
+            &field_types,
+            encode_type,
+        );
+
+        // test paging
+        let mut paging_runner = build_simple_runner_for_test();
+        paging_runner.paging_size = Some(5);
+        let mut mock_executor = MockExecutor::new(
+            field_types.clone(),
+            vec![
+                // first loop, 1 row
+                build_n_rows_int_result(0, 1),
+                // second loop, 1 row
+                build_n_rows_int_result(10, 1),
+                // third loop, 1 row
+                build_n_rows_int_result(100, 1),
+            ],
+        );
+        let expected_range: IntervalRange = (b"a".to_vec(), b"c".to_vec()).into();
+        mock_executor.scanned_range = Some(expected_range.clone());
+        mock_executor.intermediate_schema = Some((0, field_types.clone()));
+        mock_executor.intermediate_results = vec![
+            // first loop, 1 intermediate result with 1 row
+            vec![build_n_rows_int_result(1000, 1)],
+            // second loop, 2 intermediate result with 2 rows
+            vec![
+                build_n_rows_int_result(1100, 1),
+                build_n_rows_int_result(1200, 1),
+            ],
+            // third loop, 1 intermediate result with 1 row
+            vec![build_n_rows_int_result(1300, 1)],
+        ]
+        .into_iter();
+        paging_runner.out_most_executor = Box::new(mock_executor);
+        paging_runner.intermediate_channels = vec![runner::IntermediateOutputChannel {
+            encode_type: EncodeType::TypeChunk,
+            output_offsets: vec![0],
+            schema: field_types.clone(),
+        }];
+        let (mut resp, range) = block_on(paging_runner.handle_request()).unwrap();
+        assert_eq!(Some(expected_range), range);
+        let main_chunks = resp.take_chunks();
+        // the results should stop for paging in the second loop
+        assert_eq!(2, main_chunks.len());
+        check_chunk(
+            &mut ctx,
+            vec![vec![Datum::I64(0)]],
+            main_chunks[0].clone(),
+            &field_types,
+            resp.get_encode_type(),
+        );
+        check_chunk(
+            &mut ctx,
+            vec![vec![Datum::I64(10)]],
+            main_chunks[1].clone(),
+            &field_types,
+            resp.get_encode_type(),
+        );
+        let mut outputs = resp.take_intermediate_outputs();
+        assert_eq!(1, outputs.len());
+        let chunks = outputs[0].take_chunks().to_vec();
+        let encode_type = outputs[0].get_encode_type();
+        assert_eq!(3, chunks.len());
+        check_chunk(
+            &mut ctx,
+            vec![vec![Datum::I64(1000)]],
+            chunks[0].clone(),
+            &field_types,
+            encode_type,
+        );
+        check_chunk(
+            &mut ctx,
+            vec![vec![Datum::I64(1100)]],
+            chunks[1].clone(),
+            &field_types,
+            encode_type,
+        );
+        check_chunk(
+            &mut ctx,
+            vec![vec![Datum::I64(1200)]],
+            chunks[2].clone(),
+            &field_types,
+            encode_type,
+        );
+    }
+}
diff --git a/components/tidb_query_executors/src/selection_executor.rs b/components/tidb_query_executors/src/selection_executor.rs
index 8d6b245e894..da2ac5979a0 100644
--- a/components/tidb_query_executors/src/selection_executor.rs
+++ b/components/tidb_query_executors/src/selection_executor.rs
@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use tidb_query_common::{storage::IntervalRange, Result};
+use tidb_query_common::{Result, storage::IntervalRange};
 use tidb_query_datatype::{
     codec::data_type::*,
     expr::{EvalConfig, EvalContext},
@@ -45,6 +45,11 @@ impl<Src: BatchExecutor> BatchSelectionExecutor<Src> {
         }
     }
 
+    #[cfg(test)]
+    pub fn into_child(self) -> Src {
+        self.src
+    }
+
     pub fn new(config: Arc<EvalConfig>, src: Src, conditions_def: Vec<Expr>) -> Result<Self> {
         let mut conditions = Vec::with_capacity(conditions_def.len());
         let mut ctx = EvalContext::new(config);
@@ -175,6 +180,19 @@ impl<Src: BatchExecutor> BatchExecutor for BatchSelectionExecutor<Src> {
         self.src.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.src.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.src.consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         let mut src_result = self.src.next_batch(scan_rows).await;
@@ -217,7 +235,7 @@ impl<Src: BatchExecutor> BatchExecutor for BatchSelectionExecutor<Src> {
 mod tests {
     use futures::executor::block_on;
     use tidb_query_codegen::rpn_fn;
-    use tidb_query_datatype::{codec::batch::LazyBatchColumnVec, expr::EvalWarnings, FieldTypeTp};
+    use tidb_query_datatype::{FieldTypeTp, codec::batch::LazyBatchColumnVec, expr::EvalWarnings};
 
     use super::*;
     use crate::util::mock_executor::MockExecutor;
diff --git a/components/tidb_query_executors/src/simple_aggr_executor.rs b/components/tidb_query_executors/src/simple_aggr_executor.rs
index e2138394d99..8ccd9f3fde5 100644
--- a/components/tidb_query_executors/src/simple_aggr_executor.rs
+++ b/components/tidb_query_executors/src/simple_aggr_executor.rs
@@ -7,7 +7,7 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use tidb_query_aggr::*;
-use tidb_query_common::{storage::IntervalRange, Result};
+use tidb_query_common::{Result, storage::IntervalRange};
 use tidb_query_datatype::{
     codec::{
         batch::{LazyBatchColumn, LazyBatchColumnVec},
@@ -34,6 +34,19 @@ impl<Src: BatchExecutor> BatchExecutor for BatchSimpleAggregationExecutor<Src> {
         self.0.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.0.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.0.consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         self.0.next_batch(scan_rows).await
@@ -237,8 +250,8 @@ mod tests {
     use futures::executor::block_on;
     use tidb_query_codegen::AggrFunction;
     use tidb_query_datatype::{
-        expr::{EvalContext, EvalWarnings},
         FieldTypeTp,
+        expr::{EvalContext, EvalWarnings},
     };
     use tidb_query_expr::{RpnExpression, RpnExpressionBuilder};
 
diff --git a/components/tidb_query_executors/src/slow_hash_aggr_executor.rs b/components/tidb_query_executors/src/slow_hash_aggr_executor.rs
index a086e574506..b363398196d 100644
--- a/components/tidb_query_executors/src/slow_hash_aggr_executor.rs
+++ b/components/tidb_query_executors/src/slow_hash_aggr_executor.rs
@@ -10,11 +10,11 @@ use std::{
 use async_trait::async_trait;
 use collections::{HashMap, HashMapEntry};
 use tidb_query_aggr::*;
-use tidb_query_common::{storage::IntervalRange, Result};
+use tidb_query_common::{Result, storage::IntervalRange};
 use tidb_query_datatype::{
+    EvalType, FieldTypeAccessor,
     codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
     expr::{EvalConfig, EvalContext},
-    EvalType, FieldTypeAccessor,
 };
 use tidb_query_expr::{RpnExpression, RpnExpressionBuilder, RpnStackNode};
 use tipb::{Aggregation, Expr, FieldType};
@@ -42,6 +42,19 @@ impl<Src: BatchExecutor> BatchExecutor for BatchSlowHashAggregationExecutor<Src>
         self.0.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.0.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.0.consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         self.0.next_batch(scan_rows).await
@@ -514,10 +527,10 @@ impl Eq for GroupKeyRefUnsafe {}
 #[cfg(test)]
 mod tests {
     use futures::executor::block_on;
-    use tidb_query_datatype::{codec::data_type::*, FieldTypeTp};
+    use tidb_query_datatype::{FieldTypeTp, codec::data_type::*};
     use tidb_query_expr::{
-        impl_arithmetic::{arithmetic_fn_meta, RealPlus},
         RpnExpressionBuilder,
+        impl_arithmetic::{RealPlus, arithmetic_fn_meta},
     };
     use tipb::ScalarFuncSig;
 
diff --git a/components/tidb_query_executors/src/stream_aggr_executor.rs b/components/tidb_query_executors/src/stream_aggr_executor.rs
index 7ec683affa0..6891c63b7d0 100644
--- a/components/tidb_query_executors/src/stream_aggr_executor.rs
+++ b/components/tidb_query_executors/src/stream_aggr_executor.rs
@@ -4,14 +4,15 @@ use std::{cmp::Ordering, convert::TryFrom, sync::Arc};
 
 use async_trait::async_trait;
 use tidb_query_aggr::*;
-use tidb_query_common::{storage::IntervalRange, Result};
+use tidb_query_common::{Result, storage::IntervalRange};
 use tidb_query_datatype::{
+    EvalType, FieldTypeAccessor,
     codec::{
         batch::{LazyBatchColumn, LazyBatchColumnVec},
         data_type::*,
     },
     expr::{EvalConfig, EvalContext},
-    match_template_evaltype, EvalType, FieldTypeAccessor,
+    match_template_evaltype,
 };
 use tidb_query_expr::{RpnExpression, RpnExpressionBuilder, RpnStackNode};
 use tipb::{Aggregation, Expr, FieldType};
@@ -34,6 +35,19 @@ impl<Src: BatchExecutor> BatchExecutor for BatchStreamAggregationExecutor<Src> {
         self.0.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.0.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.0.consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         self.0.next_batch(scan_rows).await
@@ -458,11 +472,11 @@ fn update_current_states(
 mod tests {
     use futures::executor::block_on;
     use tidb_query_datatype::{
-        builder::FieldTypeBuilder, expr::EvalWarnings, Collation, FieldTypeTp,
+        Collation, FieldTypeTp, builder::FieldTypeBuilder, expr::EvalWarnings,
     };
     use tidb_query_expr::{
-        impl_arithmetic::{arithmetic_fn_meta, RealPlus},
         RpnExpressionBuilder,
+        impl_arithmetic::{RealPlus, arithmetic_fn_meta},
     };
     use tipb::ScalarFuncSig;
 
diff --git a/components/tidb_query_executors/src/table_scan_executor.rs b/components/tidb_query_executors/src/table_scan_executor.rs
index 13e0b8df672..a0f6d7d5a6f 100644
--- a/components/tidb_query_executors/src/table_scan_executor.rs
+++ b/components/tidb_query_executors/src/table_scan_executor.rs
@@ -8,16 +8,16 @@ use collections::HashMap;
 use kvproto::coprocessor::KeyRange;
 use smallvec::SmallVec;
 use tidb_query_common::{
-    storage::{IntervalRange, Storage},
     Result,
+    storage::{IntervalRange, Storage},
 };
 use tidb_query_datatype::{
+    EvalType, FieldTypeAccessor,
     codec::{
         batch::{LazyBatchColumn, LazyBatchColumnVec},
         row, table,
     },
     expr::{EvalConfig, EvalContext},
-    EvalType, FieldTypeAccessor,
 };
 use tipb::{ColumnInfo, FieldType, TableScan};
 
@@ -121,6 +121,19 @@ impl<S: Storage, F: KvFormat> BatchExecutor for BatchTableScanExecutor<S, F> {
         self.0.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.0.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.0.consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         self.0.next_batch(scan_rows).await
@@ -449,9 +462,9 @@ mod tests {
         execute_stats::*, storage::test_fixture::FixtureStorage, util::convert_to_prefix_next,
     };
     use tidb_query_datatype::{
-        codec::{batch::LazyBatchColumnVec, data_type::*, datum, table, Datum},
-        expr::EvalConfig,
         Collation, EvalType, FieldTypeAccessor, FieldTypeTp,
+        codec::{Datum, batch::LazyBatchColumnVec, data_type::*, datum, table},
+        expr::EvalConfig,
     };
     use tipb::{ColumnInfo, FieldType};
 
diff --git a/components/tidb_query_executors/src/top_n_executor.rs b/components/tidb_query_executors/src/top_n_executor.rs
index 670b0e0a879..585d9964b52 100644
--- a/components/tidb_query_executors/src/top_n_executor.rs
+++ b/components/tidb_query_executors/src/top_n_executor.rs
@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use tidb_query_common::{storage::IntervalRange, Result};
+use tidb_query_common::{Result, storage::IntervalRange};
 use tidb_query_datatype::{
     codec::{batch::LazyBatchColumnVec, data_type::*},
     expr::{EvalConfig, EvalContext, EvalWarnings},
@@ -38,8 +38,8 @@ pub struct BatchTopNExecutor<Src: BatchExecutor> {
     /// 1. `BatchTopNExecutor` is valid (i.e. not dropped).
     ///
     /// 2. The referenced `LazyBatchColumnVec` of the element must be valid,
-    /// which only happens when at least one of the row is in the `heap`.
-    /// Note that rows may be swapped out from    `heap` at any time.
+    ///    which only happens when at least one of the row is in the `heap`.
+    ///    Note that rows may be swapped out from    `heap` at any time.
     ///
     /// This field is placed before `order_exprs` and `src` because it relies on
     /// data in those fields and we want this field to be dropped first.
@@ -258,6 +258,19 @@ impl<Src: BatchExecutor> BatchExecutor for BatchTopNExecutor<Src> {
         self.src.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.src.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.src.consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         assert!(!self.is_ended);
@@ -335,7 +348,7 @@ impl<Src: BatchExecutor> BatchExecutor for BatchTopNExecutor<Src> {
 mod tests {
     use futures::executor::block_on;
     use tidb_query_datatype::{
-        builder::FieldTypeBuilder, expr::EvalWarnings, Collation, FieldTypeFlag, FieldTypeTp,
+        Collation, FieldTypeFlag, FieldTypeTp, builder::FieldTypeBuilder, expr::EvalWarnings,
     };
     use tidb_query_expr::RpnExpressionBuilder;
 
@@ -636,7 +649,7 @@ mod tests {
     #[test]
     fn test_integration_3() {
         use tidb_query_expr::{
-            impl_arithmetic::{arithmetic_fn_meta, IntIntPlus},
+            impl_arithmetic::{IntIntPlus, arithmetic_fn_meta},
             impl_op::is_null_fn_meta,
         };
 
diff --git a/components/tidb_query_executors/src/util/aggr_executor.rs b/components/tidb_query_executors/src/util/aggr_executor.rs
index 59272e2d402..df7368e5440 100644
--- a/components/tidb_query_executors/src/util/aggr_executor.rs
+++ b/components/tidb_query_executors/src/util/aggr_executor.rs
@@ -31,14 +31,14 @@ use std::{convert::TryFrom, sync::Arc};
 
 use async_trait::async_trait;
 use tidb_query_aggr::*;
-use tidb_query_common::{storage::IntervalRange, Result};
+use tidb_query_common::{Result, storage::IntervalRange};
 use tidb_query_datatype::{
+    EvalType, FieldTypeAccessor,
     codec::{
         batch::{LazyBatchColumn, LazyBatchColumnVec},
         data_type::*,
     },
     expr::{EvalConfig, EvalContext},
-    EvalType, FieldTypeAccessor,
 };
 use tidb_query_expr::RpnExpression;
 use tipb::{Expr, FieldType};
@@ -311,6 +311,21 @@ impl<Src: BatchExecutor, I: AggregationExecutorImpl<Src>> BatchExecutor
         self.entities.schema.as_slice()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        self.entities.src.intermediate_schema(index)
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        self.entities
+            .src
+            .consume_and_fill_intermediate_results(results)
+    }
+
     #[inline]
     async fn next_batch(&mut self, _scan_rows: usize) -> BatchExecuteResult {
         assert!(!self.is_ended);
@@ -370,10 +385,10 @@ pub mod tests {
     use tidb_query_codegen::AggrFunction;
     use tidb_query_common::Result;
     use tidb_query_datatype::{
+        Collation, FieldTypeTp,
         builder::FieldTypeBuilder,
         codec::{batch::LazyBatchColumnVec, data_type::*},
         expr::{EvalContext, EvalWarnings},
-        Collation, FieldTypeTp,
     };
 
     use crate::{interface::*, util::mock_executor::MockExecutor};
diff --git a/components/tidb_query_executors/src/util/hash_aggr_helper.rs b/components/tidb_query_executors/src/util/hash_aggr_helper.rs
index e357d065030..f4b2450e5ad 100644
--- a/components/tidb_query_executors/src/util/hash_aggr_helper.rs
+++ b/components/tidb_query_executors/src/util/hash_aggr_helper.rs
@@ -1,6 +1,6 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use tidb_query_aggr::{update, AggrFunctionState};
+use tidb_query_aggr::{AggrFunctionState, update};
 use tidb_query_common::Result;
 use tidb_query_datatype::{
     codec::{batch::LazyBatchColumnVec, data_type::*},
diff --git a/components/tidb_query_executors/src/util/mock_executor.rs b/components/tidb_query_executors/src/util/mock_executor.rs
index aee7e526425..da10bd352c6 100644
--- a/components/tidb_query_executors/src/util/mock_executor.rs
+++ b/components/tidb_query_executors/src/util/mock_executor.rs
@@ -1,11 +1,26 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
+use std::{
+    ops::DerefMut,
+    sync::{Arc, Mutex},
+};
+
+use anyhow::anyhow;
 use async_trait::async_trait;
-use tidb_query_common::storage::IntervalRange;
+use kvproto::{coprocessor::KeyRange, metapb::Region};
+use tidb_query_common::{
+    Result,
+    error::StorageError,
+    storage::{
+        FindRegionResult, IntervalRange, OwnedKvPair, PointRange, RegionStorageAccessor,
+        Result as StorageResult, StateRole, Storage,
+    },
+};
 use tidb_query_datatype::{
     codec::{batch::LazyBatchColumnVec, data_type::VectorValue},
     expr::EvalWarnings,
 };
+use tikv_util::{box_err, store::check_key_in_region};
 use tipb::FieldType;
 
 use crate::interface::*;
@@ -15,8 +30,12 @@ use crate::interface::*;
 ///
 /// Normally this should be only used in tests.
 pub struct MockExecutor {
-    schema: Vec<FieldType>,
-    results: std::vec::IntoIter<BatchExecuteResult>,
+    pub schema: Vec<FieldType>,
+    pub results: std::vec::IntoIter<BatchExecuteResult>,
+    pub intermediate_schema: Option<(usize, Vec<FieldType>)>,
+    pub intermediate_results: std::vec::IntoIter<Vec<BatchExecuteResult>>,
+    pub child: Option<Box<MockExecutor>>,
+    pub scanned_range: Option<IntervalRange>,
 }
 
 impl MockExecutor {
@@ -25,8 +44,27 @@ impl MockExecutor {
         Self {
             schema,
             results: results.into_iter(),
+            intermediate_schema: None,
+            intermediate_results: std::vec::IntoIter::default(),
+            child: None,
+            scanned_range: None,
+        }
+    }
+
+    pub fn new_with_child(child: MockExecutor) -> Self {
+        Self {
+            schema: child.schema.clone(),
+            results: vec![].into_iter(),
+            intermediate_schema: None,
+            intermediate_results: std::vec::IntoIter::default(),
+            child: Some(Box::new(child)),
+            scanned_range: None,
         }
     }
+
+    pub fn set_next_intermediate_results(&mut self, results: Vec<BatchExecuteResult>) {
+        self.intermediate_results = vec![results].into_iter();
+    }
 }
 
 #[async_trait]
@@ -37,8 +75,38 @@ impl BatchExecutor for MockExecutor {
         &self.schema
     }
 
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        if let Some((idx, schema)) = &self.intermediate_schema {
+            if *idx == index {
+                return Ok(schema);
+            }
+        }
+        if let Some(child) = &self.child {
+            return child.intermediate_schema(index);
+        }
+        Err(box_err!("no intermediate schema for index {}", index))
+    }
+
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        if let Some((idx, _)) = &self.intermediate_schema {
+            if let Some(mut next) = self.intermediate_results.next() {
+                results[*idx].append(&mut next);
+            }
+        }
+        if let Some(child) = &mut self.child {
+            child.consume_and_fill_intermediate_results(results)?
+        }
+        Ok(())
+    }
+
     async fn next_batch(&mut self, _scan_rows: usize) -> BatchExecuteResult {
-        self.results.next().unwrap()
+        match &mut self.child {
+            Some(child) => child.next_batch(_scan_rows).await,
+            None => self.results.next().unwrap(),
+        }
     }
 
     fn collect_exec_stats(&mut self, _dest: &mut ExecuteStats) {
@@ -50,8 +118,10 @@ impl BatchExecutor for MockExecutor {
     }
 
     fn take_scanned_range(&mut self) -> IntervalRange {
-        // Do nothing
-        unreachable!()
+        match &mut self.child {
+            Some(child) => child.take_scanned_range(),
+            None => self.scanned_range.take().unwrap(),
+        }
     }
 
     fn can_be_cached(&self) -> bool {
@@ -83,6 +153,18 @@ impl BatchExecutor for MockScanExecutor {
         &self.schema
     }
 
+    fn intermediate_schema(&self, _index: usize) -> Result<&[FieldType]> {
+        unreachable!()
+    }
+
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        _results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        // Do nothing
+        Ok(())
+    }
+
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         let real_scan_rows = std::cmp::min(scan_rows, self.rows.len());
         // just one column
@@ -125,3 +207,185 @@ impl BatchExecutor for MockScanExecutor {
         false
     }
 }
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct MockStorage(pub Region, pub Vec<KeyRange>);
+
+impl Storage for MockStorage {
+    type Statistics = ();
+
+    fn begin_scan(
+        &mut self,
+        _is_backward_scan: bool,
+        _is_key_only: bool,
+        _range: IntervalRange,
+    ) -> StorageResult<()> {
+        unimplemented!()
+    }
+
+    fn scan_next(&mut self) -> StorageResult<Option<OwnedKvPair>> {
+        unimplemented!()
+    }
+
+    fn get(
+        &mut self,
+        _is_key_only: bool,
+        _range: PointRange,
+    ) -> StorageResult<Option<OwnedKvPair>> {
+        unimplemented!()
+    }
+
+    fn met_uncacheable_data(&self) -> Option<bool> {
+        unimplemented!()
+    }
+
+    fn collect_statistics(&mut self, _dest: &mut Self::Statistics) {
+        unimplemented!()
+    }
+}
+
+#[derive(Default, Debug, Clone)]
+pub struct MockAccessorExpect {
+    find_region: Option<(Vec<u8>, Option<FindRegionResult>)>,
+    expect_get_local_region_storage: Option<bool>,
+}
+
+#[derive(Clone)]
+pub enum MockRegionStorageAccessor {
+    Expect(Arc<Mutex<MockAccessorExpect>>),
+    Data(Vec<(Region, StateRole)>),
+}
+
+impl MockRegionStorageAccessor {
+    pub fn with_expect_mode() -> Self {
+        Self::Expect(Arc::new(Mutex::new(MockAccessorExpect {
+            ..Default::default()
+        })))
+    }
+
+    pub fn with_regions_data(data: Vec<(Region, StateRole)>) -> Self {
+        assert!(data.is_sorted_by(|a, b| { a.0.start_key < b.0.start_key }));
+        Self::Data(data)
+    }
+
+    pub fn with_expect<T>(&self, f: impl Fn(&mut MockAccessorExpect) -> T) -> T {
+        match self {
+            Self::Expect(e) => {
+                let mut expect = e.lock().unwrap();
+                f(expect.deref_mut())
+            }
+            _ => panic!("not in expect mode"),
+        }
+    }
+
+    pub fn expect_find_region(&self, key: Vec<u8>, region: Region, role: StateRole) {
+        self.with_expect(|expect| {
+            assert!(expect.find_region.is_none());
+            expect.find_region = Some((
+                key.clone(),
+                Some(FindRegionResult::Found {
+                    region: region.clone(),
+                    role,
+                }),
+            ));
+        });
+    }
+
+    pub fn expect_region_not_found(&self, key: Vec<u8>, next_region_start: Option<Vec<u8>>) {
+        self.with_expect(|expect| {
+            assert!(expect.find_region.is_none());
+            expect.find_region = Some((
+                key.clone(),
+                Some(FindRegionResult::NotFound {
+                    next_region_start: next_region_start.clone(),
+                }),
+            ));
+        });
+    }
+
+    pub fn expect_find_region_error(&self, key: Vec<u8>) {
+        self.with_expect(|expect| {
+            assert!(expect.find_region.is_none());
+            expect.find_region = Some((key.clone(), None));
+        });
+    }
+
+    pub fn expect_get_local_region_storage(&self, success: bool) {
+        self.with_expect(|expect| {
+            assert!(expect.expect_get_local_region_storage.is_none());
+            expect.expect_get_local_region_storage = Some(success);
+        });
+    }
+
+    pub fn assert_no_exceptions(&self) {
+        self.with_expect(|expect| {
+            assert!(expect.find_region.is_none());
+            assert!(expect.expect_get_local_region_storage.is_none());
+        });
+    }
+}
+
+#[async_trait]
+impl RegionStorageAccessor for MockRegionStorageAccessor {
+    type Storage = MockStorage;
+
+    async fn find_region_by_key(&self, key: &[u8]) -> StorageResult<FindRegionResult> {
+        match self {
+            Self::Expect(_) => {
+                let find_result = self.with_expect(|expect| -> Option<FindRegionResult> {
+                    let (expect_key, find_result) = expect.find_region.take().unwrap();
+                    assert_eq!(expect_key, key.to_vec());
+                    find_result
+                });
+
+                if let Some(result) = find_result {
+                    Ok(result)
+                } else {
+                    Err(StorageError::from(anyhow!("mock find region error")))
+                }
+            }
+            Self::Data(data) => {
+                let mut result = FindRegionResult::NotFound {
+                    next_region_start: None,
+                };
+                for (region, role) in data.iter() {
+                    if region.get_end_key().is_empty() || region.get_end_key() >= key {
+                        if check_key_in_region(key, region) {
+                            result = FindRegionResult::Found {
+                                region: region.clone(),
+                                role: *role,
+                            };
+                        } else {
+                            result = FindRegionResult::NotFound {
+                                next_region_start: Some(region.get_start_key().to_vec()),
+                            };
+                        }
+                        break;
+                    }
+                }
+                Ok(result)
+            }
+        }
+    }
+
+    async fn get_local_region_storage(
+        &self,
+        region: &Region,
+        key_ranges: &[KeyRange],
+    ) -> StorageResult<Self::Storage> {
+        match self {
+            Self::Expect(_) => {
+                let success = self.with_expect(|expect| -> bool {
+                    expect.expect_get_local_region_storage.take().unwrap()
+                });
+
+                if success {
+                    Ok(MockStorage(region.clone(), key_ranges.to_vec()))
+                } else {
+                    Err(StorageError::from(anyhow!("mock get storage error")))
+                }
+            }
+            Self::Data(_) => Ok(MockStorage(region.clone(), key_ranges.to_vec())),
+        }
+    }
+}
diff --git a/components/tidb_query_executors/src/util/scan_executor.rs b/components/tidb_query_executors/src/util/scan_executor.rs
index 1b7ca895f21..a5dad4bc328 100644
--- a/components/tidb_query_executors/src/util/scan_executor.rs
+++ b/components/tidb_query_executors/src/util/scan_executor.rs
@@ -1,14 +1,14 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use api_version::{keyspace::KvPair, KvFormat};
+use api_version::{KvFormat, keyspace::KvPair};
 use async_trait::async_trait;
 use kvproto::coprocessor::KeyRange;
 use tidb_query_common::{
+    Result,
     storage::{
-        scanner::{RangesScanner, RangesScannerOptions},
         IntervalRange, Range, Storage,
+        scanner::{RangesScanner, RangesScannerOptions},
     },
-    Result,
 };
 use tidb_query_datatype::{codec::batch::LazyBatchColumnVec, expr::EvalContext};
 use tipb::{ColumnInfo, FieldType};
@@ -170,6 +170,23 @@ impl<S: Storage, I: ScanExecutorImpl, F: KvFormat> BatchExecutor for ScanExecuto
         self.imp.schema()
     }
 
+    #[inline]
+    fn intermediate_schema(&self, index: usize) -> Result<&[FieldType]> {
+        Err(other_err!(
+            "The intermediate schema is not found until root executor, index: {}",
+            index
+        ))
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        _results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        // Do nothing.
+        Ok(())
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         assert!(!self.is_ended);
diff --git a/components/tidb_query_executors/src/util/top_n_heap.rs b/components/tidb_query_executors/src/util/top_n_heap.rs
index dd37ab1d92f..20ea6c8179c 100644
--- a/components/tidb_query_executors/src/util/top_n_heap.rs
+++ b/components/tidb_query_executors/src/util/top_n_heap.rs
@@ -21,6 +21,7 @@ pub struct TopNHeap {
 impl TopNHeap {
     /// parameters:
     /// - n: The maximum number of rows in the heaps
+    ///
     /// note: to avoid large N causing OOM, the initial capacity will be limited
     /// up to 1024.
     pub fn new(n: usize) -> Self {
diff --git a/components/tidb_query_expr/Cargo.toml b/components/tidb_query_expr/Cargo.toml
index 4b9b2be6a81..57f74179f71 100644
--- a/components/tidb_query_expr/Cargo.toml
+++ b/components/tidb_query_expr/Cargo.toml
@@ -19,12 +19,12 @@ flate2 = { version = "=1.0.11", default-features = false, features = ["zlib"] }
 hex = "0.4"
 log_wrappers = { workspace = true }
 match-template = "0.0.1"
+memchr = "2.7"
 num = { version = "0.3", default-features = false }
 num-traits = "0.2"
 openssl = { workspace = true }
 protobuf = "2"
 regex = "1.1"
-safemem = { version = "0.3", default-features = false }
 serde = "1.0"
 serde_json = "1.0"
 static_assertions = { version = "1.0", features = ["nightly"] }
@@ -34,7 +34,6 @@ tidb_query_datatype = { workspace = true }
 tikv_util = { workspace = true }
 time = { workspace = true }
 tipb = { workspace = true }
-twoway = "0.2.0"
 uuid = { version = "0.8.1", features = ["v4"] }
 
 [dev-dependencies]
diff --git a/components/tidb_query_expr/src/impl_arithmetic.rs b/components/tidb_query_expr/src/impl_arithmetic.rs
index 24c5adcb7c3..92880e9c0b9 100644
--- a/components/tidb_query_expr/src/impl_arithmetic.rs
+++ b/components/tidb_query_expr/src/impl_arithmetic.rs
@@ -4,7 +4,7 @@ use num_traits::identities::Zero;
 use tidb_query_codegen::rpn_fn;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
-    codec::{self, data_type::*, div_i64, div_i64_with_u64, div_u64_with_i64, mysql::Res, Error},
+    codec::{self, Error, data_type::*, div_i64, div_i64_with_u64, div_u64_with_i64, mysql::Res},
     expr::EvalContext,
 };
 
@@ -537,10 +537,10 @@ mod tests {
     use std::str::FromStr;
 
     use tidb_query_datatype::{
+        FieldTypeFlag, FieldTypeTp,
         builder::FieldTypeBuilder,
         codec::error::ERR_DIVISION_BY_ZERO,
         expr::{EvalConfig, Flag, SqlMode},
-        FieldTypeFlag, FieldTypeTp,
     };
     use tipb::ScalarFuncSig;
 
diff --git a/components/tidb_query_expr/src/impl_cast.rs b/components/tidb_query_expr/src/impl_cast.rs
index d791866626e..ecdac4e8956 100644
--- a/components/tidb_query_expr/src/impl_cast.rs
+++ b/components/tidb_query_expr/src/impl_cast.rs
@@ -12,16 +12,15 @@ use tidb_query_codegen::rpn_fn;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
     codec::{
+        Error,
         collation::Encoding,
         convert::*,
         data_type::*,
         error::{ERR_DATA_OUT_OF_RANGE, ERR_TRUNCATE_WRONG_VALUE},
         mysql::{
-            binary_literal,
+            Time, binary_literal,
             time::{MAX_YEAR, MIN_YEAR},
-            Time,
         },
-        Error,
     },
     expr::EvalContext,
     *,
@@ -29,7 +28,7 @@ use tidb_query_datatype::{
 use tipb::{Expr, FieldType};
 
 use crate::{
-    types::RpnExpressionBuilder, RpnExpressionNode, RpnFnCallExtra, RpnFnMeta, RpnStackNode,
+    RpnExpressionNode, RpnFnCallExtra, RpnFnMeta, RpnStackNode, types::RpnExpressionBuilder,
 };
 
 fn get_cast_fn_rpn_meta(
@@ -1148,7 +1147,7 @@ pub fn cast_json_as_duration(
         JsonType::Time => Ok(Some(v.get_duration()?)),
         JsonType::String => cast_bytes_like_as_duration(ctx, extra, v.unquote()?.as_bytes(), false),
         _ => {
-            ctx.handle_truncate_err(Error::truncated_wrong_val("TIME", v.to_string()))?;
+            ctx.handle_truncate_err(Error::truncated_wrong_val("TIME", v.to_string_value()))?;
             Ok(None)
         }
     }
@@ -1342,7 +1341,7 @@ pub fn cast_json_as_time(
         }
         JsonType::String => cast_bytes_like_as_time(ctx, extra, v.unquote()?.as_bytes()),
         _ => {
-            ctx.handle_truncate_err(Error::truncated_wrong_val("DURATION", v.to_string()))?;
+            ctx.handle_truncate_err(Error::truncated_wrong_val("DURATION", v.to_string_value()))?;
             Ok(None)
         }
     }
@@ -1614,12 +1613,11 @@ mod tests {
         collections::BTreeMap,
         f32, f64,
         fmt::{Debug, Display},
-        i64,
         sync::Arc,
-        u64,
     };
 
     use tidb_query_datatype::{
+        Collation, FieldTypeFlag, FieldTypeTp, UNSPECIFIED_LENGTH,
         builder::FieldTypeBuilder,
         codec::{
             convert::produce_dec_with_specified_tp,
@@ -1629,19 +1627,18 @@ mod tests {
                 WARN_DATA_TRUNCATED,
             },
             mysql::{
+                Decimal, Duration, Json, MAX_FSP, MIN_FSP, RoundMode, Time, TimeType, Tz,
                 charset::*,
                 decimal::{max_decimal, max_or_min_dec},
-                Decimal, Duration, Json, RoundMode, Time, TimeType, Tz, MAX_FSP, MIN_FSP,
             },
         },
         expr::{EvalConfig, EvalContext, Flag},
-        Collation, FieldTypeFlag, FieldTypeTp, UNSPECIFIED_LENGTH,
     };
     use tikv_util::buffer_vec::BufferVec;
     use tipb::ScalarFuncSig;
 
     use super::Result;
-    use crate::{impl_cast::*, types::test_util::RpnFnScalarEvaluator, RpnFnCallExtra};
+    use crate::{RpnFnCallExtra, impl_cast::*, types::test_util::RpnFnScalarEvaluator};
 
     fn test_none_with_ctx_and_extra<F, Input, Ret>(func: F)
     where
@@ -4746,8 +4743,8 @@ mod tests {
 
     /// base_cs
     ///   - (cast_func_input, in_union, is_res_unsigned, base_result)
-    ///   - the base_result is the result **should** produce by
-    /// the logic of cast func above `produce_dec_with_specified_tp`
+    ///   - the base_result is the result **should** produce by the logic of
+    ///     cast func above `produce_dec_with_specified_tp`
     fn test_as_decimal_helper<T: Clone, FnCast, FnToStr>(
         base_cs: Vec<(T, bool, bool, Decimal)>,
         cast_func: FnCast,
diff --git a/components/tidb_query_expr/src/impl_compare.rs b/components/tidb_query_expr/src/impl_compare.rs
index cd978c5e559..0a9e8a345a2 100644
--- a/components/tidb_query_expr/src/impl_compare.rs
+++ b/components/tidb_query_expr/src/impl_compare.rs
@@ -1,23 +1,20 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    cmp::{max, min, Ordering},
+    cmp::{Ordering, max, min},
     str,
 };
 
 use tidb_query_codegen::rpn_fn;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
-    codec::{collation::Collator, data_type::*, mysql::Time, Error},
+    codec::{Error, collation::Collator, data_type::*, mysql::Time},
     expr::EvalContext,
 };
 
 #[rpn_fn(nullable)]
 #[inline]
-pub fn compare<C: Comparer>(lhs: Option<&C::T>, rhs: Option<&C::T>) -> Result<Option<i64>>
-where
-    C: Comparer,
-{
+pub fn compare<C: Comparer>(lhs: Option<&C::T>, rhs: Option<&C::T>) -> Result<Option<i64>> {
     C::compare(lhs, rhs)
 }
 
@@ -552,7 +549,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use tidb_query_datatype::{builder::FieldTypeBuilder, Collation, FieldTypeFlag, FieldTypeTp};
+    use tidb_query_datatype::{Collation, FieldTypeFlag, FieldTypeTp, builder::FieldTypeBuilder};
     use tipb::ScalarFuncSig;
 
     use super::*;
@@ -942,7 +939,7 @@ mod tests {
                     .push_param_with_field_type(rhs, rhs_field_type.clone())
                     .evaluate(*sig)
                     .unwrap();
-                if accept_orderings.iter().any(|&x| x == ordering) {
+                if accept_orderings.contains(&ordering) {
                     assert_eq!(output, Some(1));
                 } else {
                     assert_eq!(output, Some(0));
diff --git a/components/tidb_query_expr/src/impl_compare_in.rs b/components/tidb_query_expr/src/impl_compare_in.rs
index 6de0ba33cfb..154e3635a23 100644
--- a/components/tidb_query_expr/src/impl_compare_in.rs
+++ b/components/tidb_query_expr/src/impl_compare_in.rs
@@ -10,12 +10,12 @@ use codec::prelude::NumberDecoder;
 use tidb_query_codegen::rpn_fn;
 use tidb_query_common::{Error, Result};
 use tidb_query_datatype::{
+    EvalType, FieldTypeAccessor, FieldTypeFlag,
     codec::{
         collation::*,
         data_type::*,
         mysql::{Decimal, EnumDecoder, MAX_FSP},
     },
-    EvalType, FieldTypeAccessor, FieldTypeFlag,
 };
 use tipb::{Expr, ExprType, FieldType};
 
@@ -399,18 +399,18 @@ pub fn compare_in_by_compare_json(args: &[Option<JsonRef>]) -> Result<Option<Int
 
 #[cfg(test)]
 mod tests {
-    use test::{black_box, Bencher};
+    use test::{Bencher, black_box};
     use tidb_query_datatype::{
+        Collation, FieldTypeTp,
         builder::FieldTypeBuilder,
         codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
         expr::EvalContext,
-        Collation, FieldTypeTp,
     };
     use tipb::{FieldType, ScalarFuncSig};
     use tipb_helper::ExprDefBuilder;
 
     use super::{super::map_expr_node_to_rpn_func, *};
-    use crate::{types::RpnFnMeta, RpnExpressionBuilder, RpnExpressionNode};
+    use crate::{RpnExpressionBuilder, RpnExpressionNode, types::RpnFnMeta};
 
     #[test]
     fn test_in_constant() {
diff --git a/components/tidb_query_expr/src/impl_encryption.rs b/components/tidb_query_expr/src/impl_encryption.rs
index 03686d3755e..c21a2f5e6d1 100644
--- a/components/tidb_query_expr/src/impl_encryption.rs
+++ b/components/tidb_query_expr/src/impl_encryption.rs
@@ -5,12 +5,12 @@ use std::io::Read;
 use byteorder::{ByteOrder, LittleEndian};
 use crypto::rand;
 use flate2::{
-    read::{ZlibDecoder, ZlibEncoder},
     Compression,
+    read::{ZlibDecoder, ZlibEncoder},
 };
 use openssl::hash::{self, MessageDigest};
 use tidb_query_codegen::rpn_fn;
-use tidb_query_common::{error::EvaluateError, Result};
+use tidb_query_common::{Result, error::EvaluateError};
 use tidb_query_datatype::{
     codec::data_type::*,
     expr::{Error, EvalContext},
@@ -79,9 +79,9 @@ pub fn compress(input: BytesRef, writer: BytesWriter) -> Result<BytesGuard> {
     }
     let mut e = ZlibEncoder::new(input, Compression::default());
     // preferred capacity is input length plus four bytes length header and one
-    // extra end "." max capacity is isize::max_value(), or will panic with
+    // extra end "." max capacity is isize::MAX, or will panic with
     // "capacity overflow"
-    let mut vec = Vec::with_capacity((input.len() + 5).min(isize::max_value() as usize));
+    let mut vec = Vec::with_capacity((input.len() + 5).min(isize::MAX as usize));
     vec.resize(4, 0);
     LittleEndian::write_u32(&mut vec, input.len() as u32);
     match e.read_to_end(&mut vec) {
@@ -209,9 +209,10 @@ mod tests {
     use super::*;
     use crate::types::test_util::RpnFnScalarEvaluator;
 
-    fn test_unary_func_ok_none<'a, I: EvaluableRef<'a>, O: EvaluableRet>(sig: ScalarFuncSig)
+    fn test_unary_func_ok_none<'a, I, O>(sig: ScalarFuncSig)
     where
-        O: PartialEq,
+        I: EvaluableRef<'a>,
+        O: EvaluableRet + PartialEq,
         Option<I>: Into<ScalarValue>,
         Option<O>: From<ScalarValue>,
     {
diff --git a/components/tidb_query_expr/src/impl_json.rs b/components/tidb_query_expr/src/impl_json.rs
index e1ce48a1251..063ecddaf28 100644
--- a/components/tidb_query_expr/src/impl_json.rs
+++ b/components/tidb_query_expr/src/impl_json.rs
@@ -6,8 +6,8 @@ use serde::de::IgnoredAny;
 use tidb_query_codegen::rpn_fn;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
-    codec::{data_type::*, mysql::json::*},
     EvalType,
+    codec::{data_type::*, mysql::json::*},
 };
 
 #[rpn_fn]
diff --git a/components/tidb_query_expr/src/impl_like.rs b/components/tidb_query_expr/src/impl_like.rs
index f81e47e85e0..0994376f333 100644
--- a/components/tidb_query_expr/src/impl_like.rs
+++ b/components/tidb_query_expr/src/impl_like.rs
@@ -70,7 +70,7 @@ pub fn like<C: Collator, CS: Charset>(
 
 #[cfg(test)]
 mod tests {
-    use tidb_query_datatype::{builder::FieldTypeBuilder, Collation, FieldTypeTp};
+    use tidb_query_datatype::{Collation, FieldTypeTp, builder::FieldTypeBuilder};
     use tipb::ScalarFuncSig;
 
     use crate::test_util::RpnFnScalarEvaluator;
diff --git a/components/tidb_query_expr/src/impl_math.rs b/components/tidb_query_expr/src/impl_math.rs
index 1ce86f10193..f18b772949e 100644
--- a/components/tidb_query_expr/src/impl_math.rs
+++ b/components/tidb_query_expr/src/impl_math.rs
@@ -7,10 +7,9 @@ use tidb_query_codegen::rpn_fn;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
     codec::{
-        self,
+        self, Error,
         data_type::*,
-        mysql::{RoundMode, DEFAULT_FSP},
-        Error,
+        mysql::{DEFAULT_FSP, RoundMode},
     },
     expr::EvalContext,
 };
@@ -472,9 +471,9 @@ pub fn truncate_uint_with_uint(arg0: &Int, _arg1: &Int) -> Result<Option<Int>> {
 #[rpn_fn]
 pub fn truncate_real_with_int(arg0: &Real, arg1: &Int) -> Result<Option<Real>> {
     let d = if *arg1 >= 0 {
-        (*arg1).min(i64::from(i32::max_value())) as i32
+        (*arg1).min(i64::from(i32::MAX)) as i32
     } else {
-        (*arg1).max(i64::from(i32::min_value())) as i32
+        (*arg1).max(i64::from(i32::MIN)) as i32
     };
     Ok(Some(truncate_real(*arg0, d)))
 }
@@ -482,7 +481,7 @@ pub fn truncate_real_with_int(arg0: &Real, arg1: &Int) -> Result<Option<Real>> {
 #[inline]
 #[rpn_fn]
 pub fn truncate_real_with_uint(arg0: &Real, arg1: &Int) -> Result<Option<Real>> {
-    let d = (*arg1 as u64).min(i32::max_value() as u64) as i32;
+    let d = (*arg1 as u64).min(i32::MAX as u64) as i32;
     Ok(Some(truncate_real(*arg0, d)))
 }
 
@@ -580,9 +579,9 @@ impl IntWithSign {
         let value = if is_neg {
             // Avoid int64 overflow error.
             // -int64_min = int64_max + 1
-            num.min(Int::max_value() as u64 + 1)
+            num.min(Int::MAX as u64 + 1)
         } else {
-            num.min(Int::max_value() as u64)
+            num.min(Int::MAX as u64)
         };
         IntWithSign::from_signed_uint(value, is_neg)
     }
@@ -666,13 +665,10 @@ fn extract_num(num_s: &str, is_neg: bool, from_base: IntWithSign) -> Option<IntW
 // assert_eq!(i64_to_usize(1_i64, false), (1_usize, true));
 // assert_eq!(i64_to_usize(-1_i64, false), (1_usize, false));
 // assert_eq!(
-//     i64_to_usize(u64::max_value() as i64, true),
-//     (u64::max_value() as usize, true)
-// );
-// assert_eq!(
-//     i64_to_usize(u64::max_value() as i64, false),
-//     (1_usize, false)
+//     i64_to_usize(u64::MAX as i64, true),
+//     (u64::MAX as usize, true)
 // );
+// assert_eq!(i64_to_usize(u64::MAX as i64, false), (1_usize, false));
 // ```
 #[inline]
 pub fn i64_to_usize(i: i64, is_unsigned: bool) -> (usize, bool) {
@@ -681,8 +677,8 @@ pub fn i64_to_usize(i: i64, is_unsigned: bool) -> (usize, bool) {
     } else if i >= 0 {
         (i as usize, true)
     } else {
-        let i = if i == i64::min_value() {
-            i64::max_value() as usize + 1
+        let i = if i == i64::MIN {
+            i64::MAX as usize + 1
         } else {
             -i as usize
         };
@@ -723,9 +719,9 @@ impl Default for MySqlRng {
 
 #[cfg(test)]
 mod tests {
-    use std::{f64, i64, str::FromStr};
+    use std::{f64, str::FromStr};
 
-    use tidb_query_datatype::{builder::FieldTypeBuilder, FieldTypeFlag, FieldTypeTp};
+    use tidb_query_datatype::{FieldTypeFlag, FieldTypeTp, builder::FieldTypeBuilder};
     use tipb::ScalarFuncSig;
 
     use super::*;
@@ -1011,9 +1007,10 @@ mod tests {
         }
     }
 
-    fn test_unary_func_ok_none<I: Evaluable, O: EvaluableRet>(sig: ScalarFuncSig)
+    fn test_unary_func_ok_none<I, O>(sig: ScalarFuncSig)
     where
-        O: PartialEq,
+        I: Evaluable,
+        O: EvaluableRet + PartialEq,
         Option<I>: Into<ScalarValue>,
         Option<O>: From<ScalarValue>,
     {
@@ -1159,10 +1156,7 @@ mod tests {
         let test_cases = vec![
             (None, None),
             (Some(64f64), Some(Real::new(8f64).unwrap())),
-            (
-                Some(2f64),
-                Some(Real::new(std::f64::consts::SQRT_2).unwrap()),
-            ),
+            (Some(2f64), Some(Real::new(f64::consts::SQRT_2).unwrap())),
             (Some(-16f64), None),
             (Some(f64::NAN), None),
         ];
@@ -1268,10 +1262,7 @@ mod tests {
     fn test_sin() {
         let valid_test_cases = vec![
             (0.0_f64, 0.0_f64),
-            (
-                std::f64::consts::PI / 4.0_f64,
-                std::f64::consts::FRAC_1_SQRT_2,
-            ),
+            (std::f64::consts::PI / 4.0_f64, f64::consts::FRAC_1_SQRT_2),
             (std::f64::consts::PI / 2.0_f64, 1.0_f64),
             (std::f64::consts::PI, 0.0_f64),
         ];
@@ -1477,7 +1468,7 @@ mod tests {
                 Some(Real::new(-std::f64::consts::PI / 2.0_f64).unwrap()),
             ),
             (
-                Some(Real::new(std::f64::consts::SQRT_2 / 2.0_f64).unwrap()),
+                Some(Real::new(f64::consts::SQRT_2 / 2.0_f64).unwrap()),
                 Some(Real::new(std::f64::consts::PI / 4.0_f64).unwrap()),
             ),
         ];
@@ -1518,7 +1509,7 @@ mod tests {
                 Some(Real::new(std::f64::consts::PI).unwrap()),
             ),
             (
-                Some(Real::new(std::f64::consts::SQRT_2 / 2.0_f64).unwrap()),
+                Some(Real::new(f64::consts::SQRT_2 / 2.0_f64).unwrap()),
                 Some(Real::new(std::f64::consts::PI / 4.0_f64).unwrap()),
             ),
         ];
@@ -1781,8 +1772,8 @@ mod tests {
             (1028, 5, false, 1028),
             (1028, -2, false, 1000),
             (1028, 309, false, 1028),
-            (1028, i64::min_value(), false, 0),
-            (1028, u64::max_value() as i64, true, 1028),
+            (1028, i64::MIN, false, 0),
+            (1028, u64::MAX as i64, true, 1028),
         ];
         for (lhs, rhs, rhs_is_unsigned, expected) in tests {
             let rhs_field_type = FieldTypeBuilder::new()
@@ -1809,7 +1800,7 @@ mod tests {
         let tests = vec![
             (
                 18446744073709551615_u64,
-                u64::max_value() as i64,
+                u64::MAX as i64,
                 true,
                 18446744073709551615_u64,
             ),
@@ -1852,9 +1843,9 @@ mod tests {
             (123.2, -1, false, 120.0),
             (123.2, 100, false, 123.2),
             (123.2, -100, false, 0.0),
-            (123.2, i64::max_value(), false, 123.2),
-            (123.2, i64::min_value(), false, 0.0),
-            (123.2, u64::max_value() as i64, true, 123.2),
+            (123.2, i64::MAX, false, 123.2),
+            (123.2, i64::MIN, false, 0.0),
+            (123.2, u64::MAX as i64, true, 123.2),
             (-1.23, 0, false, -1.0),
             (
                 1.797693134862315708145274237317043567981e+308,
@@ -1948,7 +1939,7 @@ mod tests {
             ),
             (
                 Decimal::from_str("23.298").unwrap(),
-                u64::max_value() as i64,
+                u64::MAX as i64,
                 true,
                 Decimal::from_str("23.298").unwrap(),
             ),
diff --git a/components/tidb_query_expr/src/impl_miscellaneous.rs b/components/tidb_query_expr/src/impl_miscellaneous.rs
index 0bac7a12cab..8b137df78a8 100644
--- a/components/tidb_query_expr/src/impl_miscellaneous.rs
+++ b/components/tidb_query_expr/src/impl_miscellaneous.rs
@@ -65,7 +65,7 @@ pub fn any_value_bytes(args: &[Option<BytesRef>]) -> Result<Option<Bytes>> {
 pub fn inet_aton(addr: BytesRef) -> Result<Option<Int>> {
     let addr = String::from_utf8_lossy(addr);
 
-    if addr.len() == 0 || addr.ends_with('.') {
+    if addr.is_empty() || addr.ends_with('.') {
         return Ok(None);
     }
     let (mut byte_result, mut result, mut dot_count): (u64, u64, usize) = (0, 0, 0);
@@ -452,7 +452,7 @@ mod tests {
             (Some(2063728641), Some(Bytes::from("123.2.0.1"))),
             (Some(0), Some(Bytes::from("0.0.0.0"))),
             (
-                Some(i64::from(u32::max_value())),
+                Some(i64::from(u32::MAX)),
                 Some(Bytes::from("255.255.255.255")),
             ),
             (Some(545460846593), None),
diff --git a/components/tidb_query_expr/src/impl_op.rs b/components/tidb_query_expr/src/impl_op.rs
index 659f6b5efba..cf2d4e44692 100644
--- a/components/tidb_query_expr/src/impl_op.rs
+++ b/components/tidb_query_expr/src/impl_op.rs
@@ -2,7 +2,7 @@
 
 use tidb_query_codegen::rpn_fn;
 use tidb_query_common::Result;
-use tidb_query_datatype::codec::{data_type::*, Error};
+use tidb_query_datatype::codec::{Error, data_type::*};
 
 #[rpn_fn(nullable)]
 #[inline]
@@ -281,8 +281,8 @@ fn right_shift(lhs: Option<&Int>, rhs: Option<&Int>) -> Result<Option<Int>> {
 #[cfg(test)]
 mod tests {
     use tidb_query_datatype::{
-        builder::FieldTypeBuilder, codec::mysql::TimeType, expr::EvalContext, FieldTypeFlag,
-        FieldTypeTp,
+        FieldTypeFlag, FieldTypeTp, builder::FieldTypeBuilder, codec::mysql::TimeType,
+        expr::EvalContext,
     };
     use tipb::ScalarFuncSig;
 
diff --git a/components/tidb_query_expr/src/impl_other.rs b/components/tidb_query_expr/src/impl_other.rs
index ff10d4a8a3b..552b9d3242c 100644
--- a/components/tidb_query_expr/src/impl_other.rs
+++ b/components/tidb_query_expr/src/impl_other.rs
@@ -12,8 +12,6 @@ pub fn bit_count(arg: &Int) -> Result<Option<Int>> {
 
 #[cfg(test)]
 mod tests {
-    use std::i64;
-
     use tipb::ScalarFuncSig;
 
     use crate::test_util::RpnFnScalarEvaluator;
diff --git a/components/tidb_query_expr/src/impl_regexp.rs b/components/tidb_query_expr/src/impl_regexp.rs
index a8112d41945..39507bc429f 100644
--- a/components/tidb_query_expr/src/impl_regexp.rs
+++ b/components/tidb_query_expr/src/impl_regexp.rs
@@ -5,7 +5,7 @@ use std::{borrow::Cow, collections::HashSet};
 use regex::Regex;
 use tidb_query_codegen::rpn_fn;
 use tidb_query_common::Result;
-use tidb_query_datatype::codec::{collation::Collator, data_type::*, Error};
+use tidb_query_datatype::codec::{Error, collation::Collator, data_type::*};
 use tipb::{Expr, ExprType};
 
 const PATTERN_IDX: usize = 1;
@@ -423,18 +423,18 @@ pub fn regexp_replace<C: Collator>(
         for capture in regex.captures_iter(trimmed) {
             // unwrap on 0 is OK because captures only reports matches.
             let m = capture.get(0).unwrap();
-            result.extend(trimmed[last_match..m.start()].as_bytes());
+            result.extend(&trimmed.as_bytes()[last_match..m.start()]);
             last_match = m.end();
             replace_work(&capture, &mut result)?;
         }
     } else if let Some(capture) = regex.captures_iter(trimmed).nth((occurrence - 1) as usize) {
         // unwrap on 0 is OK because captures only reports matches.
         let m = capture.get(0).unwrap();
-        result.extend(trimmed[0..m.start()].as_bytes());
+        result.extend(&trimmed.as_bytes()[0..m.start()]);
         last_match = m.end();
         replace_work(&capture, &mut result)?;
     }
-    result.extend(trimmed[last_match..].as_bytes());
+    result.extend(&trimmed.as_bytes()[last_match..]);
 
     Ok(Some(result))
 }
@@ -442,9 +442,9 @@ pub fn regexp_replace<C: Collator>(
 #[cfg(test)]
 mod tests {
     use tidb_query_datatype::{
+        EvalType, FieldTypeTp,
         codec::batch::{LazyBatchColumn, LazyBatchColumnVec},
         expr::EvalContext,
-        EvalType, FieldTypeTp,
     };
     use tipb::ScalarFuncSig;
     use tipb_helper::ExprDefBuilder;
diff --git a/components/tidb_query_expr/src/impl_string.rs b/components/tidb_query_expr/src/impl_string.rs
index 9727ee98355..23deea9e6ca 100644
--- a/components/tidb_query_expr/src/impl_string.rs
+++ b/components/tidb_query_expr/src/impl_string.rs
@@ -3,6 +3,7 @@
 use std::{cmp::Ordering, iter, str};
 
 use bstr::ByteSlice;
+use memchr::memmem;
 use tidb_query_codegen::rpn_fn;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
@@ -109,7 +110,7 @@ pub fn unhex(arg: BytesRef, writer: BytesWriter) -> Result<BytesGuard> {
 
 #[inline]
 fn find_str(text: &str, pattern: &str) -> Option<usize> {
-    twoway::find_str(text, pattern).map(|i| text[..i].chars().count())
+    memmem::find(text.as_bytes(), pattern.as_bytes()).map(|i| text[..i].chars().count())
 }
 
 #[rpn_fn]
@@ -294,7 +295,7 @@ pub fn lpad_utf8(
         Some(0) => Ok(writer.write_ref(Some(b""))),
         Some(target_len) if target_len < input_len => {
             let utf8_byte_end = get_utf8_byte_index(input, target_len);
-            Ok(writer.write_ref(Some(input[..utf8_byte_end].as_bytes())))
+            Ok(writer.write_ref(Some(&input.as_bytes()[..utf8_byte_end])))
         }
         Some(target_len) => {
             let mut writer = writer.begin();
@@ -307,7 +308,7 @@ pub fn lpad_utf8(
             // Write last incomplete pad (might be none)
             let last_pad_len = (target_len - input_len) % pad_len;
             let utf8_byte_end = get_utf8_byte_index(pad, last_pad_len);
-            writer.partial_write(pad[..utf8_byte_end].as_bytes());
+            writer.partial_write(&pad.as_bytes()[..utf8_byte_end]);
 
             writer.partial_write(input.as_bytes());
             Ok(writer.finish())
@@ -360,7 +361,7 @@ pub fn rpad_utf8(
         Some(0) => Ok(writer.write_ref(Some(b""))),
         Some(target_len) if target_len < input_len => {
             let utf8_byte_end = get_utf8_byte_index(input, target_len);
-            Ok(writer.write_ref(Some(input[..utf8_byte_end].as_bytes())))
+            Ok(writer.write_ref(Some(&input.as_bytes()[..utf8_byte_end])))
         }
         Some(target_len) => {
             let mut writer = writer.begin();
@@ -375,7 +376,7 @@ pub fn rpad_utf8(
             // Write last incomplete pad (might be none)
             let last_pad_len = (target_len - input_len) % pad_len;
             let utf8_byte_end = get_utf8_byte_index(pad, last_pad_len);
-            writer.partial_write(pad[..utf8_byte_end].as_bytes());
+            writer.partial_write(&pad.as_bytes()[..utf8_byte_end]);
             Ok(writer.finish())
         }
     }
@@ -423,7 +424,7 @@ pub fn replace(
     }
     let mut last = 0;
     let mut writer = writer.begin();
-    while let Some(mut start) = twoway::find_bytes(&s[last..], from_str) {
+    while let Some(mut start) = memmem::find(&s[last..], from_str) {
         start += last;
         writer.partial_write(&s[last..start]);
         writer.partial_write(to_str);
@@ -457,7 +458,7 @@ pub fn left_utf8(lhs: BytesRef, rhs: &Int, writer: BytesWriter) -> Result<BytesG
     let len = s.chars().count();
     let result = if len > rhs {
         let idx = get_utf8_byte_index(s, rhs);
-        s[..idx].as_bytes()
+        &s.as_bytes()[..idx]
     } else {
         s.as_bytes()
     };
@@ -530,9 +531,9 @@ pub fn insert_utf8(
         ulen = slen - upos + 1;
     }
     let mut pw = writer.begin();
-    pw.partial_write(s[0..upos - 1].as_bytes());
+    pw.partial_write(&s.as_bytes()[0..upos - 1]);
     pw.partial_write(newstr.as_bytes());
-    pw.partial_write(s[upos + ulen - 1..].as_bytes());
+    pw.partial_write(&s.as_bytes()[upos + ulen - 1..]);
     Ok(pw.finish())
 }
 
@@ -549,7 +550,7 @@ pub fn right_utf8(lhs: BytesRef, rhs: &Int, writer: BytesWriter) -> Result<Bytes
     let len = s.chars().count();
     let result = if len > rhs {
         let idx = get_utf8_byte_index(s, len - rhs);
-        s[idx..].as_bytes()
+        &s.as_bytes()[idx..]
     } else {
         s.as_bytes()
     };
@@ -595,9 +596,7 @@ pub fn hex_str_arg(arg: BytesRef, writer: BytesWriter) -> Result<BytesGuard> {
 #[rpn_fn]
 #[inline]
 pub fn locate_2_args(substr: BytesRef, s: BytesRef) -> Result<Option<i64>> {
-    Ok(twoway::find_bytes(s, substr)
-        .map(|i| 1 + i as i64)
-        .or(Some(0)))
+    Ok(memmem::find(s, substr).map(|i| 1 + i as i64).or(Some(0)))
 }
 
 #[rpn_fn(writer)]
@@ -614,7 +613,7 @@ pub fn locate_3_args(substr: BytesRef, s: BytesRef, pos: &Int) -> Result<Option<
     if *pos < 1 || *pos as usize > s.len() + 1 {
         return Ok(Some(0));
     }
-    Ok(twoway::find_bytes(&s[*pos as usize - 1..], substr)
+    Ok(memmem::find(&s[*pos as usize - 1..], substr)
         .map(|i| pos + i as i64)
         .or(Some(0)))
 }
@@ -744,9 +743,9 @@ pub fn substring_index(
         return Ok(writer.write_ref(Some(b"")));
     }
     let finder = if count > 0 {
-        twoway::find_bytes
+        memmem::find
     } else {
-        twoway::rfind_bytes
+        memmem::rfind
     };
     let mut remaining = s;
     let mut remaining_pattern_count = count.abs();
@@ -791,9 +790,7 @@ pub fn strcmp<C: Collator>(left: BytesRef, right: BytesRef) -> Result<Option<i64
 #[rpn_fn]
 #[inline]
 pub fn instr(s: BytesRef, substr: BytesRef) -> Result<Option<Int>> {
-    Ok(twoway::find_bytes(s, substr)
-        .map(|i| 1 + i as i64)
-        .or(Some(0)))
+    Ok(memmem::find(s, substr).map(|i| 1 + i as i64).or(Some(0)))
 }
 
 #[rpn_fn]
@@ -801,10 +798,13 @@ pub fn instr(s: BytesRef, substr: BytesRef) -> Result<Option<Int>> {
 pub fn instr_utf8(s: BytesRef, substr: BytesRef) -> Result<Option<Int>> {
     let s = String::from_utf8_lossy(s);
     let substr = String::from_utf8_lossy(substr);
-    let index = twoway::find_str(&s.to_lowercase(), &substr.to_lowercase())
-        .map(|i| s[..i].chars().count())
-        .map(|i| 1 + i as i64)
-        .or(Some(0));
+    let index = memmem::find(
+        s.to_lowercase().as_bytes(),
+        substr.to_lowercase().as_bytes(),
+    )
+    .map(|i| s[..i].chars().count())
+    .map(|i| 1 + i as i64)
+    .or(Some(0));
     Ok(index)
 }
 
@@ -963,11 +963,11 @@ fn line_wrap(buf: &mut [u8], input_len: usize) {
     let line_with_ending_len = line_len + 1;
     let mut old_start = input_len - last_line_len;
     let mut new_start = buf.len() - last_line_len;
-    safemem::copy_over(buf, old_start, new_start, last_line_len);
+    buf.copy_within(old_start..old_start + last_line_len, new_start);
     for _ in 0..lines_with_ending {
         old_start -= line_len;
         new_start -= line_with_ending_len;
-        safemem::copy_over(buf, old_start, new_start, line_len);
+        buf.copy_within(old_start..old_start + line_len, new_start);
         buf[new_start + line_len] = BASE64_LINE_WRAP;
     }
 }
@@ -1128,7 +1128,7 @@ fn substring(input: BytesRef, pos: Int, len: Int, writer: BytesWriter) -> Result
 
 #[cfg(test)]
 mod tests {
-    use std::{f64, i64};
+    use std::f64;
 
     use tidb_query_datatype::{
         builder::FieldTypeBuilder,
@@ -1159,11 +1159,11 @@ mod tests {
             (Some(1024), Some(b"10000000000".to_vec())),
             (None, None),
             (
-                Some(Int::max_value()),
+                Some(Int::MAX),
                 Some(b"111111111111111111111111111111111111111111111111111111111111111".to_vec()),
             ),
             (
-                Some(Int::min_value()),
+                Some(Int::MIN),
                 Some(b"1000000000000000000000000000000000000000000000000000000000000000".to_vec()),
             ),
             (
@@ -2486,7 +2486,7 @@ mod tests {
             ),
             (
                 Some("数据库".as_bytes().to_vec()),
-                Some(i64::max_value()),
+                Some(i64::MAX),
                 Some("数据库".as_bytes().to_vec()),
             ),
             (None, Some(-1), None),
@@ -2531,7 +2531,7 @@ mod tests {
             ),
             (
                 Some("数据库".as_bytes().to_vec()),
-                Some(i64::max_value()),
+                Some(i64::MAX),
                 Some("数据库".as_bytes().to_vec()),
             ),
             (None, Some(-1), None),
@@ -2576,7 +2576,7 @@ mod tests {
             ),
             (
                 Some("数据库".as_bytes().to_vec()),
-                Some(i64::max_value()),
+                Some(i64::MAX),
                 Some("数据库".as_bytes().to_vec()),
             ),
             (None, Some(-1), None),
@@ -2821,7 +2821,7 @@ mod tests {
             ),
             (
                 Some("数据库".as_bytes().to_vec()),
-                Some(i64::max_value()),
+                Some(i64::MAX),
                 Some("数据库".as_bytes().to_vec()),
             ),
             (None, Some(-1), None),
@@ -3366,7 +3366,7 @@ mod tests {
             (Some(0), Some(b"".to_vec())),
             (Some(3), Some(b"   ".to_vec())),
             (Some(-1), Some(b"".to_vec())),
-            (Some(i64::max_value()), None),
+            (Some(i64::MAX), None),
             (
                 Some(i64::from(tidb_query_datatype::MAX_BLOB_WIDTH) + 1),
                 None,
@@ -4453,10 +4453,10 @@ mod tests {
         }
 
         let unsigned_cases = vec![
-            (u64::max_value(), 10, 1, false, None),
-            (u64::max_value(), 10, 4, false, None),
-            (u64::max_value(), 10, 1, true, None),
-            (u64::max_value(), 10, 4, true, None),
+            (u64::MAX, 10, 1, false, None),
+            (u64::MAX, 10, 4, false, None),
+            (u64::MAX, 10, 1, true, None),
+            (u64::MAX, 10, 4, true, None),
             (12u64, 10, 4, false, Some(12)),
         ];
         for case in unsigned_cases {
@@ -4521,12 +4521,12 @@ mod tests {
             ),
             (
                 Some("Sakila".as_bytes().to_vec()),
-                Some(i64::max_value()),
+                Some(i64::MAX),
                 Some("".as_bytes().to_vec()),
             ),
             (
                 Some("Sakila".as_bytes().to_vec()),
-                Some(i64::min_value()),
+                Some(i64::MIN),
                 Some("".as_bytes().to_vec()),
             ),
             (
@@ -4712,12 +4712,12 @@ mod tests {
             ),
             (
                 Some("Sakila".as_bytes().to_vec()),
-                Some(i64::max_value()),
+                Some(i64::MAX),
                 Some("".as_bytes().to_vec()),
             ),
             (
                 Some("Sakila".as_bytes().to_vec()),
-                Some(i64::min_value()),
+                Some(i64::MIN),
                 Some("".as_bytes().to_vec()),
             ),
             (
@@ -4808,24 +4808,24 @@ mod tests {
             (
                 Some("中文a测a试".as_bytes().to_vec()),
                 Some(100),
-                Some(i64::min_value()),
+                Some(i64::MIN),
                 Some("".as_bytes().to_vec()),
             ),
             (
                 Some("中文a测a试".as_bytes().to_vec()),
                 Some(100),
-                Some(i64::max_value()),
+                Some(i64::MAX),
                 Some("".as_bytes().to_vec()),
             ),
             (
                 Some("中文a测a试".as_bytes().to_vec()),
-                Some(i64::min_value()),
+                Some(i64::MIN),
                 Some(1),
                 Some("".as_bytes().to_vec()),
             ),
             (
                 Some("中文a测a试".as_bytes().to_vec()),
-                Some(i64::max_value()),
+                Some(i64::MAX),
                 Some(1),
                 Some("".as_bytes().to_vec()),
             ),
diff --git a/components/tidb_query_expr/src/impl_time.rs b/components/tidb_query_expr/src/impl_time.rs
index 8f299c463ed..0cccb7074c7 100644
--- a/components/tidb_query_expr/src/impl_time.rs
+++ b/components/tidb_query_expr/src/impl_time.rs
@@ -6,25 +6,24 @@ use chrono::{self, DurationRound, Offset, TimeZone};
 use tidb_query_codegen::rpn_fn;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
+    FieldTypeAccessor, FieldTypeFlag,
     codec::{
+        Error, Result as CodecResult,
         convert::ConvertTo,
         data_type::*,
         mysql::{
-            check_fsp,
+            Duration, MAX_FSP, RoundMode, Time, TimeType, Tz, check_fsp,
             duration::{
                 MAX_HOUR_PART, MAX_MINUTE_PART, MAX_NANOS, MAX_NANOS_PART, MAX_SECOND_PART,
                 NANOS_PER_SEC,
             },
             time::{
-                extension::DateTimeExtension, interval::*, weekmode::WeekMode, WeekdayExtension,
-                MONTH_NAMES,
+                MONTH_NAMES, WeekdayExtension, extension::DateTimeExtension, interval::*,
+                weekmode::WeekMode,
             },
-            Duration, RoundMode, Time, TimeType, Tz, MAX_FSP,
         },
-        Error, Result as CodecResult,
     },
     expr::{EvalContext, SqlMode},
-    FieldTypeAccessor, FieldTypeFlag,
 };
 use tipb::{Expr, ExprType};
 
@@ -200,7 +199,7 @@ pub fn year_week_with_mode(ctx: &mut EvalContext, t: &DateTime, mode: &Int) -> R
     let (year, week) = t.year_week(WeekMode::from_bits_truncate(*mode as u32));
     let result = i64::from(week + year * 100);
     if result < 0 {
-        return Ok(Some(i64::from(u32::max_value())));
+        return Ok(Some(i64::from(u32::MAX)));
     }
     Ok(Some(result))
 }
@@ -219,7 +218,7 @@ pub fn year_week_without_mode(ctx: &mut EvalContext, t: &DateTime) -> Result<Opt
     let (year, week) = t.year_week(WeekMode::from_bits_truncate(0u32));
     let result = i64::from(week + year * 100);
     if result < 0 {
-        return Ok(Some(i64::from(u32::max_value())));
+        return Ok(Some(i64::from(u32::MAX)));
     }
     Ok(Some(result))
 }
@@ -957,7 +956,7 @@ pub trait AddSubDateConvertToTime {
     fn to_time(&self, ctx: &mut EvalContext, metadata: &AddSubDateMeta) -> CodecResult<Time>;
 }
 
-impl<'a> AddSubDateConvertToTime for BytesRef<'a> {
+impl AddSubDateConvertToTime for BytesRef<'_> {
     #[inline]
     fn to_time(&self, ctx: &mut EvalContext, metadata: &AddSubDateMeta) -> CodecResult<Time> {
         let input = std::str::from_utf8(self).map_err(Error::Encoding)?;
@@ -1710,10 +1709,7 @@ fn get_micro_timestamp(time: &DateTime, tz: &Tz) -> Result<i64> {
 #[rpn_fn(capture = [ctx])]
 #[inline]
 pub fn unix_timestamp_int(ctx: &mut EvalContext, time: &DateTime) -> Result<Option<i64>> {
-    let timestamp = match get_micro_timestamp(time, &ctx.cfg.tz) {
-        Ok(val) => val,
-        Err(err) => return Err(err),
-    };
+    let timestamp = get_micro_timestamp(time, &ctx.cfg.tz)?;
 
     let res: std::result::Result<i64, Error> =
         unix_timestamp_to_mysql_unix_timestamp(ctx, timestamp, 1)?
@@ -1729,10 +1725,7 @@ pub fn unix_timestamp_decimal(
     extra: &RpnFnCallExtra,
     time: &DateTime,
 ) -> Result<Option<Decimal>> {
-    let timestamp = match get_micro_timestamp(time, &ctx.cfg.tz) {
-        Ok(val) => val,
-        Err(err) => return Err(err),
-    };
+    let timestamp = get_micro_timestamp(time, &ctx.cfg.tz)?;
 
     let res = unix_timestamp_to_mysql_unix_timestamp(
         ctx,
@@ -1862,21 +1855,21 @@ mod tests {
     use std::{str::FromStr, sync::Arc};
 
     use tidb_query_datatype::{
+        FieldTypeTp,
         builder::FieldTypeBuilder,
         codec::{
             batch::LazyBatchColumnVec,
             data_type::*,
             error::ERR_TRUNCATE_WRONG_VALUE,
-            mysql::{Time, MAX_FSP},
+            mysql::{MAX_FSP, Time},
         },
         expr::EvalConfig,
-        FieldTypeTp,
     };
     use tipb::{FieldType, ScalarFuncSig};
     use tipb_helper::ExprDefBuilder;
 
     use super::*;
-    use crate::{types::test_util::RpnFnScalarEvaluator, RpnExpressionBuilder};
+    use crate::{RpnExpressionBuilder, types::test_util::RpnFnScalarEvaluator};
 
     #[test]
     fn test_add_duration_and_duration() {
diff --git a/components/tidb_query_expr/src/impl_vec.rs b/components/tidb_query_expr/src/impl_vec.rs
index 1c7dcd3d43b..1ebe423e2ae 100644
--- a/components/tidb_query_expr/src/impl_vec.rs
+++ b/components/tidb_query_expr/src/impl_vec.rs
@@ -48,14 +48,11 @@ fn vec_cosine_distance(a: VectorFloat32Ref, b: VectorFloat32Ref) -> Result<Optio
 #[inline]
 fn vec_l2_norm(a: VectorFloat32Ref) -> Result<Option<Real>> {
     // TiKV does not support NaN. This turns NaN into null
-    Ok(Real::new(a.l2_norm()?).ok())
+    Ok(Real::new(a.l2_norm()).ok())
 }
 
-// note: The distance calculated by the simd instruction will
-// be different depending on the platform. The following is based on x86.
 #[cfg(test)]
 mod tests {
-
     use tipb::ScalarFuncSig;
 
     use super::*;
@@ -72,7 +69,7 @@ mod tests {
             (vec![1.0, 2.0, 3.0], Some(3)),
         ];
         for (arg, expected_output) in cases {
-            let arg = VectorFloat32::copy_from_f32(&arg);
+            let arg = VectorFloat32::from_f32(arg).unwrap();
             let output: Option<Int> = RpnFnScalarEvaluator::new()
                 .push_param(arg)
                 .evaluate(ScalarFuncSig::VecDimsSig)
@@ -90,7 +87,7 @@ mod tests {
         ];
 
         for (arg, expected_output) in cases {
-            let arg = VectorFloat32::copy_from_f32(&arg);
+            let arg = VectorFloat32::from_f32(arg).unwrap();
             let output: Option<Real> = RpnFnScalarEvaluator::new()
                 .push_param(arg)
                 .evaluate(ScalarFuncSig::VecL2NormSig)
@@ -108,8 +105,8 @@ mod tests {
             (Some(vec![1.0, 2.0]), None, None),
         ];
         for (arg1, arg2, expected_output) in ok_cases {
-            let arg1 = arg1.map(|v| VectorFloat32::copy_from_f32(v.as_slice()));
-            let arg2 = arg2.map(|v| VectorFloat32::copy_from_f32(v.as_slice()));
+            let arg1 = arg1.map(|v| VectorFloat32::from_f32(v).unwrap());
+            let arg2 = arg2.map(|v| VectorFloat32::from_f32(v).unwrap());
             let output: Option<Real> = RpnFnScalarEvaluator::new()
                 .push_param(arg1)
                 .push_param(arg2)
@@ -120,8 +117,8 @@ mod tests {
 
         let err_cases = vec![(vec![1.0, 2.0], vec![3.0])];
         for (arg1, arg2) in err_cases {
-            let arg1 = VectorFloat32::copy_from_f32(&arg1);
-            let arg2 = VectorFloat32::copy_from_f32(&arg2);
+            let arg1 = VectorFloat32::from_f32(arg1).unwrap();
+            let arg2 = VectorFloat32::from_f32(arg2).unwrap();
             let output: Result<Option<Real>> = RpnFnScalarEvaluator::new()
                 .push_param(arg1)
                 .push_param(arg2)
@@ -138,8 +135,8 @@ mod tests {
             (Some(vec![1.0, 2.0]), None, None),
         ];
         for (arg1, arg2, expected_output) in ok_cases {
-            let arg1 = arg1.map(|v| VectorFloat32::copy_from_f32(v.as_slice()));
-            let arg2 = arg2.map(|v| VectorFloat32::copy_from_f32(v.as_slice()));
+            let arg1 = arg1.map(|v| VectorFloat32::from_f32(v).unwrap());
+            let arg2 = arg2.map(|v| VectorFloat32::from_f32(v).unwrap());
             let output: Option<Real> = RpnFnScalarEvaluator::new()
                 .push_param(arg1)
                 .push_param(arg2)
@@ -150,8 +147,8 @@ mod tests {
 
         let err_cases = vec![(vec![1.0, 2.0], vec![3.0])];
         for (arg1, arg2) in err_cases {
-            let arg1 = VectorFloat32::copy_from_f32(&arg1);
-            let arg2 = VectorFloat32::copy_from_f32(&arg2);
+            let arg1 = VectorFloat32::from_f32(arg1).unwrap();
+            let arg2 = VectorFloat32::from_f32(arg2).unwrap();
             let output: Result<Option<Real>> = RpnFnScalarEvaluator::new()
                 .push_param(arg1)
                 .push_param(arg2)
@@ -164,46 +161,30 @@ mod tests {
     fn test_cosine_distance() {
         let ok_cases = vec![
             (Some(vec![1.0, 2.0]), Some(vec![2.0, 4.0]), Some(0.0)),
-            (Some(vec![1.0, 2.0]), Some(vec![0.0, 0.0]), Some(1.0)),
+            (Some(vec![1.0, 2.0]), Some(vec![0.0, 0.0]), None), // NaN turns to NULL
             (Some(vec![1.0, 1.0]), Some(vec![1.0, 1.0]), Some(0.0)),
             (Some(vec![1.0, 0.0]), Some(vec![0.0, 2.0]), Some(1.0)),
             (Some(vec![1.0, 1.0]), Some(vec![-1.0, -1.0]), Some(2.0)),
             (Some(vec![1.0, 1.0]), Some(vec![1.1, 1.1]), Some(0.0)),
             (Some(vec![1.0, 1.0]), Some(vec![-1.1, -1.1]), Some(2.0)),
-            (Some(vec![3e38]), Some(vec![3e38]), Some(0.0)),
+            (Some(vec![3e38]), Some(vec![3e38]), None), // NaN turns to NULL
             (Some(vec![1.0, 2.0]), None, None),
         ];
         for (arg1, arg2, expected_output) in ok_cases {
-            let arg1 = arg1.map(|v| VectorFloat32::copy_from_f32(v.as_slice()));
-            let arg2 = arg2.map(|v| VectorFloat32::copy_from_f32(v.as_slice()));
+            let arg1 = arg1.map(|v| VectorFloat32::from_f32(v).unwrap());
+            let arg2 = arg2.map(|v| VectorFloat32::from_f32(v).unwrap());
             let output: Option<Real> = RpnFnScalarEvaluator::new()
                 .push_param(arg1)
                 .push_param(arg2)
                 .evaluate(ScalarFuncSig::VecCosineDistanceSig)
                 .unwrap();
-            match (output, expected_output.map(|x| Real::new(x).unwrap())) {
-                (Some(output_val), Some(expected_val)) => {
-                    let diff = (output_val - expected_val).abs();
-                    assert!(
-                        diff < 1e-6,
-                        "assertion failed: |{} - {}| = {} > 1e-6",
-                        output_val,
-                        expected_val,
-                        diff
-                    );
-                }
-                (None, None) => {}
-                _ => panic!(
-                    "Mismatched variants: output {:?}, expected {:?}",
-                    output, expected_output
-                ),
-            }
+            assert_eq!(output, expected_output.map(|x| Real::new(x).unwrap()));
         }
 
         let err_cases = vec![(vec![1.0, 2.0], vec![3.0])];
         for (arg1, arg2) in err_cases {
-            let arg1 = VectorFloat32::copy_from_f32(&arg1);
-            let arg2 = VectorFloat32::copy_from_f32(&arg2);
+            let arg1 = VectorFloat32::from_f32(arg1).unwrap();
+            let arg2 = VectorFloat32::from_f32(arg2).unwrap();
             let output: Result<Option<Real>> = RpnFnScalarEvaluator::new()
                 .push_param(arg1)
                 .push_param(arg2)
@@ -221,8 +202,8 @@ mod tests {
             (Some(vec![1.0, 2.0]), None, None),
         ];
         for (arg1, arg2, expected_output) in ok_cases {
-            let arg1 = arg1.map(|v| VectorFloat32::copy_from_f32(v.as_slice()));
-            let arg2 = arg2.map(|v| VectorFloat32::copy_from_f32(v.as_slice()));
+            let arg1 = arg1.map(|v| VectorFloat32::from_f32(v).unwrap());
+            let arg2 = arg2.map(|v| VectorFloat32::from_f32(v).unwrap());
             let output: Option<Real> = RpnFnScalarEvaluator::new()
                 .push_param(arg1)
                 .push_param(arg2)
@@ -233,8 +214,8 @@ mod tests {
 
         let err_cases = vec![(vec![1.0, 2.0], vec![3.0])];
         for (arg1, arg2) in err_cases {
-            let arg1 = VectorFloat32::copy_from_f32(&arg1);
-            let arg2 = VectorFloat32::copy_from_f32(&arg2);
+            let arg1 = VectorFloat32::from_f32(arg1).unwrap();
+            let arg2 = VectorFloat32::from_f32(arg2).unwrap();
             let output: Result<Option<Real>> = RpnFnScalarEvaluator::new()
                 .push_param(arg1)
                 .push_param(arg2)
diff --git a/components/tidb_query_expr/src/lib.rs b/components/tidb_query_expr/src/lib.rs
index e91f7c56c4e..a7f28b25a43 100644
--- a/components/tidb_query_expr/src/lib.rs
+++ b/components/tidb_query_expr/src/lib.rs
@@ -13,8 +13,6 @@
 #![feature(proc_macro_hygiene)]
 #![feature(specialization)]
 #![feature(test)]
-#![feature(const_mut_refs)]
-#![feature(round_ties_even)]
 
 #[macro_use(box_err, box_try, try_opt)]
 extern crate tikv_util;
@@ -46,12 +44,12 @@ pub mod impl_vec;
 
 use tidb_query_common::Result;
 use tidb_query_datatype::{
+    Charset, Collation, FieldTypeAccessor, FieldTypeFlag,
     codec::{
         collation::{Charset as _, Collator},
         data_type::*,
     },
-    match_template_charset, match_template_collator, match_template_multiple_collators, Charset,
-    Collation, FieldTypeAccessor, FieldTypeFlag,
+    match_template_charset, match_template_collator, match_template_multiple_collators,
 };
 use tipb::{Expr, FieldType, ScalarFuncSig};
 
diff --git a/components/tidb_query_expr/src/types/expr_builder.rs b/components/tidb_query_expr/src/types/expr_builder.rs
index 2c5590e3f1e..9c85c45dc83 100644
--- a/components/tidb_query_expr/src/types/expr_builder.rs
+++ b/components/tidb_query_expr/src/types/expr_builder.rs
@@ -5,12 +5,13 @@ use std::convert::{TryFrom, TryInto};
 use codec::prelude::NumberDecoder;
 use tidb_query_common::Result;
 use tidb_query_datatype::{
+    EvalType, FieldTypeAccessor,
     codec::{
         data_type::*,
-        mysql::{EnumDecoder, JsonDecoder, VectorFloat32Decoder, MAX_FSP},
+        mysql::{EnumDecoder, JsonDecoder, MAX_FSP, VectorFloat32Decoder},
     },
     expr::EvalContext,
-    match_template_evaltype, EvalType, FieldTypeAccessor,
+    match_template_evaltype,
 };
 use tipb::{Expr, ExprType, FieldType};
 
diff --git a/components/tidb_query_expr/src/types/expr_eval.rs b/components/tidb_query_expr/src/types/expr_eval.rs
index 94d620f4f9a..cb7f0e37b59 100644
--- a/components/tidb_query_expr/src/types/expr_eval.rs
+++ b/components/tidb_query_expr/src/types/expr_eval.rs
@@ -2,7 +2,7 @@
 
 use tidb_query_common::Result;
 pub use tidb_query_datatype::codec::data_type::{
-    LogicalRows, BATCH_MAX_SIZE, IDENTICAL_LOGICAL_ROWS,
+    BATCH_MAX_SIZE, IDENTICAL_LOGICAL_ROWS, LogicalRows,
 };
 use tidb_query_datatype::{
     codec::{batch::LazyBatchColumnVec, data_type::*},
@@ -11,8 +11,8 @@ use tidb_query_datatype::{
 use tipb::FieldType;
 
 use super::{
-    expr::{RpnExpression, RpnExpressionNode},
     RpnFnCallExtra,
+    expr::{RpnExpression, RpnExpressionNode},
 };
 
 /// Represents a vector value node in the RPN stack.
@@ -35,7 +35,7 @@ pub enum RpnStackNodeVectorValue<'a> {
     },
 }
 
-impl<'a> RpnStackNodeVectorValue<'a> {
+impl RpnStackNodeVectorValue<'_> {
     /// Gets a reference to the inner physical vector value.
     pub fn as_ref(&self) -> &VectorValue {
         match self {
@@ -120,7 +120,7 @@ pub enum RpnStackNode<'a> {
     },
 }
 
-impl<'a> RpnStackNode<'a> {
+impl RpnStackNode<'_> {
     /// Gets the field type.
     #[inline]
     pub fn field_type(&self) -> &FieldType {
@@ -332,23 +332,23 @@ impl RpnExpression {
 mod tests {
     #![allow(clippy::float_cmp)]
 
-    use test::{black_box, Bencher};
+    use test::{Bencher, black_box};
     use tidb_query_codegen::rpn_fn;
     use tidb_query_common::Result;
     use tidb_query_datatype::{
+        EvalType, FieldTypeAccessor, FieldTypeTp,
         codec::{
             batch::LazyBatchColumn,
             data_type::*,
             datum::{Datum, DatumEncoder},
         },
         expr::EvalContext,
-        EvalType, FieldTypeAccessor, FieldTypeTp,
     };
     use tipb::FieldType;
     use tipb_helper::ExprDefBuilder;
 
     use super::*;
-    use crate::{impl_arithmetic::*, impl_compare::*, RpnExpressionBuilder, RpnFnMeta};
+    use crate::{RpnExpressionBuilder, RpnFnMeta, impl_arithmetic::*, impl_compare::*};
 
     /// Single constant node
     #[test]
@@ -1436,9 +1436,9 @@ mod benches {
     use tidb_query_codegen::rpn_fn;
     use tidb_query_common::Result;
     use tidb_query_datatype::{
+        EvalType, FieldTypeTp,
         codec::{batch::LazyBatchColumn, data_type::*},
         expr::EvalContext,
-        EvalType, FieldTypeTp,
     };
 
     use super::*;
diff --git a/components/tidb_query_expr/src/types/function.rs b/components/tidb_query_expr/src/types/function.rs
index 4912c6439d5..5fa4d13dd34 100644
--- a/components/tidb_query_expr/src/types/function.rs
+++ b/components/tidb_query_expr/src/types/function.rs
@@ -26,10 +26,10 @@ use std::{any::Any, convert::TryFrom, marker::PhantomData};
 
 use static_assertions::assert_eq_size;
 use tidb_query_common::Result;
-use tidb_query_datatype::{codec::data_type::*, expr::EvalContext, EvalType, FieldTypeAccessor};
+use tidb_query_datatype::{EvalType, FieldTypeAccessor, codec::data_type::*, expr::EvalContext};
 use tipb::{Expr, FieldType};
 
-use super::{expr_eval::LogicalRows, RpnStackNode};
+use super::{RpnStackNode, expr_eval::LogicalRows};
 
 /// Metadata of an RPN function.
 #[derive(Clone, Copy)]
diff --git a/components/tidb_query_expr/src/types/mod.rs b/components/tidb_query_expr/src/types/mod.rs
index 8aa09b4051e..63e0f51c0be 100644
--- a/components/tidb_query_expr/src/types/mod.rs
+++ b/components/tidb_query_expr/src/types/mod.rs
@@ -10,6 +10,6 @@ pub mod test_util;
 pub use self::{
     expr::{RpnExpression, RpnExpressionNode},
     expr_builder::RpnExpressionBuilder,
-    expr_eval::{RpnStackNode, BATCH_MAX_SIZE},
+    expr_eval::{BATCH_MAX_SIZE, RpnStackNode},
     function::{RpnFnCallExtra, RpnFnMeta},
 };
diff --git a/components/tidb_query_expr/src/types/test_util.rs b/components/tidb_query_expr/src/types/test_util.rs
index 36c93ef9247..77e14ae330f 100644
--- a/components/tidb_query_expr/src/types/test_util.rs
+++ b/components/tidb_query_expr/src/types/test_util.rs
@@ -12,7 +12,7 @@ use tidb_query_datatype::{
 };
 use tipb::{Expr, ExprType, FieldType, ScalarFuncSig};
 
-use crate::{types::function::RpnFnMeta, RpnExpressionBuilder};
+use crate::{RpnExpressionBuilder, types::function::RpnFnMeta};
 
 /// Helper utility to evaluate RPN function over scalar inputs.
 ///
@@ -116,11 +116,7 @@ impl RpnFnScalarEvaluator {
         ret_field_type: impl Into<FieldType>,
         sig: ScalarFuncSig,
     ) -> (Result<ScalarValue>, EvalContext) {
-        let mut context = match self.context {
-            Some(ctx) => ctx,
-            None => EvalContext::default(),
-        };
-
+        let mut context = self.context.unwrap_or_default();
         // Children expr descriptors are needed to map the signature into the actual
         // function impl.
         let children_ed: Vec<_> = self
diff --git a/components/tikv_alloc/Cargo.toml b/components/tikv_alloc/Cargo.toml
index 31e0ea0e804..a33c14eed12 100644
--- a/components/tikv_alloc/Cargo.toml
+++ b/components/tikv_alloc/Cargo.toml
@@ -48,3 +48,6 @@ features = ["stats"]
 version = "0.5.0"
 optional = true
 features = ["unprefixed_malloc_on_supported_platforms", "stats"]
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
diff --git a/components/tikv_alloc/src/jemalloc.rs b/components/tikv_alloc/src/jemalloc.rs
index d504d4956c7..b610dae1a78 100644
--- a/components/tikv_alloc/src/jemalloc.rs
+++ b/components/tikv_alloc/src/jemalloc.rs
@@ -11,7 +11,7 @@ use std::{
 };
 
 use libc::{self, c_char, c_void};
-use tikv_jemalloc_ctl::{epoch, stats, Error};
+use tikv_jemalloc_ctl::{Error, epoch, stats};
 use tikv_jemalloc_sys::malloc_stats_print;
 
 use super::error::{ProfError, ProfResult};
diff --git a/components/tikv_alloc/src/trace.rs b/components/tikv_alloc/src/trace.rs
index 00429438c2e..c1be5ce8dfd 100644
--- a/components/tikv_alloc/src/trace.rs
+++ b/components/tikv_alloc/src/trace.rs
@@ -23,8 +23,8 @@ use std::{
     num::NonZeroU64,
     ops::{Add, Deref, DerefMut},
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
 };
 
diff --git a/components/tikv_kv/src/btree_engine.rs b/components/tikv_kv/src/btree_engine.rs
index 04a14059eb1..52fbb83eb13 100644
--- a/components/tikv_kv/src/btree_engine.rs
+++ b/components/tikv_kv/src/btree_engine.rs
@@ -14,10 +14,10 @@ use std::{
 use collections::HashMap;
 use engine_panic::PanicEngine;
 use engine_traits::{
-    CfName, IterMetricsCollector, IterOptions, MetricsExt, ReadOptions, CF_DEFAULT, CF_LOCK,
-    CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_WRITE, CfName, IterMetricsCollector, IterOptions, MetricsExt,
+    ReadOptions,
 };
-use futures::{future, stream, Future, Stream};
+use futures::{Future, Stream, future, stream};
 use kvproto::kvrpcpb::Context;
 use txn_types::{Key, Value};
 
@@ -45,7 +45,7 @@ impl BTreeEngine {
         let mut cf_contents = vec![];
 
         // create default cf if missing
-        if !cfs.iter().any(|&c| c == CF_DEFAULT) {
+        if !cfs.contains(&CF_DEFAULT) {
             cf_names.push(CF_DEFAULT);
             cf_contents.push(Arc::new(RwLock::new(BTreeMap::new())))
         }
@@ -115,7 +115,9 @@ impl Engine for BTreeEngine {
     }
 
     type IMSnap = Self::Snap;
-    type IMSnapshotRes = Self::SnapshotRes;
+    // TODO: revert this once https://github.com/rust-lang/rust/issues/140222 is fixed.
+    // type IMSnapshotRes = Self::SnapshotRes;
+    type IMSnapshotRes = impl Future<Output = EngineResult<Self::Snap>> + Send;
     fn async_in_memory_snapshot(&mut self, ctx: SnapContext<'_>) -> Self::IMSnapshotRes {
         self.async_snapshot(ctx)
     }
@@ -329,7 +331,7 @@ pub mod tests {
     use engine_traits::IterOptions;
 
     use super::{
-        super::{tests::*, CfStatistics, TEST_ENGINE_CFS},
+        super::{CfStatistics, TEST_ENGINE_CFS, tests::*},
         *,
     };
     use crate::{Cursor, ScanMode};
diff --git a/components/tikv_kv/src/cursor.rs b/components/tikv_kv/src/cursor.rs
index 04eb44a5716..10b8ef5f45c 100644
--- a/components/tikv_kv/src/cursor.rs
+++ b/components/tikv_kv/src/cursor.rs
@@ -2,7 +2,7 @@
 
 use std::{cell::Cell, cmp::Ordering, ops::Bound};
 
-use engine_traits::{CfName, IterOptions, DATA_KEY_PREFIX_LEN};
+use engine_traits::{CfName, DATA_KEY_PREFIX_LEN, IterOptions};
 use tikv_util::{
     keybuilder::KeyBuilder, metrics::CRITICAL_ERROR, panic_when_unexpected_key_or_data,
     set_panic_mark,
@@ -10,8 +10,8 @@ use tikv_util::{
 use txn_types::{Key, TimeStamp};
 
 use crate::{
+    CfStatistics, Error, Iterator, Result, SEEK_BOUND, ScanMode, Snapshot,
     stats::{StatsCollector, StatsKind},
-    CfStatistics, Error, Iterator, Result, ScanMode, Snapshot, SEEK_BOUND,
 };
 
 pub struct Cursor<I: Iterator> {
@@ -83,11 +83,7 @@ impl<I: Iterator> Cursor<I> {
         });
 
         assert_ne!(self.scan_mode, ScanMode::Backward);
-        if self
-            .max_key
-            .as_ref()
-            .map_or(false, |k| k <= key.as_encoded())
-        {
+        if self.max_key.as_ref().is_some_and(|k| k <= key.as_encoded()) {
             self.iter.validate_key(key)?;
             return Ok(false);
         }
@@ -130,11 +126,7 @@ impl<I: Iterator> Cursor<I> {
         {
             return Ok(true);
         }
-        if self
-            .max_key
-            .as_ref()
-            .map_or(false, |k| k <= key.as_encoded())
-        {
+        if self.max_key.as_ref().is_some_and(|k| k <= key.as_encoded()) {
             self.iter.validate_key(key)?;
             return Ok(false);
         }
@@ -201,11 +193,7 @@ impl<I: Iterator> Cursor<I> {
 
     pub fn seek_for_prev(&mut self, key: &Key, statistics: &mut CfStatistics) -> Result<bool> {
         assert_ne!(self.scan_mode, ScanMode::Forward);
-        if self
-            .min_key
-            .as_ref()
-            .map_or(false, |k| k >= key.as_encoded())
-        {
+        if self.min_key.as_ref().is_some_and(|k| k >= key.as_encoded()) {
             self.iter.validate_key(key)?;
             return Ok(false);
         }
@@ -238,11 +226,7 @@ impl<I: Iterator> Cursor<I> {
             return Ok(true);
         }
 
-        if self
-            .min_key
-            .as_ref()
-            .map_or(false, |k| k >= key.as_encoded())
-        {
+        if self.min_key.as_ref().is_some_and(|k| k >= key.as_encoded()) {
             self.iter.validate_key(key)?;
             return Ok(false);
         }
@@ -585,10 +569,10 @@ impl<'a, S: 'a + Snapshot> CursorBuilder<'a, S> {
 #[cfg(test)]
 mod tests {
     use engine_rocks::{
-        util::{new_engine_opt, FixedPrefixSliceTransform},
         RocksCfOptions, RocksDbOptions, RocksEngine, RocksSnapshot,
+        util::{FixedPrefixSliceTransform, new_engine_opt},
     };
-    use engine_traits::{IterOptions, SyncMutable, CF_DEFAULT};
+    use engine_traits::{CF_DEFAULT, IterOptions, SyncMutable};
     use keys::data_key;
     use kvproto::metapb::{Peer, Region};
     use raftstore::store::RegionSnapshot;
diff --git a/components/tikv_kv/src/lib.rs b/components/tikv_kv/src/lib.rs
index 96fa7c63ce3..db2a30444a1 100644
--- a/components/tikv_kv/src/lib.rs
+++ b/components/tikv_kv/src/lib.rs
@@ -5,7 +5,6 @@
 //! [`Server`](crate::server::Server). The [`BTreeEngine`](kv::BTreeEngine) and
 //! [`RocksEngine`](RocksEngine) are used for testing only.
 
-#![feature(bound_map)]
 #![feature(min_specialization)]
 #![feature(type_alias_impl_trait)]
 #![feature(impl_trait_in_assoc_type)]
@@ -37,8 +36,8 @@ use std::{
 
 use collections::HashMap;
 use engine_traits::{
-    CfName, IterOptions, KvEngine as LocalEngine, MetricsExt, Mutable, MvccProperties, ReadOptions,
-    TabletRegistry, WriteBatch, CF_DEFAULT, CF_LOCK,
+    CF_DEFAULT, CF_LOCK, CfName, IterOptions, KvEngine as LocalEngine, MetricsExt, Mutable,
+    MvccProperties, ReadOptions, TabletRegistry, WriteBatch,
 };
 use error_code::{self, ErrorCode, ErrorCodeExt};
 use futures::{future::BoxFuture, prelude::*};
@@ -47,10 +46,14 @@ use kvproto::{
     errorpb::Error as ErrorHeader,
     import_sstpb::SstMeta,
     kvrpcpb::{Context, DiskFullOpt, ExtraOp as TxnExtraOp, KeyRange},
+    metapb::{Peer, RegionEpoch},
     raft_cmdpb,
 };
 use pd_client::BucketMeta;
-use raftstore::store::{PessimisticLockPair, TxnExt};
+use raftstore::{
+    SeekRegionCallback,
+    store::{PessimisticLockPair, TxnExt},
+};
 use thiserror::Error;
 use tikv_util::{
     deadline::Deadline, escape, future::block_on_timeout, memory::HeapSize, time::ThreadReadId,
@@ -65,8 +68,8 @@ pub use self::{
     raft_extension::{FakeExtension, RaftExtension},
     rocksdb_engine::{RocksEngine, RocksSnapshot},
     stats::{
-        CfStatistics, FlowStatistics, FlowStatsReporter, LoadDataHint, StageLatencyStats,
-        Statistics, StatisticsSummary, RAW_VALUE_TOMBSTONE,
+        CfStatistics, FlowStatistics, FlowStatsReporter, LoadDataHint, RAW_VALUE_TOMBSTONE,
+        StageLatencyStats, Statistics, StatisticsSummary,
     },
 };
 
@@ -323,6 +326,14 @@ impl WriteEvent {
     }
 }
 
+#[derive(Debug, Clone, PartialEq)]
+pub struct ExtraRegionOverride {
+    pub region_id: u64,
+    pub region_epoch: RegionEpoch,
+    pub peer: Peer,
+    pub check_term: Option<u64>,
+}
+
 #[derive(Debug, Clone, Default)]
 pub struct SnapContext<'a> {
     pub pb_ctx: &'a Context,
@@ -336,6 +347,15 @@ pub struct SnapContext<'a> {
     pub key_ranges: Vec<KeyRange>,
     // Marks that this snapshot request is allowed in the flashback state.
     pub allowed_in_flashback: bool,
+    // extra_region_override overrides some context fields in the `pb_ctx` for the secondary
+    // regions.
+    // The "extra region" means the regions that are not the source region
+    // in a request.
+    // For example, if a cop-task contains a `IndexLookUp` executor which needs to
+    // access look up the primary rows,
+    // it will set this field to get the extra region snapshot
+    // in lookup phase.
+    pub extra_region_override: Option<ExtraRegionOverride>,
 }
 
 /// Engine defines the common behaviour for a storage engine type.
@@ -465,6 +485,13 @@ pub trait Engine: Send + Clone + 'static {
     /// the engine there is probably a notable difference in range, so
     /// engine may update its statistics.
     fn hint_change_in_range(&self, _start_key: Vec<u8>, _end_key: Vec<u8>) {}
+
+    /// seek the regions from the specified key
+    /// The argument `from` should be the comparable format, you should use
+    /// `Key::from_raw` encode the raw key.
+    fn seek_region(&self, _from: &[u8], _callback: SeekRegionCallback) -> Result<()> {
+        Err(box_err!("not supported"))
+    }
 }
 
 /// A Snapshot is a consistent view of the underlying engine at a given point in
@@ -1192,8 +1219,8 @@ pub mod tests {
                     Some((format!("key_{}", i / 2 * 2), format!("value_{}", i / 2)))
                 } else {
                     Some((
-                        format!("key_{}", (i + 1) / 2 * 2),
-                        format!("value_{}", (i + 1) / 2),
+                        format!("key_{}", i.div_ceil(2) * 2),
+                        format!("value_{}", i.div_ceil(2)),
                     ))
                 }
             } else if seek_mode != SeekMode::Normal {
diff --git a/components/tikv_kv/src/mock_engine.rs b/components/tikv_kv/src/mock_engine.rs
index dec1ac0b9a2..038d735654b 100644
--- a/components/tikv_kv/src/mock_engine.rs
+++ b/components/tikv_kv/src/mock_engine.rs
@@ -19,6 +19,7 @@ pub struct MockEngine {
     base: RocksEngine,
     expected_modifies: Option<Arc<ExpectedWriteList>>,
     last_modifies: Arc<Mutex<Vec<Vec<Modify>>>>,
+    pre_async_snapshot: Option<Arc<Box<dyn Fn(&SnapContext<'_>) + Send + Sync + 'static>>>,
 }
 
 impl MockEngine {
@@ -26,6 +27,10 @@ impl MockEngine {
         let mut last_modifies = self.last_modifies.lock().unwrap();
         std::mem::take(&mut last_modifies)
     }
+
+    pub fn rocks_engine(&self) -> &RocksEngine {
+        &self.base
+    }
 }
 
 #[derive(Debug, Clone, Default, PartialEq)]
@@ -164,6 +169,9 @@ impl Engine for MockEngine {
 
     type SnapshotRes = <RocksEngine as Engine>::SnapshotRes;
     fn async_snapshot(&mut self, ctx: SnapContext<'_>) -> Self::SnapshotRes {
+        if let Some(f) = self.pre_async_snapshot.as_ref() {
+            f(&ctx);
+        }
         self.base.async_snapshot(ctx)
     }
 
@@ -199,6 +207,7 @@ impl Engine for MockEngine {
 pub struct MockEngineBuilder {
     base: RocksEngine,
     expected_modifies: Option<LinkedList<ExpectedWrite>>,
+    pre_async_snapshot: Option<Arc<Box<dyn Fn(&SnapContext<'_>) + Send + Sync + 'static>>>,
 }
 
 impl MockEngineBuilder {
@@ -206,6 +215,7 @@ impl MockEngineBuilder {
         Self {
             base: rocks_engine,
             expected_modifies: None,
+            pre_async_snapshot: None,
         }
     }
 
@@ -222,6 +232,15 @@ impl MockEngineBuilder {
         self
     }
 
+    #[must_use]
+    pub fn set_pre_async_snapshot<F>(mut self, f: F) -> Self
+    where
+        F: Fn(&SnapContext<'_>) + Send + Sync + 'static,
+    {
+        self.pre_async_snapshot = Some(Arc::new(Box::new(f)));
+        self
+    }
+
     pub fn build(self) -> MockEngine {
         MockEngine {
             base: self.base,
@@ -229,6 +248,7 @@ impl MockEngineBuilder {
                 .expected_modifies
                 .map(|m| Arc::new(ExpectedWriteList(Mutex::new(m)))),
             last_modifies: Arc::new(Mutex::new(Vec::new())),
+            pre_async_snapshot: self.pre_async_snapshot,
         }
     }
 }
diff --git a/components/tikv_kv/src/raftstore_impls.rs b/components/tikv_kv/src/raftstore_impls.rs
index 74dffce30ca..f7bffa3987b 100644
--- a/components/tikv_kv/src/raftstore_impls.rs
+++ b/components/tikv_kv/src/raftstore_impls.rs
@@ -6,8 +6,8 @@ use engine_traits::{CfName, IterOptions, Peekable, ReadOptions, Snapshot};
 use kvproto::kvrpcpb::ExtraOp as TxnExtraOp;
 use pd_client::BucketMeta;
 use raftstore::{
-    store::{RegionIterator, RegionSnapshot, TxnExt},
     Error as RaftServerError,
+    store::{RegionIterator, RegionSnapshot, TxnExt},
 };
 use txn_types::{Key, Value};
 
@@ -26,7 +26,7 @@ pub struct RegionSnapshotExt<'a, S: Snapshot> {
     snapshot: &'a RegionSnapshot<S>,
 }
 
-impl<'a, S: Snapshot> SnapshotExt for RegionSnapshotExt<'a, S> {
+impl<S: Snapshot> SnapshotExt for RegionSnapshotExt<'_, S> {
     #[inline]
     fn get_data_version(&self) -> Option<u64> {
         self.snapshot.get_data_version().ok()
diff --git a/components/tikv_kv/src/rocksdb_engine.rs b/components/tikv_kv/src/rocksdb_engine.rs
index e67d88bc687..a877c53cc51 100644
--- a/components/tikv_kv/src/rocksdb_engine.rs
+++ b/components/tikv_kv/src/rocksdb_engine.rs
@@ -4,8 +4,8 @@ use std::{
     fmt::{self, Debug, Display, Formatter},
     pin::Pin,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, Ordering},
     },
     task::Poll,
     time::Duration,
@@ -14,25 +14,29 @@ use std::{
 use collections::HashMap;
 pub use engine_rocks::RocksSnapshot;
 use engine_rocks::{
-    get_env, RocksCfOptions, RocksDbOptions, RocksEngine as BaseRocksEngine, RocksEngineIterator,
+    RocksCfOptions, RocksDbOptions, RocksEngine as BaseRocksEngine, RocksEngineIterator, get_env,
 };
 use engine_traits::{
     CfName, Engines, IterOptions, Iterable, Iterator, KvEngine, Peekable, ReadOptions,
 };
 use file_system::IoRateLimiter;
 use futures::{
+    Future, Stream,
     channel::{mpsc, oneshot},
-    stream, Future, Stream,
+    stream,
 };
 use kvproto::{kvrpcpb::Context, metapb, raft_cmdpb};
-use raftstore::coprocessor::CoprocessorHost;
+use raftstore::{
+    SeekRegionCallback,
+    coprocessor::{CoprocessorHost, RegionInfoProvider},
+};
 use tempfile::{Builder, TempDir};
 use tikv_util::worker::{Runnable, Scheduler, Worker};
 use txn_types::{Key, Value};
 
 use super::{
-    write_modifies, Callback, DummySnapshotExt, Engine, Error, ErrorInner,
-    Iterator as EngineIterator, Modify, Result, SnapContext, Snapshot, WriteData,
+    Callback, DummySnapshotExt, Engine, Error, ErrorInner, Iterator as EngineIterator, Modify,
+    Result, SnapContext, Snapshot, WriteData, write_modifies,
 };
 use crate::{FakeExtension, OnAppliedCb, RaftExtension, WriteEvent};
 
@@ -93,6 +97,7 @@ pub struct RocksEngine<RE = FakeExtension> {
     engines: Engines<BaseRocksEngine, BaseRocksEngine>,
     not_leader: Arc<AtomicBool>,
     coprocessor: CoprocessorHost<BaseRocksEngine>,
+    region_info_provider: Option<Arc<Box<dyn RegionInfoProvider>>>,
     ext: RE,
 }
 
@@ -104,6 +109,7 @@ impl<RE> RocksEngine<RE> {
             engines: self.engines,
             not_leader: self.not_leader,
             coprocessor: self.coprocessor,
+            region_info_provider: None,
             ext,
         }
     }
@@ -141,6 +147,7 @@ impl RocksEngine {
             not_leader: Arc::new(AtomicBool::new(false)),
             engines,
             coprocessor: CoprocessorHost::default(),
+            region_info_provider: None,
             ext: FakeExtension,
         })
     }
@@ -206,6 +213,14 @@ impl<RE> RocksEngine<RE> {
             .collect::<Vec<_>>();
         Ok(batch)
     }
+
+    pub fn set_region_info_provider(&mut self, provider: impl RegionInfoProvider + 'static) {
+        self.region_info_provider = Some(Arc::new(Box::new(provider)))
+    }
+
+    pub fn clear_region_info_provider(&mut self) {
+        self.region_info_provider = None;
+    }
 }
 
 impl<RE> Display for RocksEngine<RE> {
@@ -284,7 +299,7 @@ impl<RE: RaftExtension + 'static> Engine for RocksEngine<RE> {
         })();
         let mut res = Some(res);
         stream::poll_fn(move |cx| {
-            if res.as_ref().map_or(false, |r| r.is_err()) {
+            if res.as_ref().is_some_and(|r| r.is_err()) {
                 return Poll::Ready(res.take().map(WriteEvent::Finished));
             }
             // If it's none, it means an error is returned, it should not be polled again.
@@ -313,10 +328,21 @@ impl<RE: RaftExtension + 'static> Engine for RocksEngine<RE> {
     }
 
     type IMSnap = Self::Snap;
-    type IMSnapshotRes = Self::SnapshotRes;
+    // TODO: revert this once https://github.com/rust-lang/rust/issues/140222 is fixed.
+    // type IMSnapshotRes = Self::SnapshotRes;
+    type IMSnapshotRes = impl Future<Output = Result<Self::Snap>> + Send;
     fn async_in_memory_snapshot(&mut self, ctx: SnapContext<'_>) -> Self::IMSnapshotRes {
         self.async_snapshot(ctx)
     }
+
+    fn seek_region(&self, from: &[u8], callback: SeekRegionCallback) -> Result<()> {
+        match self.region_info_provider {
+            Some(ref accessor) => accessor
+                .seek_region(from, callback)
+                .map_err(|e| box_err!(e)),
+            None => Err(box_err!("region_info_accessor is not available")),
+        }
+    }
 }
 
 impl Snapshot for Arc<RocksSnapshot> {
diff --git a/components/tikv_kv/src/stats.rs b/components/tikv_kv/src/stats.rs
index a91bd20640d..15fa0dbd308 100644
--- a/components/tikv_kv/src/stats.rs
+++ b/components/tikv_kv/src/stats.rs
@@ -2,7 +2,7 @@
 
 use std::cell::RefCell;
 
-use engine_traits::{IterMetricsCollector, CF_DEFAULT, CF_LOCK, CF_WRITE};
+use engine_traits::{CF_DEFAULT, CF_LOCK, CF_WRITE, IterMetricsCollector};
 use kvproto::kvrpcpb::{ScanDetail, ScanDetailV2, ScanInfo};
 pub use raftstore::store::{FlowStatistics, FlowStatsReporter};
 
diff --git a/components/tikv_util/benches/channel/bench_channel.rs b/components/tikv_util/benches/channel/bench_channel.rs
index 6867aab0f56..30e40093a2a 100644
--- a/components/tikv_util/benches/channel/bench_channel.rs
+++ b/components/tikv_util/benches/channel/bench_channel.rs
@@ -1,6 +1,6 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{sync::mpsc::channel, thread, usize};
+use std::{sync::mpsc::channel, thread};
 
 use crossbeam::channel;
 use futures::{executor::block_on, stream::StreamExt};
diff --git a/components/tikv_util/src/buffer_vec.rs b/components/tikv_util/src/buffer_vec.rs
index 78196577366..bf803de5fec 100644
--- a/components/tikv_util/src/buffer_vec.rs
+++ b/components/tikv_util/src/buffer_vec.rs
@@ -321,7 +321,7 @@ impl<'a> WithConcatExtend<'a> {
     }
 }
 
-impl<'a> Extend<u8> for WithConcatExtend<'a> {
+impl Extend<u8> for WithConcatExtend<'_> {
     fn extend<I>(&mut self, iter: I)
     where
         I: IntoIterator<Item = u8>,
@@ -330,7 +330,7 @@ impl<'a> Extend<u8> for WithConcatExtend<'a> {
     }
 }
 
-impl<'a, 'b> Extend<&'a u8> for WithConcatExtend<'b> {
+impl<'a> Extend<&'a u8> for WithConcatExtend<'_> {
     fn extend<I>(&mut self, iter: I)
     where
         I: IntoIterator<Item = &'a u8>,
@@ -339,7 +339,7 @@ impl<'a, 'b> Extend<&'a u8> for WithConcatExtend<'b> {
     }
 }
 
-impl<'a> BufferWriter for WithConcatExtend<'a> {
+impl BufferWriter for WithConcatExtend<'_> {
     unsafe fn bytes_mut(&mut self, size: usize) -> &mut [u8] {
         self.0.data.bytes_mut(size)
     }
@@ -409,7 +409,7 @@ impl<'a> Iterator for Iter<'a> {
     }
 }
 
-impl<'a> ExactSizeIterator for Iter<'a> {}
+impl ExactSizeIterator for Iter<'_> {}
 
 #[cfg(test)]
 mod tests {
diff --git a/components/tikv_util/src/callback.rs b/components/tikv_util/src/callback.rs
index 5f33ce10696..1e9bd6bf39c 100644
--- a/components/tikv_util/src/callback.rs
+++ b/components/tikv_util/src/callback.rs
@@ -55,8 +55,8 @@ where
 #[cfg(test)]
 mod tests {
     use std::sync::{
-        atomic::{AtomicI32, Ordering::SeqCst},
         Arc,
+        atomic::{AtomicI32, Ordering::SeqCst},
     };
 
     use super::*;
diff --git a/components/tikv_util/src/codec/bytes.rs b/components/tikv_util/src/codec/bytes.rs
index b382f64739c..29d17f7b6e9 100644
--- a/components/tikv_util/src/codec/bytes.rs
+++ b/components/tikv_util/src/codec/bytes.rs
@@ -213,6 +213,9 @@ pub fn decode_bytes(data: &mut BytesSlice<'_>, desc: bool) -> Result<Vec<u8>> {
         }
 
         if desc {
+            // TODO: remove this after updating to a new toolchain,
+            // See: https://github.com/rust-lang/rust-clippy/issues/14685
+            #[allow(clippy::manual_slice_fill)]
             for k in &mut key {
                 *k = !*k;
             }
diff --git a/components/tikv_util/src/codec/stream_event.rs b/components/tikv_util/src/codec/stream_event.rs
index 7cc365e5124..d243466925f 100644
--- a/components/tikv_util/src/codec/stream_event.rs
+++ b/components/tikv_util/src/codec/stream_event.rs
@@ -1,10 +1,10 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
-use std::io::{prelude::*, Cursor};
+use std::io::{Cursor, prelude::*};
 
 use byteorder::ByteOrder;
 use bytes::{Buf, Bytes};
 
-use crate::{codec::Result, Either};
+use crate::{Either, codec::Result};
 
 // Note: maybe allow them to be different lifetime.
 // But not necessary for now, so keep it simple...?
diff --git a/components/tikv_util/src/config.rs b/components/tikv_util/src/config.rs
index 33cf7e4ddb6..c2dc222a8f7 100644
--- a/components/tikv_util/src/config.rs
+++ b/components/tikv_util/src/config.rs
@@ -9,21 +9,21 @@ use std::{
     path::{Path, PathBuf},
     str::{self, FromStr},
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc, RwLock, RwLockReadGuard,
+        atomic::{AtomicU64, Ordering},
     },
     time::Duration,
 };
 
 use chrono::{
-    format::{self, Fixed, Item, Parsed},
     DateTime, FixedOffset, Local, NaiveTime, TimeZone, Timelike,
+    format::{self, Fixed, Item, Parsed},
 };
 pub use heck::KebabCase;
 use online_config::ConfigValue;
 use serde::{
-    de::{self, Unexpected, Visitor},
     Deserialize, Deserializer, Serialize, Serializer,
+    de::{self, Unexpected, Visitor},
 };
 use serde_json::Value;
 use thiserror::Error;
@@ -237,7 +237,7 @@ impl<'de> Deserialize<'de> for ReadableSize {
     {
         struct SizeVisitor;
 
-        impl<'de> Visitor<'de> for SizeVisitor {
+        impl Visitor<'_> for SizeVisitor {
             type Value = ReadableSize;
 
             fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -516,7 +516,7 @@ impl<'de> Deserialize<'de> for ReadableDuration {
     {
         struct DurVisitor;
 
-        impl<'de> Visitor<'de> for DurVisitor {
+        impl Visitor<'_> for DurVisitor {
             type Value = ReadableDuration;
 
             fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -691,7 +691,7 @@ impl<'de> Deserialize<'de> for ReadableOffsetTime {
     {
         struct OffTimeVisitor;
 
-        impl<'de> Visitor<'de> for OffTimeVisitor {
+        impl Visitor<'_> for OffTimeVisitor {
             type Value = ReadableOffsetTime;
 
             fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -974,7 +974,7 @@ mod check_data_dir {
 
     use lazy_static::lazy_static;
 
-    use super::{canonicalize_path, ConfigError};
+    use super::{ConfigError, canonicalize_path};
 
     #[derive(Debug, Default)]
     struct FsInfo {
@@ -1497,7 +1497,7 @@ impl TomlWriter {
     fn write_current_table(&mut self, change: &mut HashMap<String, String>) {
         let keys: Vec<_> = change
             .keys()
-            .filter_map(|k| k.split('.').last())
+            .filter_map(|k| k.split('.').next_back())
             .map(str::to_owned)
             .collect();
         for k in keys {
@@ -1544,7 +1544,7 @@ macro_rules! numeric_enum_serializing_mod {
             {
                 struct EnumVisitor;
 
-                impl<'de> Visitor<'de> for EnumVisitor {
+                impl Visitor<'_> for EnumVisitor {
                     type Value = $enum;
 
                     fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -1814,7 +1814,7 @@ impl RaftDataStateMachine {
         fs::read_dir(path).unwrap().any(|entry| {
             if let Ok(e) = entry {
                 let p = e.path();
-                p.is_file() && p.extension().map_or(false, |ext| ext == "raftlog")
+                p.is_file() && p.extension().is_some_and(|ext| ext == "raftlog")
             } else {
                 false
             }
@@ -2250,7 +2250,7 @@ mod tests {
     #[cfg(target_os = "linux")]
     #[test]
     fn test_check_kernel() {
-        use super::check_kernel::{check_kernel_params, Checker};
+        use super::check_kernel::{Checker, check_kernel_params};
 
         // The range of vm.swappiness is from 0 to 100.
         let table: Vec<(&str, i64, Box<Checker>, bool)> = vec![
diff --git a/components/tikv_util/src/deadline.rs b/components/tikv_util/src/deadline.rs
index 64416999fe3..c2ffef393cd 100644
--- a/components/tikv_util/src/deadline.rs
+++ b/components/tikv_util/src/deadline.rs
@@ -21,7 +21,7 @@ impl std::fmt::Display for DeadlineError {
 }
 
 /// A handy structure for checking deadline.
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub struct Deadline {
     deadline: Instant,
 }
diff --git a/components/tikv_util/src/future.rs b/components/tikv_util/src/future.rs
index 6b4e608b341..f4970fc0163 100644
--- a/components/tikv_util/src/future.rs
+++ b/components/tikv_util/src/future.rs
@@ -3,8 +3,8 @@
 use std::{
     cell::UnsafeCell,
     sync::{
-        atomic::{AtomicU8, Ordering},
         Arc,
+        atomic::{AtomicU8, Ordering},
     },
 };
 
diff --git a/components/tikv_util/src/lib.rs b/components/tikv_util/src/lib.rs
index bbb3fb53c99..d272fce6952 100644
--- a/components/tikv_util/src/lib.rs
+++ b/components/tikv_util/src/lib.rs
@@ -14,9 +14,9 @@ use std::{
     cell::RefCell,
     cmp,
     collections::{
+        HashMap,
         hash_map::Entry,
         vec_deque::{Iter, VecDeque},
-        HashMap,
     },
     convert::AsRef,
     env,
@@ -24,8 +24,8 @@ use std::{
     ops::{Deref, DerefMut},
     path::{Path, PathBuf},
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, RwLock, RwLockReadGuard, RwLockWriteGuard,
+        atomic::{AtomicBool, Ordering},
     },
     thread,
     time::Duration,
@@ -33,8 +33,8 @@ use std::{
 
 use lazy_static::lazy_static;
 use nix::{
-    sys::wait::{wait, WaitStatus},
-    unistd::{fork, ForkResult},
+    sys::wait::{WaitStatus, wait},
+    unistd::{ForkResult, fork},
 };
 use serde::Serialize;
 
@@ -529,7 +529,7 @@ pub fn set_panic_hook(panic_abort: bool, data_dir: &str) {
 
     let data_dir = data_dir.to_string();
 
-    panic::set_hook(Box::new(move |info: &panic::PanicInfo<'_>| {
+    panic::set_hook(Box::new(move |info: &panic::PanicHookInfo<'_>| {
         let msg = match info.payload().downcast_ref::<&'static str>() {
             Some(s) => *s,
             None => match info.payload().downcast_ref::<String>() {
@@ -645,7 +645,7 @@ pub fn empty_shared_slice<T>() -> Arc<[T]> {
 
 /// A useful hook to check if master branch is being built.
 pub fn build_on_master_branch() -> bool {
-    option_env!("TIKV_BUILD_GIT_BRANCH").map_or(false, |b| "master" == b)
+    option_env!("TIKV_BUILD_GIT_BRANCH").is_some_and(|b| "master" == b)
 }
 
 /// Set the capacity of a vector to the given capacity.
diff --git a/components/tikv_util/src/log.rs b/components/tikv_util/src/log.rs
index d4b75ba004c..4349592f6fe 100644
--- a/components/tikv_util/src/log.rs
+++ b/components/tikv_util/src/log.rs
@@ -109,14 +109,14 @@ macro_rules! info_or_error{
 
 use std::fmt::{self, Display, Write};
 
-use slog::{BorrowedKV, OwnedKVList, Record, KV};
+use slog::{BorrowedKV, KV, OwnedKVList, Record};
 
 struct FormatKeyValueList<'a, W> {
     buffer: &'a mut W,
     written: bool,
 }
 
-impl<'a, W: Write> slog::Serializer for FormatKeyValueList<'a, W> {
+impl<W: Write> slog::Serializer for FormatKeyValueList<'_, W> {
     fn emit_arguments(&mut self, key: slog::Key, val: &fmt::Arguments<'_>) -> slog::Result {
         if !self.written {
             write!(&mut self.buffer, "[{}={}]", key, val).unwrap();
@@ -134,7 +134,7 @@ impl<'a, W: Write> slog::Serializer for FormatKeyValueList<'a, W> {
 /// processing.
 pub struct SlogFormat<'a>(pub &'a slog::Logger);
 
-impl<'a> Display for SlogFormat<'a> {
+impl Display for SlogFormat<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut formatter = FormatKeyValueList {
             buffer: f,
diff --git a/components/tikv_util/src/logger/file_log.rs b/components/tikv_util/src/logger/file_log.rs
index fa7b7c67fca..a10d28cb1c6 100644
--- a/components/tikv_util/src/logger/file_log.rs
+++ b/components/tikv_util/src/logger/file_log.rs
@@ -3,7 +3,7 @@
 use std::{
     fmt::{self, Display, Formatter},
     fs::{self, DirEntry, File, OpenOptions},
-    io::{self, Error, ErrorKind, Write},
+    io::{self, Error, Write},
     path::{Path, PathBuf},
 };
 
@@ -17,12 +17,9 @@ use crate::{
 /// Opens log file with append mode. Creates a new log file if it doesn't exist.
 fn open_log_file(path: impl AsRef<Path>) -> io::Result<File> {
     let path = path.as_ref();
-    let parent = path.parent().ok_or_else(|| {
-        Error::new(
-            ErrorKind::Other,
-            "Unable to get parent directory of log file",
-        )
-    })?;
+    let parent = path
+        .parent()
+        .ok_or_else(|| Error::other("Unable to get parent directory of log file"))?;
     if !parent.is_dir() {
         fs::create_dir_all(parent)?
     }
@@ -300,7 +297,7 @@ impl Runnable for Runner {
 
 #[cfg(test)]
 mod tests {
-    use std::{ffi::OsStr, ops::Add, time::Duration};
+    use std::{ffi::OsStr, io::ErrorKind, ops::Add, time::Duration};
 
     use tempfile::TempDir;
 
diff --git a/components/tikv_util/src/logger/formatter.rs b/components/tikv_util/src/logger/formatter.rs
index b786d2aa681..4b6de526837 100644
--- a/components/tikv_util/src/logger/formatter.rs
+++ b/components/tikv_util/src/logger/formatter.rs
@@ -21,12 +21,12 @@ where
             continue;
         }
         if start < index {
-            writer.write_all(file_name[start..index].as_bytes())?;
+            writer.write_all(&file_name.as_bytes()[start..index])?;
         }
         start = index + 1;
     }
     if start < bytes.len() {
-        writer.write_all(file_name[start..].as_bytes())?;
+        writer.write_all(&file_name.as_bytes()[start..])?;
     }
     Ok(())
 }
diff --git a/components/tikv_util/src/logger/mod.rs b/components/tikv_util/src/logger/mod.rs
index 3af4213500b..139cc5b6893 100644
--- a/components/tikv_util/src/logger/mod.rs
+++ b/components/tikv_util/src/logger/mod.rs
@@ -8,14 +8,14 @@ use std::{
     io::{self, BufWriter},
     path::{Path, PathBuf},
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Mutex,
+        atomic::{AtomicUsize, Ordering},
     },
     thread,
 };
 
 use log::{self, SetLoggerError};
-use slog::{self, slog_o, Drain, FnValue, Key, OwnedKVList, PushFnValue, Record, KV};
+use slog::{self, Drain, FnValue, KV, Key, OwnedKVList, PushFnValue, Record, slog_o};
 pub use slog::{FilterFn, Level};
 use slog_async::{Async, AsyncGuard, OverflowStrategy};
 use slog_term::{Decorator, PlainDecorator, RecordDecorator};
@@ -31,7 +31,7 @@ const SLOG_CHANNEL_SIZE: usize = 10240;
 const SLOG_CHANNEL_OVERFLOW_STRATEGY: OverflowStrategy = OverflowStrategy::Drop;
 const TIMESTAMP_FORMAT: &str = "%Y/%m/%d %H:%M:%S%.3f %:z";
 
-static LOG_LEVEL: AtomicUsize = AtomicUsize::new(usize::max_value());
+static LOG_LEVEL: AtomicUsize = AtomicUsize::new(usize::MAX);
 
 pub fn init_log<D>(
     drain: D,
@@ -673,11 +673,7 @@ impl<'a> Serializer<'a> {
     fn finish(self) {}
 }
 
-impl<'a> Drop for Serializer<'a> {
-    fn drop(&mut self) {}
-}
-
-impl<'a> slog::Serializer for Serializer<'a> {
+impl slog::Serializer for Serializer<'_> {
     fn emit_none(&mut self, key: Key) -> slog::Result {
         self.emit_arguments(key, &format_args!("None"))
     }
@@ -838,7 +834,7 @@ mod tests {
 
     #[test]
     fn test_log_format_json() {
-        use serde_json::{from_str, Value};
+        use serde_json::{Value, from_str};
         let buffer: Arc<Mutex<Vec<u8>>> = Arc::default();
         let drain = Mutex::new(json_format(TestWriter(buffer.clone()), true)).map(slog::Fuse);
         let drain = ThreadIDrain(drain);
diff --git a/components/tikv_util/src/math.rs b/components/tikv_util/src/math.rs
index e9d49a02e06..23325492e29 100644
--- a/components/tikv_util/src/math.rs
+++ b/components/tikv_util/src/math.rs
@@ -1,8 +1,8 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::sync::{
-    atomic::{AtomicU32, Ordering},
     Mutex,
+    atomic::{AtomicU32, Ordering},
 };
 
 struct MovingAvgU32Inner {
diff --git a/components/tikv_util/src/memory.rs b/components/tikv_util/src/memory.rs
index 6e2e933d762..5ae31af92c3 100644
--- a/components/tikv_util/src/memory.rs
+++ b/components/tikv_util/src/memory.rs
@@ -3,8 +3,8 @@
 use std::{
     mem,
     sync::{
-        atomic::{AtomicIsize, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicIsize, AtomicUsize, Ordering},
     },
 };
 
@@ -164,13 +164,12 @@ impl HeapSize for kvrpcpb::Context {
         self.resolved_locks.capacity() * mem::size_of::<u64>()
             + self.committed_locks.capacity() * mem::size_of::<u64>()
             + self.resource_group_tag.capacity()
-            + self.request_source.as_bytes().len()
+            + self.request_source.len()
             + self
                 .get_resource_control_context()
                 .resource_group_name
-                .as_bytes()
                 .len()
-            + self.get_source_stmt().session_alias.as_bytes().len()
+            + self.get_source_stmt().session_alias.len()
     }
 }
 
diff --git a/components/tikv_util/src/metrics/allocator_metrics.rs b/components/tikv_util/src/metrics/allocator_metrics.rs
index 1eb090d3359..880a8d7a32e 100644
--- a/components/tikv_util/src/metrics/allocator_metrics.rs
+++ b/components/tikv_util/src/metrics/allocator_metrics.rs
@@ -1,9 +1,9 @@
 // Copyright 2017 TiKV Project Authors. Licensed under Apache-2.0.
 
 use prometheus::{
+    IntGauge, IntGaugeVec, Opts, Result,
     core::{Collector, Desc},
     proto::MetricFamily,
-    IntGauge, IntGaugeVec, Opts, Result,
 };
 
 pub fn monitor_allocator_stats<S: Into<String>>(namespace: S) -> Result<()> {
diff --git a/components/tikv_util/src/metrics/mod.rs b/components/tikv_util/src/metrics/mod.rs
index 3a9964bd8d2..bdbc6e5b6ca 100644
--- a/components/tikv_util/src/metrics/mod.rs
+++ b/components/tikv_util/src/metrics/mod.rs
@@ -10,7 +10,7 @@ use prometheus_static_metric::*;
 #[cfg(target_os = "linux")]
 mod threads_linux;
 #[cfg(target_os = "linux")]
-pub use self::threads_linux::{monitor_threads, ThreadInfoStatistics};
+pub use self::threads_linux::{ThreadInfoStatistics, monitor_threads};
 
 #[cfg(target_os = "linux")]
 mod process_linux;
@@ -20,7 +20,7 @@ pub use self::process_linux::monitor_process;
 #[cfg(not(target_os = "linux"))]
 mod threads_dummy;
 #[cfg(not(target_os = "linux"))]
-pub use self::threads_dummy::{monitor_threads, ThreadInfoStatistics};
+pub use self::threads_dummy::{ThreadInfoStatistics, monitor_threads};
 
 #[cfg(not(target_os = "linux"))]
 mod process_dummy;
diff --git a/components/tikv_util/src/metrics/process_linux.rs b/components/tikv_util/src/metrics/process_linux.rs
index 9d661d1d434..7a255a4fc52 100644
--- a/components/tikv_util/src/metrics/process_linux.rs
+++ b/components/tikv_util/src/metrics/process_linux.rs
@@ -3,11 +3,12 @@
 //! This module is a subset of rust-prometheus's process collector, without the
 //! fd collector to avoid memory fragmentation issues when open fd is large.
 
-use std::io::{Error, ErrorKind, Result};
+use std::io::{Error, Result};
 
 use prometheus::{
+    IntCounter, IntGauge, Opts,
     core::{Collector, Desc},
-    proto, IntCounter, IntGauge, Opts,
+    proto,
 };
 
 use crate::sys::thread;
@@ -15,7 +16,7 @@ use crate::sys::thread;
 /// Monitors current process.
 pub fn monitor_process() -> Result<()> {
     let pc = ProcessCollector::new();
-    prometheus::register(Box::new(pc)).map_err(|e| Error::new(ErrorKind::Other, e.to_string()))
+    prometheus::register(Box::new(pc)).map_err(|e| Error::other(e.to_string()))
 }
 
 /// A collector to collect process metrics.
diff --git a/components/tikv_util/src/metrics/threads_linux.rs b/components/tikv_util/src/metrics/threads_linux.rs
index 9f85425b0ba..424a5e4ede2 100644
--- a/components/tikv_util/src/metrics/threads_linux.rs
+++ b/components/tikv_util/src/metrics/threads_linux.rs
@@ -1,7 +1,7 @@
 // Copyright 2017 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    io::{Error, ErrorKind, Result},
+    io::{Error, Result},
     sync::Mutex,
     time::Duration,
 };
@@ -9,9 +9,9 @@ use std::{
 use collections::HashMap;
 use procinfo::pid;
 use prometheus::{
-    self,
+    self, GaugeVec, IntGaugeVec, Opts,
     core::{Collector, Desc},
-    proto, GaugeVec, IntGaugeVec, Opts,
+    proto,
 };
 
 use crate::{
@@ -265,7 +265,7 @@ fn state_to_str(state: &pid::State) -> &str {
 }
 
 fn to_io_err(s: String) -> Error {
-    Error::new(ErrorKind::Other, s)
+    Error::other(s)
 }
 
 #[inline]
diff --git a/components/tikv_util/src/mpsc/future.rs b/components/tikv_util/src/mpsc/future.rs
index 4492e33a933..b54442ed923 100644
--- a/components/tikv_util/src/mpsc/future.rs
+++ b/components/tikv_util/src/mpsc/future.rs
@@ -14,7 +14,7 @@ use crossbeam::{
     channel::SendError,
     queue::{ArrayQueue, SegQueue},
 };
-use futures::{task::AtomicWaker, Stream, StreamExt};
+use futures::{Stream, StreamExt, task::AtomicWaker};
 
 use crate::future::block_on_timeout;
 
@@ -287,8 +287,9 @@ where
 mod tests {
     use std::{
         sync::{
+            Arc, Mutex,
             atomic::{AtomicBool, AtomicUsize},
-            mpsc, Arc, Mutex,
+            mpsc,
         },
         thread, time,
     };
diff --git a/components/tikv_util/src/mpsc/mod.rs b/components/tikv_util/src/mpsc/mod.rs
index 9a71dbc0c5e..4203c97cb0d 100644
--- a/components/tikv_util/src/mpsc/mod.rs
+++ b/components/tikv_util/src/mpsc/mod.rs
@@ -9,8 +9,8 @@ pub mod priority_queue;
 
 use std::{
     sync::{
-        atomic::{AtomicBool, AtomicIsize, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicIsize, AtomicUsize, Ordering},
     },
     time::Duration,
 };
diff --git a/components/tikv_util/src/mpsc/priority_queue.rs b/components/tikv_util/src/mpsc/priority_queue.rs
index fac741361db..63afa072790 100644
--- a/components/tikv_util/src/mpsc/priority_queue.rs
+++ b/components/tikv_util/src/mpsc/priority_queue.rs
@@ -1,14 +1,14 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::sync::{
-    atomic::{AtomicPtr, AtomicU64, AtomicUsize, Ordering},
     Arc,
+    atomic::{AtomicPtr, AtomicU64, AtomicUsize, Ordering},
 };
 
 use crossbeam::channel::{RecvError, SendError, TryRecvError, TrySendError};
 use crossbeam_skiplist::SkipMap;
 use parking_lot_core::{
-    park, unpark_all, unpark_one, SpinWait, DEFAULT_PARK_TOKEN, DEFAULT_UNPARK_TOKEN,
+    DEFAULT_PARK_TOKEN, DEFAULT_UNPARK_TOKEN, SpinWait, park, unpark_all, unpark_one,
 };
 
 // Create a priority based channel. Sender can send message with priority of
diff --git a/components/tikv_util/src/quota_limiter.rs b/components/tikv_util/src/quota_limiter.rs
index f122087d1d0..684603a436b 100644
--- a/components/tikv_util/src/quota_limiter.rs
+++ b/components/tikv_util/src/quota_limiter.rs
@@ -4,8 +4,8 @@ use std::{
     future::Future,
     pin::Pin,
     sync::{
-        atomic::{AtomicBool, AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicU64, Ordering},
     },
     task::{Context, Poll},
     time::Duration,
@@ -144,7 +144,7 @@ pub struct CpuObserveGuard<'a> {
     sample: &'a mut Sample,
 }
 
-impl<'a> Drop for CpuObserveGuard<'a> {
+impl Drop for CpuObserveGuard<'_> {
     fn drop(&mut self) {
         if let Some(timer) = self.timer {
             self.sample.add_cpu_time(timer.elapsed());
diff --git a/components/tikv_util/src/range_latch.rs b/components/tikv_util/src/range_latch.rs
index c9552018b13..6b9ed8fe253 100644
--- a/components/tikv_util/src/range_latch.rs
+++ b/components/tikv_util/src/range_latch.rs
@@ -3,9 +3,9 @@ use std::{
         BTreeMap,
         Bound::{Excluded, Unbounded},
     },
+    mem::ManuallyDrop,
     sync::{Arc, Mutex},
 };
-
 /// A structure used to manage range-based latch with mutual exclusion.
 ///
 /// Currently used to ensure mutual exclusion between compaction filter and
@@ -73,11 +73,7 @@ impl RangeLatch {
     ///
     /// Deadlocks cannot occur in the current scenario, as each caller thread
     /// holds at most one lock at a time.
-    pub fn acquire<'a>(
-        self: &'a Arc<Self>,
-        start_key: Vec<u8>,
-        end_key: Vec<u8>,
-    ) -> RangeLatchGuard<'a> {
+    pub fn acquire(self: &Arc<Self>, start_key: Vec<u8>, end_key: Vec<u8>) -> RangeLatchGuard<'_> {
         loop {
             let mut range_latches = self.range_latches.lock().unwrap();
 
@@ -101,14 +97,21 @@ impl RangeLatch {
 
                 // Now acquire the latch after releasing the write guard
                 let mutex_guard = mutex.lock().unwrap();
-                // Safety: `_mutex_guard` is declared before `handle` in `KeyHandleGuard`.
-                // So the mutex guard will be released earlier than the `Arc<KeyHandle>`.
-                // Then we can make sure the mutex guard doesn't point to released memory.
+                // Safety: `transmute` just change the lifetime, do not change
+                // the type.
+                // `_mutex_guard` points to the `Mutex<()>`
+                // We need to make sure it will be dropped before the
+                // `Arc<Mutex<()>>` and the `RangeLatch` while `drop`.
+                // Then we can make sure the mutex guard doesn't point to
+                // released memory.
+                // We use `ManuallyDrop` to promise it.
+
+                #[allow(clippy::missing_transmute_annotations)]
                 let mutex_guard = unsafe { std::mem::transmute(mutex_guard) };
 
                 return RangeLatchGuard {
                     start_key,
-                    _mutex_guard: mutex_guard,
+                    _mutex_guard: ManuallyDrop::new(mutex_guard),
                     handle: self,
                 };
             }
@@ -128,17 +131,26 @@ pub struct RangeLatchGuard<'a> {
     start_key: Vec<u8>,
     /// Hold the mutex guard to prevent concurrent access to the same range.
     ///
-    /// This field must be declared before `handle` so it will be dropped before
-    /// `handle`.
-    _mutex_guard: std::sync::MutexGuard<'a, ()>,
+    /// Use `ManuallyDrop` to promise:
+    /// `_mutex_guard` will be dropped before the `Arc<Mutex<()>>` and the
+    /// `RangeLatch` while `drop`.
+    _mutex_guard: ManuallyDrop<std::sync::MutexGuard<'a, ()>>,
     /// Holds a reference to RangeLatch to release the latch when the guard is
     /// dropped.
     handle: &'a RangeLatch,
 }
 
-impl<'a> Drop for RangeLatchGuard<'a> {
+impl Drop for RangeLatchGuard<'_> {
     fn drop(&mut self) {
+        // Safety: we call `ManuallyDrop::drop` to drop the mutex guard
+        // once and only once.
+        // So `_mutex_guard` will be released earlier than the
+        // `Arc<Mutex<()>>`. We drop `_mutex_guard` by hand, so dropping order
+        // depends on declaration order no longer matters.
+        unsafe { ManuallyDrop::drop(&mut self._mutex_guard) };
         let mut range_latches = self.handle.range_latches.lock().unwrap();
+        // `range_latches.remove(&self.start_key);` will cause
+        // `Arc<Mutex()>>` dropped.
         range_latches.remove(&self.start_key);
     }
 }
@@ -148,8 +160,8 @@ mod tests {
     use std::{
         collections::HashSet,
         sync::{
-            atomic::{AtomicBool, Ordering},
             Arc,
+            atomic::{AtomicBool, Ordering},
         },
         thread,
         time::Duration,
@@ -172,6 +184,7 @@ mod tests {
         drop(guard1);
         drop(guard2);
         drop(guard3);
+        drop(latch);
     }
 
     #[test]
diff --git a/components/tikv_util/src/resource_control.rs b/components/tikv_util/src/resource_control.rs
index c7b46c2ddab..64b71f945ea 100644
--- a/components/tikv_util/src/resource_control.rs
+++ b/components/tikv_util/src/resource_control.rs
@@ -20,7 +20,7 @@ pub struct TaskMetadata<'a> {
     metadata: Cow<'a, [u8]>,
 }
 
-impl<'a> TaskMetadata<'a> {
+impl TaskMetadata<'_> {
     pub fn deep_clone(&self) -> TaskMetadata<'static> {
         TaskMetadata {
             metadata: Cow::Owned(self.metadata.to_vec()),
diff --git a/components/tikv_util/src/smoother.rs b/components/tikv_util/src/smoother.rs
index 333b6b0e81a..3f3beca76f7 100644
--- a/components/tikv_util/src/smoother.rs
+++ b/components/tikv_util/src/smoother.rs
@@ -220,7 +220,7 @@ pub(super) mod tests {
 
     use crate::{
         smoother::{
-            Smoother, Trend, SMOOTHER_STALE_RECORD_THRESHOLD, SMOOTHER_TIME_RANGE_THRESHOLD,
+            SMOOTHER_STALE_RECORD_THRESHOLD, SMOOTHER_TIME_RANGE_THRESHOLD, Smoother, Trend,
         },
         time::Instant,
     };
diff --git a/components/tikv_util/src/store/mod.rs b/components/tikv_util/src/store/mod.rs
index 9a36961c202..b23baf47ec6 100644
--- a/components/tikv_util/src/store/mod.rs
+++ b/components/tikv_util/src/store/mod.rs
@@ -9,7 +9,7 @@ pub use self::{
         find_peer, find_peer_by_id, find_peer_mut, is_learner, new_learner_peer, new_peer,
         new_witness_peer, remove_peer,
     },
-    query_stats::{is_read_query, QueryStats},
+    query_stats::{QueryStats, is_read_query},
     region::{
         check_key_in_region, check_key_in_region_exclusive, check_key_in_region_inclusive,
         region_on_same_stores, region_on_stores,
diff --git a/components/tikv_util/src/stream.rs b/components/tikv_util/src/stream.rs
index 84b8eede06d..81c3bf351ef 100644
--- a/components/tikv_util/src/stream.rs
+++ b/components/tikv_util/src/stream.rs
@@ -148,11 +148,11 @@ impl<E> Default for RetryExt<E> {
 
 #[doc(hidden)]
 pub mod __macro_helper {
-    #[doc(hidden)]
-    pub use rand::thread_rng as __thread_rng;
     #[doc(hidden)]
     pub use rand::Rng as __rand_Rng;
     #[doc(hidden)]
+    pub use rand::thread_rng as __thread_rng;
+    #[doc(hidden)]
     pub use tokio::time::sleep as __tokio_sleep;
 }
 
@@ -182,7 +182,7 @@ macro_rules! retry_expr {
     };
     ($action:expr, $ext:expr) => {
         async {
-            use $crate::stream::{RetryError, __macro_helper};
+            use $crate::stream::{__macro_helper, RetryError};
 
             let mut ext: $crate::stream::RetryExt<_> = $ext;
             let max_retry_times = ext.max_retry_times;
@@ -218,10 +218,7 @@ macro_rules! retry_expr {
 
 /// Retires a future execution. Comparing to `retry`, this version allows more
 /// configurations.
-pub async fn retry_all_ext<'a, G, T, F, E>(
-    mut action: G,
-    ext: RetryExt<JustRetry<E>>,
-) -> Result<T, E>
+pub async fn retry_all_ext<G, T, F, E>(mut action: G, ext: RetryExt<JustRetry<E>>) -> Result<T, E>
 where
     G: FnMut() -> F,
     F: Future<Output = Result<T, E>>,
@@ -287,6 +284,7 @@ mod tests {
 
     #[test]
     fn test_retry_is_send_even_return_type_not_sync() {
+        #[allow(dead_code)]
         struct BangSync(Option<RefCell<()>>);
         let fut = retry(|| futures::future::ok::<_, TriviallyRetry>(BangSync(None)));
         assert_send(fut)
diff --git a/components/tikv_util/src/sys/cpu_time.rs b/components/tikv_util/src/sys/cpu_time.rs
index 61608d1518f..588f23f9cb3 100644
--- a/components/tikv_util/src/sys/cpu_time.rs
+++ b/components/tikv_util/src/sys/cpu_time.rs
@@ -109,7 +109,7 @@ mod imp {
                 guest_nice: parts.next()?.parse::<u64>().ok()?,
             })
         })()
-        .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "first line of /proc/stat malformed"))
+        .ok_or_else(|| io::Error::other("first line of /proc/stat malformed"))
     }
 
     pub fn cpu_time() -> io::Result<Duration> {
@@ -196,10 +196,7 @@ mod imp {
     use std::io;
 
     pub fn current() -> io::Result<super::LinuxStyleCpuTime> {
-        Err(io::Error::new(
-            io::ErrorKind::Other,
-            "unsupported platform to learn CPU state",
-        ))
+        Err(io::Error::other("unsupported platform to learn CPU state"))
     }
 
     use std::{io, mem, time::Duration};
diff --git a/components/tikv_util/src/sys/inspector.rs b/components/tikv_util/src/sys/inspector.rs
index d2ff80c6416..f802b630ec1 100644
--- a/components/tikv_util/src/sys/inspector.rs
+++ b/components/tikv_util/src/sys/inspector.rs
@@ -40,7 +40,7 @@ pub trait ThreadInspector {
 #[cfg(target_os = "linux")]
 mod linux {
     use std::{
-        fs::{read_to_string, File},
+        fs::{File, read_to_string},
         os::unix::io::AsRawFd,
         path::Path,
     };
@@ -126,7 +126,7 @@ mod linux {
 }
 
 #[cfg(target_os = "linux")]
-pub use self::linux::{self_thread_inspector, Impl as ThreadInspectorImpl};
+pub use self::linux::{Impl as ThreadInspectorImpl, self_thread_inspector};
 
 #[cfg(not(target_os = "linux"))]
 mod notlinux {
@@ -142,7 +142,7 @@ mod notlinux {
 }
 
 #[cfg(not(target_os = "linux"))]
-pub use self::notlinux::{self_thread_inspector, Impl as ThreadInspectorImpl};
+pub use self::notlinux::{Impl as ThreadInspectorImpl, self_thread_inspector};
 
 #[cfg(target_os = "linux")]
 #[cfg(test)]
diff --git a/components/tikv_util/src/sys/mod.rs b/components/tikv_util/src/sys/mod.rs
index d7523ba5619..3a4b7990781 100644
--- a/components/tikv_util/src/sys/mod.rs
+++ b/components/tikv_util/src/sys/mod.rs
@@ -239,7 +239,7 @@ pub fn cache_line_size(level: usize) -> Option<u64> {
 #[cfg(target_os = "linux")]
 pub fn path_in_diff_mount_point(path1: impl AsRef<Path>, path2: impl AsRef<Path>) -> bool {
     let (path1, path2) = (path1.as_ref(), path2.as_ref());
-    let empty_path = |p: &Path| p.to_str().map_or(false, |s| s.is_empty());
+    let empty_path = |p: &Path| p.to_str().is_some_and(|s| s.is_empty());
     if empty_path(path1) || empty_path(path2) {
         return false;
     }
diff --git a/components/tikv_util/src/thread_group.rs b/components/tikv_util/src/thread_group.rs
index 300c39f751c..cad1898ab90 100644
--- a/components/tikv_util/src/thread_group.rs
+++ b/components/tikv_util/src/thread_group.rs
@@ -5,8 +5,8 @@
 use std::{
     cell::RefCell,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     },
 };
 
diff --git a/components/tikv_util/src/time.rs b/components/tikv_util/src/time.rs
index 7944bef7131..c6a5f9ca929 100644
--- a/components/tikv_util/src/time.rs
+++ b/components/tikv_util/src/time.rs
@@ -7,8 +7,8 @@ use std::{
     cmp::Ordering,
     ops::{Add, AddAssign, Sub, SubAssign},
     sync::{
-        mpsc::{self, Sender},
         Once,
+        mpsc::{self, Sender},
     },
     thread::{self, Builder, JoinHandle},
     time::{SystemTime, UNIX_EPOCH},
@@ -595,8 +595,8 @@ mod tests {
     use std::{
         ops::Sub,
         sync::{
-            atomic::{AtomicBool, Ordering},
             Arc,
+            atomic::{AtomicBool, Ordering},
         },
         thread,
         time::{Duration, SystemTime},
diff --git a/components/tikv_util/src/timer.rs b/components/tikv_util/src/timer.rs
index 0ee74701ed8..4c80c956272 100644
--- a/components/tikv_util/src/timer.rs
+++ b/components/tikv_util/src/timer.rs
@@ -3,7 +3,7 @@
 use std::{
     cmp::{Ord, Ordering, Reverse},
     collections::BinaryHeap,
-    sync::{mpsc, Arc, Mutex},
+    sync::{Arc, Mutex, mpsc},
     thread::Builder,
     time::Duration,
 };
@@ -12,15 +12,14 @@ use lazy_static::lazy_static;
 use time::Timespec;
 use tokio_executor::park::ParkThread;
 use tokio_timer::{
-    self,
+    self, Delay,
     clock::{Clock, Now},
     timer::Handle,
-    Delay,
 };
 
 use crate::{
     sys::thread::StdThreadBuildWrapper,
-    time::{monotonic_raw_now, Instant},
+    time::{Instant, monotonic_raw_now},
 };
 
 pub struct Timer<T> {
@@ -57,7 +56,7 @@ impl<T> Timer<T> {
         if self
             .pending
             .peek()
-            .map_or(false, |t| t.0.next_tick <= instant)
+            .is_some_and(|t| t.0.next_tick <= instant)
         {
             return self.pending.pop().map(|t| t.0.task);
         }
diff --git a/components/tikv_util/src/topn.rs b/components/tikv_util/src/topn.rs
index d6e059d8c42..9ce35f10ab6 100644
--- a/components/tikv_util/src/topn.rs
+++ b/components/tikv_util/src/topn.rs
@@ -2,7 +2,7 @@
 
 use std::{
     cmp::Reverse,
-    collections::{binary_heap, BinaryHeap},
+    collections::{BinaryHeap, binary_heap},
     iter,
 };
 
diff --git a/components/tikv_util/src/worker/future.rs b/components/tikv_util/src/worker/future.rs
index 53addd7e3ba..366feabba84 100644
--- a/components/tikv_util/src/worker/future.rs
+++ b/components/tikv_util/src/worker/future.rs
@@ -9,7 +9,7 @@ use std::{
 };
 
 use futures::{
-    channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender},
+    channel::mpsc::{UnboundedReceiver, UnboundedSender, unbounded},
     stream::StreamExt,
 };
 use prometheus::IntGauge;
diff --git a/components/tikv_util/src/worker/mod.rs b/components/tikv_util/src/worker/mod.rs
index 63240a7c298..61ce38368df 100644
--- a/components/tikv_util/src/worker/mod.rs
+++ b/components/tikv_util/src/worker/mod.rs
@@ -16,13 +16,13 @@ mod metrics;
 mod pool;
 
 pub use pool::{
-    dummy_scheduler, Builder, LazyWorker, ReceiverWrapper, Runnable, RunnableWithTimer,
-    ScheduleError, Scheduler, Worker,
+    Builder, LazyWorker, ReceiverWrapper, Runnable, RunnableWithTimer, ScheduleError, Scheduler,
+    Worker, dummy_scheduler,
 };
 
 pub use self::future::{
-    dummy_scheduler as dummy_future_scheduler, Runnable as FutureRunnable,
-    Scheduler as FutureScheduler, Stopped, Worker as FutureWorker,
+    Runnable as FutureRunnable, Scheduler as FutureScheduler, Stopped, Worker as FutureWorker,
+    dummy_scheduler as dummy_future_scheduler,
 };
 
 #[cfg(test)]
diff --git a/components/tikv_util/src/worker/pool.rs b/components/tikv_util/src/worker/pool.rs
index 72cab2ff0d6..225ba7ad687 100644
--- a/components/tikv_util/src/worker/pool.rs
+++ b/components/tikv_util/src/worker/pool.rs
@@ -6,14 +6,14 @@ use std::{
     fmt::{self, Debug, Display, Formatter},
     future::Future,
     sync::{
-        atomic::{AtomicBool, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicUsize, Ordering},
     },
     time::{Duration, Instant},
 };
 
 use futures::{
-    channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender},
+    channel::mpsc::{UnboundedReceiver, UnboundedSender, unbounded},
     compat::{Future01CompatExt, Stream01CompatExt},
     executor::block_on,
     future::FutureExt,
@@ -549,8 +549,8 @@ mod tests {
 
     use std::{
         sync::{
-            atomic::{self, AtomicU64},
             Arc, Mutex,
+            atomic::{self, AtomicU64},
         },
         time::Duration,
     };
diff --git a/components/tikv_util/src/yatp_pool/future_pool.rs b/components/tikv_util/src/yatp_pool/future_pool.rs
index 6dd06e5bee0..1b937bd62b7 100644
--- a/components/tikv_util/src/yatp_pool/future_pool.rs
+++ b/components/tikv_util/src/yatp_pool/future_pool.rs
@@ -6,8 +6,8 @@
 use std::{
     future::Future,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
 };
 
@@ -18,7 +18,7 @@ use prometheus::{IntCounter, IntGauge};
 use tracker::TlsTrackedFuture;
 use yatp::{queue::Extras, task::future};
 
-use crate::resource_control::{priority_from_task_meta, TaskPriority};
+use crate::resource_control::{TaskPriority, priority_from_task_meta};
 
 pub type ThreadPool = yatp::ThreadPool<future::TaskCell>;
 
@@ -154,7 +154,7 @@ impl PoolInner {
     fn scale_pool_size(&self, thread_count: usize) {
         self.pool.scale_workers(thread_count);
         let mut max_tasks = self.max_tasks.load(Ordering::Acquire);
-        if max_tasks != std::usize::MAX {
+        if max_tasks != usize::MAX {
             max_tasks = max_tasks
                 .saturating_div(self.pool_size.load(Ordering::Acquire))
                 .saturating_mul(thread_count);
@@ -188,7 +188,7 @@ impl PoolInner {
         }));
 
         let max_tasks = self.max_tasks.load(Ordering::Acquire);
-        if max_tasks == std::usize::MAX {
+        if max_tasks == usize::MAX {
             return Ok(());
         }
 
@@ -284,8 +284,9 @@ impl std::error::Error for Full {
 mod tests {
     use std::{
         sync::{
+            Mutex,
             atomic::{AtomicUsize, Ordering},
-            mpsc, Mutex,
+            mpsc,
         },
         thread,
         time::Duration,
@@ -294,7 +295,7 @@ mod tests {
     use futures::executor::block_on;
 
     use super::{
-        super::{DefaultTicker, PoolTicker, YatpPoolBuilder as Builder, TICK_INTERVAL},
+        super::{DefaultTicker, PoolTicker, TICK_INTERVAL, YatpPoolBuilder as Builder},
         *,
     };
 
diff --git a/components/tikv_util/src/yatp_pool/mod.rs b/components/tikv_util/src/yatp_pool/mod.rs
index 044274ad9c5..9ac04f26e98 100644
--- a/components/tikv_util/src/yatp_pool/mod.rs
+++ b/components/tikv_util/src/yatp_pool/mod.rs
@@ -7,17 +7,17 @@ use std::sync::Arc;
 
 use fail::fail_point;
 pub use future_pool::{Full, FuturePool};
-use futures::{compat::Stream01CompatExt, StreamExt};
-use prometheus::{local::LocalHistogram, Histogram, HistogramOpts};
+use futures::{StreamExt, compat::Stream01CompatExt};
+use prometheus::{Histogram, HistogramOpts, local::LocalHistogram};
 use yatp::{
+    ThreadPool,
     pool::{CloneRunnerBuilder, Local, Remote, Runner},
-    queue::{multilevel, priority, Extras, QueueType, TaskCell as _},
+    queue::{Extras, QueueType, TaskCell as _, multilevel, priority},
     task::future::{Runner as FutureRunner, TaskCell},
-    ThreadPool,
 };
 
 use crate::{
-    resource_control::{priority_from_task_meta, TaskPriority},
+    resource_control::{TaskPriority, priority_from_task_meta},
     thread_group::GroupProperties,
     time::{Duration, Instant},
     timer::GLOBAL_TIMER_HANDLE,
@@ -150,7 +150,7 @@ impl Config {
     pub fn default_for_test() -> Self {
         Self {
             workers: 2,
-            max_tasks_per_worker: std::usize::MAX,
+            max_tasks_per_worker: usize::MAX,
             stack_size: 2_000_000,
         }
     }
@@ -279,7 +279,7 @@ impl<T: PoolTicker> YatpPoolBuilder<T> {
             core_thread_count: 1,
             max_thread_count: 1,
             stack_size: 0,
-            max_tasks: std::usize::MAX,
+            max_tasks: usize::MAX,
             cleanup_method: CleanupMethod::InPlace,
 
             enable_task_wait_metrics: false,
diff --git a/components/tipb_helper/src/expr_def_builder.rs b/components/tipb_helper/src/expr_def_builder.rs
index 2630975c5de..7774f8f1707 100644
--- a/components/tipb_helper/src/expr_def_builder.rs
+++ b/components/tipb_helper/src/expr_def_builder.rs
@@ -2,8 +2,8 @@
 
 use codec::prelude::NumberEncoder;
 use tidb_query_datatype::{
-    codec::mysql::{Decimal, DecimalEncoder, Duration, TimeType},
     FieldTypeAccessor, FieldTypeFlag, FieldTypeTp,
+    codec::mysql::{Decimal, DecimalEncoder, Duration, TimeType},
 };
 use tipb::{Expr, ExprType, FieldType, ScalarFuncSig};
 
diff --git a/components/tracker/src/lib.rs b/components/tracker/src/lib.rs
index 32ea2164d5c..b678120b92c 100644
--- a/components/tracker/src/lib.rs
+++ b/components/tracker/src/lib.rs
@@ -10,8 +10,8 @@ use std::time::Instant;
 use kvproto::kvrpcpb as pb;
 
 pub use self::{
-    future::{track, FutureTrack},
-    slab::{TrackerToken, TrackerTokenArray, GLOBAL_TRACKERS, INVALID_TRACKER_TOKEN},
+    future::{FutureTrack, track},
+    slab::{GLOBAL_TRACKERS, INVALID_TRACKER_TOKEN, TrackerToken, TrackerTokenArray},
     tls::*,
 };
 
@@ -199,4 +199,7 @@ pub struct RequestMetrics {
     pub apply_thread_wait_nanos: u64,
     pub apply_write_wal_nanos: u64,
     pub apply_write_memtable_nanos: u64,
+
+    // recorded outside the read_pool thread, accessed inside the read_pool thread for topsql usage
+    pub grpc_req_size: u64,
 }
diff --git a/components/tracker/src/slab.rs b/components/tracker/src/slab.rs
index d1c2b2f2d34..1df6bb3b7ae 100644
--- a/components/tracker/src/slab.rs
+++ b/components/tracker/src/slab.rs
@@ -7,7 +7,7 @@ use lazy_static::lazy_static;
 use parking_lot::Mutex;
 use slab::Slab;
 
-use crate::{metrics::*, Tracker};
+use crate::{Tracker, metrics::*};
 
 const SLAB_SHARD_BITS: u32 = 6;
 const SLAB_SHARD_COUNT: usize = 1 << SLAB_SHARD_BITS; // 64
@@ -189,7 +189,7 @@ impl Default for TrackerToken {
 }
 
 pub struct TrackerTokenArray<'a>(&'a [TrackerToken]);
-impl<'a> slog::Value for TrackerTokenArray<'a> {
+impl slog::Value for TrackerTokenArray<'_> {
     fn serialize(
         &self,
         _record: &slog::Record<'_>,
diff --git a/components/tracker/src/tls.rs b/components/tracker/src/tls.rs
index 1159dd6f18b..e5fad388c0c 100644
--- a/components/tracker/src/tls.rs
+++ b/components/tracker/src/tls.rs
@@ -9,7 +9,7 @@ use std::{
 
 use pin_project::pin_project;
 
-use crate::{slab::TrackerToken, Tracker, GLOBAL_TRACKERS, INVALID_TRACKER_TOKEN};
+use crate::{GLOBAL_TRACKERS, INVALID_TRACKER_TOKEN, Tracker, slab::TrackerToken};
 
 thread_local! {
     static TLS_TRACKER_TOKEN: Cell<TrackerToken> = const { Cell::new(INVALID_TRACKER_TOKEN) };
diff --git a/components/txn_types/src/lib.rs b/components/txn_types/src/lib.rs
index 022d98837b2..ead9e37c688 100644
--- a/components/txn_types/src/lib.rs
+++ b/components/txn_types/src/lib.rs
@@ -12,11 +12,11 @@ use error_code::{self, ErrorCode, ErrorCodeExt};
 use kvproto::kvrpcpb;
 pub use lock::{Lock, LockType, PessimisticLock, TxnLockRef};
 use thiserror::Error;
-pub use timestamp::{TimeStamp, TsSet, TSO_PHYSICAL_SHIFT_BITS};
+pub use timestamp::{TSO_PHYSICAL_SHIFT_BITS, TimeStamp, TsSet};
 pub use types::{
-    insert_old_value_if_resolved, is_short_value, CommitRole, Key, KvPair, LastChange, Mutation,
-    MutationType, OldValue, OldValues, TxnExtra, TxnExtraScheduler, Value, WriteBatchFlags,
-    SHORT_VALUE_MAX_LEN,
+    CommitRole, Key, KvPair, LastChange, Mutation, MutationType, OldValue, OldValues,
+    SHORT_VALUE_MAX_LEN, TxnExtra, TxnExtraScheduler, Value, WriteBatchFlags,
+    insert_old_value_if_resolved, is_short_value,
 };
 pub use write::{Write, WriteRef, WriteType};
 
@@ -79,6 +79,8 @@ impl ErrorInner {
     }
 }
 
+pub static ENABLE_DUP_KEY_DEBUG: std::sync::atomic::AtomicBool =
+    std::sync::atomic::AtomicBool::new(false);
 #[derive(Debug, Error)]
 #[error(transparent)]
 pub struct Error(#[from] pub Box<ErrorInner>);
diff --git a/components/txn_types/src/lock.rs b/components/txn_types/src/lock.rs
index fe0e3f10667..df56496d62d 100644
--- a/components/txn_types/src/lock.rs
+++ b/components/txn_types/src/lock.rs
@@ -7,15 +7,15 @@ use kvproto::kvrpcpb::{IsolationLevel, LockInfo, Op, WriteConflictReason};
 use tikv_util::{
     codec::{
         bytes::{self, BytesEncoder},
-        number::{self, NumberEncoder, MAX_VAR_I64_LEN, MAX_VAR_U64_LEN},
+        number::{self, MAX_VAR_I64_LEN, MAX_VAR_U64_LEN, NumberEncoder},
     },
     memory::HeapSize,
 };
 
 use crate::{
-    timestamp::{TimeStamp, TsSet},
-    types::{Key, Mutation, Value, SHORT_VALUE_PREFIX},
     Error, ErrorInner, LastChange, Result,
+    timestamp::{TimeStamp, TsSet},
+    types::{Key, Mutation, SHORT_VALUE_PREFIX, Value},
 };
 
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -657,7 +657,7 @@ pub enum TxnLockRef<'a> {
     Persisted(&'a Lock),
 }
 
-impl<'a> TxnLockRef<'a> {
+impl TxnLockRef<'_> {
     pub fn get_start_ts(&self) -> TimeStamp {
         match self {
             TxnLockRef::InMemory(pessimistic_lock) => pessimistic_lock.start_ts,
diff --git a/components/txn_types/src/write.rs b/components/txn_types/src/write.rs
index 9aea94d0ec3..dcb65de0b0a 100644
--- a/components/txn_types/src/write.rs
+++ b/components/txn_types/src/write.rs
@@ -3,13 +3,13 @@
 use std::mem::size_of;
 
 use codec::prelude::NumberDecoder;
-use tikv_util::codec::number::{self, NumberEncoder, MAX_VAR_U64_LEN};
+use tikv_util::codec::number::{self, MAX_VAR_U64_LEN, NumberEncoder};
 
 use crate::{
+    Error, ErrorInner, LastChange, Result,
     lock::LockType,
     timestamp::TimeStamp,
-    types::{Value, SHORT_VALUE_PREFIX},
-    Error, ErrorInner, LastChange, Result,
+    types::{SHORT_VALUE_PREFIX, Value},
 };
 
 #[derive(Debug, Clone, Copy, PartialEq)]
@@ -105,9 +105,9 @@ pub struct Write {
     ///
     /// 1. `Key_100_put`, `Key_120_del` applied
     /// 2. GC with safepoint = 130 started and `Key_100_put`, `Key_120_del` are
-    /// deleted 3. Finished applying `Key_100_put_R`, which means to rewrite
-    /// `Key_100_put` 4. Read at `140` should get nothing (since it's
-    /// MVCC-deleted at 120) but finds `Key_100_put`
+    ///    deleted 3. Finished applying `Key_100_put_R`, which means to rewrite
+    ///    `Key_100_put` 4. Read at `140` should get nothing (since it's
+    ///    MVCC-deleted at 120) but finds `Key_100_put`
     ///
     /// To solve the problem, when marking `has_overlapped_rollback` on an
     /// already-existed commit record, add a special field `gc_fence` on it. If
@@ -417,6 +417,7 @@ impl WriteRef<'_> {
     ///     found by reading at `read_ts`
     ///   * The `read_ts` is safe, which means, it's not earlier than the
     ///     current GC safepoint.
+    ///
     /// Return:
     ///   Whether the `Write` record is valid, ie. there's no GC fence or GC
     /// fence doesn't points to any other version.
@@ -566,13 +567,13 @@ mod tests {
         let cases: Vec<(Option<u64>, u64, bool)> = vec![
             (None, 10, true),
             (None, 100, true),
-            (None, u64::max_value(), true),
+            (None, u64::MAX, true),
             (Some(0), 100, true),
-            (Some(0), u64::max_value(), true),
+            (Some(0), u64::MAX, true),
             (Some(100), 50, true),
             (Some(100), 100, false),
             (Some(100), 150, false),
-            (Some(100), u64::max_value(), false),
+            (Some(100), u64::MAX, false),
         ];
 
         for case in cases {
diff --git a/deny.toml b/deny.toml
index 32ec470b6ac..c95d5866a7e 100644
--- a/deny.toml
+++ b/deny.toml
@@ -41,11 +41,9 @@ deny = [
 multiple-versions = "allow"
 
 [advisories]
-vulnerability = "deny"
-unmaintained = "allow" # FIXME: Deny it.
-unsound = "deny"
+version = 2
 yanked = "deny"
-notice = "warn"
+unmaintained = 'workspace'
 ignore = [
     # Ignore time 0.1 RUSTSEC-2020-0071 as 1) we have taken measures (see
     # clippy.toml) to mitigate the issue and 2) time 0.1 has no fix availble.
@@ -87,6 +85,13 @@ ignore = [
     # also upgrade the OpenSSL to v3.x which causes performance degradation.
     # See https://github.com/openssl/openssl/issues/17064
     "RUSTSEC-2025-0022",
+    # Ignore RUSTSEC-2024-0436, as there is no widely used replacement of 
+    # package 'paste', and the package itself is very stable.
+    "RUSTSEC-2024-0436",
+    # Ignore RUSTSEC-2025-0057 temporarily. We are evaluating alternatives to
+    # replace FxHash. Currently, this package is stable and there are no known
+    # exploitable vulnerabilities affecting our use case.
+    "RUSTSEC-2025-0057",
 ]
 
 # TiKV is licensed under Apache 2.0, according to ASF 3RD PARTY LICENSE POLICY,
@@ -94,8 +99,7 @@ ignore = [
 # under certain conditions.
 # See https://www.apache.org/legal/resolved.html.
 [licenses]
-unlicensed = "deny"
-copyleft = "deny"
+version = 2
 private = { ignore = false }
 # Allow licenses in Category A
 allow = ["0BSD", "Apache-2.0", "BSD-3-Clause", "CC0-1.0", "ISC", "MIT", "Zlib", "Unicode-3.0"]
@@ -114,3 +118,4 @@ exceptions = [
 unknown-git = "deny"
 unknown-registry = "deny"
 allow-org = { github = ["tikv", "pingcap", "rust-lang"] }
+
diff --git a/etc/config-template.toml b/etc/config-template.toml
index f6c8427af75..0781c4cb818 100644
--- a/etc/config-template.toml
+++ b/etc/config-template.toml
@@ -575,7 +575,7 @@
 
 ## Max size of RocksDB's MANIFEST file.
 ## For detailed explanation, please refer to https://github.com/facebook/rocksdb/wiki/MANIFEST
-# max-manifest-file-size = "128MB"
+# max-manifest-file-size = "256MB"
 
 ## If the value is `true`, the database will be created if it is missing.
 # create-if-missing = true
diff --git a/fuzz/cli.rs b/fuzz/cli.rs
index 201e659d8ba..da78ad81cfe 100644
--- a/fuzz/cli.rs
+++ b/fuzz/cli.rs
@@ -17,10 +17,10 @@ use std::{
     process::{Command, Stdio},
 };
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use cargo_metadata::MetadataCommand;
 use lazy_static::lazy_static;
-use structopt::{clap::arg_enum, StructOpt};
+use structopt::{StructOpt, clap::arg_enum};
 
 lazy_static! {
     static ref WORKSPACE_ROOT: PathBuf = MetadataCommand::new()
diff --git a/fuzz/fuzzer-afl/Cargo.toml b/fuzz/fuzzer-afl/Cargo.toml
index ae2d288160e..6e38640ba67 100644
--- a/fuzz/fuzzer-afl/Cargo.toml
+++ b/fuzz/fuzzer-afl/Cargo.toml
@@ -3,6 +3,7 @@ name = "fuzzer-afl"
 version = "0.0.1"
 publish = false
 license = "Apache-2.0"
+edition = "2024"
 
 [dependencies]
 fuzz-targets = { path = "../targets" }
diff --git a/fuzz/fuzzer-honggfuzz/Cargo.toml b/fuzz/fuzzer-honggfuzz/Cargo.toml
index efd43dedc2b..82d569306b9 100644
--- a/fuzz/fuzzer-honggfuzz/Cargo.toml
+++ b/fuzz/fuzzer-honggfuzz/Cargo.toml
@@ -3,6 +3,7 @@ name = "fuzzer-honggfuzz"
 version = "0.0.1"
 publish = false
 license = "Apache-2.0"
+edition = "2024"
 
 [dependencies]
 fuzz-targets = { path = "../targets" }
diff --git a/fuzz/fuzzer-libfuzzer/Cargo.toml b/fuzz/fuzzer-libfuzzer/Cargo.toml
index 90a9969330a..3b9f863e084 100644
--- a/fuzz/fuzzer-libfuzzer/Cargo.toml
+++ b/fuzz/fuzzer-libfuzzer/Cargo.toml
@@ -3,6 +3,7 @@ name = "fuzzer-libfuzzer"
 version = "0.0.1"
 publish = false
 license = "Apache-2.0"
+edition = "2024"
 
 [dependencies]
 fuzz-targets = { path = "../targets" }
diff --git a/metrics/grafana/common.py b/metrics/grafana/common.py
index 2c2397bd0d2..e733d4a59f8 100644
--- a/metrics/grafana/common.py
+++ b/metrics/grafana/common.py
@@ -20,6 +20,7 @@
     SeriesOverride,
     Stat,
     StatValueMappings,
+    Table,
     Target,
     Template,
     TimeSeries,
@@ -1180,3 +1181,84 @@ def heatmap_panel_graph_panel_histogram_quantile_pairs(
             hide_avg=hide_avg,
         ),
     ]
+
+
+DEFAULT_TABLE_OVERRIDES = [
+    {
+        "matcher": {"id": "byName", "options": "Field"},
+        "properties": [
+            {"id": "displayName", "value": "Option"},
+            {"id": "custom.align", "value": None},
+        ],
+    },
+    {
+        "matcher": {"id": "byName", "options": "Last (not null)"},
+        "properties": [{"id": "displayName", "value": "Value"}],
+    },
+]
+DEFAULT_TABLE_TRANSFORMATIONS = [
+    {
+        "id": "organize",
+        "options": {
+            "excludeByName": {
+                "Time": True,
+                "__name__": True,
+                "job": True,
+            },
+            "indexByName": {},
+            "renameByName": {
+                "Time": "",
+                "Value #A": "Value",
+                "name": "Option",
+                "job": "",
+            },
+        },
+    }
+]
+
+
+def table_panel(
+    title: str,
+    targets: list[Target],
+    description=None,
+    dataSource=DATASOURCE,
+    overrides=DEFAULT_TABLE_OVERRIDES,
+    columns=None,
+    filterable=False,
+    show_header=True,
+    transformations=DEFAULT_TABLE_TRANSFORMATIONS,
+) -> Panel:
+    """
+    Create a table panel for displaying configuration data in tabular format.
+
+    Args:
+        title: Panel title
+        targets: List of targets to query data
+        description: Panel description
+        data_source: Data source to use
+        overrides: Field overrides for customizing display
+        columns: Column configuration
+        filterable: Whether to allow column filtering
+        show_header: Whether to show table header
+        transformations: Grafana transformations for the panel
+
+    Returns:
+        Table panel instance
+    """
+    for target in targets:
+        target.format = "table"
+        target.instant = True
+
+    table_args = {
+        "title": title,
+        "targets": targets,
+        "description": description,
+        "dataSource": dataSource,
+        "overrides": overrides,
+        "columns": columns,
+        "filterable": filterable,
+        "showHeader": show_header,
+        "transformations": transformations,
+    }
+
+    return Table(**table_args)
diff --git a/metrics/grafana/tikv_details.dashboard.py b/metrics/grafana/tikv_details.dashboard.py
index 43805d1be9c..3ef6e0aae34 100644
--- a/metrics/grafana/tikv_details.dashboard.py
+++ b/metrics/grafana/tikv_details.dashboard.py
@@ -31,6 +31,7 @@
     heatmap_panel_graph_panel_histogram_quantile_pairs,
     series_override,
     stat_panel,
+    table_panel,
     target,
     template,
     yaxes,
@@ -300,6 +301,7 @@ def Cluster() -> RowPanel:
                             label_selectors=['job=~".*tikv"'],
                         ),
                         legend_format=r"quota-{{instance}}",
+                        hide=True,
                     ),
                 ],
             ),
@@ -320,6 +322,7 @@ def Cluster() -> RowPanel:
                             label_selectors=['job=~".*tikv"'],
                         ),
                         legend_format=r"quota-{{instance}}",
+                        hide=True,
                     ),
                 ],
             ),
@@ -1074,6 +1077,22 @@ def gRPC() -> RowPanel:
                     ),
                 ],
             ),
+            graph_panel(
+                title=r"gRPC batch commands wait duration",
+                description=r"The 99.99% wait time of gRPC batch commands",
+                yaxes=yaxes(left_format=UNITS.SECONDS, log_base=2),
+                targets=[
+                    target(
+                        expr=expr_histogram_quantile(
+                            0.9999,
+                            "tikv_grpc_batch_commands_wait_duration_seconds",
+                            is_optional_quantile=False,
+                        ),
+                        legend_format="P9999",
+                        additional_groupby=True,
+                    ),
+                ],
+            ),
         ]
     )
     layout.row(
@@ -4110,6 +4129,39 @@ def GC() -> RowPanel:
             ),
         ]
     )
+    # Auto Compaction panels
+    layout.row(
+        [
+            graph_panel_histogram_quantiles(
+                title="Auto Compaction Duration",
+                description="Time spent on auto compaction operations by type",
+                yaxes=yaxes(left_format=UNITS.SECONDS),
+                metric="tikv_auto_compaction_duration_seconds",
+                by_labels=["type"],
+                hide_count=True,
+            ),
+            graph_panel(
+                title="Auto Compaction Regions Status",
+                description="Number of regions meeting compaction threshold and pending candidates",
+                yaxes=yaxes(left_format=UNITS.SHORT),
+                targets=[
+                    target(
+                        expr=expr_sum(
+                            "tikv_auto_compaction_regions_meet_threshold",
+                        ),
+                        legend_format="regions meet threshold",
+                    ),
+                    target(
+                        expr=expr_sum(
+                            "tikv_auto_compaction_pending_candidates",
+                        ),
+                        legend_format="pending candidates",
+                    ),
+                ],
+            ),
+        ]
+    )
+
     return layout.row_panel
 
 
@@ -9754,7 +9806,7 @@ def BackupLog() -> RowPanel:
                 ],
             ),
             graph_panel(
-                title="Abnormal Checkpoint TS Lag",
+                title="Checkpoint TS Lag",
                 description=None,
                 yaxes=yaxes(left_format=UNITS.MILLI_SECONDS),
                 targets=[
@@ -9877,11 +9929,10 @@ def BackupLog() -> RowPanel:
                 label_selectors=['stage=~"to_stream_event"'],
             ),
             heatmap_panel(
-                title="Wait for Lock Duration",
-                description="The duration of waiting the mutex of the controller.",
+                title="Resolve Region TS duration",
+                description="The duration of calculating the next resolved TS of observed regions.",
                 yaxis=yaxis(format=UNITS.SECONDS),
-                metric="tikv_log_backup_event_handle_duration_sec_bucket",
-                label_selectors=['stage=~"get_router_lock"'],
+                metric="tikv_log_backup_resolve_duration_sec_bucket",
             ),
         ]
     )
@@ -10022,16 +10073,44 @@ def BackupLog() -> RowPanel:
                     )
                 ],
             ),
+        ]
+    )
+    layout.row(
+        [
+            graph_panel(
+                title="Buffer File Cache Mem Usage",
+                description="The memory usage of buffer file (stores logs about to be flushed to external storage) cache.",
+                yaxes=yaxes(left_format=UNITS.BYTES_IEC),
+                targets=[
+                    target(
+                        expr=expr_sum(
+                            "tikv_log_backup_temp_file_memory_usage",
+                            by_labels=["instance"],
+                        )
+                    )
+                ],
+            ),
             graph_panel(
-                title="Region Checkpoint Key Putting",
-                description="",
-                yaxes=yaxes(left_format=UNITS.COUNTS_PER_SEC),
+                title="Buffer File Count",
+                description="The number of temporary buffer files.",
+                targets=[
+                    target(
+                        expr=expr_sum(
+                            "tikv_log_backup_temp_file_count", by_labels=["instance"]
+                        )
+                    )
+                ],
+            ),
+            graph_panel(
+                title="Buffer File Swap out Bytes",
+                description="The total size of buffer files that are swapped out to disk.",
+                yaxes=yaxes(left_format=UNITS.BYTES_SEC_IEC),
                 targets=[
                     target(
                         expr=expr_sum_rate(
-                            "tikv_log_backup_metadata_key_operation",
-                            by_labels=["type"],
-                        ),
+                            "tikv_log_backup_in_disk_temp_file_size_sum",
+                            by_labels=["instance"],
+                        )
                     )
                 ],
             ),
@@ -10100,17 +10179,61 @@ def BackupLog() -> RowPanel:
                 ],
             ),
             graph_panel(
-                title="Tick Duration (P90)",
-                description="The internal handling message duration.",
-                yaxes=yaxes(left_format=UNITS.SECONDS),
+                title="Current Last Region ID",
+                description="The region with minimal checkpoint.",
                 targets=[
                     target(
-                        expr=expr_histogram_quantile(
-                            0.9,
-                            "tidb_log_backup_advancer_tick_duration_sec",
-                            by_labels=["step"],
+                        expr=expr_simple("tidb_log_backup_current_last_region_id"),
+                        legend_format="{{ instance }}",
+                    )
+                ],
+            ),
+            graph_panel(
+                title="Current Last Region Leader Store ID",
+                description="The leader of the region with minimal checkpoint.",
+                targets=[
+                    target(
+                        expr=expr_simple(
+                            "tikv_log_backup_store_last_checkpoint_ts"
+                        ).extra("/ 262144"),
+                        legend_format="{{ instance }}",
+                    )
+                ],
+            ),
+        ]
+    )
+    layout.row(
+        [
+            graph_panel(
+                title="Current Last Region ID per Store",
+                description="The region with minimal checkpoint of each store.",
+                targets=[
+                    target(
+                        expr=expr_simple(
+                            "tikv_log_backup_store_last_checkpoint_region_id"
                         ),
-                        legend_format="{{ step }}",
+                        legend_format="{{ instance }}",
+                    )
+                ],
+            ),
+            graph_panel(
+                title="Current Last Checkpoint TS per Store",
+                yaxes=yaxes(left_format=UNITS.MILLI_SECONDS),
+                description="The minimal checkpoint TS of each store.",
+                targets=[
+                    target(
+                        expr=expr_simple("tikv_log_backup_store_last_checkpoint_ts"),
+                        legend_format="{{ instance }}",
+                    )
+                ],
+            ),
+            graph_panel(
+                title="Active Progress Subscrption Per Store",
+                description="The active progress subscription from each store",
+                targets=[
+                    target(
+                        expr=expr_simple("tikv_log_backup_active_subscription_number"),
+                        legend_format="{{instance}}",
                     )
                 ],
             ),
@@ -10307,6 +10430,77 @@ def ResourceControl() -> RowPanel:
     return layout.row_panel
 
 
+def TikvConfig() -> RowPanel:
+    layout = Layout(title="Config")
+    # RocksDB DB Configuration Table
+    layout.row(
+        [
+            table_panel(
+                title="RocksDB DB Config",
+                description="TiKV RocksDB DB Configuration",
+                targets=[
+                    target(
+                        expr=expr_simple(
+                            "tikv_config_rocksdb_db",
+                        ),
+                    ),
+                ],
+            ),
+        ]
+    )
+    # RocksDB CF Configuration Table
+    layout.row(
+        [
+            table_panel(
+                title="RocksDB CF Config",
+                description="TiKV RocksDB CF Configuration",
+                targets=[
+                    target(
+                        expr=expr_simple(
+                            "tikv_config_rocksdb_cf",
+                        ).extra(
+                            " or (tikv_config_rocksdb unless tikv_config_rocksdb_cf)"
+                        ),
+                    ),
+                ],
+            ),
+        ]
+    )
+    # Flow Control Configuration Table
+    layout.row(
+        [
+            table_panel(
+                title="Flow Control Config",
+                description="TiKV Flow Control Configuration",
+                targets=[
+                    target(
+                        expr=expr_simple(
+                            "tikv_config_flow_control",
+                        ),
+                    ),
+                ],
+            ),
+        ]
+    )
+    # Raftstore Configuration Table
+    layout.row(
+        [
+            table_panel(
+                title="Raftstore Config",
+                description="TiKV Raftstore Configuration",
+                targets=[
+                    target(
+                        expr=expr_simple(
+                            "tikv_config_raftstore",
+                        ),
+                    ),
+                ],
+            ),
+        ]
+    )
+    return layout.row_panel
+
+
 #### Metrics Definition End ####
 
 
@@ -10374,6 +10568,8 @@ def ResourceControl() -> RowPanel:
         StatusServer(),
         Encryption(),
         TTL(),
+        # Config
+        TikvConfig(),
     ],
     # Set 14 or larger to support shared crosshair or shared tooltip.
     # See https://github.com/grafana/grafana/blob/v10.2.2/public/app/features/dashboard/state/DashboardMigrator.ts#L443-L445
diff --git a/metrics/grafana/tikv_details.json b/metrics/grafana/tikv_details.json
index 1fdb57c526e..a2832c1dbe9 100644
--- a/metrics/grafana/tikv_details.json
+++ b/metrics/grafana/tikv_details.json
@@ -939,7 +939,7 @@
               "datasource": "${DS_TEST-CLUSTER}",
               "expr": "((\n    tikv_server_cpu_cores_quota\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",job=~\".*tikv\"}\n    \n))  ",
               "format": "time_series",
-              "hide": false,
+              "hide": true,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
@@ -1087,7 +1087,7 @@
               "datasource": "${DS_TEST-CLUSTER}",
               "expr": "((\n    tikv_server_memory_quota_bytes\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",job=~\".*tikv\"}\n    \n))  ",
               "format": "time_series",
-              "hide": false,
+              "hide": true,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
@@ -6890,7 +6890,7 @@
           },
           "gridPos": {
             "h": 7,
-            "w": 12,
+            "w": 8,
             "x": 0,
             "y": 7
           },
@@ -7038,8 +7038,8 @@
           },
           "gridPos": {
             "h": 7,
-            "w": 12,
-            "x": 12,
+            "w": 8,
+            "x": 8,
             "y": 7
           },
           "height": null,
@@ -7160,6 +7160,139 @@
             "alignLevel": 0
           }
         },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "The 99.99% wait time of gRPC batch commands",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 8,
+            "x": 16,
+            "y": 7
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 55,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_grpc_batch_commands_wait_duration_seconds_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "P9999 {{$additional_groupby}}",
+              "metric": "",
+              "query": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_grpc_batch_commands_wait_duration_seconds_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "gRPC batch commands wait duration",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "s",
+              "label": null,
+              "logBase": 2,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
         {
           "aliasColors": {},
           "bars": false,
@@ -7192,7 +7325,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 55,
+          "id": 56,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -7400,7 +7533,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 56,
+          "id": 57,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -7548,7 +7681,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 57,
+          "id": 58,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -7681,7 +7814,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 58,
+          "id": 59,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -7814,7 +7947,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 59,
+          "id": 60,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -7950,7 +8083,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 60,
+      "id": 61,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -7989,7 +8122,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 61,
+          "id": 62,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -8122,7 +8255,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 62,
+          "id": 63,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -8262,7 +8395,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 63,
+          "id": 64,
           "interval": null,
           "legend": {
             "show": false
@@ -8360,7 +8493,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 64,
+          "id": 65,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -8568,7 +8701,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 65,
+          "id": 66,
           "interval": null,
           "legend": {
             "show": false
@@ -8666,7 +8799,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 66,
+          "id": 67,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -8874,7 +9007,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 67,
+          "id": 68,
           "interval": null,
           "legend": {
             "show": false
@@ -8972,7 +9105,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 68,
+          "id": 69,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -9180,7 +9313,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 69,
+          "id": 70,
           "interval": null,
           "legend": {
             "show": false
@@ -9278,7 +9411,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 70,
+          "id": 71,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -9486,7 +9619,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 71,
+          "id": 72,
           "interval": null,
           "legend": {
             "show": false
@@ -9584,7 +9717,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 72,
+          "id": 73,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -9785,7 +9918,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 73,
+          "id": 74,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -9918,7 +10051,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 74,
+          "id": 75,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -10119,7 +10252,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 75,
+          "id": 76,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -10320,7 +10453,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 76,
+          "id": 77,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -10521,7 +10654,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 77,
+          "id": 78,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -10672,7 +10805,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 78,
+      "id": 79,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -10711,7 +10844,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 79,
+          "id": 80,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -10844,7 +10977,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 80,
+          "id": 81,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -11055,7 +11188,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 81,
+      "id": 82,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -11094,7 +11227,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 82,
+          "id": 83,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -11227,7 +11360,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 83,
+          "id": 84,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -11369,7 +11502,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 84,
+          "id": 85,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -11511,7 +11644,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 85,
+          "id": 86,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -11653,7 +11786,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 86,
+          "id": 87,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -11804,7 +11937,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 87,
+          "id": 88,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -11946,7 +12079,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 88,
+          "id": 89,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -12079,7 +12212,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 89,
+          "id": 90,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -12212,7 +12345,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 90,
+          "id": 91,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -12345,7 +12478,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 91,
+          "id": 92,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -12478,7 +12611,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 92,
+          "id": 93,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -12611,7 +12744,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 93,
+          "id": 94,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -12744,7 +12877,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 94,
+          "id": 95,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -12877,7 +13010,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 95,
+          "id": 96,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -13010,7 +13143,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 96,
+          "id": 97,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -13173,7 +13306,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 97,
+          "id": 98,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -13315,7 +13448,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 98,
+          "id": 99,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -13496,7 +13629,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 99,
+          "id": 100,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -13668,7 +13801,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 100,
+          "id": 101,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -13816,7 +13949,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 101,
+          "id": 102,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -13952,7 +14085,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 102,
+      "id": 103,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -13991,7 +14124,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 103,
+          "id": 104,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -14139,7 +14272,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 104,
+          "id": 105,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -14287,7 +14420,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 105,
+          "id": 106,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -14420,7 +14553,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 106,
+          "id": 107,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -14571,7 +14704,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 107,
+      "id": 108,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -14610,7 +14743,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 108,
+          "id": 109,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -14811,7 +14944,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 109,
+          "id": 110,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -15012,7 +15145,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 110,
+          "id": 111,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -15213,7 +15346,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 111,
+          "id": 112,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -15414,7 +15547,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 112,
+          "id": 113,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -15615,7 +15748,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 113,
+          "id": 114,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -15816,7 +15949,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 114,
+          "id": 115,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -16017,7 +16150,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 115,
+          "id": 116,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -16218,7 +16351,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 116,
+          "id": 117,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -16419,7 +16552,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 117,
+          "id": 118,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -16620,7 +16753,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 118,
+          "id": 119,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -16821,7 +16954,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 119,
+          "id": 120,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -17022,7 +17155,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 120,
+          "id": 121,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -17226,7 +17359,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 121,
+      "id": 122,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -17272,7 +17405,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 122,
+          "id": 123,
           "interval": null,
           "legend": {
             "show": false
@@ -17370,7 +17503,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 123,
+          "id": 124,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -17578,7 +17711,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 124,
+          "id": 125,
           "interval": null,
           "legend": {
             "show": false
@@ -17676,7 +17809,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 125,
+          "id": 126,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -17884,7 +18017,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 126,
+          "id": 127,
           "interval": null,
           "legend": {
             "show": false
@@ -17982,7 +18115,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 127,
+          "id": 128,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -18190,7 +18323,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 128,
+          "id": 129,
           "interval": null,
           "legend": {
             "show": false
@@ -18288,7 +18421,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 129,
+          "id": 130,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -18496,7 +18629,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 130,
+          "id": 131,
           "interval": null,
           "legend": {
             "show": false
@@ -18594,7 +18727,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 131,
+          "id": 132,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -18802,7 +18935,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 132,
+          "id": 133,
           "interval": null,
           "legend": {
             "show": false
@@ -18900,7 +19033,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 133,
+          "id": 134,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -19108,7 +19241,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 134,
+          "id": 135,
           "interval": null,
           "legend": {
             "show": false
@@ -19206,7 +19339,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 135,
+          "id": 136,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -19414,7 +19547,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 136,
+          "id": 137,
           "interval": null,
           "legend": {
             "show": false
@@ -19512,7 +19645,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 137,
+          "id": 138,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -19720,7 +19853,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 138,
+          "id": 139,
           "interval": null,
           "legend": {
             "show": false
@@ -19818,7 +19951,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 139,
+          "id": 140,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -20026,7 +20159,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 140,
+          "id": 141,
           "interval": null,
           "legend": {
             "show": false
@@ -20124,7 +20257,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 141,
+          "id": 142,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -20332,7 +20465,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 142,
+          "id": 143,
           "interval": null,
           "legend": {
             "show": false
@@ -20430,7 +20563,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 143,
+          "id": 144,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -20638,7 +20771,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 144,
+          "id": 145,
           "interval": null,
           "legend": {
             "show": false
@@ -20736,7 +20869,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 145,
+          "id": 146,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -20940,7 +21073,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 146,
+      "id": 147,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -20986,7 +21119,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 147,
+          "id": 148,
           "interval": null,
           "legend": {
             "show": false
@@ -21084,7 +21217,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 148,
+          "id": 149,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -21292,7 +21425,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 149,
+          "id": 150,
           "interval": null,
           "legend": {
             "show": false
@@ -21390,7 +21523,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 150,
+          "id": 151,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -21598,7 +21731,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 151,
+          "id": 152,
           "interval": null,
           "legend": {
             "show": false
@@ -21696,7 +21829,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 152,
+          "id": 153,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -21904,7 +22037,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 153,
+          "id": 154,
           "interval": null,
           "legend": {
             "show": false
@@ -22002,7 +22135,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 154,
+          "id": 155,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -22210,7 +22343,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 155,
+          "id": 156,
           "interval": null,
           "legend": {
             "show": false
@@ -22308,7 +22441,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 156,
+          "id": 157,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -22516,7 +22649,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 157,
+          "id": 158,
           "interval": null,
           "legend": {
             "show": false
@@ -22614,7 +22747,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 158,
+          "id": 159,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -22815,7 +22948,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 159,
+          "id": 160,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -22963,7 +23096,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 160,
+          "id": 161,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -23099,7 +23232,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 161,
+      "id": 162,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -23138,7 +23271,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 162,
+          "id": 163,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -23271,7 +23404,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 163,
+          "id": 164,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -23404,7 +23537,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 164,
+          "id": 165,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -23537,7 +23670,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 165,
+          "id": 166,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -23677,7 +23810,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 166,
+          "id": 167,
           "interval": null,
           "legend": {
             "show": false
@@ -23775,7 +23908,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 167,
+          "id": 168,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -23983,7 +24116,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 168,
+          "id": 169,
           "interval": null,
           "legend": {
             "show": false
@@ -24081,7 +24214,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 169,
+          "id": 170,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -24289,7 +24422,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 170,
+          "id": 171,
           "interval": null,
           "legend": {
             "show": false
@@ -24387,7 +24520,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 171,
+          "id": 172,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -24595,7 +24728,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 172,
+          "id": 173,
           "interval": null,
           "legend": {
             "show": false
@@ -24700,7 +24833,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 173,
+          "id": 174,
           "interval": null,
           "legend": {
             "show": false
@@ -24798,7 +24931,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 174,
+          "id": 175,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -24931,7 +25064,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 175,
+          "id": 176,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -25082,7 +25215,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 176,
+      "id": 177,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -25121,7 +25254,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 177,
+          "id": 178,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -25269,7 +25402,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 178,
+          "id": 179,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -25424,7 +25557,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 179,
+          "id": 180,
           "interval": null,
           "legend": {
             "show": false
@@ -25522,7 +25655,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 180,
+          "id": 181,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -25662,7 +25795,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 181,
+          "id": 182,
           "interval": null,
           "legend": {
             "show": false
@@ -25767,7 +25900,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 182,
+          "id": 183,
           "interval": null,
           "legend": {
             "show": false
@@ -25872,7 +26005,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 183,
+          "id": 184,
           "interval": null,
           "legend": {
             "show": false
@@ -25977,7 +26110,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 184,
+          "id": 185,
           "interval": null,
           "legend": {
             "show": false
@@ -26082,7 +26215,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 185,
+          "id": 186,
           "interval": null,
           "legend": {
             "show": false
@@ -26187,7 +26320,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 186,
+          "id": 187,
           "interval": null,
           "legend": {
             "show": false
@@ -26292,7 +26425,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 187,
+          "id": 188,
           "interval": null,
           "legend": {
             "show": false
@@ -26397,7 +26530,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 188,
+          "id": 189,
           "interval": null,
           "legend": {
             "show": false
@@ -26502,7 +26635,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 189,
+          "id": 190,
           "interval": null,
           "legend": {
             "show": false
@@ -26607,7 +26740,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 190,
+          "id": 191,
           "interval": null,
           "legend": {
             "show": false
@@ -26705,7 +26838,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 191,
+          "id": 192,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -26838,7 +26971,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 192,
+          "id": 193,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -26989,7 +27122,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 193,
+      "id": 194,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -27028,7 +27161,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 194,
+          "id": 195,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -27161,7 +27294,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 195,
+          "id": 196,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -27294,7 +27427,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 196,
+          "id": 197,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -27427,139 +27560,6 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 197,
-          "interval": null,
-          "isNew": true,
-          "legend": {
-            "alignAsTable": true,
-            "avg": false,
-            "current": true,
-            "hideEmpty": true,
-            "hideZero": true,
-            "max": true,
-            "min": false,
-            "rightSide": true,
-            "show": true,
-            "sideWidth": null,
-            "sort": "max",
-            "sortDesc": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "maxDataPoints": null,
-          "maxPerRow": null,
-          "minSpan": null,
-          "nullPointMode": "null as zero",
-          "options": {
-            "alertThreshold": true,
-            "dataLinks": []
-          },
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "repeat": null,
-          "repeatDirection": null,
-          "seriesOverrides": [],
-          "span": null,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_raftstore_raft_sent_message_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",status=\"accept\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
-              "format": "time_series",
-              "hide": false,
-              "instant": false,
-              "interval": "",
-              "intervalFactor": 1,
-              "legendFormat": "{{type}} {{$additional_groupby}}",
-              "metric": "",
-              "query": "sum(rate(\n    tikv_raftstore_raft_sent_message_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",status=\"accept\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
-              "refId": "",
-              "step": 10,
-              "target": ""
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Messages",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "transformations": [],
-          "transparent": false,
-          "type": "graph",
-          "xaxis": {
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "decimals": null,
-              "format": "ops",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            },
-            {
-              "decimals": null,
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ],
-          "yaxis": {
-            "align": false,
-            "alignLevel": 0
-          }
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "cacheTimeout": null,
-          "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The total number of vote messages that are sent in Raft",
-          "editable": true,
-          "error": false,
-          "fieldConfig": {
-            "defaults": {
-              "thresholds": {
-                "mode": "absolute",
-                "steps": []
-              }
-            }
-          },
-          "fill": 1,
-          "fillGradient": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "gridPos": {
-            "h": 7,
-            "w": 12,
-            "x": 0,
-            "y": 14
-          },
-          "height": null,
-          "hideTimeOverride": false,
           "id": 198,
           "interval": null,
           "isNew": true,
@@ -27600,6 +27600,139 @@
           "span": null,
           "stack": false,
           "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(rate(\n    tikv_raftstore_raft_sent_message_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",status=\"accept\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{type}} {{$additional_groupby}}",
+              "metric": "",
+              "query": "sum(rate(\n    tikv_raftstore_raft_sent_message_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",status=\"accept\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Messages",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "ops",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "The total number of vote messages that are sent in Raft",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 12,
+            "x": 0,
+            "y": 14
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 199,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
@@ -27693,7 +27826,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 199,
+          "id": 200,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -27848,7 +27981,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 200,
+          "id": 201,
           "interval": null,
           "legend": {
             "show": false
@@ -27946,7 +28079,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 201,
+          "id": 202,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -28154,7 +28287,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 202,
+          "id": 203,
           "interval": null,
           "legend": {
             "show": false
@@ -28252,7 +28385,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 203,
+          "id": 204,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -28456,7 +28589,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 204,
+      "id": 205,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -28495,7 +28628,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 205,
+          "id": 206,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -28628,7 +28761,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 206,
+          "id": 207,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -28761,7 +28894,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 207,
+          "id": 208,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -28894,7 +29027,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 208,
+          "id": 209,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -29027,7 +29160,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 209,
+          "id": 210,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -29160,7 +29293,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 210,
+          "id": 211,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -29323,7 +29456,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 211,
+          "id": 212,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -29459,7 +29592,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 212,
+      "id": 213,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -29498,7 +29631,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 213,
+          "id": 214,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -29646,7 +29779,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 214,
+          "id": 215,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -29794,7 +29927,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 215,
+          "id": 216,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -29927,7 +30060,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 216,
+          "id": 217,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -30060,7 +30193,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 217,
+          "id": 218,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -30193,7 +30326,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 218,
+          "id": 219,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -30326,7 +30459,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 219,
+          "id": 220,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -30459,7 +30592,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 220,
+          "id": 221,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -30592,7 +30725,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 221,
+          "id": 222,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -30769,7 +30902,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 222,
+      "id": 223,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -30808,7 +30941,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 223,
+          "id": 224,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -30971,7 +31104,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 224,
+          "id": 225,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -31172,7 +31305,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 225,
+          "id": 226,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -31320,7 +31453,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 226,
+          "id": 227,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -31483,7 +31616,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 227,
+          "id": 228,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -31684,7 +31817,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 228,
+          "id": 229,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -31862,7 +31995,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 229,
+          "id": 230,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -32025,7 +32158,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 230,
+          "id": 231,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -32188,7 +32321,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 231,
+          "id": 232,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -32321,7 +32454,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 232,
+          "id": 233,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -32525,7 +32658,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 233,
+      "id": 234,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -32564,7 +32697,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 234,
+          "id": 235,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -32757,7 +32890,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 235,
+          "id": 236,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -32935,7 +33068,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 236,
+          "id": 237,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -33143,7 +33276,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 237,
+          "id": 238,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -33321,7 +33454,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 238,
+          "id": 239,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -33484,7 +33617,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 239,
+          "id": 240,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -33662,7 +33795,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 240,
+          "id": 241,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -33795,7 +33928,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 241,
+          "id": 242,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -33973,7 +34106,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 242,
+          "id": 243,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -34146,7 +34279,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 243,
+          "id": 244,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -34324,7 +34457,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 244,
+          "id": 245,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -34457,7 +34590,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 245,
+          "id": 246,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -34635,7 +34768,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 246,
+          "id": 247,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -34813,7 +34946,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 247,
+          "id": 248,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -34991,7 +35124,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 248,
+          "id": 249,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -35124,7 +35257,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 249,
+          "id": 250,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -35257,7 +35390,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 250,
+          "id": 251,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -35390,7 +35523,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 251,
+          "id": 252,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -35613,7 +35746,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 252,
+          "id": 253,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -35806,7 +35939,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 253,
+          "id": 254,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -35969,7 +36102,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 254,
+          "id": 255,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -36162,7 +36295,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 255,
+          "id": 256,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -36310,7 +36443,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 256,
+          "id": 257,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -36443,7 +36576,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 257,
+          "id": 258,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -36591,7 +36724,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 258,
+          "id": 259,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -36769,7 +36902,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 259,
+          "id": 260,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -36932,7 +37065,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 260,
+          "id": 261,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -37110,7 +37243,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 261,
+          "id": 262,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -37243,7 +37376,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 262,
+          "id": 263,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -37376,7 +37509,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 263,
+          "id": 264,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -37509,7 +37642,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 264,
+          "id": 265,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -37642,7 +37775,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 265,
+          "id": 266,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -37775,7 +37908,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 266,
+          "id": 267,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -37915,7 +38048,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 267,
+          "id": 268,
           "interval": null,
           "legend": {
             "show": false
@@ -38013,7 +38146,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 268,
+          "id": 269,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -38214,7 +38347,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 269,
+          "id": 270,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -38347,7 +38480,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 270,
+          "id": 271,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -38480,7 +38613,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 271,
+          "id": 272,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -38658,7 +38791,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 272,
+          "id": 273,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -38791,7 +38924,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 273,
+          "id": 274,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -38927,7 +39060,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 274,
+      "id": 275,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -38966,7 +39099,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 275,
+          "id": 276,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -39114,7 +39247,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 276,
+          "id": 277,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -39262,7 +39395,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 277,
+          "id": 278,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -39395,7 +39528,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 278,
+          "id": 279,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -39528,7 +39661,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 279,
+          "id": 280,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -39706,7 +39839,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 280,
+          "id": 281,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -39884,7 +40017,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 281,
+          "id": 282,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -40062,7 +40195,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 282,
+          "id": 283,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -40195,7 +40328,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 283,
+          "id": 284,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -40373,7 +40506,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 284,
+          "id": 285,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -40506,7 +40639,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 285,
+          "id": 286,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -40669,7 +40802,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 286,
+          "id": 287,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -40847,7 +40980,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 287,
+          "id": 288,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -41025,7 +41158,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 288,
+          "id": 289,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -41203,7 +41336,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 289,
+          "id": 290,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -41336,7 +41469,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 290,
+          "id": 291,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -41514,7 +41647,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 291,
+          "id": 292,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -41647,7 +41780,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 292,
+          "id": 293,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -41825,7 +41958,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 293,
+          "id": 294,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -41958,7 +42091,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 294,
+          "id": 295,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -42091,7 +42224,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 295,
+          "id": 296,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -42269,7 +42402,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 296,
+          "id": 297,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -42447,7 +42580,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 297,
+          "id": 298,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -42580,7 +42713,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 298,
+          "id": 299,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -42758,7 +42891,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 299,
+          "id": 300,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -42891,7 +43024,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 300,
+          "id": 301,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -43069,7 +43202,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 301,
+          "id": 302,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -43205,7 +43338,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 302,
+      "id": 303,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -43244,7 +43377,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 303,
+          "id": 304,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -43377,7 +43510,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 304,
+          "id": 305,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -43525,7 +43658,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 305,
+          "id": 306,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -43726,7 +43859,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 306,
+          "id": 307,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -43859,7 +43992,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 307,
+          "id": 308,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -43992,7 +44125,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 308,
+          "id": 309,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -44125,7 +44258,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 309,
+          "id": 310,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -44258,7 +44391,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 310,
+          "id": 311,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -44391,7 +44524,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 311,
+          "id": 312,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -44531,7 +44664,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 312,
+          "id": 313,
           "interval": null,
           "legend": {
             "show": false
@@ -44636,7 +44769,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 313,
+          "id": 314,
           "interval": null,
           "legend": {
             "show": false
@@ -44734,7 +44867,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 314,
+          "id": 315,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -44874,7 +45007,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 315,
+          "id": 316,
           "interval": null,
           "legend": {
             "show": false
@@ -44972,7 +45105,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 316,
+          "id": 317,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -45105,7 +45238,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 317,
+          "id": 318,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -45245,7 +45378,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 318,
+          "id": 319,
           "interval": null,
           "legend": {
             "show": false
@@ -45343,7 +45476,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 319,
+          "id": 320,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -45551,7 +45684,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 320,
+          "id": 321,
           "interval": null,
           "legend": {
             "show": false
@@ -45649,7 +45782,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 321,
+          "id": 322,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -45850,7 +45983,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 322,
+          "id": 323,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -46058,7 +46191,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 323,
+          "id": 324,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -46236,7 +46369,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 324,
+          "id": 325,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -46369,7 +46502,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 325,
+          "id": 326,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -46502,7 +46635,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 326,
+          "id": 327,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -46635,7 +46768,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 327,
+          "id": 328,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -46775,7 +46908,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 328,
+          "id": 329,
           "interval": null,
           "legend": {
             "show": false
@@ -46880,7 +47013,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 329,
+          "id": 330,
           "interval": null,
           "legend": {
             "show": false
@@ -46985,7 +47118,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 330,
+          "id": 331,
           "interval": null,
           "legend": {
             "show": false
@@ -47090,7 +47223,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 331,
+          "id": 332,
           "interval": null,
           "legend": {
             "show": false
@@ -47191,7 +47324,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 332,
+      "id": 333,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -47230,7 +47363,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 333,
+          "id": 334,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -47378,7 +47511,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 334,
+          "id": 335,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -47518,7 +47651,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 335,
+          "id": 336,
           "interval": null,
           "legend": {
             "show": false
@@ -47616,7 +47749,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 336,
+          "id": 337,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -47749,139 +47882,6 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 337,
-          "interval": null,
-          "isNew": true,
-          "legend": {
-            "alignAsTable": true,
-            "avg": false,
-            "current": true,
-            "hideEmpty": true,
-            "hideZero": true,
-            "max": true,
-            "min": false,
-            "rightSide": true,
-            "show": true,
-            "sideWidth": null,
-            "sort": "max",
-            "sortDesc": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "maxDataPoints": null,
-          "maxPerRow": null,
-          "minSpan": null,
-          "nullPointMode": "null as zero",
-          "options": {
-            "alertThreshold": true,
-            "dataLinks": []
-          },
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "repeat": null,
-          "repeatDirection": null,
-          "seriesOverrides": [],
-          "span": null,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_scheduler_throttle_action_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, cf, $additional_groupby) ",
-              "format": "time_series",
-              "hide": false,
-              "instant": false,
-              "interval": "",
-              "intervalFactor": 1,
-              "legendFormat": "{{type}}-{{cf}} {{$additional_groupby}}",
-              "metric": "",
-              "query": "sum(rate(\n    tikv_scheduler_throttle_action_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, cf, $additional_groupby) ",
-              "refId": "",
-              "step": 10,
-              "target": ""
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Flow controller actions",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "transformations": [],
-          "transparent": false,
-          "type": "graph",
-          "xaxis": {
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "decimals": null,
-              "format": "ops",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            },
-            {
-              "decimals": null,
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ],
-          "yaxis": {
-            "align": false,
-            "alignLevel": 0
-          }
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "cacheTimeout": null,
-          "datasource": "${DS_TEST-CLUSTER}",
-          "description": "",
-          "editable": true,
-          "error": false,
-          "fieldConfig": {
-            "defaults": {
-              "thresholds": {
-                "mode": "absolute",
-                "steps": []
-              }
-            }
-          },
-          "fill": 1,
-          "fillGradient": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "gridPos": {
-            "h": 7,
-            "w": 12,
-            "x": 12,
-            "y": 14
-          },
-          "height": null,
-          "hideTimeOverride": false,
           "id": 338,
           "interval": null,
           "isNew": true,
@@ -47922,6 +47922,139 @@
           "span": null,
           "stack": false,
           "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(rate(\n    tikv_scheduler_throttle_action_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, cf, $additional_groupby) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{type}}-{{cf}} {{$additional_groupby}}",
+              "metric": "",
+              "query": "sum(rate(\n    tikv_scheduler_throttle_action_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, cf, $additional_groupby) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Flow controller actions",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "ops",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 12,
+            "x": 12,
+            "y": 14
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 339,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
@@ -48060,7 +48193,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 339,
+          "id": 340,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -48223,7 +48356,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 340,
+          "id": 341,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -48371,7 +48504,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 341,
+          "id": 342,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -48504,7 +48637,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 342,
+          "id": 343,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -48640,7 +48773,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 343,
+      "id": 344,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -48679,7 +48812,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 344,
+          "id": 345,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -48827,7 +48960,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 345,
+          "id": 346,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -48960,7 +49093,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 346,
+          "id": 347,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -49093,7 +49226,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 347,
+          "id": 348,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -49226,7 +49359,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 348,
+          "id": 349,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -49359,7 +49492,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 349,
+          "id": 350,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -49514,7 +49647,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 350,
+          "id": 351,
           "interval": null,
           "legend": {
             "show": false
@@ -49615,7 +49748,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 351,
+      "id": 352,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -49654,7 +49787,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 352,
+          "id": 353,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -49787,7 +49920,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 353,
+          "id": 354,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -49920,7 +50053,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 354,
+          "id": 355,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -50060,7 +50193,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 355,
+          "id": 356,
           "interval": null,
           "legend": {
             "show": false
@@ -50158,7 +50291,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 356,
+          "id": 357,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -50359,7 +50492,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 357,
+          "id": 358,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -50560,7 +50693,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 358,
+          "id": 359,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -50764,7 +50897,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 359,
+      "id": 360,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -50803,7 +50936,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 360,
+          "id": 361,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -50951,7 +51084,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 361,
+          "id": 362,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -51152,7 +51285,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 362,
+          "id": 363,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -51353,7 +51486,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 363,
+          "id": 364,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -51554,7 +51687,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 364,
+          "id": 365,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -51755,7 +51888,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 365,
+          "id": 366,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -51888,7 +52021,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 366,
+          "id": 367,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -52021,7 +52154,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 367,
+          "id": 368,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -52154,7 +52287,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 368,
+          "id": 369,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -52287,7 +52420,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 369,
+          "id": 370,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -52495,7 +52628,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 370,
+          "id": 371,
           "interval": null,
           "legend": {
             "show": false
@@ -52596,7 +52729,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 371,
+      "id": 372,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -52642,7 +52775,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 372,
+          "id": 373,
           "interval": null,
           "legend": {
             "show": false
@@ -52740,7 +52873,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 373,
+          "id": 374,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -52941,7 +53074,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 374,
+          "id": 375,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -53074,7 +53207,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 375,
+          "id": 376,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -53207,7 +53340,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 376,
+          "id": 377,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -53340,7 +53473,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 377,
+          "id": 378,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -53541,7 +53674,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 378,
+          "id": 379,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -53674,7 +53807,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 379,
+          "id": 380,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -53807,7 +53940,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 380,
+          "id": 381,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -53943,7 +54076,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 381,
+      "id": 382,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -53982,7 +54115,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 382,
+          "id": 383,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -54183,7 +54316,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 383,
+          "id": 384,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -54384,7 +54517,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 384,
+          "id": 385,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -54585,7 +54718,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 385,
+          "id": 386,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -54786,7 +54919,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 386,
+          "id": 387,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -54919,7 +55052,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 387,
+          "id": 388,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -55052,7 +55185,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 388,
+          "id": 389,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -55185,7 +55318,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 389,
+          "id": 390,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -55318,7 +55451,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 390,
+          "id": 391,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -55451,7 +55584,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 391,
+          "id": 392,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -55591,7 +55724,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 392,
+          "id": 393,
           "interval": null,
           "legend": {
             "show": false
@@ -55689,7 +55822,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 393,
+          "id": 394,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -55893,7 +56026,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 394,
+      "id": 395,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -55932,7 +56065,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 395,
+          "id": 396,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -56065,7 +56198,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 396,
+          "id": 397,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -56198,7 +56331,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 397,
+          "id": 398,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -56338,7 +56471,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 398,
+          "id": 399,
           "interval": null,
           "legend": {
             "show": false
@@ -56436,7 +56569,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 399,
+          "id": 400,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -56637,7 +56770,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 400,
+          "id": 401,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -56838,7 +56971,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 401,
+          "id": 402,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -57042,7 +57175,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 402,
+      "id": 403,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -57081,7 +57214,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 403,
+          "id": 404,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -57259,7 +57392,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 404,
+          "id": 405,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -57460,7 +57593,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 405,
+          "id": 406,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -57593,7 +57726,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 406,
+          "id": 407,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -57726,7 +57859,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 407,
+          "id": 408,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -57859,7 +57992,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 408,
+          "id": 409,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -57992,7 +58125,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 409,
+          "id": 410,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -58125,7 +58258,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 410,
+          "id": 411,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -58254,7 +58387,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 411,
+          "id": 412,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -58329,7 +58462,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 412,
+          "id": 413,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -58408,7 +58541,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 413,
+          "id": 414,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -58661,7 +58794,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 414,
+          "id": 415,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -58794,7 +58927,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 415,
+          "id": 416,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -58894,55 +59027,13 @@
             "align": false,
             "alignLevel": 0
           }
-        }
-      ],
-      "repeat": null,
-      "repeatDirection": null,
-      "span": null,
-      "targets": [],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "GC",
-      "transformations": [],
-      "transparent": false,
-      "type": "row"
-    },
-    {
-      "cacheTimeout": null,
-      "collapsed": true,
-      "datasource": null,
-      "description": null,
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "thresholds": {
-            "mode": "absolute",
-            "steps": []
-          }
-        }
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "height": null,
-      "hideTimeOverride": false,
-      "id": 416,
-      "interval": null,
-      "links": [],
-      "maxDataPoints": 100,
-      "maxPerRow": null,
-      "minSpan": null,
-      "panels": [
+        },
         {
           "aliasColors": {},
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": null,
+          "description": "Time spent on auto compaction operations by type",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -58965,7 +59056,7 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 0
+            "y": 49
           },
           "height": null,
           "hideTimeOverride": false,
@@ -59005,37 +59096,90 @@
           "renderer": "flot",
           "repeat": null,
           "repeatDirection": null,
-          "seriesOverrides": [],
+          "seriesOverrides": [
+            {
+              "alias": "/^count/",
+              "bars": false,
+              "dashLength": 1,
+              "dashes": true,
+              "fill": 2,
+              "fillBelowTo": null,
+              "lines": true,
+              "spaceLength": 1,
+              "transform": "negative-Y",
+              "yaxis": 2,
+              "zindex": -3
+            },
+            {
+              "alias": "/^avg/",
+              "bars": false,
+              "fill": 7,
+              "fillBelowTo": null,
+              "lines": true,
+              "yaxis": 1,
+              "zindex": 0
+            }
+          ],
           "span": null,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"waiter_manager.*\"}\n    [$__rate_interval]\n)) by (instance, name) ",
+              "expr": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_auto_compaction_duration_seconds_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, le, $additional_groupby) \n    \n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{instance}}-{{name}}",
+              "legendFormat": "99.99%-{{type}} {{$additional_groupby}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"waiter_manager.*\"}\n    [$__rate_interval]\n)) by (instance, name) ",
+              "query": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_auto_compaction_duration_seconds_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, le, $additional_groupby) \n    \n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
             },
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"deadlock_detect.*\"}\n    [$__rate_interval]\n)) by (instance, name) ",
+              "expr": "histogram_quantile(0.99,(\n    sum(rate(\n    tikv_auto_compaction_duration_seconds_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, le, $additional_groupby) \n    \n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{instance}}-{{name}}",
+              "legendFormat": "99%-{{type}} {{$additional_groupby}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"deadlock_detect.*\"}\n    [$__rate_interval]\n)) by (instance, name) ",
+              "query": "histogram_quantile(0.99,(\n    sum(rate(\n    tikv_auto_compaction_duration_seconds_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, le, $additional_groupby) \n    \n    \n))  ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            },
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "(sum(rate(\n    tikv_auto_compaction_duration_seconds_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby)  / sum(rate(\n    tikv_auto_compaction_duration_seconds_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) )",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "avg-{{type}} {{$additional_groupby}}",
+              "metric": "",
+              "query": "(sum(rate(\n    tikv_auto_compaction_duration_seconds_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby)  / sum(rate(\n    tikv_auto_compaction_duration_seconds_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) )",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            },
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(rate(\n    tikv_auto_compaction_duration_seconds_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
+              "format": "time_series",
+              "hide": true,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "count-{{type}} {{$additional_groupby}}",
+              "metric": "",
+              "query": "sum(rate(\n    tikv_auto_compaction_duration_seconds_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -59044,7 +59188,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Lock Manager Thread CPU",
+          "title": "Auto Compaction Duration",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -59063,7 +59207,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "percentunit",
+              "format": "s",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -59090,7 +59234,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": null,
+          "description": "Number of regions meeting compaction threshold and pending candidates",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -59113,7 +59257,7 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 0
+            "y": 49
           },
           "height": null,
           "hideTimeOverride": false,
@@ -59160,15 +59304,30 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_lock_manager_task_counter\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
+              "expr": "sum((\n    tikv_auto_compaction_regions_meet_threshold\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{type}} {{$additional_groupby}}",
+              "legendFormat": "regions meet threshold",
               "metric": "",
-              "query": "sum(rate(\n    tikv_lock_manager_task_counter\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
+              "query": "sum((\n    tikv_auto_compaction_regions_meet_threshold\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            },
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum((\n    tikv_auto_compaction_pending_candidates\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "pending candidates",
+              "metric": "",
+              "query": "sum((\n    tikv_auto_compaction_pending_candidates\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -59177,7 +59336,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Lock Manager Handled tasks",
+          "title": "Auto Compaction Regions Status",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -59196,7 +59355,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "ops",
+              "format": "short",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -59217,13 +59376,55 @@
             "align": false,
             "alignLevel": 0
           }
-        },
+        }
+      ],
+      "repeat": null,
+      "repeatDirection": null,
+      "span": null,
+      "targets": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "GC",
+      "transformations": [],
+      "transparent": false,
+      "type": "row"
+    },
+    {
+      "cacheTimeout": null,
+      "collapsed": true,
+      "datasource": null,
+      "description": null,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "thresholds": {
+            "mode": "absolute",
+            "steps": []
+          }
+        }
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "height": null,
+      "hideTimeOverride": false,
+      "id": 419,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "maxPerRow": null,
+      "minSpan": null,
+      "panels": [
         {
           "aliasColors": {},
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "",
+          "description": null,
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -59246,11 +59447,11 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 7
+            "y": 0
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 419,
+          "id": 420,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -59286,90 +59487,37 @@
           "renderer": "flot",
           "repeat": null,
           "repeatDirection": null,
-          "seriesOverrides": [
-            {
-              "alias": "/^count/",
-              "bars": false,
-              "dashLength": 1,
-              "dashes": true,
-              "fill": 2,
-              "fillBelowTo": null,
-              "lines": true,
-              "spaceLength": 1,
-              "transform": "negative-Y",
-              "yaxis": 2,
-              "zindex": -3
-            },
-            {
-              "alias": "/^avg/",
-              "bars": false,
-              "fill": 7,
-              "fillBelowTo": null,
-              "lines": true,
-              "yaxis": 1,
-              "zindex": 0
-            }
-          ],
+          "seriesOverrides": [],
           "span": null,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
-              "format": "time_series",
-              "hide": false,
-              "instant": false,
-              "interval": "",
-              "intervalFactor": 1,
-              "legendFormat": "99.99% {{$additional_groupby}}",
-              "metric": "",
-              "query": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
-              "refId": "",
-              "step": 10,
-              "target": ""
-            },
-            {
-              "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "histogram_quantile(0.99,(\n    sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
+              "expr": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"waiter_manager.*\"}\n    [$__rate_interval]\n)) by (instance, name) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "99% {{$additional_groupby}}",
+              "legendFormat": "{{instance}}-{{name}}",
               "metric": "",
-              "query": "histogram_quantile(0.99,(\n    sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
+              "query": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"waiter_manager.*\"}\n    [$__rate_interval]\n)) by (instance, name) ",
               "refId": "",
               "step": 10,
               "target": ""
             },
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "(sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby)  / sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) )",
+              "expr": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"deadlock_detect.*\"}\n    [$__rate_interval]\n)) by (instance, name) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "avg {{$additional_groupby}}",
-              "metric": "",
-              "query": "(sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby)  / sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) )",
-              "refId": "",
-              "step": 10,
-              "target": ""
-            },
-            {
-              "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) ",
-              "format": "time_series",
-              "hide": true,
-              "instant": false,
-              "interval": "",
-              "intervalFactor": 1,
-              "legendFormat": "count {{$additional_groupby}}",
+              "legendFormat": "{{instance}}-{{name}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) ",
+              "query": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"deadlock_detect.*\"}\n    [$__rate_interval]\n)) by (instance, name) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -59378,7 +59526,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Waiter lifetime duration",
+          "title": "Lock Manager Thread CPU",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -59397,9 +59545,9 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "s",
+              "format": "percentunit",
               "label": null,
-              "logBase": 2,
+              "logBase": 1,
               "max": null,
               "min": null,
               "show": true
@@ -59447,11 +59595,11 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 7
+            "y": 0
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 420,
+          "id": 421,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -59494,22 +59642,7 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(max_over_time(\n    tikv_lock_manager_wait_table_status\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (type, $additional_groupby) ",
-              "format": "time_series",
-              "hide": false,
-              "instant": false,
-              "interval": "",
-              "intervalFactor": 1,
-              "legendFormat": "{{type}} {{$additional_groupby}}",
-              "metric": "",
-              "query": "sum(max_over_time(\n    tikv_lock_manager_wait_table_status\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (type, $additional_groupby) ",
-              "refId": "",
-              "step": 10,
-              "target": ""
-            },
-            {
-              "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(max_over_time(\n    tikv_lock_wait_queue_entries_gauge_vec\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (type, $additional_groupby) ",
+              "expr": "sum(rate(\n    tikv_lock_manager_task_counter\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
@@ -59517,7 +59650,7 @@
               "intervalFactor": 1,
               "legendFormat": "{{type}} {{$additional_groupby}}",
               "metric": "",
-              "query": "sum(max_over_time(\n    tikv_lock_wait_queue_entries_gauge_vec\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (type, $additional_groupby) ",
+              "query": "sum(rate(\n    tikv_lock_manager_task_counter\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -59526,7 +59659,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Lock Waiting Queue",
+          "title": "Lock Manager Handled tasks",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -59545,7 +59678,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "short",
+              "format": "ops",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -59595,11 +59728,11 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 14
+            "y": 7
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 421,
+          "id": 422,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -59665,7 +59798,7 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_lock_manager_detect_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
+              "expr": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
@@ -59673,14 +59806,14 @@
               "intervalFactor": 1,
               "legendFormat": "99.99% {{$additional_groupby}}",
               "metric": "",
-              "query": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_lock_manager_detect_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
+              "query": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
             },
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "histogram_quantile(0.99,(\n    sum(rate(\n    tikv_lock_manager_detect_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
+              "expr": "histogram_quantile(0.99,(\n    sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
@@ -59688,14 +59821,14 @@
               "intervalFactor": 1,
               "legendFormat": "99% {{$additional_groupby}}",
               "metric": "",
-              "query": "histogram_quantile(0.99,(\n    sum(rate(\n    tikv_lock_manager_detect_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
+              "query": "histogram_quantile(0.99,(\n    sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
             },
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "(sum(rate(\n    tikv_lock_manager_detect_duration_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby)  / sum(rate(\n    tikv_lock_manager_detect_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) )",
+              "expr": "(sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby)  / sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) )",
               "format": "time_series",
               "hide": false,
               "instant": false,
@@ -59703,14 +59836,14 @@
               "intervalFactor": 1,
               "legendFormat": "avg {{$additional_groupby}}",
               "metric": "",
-              "query": "(sum(rate(\n    tikv_lock_manager_detect_duration_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby)  / sum(rate(\n    tikv_lock_manager_detect_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) )",
+              "query": "(sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby)  / sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) )",
               "refId": "",
               "step": 10,
               "target": ""
             },
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_lock_manager_detect_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) ",
+              "expr": "sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) ",
               "format": "time_series",
               "hide": true,
               "instant": false,
@@ -59718,7 +59851,7 @@
               "intervalFactor": 1,
               "legendFormat": "count {{$additional_groupby}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_lock_manager_detect_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) ",
+              "query": "sum(rate(\n    tikv_lock_manager_waiter_lifetime_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -59727,7 +59860,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Deadlock detect duration",
+          "title": "Waiter lifetime duration",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -59796,11 +59929,11 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 14
+            "y": 7
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 422,
+          "id": 423,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -59843,7 +59976,7 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_lock_manager_error_counter\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
+              "expr": "sum(max_over_time(\n    tikv_lock_manager_wait_table_status\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (type, $additional_groupby) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
@@ -59851,7 +59984,22 @@
               "intervalFactor": 1,
               "legendFormat": "{{type}} {{$additional_groupby}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_lock_manager_error_counter\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
+              "query": "sum(max_over_time(\n    tikv_lock_manager_wait_table_status\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (type, $additional_groupby) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            },
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(max_over_time(\n    tikv_lock_wait_queue_entries_gauge_vec\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (type, $additional_groupby) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{type}} {{$additional_groupby}}",
+              "metric": "",
+              "query": "sum(max_over_time(\n    tikv_lock_wait_queue_entries_gauge_vec\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (type, $additional_groupby) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -59860,7 +60008,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Detect error",
+          "title": "Lock Waiting Queue",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -59879,7 +60027,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "ops",
+              "format": "short",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -59906,7 +60054,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": null,
+          "description": "",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -59929,11 +60077,11 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 21
+            "y": 14
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 423,
+          "id": 424,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -59969,155 +60117,90 @@
           "renderer": "flot",
           "repeat": null,
           "repeatDirection": null,
-          "seriesOverrides": [],
+          "seriesOverrides": [
+            {
+              "alias": "/^count/",
+              "bars": false,
+              "dashLength": 1,
+              "dashes": true,
+              "fill": 2,
+              "fillBelowTo": null,
+              "lines": true,
+              "spaceLength": 1,
+              "transform": "negative-Y",
+              "yaxis": 2,
+              "zindex": -3
+            },
+            {
+              "alias": "/^avg/",
+              "bars": false,
+              "fill": 7,
+              "fillBelowTo": null,
+              "lines": true,
+              "yaxis": 1,
+              "zindex": 0
+            }
+          ],
           "span": null,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(max_over_time(\n    tikv_lock_manager_detector_leader_heartbeat\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (instance) ",
+              "expr": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_lock_manager_detect_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{instance}}",
+              "legendFormat": "99.99% {{$additional_groupby}}",
               "metric": "",
-              "query": "sum(max_over_time(\n    tikv_lock_manager_detector_leader_heartbeat\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (instance) ",
+              "query": "histogram_quantile(0.9999,(\n    sum(rate(\n    tikv_lock_manager_detect_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Deadlock detector leader",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "transformations": [],
-          "transparent": false,
-          "type": "graph",
-          "xaxis": {
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "decimals": null,
-              "format": "none",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
             },
             {
-              "decimals": null,
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ],
-          "yaxis": {
-            "align": false,
-            "alignLevel": 0
-          }
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "cacheTimeout": null,
-          "datasource": "${DS_TEST-CLUSTER}",
-          "description": null,
-          "editable": true,
-          "error": false,
-          "fieldConfig": {
-            "defaults": {
-              "thresholds": {
-                "mode": "absolute",
-                "steps": []
-              }
-            }
-          },
-          "fill": 1,
-          "fillGradient": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "gridPos": {
-            "h": 7,
-            "w": 12,
-            "x": 12,
-            "y": 21
-          },
-          "height": null,
-          "hideTimeOverride": false,
-          "id": 424,
-          "interval": null,
-          "isNew": true,
-          "legend": {
-            "alignAsTable": true,
-            "avg": false,
-            "current": true,
-            "hideEmpty": true,
-            "hideZero": true,
-            "max": true,
-            "min": false,
-            "rightSide": true,
-            "show": true,
-            "sideWidth": null,
-            "sort": "max",
-            "sortDesc": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "maxDataPoints": null,
-          "maxPerRow": null,
-          "minSpan": null,
-          "nullPointMode": "null as zero",
-          "options": {
-            "alertThreshold": true,
-            "dataLinks": []
-          },
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "repeat": null,
-          "repeatDirection": null,
-          "seriesOverrides": [],
-          "span": null,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "histogram_quantile(0.99,(\n    sum(rate(\n    tikv_lock_manager_detect_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "99% {{$additional_groupby}}",
+              "metric": "",
+              "query": "histogram_quantile(0.99,(\n    sum(rate(\n    tikv_lock_manager_detect_duration_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le, $additional_groupby) \n    \n    \n))  ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            },
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "((\n    tikv_pessimistic_lock_memory_size\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "expr": "(sum(rate(\n    tikv_lock_manager_detect_duration_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby)  / sum(rate(\n    tikv_lock_manager_detect_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) )",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{instance}}",
+              "legendFormat": "avg {{$additional_groupby}}",
               "metric": "",
-              "query": "((\n    tikv_pessimistic_lock_memory_size\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "query": "(sum(rate(\n    tikv_lock_manager_detect_duration_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby)  / sum(rate(\n    tikv_lock_manager_detect_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) )",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            },
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(rate(\n    tikv_lock_manager_detect_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) ",
+              "format": "time_series",
+              "hide": true,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "count {{$additional_groupby}}",
+              "metric": "",
+              "query": "sum(rate(\n    tikv_lock_manager_detect_duration_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by ($additional_groupby) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -60126,7 +60209,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Total pessimistic locks memory size",
+          "title": "Deadlock detect duration",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -60145,9 +60228,9 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "bytes",
+              "format": "s",
               "label": null,
-              "logBase": 1,
+              "logBase": 2,
               "max": null,
               "min": null,
               "show": true
@@ -60194,8 +60277,8 @@
           "gridPos": {
             "h": 7,
             "w": 12,
-            "x": 0,
-            "y": 28
+            "x": 12,
+            "y": 14
           },
           "height": null,
           "hideTimeOverride": false,
@@ -60242,15 +60325,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_in_memory_pessimistic_locking\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (result, $additional_groupby) ",
+              "expr": "sum(rate(\n    tikv_lock_manager_error_counter\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{result}} {{$additional_groupby}}",
+              "legendFormat": "{{type}} {{$additional_groupby}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_in_memory_pessimistic_locking\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (result, $additional_groupby) ",
+              "query": "sum(rate(\n    tikv_lock_manager_error_counter\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type, $additional_groupby) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -60259,7 +60342,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "In-memory pessimistic locking result",
+          "title": "Detect error",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -60305,7 +60388,140 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The number of active keys and waiters.",
+          "description": null,
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 12,
+            "x": 0,
+            "y": 21
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 426,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(max_over_time(\n    tikv_lock_manager_detector_leader_heartbeat\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (instance) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{instance}}",
+              "metric": "",
+              "query": "sum(max_over_time(\n    tikv_lock_manager_detector_leader_heartbeat\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [30s]\n)) by (instance) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Deadlock detector leader",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "none",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": null,
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -60328,11 +60544,277 @@
             "h": 7,
             "w": 12,
             "x": 12,
+            "y": 21
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 427,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "((\n    tikv_pessimistic_lock_memory_size\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{instance}}",
+              "metric": "",
+              "query": "((\n    tikv_pessimistic_lock_memory_size\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Total pessimistic locks memory size",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "bytes",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": null,
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 12,
+            "x": 0,
             "y": 28
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 426,
+          "id": 428,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(rate(\n    tikv_in_memory_pessimistic_locking\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (result, $additional_groupby) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{result}} {{$additional_groupby}}",
+              "metric": "",
+              "query": "sum(rate(\n    tikv_in_memory_pessimistic_locking\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (result, $additional_groupby) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "In-memory pessimistic locking result",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "ops",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "The number of active keys and waiters.",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 12,
+            "x": 12,
+            "y": 28
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 429,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -60472,7 +60954,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 427,
+          "id": 430,
           "interval": null,
           "legend": {
             "show": false
@@ -60570,7 +61052,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 428,
+          "id": 431,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -60774,7 +61256,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 429,
+      "id": 432,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -60813,7 +61295,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 430,
+          "id": 433,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -60946,7 +61428,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 431,
+          "id": 434,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -61079,7 +61561,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 432,
+          "id": 435,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -61212,7 +61694,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 433,
+          "id": 436,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -61348,7 +61830,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 434,
+      "id": 437,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -61387,7 +61869,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 435,
+          "id": 438,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -61520,7 +62002,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 436,
+          "id": 439,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -61653,7 +62135,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 437,
+          "id": 440,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -61801,7 +62283,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 438,
+          "id": 441,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -61934,7 +62416,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 439,
+          "id": 442,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -62067,7 +62549,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 440,
+          "id": 443,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -62200,7 +62682,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 441,
+          "id": 444,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -62336,7 +62818,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 442,
+      "id": 445,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -62375,7 +62857,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 443,
+          "id": 446,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -62508,7 +62990,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 444,
+          "id": 447,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -62641,7 +63123,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 445,
+          "id": 448,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -62774,7 +63256,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 446,
+          "id": 449,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -62907,7 +63389,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 447,
+          "id": 450,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -63040,7 +63522,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 448,
+          "id": 451,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -63176,7 +63658,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 449,
+      "id": 452,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -63215,7 +63697,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 450,
+          "id": 453,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -63348,7 +63830,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 451,
+          "id": 454,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -63481,7 +63963,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 452,
+          "id": 455,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -63629,7 +64111,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 453,
+          "id": 456,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -63792,7 +64274,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 454,
+          "id": 457,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -63925,7 +64407,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 455,
+          "id": 458,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -64058,7 +64540,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 456,
+          "id": 459,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -64221,7 +64703,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 457,
+          "id": 460,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -64369,7 +64851,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 458,
+          "id": 461,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -64505,7 +64987,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 459,
+      "id": 462,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -64544,7 +65026,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 460,
+          "id": 463,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -64677,7 +65159,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 461,
+          "id": 464,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -64810,7 +65292,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 462,
+          "id": 465,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -64943,7 +65425,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 463,
+          "id": 466,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -65076,7 +65558,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 464,
+          "id": 467,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -65209,7 +65691,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 465,
+          "id": 468,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -65342,7 +65824,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 466,
+          "id": 469,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -65475,7 +65957,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 467,
+          "id": 470,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -65608,7 +66090,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 468,
+          "id": 471,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -65748,7 +66230,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 469,
+          "id": 472,
           "interval": null,
           "legend": {
             "show": false
@@ -65846,7 +66328,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 470,
+          "id": 473,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -65979,7 +66461,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 471,
+          "id": 474,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -66127,7 +66609,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 472,
+          "id": 475,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -66275,7 +66757,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 473,
+          "id": 476,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -66415,7 +66897,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 474,
+          "id": 477,
           "interval": null,
           "legend": {
             "show": false
@@ -66513,7 +66995,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 475,
+          "id": 478,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -66646,7 +67128,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 476,
+          "id": 479,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -66782,7 +67264,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 477,
+      "id": 480,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -66821,140 +67303,140 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 478,
-          "interval": null,
-          "isNew": true,
-          "legend": {
-            "alignAsTable": true,
-            "avg": false,
-            "current": true,
-            "hideEmpty": true,
-            "hideZero": true,
-            "max": true,
-            "min": false,
-            "rightSide": true,
-            "show": true,
-            "sideWidth": null,
-            "sort": "max",
-            "sortDesc": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "maxDataPoints": null,
-          "maxPerRow": null,
-          "minSpan": null,
-          "nullPointMode": "null as zero",
-          "options": {
-            "alertThreshold": true,
-            "dataLinks": []
-          },
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "repeat": null,
-          "repeatDirection": null,
-          "seriesOverrides": [],
-          "span": null,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"sst_.*\"}\n    [$__rate_interval]\n)) by (instance) ",
-              "format": "time_series",
-              "hide": false,
-              "instant": false,
-              "interval": "",
-              "intervalFactor": 1,
-              "legendFormat": "{{instance}}",
-              "metric": "",
-              "query": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"sst_.*\"}\n    [$__rate_interval]\n)) by (instance) ",
-              "refId": "",
-              "step": 10,
-              "target": ""
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "CPU Usage",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "transformations": [],
-          "transparent": false,
-          "type": "graph",
-          "xaxis": {
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "decimals": null,
-              "format": "percentunit",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            },
-            {
-              "decimals": null,
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ],
-          "yaxis": {
-            "align": false,
-            "alignLevel": 0
-          }
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "cacheTimeout": null,
-          "datasource": "${DS_TEST-CLUSTER}",
-          "description": null,
-          "editable": true,
-          "error": false,
-          "fieldConfig": {
-            "defaults": {
-              "thresholds": {
-                "mode": "absolute",
-                "steps": []
-              }
-            }
-          },
-          "fill": 1,
-          "fillGradient": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "gridPos": {
-            "h": 7,
-            "w": 12,
-            "x": 12,
-            "y": 0
-          },
-          "height": null,
-          "hideTimeOverride": false,
-          "id": 479,
+          "id": 481,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"sst_.*\"}\n    [$__rate_interval]\n)) by (instance) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{instance}}",
+              "metric": "",
+              "query": "sum(rate(\n    tikv_thread_cpu_seconds_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",name=~\"sst_.*\"}\n    [$__rate_interval]\n)) by (instance) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CPU Usage",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "percentunit",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": null,
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 12,
+            "x": 12,
+            "y": 0
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 482,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -67117,7 +67599,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 480,
+          "id": 483,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -67265,7 +67747,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 481,
+          "id": 484,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -67398,7 +67880,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 482,
+          "id": 485,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -67538,7 +68020,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 483,
+          "id": 486,
           "interval": null,
           "legend": {
             "show": false
@@ -67643,7 +68125,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 484,
+          "id": 487,
           "interval": null,
           "legend": {
             "show": false
@@ -67748,7 +68230,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 485,
+          "id": 488,
           "interval": null,
           "legend": {
             "show": false
@@ -67846,7 +68328,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 486,
+          "id": 489,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -67986,7 +68468,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 487,
+          "id": 490,
           "interval": null,
           "legend": {
             "show": false
@@ -68091,7 +68573,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 488,
+          "id": 491,
           "interval": null,
           "legend": {
             "show": false
@@ -68196,7 +68678,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 489,
+          "id": 492,
           "interval": null,
           "legend": {
             "show": false
@@ -68294,7 +68776,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 490,
+          "id": 493,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -68427,7 +68909,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 491,
+          "id": 494,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -68560,7 +69042,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 492,
+          "id": 495,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -68700,7 +69182,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 493,
+          "id": 496,
           "interval": null,
           "legend": {
             "show": false
@@ -68798,7 +69280,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 494,
+          "id": 497,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -68934,7 +69416,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 495,
+      "id": 498,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -68973,7 +69455,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 496,
+          "id": 499,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -69136,7 +69618,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 497,
+          "id": 500,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -69269,7 +69751,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 498,
+          "id": 501,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -69409,7 +69891,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 499,
+          "id": 502,
           "interval": null,
           "legend": {
             "show": false
@@ -69514,7 +69996,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 500,
+          "id": 503,
           "interval": null,
           "legend": {
             "show": false
@@ -69612,7 +70094,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 501,
+          "id": 504,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -69767,7 +70249,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 502,
+          "id": 505,
           "interval": null,
           "legend": {
             "show": false
@@ -69872,7 +70354,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 503,
+          "id": 506,
           "interval": null,
           "legend": {
             "show": false
@@ -69977,7 +70459,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 504,
+          "id": 507,
           "interval": null,
           "legend": {
             "show": false
@@ -70075,7 +70557,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 505,
+          "id": 508,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -70245,7 +70727,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 506,
+          "id": 509,
           "interval": null,
           "legend": {
             "show": false
@@ -70343,7 +70825,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 507,
+          "id": 510,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -70544,7 +71026,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 508,
+          "id": 511,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -70745,7 +71227,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 509,
+          "id": 512,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -70878,7 +71360,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 510,
+          "id": 513,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -71041,7 +71523,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 511,
+          "id": 514,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -71174,7 +71656,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 512,
+          "id": 515,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -71307,7 +71789,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 513,
+          "id": 516,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -71508,7 +71990,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 514,
+          "id": 517,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -71641,7 +72123,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 515,
+          "id": 518,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -71781,7 +72263,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 516,
+          "id": 519,
           "interval": null,
           "legend": {
             "show": false
@@ -71886,7 +72368,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 517,
+          "id": 520,
           "interval": null,
           "legend": {
             "show": false
@@ -71991,7 +72473,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 518,
+          "id": 521,
           "interval": null,
           "legend": {
             "show": false
@@ -72096,7 +72578,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 519,
+          "id": 522,
           "interval": null,
           "legend": {
             "show": false
@@ -72201,7 +72683,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 520,
+          "id": 523,
           "interval": null,
           "legend": {
             "show": false
@@ -72306,7 +72788,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 521,
+          "id": 524,
           "interval": null,
           "legend": {
             "show": false
@@ -72411,7 +72893,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 522,
+          "id": 525,
           "interval": null,
           "legend": {
             "show": false
@@ -72509,7 +72991,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 523,
+          "id": 526,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -72657,7 +73139,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 524,
+          "id": 527,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -72790,7 +73272,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 525,
+          "id": 528,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -72923,7 +73405,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 526,
+          "id": 529,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -73071,7 +73553,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 527,
+          "id": 530,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -73207,7 +73689,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 528,
+      "id": 531,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -73258,7 +73740,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 529,
+          "id": 532,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -73354,7 +73836,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 530,
+          "id": 533,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -73429,7 +73911,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 531,
+          "id": 534,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -73504,7 +73986,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 532,
+          "id": 535,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -73579,7 +74061,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 533,
+          "id": 536,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -73654,7 +74136,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 534,
+          "id": 537,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -73729,7 +74211,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 535,
+          "id": 538,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -73804,7 +74286,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 536,
+          "id": 539,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -73883,7 +74365,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 537,
+          "id": 540,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -74016,7 +74498,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 538,
+          "id": 541,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -74149,7 +74631,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 539,
+          "id": 542,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -74282,7 +74764,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 540,
+          "id": 543,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -74342,7 +74824,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Abnormal Checkpoint TS Lag",
+          "title": "Checkpoint TS Lag",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -74415,7 +74897,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 541,
+          "id": 544,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -74548,7 +75030,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 542,
+          "id": 545,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -74696,7 +75178,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 543,
+          "id": 546,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -74829,7 +75311,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 544,
+          "id": 547,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -74962,7 +75444,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 545,
+          "id": 548,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -75128,7 +75610,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 546,
+          "id": 549,
           "interval": null,
           "legend": {
             "show": false
@@ -75233,7 +75715,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 547,
+          "id": 550,
           "interval": null,
           "legend": {
             "show": false
@@ -75338,7 +75820,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 548,
+          "id": 551,
           "interval": null,
           "legend": {
             "show": false
@@ -75421,7 +75903,7 @@
           },
           "dataFormat": "tsbuckets",
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The duration of waiting the mutex of the controller.",
+          "description": "The duration of calculating the next resolved TS of observed regions.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -75443,7 +75925,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 549,
+          "id": 552,
           "interval": null,
           "legend": {
             "show": false
@@ -75460,7 +75942,7 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(increase(\n    tikv_log_backup_event_handle_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",stage=~\"get_router_lock\"}\n    [$__rate_interval]\n)) by (le) ",
+              "expr": "sum(increase(\n    tikv_log_backup_resolve_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le) ",
               "format": "heatmap",
               "hide": false,
               "instant": false,
@@ -75468,7 +75950,7 @@
               "intervalFactor": 1,
               "legendFormat": "{{le}}",
               "metric": "",
-              "query": "sum(increase(\n    tikv_log_backup_event_handle_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",stage=~\"get_router_lock\"}\n    [$__rate_interval]\n)) by (le) ",
+              "query": "sum(increase(\n    tikv_log_backup_resolve_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (le) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -75476,7 +75958,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Wait for Lock Duration",
+          "title": "Resolve Region TS duration",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -75548,7 +76030,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 550,
+          "id": 553,
           "interval": null,
           "legend": {
             "show": false
@@ -75653,7 +76135,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 551,
+          "id": 554,
           "interval": null,
           "legend": {
             "show": false
@@ -75758,7 +76240,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 552,
+          "id": 555,
           "interval": null,
           "legend": {
             "show": false
@@ -75863,7 +76345,7 @@
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 553,
+          "id": 556,
           "interval": null,
           "legend": {
             "show": false
@@ -75961,7 +76443,273 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 554,
+          "id": 557,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{message}}",
+              "metric": "",
+              "query": "sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Internal Message Type",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "ops",
+              "label": null,
+              "logBase": 2,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "The internal handling message duration.",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 8,
+            "x": 8,
+            "y": 56
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 558,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "histogram_quantile($optional_quantile,(\n    sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message, le) \n    \n    \n))  ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{message}}-$optional_quantile",
+              "metric": "",
+              "query": "histogram_quantile($optional_quantile,(\n    sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message, le) \n    \n    \n))  ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Internal Message Handling Duration $optional_quantile",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "s",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "The internal handling message duration.",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 8,
+            "x": 16,
+            "y": 56
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 559,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -76004,7 +76752,7 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message) ",
+              "expr": "histogram_quantile(0.9,(\n    sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message, le) \n    \n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
@@ -76012,7 +76760,7 @@
               "intervalFactor": 1,
               "legendFormat": "{{message}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message) ",
+              "query": "histogram_quantile(0.9,(\n    sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message, le) \n    \n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -76021,7 +76769,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Internal Message Type",
+          "title": "Internal Message Handling Duration (P90)",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -76040,9 +76788,9 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "ops",
+              "format": "s",
               "label": null,
-              "logBase": 2,
+              "logBase": 1,
               "max": null,
               "min": null,
               "show": true
@@ -76067,7 +76815,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The internal handling message duration.",
+          "description": "The internal read throughput of RocksDB during initial scanning. This panel can roughly present the read through to the hard disk of initial scanning.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -76088,13 +76836,13 @@
           },
           "gridPos": {
             "h": 7,
-            "w": 8,
-            "x": 8,
-            "y": 56
+            "w": 12,
+            "x": 0,
+            "y": 63
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 555,
+          "id": 560,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -76137,15 +76885,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "histogram_quantile($optional_quantile,(\n    sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message, le) \n    \n    \n))  ",
+              "expr": "sum(rate(\n    tikv_log_backup_initial_scan_operations\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",op=~\"read_bytes\"}\n    [$__rate_interval]\n)) by (cf) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{message}}-$optional_quantile",
+              "legendFormat": "{{cf}}",
               "metric": "",
-              "query": "histogram_quantile($optional_quantile,(\n    sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message, le) \n    \n    \n))  ",
+              "query": "sum(rate(\n    tikv_log_backup_initial_scan_operations\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",op=~\"read_bytes\"}\n    [$__rate_interval]\n)) by (cf) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -76154,7 +76902,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Internal Message Handling Duration $optional_quantile",
+          "title": "Initial Scan RocksDB Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -76173,7 +76921,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "s",
+              "format": "binBps",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -76200,7 +76948,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The internal handling message duration.",
+          "description": "Misc statistics of RocksDB during initial scanning.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -76221,13 +76969,13 @@
           },
           "gridPos": {
             "h": 7,
-            "w": 8,
-            "x": 16,
-            "y": 56
+            "w": 12,
+            "x": 12,
+            "y": 63
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 556,
+          "id": 561,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -76270,15 +77018,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "histogram_quantile(0.9,(\n    sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message, le) \n    \n    \n))  ",
+              "expr": "sum(rate(\n    tikv_log_backup_initial_scan_operations\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",op!~\"read_bytes\"}\n    [$__rate_interval]\n)) by (cf, op) > 0",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{message}}",
+              "legendFormat": "{{cf}}-{{op}}",
               "metric": "",
-              "query": "histogram_quantile(0.9,(\n    sum(rate(\n    tikv_log_backup_internal_actor_acting_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (message, le) \n    \n    \n))  ",
+              "query": "sum(rate(\n    tikv_log_backup_initial_scan_operations\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",op!~\"read_bytes\"}\n    [$__rate_interval]\n)) by (cf, op) > 0",
               "refId": "",
               "step": 10,
               "target": ""
@@ -76287,7 +77035,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Internal Message Handling Duration (P90)",
+          "title": "Initial Scan RocksDB Operation",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -76306,7 +77054,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "s",
+              "format": "ops",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -76333,7 +77081,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The internal read throughput of RocksDB during initial scanning. This panel can roughly present the read through to the hard disk of initial scanning.",
+          "description": "The reason of triggering initial scanning.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -76356,11 +77104,11 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 63
+            "y": 70
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 557,
+          "id": 562,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -76403,15 +77151,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_log_backup_initial_scan_operations\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",op=~\"read_bytes\"}\n    [$__rate_interval]\n)) by (cf) ",
+              "expr": "sum(rate(\n    tikv_log_backup_initial_scan_reason\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (reason) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{cf}}",
+              "legendFormat": "{{reason}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_log_backup_initial_scan_operations\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",op=~\"read_bytes\"}\n    [$__rate_interval]\n)) by (cf) ",
+              "query": "sum(rate(\n    tikv_log_backup_initial_scan_reason\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (reason) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -76420,7 +77168,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Initial Scan RocksDB Throughput",
+          "title": "Initial Scanning Trigger Reason",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -76439,7 +77187,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "binBps",
+              "format": "none",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -76466,7 +77214,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "Misc statistics of RocksDB during initial scanning.",
+          "description": "The task status of initial scanning.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -76489,11 +77237,11 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 63
+            "y": 70
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 558,
+          "id": 563,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -76536,15 +77284,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_log_backup_initial_scan_operations\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",op!~\"read_bytes\"}\n    [$__rate_interval]\n)) by (cf, op) > 0",
+              "expr": "sum((\n    tikv_log_backup_pending_initial_scan\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (stage) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{cf}}-{{op}}",
+              "legendFormat": "{{stage}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_log_backup_initial_scan_operations\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",op!~\"read_bytes\"}\n    [$__rate_interval]\n)) by (cf, op) > 0",
+              "query": "sum((\n    tikv_log_backup_pending_initial_scan\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (stage) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -76553,7 +77301,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Initial Scan RocksDB Operation",
+          "title": "Initial Scanning Task Status",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -76572,7 +77320,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "ops",
+              "format": "none",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -76599,7 +77347,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The reason of triggering initial scanning.",
+          "description": "The memory usage of buffer file (stores logs about to be flushed to external storage) cache.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -76622,11 +77370,11 @@
             "h": 7,
             "w": 8,
             "x": 0,
-            "y": 70
+            "y": 77
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 559,
+          "id": 564,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -76669,15 +77417,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_log_backup_initial_scan_reason\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (reason) ",
+              "expr": "sum((\n    tikv_log_backup_temp_file_memory_usage\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{reason}}",
+              "legendFormat": "{{instance}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_log_backup_initial_scan_reason\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (reason) ",
+              "query": "sum((\n    tikv_log_backup_temp_file_memory_usage\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -76686,7 +77434,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Initial Scanning Trigger Reason",
+          "title": "Buffer File Cache Mem Usage",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -76705,7 +77453,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "none",
+              "format": "bytes",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -76732,7 +77480,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The task status of initial scanning.",
+          "description": "The number of temporary buffer files.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -76755,11 +77503,11 @@
             "h": 7,
             "w": 8,
             "x": 8,
-            "y": 70
+            "y": 77
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 560,
+          "id": 565,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -76802,15 +77550,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum((\n    tikv_log_backup_pending_initial_scan\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (stage) ",
+              "expr": "sum((\n    tikv_log_backup_temp_file_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{stage}}",
+              "legendFormat": "{{instance}}",
               "metric": "",
-              "query": "sum((\n    tikv_log_backup_pending_initial_scan\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (stage) ",
+              "query": "sum((\n    tikv_log_backup_temp_file_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -76819,7 +77567,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Initial Scanning Task Status",
+          "title": "Buffer File Count",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -76865,7 +77613,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "",
+          "description": "The total size of buffer files that are swapped out to disk.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -76888,11 +77636,11 @@
             "h": 7,
             "w": 8,
             "x": 16,
-            "y": 70
+            "y": 77
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 561,
+          "id": 566,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -76935,15 +77683,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_log_backup_metadata_key_operation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type) ",
+              "expr": "sum(rate(\n    tikv_log_backup_in_disk_temp_file_size_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (instance) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{type}}",
+              "legendFormat": "{{instance}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_log_backup_metadata_key_operation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (type) ",
+              "query": "sum(rate(\n    tikv_log_backup_in_disk_temp_file_size_sum\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (instance) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -76952,7 +77700,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Region Checkpoint Key Putting",
+          "title": "Buffer File Swap out Bytes",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -76971,7 +77719,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "cps",
+              "format": "binBps",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -77025,14 +77773,14 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 77
+            "y": 84
           },
           "heatmap": {},
           "height": null,
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 562,
+          "id": 567,
           "interval": null,
           "legend": {
             "show": false
@@ -77130,14 +77878,14 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 77
+            "y": 84
           },
           "heatmap": {},
           "height": null,
           "hideTimeOverride": false,
           "hideZeroBuckets": true,
           "highlightCards": true,
-          "id": 563,
+          "id": 568,
           "interval": null,
           "legend": {
             "show": false
@@ -77231,11 +77979,144 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 84
+            "y": 91
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 564,
+          "id": 569,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(rate(\n    tidb_log_backup_region_request_failure\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",reason!=\"retryable-scan-region\"}\n    [$__rate_interval]\n)) by (reason) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{reason}}",
+              "metric": "",
+              "query": "sum(rate(\n    tidb_log_backup_region_request_failure\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",reason!=\"retryable-scan-region\"}\n    [$__rate_interval]\n)) by (reason) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Region Checkpoint Failure Reason",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "none",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "The result of getting region checkpoints.",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 12,
+            "x": 12,
+            "y": 91
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 570,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -77278,15 +78159,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tidb_log_backup_region_request_failure\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",reason!=\"retryable-scan-region\"}\n    [$__rate_interval]\n)) by (reason) ",
+              "expr": "sum(rate(\n    tidb_log_backup_region_request\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (result) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{reason}}",
+              "legendFormat": "{{result}}",
               "metric": "",
-              "query": "sum(rate(\n    tidb_log_backup_region_request_failure\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",reason!=\"retryable-scan-region\"}\n    [$__rate_interval]\n)) by (reason) ",
+              "query": "sum(rate(\n    tidb_log_backup_region_request\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (result) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -77295,7 +78176,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Region Checkpoint Failure Reason",
+          "title": "Request Result",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -77341,7 +78222,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The result of getting region checkpoints.",
+          "description": "The internal handling message duration.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -77362,13 +78243,13 @@
           },
           "gridPos": {
             "h": 7,
-            "w": 12,
-            "x": 12,
-            "y": 84
+            "w": 8,
+            "x": 0,
+            "y": 98
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 565,
+          "id": 571,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -77411,15 +78292,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tidb_log_backup_region_request\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (result) ",
+              "expr": "histogram_quantile($optional_quantile,(\n    sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (step, le) \n    \n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{result}}",
+              "legendFormat": "{{step}}-$optional_quantile",
               "metric": "",
-              "query": "sum(rate(\n    tidb_log_backup_region_request\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (result) ",
+              "query": "histogram_quantile($optional_quantile,(\n    sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (step, le) \n    \n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -77428,7 +78309,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Request Result",
+          "title": "Tick Duration $optional_quantile",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -77447,7 +78328,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "none",
+              "format": "s",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -77474,7 +78355,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The internal handling message duration.",
+          "description": "The region with minimal checkpoint.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -77495,13 +78376,13 @@
           },
           "gridPos": {
             "h": 7,
-            "w": 12,
-            "x": 0,
-            "y": 91
+            "w": 8,
+            "x": 8,
+            "y": 98
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 566,
+          "id": 572,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -77544,15 +78425,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "histogram_quantile($optional_quantile,(\n    sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (step, le) \n    \n    \n))  ",
+              "expr": "((\n    tidb_log_backup_current_last_region_id\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{step}}-$optional_quantile",
+              "legendFormat": "{{ instance }}",
               "metric": "",
-              "query": "histogram_quantile($optional_quantile,(\n    sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (step, le) \n    \n    \n))  ",
+              "query": "((\n    tidb_log_backup_current_last_region_id\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -77561,7 +78442,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tick Duration $optional_quantile",
+          "title": "Current Last Region ID",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -77580,7 +78461,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "s",
+              "format": "none",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -77607,7 +78488,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The internal handling message duration.",
+          "description": "The leader of the region with minimal checkpoint.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -77628,13 +78509,13 @@
           },
           "gridPos": {
             "h": 7,
-            "w": 12,
-            "x": 12,
-            "y": 91
+            "w": 8,
+            "x": 16,
+            "y": 98
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 567,
+          "id": 573,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -77677,15 +78558,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "histogram_quantile(0.9,(\n    sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (step, le) \n    \n    \n))  ",
+              "expr": "((\n    tikv_log_backup_store_last_checkpoint_ts\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  / 262144",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{ step }}",
+              "legendFormat": "{{ instance }}",
               "metric": "",
-              "query": "histogram_quantile(0.9,(\n    sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_bucket\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (step, le) \n    \n    \n))  ",
+              "query": "((\n    tikv_log_backup_store_last_checkpoint_ts\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  / 262144",
               "refId": "",
               "step": 10,
               "target": ""
@@ -77694,7 +78575,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tick Duration (P90)",
+          "title": "Current Last Region Leader Store ID",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -77713,7 +78594,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "s",
+              "format": "none",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -77740,7 +78621,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The frequent of getting region level checkpoint.",
+          "description": "The region with minimal checkpoint of each store.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -77761,13 +78642,13 @@
           },
           "gridPos": {
             "h": 7,
-            "w": 12,
+            "w": 8,
             "x": 0,
-            "y": 98
+            "y": 105
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 568,
+          "id": 574,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -77810,15 +78691,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",step=\"get-regions-in-range\"}\n    [$__rate_interval]\n)) by (step, instance) ",
+              "expr": "((\n    tikv_log_backup_store_last_checkpoint_region_id\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{step}}-{{instance}}",
+              "legendFormat": "{{ instance }}",
               "metric": "",
-              "query": "sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",step=\"get-regions-in-range\"}\n    [$__rate_interval]\n)) by (step, instance) ",
+              "query": "((\n    tikv_log_backup_store_last_checkpoint_region_id\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -77827,7 +78708,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Get Region Operation Count",
+          "title": "Current Last Region ID per Store",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -77873,7 +78754,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": "The variant of checkpoint group.",
+          "description": "The minimal checkpoint TS of each store.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -77894,13 +78775,13 @@
           },
           "gridPos": {
             "h": 7,
-            "w": 12,
-            "x": 12,
-            "y": 98
+            "w": 8,
+            "x": 8,
+            "y": 105
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 569,
+          "id": 575,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -77943,15 +78824,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",step=\"try-advance\"}\n    [$__rate_interval]\n)) by (step, instance) ",
+              "expr": "((\n    tikv_log_backup_store_last_checkpoint_ts\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{step}}-{{instance}}",
+              "legendFormat": "{{ instance }}",
               "metric": "",
-              "query": "sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",step=\"try-advance\"}\n    [$__rate_interval]\n)) by (step, instance) ",
+              "query": "((\n    tikv_log_backup_store_last_checkpoint_ts\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -77960,7 +78841,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Try Advance Trigger Time",
+          "title": "Current Last Checkpoint TS per Store",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -77979,7 +78860,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "none",
+              "format": "ms",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -78000,55 +78881,146 @@
             "align": false,
             "alignLevel": 0
           }
-        }
-      ],
-      "repeat": null,
-      "repeatDirection": null,
-      "span": null,
-      "targets": [],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Backup Log",
-      "transformations": [],
-      "transparent": false,
-      "type": "row"
-    },
-    {
-      "cacheTimeout": null,
-      "collapsed": true,
-      "datasource": null,
-      "description": null,
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "thresholds": {
-            "mode": "absolute",
-            "steps": []
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "The active progress subscription from each store",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 8,
+            "x": 16,
+            "y": 105
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 576,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "((\n    tikv_log_backup_active_subscription_number\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{instance}}",
+              "metric": "",
+              "query": "((\n    tikv_log_backup_active_subscription_number\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Active Progress Subscrption Per Store",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "none",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
           }
-        }
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "height": null,
-      "hideTimeOverride": false,
-      "id": 570,
-      "interval": null,
-      "links": [],
-      "maxDataPoints": 100,
-      "maxPerRow": null,
-      "minSpan": null,
-      "panels": [
+        },
         {
           "aliasColors": {},
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": null,
+          "description": "The frequent of getting region level checkpoint.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -78071,11 +79043,11 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 0
+            "y": 112
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 571,
+          "id": 577,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -78118,30 +79090,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum((\n    tikv_threads_state\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance, state) ",
-              "format": "time_series",
-              "hide": false,
-              "instant": false,
-              "interval": "",
-              "intervalFactor": 1,
-              "legendFormat": "{{instance}}-{{state}}",
-              "metric": "",
-              "query": "sum((\n    tikv_threads_state\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance, state) ",
-              "refId": "",
-              "step": 10,
-              "target": ""
-            },
-            {
-              "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum((\n    tikv_threads_state\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
+              "expr": "sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",step=\"get-regions-in-range\"}\n    [$__rate_interval]\n)) by (step, instance) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{instance}}-total",
+              "legendFormat": "{{step}}-{{instance}}",
               "metric": "",
-              "query": "sum((\n    tikv_threads_state\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
+              "query": "sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",step=\"get-regions-in-range\"}\n    [$__rate_interval]\n)) by (step, instance) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -78150,7 +79107,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Threads state",
+          "title": "Get Region Operation Count",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -78196,7 +79153,7 @@
           "bars": false,
           "cacheTimeout": null,
           "datasource": "${DS_TEST-CLUSTER}",
-          "description": null,
+          "description": "The variant of checkpoint group.",
           "editable": true,
           "error": false,
           "fieldConfig": {
@@ -78219,11 +79176,11 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 0
+            "y": 112
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 572,
+          "id": 578,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -78266,15 +79223,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "topk(20,(\n    sum(rate(\n    tikv_threads_io_bytes_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name, io) > 1024\n    \n    \n)) by ($additional_groupby) ",
+              "expr": "sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",step=\"try-advance\"}\n    [$__rate_interval]\n)) by (step, instance) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{name}} {{$additional_groupby}}",
+              "legendFormat": "{{step}}-{{instance}}",
               "metric": "",
-              "query": "topk(20,(\n    sum(rate(\n    tikv_threads_io_bytes_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name, io) > 1024\n    \n    \n)) by ($additional_groupby) ",
+              "query": "sum(rate(\n    tidb_log_backup_advancer_tick_duration_sec_count\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",step=\"try-advance\"}\n    [$__rate_interval]\n)) by (step, instance) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -78283,7 +79240,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Threads IO",
+          "title": "Try Advance Trigger Time",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -78302,7 +79259,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "binBps",
+              "format": "none",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -78323,7 +79280,49 @@
             "align": false,
             "alignLevel": 0
           }
-        },
+        }
+      ],
+      "repeat": null,
+      "repeatDirection": null,
+      "span": null,
+      "targets": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Backup Log",
+      "transformations": [],
+      "transparent": false,
+      "type": "row"
+    },
+    {
+      "cacheTimeout": null,
+      "collapsed": true,
+      "datasource": null,
+      "description": null,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "thresholds": {
+            "mode": "absolute",
+            "steps": []
+          }
+        }
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "height": null,
+      "hideTimeOverride": false,
+      "id": 579,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "maxPerRow": null,
+      "minSpan": null,
+      "panels": [
         {
           "aliasColors": {},
           "bars": false,
@@ -78352,11 +79351,11 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 7
+            "y": 0
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 573,
+          "id": 580,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -78399,15 +79398,30 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "topk(20,(\n    max(rate(\n    tikv_thread_voluntary_context_switches\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name) > 100\n    \n    \n))  ",
+              "expr": "sum((\n    tikv_threads_state\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance, state) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{name}}",
+              "legendFormat": "{{instance}}-{{state}}",
               "metric": "",
-              "query": "topk(20,(\n    max(rate(\n    tikv_thread_voluntary_context_switches\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name) > 100\n    \n    \n))  ",
+              "query": "sum((\n    tikv_threads_state\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance, state) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            },
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum((\n    tikv_threads_state\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{instance}}-total",
+              "metric": "",
+              "query": "sum((\n    tikv_threads_state\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -78416,7 +79430,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Thread Voluntary Context Switches",
+          "title": "Threads state",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -78485,11 +79499,11 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 7
+            "y": 0
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 574,
+          "id": 581,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -78532,15 +79546,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "topk(20,(\n    max(rate(\n    tikv_thread_nonvoluntary_context_switches\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name) > 100\n    \n    \n))  ",
+              "expr": "topk(20,(\n    sum(rate(\n    tikv_threads_io_bytes_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name, io) > 1024\n    \n    \n)) by ($additional_groupby) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{name}}",
+              "legendFormat": "{{name}} {{$additional_groupby}}",
               "metric": "",
-              "query": "topk(20,(\n    max(rate(\n    tikv_thread_nonvoluntary_context_switches\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name) > 100\n    \n    \n))  ",
+              "query": "topk(20,(\n    sum(rate(\n    tikv_threads_io_bytes_total\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name, io) > 1024\n    \n    \n)) by ($additional_groupby) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -78549,7 +79563,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Thread Nonvoluntary Context Switches",
+          "title": "Threads IO",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -78568,7 +79582,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "none",
+              "format": "binBps",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -78589,49 +79603,7 @@
             "align": false,
             "alignLevel": 0
           }
-        }
-      ],
-      "repeat": null,
-      "repeatDirection": null,
-      "span": null,
-      "targets": [],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Threads",
-      "transformations": [],
-      "transparent": false,
-      "type": "row"
-    },
-    {
-      "cacheTimeout": null,
-      "collapsed": true,
-      "datasource": null,
-      "description": null,
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "thresholds": {
-            "mode": "absolute",
-            "steps": []
-          }
-        }
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "height": null,
-      "hideTimeOverride": false,
-      "id": 575,
-      "interval": null,
-      "links": [],
-      "maxDataPoints": 100,
-      "maxPerRow": null,
-      "minSpan": null,
-      "panels": [
+        },
         {
           "aliasColors": {},
           "bars": false,
@@ -78660,11 +79632,11 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 0
+            "y": 7
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 576,
+          "id": 582,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -78707,15 +79679,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum((\n    tikv_allocator_stats\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance, type) ",
+              "expr": "topk(20,(\n    max(rate(\n    tikv_thread_voluntary_context_switches\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name) > 100\n    \n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{instance}}-{{type}}",
+              "legendFormat": "{{name}}",
               "metric": "",
-              "query": "sum((\n    tikv_allocator_stats\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance, type) ",
+              "query": "topk(20,(\n    max(rate(\n    tikv_thread_voluntary_context_switches\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name) > 100\n    \n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -78724,7 +79696,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Allocator Stats",
+          "title": "Thread Voluntary Context Switches",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -78743,7 +79715,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "bytes",
+              "format": "none",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -78793,11 +79765,11 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 0
+            "y": 7
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 577,
+          "id": 583,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -78840,15 +79812,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "(sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"alloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby)  - sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"dealloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) )",
+              "expr": "topk(20,(\n    max(rate(\n    tikv_thread_nonvoluntary_context_switches\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name) > 100\n    \n    \n))  ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{thread_name}} {{$additional_groupby}}",
+              "legendFormat": "{{name}}",
               "metric": "",
-              "query": "(sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"alloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby)  - sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"dealloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) )",
+              "query": "topk(20,(\n    max(rate(\n    tikv_thread_nonvoluntary_context_switches\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    [$__rate_interval]\n)) by (name) > 100\n    \n    \n))  ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -78857,7 +79829,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Send Allocated(+) / Release Received(-) Bytes Rate",
+          "title": "Thread Nonvoluntary Context Switches",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -78876,7 +79848,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "binBps",
+              "format": "none",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -78897,7 +79869,49 @@
             "align": false,
             "alignLevel": 0
           }
-        },
+        }
+      ],
+      "repeat": null,
+      "repeatDirection": null,
+      "span": null,
+      "targets": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Threads",
+      "transformations": [],
+      "transparent": false,
+      "type": "row"
+    },
+    {
+      "cacheTimeout": null,
+      "collapsed": true,
+      "datasource": null,
+      "description": null,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "thresholds": {
+            "mode": "absolute",
+            "steps": []
+          }
+        }
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "height": null,
+      "hideTimeOverride": false,
+      "id": 584,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "maxPerRow": null,
+      "minSpan": null,
+      "panels": [
         {
           "aliasColors": {},
           "bars": false,
@@ -78926,11 +79940,11 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 7
+            "y": 0
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 578,
+          "id": 585,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -78973,15 +79987,15 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"alloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) ",
+              "expr": "sum((\n    tikv_allocator_stats\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance, type) ",
               "format": "time_series",
               "hide": false,
               "instant": false,
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{thread_name}} {{$additional_groupby}}",
+              "legendFormat": "{{instance}}-{{type}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"alloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) ",
+              "query": "sum((\n    tikv_allocator_stats\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n)) by (instance, type) ",
               "refId": "",
               "step": 10,
               "target": ""
@@ -78990,7 +80004,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Allocated Bytes Rate per Thread",
+          "title": "Allocator Stats",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -79059,11 +80073,11 @@
             "h": 7,
             "w": 12,
             "x": 12,
-            "y": 7
+            "y": 0
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 579,
+          "id": 586,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -79106,7 +80120,7 @@
           "targets": [
             {
               "datasource": "${DS_TEST-CLUSTER}",
-              "expr": "sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"dealloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) ",
+              "expr": "(sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"alloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby)  - sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"dealloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) )",
               "format": "time_series",
               "hide": false,
               "instant": false,
@@ -79114,7 +80128,7 @@
               "intervalFactor": 1,
               "legendFormat": "{{thread_name}} {{$additional_groupby}}",
               "metric": "",
-              "query": "sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"dealloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) ",
+              "query": "(sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"alloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby)  - sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"dealloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) )",
               "refId": "",
               "step": 10,
               "target": ""
@@ -79123,7 +80137,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Released Bytes Rate per Thread",
+          "title": "Send Allocated(+) / Release Received(-) Bytes Rate",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -79142,7 +80156,7 @@
           "yaxes": [
             {
               "decimals": null,
-              "format": "bytes",
+              "format": "binBps",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -79192,11 +80206,277 @@
             "h": 7,
             "w": 12,
             "x": 0,
-            "y": 14
+            "y": 7
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 580,
+          "id": 587,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"alloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{thread_name}} {{$additional_groupby}}",
+              "metric": "",
+              "query": "sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"alloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Allocated Bytes Rate per Thread",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "bytes",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": null,
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 12,
+            "x": 12,
+            "y": 7
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 588,
+          "interval": null,
+          "isNew": true,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": true,
+            "max": true,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "sideWidth": null,
+            "sort": "max",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "maxDataPoints": null,
+          "maxPerRow": null,
+          "minSpan": null,
+          "nullPointMode": "null as zero",
+          "options": {
+            "alertThreshold": true,
+            "dataLinks": []
+          },
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "repeat": null,
+          "repeatDirection": null,
+          "seriesOverrides": [],
+          "span": null,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"dealloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) ",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": "{{thread_name}} {{$additional_groupby}}",
+              "metric": "",
+              "query": "sum(rate(\n    tikv_allocator_thread_allocation\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\",type=\"dealloc\"}\n    [$__rate_interval]\n)) by (thread_name, $additional_groupby) ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Released Bytes Rate per Thread",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "transformations": [],
+          "transparent": false,
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": null,
+              "format": "bytes",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "decimals": null,
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": 0
+          }
+        },
+        {
+          "aliasColors": {},
+          "bars": false,
+          "cacheTimeout": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": null,
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            }
+          },
+          "fill": 1,
+          "fillGradient": 1,
+          "grid": {
+            "threshold1": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2": null,
+            "threshold2Color": "rgba(234, 112, 112, 0.22)"
+          },
+          "gridPos": {
+            "h": 7,
+            "w": 12,
+            "x": 0,
+            "y": 14
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 589,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -79329,7 +80609,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 581,
+          "id": 590,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -79465,7 +80745,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 582,
+      "id": 591,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -79504,7 +80784,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 583,
+          "id": 592,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -79637,7 +80917,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 584,
+          "id": 593,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -79773,7 +81053,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 585,
+      "id": 594,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -79812,7 +81092,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 586,
+          "id": 595,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -80013,7 +81293,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 587,
+          "id": 596,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -80149,7 +81429,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 588,
+      "id": 597,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -80188,7 +81468,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 589,
+          "id": 598,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -80321,7 +81601,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 590,
+          "id": 599,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -80454,7 +81734,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 591,
+          "id": 600,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -80587,7 +81867,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 592,
+          "id": 601,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -80720,7 +82000,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 593,
+          "id": 602,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -80868,7 +82148,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 594,
+          "id": 603,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -81072,7 +82352,7 @@
       },
       "height": null,
       "hideTimeOverride": false,
-      "id": 595,
+      "id": 604,
       "interval": null,
       "links": [],
       "maxDataPoints": 100,
@@ -81111,7 +82391,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 596,
+          "id": 605,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -81244,7 +82524,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 597,
+          "id": 606,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -81377,7 +82657,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 598,
+          "id": 607,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -81510,7 +82790,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 599,
+          "id": 608,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -81643,7 +82923,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 600,
+          "id": 609,
           "interval": null,
           "isNew": true,
           "legend": {
@@ -81840,7 +83120,7 @@
           },
           "height": null,
           "hideTimeOverride": false,
-          "id": 601,
+          "id": 610,
           "interval": null,
           "links": [],
           "maxDataPoints": 100,
@@ -81898,6 +83178,516 @@
       "transformations": [],
       "transparent": false,
       "type": "row"
+    },
+    {
+      "cacheTimeout": null,
+      "collapsed": true,
+      "datasource": null,
+      "description": null,
+      "editable": true,
+      "error": false,
+      "fieldConfig": {
+        "defaults": {
+          "thresholds": {
+            "mode": "absolute",
+            "steps": []
+          }
+        }
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "height": null,
+      "hideTimeOverride": false,
+      "id": 611,
+      "interval": null,
+      "links": [],
+      "maxDataPoints": 100,
+      "maxPerRow": null,
+      "minSpan": null,
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "color": {
+            "mode": "thresholds"
+          },
+          "columns": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "TiKV RocksDB DB Configuration",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {
+                "align": "auto",
+                "displayMode": "auto",
+                "filterable": false
+              },
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            },
+            "overrides": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Field"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Option"
+                  },
+                  {
+                    "id": "custom.align",
+                    "value": null
+                  }
+                ]
+              },
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Last (not null)"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Value"
+                  }
+                ]
+              }
+            ]
+          },
+          "fontSize": "100%",
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 0
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 612,
+          "interval": null,
+          "links": [],
+          "mappings": [],
+          "maxDataPoints": 100,
+          "maxPerRow": null,
+          "minSpan": null,
+          "options": {
+            "showHeader": true
+          },
+          "repeat": null,
+          "repeatDirection": null,
+          "span": 6,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "((\n    tikv_config_rocksdb_db\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "format": "table",
+              "hide": false,
+              "instant": true,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": null,
+              "metric": "",
+              "query": "((\n    tikv_config_rocksdb_db\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "RocksDB DB Config",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Time": true,
+                  "__name__": true,
+                  "job": true
+                },
+                "indexByName": {},
+                "renameByName": {
+                  "Time": "",
+                  "Value #A": "Value",
+                  "job": "",
+                  "name": "Option"
+                }
+              }
+            }
+          ],
+          "transparent": false,
+          "type": "table"
+        },
+        {
+          "cacheTimeout": null,
+          "color": {
+            "mode": "thresholds"
+          },
+          "columns": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "TiKV RocksDB CF Configuration",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {
+                "align": "auto",
+                "displayMode": "auto",
+                "filterable": false
+              },
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            },
+            "overrides": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Field"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Option"
+                  },
+                  {
+                    "id": "custom.align",
+                    "value": null
+                  }
+                ]
+              },
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Last (not null)"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Value"
+                  }
+                ]
+              }
+            ]
+          },
+          "fontSize": "100%",
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 7
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 613,
+          "interval": null,
+          "links": [],
+          "mappings": [],
+          "maxDataPoints": 100,
+          "maxPerRow": null,
+          "minSpan": null,
+          "options": {
+            "showHeader": true
+          },
+          "repeat": null,
+          "repeatDirection": null,
+          "span": 6,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "((\n    tikv_config_rocksdb_cf\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))   or (tikv_config_rocksdb unless tikv_config_rocksdb_cf)",
+              "format": "table",
+              "hide": false,
+              "instant": true,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": null,
+              "metric": "",
+              "query": "((\n    tikv_config_rocksdb_cf\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))   or (tikv_config_rocksdb unless tikv_config_rocksdb_cf)",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "RocksDB CF Config",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Time": true,
+                  "__name__": true,
+                  "job": true
+                },
+                "indexByName": {},
+                "renameByName": {
+                  "Time": "",
+                  "Value #A": "Value",
+                  "job": "",
+                  "name": "Option"
+                }
+              }
+            }
+          ],
+          "transparent": false,
+          "type": "table"
+        },
+        {
+          "cacheTimeout": null,
+          "color": {
+            "mode": "thresholds"
+          },
+          "columns": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "TiKV Flow Control Configuration",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {
+                "align": "auto",
+                "displayMode": "auto",
+                "filterable": false
+              },
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            },
+            "overrides": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Field"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Option"
+                  },
+                  {
+                    "id": "custom.align",
+                    "value": null
+                  }
+                ]
+              },
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Last (not null)"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Value"
+                  }
+                ]
+              }
+            ]
+          },
+          "fontSize": "100%",
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 14
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 614,
+          "interval": null,
+          "links": [],
+          "mappings": [],
+          "maxDataPoints": 100,
+          "maxPerRow": null,
+          "minSpan": null,
+          "options": {
+            "showHeader": true
+          },
+          "repeat": null,
+          "repeatDirection": null,
+          "span": 6,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "((\n    tikv_config_flow_control\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "format": "table",
+              "hide": false,
+              "instant": true,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": null,
+              "metric": "",
+              "query": "((\n    tikv_config_flow_control\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Flow Control Config",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Time": true,
+                  "__name__": true,
+                  "job": true
+                },
+                "indexByName": {},
+                "renameByName": {
+                  "Time": "",
+                  "Value #A": "Value",
+                  "job": "",
+                  "name": "Option"
+                }
+              }
+            }
+          ],
+          "transparent": false,
+          "type": "table"
+        },
+        {
+          "cacheTimeout": null,
+          "color": {
+            "mode": "thresholds"
+          },
+          "columns": null,
+          "datasource": "${DS_TEST-CLUSTER}",
+          "description": "TiKV Raftstore Configuration",
+          "editable": true,
+          "error": false,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {
+                "align": "auto",
+                "displayMode": "auto",
+                "filterable": false
+              },
+              "thresholds": {
+                "mode": "absolute",
+                "steps": []
+              }
+            },
+            "overrides": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Field"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Option"
+                  },
+                  {
+                    "id": "custom.align",
+                    "value": null
+                  }
+                ]
+              },
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Last (not null)"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Value"
+                  }
+                ]
+              }
+            ]
+          },
+          "fontSize": "100%",
+          "gridPos": {
+            "h": 7,
+            "w": 24,
+            "x": 0,
+            "y": 21
+          },
+          "height": null,
+          "hideTimeOverride": false,
+          "id": 615,
+          "interval": null,
+          "links": [],
+          "mappings": [],
+          "maxDataPoints": 100,
+          "maxPerRow": null,
+          "minSpan": null,
+          "options": {
+            "showHeader": true
+          },
+          "repeat": null,
+          "repeatDirection": null,
+          "span": 6,
+          "targets": [
+            {
+              "datasource": "${DS_TEST-CLUSTER}",
+              "expr": "((\n    tikv_config_raftstore\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "format": "table",
+              "hide": false,
+              "instant": true,
+              "interval": "",
+              "intervalFactor": 1,
+              "legendFormat": null,
+              "metric": "",
+              "query": "((\n    tikv_config_raftstore\n    {k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\",instance=~\"$instance\"}\n    \n))  ",
+              "refId": "",
+              "step": 10,
+              "target": ""
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Raftstore Config",
+          "transformations": [
+            {
+              "id": "organize",
+              "options": {
+                "excludeByName": {
+                  "Time": true,
+                  "__name__": true,
+                  "job": true
+                },
+                "indexByName": {},
+                "renameByName": {
+                  "Time": "",
+                  "Value #A": "Value",
+                  "job": "",
+                  "name": "Option"
+                }
+              }
+            }
+          ],
+          "transparent": false,
+          "type": "table"
+        }
+      ],
+      "repeat": null,
+      "repeatDirection": null,
+      "span": null,
+      "targets": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Config",
+      "transformations": [],
+      "transparent": false,
+      "type": "row"
     }
   ],
   "refresh": "1m",
diff --git a/metrics/grafana/tikv_details.json.sha256 b/metrics/grafana/tikv_details.json.sha256
index b7c05b22b33..0b063a557f4 100644
--- a/metrics/grafana/tikv_details.json.sha256
+++ b/metrics/grafana/tikv_details.json.sha256
@@ -1 +1 @@
-57f8fbd2a12fd242845a06f7e2f593234c5d6ae78b8aa3fa120f15743e2ce55b  ./metrics/grafana/tikv_details.json
+f45de52bdf368092abe5b9c46ab9898a92c04c6e32b8eeb482fdfa862d727a50  ./metrics/grafana/tikv_details.json
diff --git a/proxy_components/engine_store_ffi/src/core/forward_raft/command.rs b/proxy_components/engine_store_ffi/src/core/forward_raft/command.rs
index b8f21a6286f..d37dca5d7c5 100644
--- a/proxy_components/engine_store_ffi/src/core/forward_raft/command.rs
+++ b/proxy_components/engine_store_ffi/src/core/forward_raft/command.rs
@@ -458,7 +458,7 @@ impl<T: Transport + 'static, ER: RaftEngine> ProxyForwarder<T, ER> {
                                 .pending_delete_ssts
                                 .write()
                                 .expect("lock error")
-                                .extract_if(|e| e.meta.get_region_id() == region_id)
+                                .extract_if(.., |e| e.meta.get_region_id() == region_id)
                                 .collect();
                             apply_ctx_info.delete_ssts.append(&mut sst_in_region);
                             apply_ctx_info.delete_ssts.append(v);
diff --git a/proxy_components/engine_tiflash/src/compact_listener.rs b/proxy_components/engine_tiflash/src/compact_listener.rs
index e679410c8b9..3b62bc03dc1 100644
--- a/proxy_components/engine_tiflash/src/compact_listener.rs
+++ b/proxy_components/engine_tiflash/src/compact_listener.rs
@@ -137,12 +137,13 @@ impl RocksCompactedEvent {
 }
 
 impl CompactedEvent for RocksCompactedEvent {
+    fn get_key_range(&self) -> (Vec<u8>, Vec<u8>) {
+        (self.start_key.clone(), self.end_key.clone())
+    }
+
     fn total_bytes_declined(&self) -> u64 {
-        if self.total_input_bytes > self.total_output_bytes {
-            self.total_input_bytes - self.total_output_bytes
-        } else {
-            0
-        }
+        self.total_input_bytes
+            .saturating_sub(self.total_output_bytes)
     }
 
     fn is_size_declining_trivial(&self, split_check_diff: u64) -> bool {
diff --git a/proxy_components/engine_tiflash/src/import.rs b/proxy_components/engine_tiflash/src/import.rs
index e6bc6fdbf21..5059caf61ed 100644
--- a/proxy_components/engine_tiflash/src/import.rs
+++ b/proxy_components/engine_tiflash/src/import.rs
@@ -18,6 +18,7 @@ impl ImportExt for RocksEngine {
         cf_name: &str,
         files: &[&str],
         range: Option<Range<'_>>,
+        force_allow_write: bool,
     ) -> Result<()> {
         // do nothing
         return Ok(());
diff --git a/proxy_components/engine_tiflash/src/misc.rs b/proxy_components/engine_tiflash/src/misc.rs
index 464106f302e..7f240c0080c 100644
--- a/proxy_components/engine_tiflash/src/misc.rs
+++ b/proxy_components/engine_tiflash/src/misc.rs
@@ -10,12 +10,13 @@ use rocksdb::{FlushOptions, Range as RocksRange};
 use tikv_util::{box_try, keybuilder::KeyBuilder};
 
 use crate::{
+    RocksSstWriter,
     engine::RocksEngine,
     r2e,
     rocks_metrics::{RocksStatisticsReporter, STORE_ENGINE_EVENT_COUNTER_VEC},
     rocks_metrics_defs::*,
     sst::RocksSstWriterBuilder,
-    util, RocksSstWriter,
+    util,
 };
 
 pub const MAX_DELETE_COUNT_BY_KEY: usize = 2048;
@@ -46,7 +47,7 @@ impl RocksEngine {
             // There may be a range overlap with next range
             if last_end_key
                 .as_ref()
-                .map_or(false, |key| key.as_slice() > r.start_key)
+                .is_some_and(|key| key.as_slice() > r.start_key)
             {
                 written |= self.delete_all_in_range_cf_by_key(wopts, cf, r)?;
                 continue;
@@ -110,7 +111,12 @@ impl RocksEngine {
             } else {
                 None
             };
-            self.ingest_external_file_cf(cf, &[sst_path.as_str()], range_to_lock)?;
+            self.ingest_external_file_cf(
+                cf,
+                &[sst_path.as_str()],
+                range_to_lock,
+                allow_write_during_ingestion,
+            )?;
         } else {
             let mut wb = self.write_batch();
             for key in data.iter() {
@@ -211,7 +217,7 @@ impl MiscExt for RocksEngine {
                     .map(|(_, time)| (handle, time))
             })
             .min_by(|(_, a), (_, b)| a.cmp(b))
-            && age_threshold.map_or(true, |threshold| time <= threshold)
+            && age_threshold.is_none_or(|threshold| time <= threshold)
         {
             let mut fopts = FlushOptions::default();
             fopts.set_wait(wait);
@@ -313,7 +319,10 @@ impl MiscExt for RocksEngine {
             .get_approximate_memtable_stats_cf(handle, &range))
     }
 
-    fn ingest_maybe_slowdown_writes(&self, cf: &str) -> Result<bool> {
+    // Checks if ingesting additional SSTs might trigger write slowdown, based
+    // on a conservative estimate of the L0 file count after ingesting the SSTs
+    // that are already inflight for ingestion.
+    fn ingest_maybe_slowdown_writes(&self, cf: &str, inflight_ingest_cnt: u64) -> Result<bool> {
         let handle = util::get_cf_handle(self.as_inner(), cf)?;
         if let Some(n) = util::get_cf_num_files_at_level(self.as_inner(), handle, 0) {
             let options = self.as_inner().get_options_cf(handle);
@@ -321,31 +330,16 @@ impl MiscExt for RocksEngine {
             let compaction_trigger = options.get_level_zero_file_num_compaction_trigger() as u64;
             // Leave enough buffer to tolerate heavy write workload,
             // which may flush some memtables in a short time.
-            if n > u64::from(slowdown_trigger) / 2 && n >= compaction_trigger {
+            let worse_case_l0_file_count = n + inflight_ingest_cnt;
+            if worse_case_l0_file_count > u64::from(slowdown_trigger) / 2
+                && worse_case_l0_file_count >= compaction_trigger
+            {
                 return Ok(true);
             }
         }
         Ok(false)
     }
 
-    fn get_sst_key_ranges(&self, cf: &str, level: usize) -> Result<Vec<(Vec<u8>, Vec<u8>)>> {
-        let handle = util::get_cf_handle(self.as_inner(), cf)?;
-        let ret = self
-            .as_inner()
-            .get_column_family_meta_data(handle)
-            .get_level(level)
-            .get_files()
-            .iter()
-            .map(|sst_meta| {
-                (
-                    sst_meta.get_smallestkey().to_vec(),
-                    sst_meta.get_largestkey().to_vec(),
-                )
-            })
-            .collect();
-        Ok(ret)
-    }
-
     fn get_engine_used_size(&self) -> Result<u64> {
         let mut used_size: u64 = 0;
         for cf in self.cf_names() {
@@ -509,16 +503,15 @@ impl MiscExt for RocksEngine {
 #[cfg(test)]
 mod tests {
     use engine_traits::{
-        CompactExt, DeleteStrategy, Iterable, Iterator, ManualCompactionOptions, Mutable,
-        SyncMutable, WriteBatchExt, ALL_CFS,
+        ALL_CFS, DeleteStrategy, Iterable, Iterator, Mutable, SyncMutable, WriteBatchExt,
     };
     use tempfile::Builder;
 
     use super::*;
     use crate::{
+        RocksCfOptions, RocksDbOptions,
         engine::RocksEngine,
         util::{new_engine, new_engine_opt},
-        RocksCfOptions, RocksDbOptions,
     };
 
     fn check_data(db: &RocksEngine, cfs: &[&str], expected: &[(&[u8], &[u8])]) {
@@ -772,79 +765,6 @@ mod tests {
         check_data(&db, &[cf], kvs_left.as_slice());
     }
 
-    #[test]
-    fn test_get_sst_key_ranges() {
-        let path = Builder::new()
-            .prefix("test_get_sst_key_ranges")
-            .tempdir()
-            .unwrap();
-        let path_str = path.path().to_str().unwrap();
-
-        let mut opts = RocksDbOptions::default();
-        opts.create_if_missing(true);
-        opts.enable_multi_batch_write(true);
-
-        let mut cf_opts = RocksCfOptions::default();
-        // Prefix extractor(trim the timestamp at tail) for write cf.
-        cf_opts
-            .set_prefix_extractor(
-                "FixedSuffixSliceTransform",
-                crate::util::FixedSuffixSliceTransform::new(8),
-            )
-            .unwrap_or_else(|err| panic!("{:?}", err));
-        // Create prefix bloom filter for memtable.
-        cf_opts.set_memtable_prefix_bloom_size_ratio(0.1_f64);
-        cf_opts.set_level_compaction_dynamic_level_bytes(false);
-        let cf = "default";
-        let db = new_engine_opt(path_str, opts, vec![(cf, cf_opts)]).unwrap();
-        let mut wb = db.write_batch();
-        let kvs: Vec<(&[u8], &[u8])> = vec![
-            (b"k1", b"v1"),
-            (b"k2", b"v2"),
-            (b"k6", b"v3"),
-            (b"k7", b"v4"),
-        ];
-
-        for &(k, v) in kvs.as_slice() {
-            wb.put_cf(cf, k, v).unwrap();
-        }
-        wb.write().unwrap();
-
-        db.flush_cf(cf, true).unwrap();
-        let sst_range = db.get_sst_key_ranges(cf, 0).unwrap();
-        let expected = vec![(b"k1".to_vec(), b"k7".to_vec())];
-        assert_eq!(sst_range, expected);
-
-        let mut wb = db.write_batch();
-        let kvs: Vec<(&[u8], &[u8])> = vec![(b"k3", b"v1"), (b"k4", b"v2"), (b"k8", b"v3")];
-
-        for &(k, v) in kvs.as_slice() {
-            wb.put_cf(cf, k, v).unwrap();
-        }
-        wb.write().unwrap();
-
-        db.flush_cf(cf, true).unwrap();
-        let sst_range = db.get_sst_key_ranges(cf, 0).unwrap();
-        let expected = vec![
-            (b"k3".to_vec(), b"k8".to_vec()),
-            (b"k1".to_vec(), b"k7".to_vec()),
-        ];
-        assert_eq!(sst_range, expected);
-
-        db.compact_range_cf(
-            cf,
-            None,
-            None,
-            ManualCompactionOptions::new(false, 1, false),
-        )
-        .unwrap();
-        let sst_range = db.get_sst_key_ranges(cf, 0).unwrap();
-        assert_eq!(sst_range.len(), 0);
-        let sst_range = db.get_sst_key_ranges(cf, 1).unwrap();
-        let expected = vec![(b"k1".to_vec(), b"k8".to_vec())];
-        assert_eq!(sst_range, expected);
-    }
-
     #[test]
     fn test_flush_oldest() {
         let path = Builder::new()
diff --git a/proxy_components/engine_tiflash/src/table_properties.rs b/proxy_components/engine_tiflash/src/table_properties.rs
index 19b2141483d..2813c9f7c69 100644
--- a/proxy_components/engine_tiflash/src/table_properties.rs
+++ b/proxy_components/engine_tiflash/src/table_properties.rs
@@ -1,8 +1,8 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_traits::{Range, Result};
+use engine_traits::{MvccProperties, Range, Result};
 
-use crate::{r2e, util, RangeProperties, RocksEngine};
+use crate::{RangeProperties, RocksEngine, mvcc_properties::RocksMvccProperties, r2e, util};
 
 #[repr(transparent)]
 pub struct UserCollectedProperties(rocksdb::UserCollectedProperties);
@@ -16,18 +16,39 @@ impl engine_traits::UserCollectedProperties for UserCollectedProperties {
         let x = rp.get_approximate_distance_in_range(start, end);
         Some((x.0 as usize, x.1 as usize))
     }
+
+    fn get_mvcc_properties(&self) -> Option<MvccProperties> {
+        let mvcc = RocksMvccProperties::decode(&self.0).ok()?;
+        Some(mvcc)
+    }
 }
 
+#[repr(transparent)]
+pub struct TableProperties(rocksdb::TableProperties);
+impl engine_traits::TableProperties for TableProperties {
+    type UserCollectedProperties = UserCollectedProperties;
+    fn get_user_collected_properties(&self) -> &Self::UserCollectedProperties {
+        unsafe {
+            std::mem::transmute::<_, &UserCollectedProperties>(self.0.user_collected_properties())
+        }
+    }
+
+    fn get_num_entries(&self) -> u64 {
+        self.0.num_entries()
+    }
+}
 #[repr(transparent)]
 pub struct TablePropertiesCollection(rocksdb::TablePropertiesCollection);
 impl engine_traits::TablePropertiesCollection for TablePropertiesCollection {
-    type UserCollectedProperties = UserCollectedProperties;
-    fn iter_user_collected_properties<F>(&self, mut f: F)
+    type TableProperties = TableProperties;
+    fn iter_table_properties<F>(&self, mut f: F)
     where
-        F: FnMut(&Self::UserCollectedProperties) -> bool,
+        F: FnMut(&Self::TableProperties) -> bool,
     {
         for (_, props) in self.0.into_iter() {
-            let props = unsafe { std::mem::transmute(props.user_collected_properties()) };
+            let props = unsafe {
+                std::mem::transmute::<&rocksdb::TableProperties, &TableProperties>(props)
+            };
             if !f(props) {
                 break;
             }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 90cdbcbdecd..291d88140c6 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,5 @@
 [toolchain]
-channel = "nightly-2023-12-28"
+#WARN: Before upgrading to a new toolchain, please ensure https://github.com/rust-lang/rust/issues/141306 is fixed.
+channel = "nightly-2025-02-28"
 components = ["rustfmt", "clippy", "rust-src", "rust-analyzer"]
 profile = "minimal"
diff --git a/rustfmt.toml b/rustfmt.toml
index 3de3c63c441..71051beda13 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,4 +1,4 @@
-version = "Two"
+style_edition="2024"
 unstable_features = true
 
 comment_width = 80
diff --git a/scripts/clippy b/scripts/clippy
index 3701099dafa..157ac102560 100755
--- a/scripts/clippy
+++ b/scripts/clippy
@@ -21,6 +21,7 @@ fi
 # - `derive_partial_eq_without_eq` has compilation overhead.
 # - Blocking issue for enabling `result_large_err` is the protobuf messages.
 # - Blocking issue for clippy::large_enum_variant is the raftstore peer message.
+# - Allow `unexpected_cfgs` as have defines many compiling cfg for unsupported test cases.
 CLIPPY_LINTS=(
     -A clippy::module_inception  \
     -A clippy::result_large_err \
@@ -50,6 +51,7 @@ CLIPPY_LINTS=(
     -D clippy::assertions_on_result_states \
     -A clippy::non_canonical_partial_ord_impl \
     -A clippy::arc_with_non_send_sync \
+    -A unexpected_cfgs \
 )
 
 # TODO: Enables `clippy::needless_return_with_question_mark` after
diff --git a/scripts/deny b/scripts/deny
index 51930bc56f5..9e18978053b 100755
--- a/scripts/deny
+++ b/scripts/deny
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 # Update cargo-deny to the 0.15.1 version to fix the issue reported by https://github.com/tikv/tikv/pull/17987.
-cargo install --locked cargo-deny@0.15.1 2> /dev/null || echo "Install cargo-deny failed"
+cargo install --locked cargo-deny@0.18.2 2> /dev/null || echo "Install cargo-deny failed"
 cargo deny -V
 cargo deny fetch all
 cargo deny check --show-stats
diff --git a/scripts/gen-tikv-details-dashboard b/scripts/gen-tikv-details-dashboard
index df768397a85..6d760844894 100755
--- a/scripts/gen-tikv-details-dashboard
+++ b/scripts/gen-tikv-details-dashboard
@@ -6,6 +6,10 @@ root_dir=$(realpath "$(dirname "$(realpath "$0")")/..")
 docker build -t tikv-dashboard-gen -f - . <<EOF
 FROM pyfound/black:23.11.0
 
+# add pip mirror if you meet pip install error
+# RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
+# RUN pip config set global.trusted-host pypi.tuna.tsinghua.edu.cn
+
 RUN pip install isort==5.13.2 grafanalib==v0.7.0
 
 CMD ["bash"]
diff --git a/src/config/configurable.rs b/src/config/configurable.rs
index c92b01cf465..391bfe6bc2a 100644
--- a/src/config/configurable.rs
+++ b/src/config/configurable.rs
@@ -4,7 +4,7 @@ use std::{error::Error, io::Write};
 
 use engine_rocks::RocksEngine;
 use engine_traits::{
-    CachedTablet, CfOptions, CfOptionsExt, DbOptions, DbOptionsExt, TabletRegistry, CF_DEFAULT,
+    CF_DEFAULT, CachedTablet, CfOptions, CfOptionsExt, DbOptions, DbOptionsExt, TabletRegistry,
 };
 
 pub type ConfigRes = Result<(), Box<dyn Error>>;
diff --git a/src/config/mod.rs b/src/config/mod.rs
index a1f40fde0d9..1716886b786 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -12,19 +12,22 @@ use std::{
     collections::{HashMap, HashSet},
     convert::TryFrom,
     error::Error,
-    fs, i32,
-    io::{Error as IoError, ErrorKind, Write},
+    fs,
+    io::{Error as IoError, Write},
     path::Path,
     str,
     sync::{Arc, RwLock},
-    usize,
 };
 
 use api_version::ApiV1Ttl;
 use causal_ts::Config as CausalTsConfig;
-pub use configurable::{loop_registry, ConfigRes, ConfigurableDb};
+pub use configurable::{ConfigRes, ConfigurableDb, loop_registry};
 use encryption_export::DataKeyManager;
 use engine_rocks::{
+    DEFAULT_PROP_KEYS_INDEX_DISTANCE, DEFAULT_PROP_SIZE_INDEX_DISTANCE, RaftDbLogger,
+    RangePropertiesCollectorFactory, RawMvccPropertiesCollectorFactory, RocksCfOptions,
+    RocksDbOptions, RocksEngine, RocksEventListener, RocksStatistics, RocksTitanDbOptions,
+    RocksdbLogger, TtlPropertiesCollectorFactory,
     config::{self as rocks_config, BlobRunMode, CompressionType, LogLevel as RocksLogLevel},
     get_env,
     properties::MvccPropertiesCollectorFactory,
@@ -37,19 +40,16 @@ use engine_rocks::{
         FixedPrefixSliceTransform, FixedSuffixSliceTransform, NoopSliceTransform,
         RangeCompactionFilterFactory, StackingCompactionFilterFactory,
     },
-    RaftDbLogger, RangePropertiesCollectorFactory, RawMvccPropertiesCollectorFactory,
-    RocksCfOptions, RocksDbOptions, RocksEngine, RocksEventListener, RocksStatistics,
-    RocksTitanDbOptions, RocksdbLogger, TtlPropertiesCollectorFactory,
-    DEFAULT_PROP_KEYS_INDEX_DISTANCE, DEFAULT_PROP_SIZE_INDEX_DISTANCE,
 };
 use engine_traits::{
-    CfOptions as _, DbOptions as _, MiscExt, TitanCfOptions as _, CF_DEFAULT, CF_LOCK, CF_RAFT,
-    CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, CfOptions as _, DbOptions as _, MiscExt,
+    TitanCfOptions as _,
 };
 use file_system::IoRateLimiter;
 use in_memory_engine::InMemoryEngineConfig;
 use keys::region_raft_prefix_len;
 use kvproto::kvrpcpb::ApiVersion;
+use lazy_static::lazy_static;
 use online_config::{ConfigChange, ConfigManager, ConfigValue, OnlineConfig, Result as CfgResult};
 use pd_client::Config as PdConfig;
 use raft_log_engine::{
@@ -57,20 +57,23 @@ use raft_log_engine::{
 };
 use raftstore::{
     coprocessor::{Config as CopConfig, RegionInfoAccessor},
-    store::{CompactionGuardGeneratorFactory, Config as RaftstoreConfig, SplitConfig},
+    store::{
+        CompactionGuardGeneratorFactory, Config as RaftstoreConfig, ForcePartitionRangeManager,
+        SplitConfig,
+    },
 };
 use resource_control::config::Config as ResourceControlConfig;
 use resource_metering::Config as ResourceMeteringConfig;
 use security::SecurityConfig;
 use serde::{
-    de::{Error as DError, Unexpected},
     Deserialize, Deserializer, Serialize, Serializer,
+    de::{Error as DError, Unexpected},
 };
-use serde_json::{to_value, Map, Value};
+use serde_json::{Map, Value, to_value};
 use tikv_util::{
     config::{
-        self, LogFormat, RaftDataStateMachine, ReadableDuration, ReadableSchedule, ReadableSize,
-        TomlWriter, MIB,
+        self, LogFormat, MIB, RaftDataStateMachine, ReadableDuration, ReadableSchedule,
+        ReadableSize, TomlWriter,
     },
     logger::{get_level_by_string, get_string_by_level, set_log_level},
     sys::SysQuota,
@@ -82,12 +85,12 @@ use crate::{
     coprocessor_v2::Config as CoprocessorV2Config,
     import::Config as ImportConfig,
     server::{
+        CONFIG_ROCKSDB_CF_GAUGE, CONFIG_ROCKSDB_DB_GAUGE, Config as ServerConfig,
         gc_worker::{GcConfig, RawCompactionFilterFactory, WriteCompactionFilterFactory},
         lock_manager::Config as PessimisticTxnConfig,
         ttl::TtlCompactionFilterFactory,
-        Config as ServerConfig, CONFIG_ROCKSDB_GAUGE,
     },
-    storage::config::{Config as StorageConfig, EngineType, DEFAULT_DATA_DIR},
+    storage::config::{Config as StorageConfig, DEFAULT_DATA_DIR, EngineType},
 };
 
 pub const DEFAULT_ROCKSDB_SUB_DIR: &str = "db";
@@ -289,7 +292,7 @@ fn get_background_job_limits_impl(
     // Scale flush threads proportionally to cpu cores. Also make sure the number of
     // flush threads doesn't exceed total jobs.
     let max_background_flushes = cmp::min(
-        (max_background_jobs + 3) / 4,
+        max_background_jobs.div_ceil(4),
         defaults.max_background_flushes,
     );
 
@@ -298,7 +301,7 @@ fn get_background_job_limits_impl(
     // v2: decrease the compaction threads to make the qps more stable.
     let max_compactions = match engine_type {
         EngineType::RaftKv => max_background_jobs - max_background_flushes,
-        EngineType::RaftKv2 => (max_background_jobs + 3) / 4,
+        EngineType::RaftKv2 => max_background_jobs.div_ceil(4),
     };
     let max_sub_compactions: u32 = (max_compactions - 1).clamp(1, defaults.max_sub_compactions);
     max_background_jobs = max_background_flushes + max_compactions;
@@ -364,7 +367,8 @@ macro_rules! cf_config {
             pub max_bytes_for_level_base: ReadableSize,
             pub target_file_size_base: Option<ReadableSize>,
             pub level0_file_num_compaction_trigger: i32,
-            pub level0_slowdown_writes_trigger: Option<i32>,
+            // See `fill_cf_opts` for detailed comments on the following two fields.
+            pub level0_slowdown_writes_trigger: i32,
             pub level0_stop_writes_trigger: Option<i32>,
             pub max_compaction_bytes: ReadableSize,
             #[serde(with = "rocks_config::compaction_pri_serde")]
@@ -380,7 +384,7 @@ macro_rules! cf_config {
             pub compaction_style: DBCompactionStyle,
             pub disable_auto_compactions: bool,
             pub disable_write_stall: bool,
-            pub soft_pending_compaction_bytes_limit: Option<ReadableSize>,
+            pub soft_pending_compaction_bytes_limit: ReadableSize,
             pub hard_pending_compaction_bytes_limit: Option<ReadableSize>,
             #[online_config(skip)]
             pub force_consistency_checks: bool,
@@ -441,11 +445,11 @@ macro_rules! cf_config {
                     )
                     .into());
                 }
-                if self.format_version.map_or(false, |v| v > 5) {
+                if self.format_version.is_some_and(|v| v > 5) {
                     return Err("format-version larger than 5 is unsupported".into());
                 }
                 if self.ribbon_filter_above_level.is_some()
-                    && self.format_version.map_or(true, |v| v < 5)
+                    && self.format_version.is_none_or(|v| v < 5)
                 {
                     return Err(
                         "ribbon-filter-above-level is only supported when format-version >= 5"
@@ -459,7 +463,7 @@ macro_rules! cf_config {
     };
 }
 
-macro_rules! write_into_metrics {
+macro_rules! write_into_cf_metrics {
     ($cf:expr, $tag:expr, $metrics:expr) => {{
         $metrics
             .with_label_values(&[$tag, "block_size"])
@@ -477,7 +481,6 @@ macro_rules! write_into_metrics {
         $metrics
             .with_label_values(&[$tag, "pin_l0_filter_and_index_blocks"])
             .set(($cf.pin_l0_filter_and_index_blocks as i32).into());
-
         $metrics
             .with_label_values(&[$tag, "use_bloom_filter"])
             .set(($cf.use_bloom_filter as i32).into());
@@ -501,13 +504,20 @@ macro_rules! write_into_metrics {
                 .with_label_values(&[$tag, "ribbon_filter_above_level"])
                 .set((level as i32).into());
         }
-
         $metrics
             .with_label_values(&[$tag, "read_amp_bytes_per_bit"])
             .set($cf.read_amp_bytes_per_bit.into());
+        for (i, level_compression) in $cf.compression_per_level.iter().enumerate() {
+            $metrics
+                .with_label_values(&[$tag, &format!("compression_level_{}", i)])
+                .set(*level_compression as u64 as f64);
+        }
         $metrics
             .with_label_values(&[$tag, "write_buffer_size"])
-            .set($cf.write_buffer_size.unwrap().0 as f64);
+            .set($cf.write_buffer_size.unwrap_or_default().0 as f64);
+        $metrics
+            .with_label_values(&[$tag, "write_buffer_limit"])
+            .set($cf.write_buffer_limit.unwrap_or_default().0 as f64);
         $metrics
             .with_label_values(&[$tag, "max_write_buffer_number"])
             .set($cf.max_write_buffer_number.into());
@@ -525,17 +535,16 @@ macro_rules! write_into_metrics {
             .set($cf.level0_file_num_compaction_trigger.into());
         $metrics
             .with_label_values(&[$tag, "level0_slowdown_writes_trigger"])
-            .set(
-                $cf.level0_slowdown_writes_trigger
-                    .unwrap_or_default()
-                    .into(),
-            );
+            .set($cf.level0_slowdown_writes_trigger.into());
         $metrics
             .with_label_values(&[$tag, "level0_stop_writes_trigger"])
             .set($cf.level0_stop_writes_trigger.unwrap_or_default().into());
         $metrics
             .with_label_values(&[$tag, "max_compaction_bytes"])
             .set($cf.max_compaction_bytes.0 as f64);
+        $metrics
+            .with_label_values(&[$tag, "compaction_pri"])
+            .set($cf.compaction_pri as u64 as f64);
         $metrics
             .with_label_values(&[$tag, "dynamic_level_bytes"])
             .set(($cf.dynamic_level_bytes as i32).into());
@@ -545,7 +554,9 @@ macro_rules! write_into_metrics {
         $metrics
             .with_label_values(&[$tag, "max_bytes_for_level_multiplier"])
             .set($cf.max_bytes_for_level_multiplier.into());
-
+        $metrics
+            .with_label_values(&[$tag, "compaction_style"])
+            .set($cf.compaction_style as u64 as f64);
         $metrics
             .with_label_values(&[$tag, "disable_auto_compactions"])
             .set(($cf.disable_auto_compactions as i32).into());
@@ -554,11 +565,7 @@ macro_rules! write_into_metrics {
             .set(($cf.disable_write_stall as i32).into());
         $metrics
             .with_label_values(&[$tag, "soft_pending_compaction_bytes_limit"])
-            .set(
-                $cf.soft_pending_compaction_bytes_limit
-                    .unwrap_or_default()
-                    .0 as f64,
-            );
+            .set($cf.soft_pending_compaction_bytes_limit.0 as f64);
         $metrics
             .with_label_values(&[$tag, "hard_pending_compaction_bytes_limit"])
             .set(
@@ -569,17 +576,72 @@ macro_rules! write_into_metrics {
         $metrics
             .with_label_values(&[$tag, "force_consistency_checks"])
             .set(($cf.force_consistency_checks as i32).into());
+        $metrics
+            .with_label_values(&[$tag, "prop_size_index_distance"])
+            .set($cf.prop_size_index_distance as f64);
+        $metrics
+            .with_label_values(&[$tag, "prop_keys_index_distance"])
+            .set($cf.prop_keys_index_distance as f64);
         $metrics
             .with_label_values(&[$tag, "enable_doubly_skiplist"])
             .set(($cf.enable_doubly_skiplist as i32).into());
+        $metrics
+            .with_label_values(&[$tag, "enable_compaction_guard"])
+            .set($cf.enable_compaction_guard.unwrap_or_default().into());
+        $metrics
+            .with_label_values(&[$tag, "compaction_guard_min_output_file_size"])
+            .set($cf.compaction_guard_min_output_file_size.0 as f64);
+        $metrics
+            .with_label_values(&[$tag, "compaction_guard_max_output_file_size"])
+            .set($cf.compaction_guard_max_output_file_size.0 as f64);
+        $metrics
+            .with_label_values(&[$tag, "bottommost_level_compression"])
+            .set($cf.bottommost_level_compression as u64 as f64);
+        $metrics
+            .with_label_values(&[$tag, "bottommost_zstd_compression_dict_size"])
+            .set($cf.bottommost_zstd_compression_dict_size.into());
+        $metrics
+            .with_label_values(&[$tag, "bottommost_zstd_compression_sample_size"])
+            .set($cf.bottommost_zstd_compression_sample_size.into());
+        $metrics
+            .with_label_values(&[$tag, "prepopulate_block_cache"])
+            .set($cf.prepopulate_block_cache as u64 as f64);
         $metrics
             .with_label_values(&[$tag, "format_version"])
             .set($cf.format_version.unwrap_or(2) as f64);
+        $metrics
+            .with_label_values(&[$tag, "checksum"])
+            .set($cf.checksum as u64 as f64);
+        $metrics
+            .with_label_values(&[$tag, "max_compactions"])
+            .set($cf.max_compactions.unwrap_or_default().into());
+        $metrics
+            .with_label_values(&[$tag, "ttl"])
+            .set($cf.ttl.unwrap_or_default().as_secs_f64());
+        $metrics
+            .with_label_values(&[$tag, "periodic_compaction_seconds"])
+            .set(
+                $cf.periodic_compaction_seconds
+                    .unwrap_or_default()
+                    .as_secs_f64(),
+            );
 
         // Titan specific metrics.
         $metrics
             .with_label_values(&[$tag, "titan_min_blob_size"])
             .set($cf.titan.min_blob_size.unwrap_or_default().0 as f64);
+        $metrics
+            .with_label_values(&[$tag, "titan_blob_file_compression"])
+            .set($cf.titan.blob_file_compression as u64 as f64);
+        $metrics
+            .with_label_values(&[$tag, "titan_zstd_dict_size"])
+            .set($cf.titan.zstd_dict_size.0 as f64);
+        $metrics
+            .with_label_values(&[$tag, "titan_shared_blob_cache"])
+            .set($cf.titan.shared_blob_cache.into());
+        $metrics
+            .with_label_values(&[$tag, "titan_blob_cache_size"])
+            .set($cf.titan.blob_cache_size.0 as f64);
         $metrics
             .with_label_values(&[$tag, "titan_min_gc_batch_size"])
             .set($cf.titan.min_gc_batch_size.0 as f64);
@@ -592,6 +654,18 @@ macro_rules! write_into_metrics {
         $metrics
             .with_label_values(&[$tag, "titan_merge_small_file_threshold"])
             .set($cf.titan.merge_small_file_threshold.0 as f64);
+        $metrics
+            .with_label_values(&[$tag, "titan_blob_run_mode"])
+            .set($cf.titan.blob_run_mode as u64 as f64);
+        $metrics
+            .with_label_values(&[$tag, "titan_level_merge"])
+            .set($cf.titan.level_merge.into());
+        $metrics
+            .with_label_values(&[$tag, "titan_range_merge"])
+            .set($cf.titan.range_merge.into());
+        $metrics
+            .with_label_values(&[$tag, "titan_max_sorted_runs"])
+            .set($cf.titan.max_sorted_runs.into());
     }};
 }
 
@@ -601,7 +675,8 @@ macro_rules! build_cf_opt {
         $cf_name:ident,
         $cache:expr,
         $compaction_limiter:expr,
-        $region_info_provider:ident
+        $region_info_provider:ident,
+        $force_partition_range_mgr:expr,
     ) => {{
         let mut block_base_opts = BlockBasedOptions::new();
         block_base_opts.set_block_size($opt.block_size.0 as usize);
@@ -653,9 +728,7 @@ macro_rules! build_cf_opt {
         cf_opts.set_max_bytes_for_level_base($opt.max_bytes_for_level_base.0);
         cf_opts.set_target_file_size_base($opt.target_file_size_base());
         cf_opts.set_level_zero_file_num_compaction_trigger($opt.level0_file_num_compaction_trigger);
-        cf_opts.set_level_zero_slowdown_writes_trigger(
-            $opt.level0_slowdown_writes_trigger.unwrap_or_default(),
-        );
+        cf_opts.set_level_zero_slowdown_writes_trigger($opt.level0_slowdown_writes_trigger);
         cf_opts.set_level_zero_stop_writes_trigger(
             $opt.level0_stop_writes_trigger.unwrap_or_default(),
         );
@@ -666,11 +739,7 @@ macro_rules! build_cf_opt {
         cf_opts.set_compaction_style($opt.compaction_style);
         cf_opts.set_disable_auto_compactions($opt.disable_auto_compactions);
         cf_opts.set_disable_write_stall($opt.disable_write_stall);
-        cf_opts.set_soft_pending_compaction_bytes_limit(
-            $opt.soft_pending_compaction_bytes_limit
-                .unwrap_or_default()
-                .0,
-        );
+        cf_opts.set_soft_pending_compaction_bytes_limit($opt.soft_pending_compaction_bytes_limit.0);
         cf_opts.set_hard_pending_compaction_bytes_limit(
             $opt.hard_pending_compaction_bytes_limit
                 .unwrap_or_default()
@@ -688,6 +757,7 @@ macro_rules! build_cf_opt {
                     provider.clone(),
                     $opt.compaction_guard_min_output_file_size.0,
                     $opt.max_compaction_bytes.0,
+                    $force_partition_range_mgr,
                 )
                 .unwrap();
                 cf_opts.set_sst_partitioner_factory(factory);
@@ -714,6 +784,7 @@ pub struct CfResources {
     pub cache: Cache,
     pub compaction_thread_limiters: HashMap<&'static str, ConcurrentTaskLimiter>,
     pub write_buffer_managers: HashMap<&'static str, Arc<WriteBufferManager>>,
+    pub force_partition_range_mgr: ForcePartitionRangeManager,
 }
 
 cf_config!(DefaultCfConfig);
@@ -751,7 +822,7 @@ impl Default for DefaultCfConfig {
             max_bytes_for_level_base: ReadableSize::mb(512),
             target_file_size_base: None,
             level0_file_num_compaction_trigger: 4,
-            level0_slowdown_writes_trigger: None,
+            level0_slowdown_writes_trigger: 20,
             level0_stop_writes_trigger: None,
             max_compaction_bytes: ReadableSize::gb(2),
             compaction_pri: CompactionPriority::MinOverlappingRatio,
@@ -761,7 +832,7 @@ impl Default for DefaultCfConfig {
             compaction_style: DBCompactionStyle::Level,
             disable_auto_compactions: false,
             disable_write_stall: false,
-            soft_pending_compaction_bytes_limit: None,
+            soft_pending_compaction_bytes_limit: ReadableSize::gb(192),
             hard_pending_compaction_bytes_limit: None,
             force_consistency_checks: false,
             prop_size_index_distance: DEFAULT_PROP_SIZE_INDEX_DISTANCE,
@@ -799,7 +870,8 @@ impl DefaultCfConfig {
             CF_DEFAULT,
             &shared.cache,
             shared.compaction_thread_limiters.get(CF_DEFAULT),
-            region_info_accessor
+            region_info_accessor,
+            shared.force_partition_range_mgr.clone(),
         );
         cf_opts.set_memtable_prefix_bloom_size_ratio(bloom_filter_ratio(for_engine));
         let f = RangePropertiesCollectorFactory {
@@ -921,7 +993,7 @@ impl Default for WriteCfConfig {
             max_bytes_for_level_base: ReadableSize::mb(512),
             target_file_size_base: None,
             level0_file_num_compaction_trigger: 4,
-            level0_slowdown_writes_trigger: None,
+            level0_slowdown_writes_trigger: 20,
             level0_stop_writes_trigger: None,
             max_compaction_bytes: ReadableSize::gb(2),
             compaction_pri: CompactionPriority::MinOverlappingRatio,
@@ -931,7 +1003,7 @@ impl Default for WriteCfConfig {
             compaction_style: DBCompactionStyle::Level,
             disable_auto_compactions: false,
             disable_write_stall: false,
-            soft_pending_compaction_bytes_limit: None,
+            soft_pending_compaction_bytes_limit: ReadableSize::gb(192),
             hard_pending_compaction_bytes_limit: None,
             force_consistency_checks: false,
             prop_size_index_distance: DEFAULT_PROP_SIZE_INDEX_DISTANCE,
@@ -968,7 +1040,8 @@ impl WriteCfConfig {
             CF_WRITE,
             &shared.cache,
             shared.compaction_thread_limiters.get(CF_WRITE),
-            region_info_accessor
+            region_info_accessor,
+            shared.force_partition_range_mgr.clone(),
         );
         // Prefix extractor(trim the timestamp at tail) for write cf.
         cf_opts
@@ -1041,7 +1114,7 @@ impl Default for LockCfConfig {
             max_bytes_for_level_base: ReadableSize::mb(128),
             target_file_size_base: None,
             level0_file_num_compaction_trigger: 1,
-            level0_slowdown_writes_trigger: None,
+            level0_slowdown_writes_trigger: 20,
             level0_stop_writes_trigger: None,
             max_compaction_bytes: ReadableSize::gb(2),
             compaction_pri: CompactionPriority::ByCompensatedSize,
@@ -1051,7 +1124,7 @@ impl Default for LockCfConfig {
             compaction_style: DBCompactionStyle::Level,
             disable_auto_compactions: false,
             disable_write_stall: false,
-            soft_pending_compaction_bytes_limit: None,
+            soft_pending_compaction_bytes_limit: ReadableSize::gb(192),
             hard_pending_compaction_bytes_limit: None,
             force_consistency_checks: false,
             prop_size_index_distance: DEFAULT_PROP_SIZE_INDEX_DISTANCE,
@@ -1088,7 +1161,8 @@ impl LockCfConfig {
             CF_LOCK,
             &shared.cache,
             shared.compaction_thread_limiters.get(CF_LOCK),
-            no_region_info_accessor
+            no_region_info_accessor,
+            Default::default(),
         );
         cf_opts
             .set_prefix_extractor("NoopSliceTransform", NoopSliceTransform)
@@ -1139,7 +1213,7 @@ impl Default for RaftCfConfig {
             max_bytes_for_level_base: ReadableSize::mb(128),
             target_file_size_base: None,
             level0_file_num_compaction_trigger: 1,
-            level0_slowdown_writes_trigger: None,
+            level0_slowdown_writes_trigger: 20,
             level0_stop_writes_trigger: None,
             max_compaction_bytes: ReadableSize::gb(2),
             compaction_pri: CompactionPriority::ByCompensatedSize,
@@ -1149,7 +1223,7 @@ impl Default for RaftCfConfig {
             compaction_style: DBCompactionStyle::Level,
             disable_auto_compactions: false,
             disable_write_stall: false,
-            soft_pending_compaction_bytes_limit: None,
+            soft_pending_compaction_bytes_limit: ReadableSize::gb(192),
             hard_pending_compaction_bytes_limit: None,
             force_consistency_checks: false,
             prop_size_index_distance: DEFAULT_PROP_SIZE_INDEX_DISTANCE,
@@ -1181,7 +1255,8 @@ impl RaftCfConfig {
             CF_RAFT,
             &shared.cache,
             shared.compaction_thread_limiters.get(CF_RAFT),
-            no_region_info_accessor
+            no_region_info_accessor,
+            Default::default(),
         );
         cf_opts
             .set_prefix_extractor("NoopSliceTransform", NoopSliceTransform)
@@ -1229,6 +1304,24 @@ impl TitanDbConfig {
     fn validate(&self) -> Result<(), Box<dyn Error>> {
         Ok(())
     }
+
+    fn write_into_metrics(&self) {
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["titan", "enabled"])
+            .set((self.enabled.unwrap_or_default() as i32).into());
+
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["titan", "disable_gc"])
+            .set((self.disable_gc as i32).into());
+
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["titan", "max_background_gc"])
+            .set(self.max_background_gc.into());
+
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["titan", "purge_obsolete_files_period_secs"])
+            .set(self.purge_obsolete_files_period.0.as_secs_f64());
+    }
 }
 
 #[derive(Clone, Serialize, Deserialize, PartialEq, Debug, OnlineConfig)]
@@ -1354,7 +1447,7 @@ impl Default for DbConfig {
             max_total_wal_size: None,
             max_background_jobs: 0,
             max_background_flushes: 0,
-            max_manifest_file_size: ReadableSize::mb(128),
+            max_manifest_file_size: ReadableSize::mb(256),
             create_if_missing: true,
             max_open_files: 40960,
             enable_statistics: true,
@@ -1560,7 +1653,11 @@ impl DbConfig {
         opts
     }
 
-    pub fn build_cf_resources(&self, cache: Cache) -> CfResources {
+    pub fn build_cf_resources(
+        &self,
+        cache: Cache,
+        force_partition_range_mgr: ForcePartitionRangeManager,
+    ) -> CfResources {
         let mut compaction_thread_limiters = HashMap::new();
         if let Some(n) = self.defaultcf.max_compactions
             && n > 0
@@ -1606,6 +1703,7 @@ impl DbConfig {
             cache,
             compaction_thread_limiters,
             write_buffer_managers,
+            force_partition_range_mgr,
         }
     }
 
@@ -1690,11 +1788,100 @@ impl DbConfig {
         Ok(())
     }
 
+    fn write_into_db_metrics(&self) {
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "wal_recovery_mode"])
+            .set(self.wal_recovery_mode as u64 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "wal_ttl_seconds"])
+            .set(self.wal_ttl_seconds as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "wal_size_limit"])
+            .set(self.wal_size_limit.0 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "max_total_wal_size"])
+            .set(self.max_total_wal_size.unwrap_or_default().0 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "max_background_jobs"])
+            .set(self.max_background_jobs.into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "max_background_flushes"])
+            .set(self.max_background_flushes.into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "max_manifest_file_size"])
+            .set(self.max_manifest_file_size.0 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "create_if_missing"])
+            .set(self.create_if_missing.into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "max_open_files"])
+            .set(self.max_open_files.into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "stats_dump_period"])
+            .set(self.stats_dump_period.unwrap_or_default().as_secs_f64());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "compaction_readahead_size"])
+            .set(self.compaction_readahead_size.0 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "rate_bytes_per_sec"])
+            .set(self.rate_bytes_per_sec.0 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "rate_limiter_refill_period"])
+            .set(self.rate_limiter_refill_period.as_secs_f64());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "rate_limiter_mode"])
+            .set(self.rate_limiter_mode as u64 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "rate_limiter_auto_tuned"])
+            .set(self.rate_limiter_auto_tuned.into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "bytes_per_sync"])
+            .set(self.bytes_per_sync.0 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "wal_bytes_per_sync"])
+            .set(self.wal_bytes_per_sync.0 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "max_sub_compactions"])
+            .set(self.max_sub_compactions.into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "writable_file_max_buffer_size"])
+            .set(self.writable_file_max_buffer_size.0 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "use_direct_io_for_flush_and_compaction"])
+            .set(self.use_direct_io_for_flush_and_compaction.into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "enable_pipelined_write"])
+            .set(self.enable_pipelined_write.into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "enable_multi_batch_write"])
+            .set(self.enable_multi_batch_write.unwrap_or_default().into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "enable_unordered_write"])
+            .set(self.enable_unordered_write.into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "allow_concurrent_memtable_write"])
+            .set(
+                self.allow_concurrent_memtable_write
+                    .unwrap_or_default()
+                    .into(),
+            );
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "write_buffer_limit"])
+            .set(self.write_buffer_limit.unwrap_or_default().0 as f64);
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "track_and_verify_wals_in_manifest"])
+            .set(self.track_and_verify_wals_in_manifest.into());
+        CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "paranoid_checks"])
+            .set(self.paranoid_checks.unwrap_or_default().into());
+    }
     fn write_into_metrics(&self) {
-        write_into_metrics!(self.defaultcf, CF_DEFAULT, CONFIG_ROCKSDB_GAUGE);
-        write_into_metrics!(self.lockcf, CF_LOCK, CONFIG_ROCKSDB_GAUGE);
-        write_into_metrics!(self.writecf, CF_WRITE, CONFIG_ROCKSDB_GAUGE);
-        write_into_metrics!(self.raftcf, CF_RAFT, CONFIG_ROCKSDB_GAUGE);
+        self.write_into_db_metrics();
+        write_into_cf_metrics!(self.defaultcf, CF_DEFAULT, CONFIG_ROCKSDB_CF_GAUGE);
+        write_into_cf_metrics!(self.lockcf, CF_LOCK, CONFIG_ROCKSDB_CF_GAUGE);
+        write_into_cf_metrics!(self.writecf, CF_WRITE, CONFIG_ROCKSDB_CF_GAUGE);
+        write_into_cf_metrics!(self.raftcf, CF_RAFT, CONFIG_ROCKSDB_CF_GAUGE);
+        self.titan.write_into_metrics();
     }
 }
 
@@ -1733,7 +1920,7 @@ impl Default for RaftDefaultCfConfig {
             max_bytes_for_level_base: ReadableSize::mb(512),
             target_file_size_base: None,
             level0_file_num_compaction_trigger: 4,
-            level0_slowdown_writes_trigger: None,
+            level0_slowdown_writes_trigger: 20,
             level0_stop_writes_trigger: None,
             max_compaction_bytes: ReadableSize::gb(2),
             compaction_pri: CompactionPriority::ByCompensatedSize,
@@ -1743,7 +1930,7 @@ impl Default for RaftDefaultCfConfig {
             compaction_style: DBCompactionStyle::Level,
             disable_auto_compactions: false,
             disable_write_stall: false,
-            soft_pending_compaction_bytes_limit: None,
+            soft_pending_compaction_bytes_limit: ReadableSize::gb(192),
             hard_pending_compaction_bytes_limit: None,
             force_consistency_checks: false,
             prop_size_index_distance: DEFAULT_PROP_SIZE_INDEX_DISTANCE,
@@ -1782,7 +1969,8 @@ impl RaftDefaultCfConfig {
             CF_DEFAULT,
             cache,
             limiter.as_ref(),
-            no_region_info_accessor
+            no_region_info_accessor,
+            Default::default(),
         );
         let f = FixedPrefixSliceTransform::new(region_raft_prefix_len());
         cf_opts
@@ -2072,7 +2260,7 @@ impl<D: ConfigurableDb> DbConfigManger<D> {
                 v => v.parse::<f64>(),
             };
             if let Ok(v) = cfg_value {
-                CONFIG_ROCKSDB_GAUGE
+                CONFIG_ROCKSDB_CF_GAUGE
                     .with_label_values(&[cf, cfg_name])
                     .set(v);
             }
@@ -2117,7 +2305,7 @@ impl<T: ConfigurableDb + Send + Sync> ConfigManager for DbConfigManger<T> {
         self.cfg.update(change.clone())?;
         let change_str = format!("{:?}", change);
         let mut change: Vec<(String, ConfigValue)> = change.into_iter().collect();
-        let cf_config = change.extract_if(|(name, _)| name.ends_with("cf"));
+        let cf_config = change.extract_if(.., |(name, _)| name.ends_with("cf"));
         for (cf_name, cf_change) in cf_config {
             if let ConfigValue::Module(mut cf_change) = cf_change {
                 // defaultcf -> default
@@ -2151,7 +2339,7 @@ impl<T: ConfigurableDb + Send + Sync> ConfigManager for DbConfigManger<T> {
         }
 
         if let Some(rate_bytes_config) = change
-            .extract_if(|(name, _)| name == "rate_bytes_per_sec")
+            .extract_if(.., |(name, _)| name == "rate_bytes_per_sec")
             .next()
         {
             let rate_bytes_per_sec: ReadableSize = rate_bytes_config.1.into();
@@ -2160,7 +2348,7 @@ impl<T: ConfigurableDb + Send + Sync> ConfigManager for DbConfigManger<T> {
         }
 
         if let Some(rate_bytes_config) = change
-            .extract_if(|(name, _)| name == "rate_limiter_auto_tuned")
+            .extract_if(.., |(name, _)| name == "rate_limiter_auto_tuned")
             .next()
         {
             let rate_limiter_auto_tuned: bool = rate_bytes_config.1.into();
@@ -2169,7 +2357,7 @@ impl<T: ConfigurableDb + Send + Sync> ConfigManager for DbConfigManger<T> {
         }
 
         if let Some(size) = change
-            .extract_if(|(name, _)| name == "write_buffer_limit")
+            .extract_if(.., |(name, _)| name == "write_buffer_limit")
             .next()
         {
             let size: ReadableSize = size.1.into();
@@ -2177,14 +2365,14 @@ impl<T: ConfigurableDb + Send + Sync> ConfigManager for DbConfigManger<T> {
         }
 
         if let Some(f) = change
-            .extract_if(|(name, _)| name == "write_buffer_flush_oldest_first")
+            .extract_if(.., |(name, _)| name == "write_buffer_flush_oldest_first")
             .next()
         {
             self.db.set_flush_oldest_first(f.1.into())?;
         }
 
         if let Some(background_jobs_config) = change
-            .extract_if(|(name, _)| name == "max_background_jobs")
+            .extract_if(.., |(name, _)| name == "max_background_jobs")
             .next()
         {
             let max_background_jobs: i32 = background_jobs_config.1.into();
@@ -2192,7 +2380,7 @@ impl<T: ConfigurableDb + Send + Sync> ConfigManager for DbConfigManger<T> {
         }
 
         if let Some(background_subcompactions_config) = change
-            .extract_if(|(name, _)| name == "max_sub_compactions")
+            .extract_if(.., |(name, _)| name == "max_sub_compactions")
             .next()
         {
             let max_subcompactions: u32 = background_subcompactions_config.1.into();
@@ -2201,7 +2389,7 @@ impl<T: ConfigurableDb + Send + Sync> ConfigManager for DbConfigManger<T> {
         }
 
         if let Some(background_flushes_config) = change
-            .extract_if(|(name, _)| name == "max_background_flushes")
+            .extract_if(.., |(name, _)| name == "max_background_flushes")
             .next()
         {
             let max_background_flushes: i32 = background_flushes_config.1.into();
@@ -3810,21 +3998,28 @@ impl TikvConfig {
             self.rocksdb.raftcf.disable_write_stall = true;
         }
         // Fill in values for unspecified write stall configurations.
+
         macro_rules! fill_cf_opts {
             ($cf_opts:expr, $cfg:expr) => {
-                if let Some(v) = &mut $cf_opts.level0_slowdown_writes_trigger {
-                    if $cfg.enable && *v > $cfg.l0_files_threshold as i32 {
-                        warn!(
-                            "{}.level0-slowdown-writes-trigger is too large. Setting it to \
-                            storage.flow-control.l0-files-threshold ({})",
-                            stringify!($cf_opts), $cfg.l0_files_threshold
-                        );
-                        *v = $cfg.l0_files_threshold as i32;
-                    }
-                } else {
-                    $cf_opts.level0_slowdown_writes_trigger =
-                        Some($cfg.l0_files_threshold as i32);
+                // Automatically override `level0_slowdown_writes_trigger` if it is set too high,
+                // to ensure that RocksDB's compaction speed-up mechanism can help avoid triggering flow control,
+                // since RocksDB starts speed up compaction when the number of L0 files reaches this threshold.
+                //
+                // For the same reason, when `l0-file-threshold` is set to a higher value, we do **not** override it,
+                // because we still want RocksDB's compaction speed-up mechanism to take effect—
+                // allowing compaction to proceed more quickly and smoothly, leading to more stable performance
+                // and avoiding issues like https://github.com/tikv/tikv/issues/18708.
+                if $cfg.enable && $cf_opts.level0_slowdown_writes_trigger > $cfg.l0_files_threshold as i32 {
+                    warn!(
+                        "{}.level0-slowdown-writes-trigger is too large. Setting it to \
+                        storage.flow-control.l0-files-threshold ({})",
+                        stringify!($cf_opts), $cfg.l0_files_threshold
+                    );
+                    $cf_opts.level0_slowdown_writes_trigger = $cfg.l0_files_threshold as i32;
                 }
+                // If unset, `level0_stop_writes_trigger` defaults to `l0_files_threshold`
+                // (unlike `level0_slowdown_writes_trigger`, which defaults to 20)  to ensure ingest_maybe_stall
+                // integrates properly with flow control for correctness on SST ingestion
                 if let Some(v) = &mut $cf_opts.level0_stop_writes_trigger {
                     if $cfg.enable && *v > $cfg.l0_files_threshold as i32 {
                         warn!(
@@ -3838,18 +4033,14 @@ impl TikvConfig {
                     $cf_opts.level0_stop_writes_trigger =
                         Some($cfg.l0_files_threshold as i32);
                 }
-                if let Some(v) = &mut $cf_opts.soft_pending_compaction_bytes_limit {
-                    if $cfg.enable && v.0 > $cfg.soft_pending_compaction_bytes_limit.0 {
-                        warn!(
-                            "{}.soft-pending-compaction-bytes-limit is too large. Setting it to \
-                            storage.flow-control.soft-pending-compaction-bytes-limit ({})",
-                            stringify!($cf_opts), $cfg.soft_pending_compaction_bytes_limit.0
-                        );
-                        *v = $cfg.soft_pending_compaction_bytes_limit;
-                    }
-                } else {
-                    $cf_opts.soft_pending_compaction_bytes_limit =
-                        Some($cfg.soft_pending_compaction_bytes_limit);
+                // The reason for automatically overriding it is the same as for `level0_slowdown_writes_trigger`.
+                if $cfg.enable && $cf_opts.soft_pending_compaction_bytes_limit.0 > $cfg.soft_pending_compaction_bytes_limit.0 {
+                    warn!(
+                        "{}.soft-pending-compaction-bytes-limit is too large. Setting it to \
+                        storage.flow-control.soft-pending-compaction-bytes-limit ({})",
+                        stringify!($cf_opts), $cfg.soft_pending_compaction_bytes_limit.0
+                    );
+                    $cf_opts.soft_pending_compaction_bytes_limit = $cfg.soft_pending_compaction_bytes_limit;
                 }
                 if let Some(v) = &mut $cf_opts.hard_pending_compaction_bytes_limit {
                     if $cfg.enable && v.0 > $cfg.hard_pending_compaction_bytes_limit.0 {
@@ -4122,10 +4313,58 @@ impl TikvConfig {
         Ok(())
     }
 
+    /// Adjusts the current configuration to maintain compatibility with the
+    /// last persisted configuration. This function performs two main tasks:
+    ///
+    /// 1. Checks for configuration inconsistencies between the current and last
+    ///    configuration, particularly for region size settings that have been
+    ///    moved from raftstore to coprocessor.
+    ///
+    /// 2. Inherits critical configuration values from the last configuration
+    ///    when appropriate, specifically:
+    ///    - For region size settings (max_size, split_size, max_keys,
+    ///      split_keys), inheritance only occurs if the current value is not
+    ///      manually specified
+    ///
+    /// # Parameters
+    ///
+    /// * `last_config` - An optional reference to the last persisted
+    ///   configuration. If `None`, default values will be used instead of
+    ///   inheritance.
+    ///
+    /// # Behavior
+    ///
+    /// * Region Size Settings:
+    ///   - If `raftstore.region-max-size` differs from the last config, it's
+    ///     considered deprecated and will be moved to
+    ///     `coprocessor.region-max-size` if not already set
+    ///   - If `raftstore.region-split-size` differs from the last config, it's
+    ///     considered deprecated and will be moved to
+    ///     `coprocessor.region-split-size` if not already set
+    /// # Examples
+    ///
+    /// ```rust
+    /// // Start with default configuration
+    /// let mut cfg = TikvConfig::default();
+    /// cfg.compatible_adjust(None); // Uses default values
+    ///
+    /// // Adjust with last configuration
+    /// let last_cfg = get_last_config();
+    /// cfg.compatible_adjust(Some(&last_cfg)); // Inherits values from last_cfg if needed
+    /// ```
     #[allow(deprecated)]
-    pub fn compatible_adjust(&mut self) {
-        let default_raft_store = RaftstoreConfig::default();
-        let default_coprocessor = CopConfig::default();
+    pub fn compatible_adjust(&mut self, last_config: Option<&TikvConfig>) {
+        let (default_raft_store, default_coprocessor) =
+            last_config.map_or((RaftstoreConfig::default(), CopConfig::default()), |cfg| {
+                (
+                    RaftstoreConfig {
+                        region_max_size: cfg.raft_store.region_max_size,
+                        region_split_size: cfg.raft_store.region_split_size,
+                        ..cfg.raft_store.clone()
+                    },
+                    cfg.coprocessor.clone(),
+                )
+            });
         if self.raft_store.region_max_size != default_raft_store.region_max_size {
             warn!(
                 "deprecated configuration, \
@@ -4154,6 +4393,21 @@ impl TikvConfig {
             }
             self.raft_store.region_split_size = default_raft_store.region_split_size;
         }
+        // If any one of the configurations, corresponsive for the size of region, not
+        // manully changed or set, TiKV should inherit the relative settings
+        // from the previous config file.
+        if self.coprocessor.region_max_size.is_none() {
+            self.coprocessor.region_max_size = default_coprocessor.region_max_size;
+        }
+        if self.coprocessor.region_max_keys.is_none() {
+            self.coprocessor.region_max_keys = default_coprocessor.region_max_keys;
+        }
+        if self.coprocessor.region_split_size.is_none() {
+            self.coprocessor.region_split_size = default_coprocessor.region_split_size;
+        }
+        if self.coprocessor.region_split_keys.is_none() {
+            self.coprocessor.region_split_keys = default_coprocessor.region_split_keys;
+        }
         if self.server.end_point_concurrency.is_some() {
             warn!(
                 "deprecated configuration, {} has been moved to {}",
@@ -4315,27 +4569,27 @@ impl TikvConfig {
             .raftdb
             .defaultcf
             .format_version
-            .map_or(false, |v| v > 5)
+            .is_some_and(|v| v > 5)
             || last_cfg
                 .rocksdb
                 .defaultcf
                 .format_version
-                .map_or(false, |v| v > 5)
+                .is_some_and(|v| v > 5)
             || last_cfg
                 .rocksdb
                 .writecf
                 .format_version
-                .map_or(false, |v| v > 5)
+                .is_some_and(|v| v > 5)
             || last_cfg
                 .rocksdb
                 .lockcf
                 .format_version
-                .map_or(false, |v| v > 5)
+                .is_some_and(|v| v > 5)
             || last_cfg
                 .rocksdb
                 .raftcf
                 .format_version
-                .map_or(false, |v| v > 5)
+                .is_some_and(|v| v > 5)
         {
             return Err("format_version larger than 5 is unsupported".into());
         }
@@ -4371,6 +4625,7 @@ impl TikvConfig {
     pub fn write_into_metrics(&self) {
         self.raft_store.write_into_metrics();
         self.rocksdb.write_into_metrics();
+        self.storage.flow_control.write_into_metrics();
     }
 
     pub fn with_tmp() -> Result<(TikvConfig, tempfile::TempDir), IoError> {
@@ -4425,13 +4680,24 @@ pub fn validate_and_persist_config(config: &mut TikvConfig, persist: bool) -> Re
     // changes, user must guarantee relevant works have been done.
     let mut last_cfg = get_last_config(&config.storage.data_dir);
     if let Some(last_cfg) = &mut last_cfg {
-        last_cfg.compatible_adjust();
+        // Validate and normalize the last persisted configuration to ensure it's in a
+        // consistent state before using it as a reference for inheritance. This helps
+        // prevent propagating invalid or deprecated settings to the current
+        // configuration.
+        last_cfg.compatible_adjust(None);
         if let Err(e) = last_cfg.validate() {
             warn!("last_tikv.toml is invalid but ignored: {:?}", e);
         }
+        // Inherit critical configuration values from the validated last configuration
+        // if they are not explicitly set in the current configuration. This ensures
+        // smooth upgrades while preserving user-specified settings.
+        config.compatible_adjust(Some(last_cfg));
+    } else {
+        // For newly deployed nodes or when no previous configuration exists,
+        // initialize with default values. No inheritance is needed in this case.
+        config.compatible_adjust(None);
     }
 
-    config.compatible_adjust();
     if let Err(e) = config.validate() {
         return Err(format!("invalid configuration: {}", e));
     }
@@ -4479,9 +4745,8 @@ pub fn persist_config(config: &TikvConfig) -> Result<(), String> {
     let last_cfg_path = store_path.join(LAST_CONFIG_FILE);
     let tmp_cfg_path = store_path.join(TMP_CONFIG_FILE);
 
-    let same_as_last_cfg = fs::read_to_string(&last_cfg_path).map_or(false, |last_cfg| {
-        toml::to_string(&config).unwrap() == last_cfg
-    });
+    let same_as_last_cfg = fs::read_to_string(&last_cfg_path)
+        .is_ok_and(|last_cfg| toml::to_string(&config).unwrap() == last_cfg);
     if same_as_last_cfg {
         return Ok(());
     }
@@ -4521,13 +4786,10 @@ pub fn write_config<P: AsRef<Path>>(path: P, content: &[u8]) -> CfgResult<()> {
     let tmp_cfg_path = match path.as_ref().parent() {
         Some(p) => p.join(TMP_CONFIG_FILE),
         None => {
-            return Err(Box::new(IoError::new(
-                ErrorKind::Other,
-                format!(
-                    "failed to get parent path of config file: {}",
-                    path.as_ref().display()
-                ),
-            )));
+            return Err(Box::new(IoError::other(format!(
+                "failed to get parent path of config file: {}",
+                path.as_ref().display()
+            ))));
         }
     };
     {
@@ -4700,35 +4962,32 @@ fn to_toml_encode(change: HashMap<String, String>) -> CfgResult<HashMap<String,
     fn helper(mut fields: Vec<String>, typed: &ConfigChange) -> CfgResult<bool> {
         if let Some(field) = fields.pop() {
             match typed.get(&field) {
-                None | Some(ConfigValue::Skip) => Err(Box::new(IoError::new(
-                    ErrorKind::Other,
-                    format!("failed to get field: {}", field),
-                ))),
+                None | Some(ConfigValue::Skip) => Err(Box::new(IoError::other(format!(
+                    "failed to get field: {}",
+                    field
+                )))),
                 Some(ConfigValue::Module(m)) => helper(fields, m),
                 Some(c) => {
                     if !fields.is_empty() {
-                        return Err(Box::new(IoError::new(
-                            ErrorKind::Other,
-                            format!("unexpect fields: {:?}", fields),
-                        )));
+                        return Err(Box::new(IoError::other(format!(
+                            "unexpect fields: {:?}",
+                            fields
+                        ))));
                     }
                     match c {
                         ConfigValue::Duration(_)
                         | ConfigValue::Size(_)
                         | ConfigValue::String(_) => Ok(true),
-                        ConfigValue::None => Err(Box::new(IoError::new(
-                            ErrorKind::Other,
-                            format!("unexpect none field: {:?}", c),
-                        ))),
+                        ConfigValue::None => Err(Box::new(IoError::other(format!(
+                            "unexpect none field: {:?}",
+                            c
+                        )))),
                         _ => Ok(false),
                     }
                 }
             }
         } else {
-            Err(Box::new(IoError::new(
-                ErrorKind::Other,
-                "failed to get field",
-            )))
+            Err(Box::new(IoError::other("failed to get field")))
         }
     }
     let mut dst = HashMap::new();
@@ -4948,7 +5207,7 @@ impl ConfigController {
 #[cfg(test)]
 mod tests {
     use std::{
-        sync::{mpsc::channel, Arc},
+        sync::{Arc, mpsc::channel},
         time::Duration,
     };
 
@@ -4977,21 +5236,21 @@ mod tests {
     use test_util::assert_eq_debug;
     use tikv_kv::RocksEngine as RocksDBEngine;
     use tikv_util::{
-        config::{VersionTrack, GIB},
+        config::{GIB, VersionTrack},
         logger::get_log_level,
         quota_limiter::{QuotaLimitConfigManager, QuotaLimiter},
         sys::SysQuota,
-        worker::{dummy_scheduler, ReceiverWrapper},
+        worker::{ReceiverWrapper, dummy_scheduler},
     };
 
     use super::*;
     use crate::{
         server::{config::ServerConfigManager, ttl::TtlCheckerTask},
         storage::{
+            Storage, TestStorageBuilder,
             config_manager::StorageConfigManger,
             lock_manager::MockLockManager,
             txn::flow_controller::{EngineFlowController, FlowController},
-            Storage, TestStorageBuilder,
         },
     };
 
@@ -5341,6 +5600,7 @@ mod tests {
 
         tikv_cfg.rocksdb.wal_dir = s1.clone();
         tikv_cfg.raftdb.wal_dir = s2.clone();
+        tikv_cfg.coprocessor.region_split_size = Some(ReadableSize::mb(16));
         tikv_cfg.write_to_file(file).unwrap();
         let cfg_from_file = TikvConfig::from_file(file, None).unwrap_or_else(|e| {
             panic!(
@@ -5365,6 +5625,10 @@ mod tests {
         });
         assert_eq!(cfg_from_file.rocksdb.wal_dir, s2);
         assert_eq!(cfg_from_file.raftdb.wal_dir, s1);
+        assert_eq!(
+            cfg_from_file.coprocessor.region_split_size.unwrap(),
+            tikv_cfg.coprocessor.region_split_size.unwrap()
+        );
     }
 
     #[test]
@@ -5501,6 +5765,94 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_write_metrics() {
+        use raftstore::store::config::CONFIG_RAFTSTORE_GAUGE;
+        let mut cfg = TikvConfig::default();
+        cfg.rocksdb.max_background_jobs = 5;
+        cfg.rocksdb.wal_recovery_mode = DBRecoveryMode::SkipAnyCorruptedRecords;
+        cfg.rocksdb.defaultcf.block_size = ReadableSize::kb(64);
+        cfg.raft_store.inspect_interval = ReadableDuration::secs(15);
+        cfg.raft_store.reactive_memory_lock_tick_interval = ReadableDuration::secs(3);
+        cfg.raft_store.reactive_memory_lock_timeout_tick = 10;
+        cfg.raft_store.report_region_buckets_tick_interval = ReadableDuration::secs(20);
+        cfg.raft_store.max_entry_cache_warmup_duration = ReadableDuration::secs(60);
+        cfg.raft_store.unreachable_backoff = ReadableDuration::secs(5);
+        cfg.validate().unwrap();
+
+        CONFIG_ROCKSDB_DB_GAUGE.reset();
+        CONFIG_ROCKSDB_CF_GAUGE.reset();
+        CONFIG_RAFTSTORE_GAUGE.reset();
+
+        cfg.write_into_metrics();
+
+        let wal_mode_value = CONFIG_ROCKSDB_DB_GAUGE
+            .with_label_values(&["rocksdb", "wal_recovery_mode"])
+            .get();
+        assert_eq!(
+            wal_mode_value as u64,
+            DBRecoveryMode::SkipAnyCorruptedRecords as u64
+        );
+
+        let block_size_value = CONFIG_ROCKSDB_CF_GAUGE
+            .with_label_values(&["default", "block_size"])
+            .get();
+        assert_eq!(block_size_value as u64, ReadableSize::kb(64).0);
+
+        let max_bytes_for_level_base = CONFIG_ROCKSDB_CF_GAUGE
+            .with_label_values(&["default", "max_bytes_for_level_base"])
+            .get();
+        assert_eq!(
+            max_bytes_for_level_base as u64,
+            cfg.rocksdb.defaultcf.max_bytes_for_level_base.0
+        );
+
+        let compression_level_0 = CONFIG_ROCKSDB_CF_GAUGE
+            .with_label_values(&["default", "compression_level_0"])
+            .get();
+        assert_eq!(
+            compression_level_0 as u64,
+            cfg.rocksdb.defaultcf.compression_per_level[0] as u64
+        );
+        let disable_auto_compactions = CONFIG_ROCKSDB_CF_GAUGE
+            .with_label_values(&["default", "disable_auto_compactions"])
+            .get();
+        assert_eq!(
+            disable_auto_compactions as u64,
+            cfg.rocksdb.defaultcf.disable_auto_compactions as u64
+        );
+
+        let inspect_interval = CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["inspect_interval"])
+            .get();
+        assert_eq!(inspect_interval, 15.0);
+
+        let reactive_tick = CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["reactive_memory_lock_tick_interval"])
+            .get();
+        assert_eq!(reactive_tick, 3.0);
+
+        let reactive_timeout = CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["reactive_memory_lock_timeout_tick"])
+            .get();
+        assert_eq!(reactive_timeout, 10.0);
+
+        let region_buckets = CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["report_region_buckets_tick_interval"])
+            .get();
+        assert_eq!(region_buckets, 20.0);
+
+        let warmup_duration = CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["max_entry_cache_warmup_duration"])
+            .get();
+        assert_eq!(warmup_duration, 60.0);
+
+        let unreachable_backoff = CONFIG_RAFTSTORE_GAUGE
+            .with_label_values(&["unreachable_backoff"])
+            .get();
+        assert_eq!(unreachable_backoff, 5.0);
+    }
+
     #[test]
     fn test_to_config_change() {
         assert_eq!(
@@ -5628,8 +5980,10 @@ mod tests {
             &cfg.infer_kv_engine_path(None).unwrap(),
             Some(cfg.rocksdb.build_opt(&resource, cfg.storage.engine)),
             cfg.rocksdb.build_cf_opts(
-                &cfg.rocksdb
-                    .build_cf_resources(cfg.storage.block_cache.build_shared_cache()),
+                &cfg.rocksdb.build_cf_resources(
+                    cfg.storage.block_cache.build_shared_cache(),
+                    Default::default(),
+                ),
                 None,
                 cfg.storage.api_version(),
                 None,
@@ -5680,55 +6034,6 @@ mod tests {
         (storage, cfg_controller, receiver, flow_controller)
     }
 
-    #[test]
-    fn test_flow_control() {
-        let (mut cfg, _dir) = TikvConfig::with_tmp().unwrap();
-        cfg.storage.flow_control.l0_files_threshold = 50;
-        cfg.validate().unwrap();
-        let (storage, cfg_controller, _, flow_controller) = new_engines::<ApiV1>(cfg);
-        let db = storage.get_engine().get_rocksdb();
-        assert_eq!(
-            db.get_options_cf(CF_DEFAULT)
-                .unwrap()
-                .get_level_zero_slowdown_writes_trigger(),
-            50
-        );
-        assert_eq!(
-            db.get_options_cf(CF_DEFAULT)
-                .unwrap()
-                .get_level_zero_stop_writes_trigger(),
-            50
-        );
-
-        assert_eq!(
-            db.get_options_cf(CF_DEFAULT)
-                .unwrap()
-                .get_disable_write_stall(),
-            true
-        );
-        assert_eq!(flow_controller.enabled(), true);
-        cfg_controller
-            .update_config("storage.flow-control.enable", "false")
-            .unwrap();
-        assert_eq!(
-            db.get_options_cf(CF_DEFAULT)
-                .unwrap()
-                .get_disable_write_stall(),
-            false
-        );
-        assert_eq!(flow_controller.enabled(), false);
-        cfg_controller
-            .update_config("storage.flow-control.enable", "true")
-            .unwrap();
-        assert_eq!(
-            db.get_options_cf(CF_DEFAULT)
-                .unwrap()
-                .get_disable_write_stall(),
-            true
-        );
-        assert_eq!(flow_controller.enabled(), true);
-    }
-
     struct MockCfgManager(Box<dyn Fn(ConfigChange) + Send + Sync>);
 
     impl ConfigManager for MockCfgManager {
@@ -6500,11 +6805,11 @@ mod tests {
         // the same effect as calling `compatible_adjust` and `validate` one time
         let mut c = TikvConfig::default();
         let mut cfg = c.clone();
-        c.compatible_adjust();
+        c.compatible_adjust(None);
         c.validate().unwrap();
 
         for _ in 0..10 {
-            cfg.compatible_adjust();
+            cfg.compatible_adjust(None);
             cfg.validate().unwrap();
             assert_eq_debug(&c, &cfg);
         }
@@ -6517,7 +6822,7 @@ mod tests {
         [readpool.coprocessor]
         "#;
         let mut cfg: TikvConfig = toml::from_str(content).unwrap();
-        cfg.compatible_adjust();
+        cfg.compatible_adjust(None);
         assert_eq!(cfg.readpool.storage.use_unified_pool, Some(true));
         assert_eq!(cfg.readpool.coprocessor.use_unified_pool, Some(true));
 
@@ -6528,7 +6833,7 @@ mod tests {
         normal-concurrency = 1
         "#;
         let mut cfg: TikvConfig = toml::from_str(content).unwrap();
-        cfg.compatible_adjust();
+        cfg.compatible_adjust(None);
         assert_eq!(cfg.readpool.storage.use_unified_pool, Some(false));
         assert_eq!(cfg.readpool.coprocessor.use_unified_pool, Some(false));
     }
@@ -6596,7 +6901,14 @@ mod tests {
             ..Default::default()
         };
         let provider = Some(MockRegionInfoProvider::new(vec![]));
-        let cf_opts = build_cf_opt!(config, CF_DEFAULT, &cache, no_limiter.as_ref(), provider);
+        let cf_opts = build_cf_opt!(
+            config,
+            CF_DEFAULT,
+            &cache,
+            no_limiter.as_ref(),
+            provider,
+            Default::default(),
+        );
         assert_eq!(
             config.target_file_size_base(),
             cf_opts.get_target_file_size_base()
@@ -6609,7 +6921,14 @@ mod tests {
             ..Default::default()
         };
         let provider: Option<MockRegionInfoProvider> = None;
-        let cf_opts = build_cf_opt!(config, CF_DEFAULT, &cache, no_limiter.as_ref(), provider);
+        let cf_opts = build_cf_opt!(
+            config,
+            CF_DEFAULT,
+            &cache,
+            no_limiter.as_ref(),
+            provider,
+            Default::default(),
+        );
         assert_eq!(
             config.target_file_size_base(),
             cf_opts.get_target_file_size_base()
@@ -6624,7 +6943,14 @@ mod tests {
             ..Default::default()
         };
         let provider = Some(MockRegionInfoProvider::new(vec![]));
-        let cf_opts = build_cf_opt!(config, CF_DEFAULT, &cache, no_limiter.as_ref(), provider);
+        let cf_opts = build_cf_opt!(
+            config,
+            CF_DEFAULT,
+            &cache,
+            no_limiter.as_ref(),
+            provider,
+            Default::default(),
+        );
         assert_eq!(
             config.compaction_guard_max_output_file_size.0,
             cf_opts.get_target_file_size_base()
@@ -7033,6 +7359,8 @@ mod tests {
             default_cfg.readpool.coprocessor.normal_concurrency;
         cfg.readpool.coprocessor.low_concurrency = default_cfg.readpool.coprocessor.low_concurrency;
         cfg.server.grpc_memory_pool_quota = default_cfg.server.grpc_memory_pool_quota;
+        cfg.server.grpc_concurrency = default_cfg.server.grpc_concurrency;
+        cfg.server.grpc_raft_conn_num = default_cfg.server.grpc_raft_conn_num;
         cfg.server.background_thread_count = default_cfg.server.background_thread_count;
         cfg.server.end_point_max_concurrency = default_cfg.server.end_point_max_concurrency;
         cfg.server.end_point_memory_quota = default_cfg.server.end_point_memory_quota;
@@ -7086,7 +7414,6 @@ mod tests {
         default_cfg.rocksdb.lockcf.target_file_size_base = Some(ReadableSize::mb(8));
         default_cfg.rocksdb.lockcf.write_buffer_size = Some(ReadableSize::mb(32));
         default_cfg.raftdb.defaultcf.target_file_size_base = Some(ReadableSize::mb(8));
-        default_cfg.raft_store.region_compact_check_step = Some(100);
         default_cfg.rocksdb.titan.enabled = Some(true);
 
         // Other special cases.
@@ -7105,11 +7432,11 @@ mod tests {
         cfg.rocksdb.raftcf.enable_compaction_guard = None;
         cfg.raftdb.defaultcf.enable_compaction_guard = None;
         //
-        cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger = None;
-        cfg.rocksdb.writecf.level0_slowdown_writes_trigger = None;
-        cfg.rocksdb.lockcf.level0_slowdown_writes_trigger = None;
-        cfg.rocksdb.raftcf.level0_slowdown_writes_trigger = None;
-        cfg.raftdb.defaultcf.level0_slowdown_writes_trigger = None;
+        cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger = 20;
+        cfg.rocksdb.writecf.level0_slowdown_writes_trigger = 20;
+        cfg.rocksdb.lockcf.level0_slowdown_writes_trigger = 20;
+        cfg.rocksdb.raftcf.level0_slowdown_writes_trigger = 20;
+        cfg.raftdb.defaultcf.level0_slowdown_writes_trigger = 20;
         //
         cfg.rocksdb.defaultcf.level0_stop_writes_trigger = None;
         cfg.rocksdb.writecf.level0_stop_writes_trigger = None;
@@ -7117,11 +7444,11 @@ mod tests {
         cfg.rocksdb.raftcf.level0_stop_writes_trigger = None;
         cfg.raftdb.defaultcf.level0_stop_writes_trigger = None;
         //
-        cfg.rocksdb.defaultcf.soft_pending_compaction_bytes_limit = None;
-        cfg.rocksdb.writecf.soft_pending_compaction_bytes_limit = None;
-        cfg.rocksdb.lockcf.soft_pending_compaction_bytes_limit = None;
-        cfg.rocksdb.raftcf.soft_pending_compaction_bytes_limit = None;
-        cfg.raftdb.defaultcf.soft_pending_compaction_bytes_limit = None;
+        cfg.rocksdb.defaultcf.soft_pending_compaction_bytes_limit = ReadableSize::gb(192);
+        cfg.rocksdb.writecf.soft_pending_compaction_bytes_limit = ReadableSize::gb(192);
+        cfg.rocksdb.lockcf.soft_pending_compaction_bytes_limit = ReadableSize::gb(192);
+        cfg.rocksdb.raftcf.soft_pending_compaction_bytes_limit = ReadableSize::gb(192);
+        cfg.raftdb.defaultcf.soft_pending_compaction_bytes_limit = ReadableSize::gb(192);
         //
         cfg.rocksdb.defaultcf.hard_pending_compaction_bytes_limit = None;
         cfg.rocksdb.writecf.hard_pending_compaction_bytes_limit = None;
@@ -7231,6 +7558,126 @@ mod tests {
         assert!(default_cfg.coprocessor.enable_region_bucket());
     }
 
+    #[test]
+    fn test_inherit_region_size_config() {
+        let default_cfg = TikvConfig::default();
+
+        // Case 1: start with empty settings
+        let (mut cfg, _dir) = TikvConfig::with_tmp().unwrap();
+        cfg.compatible_adjust(None);
+        assert_eq!(
+            default_cfg.coprocessor.region_max_size,
+            cfg.coprocessor.region_max_size
+        );
+        assert_eq!(
+            default_cfg.coprocessor.region_split_size,
+            cfg.coprocessor.region_split_size
+        );
+
+        // Case 2: persist and load the last tikv configurations, then make the current
+        // config compatible to it. And it manually set `raft_entry_max_size` in
+        // Raftstore, but the new config does not set it.
+        cfg.coprocessor.region_split_size = Some(ReadableSize::mb(16));
+        cfg.raft_store.raft_entry_max_size = ReadableSize::kb(16);
+        validate_and_persist_config(&mut cfg, true).unwrap();
+        let cfg_from_file = TikvConfig::from_file(
+            &Path::new(&cfg.storage.data_dir).join(LAST_CONFIG_FILE),
+            None,
+        )
+        .unwrap();
+        assert!(
+            cfg_from_file.coprocessor.region_max_size.is_some()
+                && cfg_from_file.coprocessor.region_max_keys.is_some()
+        );
+        assert_eq!(
+            cfg_from_file.coprocessor.region_split_size,
+            cfg.coprocessor.region_split_size
+        );
+        let mut case2_cfg = TikvConfig::default();
+        case2_cfg.compatible_adjust(Some(&cfg_from_file));
+        assert_eq!(
+            cfg_from_file.coprocessor.region_max_size,
+            case2_cfg.coprocessor.region_max_size
+        );
+        assert_eq!(
+            cfg_from_file.coprocessor.region_split_size,
+            case2_cfg.coprocessor.region_split_size
+        );
+        assert_eq!(
+            cfg_from_file.coprocessor.region_max_keys,
+            case2_cfg.coprocessor.region_max_keys
+        );
+        assert_eq!(
+            cfg_from_file.coprocessor.region_split_keys,
+            case2_cfg.coprocessor.region_split_keys
+        );
+        // Other configs in RaftstoreConfig should not
+        // inherit the last config.
+        assert_eq!(
+            default_cfg.raft_store.raft_entry_max_size,
+            case2_cfg.raft_store.raft_entry_max_size
+        );
+        assert_ne!(
+            cfg_from_file.raft_store.raft_entry_max_size,
+            case2_cfg.raft_store.raft_entry_max_size
+        );
+
+        // Case 3: manually specify region-split-size, then make it compatible to the
+        // last config. The current configuration should inherit the remained configs.
+        let content = r#"
+        [coprocessor]
+        region-split-size = "32MiB"
+        "#;
+        let mut case3_cfg: TikvConfig = toml::from_str(content).unwrap();
+        case3_cfg.compatible_adjust(None);
+        assert_eq!(
+            case3_cfg.coprocessor.region_split_size,
+            Some(ReadableSize::mb(32))
+        );
+        case3_cfg.compatible_adjust(Some(&cfg_from_file));
+        assert_eq!(
+            case3_cfg.coprocessor.region_split_size,
+            Some(ReadableSize::mb(32))
+        );
+        assert_eq!(
+            cfg_from_file.coprocessor.region_max_size,
+            case3_cfg.coprocessor.region_max_size
+        );
+        assert_eq!(
+            cfg_from_file.coprocessor.region_max_keys,
+            case3_cfg.coprocessor.region_max_keys
+        );
+        assert_eq!(
+            cfg_from_file.coprocessor.region_split_keys,
+            case3_cfg.coprocessor.region_split_keys
+        );
+        // Invalid configuration as `regions-split-size` > inherited.`region-max-size`
+        case3_cfg.coprocessor.validate(false).unwrap_err();
+
+        // Case 4: all settings are manually changed in the current config file,
+        // then make it compatible to the last config. The current
+        // configuration should not be changed.
+        let content = r#"
+        [coprocessor]
+        region-split-size = "24MiB"
+        region-max-size = "32MiB"
+        region-split-keys = 24000
+        region-max-keys = 32000
+        "#;
+        let mut case4_cfg: TikvConfig = toml::from_str(content).unwrap();
+        case4_cfg.compatible_adjust(Some(&cfg_from_file));
+        assert_eq!(
+            case4_cfg.coprocessor.region_split_size,
+            Some(ReadableSize::mb(24))
+        );
+        assert_eq!(
+            case4_cfg.coprocessor.region_max_size,
+            Some(ReadableSize::mb(32))
+        );
+        assert_eq!(case4_cfg.coprocessor.region_split_keys, Some(24000));
+        assert_eq!(case4_cfg.coprocessor.region_max_keys, Some(32000));
+    }
+
     #[test]
     fn test_compatibility_with_old_config_template() {
         let mut buf = Vec::new();
@@ -7465,151 +7912,182 @@ mod tests {
     }
 
     #[test]
-    fn test_flow_control_override() {
+    fn test_flow_control() {
+        let (mut cfg, _dir) = TikvConfig::with_tmp().unwrap();
+        cfg.storage.flow_control.l0_files_threshold = 50;
+        cfg.validate().unwrap();
+        let (storage, cfg_controller, _, flow_controller) = new_engines::<ApiV1>(cfg);
+        let db = storage.get_engine().get_rocksdb();
+        // level0_slowdown_writes_trigger should preserve its default value (20) when
+        // it's smaller than l0_files_threshold (50), only override if it's too
+        // large
+        assert_eq!(
+            db.get_options_cf(CF_DEFAULT)
+                .unwrap()
+                .get_level_zero_slowdown_writes_trigger(),
+            20 // Default value preserved since 20 < 50 (l0_files_threshold)
+        );
+        // level0_stop_writes_trigger is overridden for flow control correctness
+        assert_eq!(
+            db.get_options_cf(CF_DEFAULT)
+                .unwrap()
+                .get_level_zero_stop_writes_trigger(),
+            50
+        );
+
+        assert_eq!(
+            db.get_options_cf(CF_DEFAULT)
+                .unwrap()
+                .get_disable_write_stall(),
+            true
+        );
+        assert_eq!(flow_controller.enabled(), true);
+        cfg_controller
+            .update_config("storage.flow-control.enable", "false")
+            .unwrap();
+        assert_eq!(
+            db.get_options_cf(CF_DEFAULT)
+                .unwrap()
+                .get_disable_write_stall(),
+            false
+        );
+        assert_eq!(flow_controller.enabled(), false);
+        cfg_controller
+            .update_config("storage.flow-control.enable", "true")
+            .unwrap();
+        assert_eq!(
+            db.get_options_cf(CF_DEFAULT)
+                .unwrap()
+                .get_disable_write_stall(),
+            true
+        );
+        assert_eq!(flow_controller.enabled(), true);
+    }
+
+    #[test]
+    fn test_flow_control_override_with_default_values() {
+        // When flow control thresholds are higher than defaults, preserve default
+        // values
         let content = r#"
             [storage.flow-control]
             enable = true
-            l0-files-threshold = 77
-            soft-pending-compaction-bytes-limit = "777GB"
+            l0-files-threshold = 50
+            soft-pending-compaction-bytes-limit = "300GB"
+            hard-pending-compaction-bytes-limit = "500GB"
         "#;
         let mut cfg: TikvConfig = toml::from_str(content).unwrap();
         cfg.validate().unwrap();
+
+        // level0_slowdown_writes_trigger default (20) < l0_files_threshold (50), should
+        // be preserved
+        assert_eq!(cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger, 20);
+        // level0_stop_writes_trigger should always be set to flow control threshold
+        assert_eq!(cfg.rocksdb.defaultcf.level0_stop_writes_trigger, Some(50));
+        // soft_pending_compaction_bytes_limit default (192GB) < flow control limit
+        // (300GB), should be preserved
         assert_eq!(
-            cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger,
-            Some(77)
+            cfg.rocksdb.defaultcf.soft_pending_compaction_bytes_limit,
+            ReadableSize::gb(192)
         );
+        // hard_pending_compaction_bytes_limit should always be set to flow control
+        // threshold
         assert_eq!(
-            cfg.rocksdb.defaultcf.soft_pending_compaction_bytes_limit,
-            Some(ReadableSize::gb(777))
+            cfg.rocksdb.defaultcf.hard_pending_compaction_bytes_limit,
+            Some(ReadableSize::gb(500))
         );
+    }
 
-        // Override with default values if flow control is disabled.
+    #[test]
+    fn test_flow_control_override_disabled() {
+        // When flow control is disabled, preserve all user configurations
         let content = r#"
             [storage.flow-control]
             enable = false
-            l0-files-threshold = 77
-            soft-pending-compaction-bytes-limit = "777GB"
+            l0-files-threshold = 10
+            soft-pending-compaction-bytes-limit = "100GB"
+            hard-pending-compaction-bytes-limit = "200GB"
             [rocksdb.defaultcf]
             level0-slowdown-writes-trigger = 888
+            level0-stop-writes-trigger = 999
             soft-pending-compaction-bytes-limit = "888GB"
-            [rocksdb.writecf]
+            hard-pending-compaction-bytes-limit = "999GB"
         "#;
         let mut cfg: TikvConfig = toml::from_str(content).unwrap();
         cfg.validate().unwrap();
+
+        // All user configurations should be preserved when flow control is disabled
+        assert_eq!(cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger, 888);
+        assert_eq!(cfg.rocksdb.defaultcf.level0_stop_writes_trigger, Some(999));
         assert_eq!(
-            cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger,
-            Some(888)
+            cfg.rocksdb.defaultcf.soft_pending_compaction_bytes_limit,
+            ReadableSize::gb(888)
         );
         assert_eq!(
-            cfg.rocksdb.defaultcf.soft_pending_compaction_bytes_limit,
-            Some(ReadableSize::gb(888))
+            cfg.rocksdb.defaultcf.hard_pending_compaction_bytes_limit,
+            Some(ReadableSize::gb(999))
         );
-        matches!(cfg.rocksdb.writecf.level0_slowdown_writes_trigger, Some(v) if v != 77);
-        matches!(cfg.rocksdb.writecf.soft_pending_compaction_bytes_limit, Some(v) if v != ReadableSize::gb(777));
+    }
 
-        // Do not override when RocksDB configurations are specified.
+    #[test]
+    fn test_flow_control_override_user_config_preserved() {
+        // When user config is smaller than flow control threshold, preserve user values
         let content = r#"
             [storage.flow-control]
             enable = true
             l0-files-threshold = 77
             soft-pending-compaction-bytes-limit = "777GB"
+            hard-pending-compaction-bytes-limit = "888GB"
             [rocksdb.defaultcf]
             level0-slowdown-writes-trigger = 66
+            level0-stop-writes-trigger = 70
             soft-pending-compaction-bytes-limit = "666GB"
+            hard-pending-compaction-bytes-limit = "800GB"
         "#;
         let mut cfg: TikvConfig = toml::from_str(content).unwrap();
         cfg.validate().unwrap();
+
+        // User configs smaller than flow control thresholds should be preserved
+        assert_eq!(cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger, 66);
+        assert_eq!(cfg.rocksdb.defaultcf.level0_stop_writes_trigger, Some(70));
         assert_eq!(
-            cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger,
-            Some(66)
+            cfg.rocksdb.defaultcf.soft_pending_compaction_bytes_limit,
+            ReadableSize::gb(666)
         );
         assert_eq!(
-            cfg.rocksdb.defaultcf.soft_pending_compaction_bytes_limit,
-            Some(ReadableSize::gb(666))
+            cfg.rocksdb.defaultcf.hard_pending_compaction_bytes_limit,
+            Some(ReadableSize::gb(800))
         );
+    }
 
-        // Cannot specify larger configurations for RocksDB.
+    #[test]
+    fn test_flow_control_override_user_config_too_large() {
+        // When user config is larger than flow control threshold, override with
+        // threshold
         let content = r#"
             [storage.flow-control]
             enable = true
-            l0-files-threshold = 1
-            soft-pending-compaction-bytes-limit = "1GB"
+            l0-files-threshold = 10
+            soft-pending-compaction-bytes-limit = "50GB"
+            hard-pending-compaction-bytes-limit = "100GB"
             [rocksdb.defaultcf]
             level0-slowdown-writes-trigger = 88
+            level0-stop-writes-trigger = 99
             soft-pending-compaction-bytes-limit = "888GB"
+            hard-pending-compaction-bytes-limit = "999GB"
         "#;
         let mut cfg: TikvConfig = toml::from_str(content).unwrap();
         cfg.validate().unwrap();
-        assert_eq!(
-            cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger,
-            Some(1)
-        );
-        assert_eq!(
-            cfg.rocksdb.defaultcf.soft_pending_compaction_bytes_limit,
-            Some(ReadableSize::gb(1))
-        );
-    }
 
-    #[test]
-    fn test_compact_check_default() {
-        let content = r#"
-            [raftstore]
-            region-compact-check-step = 50
-        "#;
-        let mut cfg: TikvConfig = toml::from_str(content).unwrap();
-        cfg.validate().unwrap();
-        assert_eq!(cfg.raft_store.region_compact_check_step.unwrap(), 50);
+        // User configs larger than flow control thresholds should be overridden
+        assert_eq!(cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger, 10);
+        assert_eq!(cfg.rocksdb.defaultcf.level0_stop_writes_trigger, Some(10));
         assert_eq!(
-            cfg.raft_store
-                .region_compact_redundant_rows_percent
-                .unwrap(),
-            20
-        );
-
-        let content = r#"
-            [raftstore]
-            region-compact-check-step = 50
-            [storage]
-            engine = "partitioned-raft-kv"
-        "#;
-        let mut cfg: TikvConfig = toml::from_str(content).unwrap();
-        cfg.validate().unwrap();
-        assert_eq!(cfg.raft_store.region_compact_check_step.unwrap(), 50);
-        assert_eq!(
-            cfg.raft_store
-                .region_compact_redundant_rows_percent
-                .unwrap(),
-            20
-        );
-
-        let content = r#"
-            [raftstore]
-            region-compact-redundant-rows-percent = 50
-        "#;
-        let mut cfg: TikvConfig = toml::from_str(content).unwrap();
-        cfg.validate().unwrap();
-        assert_eq!(cfg.raft_store.region_compact_check_step.unwrap(), 100);
-        assert_eq!(
-            cfg.raft_store
-                .region_compact_redundant_rows_percent
-                .unwrap(),
-            50
+            cfg.rocksdb.defaultcf.soft_pending_compaction_bytes_limit,
+            ReadableSize::gb(50)
         );
-
-        let content = r#"
-            [raftstore]
-            region-compact-redundant-rows-percent = 50
-            [storage]
-            engine = "partitioned-raft-kv"
-        "#;
-        let mut cfg: TikvConfig = toml::from_str(content).unwrap();
-        cfg.validate().unwrap();
-        assert_eq!(cfg.raft_store.region_compact_check_step.unwrap(), 5);
         assert_eq!(
-            cfg.raft_store
-                .region_compact_redundant_rows_percent
-                .unwrap(),
-            50
+            cfg.rocksdb.defaultcf.hard_pending_compaction_bytes_limit,
+            Some(ReadableSize::gb(100))
         );
     }
 
diff --git a/src/coprocessor/checksum.rs b/src/coprocessor/checksum.rs
index 3778f549427..c09d370e275 100644
--- a/src/coprocessor/checksum.rs
+++ b/src/coprocessor/checksum.rs
@@ -1,12 +1,12 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use api_version::{keyspace::KvPair, ApiV1};
+use api_version::{ApiV1, keyspace::KvPair};
 use async_trait::async_trait;
 use kvproto::coprocessor::{KeyRange, Response};
 use protobuf::Message;
 use tidb_query_common::storage::{
-    scanner::{RangesScanner, RangesScannerOptions},
     Range,
+    scanner::{RangesScanner, RangesScannerOptions},
 };
 use tikv_alloc::trace::MemoryTraceGuard;
 use tipb::{ChecksumAlgorithm, ChecksumRequest, ChecksumResponse};
diff --git a/src/coprocessor/dag/mod.rs b/src/coprocessor/dag/mod.rs
index bd077c5c0ba..9c151f6f9e7 100644
--- a/src/coprocessor/dag/mod.rs
+++ b/src/coprocessor/dag/mod.rs
@@ -6,23 +6,36 @@ use std::{marker::PhantomData, sync::Arc};
 
 use api_version::KvFormat;
 use async_trait::async_trait;
-use kvproto::coprocessor::{KeyRange, Response};
+use kvproto::{
+    coprocessor::{KeyRange, Response},
+    metapb::Region,
+};
 use protobuf::Message;
-use tidb_query_common::{execute_stats::ExecSummary, storage::IntervalRange};
+use tidb_query_common::{
+    execute_stats::ExecSummary,
+    storage,
+    storage::{FindRegionResult, IntervalRange, RegionStorageAccessor},
+};
 use tikv_alloc::trace::MemoryTraceGuard;
 use tipb::{DagRequest, SelectResponse, StreamResponse};
 
 pub use self::storage_impl::TikvStorage;
 use crate::{
-    coprocessor::{metrics::*, Deadline, RequestHandler, Result},
+    coprocessor::{Deadline, RequestHandler, Result, metrics::*},
     storage::{Statistics, Store},
     tikv_util::quota_limiter::QuotaLimiter,
 };
 
-pub struct DagHandlerBuilder<S: Store + 'static, F: KvFormat> {
+pub struct DagHandlerBuilder<R, S, F>
+where
+    R: RegionStorageAccessor<Storage = S> + 'static,
+    S: Store + 'static,
+    F: KvFormat,
+{
     req: DagRequest,
     ranges: Vec<KeyRange>,
     store: S,
+    extra_storage_accessor: Option<R>,
     data_version: Option<u64>,
     deadline: Deadline,
     batch_row_limit: usize,
@@ -33,11 +46,17 @@ pub struct DagHandlerBuilder<S: Store + 'static, F: KvFormat> {
     _phantom: PhantomData<F>,
 }
 
-impl<S: Store + 'static, F: KvFormat> DagHandlerBuilder<S, F> {
+impl<R, S, F> DagHandlerBuilder<R, S, F>
+where
+    R: RegionStorageAccessor<Storage = S>,
+    S: Store + 'static,
+    F: KvFormat,
+{
     pub fn new(
         req: DagRequest,
         ranges: Vec<KeyRange>,
         store: S,
+        extra_storage_accessor: Option<R>,
         deadline: Deadline,
         batch_row_limit: usize,
         is_streaming: bool,
@@ -49,6 +68,7 @@ impl<S: Store + 'static, F: KvFormat> DagHandlerBuilder<S, F> {
             req,
             ranges,
             store,
+            extra_storage_accessor,
             data_version: None,
             deadline,
             batch_row_limit,
@@ -72,6 +92,7 @@ impl<S: Store + 'static, F: KvFormat> DagHandlerBuilder<S, F> {
             self.req,
             self.ranges,
             self.store,
+            self.extra_storage_accessor,
             self.data_version,
             self.deadline,
             self.is_cache_enabled,
@@ -84,6 +105,47 @@ impl<S: Store + 'static, F: KvFormat> DagHandlerBuilder<S, F> {
     }
 }
 
+/// Wraps the internal accessor to provide the accessor for the secondary
+/// TikvStorage.
+#[derive(Clone, Debug)]
+pub struct ExtraTiKVStorageAccessor<R> {
+    store_accessor: R,
+}
+
+impl<R> ExtraTiKVStorageAccessor<R> {
+    pub fn from_store_accessor(store_accessor: R) -> Self {
+        ExtraTiKVStorageAccessor { store_accessor }
+    }
+}
+
+#[async_trait]
+impl<R> RegionStorageAccessor for ExtraTiKVStorageAccessor<R>
+where
+    R: RegionStorageAccessor<Storage: Store>,
+{
+    type Storage = TikvStorage<R::Storage>;
+
+    /// find the region by the specified key.
+    /// The argument `key` should be the comparable format, you should use
+    /// `Key::from_raw` encode the raw key.
+    async fn find_region_by_key(&self, key: &[u8]) -> storage::Result<FindRegionResult> {
+        self.store_accessor.find_region_by_key(key).await
+    }
+
+    async fn get_local_region_storage(
+        &self,
+        region: &Region,
+        key_ranges: &[KeyRange],
+    ) -> storage::Result<Self::Storage> {
+        let store = self
+            .store_accessor
+            .get_local_region_storage(region, key_ranges)
+            .await?;
+        let check_can_be_cached = store.is_check_has_newer_ts_data();
+        Ok(Self::Storage::new(store, check_can_be_cached))
+    }
+}
+
 pub struct BatchDagHandler {
     runner: tidb_query_executors::runner::BatchExecutorsRunner<Statistics>,
     data_version: Option<u64>,
@@ -94,6 +156,7 @@ impl BatchDagHandler {
         req: DagRequest,
         ranges: Vec<KeyRange>,
         store: S,
+        extra_storage_accessor: Option<impl RegionStorageAccessor<Storage = S> + 'static>,
         data_version: Option<u64>,
         deadline: Deadline,
         is_cache_enabled: bool,
@@ -102,11 +165,14 @@ impl BatchDagHandler {
         paging_size: Option<u64>,
         quota_limiter: Arc<QuotaLimiter>,
     ) -> Result<Self> {
+        let extra_storage_accessor =
+            extra_storage_accessor.map(ExtraTiKVStorageAccessor::from_store_accessor);
         Ok(Self {
             runner: tidb_query_executors::runner::BatchExecutorsRunner::from_request::<_, F>(
                 req,
                 ranges,
                 TikvStorage::new(store, is_cache_enabled),
+                extra_storage_accessor,
                 deadline,
                 streaming_batch_limit,
                 is_streaming,
diff --git a/src/coprocessor/dag/storage_impl.rs b/src/coprocessor/dag/storage_impl.rs
index 6d819b7b94f..f5c81bca583 100644
--- a/src/coprocessor/dag/storage_impl.rs
+++ b/src/coprocessor/dag/storage_impl.rs
@@ -7,7 +7,7 @@ use txn_types::Key;
 
 use crate::{
     coprocessor::Error,
-    storage::{mvcc::NewerTsCheckState, Scanner, Statistics, Store},
+    storage::{Scanner, Statistics, Store, mvcc::NewerTsCheckState},
 };
 
 /// A `Storage` implementation over TiKV's storage.
diff --git a/src/coprocessor/endpoint.rs b/src/coprocessor/endpoint.rs
index b1011f89b98..ecf29faac9e 100644
--- a/src/coprocessor/endpoint.rs
+++ b/src/coprocessor/endpoint.rs
@@ -1,14 +1,15 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    borrow::Cow, future::Future, iter::FromIterator, marker::PhantomData, mem, sync::Arc,
-    time::Duration,
+    borrow::Cow, fmt::Display, future::Future, iter::FromIterator, marker::PhantomData, mem,
+    sync::Arc, time::Duration,
 };
 
 use ::tracker::{
-    set_tls_tracker_token, track, with_tls_tracker, RequestInfo, RequestType, GLOBAL_TRACKERS,
+    GLOBAL_TRACKERS, RequestInfo, RequestType, set_tls_tracker_token, track, with_tls_tracker,
 };
-use api_version::{dispatch_api_version, KvFormat};
+use anyhow::anyhow;
+use api_version::{KvFormat, dispatch_api_version};
 use async_stream::try_stream;
 use concurrency_manager::ConcurrencyManager;
 use engine_traits::PerfLevel;
@@ -17,18 +18,26 @@ use futures::{
     future::Either,
     prelude::*,
 };
-use kvproto::{coprocessor as coppb, errorpb, kvrpcpb, kvrpcpb::CommandPri};
+use kvproto::{coprocessor as coppb, errorpb, kvrpcpb, kvrpcpb::CommandPri, metapb};
 use online_config::ConfigManager;
 use protobuf::{CodedInputStream, Message};
 use resource_control::{ResourceGroupManager, ResourceLimiter, TaskMetadata};
-use resource_metering::{FutureExt, ResourceTagFactory, StreamExt};
-use tidb_query_common::execute_stats::ExecSummary;
+use resource_metering::{
+    FutureExt, ResourceTagFactory, StreamExt, record_logical_read_bytes, record_network_in_bytes,
+    record_network_out_bytes,
+};
+use tidb_query_common::{
+    error::StorageError,
+    execute_stats::ExecSummary,
+    storage::{FindRegionResult, RegionStorageAccessor, Result as StorageResult},
+};
 use tikv_alloc::trace::MemoryTraceGuard;
-use tikv_kv::SnapshotExt;
+use tikv_kv::{ExtraRegionOverride, SnapshotExt};
 use tikv_util::{
     deadline::set_deadline_exceeded_busy_error,
     memory::{MemoryQuota, OwnedAllocated},
     quota_limiter::QuotaLimiter,
+    store::find_peer,
     time::Instant,
 };
 use tipb::{AnalyzeReq, AnalyzeType, ChecksumRequest, ChecksumScanOn, DagRequest, ExecType};
@@ -44,10 +53,10 @@ use crate::{
     read_pool::ReadPoolHandle,
     server::Config,
     storage::{
-        self,
-        kv::{self, with_tls_engine, SnapContext},
+        self, Engine, Snapshot, SnapshotStore,
+        kv::{self, SnapContext, with_tls_engine},
         mvcc::Error as MvccError,
-        need_check_locks, need_check_locks_in_replica_read, Engine, Snapshot, SnapshotStore,
+        need_check_locks, need_check_locks_in_replica_read,
     },
     tikv_util::time::InstantExt,
 };
@@ -93,6 +102,24 @@ pub struct Endpoint<E: Engine> {
     _phantom: PhantomData<E>,
 }
 
+/// The result of parsing a Coprocessor request.
+pub struct ParseCopRequestResult<Snap> {
+    req_tag: ReqTag,
+    req_ctx: ReqContext,
+    handler_builder: RequestHandlerBuilder<Snap>,
+}
+
+impl<Snap> ParseCopRequestResult<Snap> {
+    #[cfg(test)]
+    pub fn default_for_test(handler_builder: RequestHandlerBuilder<Snap>) -> Self {
+        Self {
+            req_tag: ReqTag::test,
+            req_ctx: ReqContext::default_for_test(),
+            handler_builder,
+        }
+    }
+}
+
 impl<E: Engine> tikv_util::AssertSend for Endpoint<E> {}
 
 impl<E: Engine> Endpoint<E> {
@@ -136,38 +163,7 @@ impl<E: Engine> Endpoint<E> {
     }
 
     fn check_memory_locks(&self, req_ctx: &ReqContext) -> Result<()> {
-        let start_ts = req_ctx.txn_start_ts;
-        if !req_ctx.context.get_stale_read() {
-            self.concurrency_manager
-                .update_max_ts(start_ts, || format!("coprocessor-{}", start_ts))?;
-        }
-        if need_check_locks(req_ctx.context.get_isolation_level()) {
-            let begin_instant = Instant::now();
-            for range in &req_ctx.ranges {
-                let start_key = txn_types::Key::from_raw_maybe_unbounded(range.get_start());
-                let end_key = txn_types::Key::from_raw_maybe_unbounded(range.get_end());
-                self.concurrency_manager
-                    .read_range_check(start_key.as_ref(), end_key.as_ref(), |key, lock| {
-                        Lock::check_ts_conflict(
-                            Cow::Borrowed(lock),
-                            key,
-                            start_ts,
-                            &req_ctx.bypass_locks,
-                            req_ctx.context.get_isolation_level(),
-                        )
-                    })
-                    .map_err(|e| {
-                        MEM_LOCK_CHECK_HISTOGRAM_VEC_STATIC
-                            .locked
-                            .observe(begin_instant.saturating_elapsed().as_secs_f64());
-                        MvccError::from(e)
-                    })?;
-            }
-            MEM_LOCK_CHECK_HISTOGRAM_VEC_STATIC
-                .unlocked
-                .observe(begin_instant.saturating_elapsed().as_secs_f64());
-        }
-        Ok(())
+        check_memory_locks_for_ranges(&self.concurrency_manager, req_ctx, &req_ctx.ranges)
     }
 
     /// Parse the raw `Request` to create `RequestHandlerBuilder` and
@@ -179,7 +175,7 @@ impl<E: Engine> Endpoint<E> {
         req: coppb::Request,
         peer: Option<String>,
         is_streaming: bool,
-    ) -> Result<(RequestHandlerBuilder<E::IMSnap>, ReqContext)> {
+    ) -> Result<ParseCopRequestResult<E::IMSnap>> {
         dispatch_api_version!(req.get_context().get_api_version(), {
             self.parse_request_and_check_memory_locks_impl::<API>(req, peer, is_streaming)
         })
@@ -194,7 +190,7 @@ impl<E: Engine> Endpoint<E> {
         mut req: coppb::Request,
         peer: Option<String>,
         is_streaming: bool,
-    ) -> Result<(RequestHandlerBuilder<E::IMSnap>, ReqContext)> {
+    ) -> Result<ParseCopRequestResult<E::IMSnap>> {
         fail_point!("coprocessor_parse_request", |_| Err(box_err!(
             "unsupported tp (failpoint)"
         )));
@@ -214,8 +210,9 @@ impl<E: Engine> Endpoint<E> {
         let mut input = CodedInputStream::from_bytes(&data);
         input.set_recursion_limit(self.recursion_limit);
 
-        let mut req_ctx: ReqContext;
-        let builder: RequestHandlerBuilder<E::IMSnap>;
+        let req_ctx: ReqContext;
+        let handler_builder: RequestHandlerBuilder<E::IMSnap>;
+        let req_tag: ReqTag;
         match req.get_tp() {
             REQ_TYPE_DAG => {
                 let mut dag = DagRequest::default();
@@ -233,14 +230,13 @@ impl<E: Engine> Endpoint<E> {
                 if start_ts == 0 {
                     start_ts = dag.get_start_ts_fallback();
                 }
-                let tag = if table_scan {
+                req_tag = if table_scan {
                     ReqTag::select
                 } else {
                     ReqTag::index
                 };
 
                 req_ctx = ReqContext::new(
-                    tag,
                     context,
                     ranges,
                     self.max_handle_duration,
@@ -249,6 +245,7 @@ impl<E: Engine> Endpoint<E> {
                     start_ts.into(),
                     cache_match_version,
                     self.perf_level,
+                    false,
                 );
                 with_tls_tracker(|tracker| {
                     tracker.req_info.request_type = RequestType::CoprocessorDag;
@@ -259,7 +256,8 @@ impl<E: Engine> Endpoint<E> {
 
                 let batch_row_limit = self.get_batch_row_limit(is_streaming);
                 let quota_limiter = self.quota_limiter.clone();
-                builder = Box::new(move |snap, req_ctx| {
+                let concurrency_manager = self.concurrency_manager.clone();
+                handler_builder = Box::new(move |snap, req_ctx| {
                     let data_version = snap.ext().get_data_version();
                     let store = SnapshotStore::new(
                         snap,
@@ -274,10 +272,14 @@ impl<E: Engine> Endpoint<E> {
                         0 => None,
                         i => Some(i),
                     };
-                    dag::DagHandlerBuilder::<_, F>::new(
+
+                    let extra_store_accessor =
+                        ExtraSnapStoreAccessor::<E>::new(req_ctx.clone(), concurrency_manager);
+                    dag::DagHandlerBuilder::<_, _, F>::new(
                         dag,
                         req_ctx.ranges.clone(),
                         store,
+                        extra_store_accessor,
                         req_ctx.deadline,
                         batch_row_limit,
                         is_streaming,
@@ -296,14 +298,13 @@ impl<E: Engine> Endpoint<E> {
                     start_ts = analyze.get_start_ts_fallback();
                 }
 
-                let tag = match analyze.get_tp() {
+                req_tag = match analyze.get_tp() {
                     AnalyzeType::TypeIndex | AnalyzeType::TypeCommonHandle => ReqTag::analyze_index,
                     AnalyzeType::TypeColumn | AnalyzeType::TypeMixed => ReqTag::analyze_table,
                     AnalyzeType::TypeFullSampling => ReqTag::analyze_full_sampling,
                     AnalyzeType::TypeSampleIndex => unimplemented!(),
                 };
                 req_ctx = ReqContext::new(
-                    tag,
                     context,
                     ranges,
                     self.max_handle_duration,
@@ -312,6 +313,7 @@ impl<E: Engine> Endpoint<E> {
                     start_ts.into(),
                     cache_match_version,
                     self.perf_level,
+                    false,
                 );
                 with_tls_tracker(|tracker| {
                     tracker.req_info.request_type = RequestType::CoprocessorAnalyze;
@@ -322,7 +324,7 @@ impl<E: Engine> Endpoint<E> {
 
                 let quota_limiter = self.quota_limiter.clone();
 
-                builder = Box::new(move |snap, req_ctx| {
+                handler_builder = Box::new(move |snap, req_ctx| {
                     AnalyzeContext::<_, F>::new(
                         analyze,
                         req_ctx.ranges.clone(),
@@ -342,13 +344,12 @@ impl<E: Engine> Endpoint<E> {
                     start_ts = checksum.get_start_ts_fallback();
                 }
 
-                let tag = if table_scan {
+                req_tag = if table_scan {
                     ReqTag::checksum_table
                 } else {
                     ReqTag::checksum_index
                 };
                 req_ctx = ReqContext::new(
-                    tag,
                     context,
                     ranges,
                     self.max_handle_duration,
@@ -357,10 +358,11 @@ impl<E: Engine> Endpoint<E> {
                     start_ts.into(),
                     cache_match_version,
                     self.perf_level,
+                    // Checksum is allowed during the flashback period to make sure the tool such
+                    // like BR can work.
+                    true,
                 );
-                // Checksum is allowed during the flashback period to make sure the tool such
-                // like BR can work.
-                req_ctx.allowed_in_flashback = true;
+
                 with_tls_tracker(|tracker| {
                     tracker.req_info.request_type = RequestType::CoprocessorChecksum;
                     tracker.req_info.start_ts = start_ts;
@@ -368,7 +370,7 @@ impl<E: Engine> Endpoint<E> {
 
                 self.check_memory_locks(&req_ctx)?;
 
-                builder = Box::new(move |snap, req_ctx| {
+                handler_builder = Box::new(move |snap, req_ctx| {
                     checksum::ChecksumContext::new(
                         checksum,
                         req_ctx.ranges.clone(),
@@ -382,7 +384,11 @@ impl<E: Engine> Endpoint<E> {
             tp => return Err(box_err!("unsupported tp {}", tp)),
         };
 
-        Ok((builder, req_ctx))
+        Ok(ParseCopRequestResult {
+            req_tag,
+            req_ctx,
+            handler_builder,
+        })
     }
 
     /// Get the batch row limit configuration.
@@ -431,6 +437,9 @@ impl<E: Engine> Endpoint<E> {
         mut tracker: Box<Tracker<E>>,
         handler_builder: RequestHandlerBuilder<E::IMSnap>,
     ) -> Result<MemoryTraceGuard<coppb::Response>> {
+        with_tls_tracker(|tracker1| {
+            record_network_in_bytes(tracker1.metrics.grpc_req_size);
+        });
         // When this function is being executed, it may be queued for a long time, so
         // that deadline may exceed.
         tracker.on_scheduled();
@@ -498,10 +507,12 @@ impl<E: Engine> Endpoint<E> {
         tracker.collect_storage_statistics(storage_stats);
         let (exec_details, exec_details_v2) = tracker.get_exec_details();
         tracker.on_finish_all_items();
-
+        record_logical_read_bytes(exec_details_v2.get_scan_detail_v2().processed_versions_size);
         let mut resp = match result {
             Ok(resp) => {
-                COPR_RESP_SIZE.inc_by(resp.data.len() as u64);
+                let resp_size = resp.data.len() as u64;
+                COPR_RESP_SIZE.inc_by(resp_size);
+                record_network_out_bytes(resp_size);
                 resp
             }
             Err(e) => {
@@ -526,9 +537,9 @@ impl<E: Engine> Endpoint<E> {
     /// other cases. The future inside may be an error however.
     fn handle_unary_request(
         &self,
-        req_ctx: ReqContext,
-        handler_builder: RequestHandlerBuilder<E::IMSnap>,
+        r: ParseCopRequestResult<E::IMSnap>,
     ) -> impl Future<Output = Result<MemoryTraceGuard<coppb::Response>>> {
+        let req_ctx = r.req_ctx;
         let priority = req_ctx.context.get_priority();
         let task_id = req_ctx.build_task_id();
         let key_ranges: Vec<_> = req_ctx
@@ -556,14 +567,14 @@ impl<E: Engine> Endpoint<E> {
             )
         });
         // box the tracker so that moving it is cheap.
-        let tracker = Box::new(Tracker::new(req_ctx, self.slow_log_threshold));
+        let tracker = Box::new(Tracker::new(req_ctx, r.req_tag, self.slow_log_threshold));
         allocated_bytes += tracker.approximate_mem_size();
 
         let (tx, rx) = oneshot::channel();
         let future =
-            Self::handle_unary_request_impl(self.semaphore.clone(), tracker, handler_builder)
+            Self::handle_unary_request_impl(self.semaphore.clone(), tracker, r.handler_builder)
                 .in_resource_metering_tag(resource_tag)
-                .map(|res| {
+                .map(move |res| {
                     let _ = tx.send(res);
                 });
         let res = self.read_pool_spawn_with_memory_quota_check(
@@ -607,9 +618,12 @@ impl<E: Engine> Endpoint<E> {
 
         let result_of_batch = self.process_batch_tasks(&mut req, &peer);
         set_tls_tracker_token(tracker);
+        with_tls_tracker(|tracker| {
+            tracker.metrics.grpc_req_size = req.compute_size() as u64;
+        });
         let result_of_future = self
             .parse_request_and_check_memory_locks(req, peer, false)
-            .map(|(handler_builder, req_ctx)| self.handle_unary_request(req_ctx, handler_builder));
+            .map(|r| self.handle_unary_request(r));
         with_tls_tracker(|tracker| {
             tracker.metrics.grpc_process_nanos =
                 tracker.req_info.begin.saturating_elapsed().as_nanos() as u64;
@@ -675,10 +689,10 @@ impl<E: Engine> Endpoint<E> {
             let mut response = coppb::StoreBatchTaskResponse::new();
             response.set_task_id(task_id);
             match self.parse_request_and_check_memory_locks(cur_req, peer.clone(), false) {
-                Ok((handler_builder, req_ctx)) => {
+                Ok(r) => {
                     let cur_tracker = GLOBAL_TRACKERS.insert(::tracker::Tracker::new(request_info));
                     set_tls_tracker_token(cur_tracker);
-                    let fut = self.handle_unary_request(req_ctx, handler_builder);
+                    let fut = self.handle_unary_request(r);
                     let fut = async move {
                         let res = fut.await;
                         match res {
@@ -736,6 +750,9 @@ impl<E: Engine> Endpoint<E> {
                 None
             };
 
+            with_tls_tracker(|tracker| {
+                record_network_in_bytes(tracker.metrics.grpc_req_size);
+            });
             // When this function is being executed, it may be queued for a long time, so that
             // deadline may exceed.
             tracker.on_scheduled();
@@ -780,7 +797,10 @@ impl<E: Engine> Endpoint<E> {
                     },
                     Ok((None, _)) => break,
                     Ok((Some(mut resp), finished)) => {
-                        COPR_RESP_SIZE.inc_by(resp.data.len() as u64);
+                        let resp_size = resp.data.len() as u64;
+                        COPR_RESP_SIZE.inc_by(resp_size);
+                        record_network_out_bytes(resp_size);
+                        record_logical_read_bytes(exec_details_v2.get_scan_detail_v2().processed_versions_size);
                         resp.set_exec_details(exec_details);
                         resp.set_exec_details_v2(exec_details_v2);
                         yield resp;
@@ -800,9 +820,9 @@ impl<E: Engine> Endpoint<E> {
     /// other cases. The stream inside may produce errors however.
     fn handle_stream_request(
         &self,
-        req_ctx: ReqContext,
-        handler_builder: RequestHandlerBuilder<E::IMSnap>,
+        r: ParseCopRequestResult<E::IMSnap>,
     ) -> Result<impl futures::stream::Stream<Item = Result<coppb::Response>>> {
+        let req_ctx = r.req_ctx;
         let (tx, rx) = mpsc::channel::<Result<coppb::Response>>(self.stream_channel_size);
         let priority = req_ctx.context.get_priority();
         let metadata = TaskMetadata::from_ctx(req_ctx.context.get_resource_control_context());
@@ -830,11 +850,11 @@ impl<E: Engine> Endpoint<E> {
         let mut allocated_bytes = resource_tag.approximate_heap_size();
 
         let task_id = req_ctx.build_task_id();
-        let tracker = Box::new(Tracker::new(req_ctx, self.slow_log_threshold));
+        let tracker = Box::new(Tracker::new(req_ctx, r.req_tag, self.slow_log_threshold));
         allocated_bytes += tracker.approximate_mem_size();
 
         let future =
-            Self::handle_stream_request_impl(self.semaphore.clone(), tracker, handler_builder)
+            Self::handle_stream_request_impl(self.semaphore.clone(), tracker, r.handler_builder)
                 .in_resource_metering_tag(resource_tag)
                 .then(futures::future::ok::<_, mpsc::SendError>)
                 .forward(tx)
@@ -863,11 +883,18 @@ impl<E: Engine> Endpoint<E> {
         req: coppb::Request,
         peer: Option<String>,
     ) -> impl futures::stream::Stream<Item = coppb::Response> {
+        let tracker = GLOBAL_TRACKERS.insert(::tracker::Tracker::new(RequestInfo::new(
+            req.get_context(),
+            RequestType::Unknown,
+            req.start_ts,
+        )));
+        set_tls_tracker_token(tracker);
+        with_tls_tracker(|tracker| {
+            tracker.metrics.grpc_req_size = req.compute_size() as u64;
+        });
         let result_of_stream = self
             .parse_request_and_check_memory_locks(req, peer, true)
-            .and_then(|(handler_builder, req_ctx)| {
-                self.handle_stream_request(req_ctx, handler_builder)
-            }); // Result<Stream<Resp, Error>, Error>
+            .and_then(|r| self.handle_stream_request(r)); // Result<Stream<Resp, Error>, Error>
 
         futures::stream::once(futures::future::ready(result_of_stream)) // Stream<Stream<Resp, Error>, Error>
             .try_flatten() // Stream<Resp, Error>
@@ -900,6 +927,44 @@ impl<E: Engine> Endpoint<E> {
     }
 }
 
+fn check_memory_locks_for_ranges(
+    concurrency_manager: &ConcurrencyManager,
+    req_ctx: &ReqContext,
+    key_ranges: &[coppb::KeyRange],
+) -> Result<()> {
+    let start_ts = req_ctx.txn_start_ts;
+    if !req_ctx.context.get_stale_read() {
+        concurrency_manager.update_max_ts(start_ts, || format!("coprocessor-{}", start_ts))?;
+    }
+    if need_check_locks(req_ctx.context.get_isolation_level()) {
+        let begin_instant = Instant::now();
+        for range in key_ranges {
+            let start_key = txn_types::Key::from_raw_maybe_unbounded(range.get_start());
+            let end_key = txn_types::Key::from_raw_maybe_unbounded(range.get_end());
+            concurrency_manager
+                .read_range_check(start_key.as_ref(), end_key.as_ref(), |key, lock| {
+                    Lock::check_ts_conflict(
+                        Cow::Borrowed(lock),
+                        key,
+                        start_ts,
+                        &req_ctx.bypass_locks,
+                        req_ctx.context.get_isolation_level(),
+                    )
+                })
+                .map_err(|e| {
+                    MEM_LOCK_CHECK_HISTOGRAM_VEC_STATIC
+                        .locked
+                        .observe(begin_instant.saturating_elapsed().as_secs_f64());
+                    MvccError::from(e)
+                })?;
+        }
+        MEM_LOCK_CHECK_HISTOGRAM_VEC_STATIC
+            .unlocked
+            .observe(begin_instant.saturating_elapsed().as_secs_f64());
+    }
+    Ok(())
+}
+
 macro_rules! make_error_response_common {
     ($resp:expr, $tag:expr, $e:expr) => {{
         match $e {
@@ -978,16 +1043,177 @@ fn make_error_response(e: Error) -> coppb::Response {
     resp
 }
 
+/// ExtraSnapStoreAccessor is used to get the snapshot stores for the
+/// extra regions.
+/// The "extra region" means the regions that are not the source region in a
+/// request.
+/// For example, if a cop-task contains a `IndexLookUp` executor which needs to
+/// access look up the primary rows, it will use this accessor to locate and get
+/// the snapshot of the regions which these primary rows located.
+#[derive(Clone)]
+pub struct ExtraSnapStoreAccessor<E> {
+    store_id: u64,
+    req_ctx: ReqContext,
+    concurrency_manager: ConcurrencyManager,
+    _phantom: PhantomData<fn() -> E>,
+}
+
+impl<E: Engine> ExtraSnapStoreAccessor<E> {
+    /// new creates an Optional EngineSnapshotStoreAccessor.
+    /// Please note that not all scenes are supported.
+    /// If the current request is not supported, a `None` value will be
+    /// returned to force the request to access the source region only.
+    pub fn new(req_ctx: ReqContext, concurrency_manager: ConcurrencyManager) -> Option<Self> {
+        let pb_ctx = &req_ctx.context;
+        let store_id = match pb_ctx.peer.as_ref() {
+            // Though it is possible that the request carries a wrong store_id, we can still use
+            // it to find the peer in the region because it will be validated in get snapshot phase.
+            Some(peer) => peer.get_store_id(),
+            None => return None,
+        };
+
+        if pb_ctx.get_isolation_level() == kvrpcpb::IsolationLevel::Si
+            && !pb_ctx.get_stale_read()
+            && !pb_ctx.get_replica_read()
+        {
+            // Some scenes are not supported before an effective argument, including:
+            // - stale-read & replica-read, TODO: support it later
+            // - non-SI isolation level, TODO: support it later
+            return Some(Self {
+                store_id,
+                req_ctx,
+                concurrency_manager,
+                _phantom: PhantomData,
+            });
+        }
+        None
+    }
+
+    #[inline]
+    fn err<S: Display>(s: S) -> StorageError {
+        StorageError::from(anyhow!("{}", s))
+    }
+}
+
+#[async_trait]
+impl<E: Engine> RegionStorageAccessor for ExtraSnapStoreAccessor<E> {
+    type Storage = SnapshotStore<E::IMSnap>;
+
+    /// find the region by the specified key.
+    /// The argument `key` should be the comparable format, you should use
+    /// `Key::from_raw` encode the raw key.
+    async fn find_region_by_key(&self, key: &[u8]) -> StorageResult<FindRegionResult> {
+        let key_in_vec = key.to_vec();
+        let (tx, rx) = oneshot::channel();
+        unsafe {
+            with_tls_engine(|engine: &mut E| -> StorageResult<()> {
+                engine
+                    .seek_region(
+                        key,
+                        Box::new(move |iter| {
+                            let result = match iter.next() {
+                                Some(info)
+                                    if info.region.get_start_key() <= key_in_vec.as_slice() =>
+                                {
+                                    FindRegionResult::with_found(info.region.clone(), info.role)
+                                }
+                                Some(info) => FindRegionResult::with_not_found(Some(
+                                    info.region.start_key.clone(),
+                                )),
+                                None => FindRegionResult::with_not_found(None),
+                            };
+
+                            if tx.send(result).is_err() {
+                                warn!("failed to send find_region_by_key result");
+                            }
+                        }),
+                    )
+                    .map_err(Self::err)
+            })?;
+        }
+        rx.map_err(Self::err).await
+    }
+
+    async fn get_local_region_storage(
+        &self,
+        region: &metapb::Region,
+        key_range: &[coppb::KeyRange],
+    ) -> StorageResult<Self::Storage> {
+        let peer = match find_peer(region, self.store_id) {
+            Some(peer) => peer.clone(),
+            None => {
+                return Err(Self::err(format!(
+                    "cannot find peer in region, region_id: {}, request store_id: {}",
+                    self.store_id,
+                    region.get_id()
+                )));
+            }
+        };
+
+        check_memory_locks_for_ranges(&self.concurrency_manager, &self.req_ctx, key_range)?;
+        let pb_ctx = &self.req_ctx.context;
+        let start_ts = self.req_ctx.txn_start_ts;
+        let snap_ctx = SnapContext {
+            pb_ctx,
+            // read_id is used by batch_get to cache the snapshot.
+            // We set it as None here to disable this optimization for simple.
+            read_id: None,
+            start_ts: Some(start_ts),
+            // does not support in-flashback execution currently to avoid some potential
+            // issues for simple.
+            allowed_in_flashback: false,
+            // key_ranges is always empty because replica-read is not supported.
+            // TODO: check the locks for the input key_ranges for replica-read if
+            // it is supported in the future.
+            key_ranges: Vec::default(),
+            extra_region_override: Some(ExtraRegionOverride {
+                region_id: region.get_id(),
+                region_epoch: region.get_region_epoch().clone(),
+                peer,
+                // Do not need to check the term because only readonly requests are
+                // supported currently.
+                check_term: None,
+            }),
+        };
+
+        let snap = unsafe {
+            with_tls_engine(move |engine: &mut E| kv::in_memory_snapshot(engine, snap_ctx))
+        }
+        .await
+        .map_err(Self::err)?;
+
+        Ok(SnapshotStore::new(
+            snap,
+            start_ts,
+            pb_ctx.get_isolation_level(),
+            !pb_ctx.get_not_fill_cache(),
+            self.req_ctx.bypass_locks.clone(),
+            self.req_ctx.access_locks.clone(),
+            // If `check_has_newer_ts_data` is enabled, the internal scanner will check if there is
+            // newer data in the region to tell the TiDB whether to cache the cop response or not.
+            // However, the current cop-cache implementation only supports the source region.
+            // So here we force to set it to `false` to avoid caching the cop response when
+            // any other region snapshot is accessed in a request.
+            false,
+        ))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::{
-        sync::{atomic, mpsc},
+        assert_matches::assert_matches,
+        sync::{Mutex, atomic, mpsc},
         thread, vec,
     };
 
     use futures::executor::{block_on, block_on_stream};
-    use kvproto::kvrpcpb::IsolationLevel;
+    use kvproto::kvrpcpb::{IsolationLevel, LockInfo};
     use protobuf::Message;
+    use raft::StateRole;
+    use raftstore::coprocessor::region_info_accessor::MockRegionInfoProvider;
+    use tidb_query_common::storage::Storage;
+    use tikv_kv::{MockEngine, MockEngineBuilder, destroy_tls_engine, set_tls_engine};
     use tipb::{Executor, Expr};
     use txn_types::{Key, LockType};
 
@@ -996,7 +1222,7 @@ mod tests {
         config::CoprReadPoolConfig,
         coprocessor::readpool_impl::build_read_pool_for_test,
         read_pool::ReadPool,
-        storage::{kv::RocksEngine, TestEngineBuilder},
+        storage::{Store, TestEngineBuilder, kv::RocksEngine},
     };
 
     /// A unary `RequestHandler` that always produces a fixture.
@@ -1166,16 +1392,16 @@ mod tests {
         // a normal request
         let handler_builder =
             Box::new(|_, _: &_| Ok(UnaryFixture::new(Ok(coppb::Response::default())).into_boxed()));
-        let resp =
-            block_on(copr.handle_unary_request(ReqContext::default_for_test(), handler_builder))
-                .unwrap();
+        let resp = block_on(
+            copr.handle_unary_request(ParseCopRequestResult::default_for_test(handler_builder)),
+        )
+        .unwrap();
         assert!(resp.get_other_error().is_empty());
 
         // an outdated request
         let handler_builder =
             Box::new(|_, _: &_| Ok(UnaryFixture::new(Ok(coppb::Response::default())).into_boxed()));
         let outdated_req_ctx = ReqContext::new(
-            ReqTag::test,
             Default::default(),
             Vec::new(),
             Duration::from_secs(0),
@@ -1184,8 +1410,14 @@ mod tests {
             TimeStamp::max(),
             None,
             PerfLevel::EnableCount,
+            false,
         );
-        block_on(copr.handle_unary_request(outdated_req_ctx, handler_builder)).unwrap_err();
+        block_on(copr.handle_unary_request(ParseCopRequestResult {
+            req_ctx: outdated_req_ctx,
+            req_tag: ReqTag::test,
+            handler_builder,
+        }))
+        .unwrap_err();
     }
 
     #[test]
@@ -1297,12 +1529,12 @@ mod tests {
             .map(|config| {
                 let engine = Arc::new(Mutex::new(engine.clone()));
                 YatpPoolBuilder::new(DefaultTicker::default())
-                    .config(config)
-                    .name_prefix("coprocessor_endpoint_test_full")
-                    .after_start(move || set_tls_engine(engine.lock().unwrap().clone()))
-                    // Safety: we call `set_` and `destroy_` with the same engine type.
-                    .before_stop(|| unsafe { destroy_tls_engine::<RocksEngine>() })
-                    .build_future_pool()
+                        .config(config)
+                        .name_prefix("coprocessor_endpoint_test_full")
+                        .after_start(move || set_tls_engine(engine.lock().unwrap().clone()))
+                        // Safety: we call `set_` and `destroy_` with the same engine type.
+                        .before_stop(|| unsafe { destroy_tls_engine::<RocksEngine>() })
+                        .build_future_pool()
             })
             .collect::<Vec<_>>(),
         );
@@ -1333,7 +1565,8 @@ mod tests {
                         .into_boxed(),
                 )
             });
-            let future = copr.handle_unary_request(ReqContext::default_for_test(), handler_builder);
+            let future =
+                copr.handle_unary_request(ParseCopRequestResult::default_for_test(handler_builder));
             let tx = tx.clone();
             thread::spawn(move || {
                 tx.send(block_on(future)).unwrap();
@@ -1371,9 +1604,10 @@ mod tests {
 
         let handler_builder =
             Box::new(|_, _: &_| Ok(UnaryFixture::new(Err(box_err!("foo"))).into_boxed()));
-        let resp =
-            block_on(copr.handle_unary_request(ReqContext::default_for_test(), handler_builder))
-                .unwrap();
+        let resp = block_on(
+            copr.handle_unary_request(ParseCopRequestResult::default_for_test(handler_builder)),
+        )
+        .unwrap();
         assert_eq!(resp.get_data().len(), 0);
         assert!(!resp.get_other_error().is_empty());
     }
@@ -1399,7 +1633,7 @@ mod tests {
         let handler_builder =
             Box::new(|_, _: &_| Ok(StreamFixture::new(vec![Err(box_err!("foo"))]).into_boxed()));
         let resp_vec = block_on_stream(
-            copr.handle_stream_request(ReqContext::default_for_test(), handler_builder)
+            copr.handle_stream_request(ParseCopRequestResult::default_for_test(handler_builder))
                 .unwrap(),
         )
         .collect::<Result<Vec<_>>>()
@@ -1419,7 +1653,7 @@ mod tests {
 
         let handler_builder = Box::new(|_, _: &_| Ok(StreamFixture::new(responses).into_boxed()));
         let resp_vec = block_on_stream(
-            copr.handle_stream_request(ReqContext::default_for_test(), handler_builder)
+            copr.handle_stream_request(ParseCopRequestResult::default_for_test(handler_builder))
                 .unwrap(),
         )
         .collect::<Result<Vec<_>>>()
@@ -1451,7 +1685,7 @@ mod tests {
 
         let handler_builder = Box::new(|_, _: &_| Ok(StreamFixture::new(vec![]).into_boxed()));
         let resp_vec = block_on_stream(
-            copr.handle_stream_request(ReqContext::default_for_test(), handler_builder)
+            copr.handle_stream_request(ParseCopRequestResult::default_for_test(handler_builder))
                 .unwrap(),
         )
         .collect::<Result<Vec<_>>>()
@@ -1495,7 +1729,7 @@ mod tests {
         });
         let handler_builder = Box::new(move |_, _: &_| Ok(handler.into_boxed()));
         let resp_vec = block_on_stream(
-            copr.handle_stream_request(ReqContext::default_for_test(), handler_builder)
+            copr.handle_stream_request(ParseCopRequestResult::default_for_test(handler_builder))
                 .unwrap(),
         )
         .collect::<Result<Vec<_>>>()
@@ -1521,7 +1755,7 @@ mod tests {
         });
         let handler_builder = Box::new(move |_, _: &_| Ok(handler.into_boxed()));
         let resp_vec = block_on_stream(
-            copr.handle_stream_request(ReqContext::default_for_test(), handler_builder)
+            copr.handle_stream_request(ParseCopRequestResult::default_for_test(handler_builder))
                 .unwrap(),
         )
         .collect::<Result<Vec<_>>>()
@@ -1547,7 +1781,7 @@ mod tests {
         });
         let handler_builder = Box::new(move |_, _: &_| Ok(handler.into_boxed()));
         let resp_vec = block_on_stream(
-            copr.handle_stream_request(ReqContext::default_for_test(), handler_builder)
+            copr.handle_stream_request(ParseCopRequestResult::default_for_test(handler_builder))
                 .unwrap(),
         )
         .collect::<Result<Vec<_>>>()
@@ -1589,7 +1823,7 @@ mod tests {
         });
         let handler_builder = Box::new(move |_, _: &_| Ok(handler.into_boxed()));
         let resp_vec = block_on_stream(
-            copr.handle_stream_request(ReqContext::default_for_test(), handler_builder)
+            copr.handle_stream_request(ParseCopRequestResult::default_for_test(handler_builder))
                 .unwrap(),
         )
         .take(7)
@@ -1651,9 +1885,11 @@ mod tests {
         let (tx, rx) = std::sync::mpsc::channel();
 
         // A request that requests execution details.
-        let mut req_with_exec_detail = ReqContext::default_for_test();
-        req_with_exec_detail.context.set_record_time_stat(true);
-
+        let req_with_exec_detail: ReqContext = {
+            let mut inner = ReqContextInner::default_for_test();
+            inner.context.set_record_time_stat(true);
+            inner.into()
+        };
         {
             let mut wait_time: Duration = Duration::default();
 
@@ -1664,8 +1900,11 @@ mod tests {
                         .into_boxed(),
                 )
             });
-            let resp_future_1 =
-                copr.handle_unary_request(req_with_exec_detail.clone(), handler_builder);
+            let resp_future_1 = copr.handle_unary_request(ParseCopRequestResult {
+                req_tag: ReqTag::test,
+                req_ctx: req_with_exec_detail.clone(),
+                handler_builder,
+            });
             let sender = tx.clone();
             thread::spawn(move || sender.send(vec![block_on(resp_future_1).unwrap()]).unwrap());
             // Sleep a while to make sure that thread is spawn and snapshot is taken.
@@ -1678,8 +1917,11 @@ mod tests {
                         .into_boxed(),
                 )
             });
-            let resp_future_2 =
-                copr.handle_unary_request(req_with_exec_detail.clone(), handler_builder);
+            let resp_future_2 = copr.handle_unary_request(ParseCopRequestResult {
+                req_tag: ReqTag::test,
+                req_ctx: req_with_exec_detail.clone(),
+                handler_builder,
+            });
             let sender = tx.clone();
             thread::spawn(move || sender.send(vec![block_on(resp_future_2).unwrap()]).unwrap());
             thread::sleep(SNAPSHOT_DURATION);
@@ -1784,8 +2026,11 @@ mod tests {
                 )
                 .into_boxed())
             });
-            let resp_future_1 =
-                copr.handle_unary_request(req_with_exec_detail.clone(), handler_builder);
+            let resp_future_1 = copr.handle_unary_request(ParseCopRequestResult {
+                req_tag: ReqTag::test,
+                req_ctx: req_with_exec_detail.clone(),
+                handler_builder,
+            });
             let sender = tx.clone();
             thread::spawn(move || sender.send(vec![block_on(resp_future_1).unwrap()]).unwrap());
             // Sleep a while to make sure that thread is spawn and snapshot is taken.
@@ -1798,8 +2043,11 @@ mod tests {
                         .into_boxed(),
                 )
             });
-            let resp_future_2 =
-                copr.handle_unary_request(req_with_exec_detail.clone(), handler_builder);
+            let resp_future_2 = copr.handle_unary_request(ParseCopRequestResult {
+                req_tag: ReqTag::test,
+                req_ctx: req_with_exec_detail.clone(),
+                handler_builder,
+            });
             let sender = tx.clone();
             thread::spawn(move || sender.send(vec![block_on(resp_future_2).unwrap()]).unwrap());
             thread::sleep(SNAPSHOT_DURATION);
@@ -1861,8 +2109,11 @@ mod tests {
                         .into_boxed(),
                 )
             });
-            let resp_future_1 =
-                copr.handle_unary_request(req_with_exec_detail.clone(), handler_builder);
+            let resp_future_1 = copr.handle_unary_request(ParseCopRequestResult {
+                req_tag: ReqTag::test,
+                req_ctx: req_with_exec_detail.clone(),
+                handler_builder,
+            });
             let sender = tx.clone();
             thread::spawn(move || sender.send(vec![block_on(resp_future_1).unwrap()]).unwrap());
             // Sleep a while to make sure that thread is spawn and snapshot is taken.
@@ -1881,7 +2132,11 @@ mod tests {
                 .into_boxed())
             });
             let resp_future_3 = copr
-                .handle_stream_request(req_with_exec_detail, handler_builder)
+                .handle_stream_request(ParseCopRequestResult {
+                    req_tag: ReqTag::test,
+                    req_ctx: req_with_exec_detail.clone(),
+                    handler_builder,
+                })
                 .unwrap()
                 .map(|x| x.map(|x| x.into()));
             thread::spawn(move || {
@@ -2034,10 +2289,16 @@ mod tests {
                 Ok(UnaryFixture::new(Ok(coppb::Response::default())).into_boxed())
             });
 
-            let mut config = ReqContext::default_for_test();
-            config.deadline = Deadline::from_now(Duration::from_millis(500));
+            let mut inner = ReqContextInner::default_for_test();
+            inner.deadline = Deadline::from_now(Duration::from_millis(500));
+            let config: ReqContext = inner.into();
 
-            let resp = block_on(copr.handle_unary_request(config, handler_builder)).unwrap();
+            let resp = block_on(copr.handle_unary_request(ParseCopRequestResult {
+                req_tag: ReqTag::test,
+                req_ctx: config,
+                handler_builder,
+            }))
+            .unwrap();
             assert_eq!(resp.get_data().len(), 0);
             let region_err = resp.get_region_error();
             assert_eq!(
@@ -2055,10 +2316,16 @@ mod tests {
                 .into_boxed())
             });
 
-            let mut config = ReqContext::default_for_test();
-            config.deadline = Deadline::from_now(Duration::from_millis(500));
+            let mut inner = ReqContextInner::default_for_test();
+            inner.deadline = Deadline::from_now(Duration::from_millis(500));
+            let config: ReqContext = inner.into();
 
-            let resp = block_on(copr.handle_unary_request(config, handler_builder)).unwrap();
+            let resp = block_on(copr.handle_unary_request(ParseCopRequestResult {
+                req_tag: ReqTag::test,
+                req_ctx: config,
+                handler_builder,
+            }))
+            .unwrap();
             assert_eq!(resp.get_data().len(), 0);
             let region_err = resp.get_region_error();
             assert_eq!(
@@ -2154,10 +2421,16 @@ mod tests {
                 Ok(UnaryFixture::new(Ok(coppb::Response::default())).into_boxed())
             });
 
-            let mut config = ReqContext::default_for_test();
-            config.deadline = Deadline::from_now(Duration::from_millis(500));
+            let mut inner = ReqContextInner::default_for_test();
+            inner.deadline = Deadline::from_now(Duration::from_millis(500));
+            let config: ReqContext = inner.into();
 
-            let resp = block_on(copr.handle_unary_request(config, handler_builder)).unwrap();
+            let resp = block_on(copr.handle_unary_request(ParseCopRequestResult {
+                req_tag: ReqTag::test,
+                req_ctx: config,
+                handler_builder,
+            }))
+            .unwrap();
             assert!(!resp.has_region_error(), "{:?}", resp);
         }
 
@@ -2168,10 +2441,15 @@ mod tests {
                 Ok(UnaryFixture::new(Ok(coppb::Response::default())).into_boxed())
             });
 
-            let mut config = ReqContext::default_for_test();
-            config.deadline = Deadline::from_now(Duration::from_millis(500));
+            let mut inner = ReqContextInner::default_for_test();
+            inner.deadline = Deadline::from_now(Duration::from_millis(500));
+            let config: ReqContext = inner.into();
 
-            let res = block_on(copr.handle_unary_request(config, handler_builder));
+            let res = block_on(copr.handle_unary_request(ParseCopRequestResult {
+                req_tag: ReqTag::test,
+                req_ctx: config,
+                handler_builder,
+            }));
             assert!(res.is_err(), "{:?}", res);
             let resp = make_error_response(res.unwrap_err());
             assert_eq!(resp.get_data().len(), 0);
@@ -2186,4 +2464,481 @@ mod tests {
             );
         }
     }
+
+    // A default ReqContext that support to access another snapshot in a
+    // request. It can be used to create an not None value of
+    // Option<EngineSnapshotStoreAccessor>
+    fn default_req_ctx_support_snap_accessor() -> ReqContextInner {
+        let mut pb_ctx = kvrpcpb::Context::default();
+        pb_ctx.set_isolation_level(IsolationLevel::Si);
+        pb_ctx.set_stale_read(false);
+        pb_ctx.set_replica_read(false);
+        pb_ctx.set_peer(metapb::Peer {
+            id: 12,
+            store_id: 100,
+            ..Default::default()
+        });
+        pb_ctx.set_region_id(23);
+        let mut req_ctx = ReqContextInner::default_for_test();
+        req_ctx.context = pb_ctx;
+        req_ctx.txn_start_ts = TimeStamp::new(1234567);
+        req_ctx.is_desc_scan = Some(true);
+        req_ctx.ranges = vec![
+            coppb::KeyRange {
+                start: b"a1".to_vec(),
+                end: b"b1".to_vec(),
+                ..Default::default()
+            },
+            coppb::KeyRange {
+                start: b"b3".to_vec(),
+                end: b"b4".to_vec(),
+                ..Default::default()
+            },
+        ];
+        req_ctx
+    }
+
+    #[test]
+    fn test_secondary_snap_store_accessor_new() {
+        type StoreAccessor = ExtraSnapStoreAccessor<RocksEngine>;
+        // construct a ReqContext that support to access another snapshot in a request
+        let req_ctx = default_req_ctx_support_snap_accessor();
+        let cm = ConcurrencyManager::new_for_test(1.into());
+
+        // accessor support case
+        let mut ctx = req_ctx.clone();
+        assert!(StoreAccessor::new(ctx.into(), cm.clone()).is_some());
+
+        // does not support Rc / RcCheckTs
+        ctx = req_ctx.clone();
+        ctx.context.set_isolation_level(IsolationLevel::Rc);
+        assert!(StoreAccessor::new(ctx.into(), cm.clone()).is_none());
+        ctx = req_ctx.clone();
+        ctx.context.set_isolation_level(IsolationLevel::RcCheckTs);
+        assert!(StoreAccessor::new(ctx.into(), cm.clone()).is_none());
+
+        // does not support stale read
+        ctx = req_ctx.clone();
+        ctx.context.set_stale_read(true);
+        assert!(StoreAccessor::new(ctx.into(), cm.clone()).is_none());
+
+        // does not support replica read
+        ctx = req_ctx.clone();
+        ctx.context.set_replica_read(true);
+        assert!(StoreAccessor::new(ctx.into(), cm.clone()).is_none());
+    }
+
+    #[test]
+    fn test_extra_snap_store_accessor_locate_region_by_key() {
+        set_tls_engine(TestEngineBuilder::new().build().unwrap());
+        defer! {
+            unsafe {destroy_tls_engine::<RocksEngine>()}
+        }
+
+        let (r1, r2, r3) = (
+            metapb::Region {
+                id: 1,
+                start_key: b"b".to_vec(),
+                end_key: b"d".to_vec(),
+                ..Default::default()
+            },
+            metapb::Region {
+                id: 2,
+                start_key: b"e".to_vec(),
+                end_key: b"g".to_vec(),
+                ..Default::default()
+            },
+            metapb::Region {
+                id: 3,
+                start_key: b"g".to_vec(),
+                end_key: b"h".to_vec(),
+                ..Default::default()
+            },
+        );
+
+        unsafe {
+            let provider = MockRegionInfoProvider::new(vec![r1.clone(), r2.clone(), r3.clone()]);
+            provider.set_role(2, StateRole::Follower);
+            with_tls_engine(|e: &mut RocksEngine| e.set_region_info_provider(provider))
+        }
+
+        type StoreAccessor = ExtraSnapStoreAccessor<RocksEngine>;
+        let accessor = StoreAccessor::new(
+            default_req_ctx_support_snap_accessor().into(),
+            ConcurrencyManager::new_for_test(1.into()),
+        )
+        .unwrap();
+
+        // key is before any region, not found
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"a")).unwrap(),
+            FindRegionResult::with_not_found(Some(b"b".to_vec())),
+        );
+        // key is region start, found
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"b")).unwrap(),
+            FindRegionResult::with_found(r1.clone(), StateRole::Leader),
+        );
+        // key is in a region range, found
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"b1")).unwrap(),
+            FindRegionResult::with_found(r1.clone(), StateRole::Leader),
+        );
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"c")).unwrap(),
+            FindRegionResult::with_found(r1.clone(), StateRole::Leader),
+        );
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"c1")).unwrap(),
+            FindRegionResult::with_found(r1.clone(), StateRole::Leader),
+        );
+        // key is a region's end, but not any region's end, not found
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"d")).unwrap(),
+            FindRegionResult::with_not_found(Some(b"e".to_vec())),
+        );
+        // key is between a region's end and another region's start, not found
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"d1")).unwrap(),
+            FindRegionResult::with_not_found(Some(b"e".to_vec())),
+        );
+        // key is in a region, but the region is not a leader
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"e")).unwrap(),
+            FindRegionResult::with_found(r2.clone(), StateRole::Follower),
+        );
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"f")).unwrap(),
+            FindRegionResult::with_found(r2.clone(), StateRole::Follower),
+        );
+        // key is a region's end, and another region's start found
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"g")).unwrap(),
+            FindRegionResult::with_found(r3.clone(), StateRole::Leader),
+        );
+        // key is after all regions, not found without next_region_start
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"h")).unwrap(),
+            FindRegionResult::with_not_found(None),
+        );
+        assert_eq!(
+            block_on(accessor.find_region_by_key(b"i")).unwrap(),
+            FindRegionResult::with_not_found(None),
+        );
+
+        // clear_region_info_provider makes RocksEngine::seek_region returns error
+        unsafe { with_tls_engine(|e: &mut RocksEngine| e.clear_region_info_provider()) }
+        let err = block_on(accessor.find_region_by_key(b"a")).unwrap_err();
+        assert!(
+            err.to_string()
+                .contains("region_info_accessor is not available"),
+        );
+    }
+
+    #[test]
+    fn test_secondary_snap_store_accessor_get_local_region_storage() {
+        type StoreAccessor = ExtraSnapStoreAccessor<MockEngine>;
+        #[derive(Clone)]
+        struct TestCtx {
+            store_id: u64,
+            req_ctx: Arc<Mutex<ReqContextInner>>,
+            req_region: Arc<Mutex<metapb::Region>>,
+            req_ranges: Arc<Mutex<Vec<coppb::KeyRange>>>,
+            called: Arc<atomic::AtomicBool>,
+        }
+
+        impl TestCtx {
+            fn new_accessor(&self) -> StoreAccessor {
+                StoreAccessor::new(
+                    self.get_req_ctx(),
+                    ConcurrencyManager::new_for_test(1.into()),
+                )
+                .unwrap()
+            }
+
+            fn get_req_ctx(&self) -> ReqContext {
+                ReqContext(Arc::new(self.req_ctx.lock().unwrap().clone()))
+            }
+
+            fn get_req_region(&self) -> metapb::Region {
+                self.req_region.lock().unwrap().clone()
+            }
+
+            fn get_req_ranges(&self) -> Vec<coppb::KeyRange> {
+                self.req_ranges.lock().unwrap().clone()
+            }
+
+            fn get_local_region_storage_with_check(
+                &self,
+            ) -> StorageResult<SnapshotStore<<MockEngine as Engine>::Snap>> {
+                let accessor = &self.new_accessor();
+                assert!(!self.called.load(atomic::Ordering::SeqCst));
+                let result = block_on(
+                    accessor
+                        .get_local_region_storage(&self.get_req_region(), &self.get_req_ranges()),
+                );
+                let called = self.called.swap(false, atomic::Ordering::SeqCst);
+
+                if let Ok(ref store) = result {
+                    assert!(called);
+                    let req_ctx = self.get_req_ctx();
+                    let pb_ctx = &req_ctx.context;
+                    assert_eq!(store.get_start_ts(), req_ctx.txn_start_ts);
+                    assert_eq!(store.get_isolation_level(), pb_ctx.isolation_level);
+                    assert_eq!(store.is_fill_cache(), !pb_ctx.get_not_fill_cache());
+                    assert_eq!(store.get_by_pass_locks(), req_ctx.bypass_locks);
+                    assert_eq!(store.get_access_locks(), req_ctx.access_locks);
+                    // check_has_newer_ts_data should always be false to avoid caching the cop
+                    // response
+                    assert!(!store.is_check_has_newer_ts_data());
+                }
+
+                result
+            }
+        }
+
+        let test_ctx = {
+            let req_ctx = Arc::new(Mutex::new(default_req_ctx_support_snap_accessor()));
+            let store_id = req_ctx.lock().unwrap().context.get_peer().get_store_id();
+            assert!(store_id > 0);
+            TestCtx {
+                store_id,
+                req_ctx,
+                req_region: Arc::new(Mutex::new(metapb::Region {
+                    id: 123,
+                    start_key: b"a".to_vec(),
+                    end_key: b"z".to_vec(),
+                    peers: vec![
+                        metapb::Peer {
+                            id: 1,
+                            store_id: store_id - 1,
+                            ..Default::default()
+                        },
+                        metapb::Peer {
+                            id: 2,
+                            store_id,
+                            ..Default::default()
+                        },
+                        metapb::Peer {
+                            id: 3,
+                            store_id: store_id + 1,
+                            ..Default::default()
+                        },
+                    ]
+                    .into(),
+                    ..Default::default()
+                })),
+                req_ranges: Arc::new(Mutex::new(vec![coppb::KeyRange {
+                    start: b"a".to_vec(),
+                    end: b"b".to_vec(),
+                    ..Default::default()
+                }])),
+                called: Arc::new(atomic::AtomicBool::new(false)),
+            }
+        };
+
+        let test_ctx_for_engine = test_ctx.clone();
+        set_tls_engine(
+            MockEngineBuilder::from_rocks_engine(TestEngineBuilder::new().build().unwrap())
+                // set the hook to check the snap_ctx as the argument of Engine::async_snapshot
+                .set_pre_async_snapshot(move |snap_ctx| {
+                    let test_ctx = test_ctx_for_engine.clone();
+                    assert!(!test_ctx.called.swap(
+                        true,
+                        atomic::Ordering::SeqCst,
+                    ));
+
+                    let check_ctx = test_ctx.get_req_ctx();
+                    let check_region = test_ctx.get_req_region();
+                    // Currently, only leader read is supported in this test.
+                    assert!(!check_ctx.context.get_replica_read() && !check_ctx.context.get_stale_read());
+                    assert!(!check_ctx.ranges.is_empty());
+                    // snap_ctx.pb_ctx should be the same as ReqContext.context
+                    assert_eq!(snap_ctx.pb_ctx.clone(), check_ctx.context.clone());
+                    // snap_ctx.extra_snap_override should be present with the correct region info
+                    assert_eq!(
+                        snap_ctx.extra_region_override,
+                        Some(ExtraRegionOverride {
+                            region_id: check_region.id,
+                            region_epoch: check_region.get_region_epoch().clone(),
+                            peer: check_region.get_peers()[1].clone(),
+                            check_term: None,
+                        })
+                    );
+                    // should select a peer with the right store_id.
+                    assert_eq!(
+                        snap_ctx.extra_region_override.as_ref().unwrap().peer.store_id,
+                        test_ctx.store_id
+                    );
+                    // snapshot cache is not supported currently, so snap_ctx.read_id is always None.
+                    assert!(snap_ctx.read_id.is_none());
+                    // snap_ctx.start_ts should be the same as req_ctx.txn_start_ts
+                    assert!(check_ctx.txn_start_ts > TimeStamp::zero());
+                    assert_eq!(snap_ctx.start_ts, Some(check_ctx.txn_start_ts));
+                    // Even if req_ctx.ranges is not empty, snap_ctx.key_ranges should be empty in
+                    // leader read because leader read does not need to check keys locks.
+                    assert!(!test_ctx.get_req_ranges().is_empty());
+                    assert_eq!(snap_ctx.key_ranges.len(), 0);
+                    // not allowed in flashback
+                    assert!(!snap_ctx.allowed_in_flashback);
+                })
+                .build(),
+        );
+        defer! {
+            unsafe {destroy_tls_engine::<MockEngine>()}
+        }
+
+        // normal case
+        test_ctx
+            .get_local_region_storage_with_check()
+            .expect("should succeed");
+
+        // if set_not_fill_cache, it should work
+        {
+            let mut req_ctx = test_ctx.req_ctx.lock().unwrap();
+            // in previous test, get_not_fill_cache should return false.
+            assert!(!req_ctx.context.get_not_fill_cache());
+            req_ctx.context.set_not_fill_cache(true);
+        }
+        let store = test_ctx
+            .get_local_region_storage_with_check()
+            .expect("should succeed");
+        assert!(!store.is_fill_cache());
+
+        // cannot find peer
+        {
+            test_ctx.req_region.lock().unwrap().peers[1].store_id = 99999999;
+        }
+        let err = test_ctx
+            .get_local_region_storage_with_check()
+            .err()
+            .unwrap();
+        println!("error: {}", err);
+        assert!(err.to_string().contains("cannot find peer in region"));
+        {
+            test_ctx.req_region.lock().unwrap().peers[1].store_id = test_ctx.store_id;
+        }
+
+        // always not allow in flashback
+        {
+            test_ctx.req_ctx.lock().unwrap().allowed_in_flashback = true;
+        }
+        test_ctx
+            // snap_ctx.allowed_in_flashback will be validated in pre_async_snapshot func
+            .get_local_region_storage_with_check()
+            .expect("should succeed");
+
+        // should return error when engine returns error
+        unsafe {
+            with_tls_engine(|e: &mut MockEngine| e.rocks_engine().trigger_not_leader());
+        }
+        let err = test_ctx
+            .get_local_region_storage_with_check()
+            .err()
+            .unwrap();
+        assert!(err.to_string().contains("not_leader"));
+    }
+
+    #[test]
+    fn test_secondary_tikv_storage_accessor() {
+        set_tls_engine(TestEngineBuilder::new().build().unwrap());
+        defer! {
+            unsafe {destroy_tls_engine::<RocksEngine>()}
+        }
+        let def_req = default_req_ctx_support_snap_accessor();
+        let store_id = def_req.context.get_peer().get_store_id();
+        let store_accessor = ExtraSnapStoreAccessor::<RocksEngine>::new(
+            def_req.into(),
+            ConcurrencyManager::new_for_test(1.into()),
+        )
+        .unwrap();
+        let storage_accessor = dag::ExtraTiKVStorageAccessor::<
+            ExtraSnapStoreAccessor<RocksEngine>,
+        >::from_store_accessor(store_accessor);
+
+        let storage = block_on(
+            storage_accessor.get_local_region_storage(
+                &metapb::Region {
+                    id: 123,
+                    start_key: b"a".to_vec(),
+                    end_key: b"z".to_vec(),
+                    peers: vec![metapb::Peer {
+                        id: 1,
+                        store_id,
+                        ..Default::default()
+                    }]
+                    .into(),
+                    ..Default::default()
+                },
+                &[coppb::KeyRange {
+                    start: b"a".to_vec(),
+                    end: b"b".to_vec(),
+                    ..Default::default()
+                }],
+            ),
+        )
+        .unwrap();
+
+        // should always disable check_can_be_cached
+        assert!(storage.met_uncacheable_data().is_none());
+    }
+
+    #[test]
+    fn test_extra_snap_accessor_check_memory_locks() {
+        let mut engine = TestEngineBuilder::new().build().unwrap();
+        let region = metapb::Region {
+            id: 1,
+            start_key: b"".to_vec(),
+            end_key: b"".to_vec(),
+            peers: vec![metapb::Peer {
+                id: 1,
+                store_id: 100,
+                ..Default::default()
+            }]
+            .into(),
+            ..Default::default()
+        };
+        engine.set_region_info_provider(MockRegionInfoProvider::new(vec![region.clone()]));
+        set_tls_engine(engine);
+        defer! {
+            unsafe {destroy_tls_engine::<RocksEngine>()}
+        }
+
+        let cm = ConcurrencyManager::new_for_test(1.into());
+        let mut req = default_req_ctx_support_snap_accessor();
+        req.txn_start_ts = 100.into();
+        let accessor = ExtraSnapStoreAccessor::<RocksEngine>::new(req.into(), cm.clone()).unwrap();
+
+        let key = Key::from_raw(b"key");
+        let guard = block_on(cm.lock_key(&key));
+        guard.with_lock(|lock| {
+            *lock = Some(txn_types::Lock::new(
+                LockType::Put,
+                b"key".to_vec(),
+                10.into(),
+                100,
+                Some(vec![]),
+                0.into(),
+                1,
+                20.into(),
+                false,
+            ));
+        });
+
+        let err = block_on(accessor.get_local_region_storage(
+            &region,
+            &[coppb::KeyRange {
+                start: b"key".to_vec(),
+                end: b"key0".to_vec(),
+                ..Default::default()
+            }],
+        ))
+        .map_err(Error::from)
+        .err()
+        .unwrap();
+        assert_matches!(err, Error::Locked(LockInfo { key, .. }) if {
+            assert_eq!(key, b"key".to_vec());
+            true
+        });
+    }
 }
diff --git a/src/coprocessor/interceptors/concurrency_limiter.rs b/src/coprocessor/interceptors/concurrency_limiter.rs
index 196d398bf71..e79290c6b49 100644
--- a/src/coprocessor/interceptors/concurrency_limiter.rs
+++ b/src/coprocessor/interceptors/concurrency_limiter.rs
@@ -53,6 +53,7 @@ where
 enum LimitationState<'a> {
     NotLimited,
     Acquiring,
+    #[allow(dead_code)]
     Acuqired(SemaphorePermit<'a>),
 }
 
@@ -128,8 +129,8 @@ where
 mod tests {
     use std::{
         sync::{
-            atomic::{AtomicBool, Ordering},
             Arc,
+            atomic::{AtomicBool, Ordering},
         },
         thread,
     };
diff --git a/src/coprocessor/metrics.rs b/src/coprocessor/metrics.rs
index 309c407afc4..e5a1dfd6c3f 100644
--- a/src/coprocessor/metrics.rs
+++ b/src/coprocessor/metrics.rs
@@ -4,10 +4,11 @@ use std::{cell::RefCell, mem, sync::Arc};
 
 use collections::HashMap;
 use kvproto::{metapb, pdpb::QueryKind};
+use lazy_static::lazy_static;
 use pd_client::{BucketMeta, RegionWriteCfCopDetail};
 use prometheus::*;
 use prometheus_static_metric::*;
-use raftstore::store::{util::build_key_range, ReadStats};
+use raftstore::store::{ReadStats, util::build_key_range};
 use tikv_util::memory::MemoryQuota;
 
 use crate::{
diff --git a/src/coprocessor/mod.rs b/src/coprocessor/mod.rs
index 822767f0e2a..b84904d1831 100644
--- a/src/coprocessor/mod.rs
+++ b/src/coprocessor/mod.rs
@@ -35,17 +35,16 @@ pub mod readpool_impl;
 mod statistics;
 mod tracker;
 
-use std::sync::Arc;
+use std::{ops::Deref, sync::Arc};
 
 use async_trait::async_trait;
 pub use checksum::checksum_crc64_xor;
 use engine_traits::PerfLevel;
 use kvproto::{coprocessor as coppb, kvrpcpb};
 use lazy_static::lazy_static;
-use metrics::ReqTag;
 use rand::prelude::*;
 use tidb_query_common::execute_stats::ExecSummary;
-use tikv_alloc::{mem_trace, Id, MemoryTrace, MemoryTraceGuard};
+use tikv_alloc::{Id, MemoryTrace, MemoryTraceGuard, mem_trace};
 use tikv_util::{deadline::Deadline, memory::HeapSize, time::Duration};
 use txn_types::TsSet;
 
@@ -53,7 +52,7 @@ pub use self::{
     endpoint::Endpoint,
     error::{Error, Result},
 };
-use crate::storage::{mvcc::TimeStamp, Statistics};
+use crate::storage::{Statistics, mvcc::TimeStamp};
 
 pub const REQ_TYPE_DAG: i64 = 103;
 pub const REQ_TYPE_ANALYZE: i64 = 104;
@@ -97,12 +96,9 @@ pub trait RequestHandler: Send {
 type RequestHandlerBuilder<Snap> =
     Box<dyn for<'a> FnOnce(Snap, &ReqContext) -> Result<Box<dyn RequestHandler>> + Send>;
 
-/// Encapsulate the `kvrpcpb::Context` to provide some extra properties.
-#[derive(Debug, Clone)]
-pub struct ReqContext {
-    /// The tag of the request
-    pub tag: ReqTag,
-
+/// The inner state of ReqContext.
+#[derive(Debug, Clone, PartialEq)]
+pub struct ReqContextInner {
     /// The rpc context carried in the request
     pub context: kvrpcpb::Context,
 
@@ -150,19 +146,9 @@ pub struct ReqContext {
     pub allowed_in_flashback: bool,
 }
 
-impl HeapSize for ReqContext {
-    fn approximate_heap_size(&self) -> usize {
-        self.context.approximate_heap_size()
-            + self.ranges.approximate_heap_size()
-            + self.peer.as_ref().map_or(0, |p| p.as_bytes().len())
-            + self.lower_bound.approximate_heap_size()
-            + self.upper_bound.approximate_heap_size()
-    }
-}
-
-impl ReqContext {
+impl ReqContextInner {
+    #[inline]
     pub fn new(
-        tag: ReqTag,
         mut context: kvrpcpb::Context,
         ranges: Vec<coppb::KeyRange>,
         max_handle_duration: Duration,
@@ -171,6 +157,7 @@ impl ReqContext {
         txn_start_ts: TimeStamp,
         cache_match_version: Option<u64>,
         perf_level: PerfLevel,
+        allowed_in_flashback: bool,
     ) -> Self {
         let mut deadline_duration = max_handle_duration;
         if context.max_execution_duration_ms > 0 {
@@ -188,7 +175,6 @@ impl ReqContext {
             None => vec![],
         };
         Self {
-            tag,
             context,
             deadline,
             peer,
@@ -201,14 +187,13 @@ impl ReqContext {
             lower_bound,
             upper_bound,
             perf_level,
-            allowed_in_flashback: false,
+            allowed_in_flashback,
         }
     }
 
     #[cfg(test)]
     pub fn default_for_test() -> Self {
         Self::new(
-            ReqTag::test,
             Default::default(),
             Vec::new(),
             Duration::from_secs(100),
@@ -217,13 +202,77 @@ impl ReqContext {
             TimeStamp::max(),
             None,
             PerfLevel::EnableCount,
+            false,
+        )
+    }
+}
+
+/// ReqContext provides the context for the coprocessor request.
+/// It Encapsulate the `kvrpcpb::Context` to provide some extra properties.
+/// It is immutable and can be shared across threads.
+#[derive(Debug, Clone, PartialEq)]
+pub struct ReqContext(Arc<ReqContextInner>);
+
+impl Deref for ReqContext {
+    type Target = Arc<ReqContextInner>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl HeapSize for ReqContext {
+    fn approximate_heap_size(&self) -> usize {
+        self.0.context.approximate_heap_size()
+            + self.0.ranges.approximate_heap_size()
+            + self.0.peer.as_ref().map_or(0, |p| p.len())
+            + self.0.lower_bound.approximate_heap_size()
+            + self.0.upper_bound.approximate_heap_size()
+    }
+}
+
+impl From<ReqContextInner> for ReqContext {
+    fn from(inner: ReqContextInner) -> Self {
+        Self(Arc::new(inner))
+    }
+}
+
+impl ReqContext {
+    #[inline]
+    pub fn new(
+        context: kvrpcpb::Context,
+        ranges: Vec<coppb::KeyRange>,
+        max_handle_duration: Duration,
+        peer: Option<String>,
+        is_desc_scan: Option<bool>,
+        txn_start_ts: TimeStamp,
+        cache_match_version: Option<u64>,
+        perf_level: PerfLevel,
+        allowed_in_flashback: bool,
+    ) -> Self {
+        ReqContextInner::new(
+            context,
+            ranges,
+            max_handle_duration,
+            peer,
+            is_desc_scan,
+            txn_start_ts,
+            cache_match_version,
+            perf_level,
+            allowed_in_flashback,
         )
+        .into()
+    }
+
+    #[cfg(test)]
+    pub fn default_for_test() -> Self {
+        ReqContextInner::default_for_test().into()
     }
 
     pub fn build_task_id(&self) -> u64 {
         const ID_SHIFT: u32 = 16;
-        const MASK: u64 = u64::max_value() >> ID_SHIFT;
-        const MAX_TS: u64 = u64::max_value();
+        const MASK: u64 = u64::MAX >> ID_SHIFT;
+        const MAX_TS: u64 = u64::MAX;
         let base = match self.txn_start_ts.into_inner() {
             0 | MAX_TS => thread_rng().next_u64(),
             start_ts => start_ts,
@@ -257,7 +306,6 @@ mod tests {
         max_handle_duration: Duration,
     ) -> ReqContext {
         ReqContext::new(
-            ReqTag::test,
             context,
             Vec::new(),
             max_handle_duration,
@@ -266,18 +314,21 @@ mod tests {
             TimeStamp::max(),
             None,
             PerfLevel::EnableCount,
+            false,
         )
     }
 
     #[test]
     fn test_build_task_id() {
-        let mut ctx = ReqContext::default_for_test();
+        let mut inner = ReqContextInner::default_for_test();
         let start_ts: u64 = 0x05C6_1BFA_2648_324A;
-        ctx.txn_start_ts = start_ts.into();
-        ctx.context.set_task_id(1);
+        inner.txn_start_ts = start_ts.into();
+        inner.context.set_task_id(1);
+        let ctx: ReqContext = inner.clone().into();
         assert_eq!(ctx.build_task_id(), 0x0001_1BFA_2648_324A);
 
-        ctx.context.set_task_id(0);
+        inner.context.set_task_id(0);
+        let ctx: ReqContext = inner.clone().into();
         assert_eq!(ctx.build_task_id(), start_ts);
     }
 
@@ -303,4 +354,59 @@ mod tests {
             .check()
             .expect("deadline should not exceed");
     }
+
+    #[test]
+    fn test_req_ctx_new_match_inner() {
+        let pb_ctx = kvrpcpb::Context {
+            region_id: 12345,
+            ..Default::default()
+        };
+        let ranges = vec![coppb::KeyRange {
+            start: vec![1, 2, 3],
+            end: vec![4, 5, 6],
+            ..Default::default()
+        }];
+        let max_handle_duration = Duration::from_secs(100);
+        let peer = Some(String::from("1223"));
+        let is_desc_scan = Some(true);
+        let txn_start_ts = TimeStamp::new(9898);
+        let cache_match_version = Some(42);
+        let perf_level = PerfLevel::EnableCount;
+        let allow_in_flashback = true;
+
+        let mut inner = ReqContextInner::new(
+            pb_ctx.clone(),
+            ranges.clone(),
+            max_handle_duration,
+            peer.clone(),
+            is_desc_scan,
+            txn_start_ts,
+            cache_match_version,
+            perf_level,
+            allow_in_flashback,
+        );
+
+        let ctx = ReqContext::new(
+            pb_ctx,
+            ranges,
+            max_handle_duration,
+            peer,
+            is_desc_scan,
+            txn_start_ts,
+            cache_match_version,
+            perf_level,
+            allow_in_flashback,
+        );
+
+        // deadlines are not exactly equal, just compare the delta
+        assert!(
+            ctx.deadline.inner().duration_since(inner.deadline.inner()) < Duration::from_secs(1),
+            "{:?} - {:?} > 1s",
+            ctx.deadline,
+            inner.deadline
+        );
+        inner.deadline = ctx.deadline;
+        // test ReqContextInner::new and ReqContext::new should match
+        assert_eq!(ctx.0.as_ref().clone(), inner);
+    }
 }
diff --git a/src/coprocessor/readpool_impl.rs b/src/coprocessor/readpool_impl.rs
index 45f6b9bcc73..471e00eaae6 100644
--- a/src/coprocessor/readpool_impl.rs
+++ b/src/coprocessor/readpool_impl.rs
@@ -2,15 +2,15 @@
 
 use std::sync::{Arc, Mutex};
 
-use file_system::{set_io_type, IoType};
+use file_system::{IoType, set_io_type};
 use tikv_util::yatp_pool::{Config, DefaultTicker, FuturePool, PoolTicker, YatpPoolBuilder};
 
 use super::metrics::*;
 use crate::{
     config::CoprReadPoolConfig,
     storage::{
-        kv::{destroy_tls_engine, set_tls_engine},
         Engine, FlowStatsReporter,
+        kv::{destroy_tls_engine, set_tls_engine},
     },
 };
 
diff --git a/src/coprocessor/statistics/analyze.rs b/src/coprocessor/statistics/analyze.rs
index 16821166edb..07dc516739b 100644
--- a/src/coprocessor/statistics/analyze.rs
+++ b/src/coprocessor/statistics/analyze.rs
@@ -5,28 +5,28 @@ use std::{cmp::Reverse, collections::BinaryHeap, hash::Hasher, mem, sync::Arc};
 use api_version::KvFormat;
 use kvproto::coprocessor::KeyRange;
 use mur3::Hasher128;
-use rand::{rngs::StdRng, Rng};
+use rand::{Rng, rngs::StdRng};
 use tidb_query_datatype::{
+    FieldTypeAccessor,
     codec::{
-        datum::{encode_value, Datum, DatumDecoder, DURATION_FLAG, INT_FLAG, NIL_FLAG, UINT_FLAG},
+        datum::{DURATION_FLAG, Datum, DatumDecoder, INT_FLAG, NIL_FLAG, UINT_FLAG, encode_value},
         table,
     },
     def::Collation,
     expr::{EvalConfig, EvalContext},
-    FieldTypeAccessor,
 };
-use tidb_query_executors::{interface::BatchExecutor, BatchTableScanExecutor};
+use tidb_query_executors::{BatchTableScanExecutor, interface::BatchExecutor};
 use tidb_query_expr::BATCH_MAX_SIZE;
 use tikv_alloc::trace::TraceEvent;
 use tikv_util::{
-    metrics::{ThrottleType, NON_TXN_COMMAND_THROTTLE_TIME_COUNTER_VEC_STATIC},
+    metrics::{NON_TXN_COMMAND_THROTTLE_TIME_COUNTER_VEC_STATIC, ThrottleType},
     quota_limiter::QuotaLimiter,
 };
 use tipb::{self, AnalyzeColumnsReq};
 
 use super::{cmsketch::CmSketch, fmsketch::FmSketch, histogram::Histogram};
 use crate::{
-    coprocessor::{dag::TikvStorage, MEMTRACE_ANALYZE, *},
+    coprocessor::{MEMTRACE_ANALYZE, dag::TikvStorage, *},
     storage::{Snapshot, SnapshotStore},
 };
 
@@ -211,9 +211,11 @@ trait RowSampleCollector: Send {
     );
     fn sampling(&mut self, data: &[Vec<u8>]);
     fn to_proto(&mut self) -> tipb::RowSampleCollector;
+    #[allow(dead_code)]
     fn get_reported_memory_usage(&mut self) -> usize {
         self.mut_base().reported_memory_usage
     }
+    #[allow(dead_code)]
     fn get_memory_usage(&mut self) -> usize {
         self.mut_base().memory_usage
     }
@@ -1059,11 +1061,11 @@ mod tests {
 #[cfg(test)]
 mod benches {
     use tidb_query_datatype::{
+        EvalType, FieldTypeTp,
         codec::{
             batch::LazyBatchColumn,
-            collation::{collator::CollatorUtf8Mb4Bin, Collator},
+            collation::{Collator, collator::CollatorUtf8Mb4Bin},
         },
-        EvalType, FieldTypeTp,
     };
 
     use super::*;
diff --git a/src/coprocessor/statistics/analyze_context.rs b/src/coprocessor/statistics/analyze_context.rs
index d3058a147e9..d18b5d5dfda 100644
--- a/src/coprocessor/statistics/analyze_context.rs
+++ b/src/coprocessor/statistics/analyze_context.rs
@@ -2,13 +2,13 @@
 
 use std::{cmp::Reverse, collections::BinaryHeap, marker::PhantomData, sync::Arc};
 
-use api_version::{keyspace::KvPair, KvFormat};
+use api_version::{KvFormat, keyspace::KvPair};
 use async_trait::async_trait;
 use kvproto::coprocessor::{KeyRange, Response};
 use protobuf::Message;
 use tidb_query_common::storage::{
-    scanner::{RangesScanner, RangesScannerOptions},
     Range,
+    scanner::{RangesScanner, RangesScannerOptions},
 };
 use tidb_query_datatype::codec::{datum::split_datum, table};
 use tidb_query_executors::interface::BatchExecutor;
@@ -19,11 +19,12 @@ use tipb::{self, AnalyzeIndexReq, AnalyzeReq, AnalyzeType};
 use super::{cmsketch::CmSketch, fmsketch::FmSketch, histogram::Histogram};
 use crate::{
     coprocessor::{
+        MEMTRACE_ANALYZE,
         dag::TikvStorage,
         statistics::analyze::{
             AnalyzeIndexResult, AnalyzeMixedResult, RowSampleBuilder, SampleBuilder,
         },
-        MEMTRACE_ANALYZE, *,
+        *,
     },
     storage::{Snapshot, SnapshotStore, Statistics},
 };
diff --git a/src/coprocessor/statistics/cmsketch.rs b/src/coprocessor/statistics/cmsketch.rs
index 2663df4e4b9..6ff18940cb1 100644
--- a/src/coprocessor/statistics/cmsketch.rs
+++ b/src/coprocessor/statistics/cmsketch.rs
@@ -93,7 +93,7 @@ mod tests {
     use std::{cmp::min, slice::from_ref};
 
     use collections::HashMap;
-    use rand::{distributions::Distribution, rngs::StdRng, SeedableRng};
+    use rand::{SeedableRng, distributions::Distribution, rngs::StdRng};
     use tidb_query_datatype::{
         codec::{datum, datum::Datum},
         expr::EvalContext,
@@ -106,7 +106,7 @@ mod tests {
         fn query(&self, bytes: &[u8]) -> u32 {
             let (h1, h2) = CmSketch::hash(bytes);
             let mut vals = vec![0u32; self.depth];
-            let mut min_counter = u32::max_value();
+            let mut min_counter = u32::MAX;
             for (i, row) in self.table.iter().enumerate() {
                 let j = (h1.wrapping_add(h2.wrapping_mul(i as u64)) % self.width as u64) as usize;
                 let noise = (self.count - row[j]) / (self.width as u32 - 1);
diff --git a/src/coprocessor/statistics/fmsketch.rs b/src/coprocessor/statistics/fmsketch.rs
index 2978f62cb30..ebab5567793 100644
--- a/src/coprocessor/statistics/fmsketch.rs
+++ b/src/coprocessor/statistics/fmsketch.rs
@@ -93,10 +93,10 @@ impl From<FmSketch> for tipb::FmSketch {
 
 #[cfg(test)]
 mod tests {
-    use std::{iter::repeat, slice::from_ref};
+    use std::{iter::repeat_n, slice::from_ref};
 
     use tidb_query_datatype::{
-        codec::{datum, datum::Datum, Result},
+        codec::{Result, datum, datum::Datum},
         expr::EvalContext,
     };
 
@@ -111,7 +111,7 @@ mod tests {
     fn generate_samples(count: usize) -> Vec<Datum> {
         let start = 1000;
         let mut samples: Vec<usize> = (0..1)
-            .chain(repeat(2).take(start - 1))
+            .chain(repeat_n(2, start - 1))
             .chain(1000..count)
             .collect();
         let mut id = start;
diff --git a/src/coprocessor/statistics/histogram.rs b/src/coprocessor/statistics/histogram.rs
index f499cfbc3ee..0b41e17ea06 100644
--- a/src/coprocessor/statistics/histogram.rs
+++ b/src/coprocessor/statistics/histogram.rs
@@ -138,7 +138,7 @@ impl Histogram {
 
     // It merges every two neighbor buckets.
     fn merge_buckets(&mut self) {
-        let bucket_num = (self.buckets_num + 1) / 2;
+        let bucket_num = self.buckets_num.div_ceil(2);
         if self.buckets_num > 1 {
             let (left, right) = self.buckets.split_at_mut(1);
             mem::swap(&mut left[0].upper_bound, &mut right[0].upper_bound);
@@ -179,7 +179,7 @@ impl From<Histogram> for tipb::Histogram {
 
 #[cfg(test)]
 mod tests {
-    use std::iter::repeat;
+    use std::iter::repeat_n;
 
     use tidb_query_datatype::{
         codec::{datum, datum::Datum},
@@ -215,7 +215,7 @@ mod tests {
         assert_eq!(hist.ndv, 4);
 
         // push repeated item
-        for item in repeat(3).take(3).map(Datum::I64) {
+        for item in repeat_n(3, 3).map(Datum::I64) {
             let bytes = datum::encode_value(&mut EvalContext::default(), &[item]).unwrap();
             hist.append(&bytes, false);
         }
@@ -226,7 +226,7 @@ mod tests {
         assert_eq!(hist.buckets.len(), 2);
         assert_eq!(hist.ndv, 4);
 
-        for item in repeat(4).take(4).map(Datum::I64) {
+        for item in repeat_n(4, 4).map(Datum::I64) {
             let bytes = datum::encode_value(&mut EvalContext::default(), &[item]).unwrap();
             hist.append(&bytes, false);
         }
diff --git a/src/coprocessor/tracker.rs b/src/coprocessor/tracker.rs
index caac809a0c9..2dee6067e6d 100644
--- a/src/coprocessor/tracker.rs
+++ b/src/coprocessor/tracker.rs
@@ -2,7 +2,7 @@
 
 use std::{cell::RefCell, marker::PhantomData};
 
-use ::tracker::{get_tls_tracker_token, with_tls_tracker, FutureTrack};
+use ::tracker::{FutureTrack, get_tls_tracker_token, with_tls_tracker};
 use engine_traits::{PerfContext, PerfContextExt, PerfContextKind};
 use kvproto::{kvrpcpb, kvrpcpb::ScanDetailV2};
 use pd_client::BucketMeta;
@@ -79,6 +79,8 @@ pub struct Tracker<E: Engine> {
     // Request info, used to print slow log.
     pub req_ctx: ReqContext,
 
+    req_tag: ReqTag,
+
     _phantom: PhantomData<fn() -> E>,
 }
 
@@ -86,7 +88,7 @@ impl<E: Engine> Tracker<E> {
     /// Initialize the tracker. Normally it is called outside future pool's
     /// factory context, because the future pool might be full and we need
     /// to wait it. This kind of wait time has to be recorded.
-    pub fn new(req_ctx: ReqContext, slow_log_threshold: Duration) -> Self {
+    pub fn new(req_ctx: ReqContext, req_tag: ReqTag, slow_log_threshold: Duration) -> Self {
         let now = Instant::now();
         Tracker {
             request_begin_at: now,
@@ -104,6 +106,7 @@ impl<E: Engine> Tracker<E> {
             scan_process_time_ns: 0,
             slow_log_threshold,
             req_ctx,
+            req_tag,
             buckets: None,
             _phantom: PhantomData,
         }
@@ -111,10 +114,10 @@ impl<E: Engine> Tracker<E> {
 
     pub fn adjust_snapshot_type(&mut self, region_cache_engine: bool) {
         if region_cache_engine {
-            if self.req_ctx.tag == ReqTag::select {
-                self.req_ctx.tag = ReqTag::select_by_in_memory_engine;
-            } else if self.req_ctx.tag == ReqTag::index {
-                self.req_ctx.tag = ReqTag::index_by_in_memory_engine;
+            if self.req_tag == ReqTag::select {
+                self.req_tag = ReqTag::select_by_in_memory_engine;
+            } else if self.req_tag == ReqTag::index {
+                self.req_tag = ReqTag::index_by_in_memory_engine;
             }
         }
     }
@@ -300,7 +303,7 @@ impl<E: Engine> Tracker<E> {
                     "total_suspend_time" => ?self.total_suspend_time,
                     "txn_start_ts" => self.req_ctx.txn_start_ts,
                     "table_id" => some_table_id,
-                    "tag" => self.req_ctx.tag.get_str(),
+                    "tag" => self.req_tag.get_str(),
                     "scan.is_desc" => self.req_ctx.is_desc_scan,
                     "scan.processed" => total_storage_stats.write.processed_keys,
                     "scan.processed_size" => total_storage_stats.processed_size,
@@ -320,65 +323,61 @@ impl<E: Engine> Tracker<E> {
 
         // req time
         COPR_REQ_HISTOGRAM_STATIC
-            .get(self.req_ctx.tag)
+            .get(self.req_tag)
             .observe(time::duration_to_sec(self.req_lifetime));
 
         // wait time
         COPR_REQ_WAIT_TIME_STATIC
-            .get(self.req_ctx.tag)
+            .get(self.req_tag)
             .all
             .observe(time::duration_to_sec(self.wait_time));
 
         // schedule wait time
         COPR_REQ_WAIT_TIME_STATIC
-            .get(self.req_ctx.tag)
+            .get(self.req_tag)
             .schedule
             .observe(time::duration_to_sec(self.schedule_wait_time));
 
         // snapshot wait time
         COPR_REQ_WAIT_TIME_STATIC
-            .get(self.req_ctx.tag)
+            .get(self.req_tag)
             .snapshot
             .observe(time::duration_to_sec(self.snapshot_wait_time));
 
         // handler build time
         COPR_REQ_HANDLER_BUILD_TIME_STATIC
-            .get(self.req_ctx.tag)
+            .get(self.req_tag)
             .observe(time::duration_to_sec(self.handler_build_time));
 
         // handle time
         COPR_REQ_HANDLE_TIME_STATIC
-            .get(self.req_ctx.tag)
+            .get(self.req_tag)
             .observe(time::duration_to_sec(self.total_process_time));
 
         // scan keys
         COPR_SCAN_KEYS_STATIC
-            .get(self.req_ctx.tag)
+            .get(self.req_tag)
             .total
             .observe(total_storage_stats.write.total_op_count() as f64);
         COPR_SCAN_KEYS_STATIC
-            .get(self.req_ctx.tag)
+            .get(self.req_tag)
             .processed_keys
             .observe(total_storage_stats.write.processed_keys as f64);
 
-        tls_collect_scan_details(self.req_ctx.tag, &total_storage_stats);
+        tls_collect_scan_details(self.req_tag, &total_storage_stats);
 
         let peer = self.req_ctx.context.get_peer();
         let region_id = self.req_ctx.context.get_region_id();
         let start_key = Key::from_raw(&self.req_ctx.lower_bound);
         let end_key = Key::from_raw(&self.req_ctx.upper_bound);
-        let reverse_scan = if let Some(reverse_scan) = self.req_ctx.is_desc_scan {
-            reverse_scan
-        } else {
-            false
-        };
+        let reverse_scan = self.req_ctx.is_desc_scan.unwrap_or(false);
 
         // only collect metrics for select and index, exclude transient read flow such
         // like analyze and checksum.
-        if self.req_ctx.tag == ReqTag::select
-            || self.req_ctx.tag == ReqTag::index
-            || self.req_ctx.tag == ReqTag::select_by_in_memory_engine
-            || self.req_ctx.tag == ReqTag::index_by_in_memory_engine
+        if self.req_tag == ReqTag::select
+            || self.req_tag == ReqTag::index
+            || self.req_tag == ReqTag::select_by_in_memory_engine
+            || self.req_tag == ReqTag::index_by_in_memory_engine
         {
             tls_collect_query(
                 region_id,
@@ -414,7 +413,7 @@ impl<E: Engine> Tracker<E> {
             static CHECKSUM_INDEX: RefCell<Option<Box<dyn PerfContext>>> = RefCell::new(None);
             static TEST: RefCell<Option<Box<dyn PerfContext>>> = RefCell::new(None);
         }
-        let tls_cell = match self.req_ctx.tag {
+        let tls_cell = match self.req_tag {
             ReqTag::select => &SELECT,
             ReqTag::select_by_in_memory_engine => &SELECT_BY_IN_MEMORY_ENGINE,
             ReqTag::index => &INDEX,
@@ -431,7 +430,7 @@ impl<E: Engine> Tracker<E> {
             let perf_context: &mut Box<dyn PerfContext> = c.get_or_insert_with(|| {
                 Box::new(E::Local::get_perf_context(
                     PerfLevel::Uninitialized,
-                    PerfContextKind::Coprocessor(self.req_ctx.tag.get_str()),
+                    PerfContextKind::Coprocessor(self.req_tag.get_str()),
                 )) as Box<dyn PerfContext>
             });
             f(perf_context)
@@ -499,7 +498,7 @@ impl<E: Engine> Drop for Tracker<E> {
                 "total_suspend_time" => ?self.total_suspend_time,
                 "txn_start_ts" => self.req_ctx.txn_start_ts,
                 "table_id" => some_table_id,
-                "tag" => self.req_ctx.tag.get_str(),
+                "tag" => self.req_tag.get_str(),
             );
         }
     }
@@ -523,16 +522,15 @@ mod tests {
     use pd_client::BucketMeta;
     use tikv_kv::RocksEngine;
 
-    use super::{PerfLevel, ReqContext, ReqTag, TimeStamp, Tracker, TLS_COP_METRICS};
-    use crate::storage::Statistics;
+    use super::{PerfLevel, ReqTag, TLS_COP_METRICS, TimeStamp, Tracker};
+    use crate::{coprocessor::ReqContextInner, storage::Statistics};
 
     #[test]
     fn test_track() {
         let check = move |tag: ReqTag, flow: u64| {
             let mut context = kvrpcpb::Context::default();
             context.set_region_id(1);
-            let mut req_ctx = ReqContext::new(
-                tag,
+            let mut req_ctx_inner = ReqContextInner::new(
                 context,
                 vec![],
                 Duration::from_secs(0),
@@ -541,15 +539,17 @@ mod tests {
                 TimeStamp::max(),
                 None,
                 PerfLevel::EnableCount,
+                false,
             );
 
-            req_ctx.lower_bound = vec![
+            req_ctx_inner.lower_bound = vec![
                 116, 128, 0, 0, 0, 0, 0, 0, 184, 95, 114, 128, 0, 0, 0, 0, 0, 70, 67,
             ];
-            req_ctx.upper_bound = vec![
+            req_ctx_inner.upper_bound = vec![
                 116, 128, 0, 0, 0, 0, 0, 0, 184, 95, 114, 128, 0, 0, 0, 0, 0, 70, 167,
             ];
-            let mut track: Tracker<RocksEngine> = Tracker::new(req_ctx, Duration::default());
+            let mut track: Tracker<RocksEngine> =
+                Tracker::new(req_ctx_inner.into(), tag, Duration::default());
             let mut bucket = BucketMeta::default();
             bucket.region_id = 1;
             bucket.version = 1;
@@ -594,13 +594,12 @@ mod tests {
                             .read_keys[0]
                     );
                 } else {
-                    assert!(m.borrow().local_read_stats().region_infos.get(&1).is_none());
+                    assert!(!m.borrow().local_read_stats().region_infos.contains_key(&1));
                     assert!(
-                        m.borrow()
+                        !m.borrow()
                             .local_read_stats()
                             .region_buckets
-                            .get(&1)
-                            .is_none()
+                            .contains_key(&1)
                     );
                 }
 
diff --git a/src/coprocessor_v2/endpoint.rs b/src/coprocessor_v2/endpoint.rs
index da6d4aa8521..ea0081f26ec 100644
--- a/src/coprocessor_v2/endpoint.rs
+++ b/src/coprocessor_v2/endpoint.rs
@@ -8,7 +8,7 @@ use kvproto::kvrpcpb;
 use semver::VersionReq;
 
 use super::{config::Config, plugin_registry::PluginRegistry, raw_storage_impl::RawStorageImpl};
-use crate::storage::{self, lock_manager::LockManager, Engine, Storage};
+use crate::storage::{self, Engine, Storage, lock_manager::LockManager};
 
 #[allow(clippy::large_enum_variant)]
 enum CoprocessorError {
diff --git a/src/coprocessor_v2/plugin_registry.rs b/src/coprocessor_v2/plugin_registry.rs
index ee8d9cdc13b..f56edaed29d 100644
--- a/src/coprocessor_v2/plugin_registry.rs
+++ b/src/coprocessor_v2/plugin_registry.rs
@@ -5,7 +5,7 @@ use std::{
     ffi::{OsStr, OsString},
     ops::Range,
     path::{Path, PathBuf},
-    sync::{mpsc, Arc, RwLock},
+    sync::{Arc, RwLock, mpsc},
     thread,
     time::Duration,
 };
@@ -32,9 +32,7 @@ pub enum PluginLoadingError {
         tikv_rustc: String,
     },
 
-    #[error(
-        "target mismatch: plugin was compiled for {plugin_target}, but TiKV for {tikv_target}"
-    )]
+    #[error("target mismatch: plugin was compiled for {plugin_target}, but TiKV for {tikv_target}")]
     TargetMismatch {
         plugin_target: String,
         tikv_target: String,
diff --git a/src/coprocessor_v2/raw_storage_impl.rs b/src/coprocessor_v2/raw_storage_impl.rs
index d453c23819b..063b2f9ddc4 100644
--- a/src/coprocessor_v2/raw_storage_impl.rs
+++ b/src/coprocessor_v2/raw_storage_impl.rs
@@ -10,11 +10,10 @@ use kvproto::kvrpcpb::Context;
 use tikv_util::future::paired_future_callback;
 
 use crate::storage::{
-    self,
+    self, Engine, Storage,
     errors::extract_kv_pairs,
     kv::{Error as KvError, ErrorInner as KvErrorInner},
     lock_manager::LockManager,
-    Engine, Storage,
 };
 
 /// Implementation of the [`RawStorage`] trait.
@@ -215,7 +214,7 @@ mod test {
     use kvproto::kvrpcpb::{ApiVersion, Context};
 
     use super::*;
-    use crate::storage::{lock_manager::MockLockManager, TestStorageBuilder};
+    use crate::storage::{TestStorageBuilder, lock_manager::MockLockManager};
 
     #[tokio::test]
     async fn test_storage_api() {
diff --git a/src/import/duplicate_detect.rs b/src/import/duplicate_detect.rs
index 7b99645c113..7bafb26e58c 100644
--- a/src/import/duplicate_detect.rs
+++ b/src/import/duplicate_detect.rs
@@ -1,6 +1,6 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_traits::{IterOptions, CF_DEFAULT, CF_WRITE, DATA_KEY_PREFIX_LEN};
+use engine_traits::{CF_DEFAULT, CF_WRITE, DATA_KEY_PREFIX_LEN, IterOptions};
 use kvproto::import_sstpb::{DuplicateDetectResponse, KvPair};
 use sst_importer::{Error, Result};
 use tikv_kv::{Iterator as kvIterator, Snapshot};
@@ -247,9 +247,9 @@ mod tests {
 
     use super::*;
     use crate::storage::{
+        Storage, TestStorageBuilderApiV1,
         lock_manager::{LockManager, MockLockManager},
         txn::commands,
-        Storage, TestStorageBuilderApiV1,
     };
 
     fn prewrite_data<E: Engine, L: LockManager, F: KvFormat>(
diff --git a/src/import/ingest.rs b/src/import/ingest.rs
index 7ce8d6ca0d1..7ded29d5bdc 100644
--- a/src/import/ingest.rs
+++ b/src/import/ingest.rs
@@ -5,20 +5,20 @@ use std::{
     future::Future,
     path::PathBuf,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc, Mutex,
+        atomic::{AtomicU64, Ordering},
     },
     time::Duration,
 };
 
-use engine_traits::{KvEngine, CF_WRITE};
+use engine_traits::{CF_WRITE, KvEngine};
 use kvproto::{
     errorpb,
     import_sstpb::{Error as ImportPbError, SstMeta, SwitchMode, *},
     kvrpcpb::Context,
 };
 use raftstore_v2::StoreMeta;
-use sst_importer::{metrics::*, sst_meta_to_path, Error, Result, SstImporter};
+use sst_importer::{Error, Result, SstImporter, metrics::*, sst_meta_to_path};
 use tikv_kv::{
     Engine, LocalTablets, Modify, SnapContext, Snapshot, SnapshotExt, WriteData, WriteEvent,
 };
@@ -28,19 +28,25 @@ use super::{pb_error_inc, raft_writer::wait_write};
 use crate::storage::{self, errors::extract_region_error_from_error};
 
 #[derive(Default)]
-pub(super) struct IngestLatch(Mutex<HashSet<PathBuf>>);
+pub(super) struct IngestLatch(Mutex<HashSet<(String /* cf_name */, PathBuf)>>);
 
 impl IngestLatch {
     pub(super) fn acquire_lock(&self, meta: &SstMeta) -> Result<bool> {
         let mut slots = self.0.lock().unwrap();
         let p = sst_meta_to_path(meta)?;
-        Ok(slots.insert(p))
+        Ok(slots.insert((meta.get_cf_name().to_string(), p)))
     }
 
     pub(super) fn release_lock(&self, meta: &SstMeta) -> Result<bool> {
         let mut slots = self.0.lock().unwrap();
         let p = sst_meta_to_path(meta)?;
-        Ok(slots.remove(&p))
+        Ok(slots.remove(&(meta.get_cf_name().to_string(), p)))
+    }
+
+    pub(super) fn count_ssts_in_cf(&self, cf_name: &str) -> usize {
+        let slots = self.0.lock().unwrap();
+        let cnt = slots.iter().filter(|(cf, _)| cf == cf_name).count();
+        cnt
     }
 }
 
@@ -94,6 +100,7 @@ fn check_write_stall<E: KvEngine>(
     tablets: &LocalTablets<E>,
     store_meta: &Option<Arc<Mutex<StoreMeta<E>>>>,
     importer: &SstImporter<E>,
+    inflight_write_cf_sst_cnt: u64,
 ) -> Option<errorpb::Error> {
     let tablet = match tablets.get(region_id) {
         Some(tablet) => tablet,
@@ -123,7 +130,9 @@ fn check_write_stall<E: KvEngine>(
     if let Some(ref store_meta) = store_meta {
         if let Some((region, _)) = store_meta.lock().unwrap().regions.get(&region_id) {
             if !importer.region_in_import_mode(region)
-                && tablet.ingest_maybe_slowdown_writes(CF_WRITE).expect("cf")
+                && tablet
+                    .ingest_maybe_slowdown_writes(CF_WRITE, inflight_write_cf_sst_cnt)
+                    .expect("cf")
             {
                 return reject_error(Some(region_id));
             }
@@ -134,22 +143,17 @@ fn check_write_stall<E: KvEngine>(
             return Some(errorpb);
         }
     } else if importer.get_mode() == SwitchMode::Normal
-        && tablet.ingest_maybe_slowdown_writes(CF_WRITE).expect("cf")
+        && tablet
+            .ingest_maybe_slowdown_writes(CF_WRITE, inflight_write_cf_sst_cnt)
+            .expect("cf")
     {
-        match tablet.get_sst_key_ranges(CF_WRITE, 0) {
-            Ok(l0_sst_ranges) => {
-                warn!(
-                    "sst ingest is too slow";
-                    "sst_ranges" => ?l0_sst_ranges,
-                );
-            }
-            Err(e) => {
-                error!("get sst key ranges failed"; "err" => ?e);
-            }
-        }
+        // See https://github.com/tikv/tikv/issues/18549:
+        // Previously, logging SST key ranges by calling `ingest_sst_key_ranges` caused
+        // latency spikes. The logging here has been refined to avoid such
+        // performance issues.
+        warn!("SST ingest is experiencing slowdowns");
         return reject_error(None);
     }
-
     None
 }
 
@@ -259,6 +263,7 @@ pub async fn ingest<E: Engine>(
     store_meta: &Option<Arc<Mutex<StoreMeta<E::Local>>>>,
     importer: &SstImporter<E::Local>,
     ingest_latch: &Arc<IngestLatch>,
+    ingest_admission_guard: &Arc<Mutex<()>>,
     label: &'static str,
 ) -> Result<IngestResponse> {
     let mut resp = IngestResponse::default();
@@ -267,21 +272,29 @@ pub async fn ingest<E: Engine>(
         return Ok(resp);
     }
 
-    if let Some(errorpb) = check_write_stall(
-        req.get_context().get_region_id(),
-        tablets,
-        store_meta,
-        importer,
-    ) {
-        resp.set_error(errorpb);
-        return Ok(resp);
-    }
-
     let mut errorpb = errorpb::Error::default();
     let mut metas = vec![];
-    for meta in req.get_ssts() {
-        if ingest_latch.acquire_lock(meta).unwrap_or(false) {
-            metas.push(meta.clone());
+    {
+        // Serialize admission checks to avoid race conditions between
+        // concurrent ingests.
+        let _guard = ingest_admission_guard.lock().unwrap();
+
+        // Check if there is a write stall.
+        if let Some(errorpb) = check_write_stall(
+            req.get_context().get_region_id(),
+            tablets,
+            store_meta,
+            importer,
+            ingest_latch.count_ssts_in_cf(CF_WRITE) as u64,
+        ) {
+            resp.set_error(errorpb);
+            return Ok(resp);
+        }
+
+        for meta in req.get_ssts() {
+            if ingest_latch.acquire_lock(meta).unwrap_or(false) {
+                metas.push(meta.clone());
+            }
         }
     }
     if metas.len() < req.get_ssts().len() {
diff --git a/src/import/raft_writer.rs b/src/import/raft_writer.rs
index e66bcededc2..926df02b714 100644
--- a/src/import/raft_writer.rs
+++ b/src/import/raft_writer.rs
@@ -10,7 +10,7 @@ use std::{
 use futures::{Future, Stream, StreamExt};
 use kvproto::kvrpcpb::Context;
 use sst_importer::metrics::{APPLIER_ENGINE_REQUEST_DURATION, APPLIER_EVENT, IMPORTER_APPLY_BYTES};
-use tikv_kv::{with_tls_engine, Engine, WriteData, WriteEvent};
+use tikv_kv::{Engine, WriteData, WriteEvent, with_tls_engine};
 use tikv_util::time::Instant;
 use tokio::sync::{Semaphore, SemaphorePermit};
 
@@ -168,8 +168,8 @@ mod test {
     use std::{convert::identity, iter::IntoIterator, sync::Mutex, time::Duration};
 
     use engine_rocks::RocksEngineIterator;
-    use engine_traits::{Iterator, ALL_CFS, CF_DEFAULT, CF_WRITE};
-    use futures::{future::join_all, Future};
+    use engine_traits::{ALL_CFS, CF_DEFAULT, CF_WRITE, Iterator};
+    use futures::{Future, future::join_all};
     use kvproto::kvrpcpb::Context;
     use tempfile::TempDir;
     use tikv_kv::{Engine, Modify, RocksEngine, SnapContext, Snapshot, WriteData, WriteEvent};
diff --git a/src/import/sst_service.rs b/src/import/sst_service.rs
index ff35da37d69..2fe6bbf7e27 100644
--- a/src/import/sst_service.rs
+++ b/src/import/sst_service.rs
@@ -7,9 +7,9 @@ use std::{
     time::Duration,
 };
 
-use engine_traits::{CompactExt, CF_DEFAULT, CF_WRITE};
-use file_system::{set_io_type, IoType};
-use futures::{sink::SinkExt, stream::TryStreamExt, FutureExt, TryFutureExt};
+use engine_traits::{CF_DEFAULT, CF_WRITE, CompactExt, ManualCompactionOptions};
+use file_system::{IoType, set_io_type};
+use futures::{FutureExt, TryFutureExt, sink::SinkExt, stream::TryStreamExt};
 use grpcio::{
     ClientStreamingSink, RequestStream, RpcContext, RpcStatus, RpcStatusCode, ServerStreamingSink,
     UnarySink, WriteFlags,
@@ -24,40 +24,41 @@ use kvproto::{
     metapb::RegionEpoch,
 };
 use raftstore::{
-    coprocessor::{RegionInfo, RegionInfoProvider},
-    store::util::is_epoch_stale,
     RegionInfoAccessor,
+    coprocessor::{RegionInfo, RegionInfoProvider},
+    store::{ForcePartitionRangeManager, util::is_epoch_stale},
 };
 use raftstore_v2::StoreMeta;
 use rand::Rng;
-use resource_control::{with_resource_limiter, ResourceGroupManager};
+use resource_control::{ResourceGroupManager, with_resource_limiter};
 use sst_importer::{
-    error_inc, metrics::*, sst_importer::DownloadExt, Config, ConfigManager, Error, Result,
-    SstImporter,
+    Config, ConfigManager, Error, Result, SstImporter, error_inc, metrics::*,
+    sst_importer::DownloadExt,
 };
 use tikv_kv::{Engine, LocalTablets, Modify, WriteData};
 use tikv_util::{
+    HandyRwLock,
     config::ReadableSize,
     future::{create_stream_with_buffer, paired_future_callback},
     resizable_threadpool::{DeamonRuntimeHandle, ResizableRuntime},
     sys::{
-        disk::{get_disk_status, DiskUsage},
-        get_global_memory_usage, SysQuota,
+        SysQuota,
+        disk::{DiskUsage, get_disk_status},
+        get_global_memory_usage,
     },
     time::{Instant, Limiter},
-    HandyRwLock,
 };
 use tokio::time::sleep;
 use txn_types::{Key, WriteRef, WriteType};
 
 use super::{
-    ingest::{async_snapshot, ingest, IngestLatch, SuspendDeadline},
+    ingest::{IngestLatch, SuspendDeadline, async_snapshot, ingest},
     make_rpc_error, pb_error_inc, raft_writer,
 };
 use crate::{
     import::duplicate_detect::DuplicateDetector,
     send_rpc_response,
-    server::CONFIG_ROCKSDB_GAUGE,
+    server::CONFIG_ROCKSDB_CF_GAUGE,
     storage::{self, errors::extract_region_error_from_error},
     tikv_util::sys::thread::ThreadBuildWrapper,
 };
@@ -74,13 +75,12 @@ const REQUEST_WRITE_CONCURRENCY: usize = 16;
 /// Generally, a field (and a embedded message) would introduce some extra
 /// bytes. In detail, they are:
 /// - 2 bytes for the request type (Tag+Value).
-/// - 2 bytes for every string or bytes field (Tag+Length), they are:
-/// .  + the key field
-/// .  + the value field
-/// .  + the CF field (None for CF_DEFAULT)
+/// - 2 bytes for every string or bytes field (Tag+Length), they are: .  + the
+///   key field .  + the value field .  + the CF field (None for CF_DEFAULT)
 /// - 2 bytes for the embedded message field `PutRequest` (Tag+Length).
 /// - 2 bytes for the request itself (which would be embedded into a
 ///   [`RaftCmdRequest`].)
+///
 /// In fact, the length field is encoded by varint, which may grow when the
 /// content length is greater than 128, however when the length is greater than
 /// 128, the extra 1~4 bytes can be ignored.
@@ -98,6 +98,11 @@ const REJECT_SERVE_MEMORY_USAGE: u64 = 1024 * 1024 * 1024; //1G
 // consider block cache and raft store. the memory usage will be
 const HIGH_IMPORT_MEMORY_WATER_RATIO: f64 = 0.95;
 
+// the default TTL seconds of force partition range.
+// the TTL is to ensure all force partition ranges can be
+// cleaned up eventually.
+const DEFAULT_FORCE_PARTITION_RANGE_TTL_SECONDS: u64 = 3600;
+
 /// Check if the system has enough resources for import tasks
 async fn check_import_resources(mem_limit: u64) -> Result<()> {
     #[cfg(feature = "failpoints")]
@@ -187,6 +192,7 @@ pub struct ImportSstService<E: Engine> {
     importer: Arc<SstImporter<E::Local>>,
     limiter: Limiter,
     ingest_latch: Arc<IngestLatch>,
+    ingest_admission_guard: Arc<Mutex<()>>,
     raft_entry_max_size: ReadableSize,
     region_info_accessor: Arc<RegionInfoAccessor>,
 
@@ -200,6 +206,7 @@ pub struct ImportSstService<E: Engine> {
     suspend: Arc<SuspendDeadline>,
 
     mem_limit: u64,
+    force_partition_range_mgr: ForcePartitionRangeManager,
 }
 
 struct RequestCollector {
@@ -386,6 +393,7 @@ impl<E: Engine> ImportSstService<E> {
         store_meta: Option<Arc<Mutex<StoreMeta<E::Local>>>>,
         resource_manager: Option<Arc<ResourceGroupManager>>,
         region_info_accessor: Arc<RegionInfoAccessor>,
+        force_partition_range_mgr: ForcePartitionRangeManager,
     ) -> Self {
         let eng = Arc::new(Mutex::new(engine.clone()));
         let create_tokio_runtime = move |thread_count: usize, thread_name: &str| {
@@ -446,6 +454,7 @@ impl<E: Engine> ImportSstService<E> {
             importer,
             limiter: Limiter::new(f64::INFINITY),
             ingest_latch: Arc::default(),
+            ingest_admission_guard: Arc::default(),
             raft_entry_max_size,
             region_info_accessor,
             writer,
@@ -453,6 +462,7 @@ impl<E: Engine> ImportSstService<E> {
             resource_manager,
             suspend: Arc::default(),
             mem_limit,
+            force_partition_range_mgr,
         }
     }
 
@@ -753,62 +763,71 @@ impl<E: Engine> ImportSst for ImportSstService<E> {
     // future.
     fn switch_mode(
         &mut self,
-        ctx: RpcContext<'_>,
+        _ctx: RpcContext<'_>,
         mut req: SwitchModeRequest,
         sink: UnarySink<SwitchModeResponse>,
     ) {
         let label = "switch_mode";
         IMPORT_RPC_COUNT.with_label_values(&[label]).inc();
         let timer = Instant::now_coarse();
+        let importer = self.importer.clone();
+        let tablets = self.tablets.clone();
 
-        let res = {
-            fn mf(cf: &str, name: &str, v: f64) {
-                CONFIG_ROCKSDB_GAUGE.with_label_values(&[cf, name]).set(v);
-            }
+        let task = async move {
+            let req_mode = req.get_mode();
+            let handle = tokio::task::spawn_blocking(move || {
+                fn mf(cf: &str, name: &str, v: f64) {
+                    CONFIG_ROCKSDB_CF_GAUGE
+                        .with_label_values(&[cf, name])
+                        .set(v);
+                }
 
-            match &self.tablets {
-                LocalTablets::Singleton(tablet) => match req.get_mode() {
-                    SwitchMode::Normal => self.importer.enter_normal_mode(tablet.clone(), mf),
-                    SwitchMode::Import => self.importer.enter_import_mode(tablet.clone(), mf),
-                },
-                LocalTablets::Registry(_) => {
-                    if req.get_mode() == SwitchMode::Import {
-                        if !req.get_ranges().is_empty() {
-                            let ranges = req.take_ranges().to_vec();
-                            self.importer.ranges_enter_import_mode(ranges);
-                            Ok(true)
-                        } else {
-                            Err(sst_importer::Error::Engine(
-                                "partitioned-raft-kv only support switch mode with range set"
-                                    .into(),
-                            ))
-                        }
-                    } else {
-                        // case SwitchMode::Normal
-                        if !req.get_ranges().is_empty() {
-                            let ranges = req.take_ranges().to_vec();
-                            self.importer.clear_import_mode_regions(ranges);
-                            Ok(true)
+                match tablets {
+                    LocalTablets::Singleton(tablet) => match req.get_mode() {
+                        SwitchMode::Normal => importer.enter_normal_mode(tablet, mf),
+                        SwitchMode::Import => importer.enter_import_mode(tablet, mf),
+                    },
+                    LocalTablets::Registry(_) => {
+                        if req.get_mode() == SwitchMode::Import {
+                            if !req.get_ranges().is_empty() {
+                                let ranges = req.take_ranges().to_vec();
+                                importer.ranges_enter_import_mode(ranges);
+                                Ok(true)
+                            } else {
+                                Err(sst_importer::Error::Engine(
+                                    "partitioned-raft-kv only support switch mode with range set"
+                                        .into(),
+                                ))
+                            }
                         } else {
-                            Err(sst_importer::Error::Engine(
-                                "partitioned-raft-kv only support switch mode with range set"
-                                    .into(),
-                            ))
+                            // case SwitchMode::Normal
+                            if !req.get_ranges().is_empty() {
+                                let ranges = req.take_ranges().to_vec();
+                                importer.clear_import_mode_regions(ranges);
+                                Ok(true)
+                            } else {
+                                Err(sst_importer::Error::Engine(
+                                    "partitioned-raft-kv only support switch mode with range set"
+                                        .into(),
+                                ))
+                            }
                         }
                     }
                 }
+            });
+            match handle.await.map_err(|e| Error::Io(e.into())) {
+                Ok(res) => match res {
+                    Ok(_) => info!("switch mode"; "mode" => ?req_mode),
+                    Err(ref e) => error!(%*e; "switch mode failed"; "mode" => ?req_mode,),
+                },
+                Err(ref e) => {
+                    error!(%*e; "joining the background job failed"; "mode" => ?req_mode,)
+                }
             }
-        };
-        match res {
-            Ok(_) => info!("switch mode"; "mode" => ?req.get_mode()),
-            Err(ref e) => error!(%*e; "switch mode failed"; "mode" => ?req.get_mode(),),
-        }
-
-        let task = async move {
             defer! { IMPORT_RPC_COUNT.with_label_values(&[label]).dec() }
             crate::send_rpc_response!(Ok(SwitchModeResponse::default()), sink, label, timer);
         };
-        ctx.spawn(task);
+        self.threads.spawn(task);
     }
 
     /// Receive SST from client and save the file for later ingesting.
@@ -1052,6 +1071,7 @@ impl<E: Engine> ImportSst for ImportSstService<E> {
         let tablets = self.tablets.clone();
         let store_meta = self.store_meta.clone();
         let ingest_latch = self.ingest_latch.clone();
+        let ingest_admission_guard = self.ingest_admission_guard.clone();
 
         let handle_task = async move {
             defer! { IMPORT_RPC_COUNT.with_label_values(&[label]).dec() }
@@ -1066,6 +1086,7 @@ impl<E: Engine> ImportSst for ImportSstService<E> {
                 &store_meta,
                 &import,
                 &ingest_latch,
+                &ingest_admission_guard,
                 label,
             )
             .await;
@@ -1090,6 +1111,7 @@ impl<E: Engine> ImportSst for ImportSstService<E> {
         let tablets = self.tablets.clone();
         let store_meta = self.store_meta.clone();
         let ingest_latch = self.ingest_latch.clone();
+        let ingest_admission_guard = self.ingest_admission_guard.clone();
 
         let handle_task = async move {
             defer! { IMPORT_RPC_COUNT.with_label_values(&[label]).dec() }
@@ -1101,6 +1123,7 @@ impl<E: Engine> ImportSst for ImportSstService<E> {
                 &store_meta,
                 &import,
                 &ingest_latch,
+                &ingest_admission_guard,
                 label,
             )
             .await;
@@ -1309,6 +1332,109 @@ impl<E: Engine> ImportSst for ImportSstService<E> {
         resp.set_already_suspended(suspended);
         ctx.spawn(async move { send_rpc_response!(Ok(resp), sink, label, timer) });
     }
+
+    fn add_force_partition_range(
+        &mut self,
+        _ctx: RpcContext<'_>,
+        req: AddPartitionRangeRequest,
+        sink: UnarySink<AddPartitionRangeResponse>,
+    ) {
+        let label = "add_force_partition_range";
+        let timer = Instant::now_coarse();
+        let kv_engine = self.engine.kv_engine();
+        let force_partition_range_mgr = self.force_partition_range_mgr.clone();
+
+        let handle_task = async move {
+            let resp = AddPartitionRangeResponse::default();
+            let engine = if let Some(eng) = kv_engine {
+                eng
+            } else {
+                info!("ignore add_force_partition_range request on raftstore-v2 cluster");
+                // engine is none means this is raftstore-v2, then we can just return.
+                send_rpc_response!(Ok(resp), sink, label, timer);
+                return;
+            };
+            let start = keys::data_key(Key::from_raw(req.get_range().get_start()).as_encoded());
+            let end = keys::data_end_key(Key::from_raw(req.get_range().get_end()).as_encoded());
+            let mut ttl_seconds = req.get_ttl_seconds();
+            if ttl_seconds == 0 {
+                // default value if the ttl is not set, 1h is big enough for most cases.
+                ttl_seconds = DEFAULT_FORCE_PARTITION_RANGE_TTL_SECONDS;
+            }
+            if start >= end {
+                send_rpc_response!(
+                    Err(Error::Io(std::io::Error::new(
+                        std::io::ErrorKind::InvalidInput,
+                        format!(
+                            "start keys must be smaller than end key, start: {:?}, end: {:?}",
+                            req.get_range().get_start(),
+                            req.get_range().get_end()
+                        )
+                    ))),
+                    sink,
+                    label,
+                    timer
+                );
+                return;
+            }
+
+            let added =
+                force_partition_range_mgr.add_range(start.clone(), end.clone(), ttl_seconds);
+
+            // here, we don't compact the whole range directly because it's possible that
+            // the task is restart from a checkpoint, thus, there may be already
+            // many SST files, but there's no need to compact them. Instaed, we
+            // try to compact a range that won't overlap with any real data kv
+            // at both side of the range. These 2 ranges won't overlap with any real
+            // data kv, but can trigger a compact if a SST with huge range overlaps with the
+            // input range.
+            let mut start_next = req.get_range().get_start().to_owned();
+            start_next.push(0);
+            let start_next_data_key = keys::data_key(Key::from_raw(&start_next).as_encoded());
+            let mut end_next = req.get_range().get_end().to_owned();
+            end_next.push(0);
+            let end_next_data_key = keys::data_key(Key::from_raw(&end_next).as_encoded());
+            let opts = ManualCompactionOptions::new(false, 1, true);
+            for cf in [CF_WRITE, CF_DEFAULT] {
+                for rg in [(&*start, &*start_next_data_key), (&end, &end_next_data_key)] {
+                    let start = Instant::now_coarse();
+                    let start_key = log_wrappers::Value::key(req.get_range().get_start());
+                    let end_key = log_wrappers::Value::key(req.get_range().get_end());
+                    let res = engine.compact_range_cf(cf, Some(rg.0), Some(rg.1), opts.clone());
+                    let dur = start.saturating_elapsed();
+                    if let Err(e) = res {
+                        warn!("manual compact range failed"; "cf" => cf, "start" => ?start_key, "end" => ?end_key, "err" => ?e, "dur" => ?dur);
+                    } else {
+                        info!("manual compact range success"; "cf" => cf, "start" => ?start_key, "end" => ?end_key, "dur" => ?dur);
+                    }
+                }
+            }
+
+            info!("add force_partition range"; "start" => ?log_wrappers::Value::key(req.get_range().get_start()),
+                    "end" => ?log_wrappers::Value::key(req.get_range().get_end()), "ttl" => ttl_seconds, "added" => added);
+            send_rpc_response!(Ok(resp), sink, label, timer);
+        };
+
+        self.threads.spawn(handle_task);
+    }
+    fn remove_force_partition_range(
+        &mut self,
+        ctx: RpcContext<'_>,
+        req: RemovePartitionRangeRequest,
+        sink: UnarySink<RemovePartitionRangeResponse>,
+    ) {
+        let label = "remove_force_partition_range";
+        let timer = Instant::now_coarse();
+
+        let start = keys::data_key(Key::from_raw(req.get_range().get_start()).as_encoded());
+        let end = keys::data_end_key(Key::from_raw(req.get_range().get_end()).as_encoded());
+        let removed = self.force_partition_range_mgr.remove_range(&start, &end);
+        info!("remove force_partition range"; "start" => log_wrappers::Value::key(req.get_range().get_start()),
+                "end" => log_wrappers::Value::key(req.get_range().get_end()), "removed" => removed);
+
+        let resp = RemovePartitionRangeResponse::default();
+        ctx.spawn(async move { send_rpc_response!(Ok(resp), sink, label, timer) });
+    }
 }
 
 fn write_needs_restore(write: &[u8]) -> bool {
@@ -1353,7 +1479,7 @@ mod test {
     use txn_types::{Key, TimeStamp, Write, WriteBatchFlags, WriteType};
 
     use crate::{
-        import::sst_service::{check_local_region_stale, RequestCollector},
+        import::sst_service::{RequestCollector, check_local_region_stale},
         server::raftkv,
     };
 
@@ -1539,7 +1665,7 @@ mod test {
     fn convert_write_batch_to_request_raftkv1(ctx: &Context, batch: WriteData) -> RaftCmdRequest {
         let reqs: Vec<Request> = batch.modifies.into_iter().map(Into::into).collect();
         let txn_extra = batch.extra;
-        let mut header = raftkv::new_request_header(ctx);
+        let mut header = raftkv::new_request_header(ctx, None);
         if batch.avoid_batch {
             header.set_uuid(uuid::Uuid::new_v4().as_bytes().to_vec());
         }
diff --git a/src/lib.rs b/src/lib.rs
index b5f82f8a7a1..cdb8f5a9999 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -23,7 +23,6 @@
 #![feature(proc_macro_hygiene)]
 #![feature(min_specialization)]
 #![feature(box_patterns)]
-#![feature(extract_if)]
 #![feature(deadline_api)]
 #![feature(let_chains)]
 #![feature(read_buf)]
@@ -32,7 +31,6 @@
 #![allow(incomplete_features)]
 #![feature(core_io_borrowed_buf)]
 #![feature(assert_matches)]
-#![feature(associated_type_bounds)]
 
 #[macro_use(fail_point)]
 extern crate fail;
diff --git a/src/read_pool.rs b/src/read_pool.rs
index 294f9a87003..65104a4b80b 100644
--- a/src/read_pool.rs
+++ b/src/read_pool.rs
@@ -4,28 +4,28 @@ use std::{
     convert::TryFrom,
     future::Future,
     sync::{
+        Arc, Mutex,
         atomic::{AtomicU64, Ordering},
         mpsc::SyncSender,
-        Arc, Mutex,
     },
     time::Duration,
 };
 
-use file_system::{set_io_type, IoType};
+use file_system::{IoType, set_io_type};
 use futures::{
     channel::oneshot,
     future::{FutureExt, TryFutureExt},
 };
 use kvproto::{errorpb, kvrpcpb::CommandPri};
 use online_config::{ConfigChange, ConfigManager, ConfigValue, Result as CfgResult};
-use prometheus::{core::Metric, Histogram, IntCounter, IntGauge};
+use prometheus::{Histogram, IntCounter, IntGauge, core::Metric};
 use resource_control::{
-    with_resource_limiter, ControlledFuture, ResourceController, ResourceLimiter, TaskPriority,
+    ControlledFuture, ResourceController, ResourceLimiter, TaskPriority, with_resource_limiter,
 };
 use thiserror::Error;
 use tikv_util::{
     resource_control::TaskMetadata,
-    sys::{cpu_time::ProcessStat, SysQuota},
+    sys::{SysQuota, cpu_time::ProcessStat},
     time::Instant,
     worker::{Runnable, RunnableWithTimer, Scheduler, Worker},
     yatp_pool::{self, CleanupMethod, FuturePool, PoolTicker, YatpPoolBuilder},
@@ -37,8 +37,8 @@ use yatp::{
 
 use self::metrics::*;
 use crate::{
-    config::{UnifiedReadPoolConfig, UNIFIED_READPOOL_MIN_CONCURRENCY},
-    storage::kv::{destroy_tls_engine, set_tls_engine, Engine, FlowStatsReporter},
+    config::{UNIFIED_READPOOL_MIN_CONCURRENCY, UnifiedReadPoolConfig},
+    storage::kv::{Engine, FlowStatsReporter, destroy_tls_engine, set_tls_engine},
 };
 
 // the duration to check auto-scale unified-thread-pool's thread
@@ -790,6 +790,7 @@ pub enum ReadPoolError {
 }
 
 mod metrics {
+    use lazy_static::lazy_static;
     use prometheus::*;
 
     lazy_static! {
diff --git a/src/server/config.rs b/src/server/config.rs
index deb5676f9e9..227b3cab510 100644
--- a/src/server/config.rs
+++ b/src/server/config.rs
@@ -1,13 +1,19 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::{cmp, i32, isize, sync::Arc, time::Duration};
+use std::{
+    cmp,
+    ops::{Div, Mul},
+    sync::Arc,
+    time::Duration,
+};
 
 use collections::HashMap;
-use engine_traits::{perf_level_serde, PerfLevel};
+use engine_traits::{PerfLevel, perf_level_serde};
 use grpcio::{CompressionAlgorithms, ResourceQuota};
+use lazy_static::lazy_static;
 use online_config::{ConfigChange, ConfigManager, OnlineConfig};
-use raftstore::store::config::DEFAULT_SNAP_MAX_BYTES_PER_SEC;
 pub use raftstore::store::Config as RaftStoreConfig;
+use raftstore::store::config::DEFAULT_SNAP_MAX_BYTES_PER_SEC;
 use regex::Regex;
 use tikv_util::{
     config::{self, ReadableDuration, ReadableSize, VersionTrack},
@@ -15,16 +21,46 @@ use tikv_util::{
     worker::Scheduler,
 };
 
-use super::{snap::Task as SnapTask, Result};
+use super::{Result, snap::Task as SnapTask};
 pub use crate::storage::config::Config as StorageConfig;
 
 pub const DEFAULT_CLUSTER_ID: u64 = 0;
 pub const DEFAULT_LISTENING_ADDR: &str = "127.0.0.1:20160";
 const DEFAULT_ADVERTISE_LISTENING_ADDR: &str = "";
 const DEFAULT_STATUS_ADDR: &str = "127.0.0.1:20180";
-const DEFAULT_GRPC_CONCURRENCY: usize = 5;
+
+fn calculate_cpu_quota_base_num() -> usize {
+    // Use 8c as the default quota unit for the limit calculations
+    const DEFAULT_CPU_QUOTA_UNIT: f64 = 8.0;
+
+    SysQuota::cpu_cores_quota()
+        .div(DEFAULT_CPU_QUOTA_UNIT)
+        .floor() as usize
+}
+
+fn calculate_grpc_concurrency() -> usize {
+    // Multiplier applied to the number of raft connections to determine base
+    // concurrency.
+    const GRPC_RAFT_CONN_MULTIPLIER: usize = 3;
+
+    // Additional offset added to the calculated concurrency to ensure sufficient
+    // threads for handling gRPC requests and system overhead.
+    const GRPC_CONCURRENCY_OFFSET: usize = 2;
+
+    DEFAULT_GRPC_RAFT_CONN_NUM.mul(GRPC_RAFT_CONN_MULTIPLIER) + GRPC_CONCURRENCY_OFFSET
+}
+
+// Default settings related to gRPC
+lazy_static! {
+     static ref DEFAULT_GRPC_RAFT_CONN_NUM: usize = {
+        // Max count for the default setting of raft connection num is limited
+        // to 4.
+        calculate_cpu_quota_base_num().clamp(1, 4)
+    };
+
+    static ref DEFAULT_GRPC_CONCURRENCY: usize = calculate_grpc_concurrency();
+}
 const DEFAULT_GRPC_CONCURRENT_STREAM: i32 = 1024;
-const DEFAULT_GRPC_RAFT_CONN_NUM: usize = 1;
 const DEFAULT_GRPC_MEMORY_POOL_QUOTA: u64 = isize::MAX as u64;
 const DEFAULT_GRPC_STREAM_INITIAL_WINDOW_SIZE: u64 = 2 * 1024 * 1024;
 const DEFAULT_GRPC_GZIP_COMPRESSION_LEVEL: usize = 2;
@@ -219,6 +255,17 @@ pub struct Config {
     /// `BatchCommands` gRPC stream. 0 to disable sending health feedback.
     pub health_feedback_interval: ReadableDuration,
 
+    #[doc(hidden)]
+    #[online_config(hidden)]
+    // Interval to inspect the network latency between tikv and tikv for slow store detection.
+    // If it set to 0, it will disable the inspection.
+    pub inspect_network_interval: ReadableDuration,
+
+    /// Timeout for leader eviction during graceful shutdown.
+    /// After this timeout, TiKV will proceed with shutdown even if
+    /// some regions haven't completed leader transfer.
+    pub graceful_shutdown_timeout: ReadableDuration,
+
     // Server labels to specify some attributes about this server.
     #[online_config(skip)]
     pub labels: HashMap<String, String>,
@@ -251,6 +298,7 @@ impl Default for Config {
             cluster_id: DEFAULT_CLUSTER_ID,
             addr: DEFAULT_LISTENING_ADDR.to_owned(),
             labels: HashMap::default(),
+            graceful_shutdown_timeout: ReadableDuration::secs(20),
             advertise_addr: DEFAULT_ADVERTISE_LISTENING_ADDR.to_owned(),
             status_addr: DEFAULT_STATUS_ADDR.to_owned(),
             advertise_status_addr: DEFAULT_ADVERTISE_LISTENING_ADDR.to_owned(),
@@ -267,9 +315,9 @@ impl Default for Config {
             grpc_compression_type: GrpcCompressionType::None,
             grpc_gzip_compression_level: DEFAULT_GRPC_GZIP_COMPRESSION_LEVEL,
             grpc_min_message_size_to_compress: DEFAULT_GRPC_MIN_MESSAGE_SIZE_TO_COMPRESS,
-            grpc_concurrency: DEFAULT_GRPC_CONCURRENCY,
+            grpc_concurrency: *DEFAULT_GRPC_CONCURRENCY,
             grpc_concurrent_stream: DEFAULT_GRPC_CONCURRENT_STREAM,
-            grpc_raft_conn_num: DEFAULT_GRPC_RAFT_CONN_NUM,
+            grpc_raft_conn_num: *DEFAULT_GRPC_RAFT_CONN_NUM,
             grpc_stream_initial_window_size: ReadableSize(DEFAULT_GRPC_STREAM_INITIAL_WINDOW_SIZE),
             grpc_memory_pool_quota: ReadableSize(DEFAULT_GRPC_MEMORY_POOL_QUOTA),
             // There will be a heartbeat every secs, it's weird a connection will be idle for more
@@ -306,6 +354,7 @@ impl Default for Config {
             forward_max_connections_per_address: 4,
             simplify_metrics: false,
             health_feedback_interval: ReadableDuration::secs(1),
+            inspect_network_interval: ReadableDuration::millis(100),
         }
     }
 }
@@ -440,6 +489,18 @@ impl Config {
             self.heavy_load_threshold = 75;
         }
 
+        if self
+            .inspect_network_interval
+            .lt(&ReadableDuration::millis(10))
+            && self.inspect_network_interval.0 != Duration::from_millis(0)
+        {
+            return Err(box_err!(
+                "server.inspect-network-interval can't be less than 10ms and not zero."
+            ));
+        }
+        if self.graceful_shutdown_timeout.0.as_secs() == 0 {
+            warn!("graceful shutdown timeout is disabled");
+        }
         Ok(())
     }
 
@@ -575,6 +636,9 @@ mod tests {
         cfg.validate().unwrap();
         assert_eq!(cfg.addr, cfg.advertise_addr);
         assert_eq!(cfg.status_addr, cfg.advertise_status_addr);
+        let base_num = calculate_cpu_quota_base_num().clamp(1, 4);
+        assert_eq!(cfg.grpc_raft_conn_num, base_num);
+        assert_eq!(cfg.grpc_concurrency, base_num * 3 + 2);
 
         let mut invalid_cfg = cfg.clone();
         invalid_cfg.concurrent_send_snap_limit = 0;
diff --git a/src/server/debug.rs b/src/server/debug.rs
index 2ded76a46b7..23304662d62 100644
--- a/src/server/debug.rs
+++ b/src/server/debug.rs
@@ -12,16 +12,17 @@ use std::{
 use api_version::KvFormat;
 use collections::HashSet;
 use engine_rocks::{
+    RocksEngine, RocksEngineIterator, RocksMvccProperties, RocksStatistics, RocksWriteBatchVec,
     raw::{CompactOptions, DBBottommostLevelCompaction},
     util::get_cf_handle,
-    RocksEngine, RocksEngineIterator, RocksMvccProperties, RocksStatistics, RocksWriteBatchVec,
 };
 use engine_traits::{
-    Engines, Error as EngineTraitError, IterOptions, Iterable, Iterator as EngineIterator, MiscExt,
-    Mutable, MvccProperties, Peekable, RaftEngine, RaftLogBatch, Range, RangePropertiesExt,
-    SyncMutable, WriteBatch, WriteBatchExt, WriteOptions, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, Engines, Error as EngineTraitError, IterOptions,
+    Iterable, Iterator as EngineIterator, MiscExt, Mutable, MvccProperties, Peekable, RaftEngine,
+    RaftLogBatch, Range, RangePropertiesExt, SyncMutable, WriteBatch, WriteBatchExt, WriteOptions,
 };
 use futures::future::Future;
+use hyper::{Body, Method, Request, Response, StatusCode};
 use kvproto::{
     debugpb::{self, Db as DbType},
     kvrpcpb::{self, Context, MvccInfo},
@@ -29,12 +30,12 @@ use kvproto::{
     raft_serverpb::*,
 };
 use protobuf::Message;
-use raft::{self, eraftpb::Entry, RawNode};
+use raft::{self, RawNode, eraftpb::Entry};
 use raftstore::{
     coprocessor::get_region_approximate_middle,
     store::{
-        local_metrics::RaftMetrics, write_initial_apply_state, write_initial_raft_state,
-        write_peer_state, PeerStorage,
+        PeerStorage, local_metrics::RaftMetrics, write_initial_apply_state,
+        write_initial_raft_state, write_peer_state,
     },
 };
 use thiserror::Error;
@@ -51,9 +52,9 @@ use crate::{
     config::ConfigController,
     server::reset_to_version::ResetToVersionManager,
     storage::{
+        Storage,
         lock_manager::LockManager,
         mvcc::{Lock, LockType, TimeStamp, Write, WriteRef, WriteType},
-        Storage,
     },
 };
 
@@ -431,11 +432,10 @@ where
         let res = handles
             .into_iter()
             .map(|h: JoinHandle<Result<()>>| h.join())
-            .map(|r| {
+            .inspect(|r| {
                 if let Err(e) = &r {
                     error!("{:?}", e);
                 }
-                r
             })
             .all(|r| r.is_ok());
         if res {
@@ -533,7 +533,7 @@ where
         promote_learner: bool,
     ) -> Result<()> {
         let store_id = self.get_store_ident()?.get_store_id();
-        if store_ids.iter().any(|&s| s == store_id) {
+        if store_ids.contains(&store_id) {
             let msg = format!("Store {} in the failed list", store_id);
             return Err(Error::Other(msg.into()));
         }
@@ -1611,7 +1611,7 @@ fn set_region_tombstone(
         .get_peers()
         .iter()
         .find(|p| p.get_store_id() == store_id)
-        .map_or(true, |p| p.get_id() != peer_id);
+        .is_none_or(|p| p.get_id() != peer_id);
     if !scheduled {
         return Err(box_err!("The peer is still in target peers"));
     }
@@ -1630,11 +1630,76 @@ fn divide_db(db: &RocksEngine, parts: usize) -> raftstore::Result<Vec<Vec<u8>>>
     ))
 }
 
+/// Main handler for debug dup key.
+pub fn handle_dup_key_debug(req: Request<Body>) -> hyper::Result<Response<Body>> {
+    let path = req.uri().path();
+    let method = req.method();
+
+    match (method, path) {
+        (&Method::GET, "/debug/dup-key/check") => handle_check(),
+        (&Method::POST, "/debug/dup-key/enable") => handle_enable_debug(true),
+        (&Method::POST, "/debug/dup-key/disable") => handle_enable_debug(false),
+        _ => Ok(Response::builder()
+            .status(StatusCode::NOT_FOUND)
+            .body(Body::from("Not Found"))
+            .unwrap()),
+    }
+}
+
+/// Handle /debug/debug-dup/check endpoint (GET method to get current
+/// config)
+fn handle_check() -> hyper::Result<Response<Body>> {
+    let result = txn_types::ENABLE_DUP_KEY_DEBUG
+        .load(std::sync::atomic::Ordering::Relaxed)
+        .to_string();
+    let json = match serde_json::to_string_pretty(&result) {
+        Ok(json) => json,
+        Err(e) => {
+            return Ok(Response::builder()
+                .status(StatusCode::INTERNAL_SERVER_ERROR)
+                .body(Body::from(format!("JSON serialization error: {}", e)))
+                .unwrap());
+        }
+    };
+
+    Ok(Response::builder()
+        .status(StatusCode::OK)
+        .header("Content-Type", "application/json")
+        .body(Body::from(json))
+        .unwrap())
+}
+
+/// Handle /debug/dup-key/enable or disable endpoint (POST method to clear
+/// registry)
+fn handle_enable_debug(operation: bool) -> hyper::Result<Response<Body>> {
+    txn_types::ENABLE_DUP_KEY_DEBUG.store(operation, std::sync::atomic::Ordering::Relaxed);
+    let response = serde_json::json!({
+        "status": "success",
+        "message": format!("set to operation={:?} successfully", operation),
+    });
+
+    let json = match serde_json::to_string_pretty(&response) {
+        Ok(json) => json,
+        Err(e) => {
+            return Ok(Response::builder()
+                .status(StatusCode::INTERNAL_SERVER_ERROR)
+                .body(Body::from(format!("JSON serialization error: {}", e)))
+                .unwrap());
+        }
+    };
+
+    Ok(Response::builder()
+        .status(StatusCode::OK)
+        .header("Content-Type", "application/json")
+        .body(Body::from(json))
+        .unwrap())
+}
+
 #[cfg(test)]
 mod tests {
     use api_version::ApiV1;
-    use engine_rocks::{util::new_engine_opt, RocksCfOptions, RocksDbOptions, RocksEngine};
-    use engine_traits::{Mutable, SyncMutable, ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE};
+    use engine_rocks::{RocksCfOptions, RocksDbOptions, RocksEngine, util::new_engine_opt};
+    use engine_traits::{ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, Mutable, SyncMutable};
     use kvproto::{
         kvrpcpb::ApiVersion,
         metapb::{Peer, PeerRole, Region},
diff --git a/src/server/debug2.rs b/src/server/debug2.rs
index 68404441eed..d46439ceaa4 100644
--- a/src/server/debug2.rs
+++ b/src/server/debug2.rs
@@ -3,13 +3,13 @@
 use std::{sync::Arc, thread::JoinHandle};
 
 use engine_rocks::{
-    raw::CompactOptions, util::get_cf_handle, RocksEngine, RocksEngineIterator, RocksStatistics,
+    RocksEngine, RocksEngineIterator, RocksStatistics, raw::CompactOptions, util::get_cf_handle,
 };
 use engine_traits::{
-    CachedTablet, Iterable, MiscExt, Peekable, RaftEngine, RaftLogBatch, TabletContext,
-    TabletRegistry, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, CachedTablet, Iterable, MiscExt, Peekable, RaftEngine,
+    RaftLogBatch, TabletContext, TabletRegistry,
 };
-use keys::{data_key, enc_end_key, enc_start_key, DATA_MAX_KEY, DATA_PREFIX_KEY};
+use keys::{DATA_MAX_KEY, DATA_PREFIX_KEY, data_key, enc_end_key, enc_start_key};
 use kvproto::{
     debugpb::Db as DbType,
     kvrpcpb::MvccInfo,
@@ -17,7 +17,7 @@ use kvproto::{
     raft_serverpb::{PeerState, RaftApplyState, RaftLocalState, RegionLocalState, StoreIdent},
 };
 use nom::AsBytes;
-use raft::{prelude::Entry, RawNode};
+use raft::{RawNode, prelude::Entry};
 use raftstore::{
     coprocessor::{get_region_approximate_middle, get_region_approximate_size},
     store::util::check_key_in_region,
@@ -28,10 +28,10 @@ use tikv_util::{
     config::ReadableSize, store::find_peer, sys::thread::StdThreadBuildWrapper, worker::Worker,
 };
 
-use super::debug::{recover_mvcc_for_range, BottommostLevelCompaction, Debugger, RegionInfo};
+use super::debug::{BottommostLevelCompaction, Debugger, RegionInfo, recover_mvcc_for_range};
 use crate::{
     config::ConfigController,
-    server::debug::{dump_default_cf_properties, dump_write_cf_properties, Error, Result},
+    server::debug::{Error, Result, dump_default_cf_properties, dump_write_cf_properties},
     storage::mvcc::{MvccInfoCollector, MvccInfoScanner},
 };
 
@@ -334,7 +334,7 @@ impl<ER: RaftEngine> DebuggerImplV2<ER> {
         let res = handles
             .into_iter()
             .map(|h: JoinHandle<Vec<Result<()>>>| h.join())
-            .map(|results| {
+            .inspect(|results| {
                 if let Err(e) = &results {
                     error!("{:?}", e);
                 } else {
@@ -344,7 +344,6 @@ impl<ER: RaftEngine> DebuggerImplV2<ER> {
                         }
                     }
                 }
-                results
             })
             .all(|results| {
                 if results.is_err() {
@@ -605,7 +604,7 @@ fn set_region_tombstone<ER: RaftEngine>(
         .get_peers()
         .iter()
         .find(|p| p.get_store_id() == store_id)
-        .map_or(true, |p| p.get_id() != peer_id);
+        .is_none_or(|p| p.get_id() != peer_id);
     if !scheduled {
         return Err(box_err!("The peer is still in target peers"));
     }
@@ -982,7 +981,7 @@ fn range_in_region<'a>(
         DATA_PREFIX_KEY
     };
     if range_start == DATA_PREFIX_KEY && range_end == DATA_PREFIX_KEY {
-        return Some((region.get_start_key(), region.get_end_key()));
+        Some((region.get_start_key(), region.get_end_key()))
     } else if range_start == DATA_PREFIX_KEY {
         assert!(range_end.starts_with(DATA_PREFIX_KEY));
         if region.get_start_key() < &range_end[DATA_PREFIX_KEY.len()..] {
@@ -1182,7 +1181,7 @@ fn deivde_regions_for_concurrency<ER: RaftEngine>(
     }
     region_sizes.sort_by(|a, b| a.0.cmp(&b.0));
 
-    let group_size = (total_size + threads - 1) / threads;
+    let group_size = total_size.div_ceil(threads);
     let mut cur_group = vec![];
     let mut cur_size = 0;
     for (region_size, mut region_state) in region_sizes.into_iter() {
@@ -1213,7 +1212,7 @@ pub fn new_debugger(path: &std::path::Path) -> DebuggerImplV2<raft_log_engine::R
     let cache = cfg.storage.block_cache.build_shared_cache();
     let env = cfg.build_shared_rocks_env(None, None).unwrap();
 
-    let factory = KvEngineFactoryBuilder::new(env, &cfg, cache, None).build();
+    let factory = KvEngineFactoryBuilder::new(env, &cfg, cache, None, Default::default()).build();
     let reg = TabletRegistry::new(Box::new(factory), path).unwrap();
 
     let raft_engine =
@@ -1226,8 +1225,8 @@ pub fn new_debugger(path: &std::path::Path) -> DebuggerImplV2<raft_log_engine::R
 mod tests {
     use collections::HashMap;
     use engine_traits::{
-        RaftEngineReadOnly, RaftLogBatch, SyncMutable, ALL_CFS, CF_DEFAULT, CF_LOCK, CF_WRITE,
-        DATA_CFS,
+        ALL_CFS, CF_DEFAULT, CF_LOCK, CF_WRITE, DATA_CFS, RaftEngineReadOnly, RaftLogBatch,
+        SyncMutable,
     };
     use kvproto::{
         metapb::{self, Peer, PeerRole},
@@ -1699,8 +1698,7 @@ mod tests {
                 region.set_id(region_id);
                 let peers = peers
                     .iter()
-                    .enumerate()
-                    .map(|(_, &sid)| Peer {
+                    .map(|&sid| Peer {
                         id: region_id,
                         store_id: sid,
                         ..Default::default()
diff --git a/src/server/engine_factory.rs b/src/server/engine_factory.rs
index 1d7f1eed000..ab3e036ac43 100644
--- a/src/server/engine_factory.rs
+++ b/src/server/engine_factory.rs
@@ -4,22 +4,22 @@ use std::{path::Path, sync::Arc};
 
 use encryption_export::DataKeyManager;
 use engine_rocks::{
-    raw::{Cache, Env},
-    util::RangeCompactionFilterFactory,
     CompactedEventSender, CompactionListener, FlowListener, RocksCfOptions, RocksCompactionJobInfo,
     RocksDbOptions, RocksEngine, RocksEventListener, RocksPersistenceListener, RocksStatistics,
     TabletLogger,
+    raw::{Cache, Env},
+    util::RangeCompactionFilterFactory,
 };
 use engine_traits::{
-    CompactionJobInfo, MiscExt, PersistenceListener, Result, StateStorage, TabletContext,
-    TabletFactory, CF_DEFAULT, CF_WRITE,
+    CF_DEFAULT, CF_WRITE, CompactionJobInfo, MiscExt, PersistenceListener, Result, StateStorage,
+    TabletContext, TabletFactory,
 };
 use kvproto::kvrpcpb::ApiVersion;
-use raftstore::RegionInfoAccessor;
+use raftstore::{RegionInfoAccessor, store::ForcePartitionRangeManager};
 use tikv_util::worker::Scheduler;
 
 use crate::{
-    config::{CfResources, DbConfig, DbResources, TikvConfig, DEFAULT_ROCKSDB_SUB_DIR},
+    config::{CfResources, DEFAULT_ROCKSDB_SUB_DIR, DbConfig, DbResources, TikvConfig},
     storage::config::EngineType,
 };
 
@@ -47,6 +47,7 @@ impl KvEngineFactoryBuilder {
         config: &TikvConfig,
         cache: Cache,
         key_manager: Option<Arc<DataKeyManager>>,
+        force_partition_range_mgr: ForcePartitionRangeManager,
     ) -> Self {
         Self {
             inner: FactoryInner {
@@ -57,7 +58,9 @@ impl KvEngineFactoryBuilder {
                 sst_recovery_sender: None,
                 encryption_key_manager: key_manager,
                 db_resources: config.rocksdb.build_resources(env, config.storage.engine),
-                cf_resources: config.rocksdb.build_cf_resources(cache),
+                cf_resources: config
+                    .rocksdb
+                    .build_cf_resources(cache, force_partition_range_mgr),
                 state_storage: None,
                 lite: false,
             },
@@ -284,7 +287,8 @@ mod tests {
         let dir = test_util::temp_dir(name, false);
         let env = cfg.build_shared_rocks_env(None, None).unwrap();
 
-        let factory = KvEngineFactoryBuilder::new(env, &cfg, cache, None).build();
+        let factory =
+            KvEngineFactoryBuilder::new(env, &cfg, cache, None, Default::default()).build();
         let reg = TabletRegistry::new(Box::new(factory), dir.path()).unwrap();
         (dir, reg)
     }
diff --git a/src/server/errors.rs b/src/server/errors.rs
index 1f2631cf7b7..ba2e0a9c9b3 100644
--- a/src/server/errors.rs
+++ b/src/server/errors.rs
@@ -14,7 +14,7 @@ use thiserror::Error;
 use tikv_util::{codec::Error as CodecError, worker::ScheduleError};
 
 use super::snap::Task as SnapTask;
-use crate::storage::{kv::Error as EngineError, Error as StorageError};
+use crate::storage::{Error as StorageError, kv::Error as EngineError};
 
 #[derive(Debug, Error)]
 pub enum Error {
diff --git a/src/server/gc_worker/compaction_filter.rs b/src/server/gc_worker/compaction_filter.rs
index c415b0e5025..c7d23d356c8 100644
--- a/src/server/gc_worker/compaction_filter.rs
+++ b/src/server/gc_worker/compaction_filter.rs
@@ -6,28 +6,29 @@ use std::{
     mem,
     result::Result,
     sync::{
-        atomic::{AtomicU64, AtomicUsize, Ordering},
         Arc, Mutex,
+        atomic::{AtomicU64, AtomicUsize, Ordering},
     },
     time::Duration,
 };
 
 use engine_rocks::{
+    RocksEngine, RocksMvccProperties, RocksWriteBatchVec,
     raw::{
         CompactionFilter, CompactionFilterContext, CompactionFilterDecision,
         CompactionFilterFactory, CompactionFilterValueType,
     },
-    RocksEngine, RocksMvccProperties, RocksWriteBatchVec,
 };
 use engine_traits::{KvEngine, MiscExt, MvccProperties, WriteBatch, WriteOptions};
 use file_system::{IoType, WithIoType};
+use lazy_static::lazy_static;
 use pd_client::{Feature, FeatureGate};
 use prometheus::{local::*, *};
 use raftstore::coprocessor::RegionInfoProvider;
 use tikv_util::{
+    Either,
     time::Instant,
     worker::{ScheduleError, Scheduler},
-    Either,
 };
 use txn_types::{Key, TimeStamp, WriteRef, WriteType};
 
@@ -243,10 +244,7 @@ impl CompactionFilterFactory for WriteCompactionFilterFactory {
             "ratio_threshold" => ratio_threshold,
         );
 
-        if db
-            .as_ref()
-            .map_or(false, RocksEngine::is_stalled_or_stopped)
-        {
+        if db.as_ref().is_some_and(RocksEngine::is_stalled_or_stopped) {
             debug!("skip gc in compaction filter because the DB is stalled");
             return None;
         }
@@ -862,22 +860,22 @@ pub fn check_need_gc(
         }
     }
 
-    (needs_gc >= ((table_props.len() + 1) / 2)) || check_props(&sum_props).0
+    (needs_gc >= table_props.len().div_ceil(2)) || check_props(&sum_props).0
 }
 
 #[allow(dead_code)] // Some interfaces are not used with different compile options.
 #[cfg(any(test, feature = "failpoints"))]
 pub mod test_utils {
     use engine_rocks::{
+        RocksEngine,
         raw::{CompactOptions, CompactionOptions},
         util::get_cf_handle,
-        RocksEngine,
     };
-    use engine_traits::{SyncMutable, CF_DEFAULT, CF_WRITE};
+    use engine_traits::{CF_DEFAULT, CF_WRITE, SyncMutable};
     use raftstore::coprocessor::region_info_accessor::MockRegionInfoProvider;
     use tikv_util::{
         config::VersionTrack,
-        worker::{dummy_scheduler, ReceiverWrapper},
+        worker::{ReceiverWrapper, dummy_scheduler},
     };
 
     use super::*;
@@ -915,7 +913,7 @@ pub mod test_utils {
         pub(super) callbacks_on_drop: Vec<Arc<dyn Fn(&WriteCompactionFilter) + Send + Sync>>,
     }
 
-    impl<'a> TestGcRunner<'a> {
+    impl TestGcRunner<'_> {
         pub fn new(safe_point: u64) -> Self {
             let (gc_scheduler, gc_receiver) = dummy_scheduler();
 
@@ -932,7 +930,7 @@ pub mod test_utils {
         }
     }
 
-    impl<'a> TestGcRunner<'a> {
+    impl TestGcRunner<'_> {
         pub fn safe_point(&mut self, sp: u64) -> &mut Self {
             self.safe_point = sp;
             self
@@ -1043,7 +1041,7 @@ pub mod test_utils {
 
 #[cfg(test)]
 pub mod tests {
-    use engine_traits::{DeleteStrategy, MiscExt, Peekable, Range, SyncMutable, CF_WRITE};
+    use engine_traits::{CF_WRITE, DeleteStrategy, MiscExt, Peekable, Range, SyncMutable};
 
     use super::{test_utils::*, *};
     use crate::{
diff --git a/src/server/gc_worker/compaction_runner.rs b/src/server/gc_worker/compaction_runner.rs
new file mode 100644
index 00000000000..efb80eaa975
--- /dev/null
+++ b/src/server/gc_worker/compaction_runner.rs
@@ -0,0 +1,695 @@
+// Copyright 2025 TiKV Project Authors. Licensed under Apache-2.0.
+
+use std::{
+    cmp::Reverse,
+    collections::BinaryHeap,
+    sync::mpsc,
+    thread::{self, Builder as ThreadBuilder, JoinHandle},
+    time::{Duration, Instant},
+    vec::Vec,
+};
+
+use engine_traits::{
+    CF_DEFAULT, CF_WRITE, KvEngine, ManualCompactionOptions, Range, TableProperties,
+    TablePropertiesCollection, UserCollectedProperties,
+};
+use keys::{enc_end_key, enc_start_key};
+use kvproto::metapb::Region;
+use prometheus::*;
+use prometheus_static_metric::*;
+use raftstore::coprocessor::RegionInfoProvider;
+use tikv_util::{box_err, debug, error, info, sys::thread::StdThreadBuildWrapper, warn};
+use txn_types::TimeStamp;
+
+use super::{
+    Error, Result,
+    config::{GcConfig, GcWorkerConfigManager},
+    gc_worker::GcSafePointProvider,
+};
+
+make_static_metric! {
+    pub label_enum AutoCompactionDurationType {
+        initial_evaluation,
+        re_evaluation,
+        compact,
+    }
+
+    pub struct AutoCompactionDurationHistogramVec: Histogram {
+        "type" => AutoCompactionDurationType,
+    }
+
+
+}
+
+lazy_static::lazy_static! {
+    pub static ref AUTO_COMPACTION_DURATION_HISTOGRAM_VEC: AutoCompactionDurationHistogramVec = register_static_histogram_vec!(
+        AutoCompactionDurationHistogramVec,
+        "tikv_auto_compaction_duration_seconds",
+        "Time spent on auto compaction operations",
+        &["type"],
+        exponential_buckets(0.0001, 2.0, 26).unwrap()
+    ).unwrap();
+
+    pub static ref AUTO_COMPACTION_REGIONS_MEET_THRESHOLD_GAUGE: IntGauge = register_int_gauge!(
+        "tikv_auto_compaction_regions_meet_threshold",
+        "Number of regions that meet the compaction threshold"
+    ).unwrap();
+
+    pub static ref AUTO_COMPACTION_PENDING_CANDIDATES_GAUGE: IntGauge = register_int_gauge!(
+        "tikv_auto_compaction_pending_candidates",
+        "Number of pending compaction candidates"
+    ).unwrap();
+
+}
+
+/// A candidate for compaction with its priority score
+#[derive(Debug, Clone)]
+pub struct CompactionCandidate {
+    pub score: f64,
+    pub num_tombstones: u64,  // RocksDB tombstones
+    pub num_discardable: u64, // Estimated discardable TiKV MVCC versions
+    pub num_total_entries: u64,
+    pub num_rows: u64, // TiKV rows
+    pub region: Region,
+}
+
+impl PartialEq for CompactionCandidate {
+    fn eq(&self, other: &Self) -> bool {
+        self.score == other.score
+    }
+}
+
+impl Eq for CompactionCandidate {}
+
+impl PartialOrd for CompactionCandidate {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        self.score.partial_cmp(&other.score)
+    }
+}
+
+impl Ord for CompactionCandidate {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.partial_cmp(other).unwrap_or(std::cmp::Ordering::Equal)
+    }
+}
+
+/// Handle for managing compaction runner
+pub struct CompactionRunnerHandle {
+    join_handle: JoinHandle<()>,
+    stop_signal_sender: mpsc::Sender<()>,
+}
+
+impl CompactionRunnerHandle {
+    pub fn stop(self) -> Result<()> {
+        let res: Result<()> = self.stop_signal_sender.send(()).map_err(|e| {
+            box_err!(
+                "failed to send stop signal to compaction runner thread: {:?}",
+                e
+            )
+        });
+        res?;
+        self.join_handle
+            .join()
+            .map_err(|e| box_err!("failed to join compaction runner thread: {:?}", e))
+    }
+}
+
+/// Runs automatic compaction on TiKV
+/// Runs in a dedicated thread and continuously evaluates compaction candidates
+pub struct CompactionRunner<S: GcSafePointProvider, R: RegionInfoProvider, E: KvEngine> {
+    safe_point_provider: S,
+    region_info_provider: R,
+    engine: E,
+    stop_signal_receiver: Option<mpsc::Receiver<()>>,
+    is_stopped: bool,
+    cfg_tracker: GcWorkerConfigManager,
+}
+
+impl<S: GcSafePointProvider, R: RegionInfoProvider + 'static, E: KvEngine>
+    CompactionRunner<S, R, E>
+{
+    pub fn new(
+        safe_point_provider: S,
+        region_info_provider: R,
+        engine: E,
+        cfg_tracker: GcWorkerConfigManager,
+    ) -> Self {
+        Self {
+            safe_point_provider,
+            region_info_provider,
+            engine,
+            stop_signal_receiver: None,
+            is_stopped: false,
+            cfg_tracker,
+        }
+    }
+
+    fn curr_safe_point(&self) -> TimeStamp {
+        self.safe_point_provider
+            .get_safe_point()
+            .unwrap_or(TimeStamp::zero())
+    }
+
+    /// Starts the compaction runner in a separate thread
+    pub fn start(mut self) -> Result<CompactionRunnerHandle> {
+        fail_point!("gc_worker_auto_compaction_thread_start");
+        let (tx, rx) = mpsc::channel();
+        self.stop_signal_receiver = Some(rx);
+
+        let props = tikv_util::thread_group::current_properties();
+        let res: Result<_> = ThreadBuilder::new()
+            .name(tikv_util::thd_name!("compaction-runner"))
+            .spawn_wrapper(move || {
+                tikv_util::thread_group::set_properties(props);
+                self.run();
+            })
+            .map_err(|e| box_err!("failed to start compaction runner: {:?}", e));
+
+        res.map(|join_handle| CompactionRunnerHandle {
+            join_handle,
+            stop_signal_sender: tx,
+        })
+    }
+
+    /// Main loop for the compaction runner
+    fn run(&mut self) {
+        info!("compaction-runner started");
+        fail_point!("gc_worker_auto_compaction_start");
+        loop {
+            if self.check_stopped() {
+                break;
+            }
+
+            // Get consistent config snapshot for this run
+            let config = self.cfg_tracker.value().clone();
+            let check_interval = config.auto_compaction.check_interval.0;
+
+            // Get current safe point
+            let gc_safe_point = self.curr_safe_point().into_inner();
+
+            // Skip compaction if safe point is zero (GC not initialized)
+            if gc_safe_point == 0 {
+                info!("skipping compaction: GC safe point is zero");
+                if self.sleep_or_stop(check_interval) {
+                    break;
+                }
+                continue;
+            }
+
+            // Collect and rank compaction candidates
+            let candidates = match self.collect_compaction_candidates(gc_safe_point, &config) {
+                Ok(candidates) => {
+                    // Add failpoints to check specific candidates (using compact_top_n pattern)
+                    fail_point!(
+                        "gc_worker_auto_compaction_candidate_k05_k10",
+                        candidates
+                            .iter()
+                            .any(|c| c.num_total_entries == 10 && c.num_discardable == 5),
+                        |_| {}
+                    );
+                    fail_point!(
+                        "gc_worker_auto_compaction_candidate_k10_k15",
+                        candidates
+                            .iter()
+                            .any(|c| c.num_total_entries == 15 && c.num_discardable == 2),
+                        |_| {}
+                    );
+                    fail_point!(
+                        "gc_worker_auto_compaction_candidate_k15_k20",
+                        candidates
+                            .iter()
+                            .any(|c| c.num_total_entries == 20 && c.num_discardable == 7),
+                        |_| {}
+                    );
+                    fail_point!(
+                        "gc_worker_auto_compaction_candidate_k20_k35",
+                        candidates
+                            .iter()
+                            .any(|c| c.num_total_entries == 30 && c.num_discardable == 10),
+                        |_| {}
+                    );
+                    candidates
+                }
+                Err(e) => {
+                    error!("failed to collect compaction candidates: {:?}", e);
+                    if self.sleep_or_stop(check_interval) {
+                        break;
+                    }
+                    continue;
+                }
+            };
+
+            if candidates.is_empty() {
+                info!("no compaction candidates found, sleeping");
+                if self.sleep_or_stop(check_interval) {
+                    break;
+                }
+                continue;
+            }
+
+            // Compact the candidates
+            let elapsed = match self.compact_candidates(candidates, &config) {
+                Some(elapsed) => elapsed,
+                None => {
+                    break;
+                }
+            };
+
+            // Sleep for remaining time in check interval, or start next round immediately
+            if elapsed < check_interval {
+                let remaining_sleep = check_interval - elapsed;
+                if self.sleep_or_stop(remaining_sleep) {
+                    break;
+                }
+            }
+        }
+        debug!("compaction-runner stopped");
+    }
+
+    /// Collects all compaction candidates from all regions
+    fn collect_compaction_candidates(
+        &self,
+        gc_safe_point: u64,
+        config: &GcConfig,
+    ) -> Result<Vec<CompactionCandidate>> {
+        // Calculate heap capacity based on check duration (assuming 1 sec per
+        // compaction)
+        let check_duration_secs = config.auto_compaction.check_interval.as_secs() as usize;
+        let heap_capacity = check_duration_secs.max(10); // At least 10 candidates
+
+        debug!(
+            "collecting compaction candidates with heap capacity: {}",
+            heap_capacity
+        );
+
+        // Use a min-heap to keep top candidates (using Reverse for min-heap behavior)
+        // We use a heap to retain only the top candidates, which helps limit memory
+        // usage in case we need to track compaction scores for all regions.
+        // This module assumes that each compaction takes at least 1 second, ensuring
+        // full utilization of the time window between check intervals.
+        let mut candidates_heap: BinaryHeap<Reverse<CompactionCandidate>> =
+            BinaryHeap::with_capacity(heap_capacity);
+        let mut current_key = b"".to_vec();
+        let mut regions_meeting_threshold = 0;
+
+        while let Some(region) = self.get_next_region_context(&current_key)? {
+            // Evaluate this region as a compaction candidate
+            let evaluation_start = Instant::now();
+            match self.evaluate_range_candidate(&region, gc_safe_point, config) {
+                Ok(Some(candidate)) => {
+                    regions_meeting_threshold += 1;
+                    if candidates_heap.len() < heap_capacity {
+                        // Heap not full, add candidate
+                        candidates_heap.push(Reverse(candidate));
+                    } else if let Some(top) = candidates_heap.peek() {
+                        // Heap is full, check if new candidate has higher score than the lowest
+                        if candidate.score > top.0.score {
+                            candidates_heap.pop(); // Remove lowest score
+                            candidates_heap.push(Reverse(candidate)); // Add new candidate
+                        }
+                    }
+                }
+                Ok(None) => {} // No compaction needed
+                Err(e) => {
+                    warn!(
+                        "failed to evaluate region {} as compaction candidate: {:?}",
+                        region.get_id(),
+                        e
+                    );
+                }
+            }
+
+            // Record initial evaluation duration
+            AUTO_COMPACTION_DURATION_HISTOGRAM_VEC
+                .initial_evaluation
+                .observe(evaluation_start.elapsed().as_secs_f64());
+
+            if region.get_end_key().is_empty() {
+                // Reached the end of regions, stop seeking
+                break;
+            } else {
+                current_key = region.get_end_key().to_vec();
+            }
+        }
+
+        // Convert heap to sorted vector (highest score first)
+        let mut candidates: Vec<CompactionCandidate> = candidates_heap
+            .into_sorted_vec()
+            .into_iter()
+            .map(|reverse| reverse.0)
+            .collect();
+        candidates.reverse(); // Min-heap gives us lowest first, we want highest first
+
+        // Log details for top 10 candidates
+        for (rank, candidate) in candidates.iter().take(10).enumerate() {
+            info!("top compaction candidate";
+                "rank" => rank + 1,
+                "region_id" => candidate.region.get_id(),
+                "score" => candidate.score,
+                "total_entries" => candidate.num_total_entries,
+                "tikv_estimated_discardable" => candidate.num_discardable,
+                "rocksdb_tombstones" => candidate.num_tombstones,
+                "tikv_rows" => candidate.num_rows,
+            );
+        }
+
+        // Update gauge metrics
+        AUTO_COMPACTION_REGIONS_MEET_THRESHOLD_GAUGE.set(regions_meeting_threshold as i64);
+        AUTO_COMPACTION_PENDING_CANDIDATES_GAUGE.set(candidates.len() as i64);
+
+        info!("collected {} compaction candidates", candidates.len());
+        fail_point!("gc_worker_auto_compaction_candidates_collected");
+        Ok(candidates)
+    }
+
+    /// Compact candidates and return elapsed time
+    fn compact_candidates(
+        &mut self,
+        candidates: Vec<CompactionCandidate>,
+        config: &GcConfig,
+    ) -> Option<Duration> {
+        let start_time = Instant::now();
+        let mut processed_count = 0;
+        let total_candidates = candidates.len();
+        let check_interval = config.auto_compaction.check_interval.0;
+        fail_point!("gc_worker_auto_compaction_start_compacting");
+
+        for (index, candidate) in candidates.into_iter().enumerate() {
+            if self.check_stopped() {
+                return None; // Stopped
+            }
+
+            // Check if we've exceeded the check interval, return to start next round
+            let elapsed = start_time.elapsed();
+            if elapsed >= check_interval {
+                debug!("check interval exceeded, returning to start next round");
+                return Some(elapsed);
+            }
+
+            // Update pending candidates gauge (remaining candidates)
+            AUTO_COMPACTION_PENDING_CANDIDATES_GAUGE.set((total_candidates - index) as i64);
+
+            // Get current safe point for this candidate (might have advanced)
+            let current_gc_safe_point = self.curr_safe_point().into_inner();
+
+            // Recheck candidate before compacting in case it's been resolved
+            let re_evaluation_start = Instant::now();
+            let current_candidate = match self.evaluate_range_candidate(
+                &candidate.region,
+                current_gc_safe_point,
+                config,
+            ) {
+                Ok(Some(updated_candidate)) => updated_candidate,
+                Ok(None) => {
+                    info!(
+                        "candidate region {} no longer needs compaction, skipping",
+                        candidate.region.get_id()
+                    );
+                    continue;
+                }
+                Err(e) => {
+                    warn!(
+                        "failed to recheck candidate region {}: {:?}, proceeding with original",
+                        candidate.region.get_id(),
+                        e
+                    );
+                    candidate
+                }
+            };
+
+            // Record re-evaluation duration
+            AUTO_COMPACTION_DURATION_HISTOGRAM_VEC
+                .re_evaluation
+                .observe(re_evaluation_start.elapsed().as_secs_f64());
+
+            // Compact this candidate
+            let compact_start = Instant::now();
+            if let Err(e) = self.compact_candidate(&current_candidate, config) {
+                error!("failed to compact candidate: {:?}", e);
+                continue;
+            }
+            let compact_duration = compact_start.elapsed();
+            AUTO_COMPACTION_DURATION_HISTOGRAM_VEC
+                .compact
+                .observe(compact_duration.as_secs_f64());
+
+            processed_count += 1;
+            info!("compacted candidate"; 
+                  "region_id" => current_candidate.region.get_id(),
+                  "score" => current_candidate.score,
+                  "processed_count" => processed_count,
+                  "duration_ms" => compact_duration.as_millis());
+        }
+
+        Some(start_time.elapsed())
+    }
+
+    /// Compacts a single candidate
+    fn compact_candidate(&self, candidate: &CompactionCandidate, config: &GcConfig) -> Result<()> {
+        let bottommost_level_force = config.auto_compaction.bottommost_level_force;
+        let start_key = enc_start_key(&candidate.region);
+        let end_key = enc_end_key(&candidate.region);
+
+        // Compact write CF first (most important for GC)
+        self.compact_range_cf(
+            CF_WRITE,
+            Some(&start_key),
+            Some(&end_key),
+            bottommost_level_force,
+        )?;
+
+        // Then compact default CF
+        self.compact_range_cf(
+            CF_DEFAULT,
+            Some(&start_key),
+            Some(&end_key),
+            bottommost_level_force,
+        )?;
+
+        Ok(())
+    }
+
+    /// Compacts a range in a specific column family
+    fn compact_range_cf(
+        &self,
+        cf_name: &str,
+        start_key: Option<&[u8]>,
+        end_key: Option<&[u8]>,
+        bottommost_level_force: bool,
+    ) -> Result<()> {
+        let compact_options = ManualCompactionOptions::new(false, 1, bottommost_level_force);
+        self.engine
+            .compact_range_cf(cf_name, start_key, end_key, compact_options)
+            .map_err(|e: engine_traits::Error| -> Error {
+                box_err!("compact range failed: {:?}", e)
+            })?;
+        Ok(())
+    }
+
+    /// Gets the next region for compaction evaluation
+    fn get_next_region_context(&self, key: &[u8]) -> Result<Option<Region>> {
+        let (tx, rx) = mpsc::channel();
+
+        let res = self.region_info_provider.seek_region(
+            key,
+            Box::new(move |iter| {
+                if let Some(info) = iter.next() {
+                    // Assume any region returned by seek_region has a peer on this store
+                    let _ = tx.send(Some(info.region.clone()));
+                    return;
+                }
+                let _ = tx.send(None);
+            }),
+        );
+
+        if let Err(e) = res {
+            return Err(box_err!("failed to get next region information: {:?}", e));
+        }
+
+        match rx.recv() {
+            Ok(Some(region)) => Ok(Some(region)),
+            Ok(None) => Ok(None),
+            Err(e) => Err(box_err!("failed to receive region information: {:?}", e)),
+        }
+    }
+
+    /// Evaluates a key range as a compaction candidate using MVCC-aware scoring
+    fn evaluate_range_candidate(
+        &self,
+        region: &Region,
+        gc_safe_point: u64,
+        config: &GcConfig,
+    ) -> Result<Option<CompactionCandidate>> {
+        let start_key = enc_start_key(region);
+        let end_key = enc_end_key(region);
+
+        let mut num_tombstones = 0;
+        let mut num_discardable = 0;
+        let mut num_total_entries = 0;
+        let mut num_rows = 0;
+
+        let collection = self
+            .engine
+            .table_properties_collection(CF_WRITE, &[Range::new(&start_key, &end_key)])
+            .map_err(|e: engine_traits::Error| -> Error {
+                box_err!("failed to get table properties: {:?}", e)
+            })?;
+
+        collection.iter_table_properties(|table_prop| {
+            let num_entries = table_prop.get_num_entries();
+            num_total_entries += num_entries;
+
+            if let Some(mvcc_properties) = table_prop
+                .get_user_collected_properties()
+                .get_mvcc_properties()
+            {
+                // Collect MVCC stats
+                num_rows += mvcc_properties.num_rows;
+
+                // RocksDB tombstones are guaranteed to be discardable
+                num_tombstones += num_entries - mvcc_properties.num_versions;
+                if config.enable_compaction_filter {
+                    // Estimate discardable TiKV MVCC delete versions
+                    num_discardable += self.get_estimated_discardable_entries(
+                        mvcc_properties.num_deletes,
+                        mvcc_properties.oldest_delete_ts,
+                        mvcc_properties.newest_delete_ts,
+                        gc_safe_point,
+                    );
+                    // Estimate discardable stale MVCC versions
+                    num_discardable += self.get_estimated_discardable_entries(
+                        mvcc_properties.num_versions - mvcc_properties.num_rows,
+                        mvcc_properties.oldest_stale_version_ts,
+                        mvcc_properties.newest_stale_version_ts,
+                        gc_safe_point,
+                    );
+                }
+            }
+            true
+        });
+
+        let score =
+            self.get_compact_score(num_tombstones, num_discardable, num_total_entries, config);
+
+        if score > 0.0 {
+            fail_point!("gc_worker_auto_compaction_candidate_found");
+            Ok(Some(CompactionCandidate {
+                score,
+                num_tombstones,
+                num_discardable,
+                num_total_entries,
+                num_rows,
+                region: region.clone(),
+            }))
+        } else {
+            Ok(None)
+        }
+    }
+
+    /// Estimates the number of discardable MVCC entries based on GC safe point
+    fn get_estimated_discardable_entries(
+        &self,
+        num_entries: u64,
+        oldest_ts: TimeStamp,
+        newest_ts: TimeStamp,
+        gc_safe_point: u64,
+    ) -> u64 {
+        if num_entries == 0 || oldest_ts >= newest_ts {
+            return 0;
+        }
+        let oldest_ts = oldest_ts.into_inner();
+        let newest_ts = newest_ts.into_inner();
+
+        if gc_safe_point >= newest_ts {
+            return num_entries;
+        }
+        if gc_safe_point < oldest_ts {
+            return 0;
+        }
+
+        let total_range = newest_ts - oldest_ts;
+        let discardable_range = gc_safe_point - oldest_ts;
+        let portion = (discardable_range as f64) / (total_range as f64);
+        (num_entries as f64 * portion).round() as u64
+    }
+
+    /// Calculates compaction score based on tombstones and discardable entries
+    fn get_compact_score(
+        &self,
+        num_tombstones: u64,
+        num_discardable: u64,
+        num_total_entries: u64,
+        config: &GcConfig,
+    ) -> f64 {
+        if num_total_entries == 0 || num_total_entries < num_discardable {
+            return 0.0;
+        }
+
+        if !config.enable_compaction_filter {
+            // Only consider deletes (tombstones)
+            let ratio = num_tombstones as f64 / num_total_entries as f64;
+            if num_tombstones < config.auto_compaction.tombstones_num_threshold
+                && ratio < config.auto_compaction.tombstones_percent_threshold as f64 / 100.0
+            {
+                return 0.0;
+            }
+            return num_tombstones as f64 * ratio;
+        }
+
+        // When compaction filter is enabled, ignore tombstone threshold,
+        // just add deletes to redundant keys for scoring.
+        let ratio = (num_tombstones + num_discardable) as f64 / num_total_entries as f64;
+        if num_discardable < config.auto_compaction.redundant_rows_threshold
+            && ratio < config.auto_compaction.redundant_rows_percent_threshold as f64 / 100.0
+        {
+            return 0.0;
+        }
+        num_discardable as f64 * ratio
+    }
+
+    fn sleep_or_stop(&mut self, timeout: Duration) -> bool {
+        if self.is_stopped {
+            return true; // Already stopped
+        }
+        match self.stop_signal_receiver.as_ref() {
+            Some(rx) => match rx.recv_timeout(timeout) {
+                Ok(_) => {
+                    self.is_stopped = true;
+                    true // Stop requested
+                }
+                Err(mpsc::RecvTimeoutError::Timeout) => false, // Continue
+                Err(mpsc::RecvTimeoutError::Disconnected) => {
+                    error!("stop_signal_receiver unexpectedly disconnected");
+                    self.is_stopped = true;
+                    true // Stop
+                }
+            },
+            None => {
+                thread::sleep(timeout);
+                false // Continue
+            }
+        }
+    }
+
+    fn check_stopped(&mut self) -> bool {
+        if self.is_stopped {
+            return true; // Already stopped
+        }
+        match self.stop_signal_receiver.as_ref() {
+            Some(rx) => match rx.try_recv() {
+                Ok(_) => {
+                    self.is_stopped = true;
+                    true // Stop requested
+                }
+                Err(mpsc::TryRecvError::Empty) => false, // Continue
+                Err(mpsc::TryRecvError::Disconnected) => {
+                    error!(
+                        "stop_signal_receiver unexpectedly disconnected, compaction_runner will stop"
+                    );
+                    true // Stop
+                }
+            },
+            None => false, // Continue
+        }
+    }
+}
diff --git a/src/server/gc_worker/config.rs b/src/server/gc_worker/config.rs
index 809c55e1268..290c55244df 100644
--- a/src/server/gc_worker/config.rs
+++ b/src/server/gc_worker/config.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use online_config::{ConfigChange, ConfigManager, OnlineConfig};
 use tikv_util::{
-    config::{ReadableSize, VersionTrack},
+    config::{ReadableDuration, ReadableSize, VersionTrack},
     yatp_pool::FuturePool,
 };
 
@@ -13,6 +13,65 @@ pub const DEFAULT_GC_BATCH_KEYS: usize = 512;
 // No limit
 const DEFAULT_GC_MAX_WRITE_BYTES_PER_SEC: u64 = 0;
 
+// Auto compaction defaults - matching raftstore defaults
+const DEFAULT_AUTO_COMPACTION_CHECK_INTERVAL: ReadableDuration = ReadableDuration::secs(300); // 5 minutes, same as raftstore
+
+// Compaction threshold defaults - matching raftstore defaults
+const DEFAULT_TOMBSTONES_NUM_THRESHOLD: u64 = 10000; // same as region_compact_min_tombstones
+const DEFAULT_TOMBSTONES_PERCENT_THRESHOLD: u64 = 30; // same as region_compact_tombstones_percent
+const DEFAULT_REDUNDANT_ROWS_THRESHOLD: u64 = 50000; // same as region_compact_min_redundant_rows
+const DEFAULT_REDUNDANT_ROWS_PERCENT_THRESHOLD: u64 = 20; // same as region_compact_redundant_rows_percent
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, OnlineConfig)]
+#[serde(default)]
+#[serde(rename_all = "kebab-case")]
+pub struct AutoCompactionConfig {
+    /// How often to check for new compaction candidates
+    pub check_interval: ReadableDuration,
+    /// Minimum number of tombstones to trigger compaction
+    pub tombstones_num_threshold: u64,
+    /// Minimum percentage of tombstones to trigger compaction
+    pub tombstones_percent_threshold: u64,
+    /// Minimum number of redundant rows to trigger compaction
+    pub redundant_rows_threshold: u64,
+    /// Minimum percentage of redundant rows to trigger compaction
+    pub redundant_rows_percent_threshold: u64,
+    /// Force compaction of bottommost level
+    pub bottommost_level_force: bool,
+}
+
+impl Default for AutoCompactionConfig {
+    fn default() -> AutoCompactionConfig {
+        AutoCompactionConfig {
+            check_interval: DEFAULT_AUTO_COMPACTION_CHECK_INTERVAL,
+            tombstones_num_threshold: DEFAULT_TOMBSTONES_NUM_THRESHOLD,
+            tombstones_percent_threshold: DEFAULT_TOMBSTONES_PERCENT_THRESHOLD,
+            redundant_rows_threshold: DEFAULT_REDUNDANT_ROWS_THRESHOLD,
+            redundant_rows_percent_threshold: DEFAULT_REDUNDANT_ROWS_PERCENT_THRESHOLD,
+            bottommost_level_force: false,
+        }
+    }
+}
+
+impl AutoCompactionConfig {
+    pub fn validate(&self) -> std::result::Result<(), Box<dyn std::error::Error>> {
+        if self.check_interval.as_secs() == 0 {
+            return Err("auto_compaction.check_interval should not be 0".into());
+        }
+        if self.tombstones_percent_threshold > 100 {
+            return Err(
+                "auto_compaction.tombstones_percent_threshold should not exceed 100".into(),
+            );
+        }
+        if self.redundant_rows_percent_threshold > 100 {
+            return Err(
+                "auto_compaction.redundant_rows_percent_threshold should not exceed 100".into(),
+            );
+        }
+        Ok(())
+    }
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, OnlineConfig)]
 #[serde(default)]
 #[serde(rename_all = "kebab-case")]
@@ -27,6 +86,10 @@ pub struct GcConfig {
     pub compaction_filter_skip_version_check: bool,
     /// gc threads count
     pub num_threads: usize,
+
+    // Auto compaction settings
+    #[online_config(submodule)]
+    pub auto_compaction: AutoCompactionConfig,
 }
 
 impl Default for GcConfig {
@@ -38,6 +101,7 @@ impl Default for GcConfig {
             enable_compaction_filter: true,
             compaction_filter_skip_version_check: false,
             num_threads: 1,
+            auto_compaction: AutoCompactionConfig::default(),
         }
     }
 }
@@ -50,6 +114,7 @@ impl GcConfig {
         if self.num_threads == 0 {
             return Err("gc.thread_count should not be 0".into());
         }
+        self.auto_compaction.validate()?;
         Ok(())
     }
 }
diff --git a/src/server/gc_worker/gc_manager.rs b/src/server/gc_worker/gc_manager.rs
index 45f8156ab57..26fc869b91e 100644
--- a/src/server/gc_worker/gc_manager.rs
+++ b/src/server/gc_worker/gc_manager.rs
@@ -3,8 +3,9 @@
 use std::{
     cmp::Ordering,
     sync::{
+        Arc, Condvar, Mutex,
         atomic::{AtomicU64, Ordering as AtomicOrdering},
-        mpsc, Arc, Condvar, Mutex,
+        mpsc,
     },
     thread::{self, Builder as ThreadBuilder, JoinHandle},
     time::Duration,
@@ -18,10 +19,10 @@ use tikv_util::{store::find_peer, time::Instant, worker::Scheduler};
 use txn_types::{Key, TimeStamp};
 
 use super::{
+    Error, ErrorInner, Result,
     compaction_filter::is_compaction_filter_allowed,
     config::GcWorkerConfigManager,
-    gc_worker::{schedule_gc, GcSafePointProvider, GcTask},
-    Error, ErrorInner, Result,
+    gc_worker::{GcSafePointProvider, GcTask, schedule_gc},
 };
 use crate::{server::metrics::*, storage::Callback, tikv_util::sys::thread::StdThreadBuildWrapper};
 
@@ -675,7 +676,7 @@ mod tests {
     use std::{
         collections::BTreeMap,
         mem,
-        sync::mpsc::{channel, Receiver, Sender},
+        sync::mpsc::{Receiver, Sender, channel},
     };
 
     use engine_rocks::RocksEngine;
diff --git a/src/server/gc_worker/gc_worker.rs b/src/server/gc_worker/gc_worker.rs
index 44d8388b5e5..871224ffe1a 100644
--- a/src/server/gc_worker/gc_worker.rs
+++ b/src/server/gc_worker/gc_worker.rs
@@ -5,9 +5,9 @@ use std::{
     iter::Peekable,
     mem,
     sync::{
+        Arc, Mutex,
         atomic::{AtomicU64, AtomicUsize, Ordering},
         mpsc::Sender,
-        Arc, Mutex,
     },
     vec::IntoIter,
 };
@@ -17,8 +17,8 @@ use collections::HashMap;
 use concurrency_manager::ConcurrencyManager;
 use engine_rocks::{FlowInfo, RocksEngine};
 use engine_traits::{
-    raw_ttl::ttl_current_ts, DeleteStrategy, Error as EngineError, ImportExt, KvEngine, MiscExt,
-    Range, WriteBatch, WriteOptions, CF_DEFAULT, CF_LOCK, CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_WRITE, DeleteStrategy, Error as EngineError, ImportExt, KvEngine,
+    MiscExt, Range, WriteBatch, WriteOptions, raw_ttl::ttl_current_ts,
 };
 use file_system::{IoType, WithIoType};
 use futures::executor::block_on;
@@ -27,32 +27,32 @@ use pd_client::{FeatureGate, PdClient};
 use raftstore::coprocessor::{CoprocessorHost, RegionInfoProvider};
 use tikv_kv::{CfStatistics, CursorBuilder, Modify, SnapContext};
 use tikv_util::{
+    Either,
     config::{Tracker, VersionTrack},
     set_panic_context,
     store::find_peer,
-    time::{duration_to_sec, Instant, Limiter, SlowTimer},
+    time::{Instant, Limiter, SlowTimer, duration_to_sec},
     worker::{Builder as WorkerBuilder, LazyWorker, Runnable, ScheduleError, Scheduler},
-    Either,
 };
 use txn_types::{Key, TimeStamp};
-use yatp::{task::future::TaskCell, Remote};
+use yatp::{Remote, task::future::TaskCell};
 
 use super::{
-    check_need_gc,
+    Callback, Error, ErrorInner, Result, check_need_gc,
     compaction_filter::{
         CompactionFilterInitializer, DeleteBatch, GC_COMPACTION_FILTER_MVCC_DELETION_HANDLED,
         GC_COMPACTION_FILTER_MVCC_DELETION_WASTED, GC_COMPACTION_FILTER_ORPHAN_VERSIONS,
     },
+    compaction_runner::{CompactionRunner, CompactionRunnerHandle},
     config::{GcConfig, GcWorkerConfigManager},
     gc_manager::{AutoGcConfig, GcManager, GcManagerHandle},
-    Callback, Error, ErrorInner, Result,
 };
 use crate::{
     server::metrics::*,
     storage::{
-        kv::{metrics::GcKeyMode, Engine, ScanMode, Statistics},
+        kv::{Engine, ScanMode, Statistics, metrics::GcKeyMode},
         mvcc::{GcInfo, MvccReader, MvccTxn},
-        txn::{gc, Error as TxnError},
+        txn::{Error as TxnError, gc},
     },
 };
 
@@ -1211,6 +1211,7 @@ where
     worker_scheduler: Scheduler<GcTask<<E::Local as MiscExt>::DiskEngine>>,
 
     gc_manager_handle: Arc<Mutex<Option<GcManagerHandle>>>,
+    compaction_runner_handle: Arc<Mutex<Option<CompactionRunnerHandle>>>,
     feature_gate: FeatureGate,
 }
 
@@ -1227,6 +1228,7 @@ impl<E: Engine> Clone for GcWorker<E> {
             worker: self.worker.clone(),
             worker_scheduler: self.worker_scheduler.clone(),
             gc_manager_handle: self.gc_manager_handle.clone(),
+            compaction_runner_handle: self.compaction_runner_handle.clone(),
             feature_gate: self.feature_gate.clone(),
             region_info_provider: self.region_info_provider.clone(),
         }
@@ -1290,6 +1292,41 @@ where
         Ok(())
     }
 
+    pub fn start_auto_compaction<
+        S: GcSafePointProvider,
+        R: RegionInfoProvider + Clone + 'static,
+    >(
+        &self,
+        safe_point_provider: S,
+        region_info_provider: R,
+    ) -> Result<()> {
+        let mut handle = self.compaction_runner_handle.lock().unwrap();
+        assert!(handle.is_none(), "compaction runner already started");
+
+        let kv_engine = match self.engine.kv_engine() {
+            Some(engine) => engine,
+            None => {
+                warn!("kv_engine not available, auto compaction cannot start");
+                return Ok(());
+            }
+        };
+
+        let compaction_runner = CompactionRunner::new(
+            safe_point_provider,
+            region_info_provider,
+            kv_engine,
+            self.config_manager.clone(),
+        );
+
+        let new_handle = compaction_runner
+            .start()
+            .map_err(|e| -> Error { box_err!("failed to start compaction runner: {:?}", e) })?;
+
+        *handle = Some(new_handle);
+        info!("compaction runner started");
+        Ok(())
+    }
+
     pub fn scheduler(&self) -> Scheduler<GcTask<<E::Local as MiscExt>::DiskEngine>> {
         self.worker_scheduler.clone()
     }
@@ -1319,6 +1356,7 @@ impl<E: Engine> GcWorker<E> {
             worker: Arc::new(Mutex::new(worker)),
             worker_scheduler,
             gc_manager_handle: Arc::new(Mutex::new(None)),
+            compaction_runner_handle: Arc::new(Mutex::new(None)),
             feature_gate,
             region_info_provider,
         }
@@ -1352,6 +1390,10 @@ impl<E: Engine> GcWorker<E> {
         if let Some(h) = self.gc_manager_handle.lock().unwrap().take() {
             h.stop()?;
         }
+        // Stop CompactionRunner.
+        if let Some(h) = self.compaction_runner_handle.lock().unwrap().take() {
+            h.stop()?;
+        }
         // Stop self.
         self.worker.lock().unwrap().stop();
         Ok(())
@@ -1420,14 +1462,14 @@ pub mod test_gc_worker {
         metapb::{Peer, Region},
     };
     use raftstore::store::RegionSnapshot;
-    use tikv_kv::{write_modifies, OnAppliedCb};
+    use tikv_kv::{OnAppliedCb, write_modifies};
     use txn_types::{Key, TimeStamp};
 
     use crate::{
         server::gc_worker::{GcSafePointProvider, Result as GcWorkerResult},
         storage::{
-            kv::{self, Modify, Result as EngineResult, SnapContext, WriteData},
             Engine,
+            kv::{self, Modify, Result as EngineResult, SnapContext, WriteData},
         },
     };
 
@@ -1520,7 +1562,9 @@ pub mod test_gc_worker {
         }
 
         type IMSnap = Self::Snap;
-        type IMSnapshotRes = Self::SnapshotRes;
+        // TODO: revert this once https://github.com/rust-lang/rust/issues/140222 is fixed.
+        // type IMSnapshotRes = Self::SnapshotRes;
+        type IMSnapshotRes = impl Future<Output = EngineResult<Self::Snap>> + Send;
         fn async_in_memory_snapshot(&mut self, ctx: SnapContext<'_>) -> Self::IMSnapshotRes {
             self.async_snapshot(ctx)
         }
@@ -1537,6 +1581,7 @@ pub mod test_gc_worker {
     #[derive(Clone, Default)]
     pub struct MultiRocksEngine {
         pub engines: Arc<Mutex<HashMap<u64, PrefixedEngine>>>,
+        #[allow(dead_code)]
         pub region_info: HashMap<u64, Region>,
     }
 
@@ -1585,7 +1630,9 @@ pub mod test_gc_worker {
         }
 
         type IMSnap = Self::Snap;
-        type IMSnapshotRes = Self::SnapshotRes;
+        // TODO: revert this once https://github.com/rust-lang/rust/issues/140222 is fixed.
+        // type IMSnapshotRes = Self::SnapshotRes;
+        type IMSnapshotRes = impl Future<Output = EngineResult<Self::Snap>> + Send;
         fn async_in_memory_snapshot(&mut self, ctx: SnapContext<'_>) -> Self::IMSnapshotRes {
             self.async_snapshot(ctx)
         }
@@ -1603,15 +1650,15 @@ mod tests {
     };
 
     use api_version::{ApiV2, KvFormat, RawValue};
-    use engine_rocks::{raw::FlushOptions, util::get_cf_handle, RocksEngine};
+    use engine_rocks::{RocksEngine, raw::FlushOptions, util::get_cf_handle};
     use engine_traits::Peekable as _;
     use futures::executor::block_on;
     use kvproto::{kvrpcpb::ApiVersion, metapb::Peer};
     use online_config::{ConfigChange, ConfigManager, ConfigValue};
     use raft::StateRole;
     use raftstore::coprocessor::{
-        region_info_accessor::{MockRegionInfoProvider, RegionInfoAccessor},
         CoprocessorHost, RegionChangeEvent,
+        region_info_accessor::{MockRegionInfoProvider, RegionInfoAccessor},
     };
     use tempfile::Builder;
     use tikv_kv::Snapshot;
@@ -1623,11 +1670,12 @@ mod tests {
         config::DbConfig,
         server::gc_worker::{MockSafePointProvider, PrefixedEngine},
         storage::{
-            kv::{metrics::GcKeyMode, Modify, TestEngineBuilder, WriteData},
+            Engine, Storage, TestStorageBuilderApiV1,
+            kv::{Modify, TestEngineBuilder, WriteData, metrics::GcKeyMode},
             lock_manager::MockLockManager,
             mvcc::{
-                tests::{must_get_none, must_get_none_on_region, must_get_on_region},
                 MAX_TXN_WRITE_SIZE,
+                tests::{must_get_none, must_get_none_on_region, must_get_on_region},
             },
             txn::{
                 commands,
@@ -1637,7 +1685,6 @@ mod tests {
                     must_rollback,
                 },
             },
-            Engine, Storage, TestStorageBuilderApiV1,
         },
     };
 
diff --git a/src/server/gc_worker/mod.rs b/src/server/gc_worker/mod.rs
index 75b7441fbcb..422b04e37a7 100644
--- a/src/server/gc_worker/mod.rs
+++ b/src/server/gc_worker/mod.rs
@@ -1,22 +1,24 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 pub mod compaction_filter;
+mod compaction_runner;
 mod config;
 mod gc_manager;
 mod gc_worker;
 pub mod rawkv_compaction_filter;
 
 // TODO: Use separated error type for GcWorker instead.
-#[cfg(any(test, feature = "failpoints"))]
-pub use compaction_filter::test_utils::{gc_by_compact, TestGcRunner};
 pub use compaction_filter::WriteCompactionFilterFactory;
-pub use config::{GcConfig, GcWorkerConfigManager, DEFAULT_GC_BATCH_KEYS};
+#[cfg(any(test, feature = "failpoints"))]
+pub use compaction_filter::test_utils::{TestGcRunner, gc_by_compact};
+pub use compaction_runner::{CompactionCandidate, CompactionRunner, CompactionRunnerHandle};
+pub use config::{AutoCompactionConfig, DEFAULT_GC_BATCH_KEYS, GcConfig, GcWorkerConfigManager};
 use engine_traits::MvccProperties;
 pub use gc_manager::AutoGcConfig;
 #[cfg(any(test, feature = "testexport"))]
 pub use gc_worker::test_gc_worker::{MockSafePointProvider, PrefixedEngine};
 pub use gc_worker::{
-    sync_gc, GcSafePointProvider, GcTask, GcWorker, STAT_RAW_KEYMODE, STAT_TXN_KEYMODE,
+    GcSafePointProvider, GcTask, GcWorker, STAT_RAW_KEYMODE, STAT_TXN_KEYMODE, sync_gc,
 };
 pub use rawkv_compaction_filter::RawCompactionFilterFactory;
 use txn_types::TimeStamp;
@@ -62,11 +64,11 @@ fn check_need_gc(safe_point: TimeStamp, ratio_threshold: f64, props: &MvccProper
 #[cfg(test)]
 mod tests {
     use engine_rocks::RocksEngine;
-    use engine_traits::{MvccPropertiesExt, CF_WRITE};
+    use engine_traits::{CF_WRITE, MvccPropertiesExt};
     use kvproto::metapb::Region;
 
     use super::*;
-    use crate::storage::mvcc::reader_tests::{make_region, open_db, RegionEngine};
+    use crate::storage::mvcc::reader_tests::{RegionEngine, make_region, open_db};
 
     fn get_mvcc_properties_and_check_gc(
         db: &RocksEngine,
diff --git a/src/server/gc_worker/rawkv_compaction_filter.rs b/src/server/gc_worker/rawkv_compaction_filter.rs
index 3c59fd9ccbb..b878ec8950a 100644
--- a/src/server/gc_worker/rawkv_compaction_filter.rs
+++ b/src/server/gc_worker/rawkv_compaction_filter.rs
@@ -3,18 +3,18 @@
 use std::{
     ffi::CString,
     mem,
-    sync::{atomic::Ordering, Arc},
+    sync::{Arc, atomic::Ordering},
 };
 
 use api_version::{ApiV2, KeyMode, KvFormat};
 use engine_rocks::{
+    RocksEngine,
     raw::{
         CompactionFilter, CompactionFilterContext, CompactionFilterDecision,
         CompactionFilterFactory, CompactionFilterValueType,
     },
-    RocksEngine,
 };
-use engine_traits::{raw_ttl::ttl_current_ts, MiscExt};
+use engine_traits::{MiscExt, raw_ttl::ttl_current_ts};
 use prometheus::local::LocalHistogramVec;
 use raftstore::coprocessor::RegionInfoProvider;
 use tikv_util::worker::{ScheduleError, Scheduler};
@@ -22,13 +22,13 @@ use txn_types::Key;
 
 use crate::{
     server::gc_worker::{
+        GcTask, STAT_RAW_KEYMODE,
         compaction_filter::{
-            check_need_gc, CompactionFilterStats, DEFAULT_DELETE_BATCH_COUNT,
-            GC_COMPACTION_FAILURE, GC_COMPACTION_FILTERED, GC_COMPACTION_FILTER_MVCC_DELETION_MET,
-            GC_COMPACTION_FILTER_ORPHAN_VERSIONS, GC_COMPACTION_FILTER_PERFORM,
-            GC_COMPACTION_FILTER_SKIP, GC_CONTEXT,
+            CompactionFilterStats, DEFAULT_DELETE_BATCH_COUNT, GC_COMPACTION_FAILURE,
+            GC_COMPACTION_FILTER_MVCC_DELETION_MET, GC_COMPACTION_FILTER_ORPHAN_VERSIONS,
+            GC_COMPACTION_FILTER_PERFORM, GC_COMPACTION_FILTER_SKIP, GC_COMPACTION_FILTERED,
+            GC_CONTEXT, check_need_gc,
         },
-        GcTask, STAT_RAW_KEYMODE,
     },
     storage::mvcc::{GC_DELETE_VERSIONS_HISTOGRAM, MVCC_VERSIONS_HISTOGRAM},
 };
@@ -74,7 +74,7 @@ impl CompactionFilterFactory for RawCompactionFilterFactory {
         if gc_context
             .db
             .as_ref()
-            .map_or(false, RocksEngine::is_stalled_or_stopped)
+            .is_some_and(RocksEngine::is_stalled_or_stopped)
         {
             debug!("skip gc in compaction filter because the DB is stalled");
             return None;
@@ -357,7 +357,7 @@ pub mod tests {
     use std::time::Duration;
 
     use api_version::RawValue;
-    use engine_traits::{DeleteStrategy, Peekable, Range, WriteOptions, CF_DEFAULT};
+    use engine_traits::{CF_DEFAULT, DeleteStrategy, Peekable, Range, WriteOptions};
     use kvproto::kvrpcpb::{ApiVersion, Context};
     use tikv_kv::{Engine, Modify, WriteData};
     use txn_types::TimeStamp;
diff --git a/src/server/load_statistics/linux.rs b/src/server/load_statistics/linux.rs
index e0a9b950944..8927bf8a687 100644
--- a/src/server/load_statistics/linux.rs
+++ b/src/server/load_statistics/linux.rs
@@ -2,7 +2,7 @@
 
 use std::{
     cmp,
-    sync::{atomic::Ordering, Arc},
+    sync::{Arc, atomic::Ordering},
     time::Instant,
 };
 
diff --git a/src/server/load_statistics/mod.rs b/src/server/load_statistics/mod.rs
index f88dd465bef..5b647e48934 100644
--- a/src/server/load_statistics/mod.rs
+++ b/src/server/load_statistics/mod.rs
@@ -3,8 +3,8 @@
 use std::{
     cell::RefCell,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
 };
 
diff --git a/src/server/lock_manager/config.rs b/src/server/lock_manager/config.rs
index 6b7ddc7aca0..be42e67e829 100644
--- a/src/server/lock_manager/config.rs
+++ b/src/server/lock_manager/config.rs
@@ -3,8 +3,8 @@
 use std::{
     error::Error,
     sync::{
-        atomic::{AtomicBool, AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicU64, Ordering},
     },
 };
 
diff --git a/src/server/lock_manager/deadlock.rs b/src/server/lock_manager/deadlock.rs
index d1b148d899d..1c2818efc43 100644
--- a/src/server/lock_manager/deadlock.rs
+++ b/src/server/lock_manager/deadlock.rs
@@ -19,7 +19,7 @@ use grpcio::{
     WriteFlags,
 };
 use kvproto::{deadlock::*, metapb::Region};
-use pd_client::{PdClient, INVALID_ID};
+use pd_client::{INVALID_ID, PdClient};
 use raft::StateRole;
 use raftstore::{
     coprocessor::{
@@ -38,11 +38,11 @@ use tokio::task::spawn_local;
 use txn_types::TimeStamp;
 
 use super::{
+    Error, Result,
     client::{self, Client},
     config::Config,
     metrics::*,
     waiter_manager::Scheduler as WaiterMgrScheduler,
-    Error, Result,
 };
 use crate::{
     server::resolve::StoreAddrResolver,
diff --git a/src/server/lock_manager/metrics.rs b/src/server/lock_manager/metrics.rs
index d6ff48bcf80..3c8c400ca06 100644
--- a/src/server/lock_manager/metrics.rs
+++ b/src/server/lock_manager/metrics.rs
@@ -1,5 +1,6 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
+use lazy_static::lazy_static;
 use prometheus::*;
 use prometheus_static_metric::*;
 
diff --git a/src/server/lock_manager/mod.rs b/src/server/lock_manager/mod.rs
index a992d2ca1cf..697f6ae6193 100644
--- a/src/server/lock_manager/mod.rs
+++ b/src/server/lock_manager/mod.rs
@@ -8,8 +8,8 @@ pub mod waiter_manager;
 
 use std::{
     sync::{
-        atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
     },
     thread::JoinHandle,
 };
@@ -33,14 +33,14 @@ use self::{
 };
 use crate::{
     server::{
-        lock_manager::deadlock::RoleChangeNotifier, resolve::StoreAddrResolver, Error, Result,
+        Error, Result, lock_manager::deadlock::RoleChangeNotifier, resolve::StoreAddrResolver,
     },
     storage::{
+        DynamicConfigs as StorageDynamicConfigs,
         lock_manager::{
             CancellationCallback, DiagnosticContext, KeyLockWaitInfo,
             LockManager as LockManagerTrait, LockWaitToken, UpdateWaitForEvent, WaitTimeout,
         },
-        DynamicConfigs as StorageDynamicConfigs,
     },
 };
 
@@ -326,7 +326,7 @@ mod tests {
     use raftstore::coprocessor::RegionChangeEvent;
     use security::SecurityConfig;
     use tikv_util::config::{ReadableDuration, ReadableSize};
-    use tracker::{TrackerToken, INVALID_TRACKER_TOKEN};
+    use tracker::{INVALID_TRACKER_TOKEN, TrackerToken};
     use txn_types::Key;
 
     use self::{deadlock::tests::*, metrics::*, waiter_manager::tests::*};
diff --git a/src/server/lock_manager/waiter_manager.rs b/src/server/lock_manager/waiter_manager.rs
index f1b3c9b3dbe..5a4f7729220 100644
--- a/src/server/lock_manager/waiter_manager.rs
+++ b/src/server/lock_manager/waiter_manager.rs
@@ -6,8 +6,8 @@ use std::{
     pin::Pin,
     rc::Rc,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
     time::Instant,
 };
@@ -21,7 +21,7 @@ use futures::{
 use kvproto::{deadlock::WaitForEntry, metapb::RegionEpoch};
 use tikv_util::{
     config::ReadableDuration,
-    time::{duration_to_sec, InstantExt},
+    time::{InstantExt, duration_to_sec},
     timer::GLOBAL_TIMER_HANDLE,
     worker::{FutureRunnable, FutureScheduler, Stopped},
 };
@@ -30,13 +30,13 @@ use tracker::GLOBAL_TRACKERS;
 
 use super::{config::Config, deadlock::Scheduler as DetectorScheduler, metrics::*};
 use crate::storage::{
+    Error as StorageError, ErrorInner as StorageErrorInner,
     lock_manager::{
         CancellationCallback, DiagnosticContext, KeyLockWaitInfo, LockDigest, LockWaitToken,
         UpdateWaitForEvent, WaitTimeout,
     },
     mvcc::{Error as MvccError, ErrorInner as MvccErrorInner, TimeStamp},
     txn::Error as TxnError,
-    Error as StorageError, ErrorInner as StorageErrorInner,
 };
 
 struct DelayInner {
diff --git a/src/server/metrics.rs b/src/server/metrics.rs
index 3f3aa025f46..a14684e0bcd 100644
--- a/src/server/metrics.rs
+++ b/src/server/metrics.rs
@@ -6,14 +6,15 @@ use std::{
 };
 
 use collections::HashMap;
+use lazy_static::lazy_static;
 use prometheus::{exponential_buckets, local::LocalIntCounter, *};
 use prometheus_static_metric::*;
 use tikv_util::time::Instant;
 
+use crate::storage::ErrorHeaderKind;
 pub use crate::storage::kv::metrics::{
     GcKeysCF, GcKeysCounterVec, GcKeysCounterVecInner, GcKeysDetail,
 };
-use crate::storage::ErrorHeaderKind;
 
 make_auto_flush_static_metric! {
     pub label_enum GrpcTypeKind {
@@ -268,6 +269,12 @@ lazy_static! {
         exponential_buckets(5e-5, 2.0, 22).unwrap() // 50us ~ 104s
     )
     .unwrap();
+    pub static ref GRPC_BATCH_COMMANDS_WAIT_HISTOGRAM: Histogram = register_histogram!(
+        "tikv_grpc_batch_commands_wait_duration_seconds",
+        "Bucketed histogram of grpc server batch commands waiting duration",
+        exponential_buckets(5e-5, 2.0, 22).unwrap() // 50us ~ 104s
+    )
+    .unwrap();
     pub static ref SERVER_INFO_GAUGE_VEC: IntGaugeVec = register_int_gauge_vec!(
         "tikv_server_info",
         "Indicate the tikv server info, and the value is the server startup timestamp(s).",
@@ -453,12 +460,24 @@ lazy_static! {
             &["reason"]
         )
         .unwrap();
-    pub static ref CONFIG_ROCKSDB_GAUGE: GaugeVec = register_gauge_vec!(
-        "tikv_config_rocksdb",
-        "Config information of rocksdb",
+    pub static ref CONFIG_ROCKSDB_DB_GAUGE: GaugeVec = register_gauge_vec!(
+        "tikv_config_rocksdb_db",
+        "DB Config information of rocksdb",
+        &["db", "name"]
+    )
+    .unwrap();
+    pub static ref CONFIG_ROCKSDB_CF_GAUGE: GaugeVec = register_gauge_vec!(
+        "tikv_config_rocksdb_cf",
+        "CF Config information of rocksdb",
         &["cf", "name"]
     )
     .unwrap();
+    pub static ref CONFIG_FLOW_CONTROL_GAUGE: GaugeVec = register_gauge_vec!(
+        "tikv_config_flow_control",
+        "Config information of flow control",
+        &["name"]
+    )
+    .unwrap();
     pub static ref REQUEST_BATCH_SIZE_HISTOGRAM_VEC: RequestBatchSizeHistogramVec =
         register_static_histogram_vec!(
             RequestBatchSizeHistogramVec,
diff --git a/src/server/mod.rs b/src/server/mod.rs
index b17809956c8..03f9be932f6 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -30,17 +30,18 @@ pub use engine_factory::{KvEngineFactory, KvEngineFactoryBuilder};
 #[cfg(any(test, feature = "testexport"))]
 pub use self::server::test_router::TestRaftStoreRouter;
 pub use self::{
-    config::{Config, ServerConfigManager, DEFAULT_CLUSTER_ID, DEFAULT_LISTENING_ADDR},
+    config::{Config, DEFAULT_CLUSTER_ID, DEFAULT_LISTENING_ADDR, ServerConfigManager},
     errors::{Error, Result},
     metrics::{
-        CONFIG_ROCKSDB_GAUGE, CPU_CORES_QUOTA_GAUGE, MEMORY_LIMIT_GAUGE, MEM_TRACE_SUM_GAUGE,
+        CONFIG_FLOW_CONTROL_GAUGE, CONFIG_ROCKSDB_CF_GAUGE, CONFIG_ROCKSDB_DB_GAUGE,
+        CPU_CORES_QUOTA_GAUGE, MEM_TRACE_SUM_GAUGE, MEMORY_LIMIT_GAUGE,
     },
-    proxy::{build_forward_option, get_target_address, Proxy},
+    proxy::{Proxy, build_forward_option, get_target_address},
     raft_client::{ConnectionBuilder, MetadataSourceStoreId, RaftClient},
     raft_server::MultiRaftServer,
     raftkv::RaftKv,
     raftkv2::{Extension, NodeV2, RaftKv2},
     resolve::{PdStoreAddrResolver, StoreAddrResolver},
-    server::{Server, GRPC_THREAD_PREFIX},
+    server::{GRPC_THREAD_PREFIX, Server},
     transport::ServerTransport,
 };
diff --git a/src/server/proxy.rs b/src/server/proxy.rs
index c380e628348..0f1eb1b3507 100644
--- a/src/server/proxy.rs
+++ b/src/server/proxy.rs
@@ -83,10 +83,7 @@ impl ClientPool {
     ) -> Option<Client> {
         if self.last_pos == self.pool.len() {
             if self.last_pos < cfg.forward_max_connections_per_address {
-                let env = match env.upgrade() {
-                    Some(e) => e,
-                    None => return None,
-                };
+                let env = env.upgrade()?;
                 let cb = ChannelBuilder::new(env)
                     .stream_initial_window_size(cfg.grpc_stream_initial_window_size.0 as i32)
                     .max_receive_message_len(-1)
diff --git a/src/server/raft_client.rs b/src/server/raft_client.rs
index b6d1f96d618..91f9de48fb4 100644
--- a/src/server/raft_client.rs
+++ b/src/server/raft_client.rs
@@ -7,8 +7,8 @@ use std::{
     pin::Pin,
     result,
     sync::{
-        atomic::{AtomicI32, AtomicU8, Ordering},
         Arc, Mutex,
+        atomic::{AtomicI32, AtomicU8, Ordering},
     },
     time::{Duration, Instant, SystemTime, UNIX_EPOCH},
 };
@@ -16,17 +16,18 @@ use std::{
 use collections::{HashMap, HashSet};
 use crossbeam::queue::ArrayQueue;
 use futures::{
+    Future, Sink,
     channel::oneshot,
     compat::Future01CompatExt,
     ready,
     task::{Context, Poll, Waker},
-    Future, Sink,
 };
 use futures_timer::Delay;
 use grpcio::{
     CallOption, Channel, ChannelBuilder, ClientCStreamReceiver, ClientCStreamSender, Environment,
     MetadataBuilder, RpcStatusCode, WriteFlags,
 };
+use grpcio_health::proto::HealthClient;
 use kvproto::{
     raft_serverpb::{Done, RaftMessage, RaftSnapshotData},
     tikvpb::{BatchRaftMessage, TikvClient},
@@ -39,20 +40,28 @@ use tikv_kv::RaftExtension;
 use tikv_util::{
     config::{Tracker, VersionTrack},
     lru::LruCache,
-    time::{duration_to_sec, InstantExt},
+    time::{InstantExt, duration_to_sec},
     timer::GLOBAL_TIMER_HANDLE,
-    worker::Scheduler,
+    worker::{Scheduler, Worker},
 };
-use yatp::{task::future::TaskCell, ThreadPool};
+use yatp::{ThreadPool, task::future::TaskCell};
 
 use crate::server::{
+    Config, StoreAddrResolver,
     load_statistics::ThreadLoadPool,
     metrics::*,
     resolve::{Error as ResolveError, Result as ResolveResult},
     snap::Task as SnapTask,
-    Config, StoreAddrResolver,
 };
 
+// Implement health_controller::HealthChecker for HealthChecker to bridge with
+// health_controller
+impl health_controller::HealthChecker for HealthChecker {
+    fn get_all_max_latencies(&self) -> HashMap<u64, f64> {
+        self.get_all_max_latencies()
+    }
+}
+
 pub struct MetadataSourceStoreId {}
 
 impl MetadataSourceStoreId {
@@ -603,7 +612,7 @@ where
         if let Some(tx) = self.lifetime.take() {
             let should_fallback = [sink_err, recv_err]
                 .iter()
-                .any(|e| e.as_ref().map_or(false, grpc_error_is_unimplemented));
+                .any(|e| e.as_ref().is_some_and(grpc_error_is_unimplemented));
 
             let res = if should_fallback {
                 // Asks backend to fallback.
@@ -853,8 +862,9 @@ async fn start<S, R>(
                 error_unknown!(?e; "resolve store address failed"; "store_id" => back_end.store_id,);
                 if let ResolveError::StoreTombstone(_) = e {
                     let mut pool = pool.lock().unwrap();
-                    if let Some(s) = pool.connections.remove(&(back_end.store_id, conn_id)) {
-                        s.set_conn_state(ConnState::Disconnected);
+                    if let Some(conn_info) = pool.connections.remove(&(back_end.store_id, conn_id))
+                    {
+                        conn_info.queue.set_conn_state(ConnState::Disconnected);
                     }
                     pool.tombstone_stores.insert(back_end.store_id);
                     return;
@@ -866,7 +876,7 @@ async fn start<S, R>(
         // reuse channel if the address is the same.
         if addr_channel
             .as_ref()
-            .map_or(true, |(_, prev_addr)| prev_addr != &addr)
+            .is_none_or(|(_, prev_addr)| prev_addr != &addr)
         {
             addr_channel = Some((back_end.connect(&addr), addr.clone()));
         }
@@ -899,6 +909,17 @@ async fn start<S, R>(
                 .observe(duration_to_sec(wait_conn_duration));
             begin = None;
             try_count = 0;
+
+            // Update the channel in ConnectionPool for health check
+            {
+                let mut pool_guard = pool.lock().unwrap();
+                if let Some(conn_info) = pool_guard
+                    .connections
+                    .get_mut(&(back_end.store_id, conn_id))
+                {
+                    conn_info.channel = Some(channel.clone());
+                }
+            }
         }
 
         let client = TikvClient::new(channel);
@@ -927,18 +948,53 @@ async fn start<S, R>(
                     .router
                     .report_store_unreachable(back_end.store_id);
                 addr_channel = None;
+
+                // Clear the channel when connection is lost
+                {
+                    let mut pool_guard = pool.lock().unwrap();
+                    if let Some(conn_info) = pool_guard
+                        .connections
+                        .get_mut(&(back_end.store_id, conn_id))
+                    {
+                        conn_info.channel = None;
+                    }
+                }
             }
         }
     }
 }
 
+/// Connection information for a specific store connection.
+///
+/// This struct contains the essential components needed to manage a connection
+/// to a remote TiKV store, including message queuing and gRPC channel
+/// management.
+struct ConnectionInfo {
+    /// Message queue for buffering raft messages before sending.
+    ///
+    /// The queue is shared between the sender (RaftClient) and the background
+    /// connection task. It handles connection states
+    /// (established/paused/disconnected) and provides backpressure when
+    /// full.
+    queue: Arc<Queue>,
+
+    /// Optional gRPC channel for the connection.
+    ///
+    /// This is `None` when the connection is not established or has been lost.
+    /// When `Some`, it contains an active gRPC channel that can be used for
+    /// health checks and other communication with the remote store.
+    /// The channel is updated by the background connection task when the
+    /// connection state changes.
+    channel: Option<Channel>,
+}
+
 /// A global connection pool.
 ///
 /// All valid connections should be stored as a record. Once it's removed
 /// from the struct, all cache clone should also remove it at some time.
 #[derive(Default)]
 struct ConnectionPool {
-    connections: HashMap<(u64, usize), Arc<Queue>>,
+    connections: HashMap<(u64, usize), ConnectionInfo>,
     tombstone_stores: HashSet<u64>,
     store_allowlist: Vec<u64>,
 }
@@ -946,12 +1002,15 @@ struct ConnectionPool {
 impl ConnectionPool {
     fn set_store_allowlist(&mut self, stores: Vec<u64>) {
         self.store_allowlist = stores;
-        for (&(store_id, _), q) in self.connections.iter() {
+        let need_pause_check = !self.store_allowlist.is_empty();
+        let allowlist = &self.store_allowlist;
+
+        for (&(store_id, _), conn_info) in self.connections.iter_mut() {
             let mut state = ConnState::Established;
-            if self.need_pause(store_id) {
+            if need_pause_check && !allowlist.contains(&store_id) {
                 state = ConnState::Paused;
             }
-            q.set_conn_state(state);
+            conn_info.queue.set_conn_state(state);
         }
     }
 
@@ -992,6 +1051,8 @@ pub struct RaftClient<S, R> {
     future_pool: Arc<ThreadPool<TaskCell>>,
     builder: ConnectionBuilder<S, R>,
     last_hash: (u64, u64),
+
+    health_checker: HealthChecker,
 }
 
 impl<S, R> RaftClient<S, R>
@@ -999,24 +1060,58 @@ where
     S: StoreAddrResolver + Send + 'static,
     R: RaftExtension + Unpin + Send + 'static,
 {
-    pub fn new(self_store_id: u64, builder: ConnectionBuilder<S, R>) -> Self {
+    pub fn new(
+        self_store_id: u64,
+        builder: ConnectionBuilder<S, R>,
+        inspect_interval: Duration,
+        background_worker: Worker,
+    ) -> Self {
         let future_pool = Arc::new(
             yatp::Builder::new(thd_name!("raft-stream"))
                 .max_thread_count(1)
                 .build_future_pool(),
         );
+        let pool: Arc<Mutex<ConnectionPool>> = Arc::default();
+        let health_checker = HealthChecker::new(
+            self_store_id,
+            pool.clone(),
+            inspect_interval,
+            background_worker.clone(),
+        );
         RaftClient {
             self_store_id,
-            pool: Arc::default(),
+            pool,
             cache: LruCache::with_capacity_and_sample(0, 7),
             need_flush: vec![],
             full_stores: vec![],
             future_pool,
             builder,
             last_hash: (0, 0),
+            health_checker,
         }
     }
 
+    // Start the network inspection
+    pub fn start_network_inspection(&self) {
+        let health_checker = self.health_checker.clone();
+        self.future_pool.spawn(async move {
+            health_checker.run().await;
+        });
+    }
+
+    /// Get the maximum latency for a specific store. Just for test
+    /// Returns the latency in milliseconds, or None if no latency recorded for
+    /// this store
+    pub fn get_max_latency(&self, store_id: u64) -> Option<f64> {
+        self.health_checker.get_max_latency(store_id)
+    }
+
+    /// Get all maximum latencies. Just for test
+    /// Returns a HashMap of store_id -> max_latency_ms
+    pub fn get_all_max_latencies(&self) -> HashMap<u64, f64> {
+        self.health_checker.get_all_max_latencies()
+    }
+
     /// Loads connection from pool.
     ///
     /// Creates it if it doesn't exist. `false` is returned if such connection
@@ -1031,7 +1126,7 @@ where
                 return false;
             }
             let need_pause = pool.need_pause(store_id);
-            let conn = pool
+            let conn_info = pool
                 .connections
                 .entry((store_id, conn_id))
                 .or_insert_with(|| {
@@ -1049,10 +1144,13 @@ where
                     };
                     self.future_pool
                         .spawn(start(back_end, conn_id, self.pool.clone()));
-                    queue
-                })
-                .clone();
-            (conn, pool.connections.len())
+                    ConnectionInfo {
+                        queue: queue.clone(),
+                        channel: None,
+                    }
+                });
+            let queue = conn_info.queue.clone();
+            (queue, pool.connections.len())
         };
         self.cache.resize(pool_len);
         self.cache.insert(
@@ -1180,9 +1278,9 @@ where
                 continue;
             }
             let l = self.pool.lock().unwrap();
-            if let Some(q) = l.connections.get(id) {
+            if let Some(conn_info) = l.connections.get(id) {
                 counter += 1;
-                q.notify();
+                conn_info.queue.notify();
             }
         }
         self.need_flush.clear();
@@ -1196,6 +1294,10 @@ where
         let mut p = self.pool.lock().unwrap();
         p.set_store_allowlist(stores);
     }
+
+    pub fn get_health_checker(&self) -> HealthChecker {
+        self.health_checker.clone()
+    }
 }
 
 impl<S, R> Clone for RaftClient<S, R>
@@ -1213,10 +1315,320 @@ where
             future_pool: self.future_pool.clone(),
             builder: self.builder.clone(),
             last_hash: (0, 0),
+            health_checker: self.health_checker.clone(),
         }
     }
 }
 
+#[derive(Clone)]
+pub struct HealthChecker {
+    self_store_id: u64,
+    pool: Arc<Mutex<ConnectionPool>>,
+    inspect_interval: Duration,
+    // Store shutdown senders for each store inspection task
+    task_handles: Arc<Mutex<HashMap<u64, oneshot::Sender<()>>>>,
+    background_worker: Worker,
+    // Store the maximum latency and its timestamp that began to check for each store (in
+    // milliseconds, Instant)
+    max_latencies: Arc<Mutex<HashMap<u64, (f64, Instant)>>>,
+}
+
+impl HealthChecker {
+    fn new(
+        self_store_id: u64,
+        pool: Arc<Mutex<ConnectionPool>>,
+        inspect_interval: Duration,
+        background_worker: Worker,
+    ) -> Self {
+        HealthChecker {
+            self_store_id,
+            pool,
+            inspect_interval,
+            task_handles: Arc::new(Mutex::new(HashMap::default())),
+            background_worker,
+            max_latencies: Arc::new(Mutex::new(HashMap::default())),
+        }
+    }
+
+    /// Main control loop that manages inspection tasks for all stores
+    pub async fn run(&self) {
+        if self.inspect_interval.is_zero() {
+            info!("Network inspection is disabled.");
+            return;
+        }
+        let mut watched_stores = HashSet::default();
+        let check_interval = (|| {
+            fail_point!("network_inspection_interval", |_| {
+                Duration::from_millis(10)
+            });
+            Duration::from_secs(30)
+        })();
+
+        loop {
+            // Check current stores in the pool
+            let current_stores: HashSet<u64> = {
+                let pool_guard = self.pool.lock().unwrap();
+                pool_guard
+                    .connections
+                    .keys()
+                    .map(|(store_id, _)| *store_id)
+                    .collect()
+            };
+
+            // Find stores that need to be added
+            for store_id in current_stores.difference(&watched_stores) {
+                self.start_store_inspection(*store_id);
+            }
+
+            // Find stores that need to be removed
+            for store_id in watched_stores.difference(&current_stores) {
+                self.stop_store_inspection(*store_id);
+            }
+
+            watched_stores = current_stores;
+            if let Err(e) = GLOBAL_TIMER_HANDLE
+                .delay(Instant::now() + check_interval)
+                .compat()
+                .await
+            {
+                error!("failed to delay in store inspection management"; "error" => ?e);
+            }
+        }
+    }
+
+    /// Start inspection task for a specific store
+    fn start_store_inspection(&self, store_id: u64) {
+        info!("Starting health check inspection for store"; "store_id" => store_id);
+
+        let (shutdown_tx, shutdown_rx) = oneshot::channel();
+
+        // Store the shutdown sender
+        {
+            let mut handles = self.task_handles.lock().unwrap();
+            handles.insert(store_id, shutdown_tx);
+        }
+
+        // Spawn the inspection task using the background worker
+        let pool = self.pool.clone();
+        let inspect_interval = self.inspect_interval;
+        let max_latencies = self.max_latencies.clone();
+        let self_store_id = self.self_store_id;
+
+        self.background_worker.spawn_async_task(async move {
+            Self::store_inspection_loop(
+                self_store_id,
+                store_id,
+                pool,
+                inspect_interval,
+                max_latencies,
+                shutdown_rx,
+            )
+            .await;
+        });
+    }
+
+    /// Stop inspection task for a specific store
+    fn stop_store_inspection(&self, store_id: u64) {
+        info!("Stopping health check inspection for store"; "store_id" => store_id);
+
+        let shutdown_tx = {
+            let mut handles = self.task_handles.lock().unwrap();
+            handles.remove(&store_id)
+        };
+
+        if let Some(tx) = shutdown_tx {
+            let _ = tx.send(());
+        }
+    }
+
+    /// Main inspection loop for a single store
+    async fn store_inspection_loop(
+        self_store_id: u64,
+        store_id: u64,
+        pool: Arc<Mutex<ConnectionPool>>,
+        inspect_interval: Duration,
+        max_latencies: Arc<Mutex<HashMap<u64, (f64, Instant)>>>,
+        mut shutdown_rx: oneshot::Receiver<()>,
+    ) {
+        let mut last_check_time = Instant::now();
+
+        loop {
+            // Check if we should shutdown
+            if let Ok(Some(())) = shutdown_rx.try_recv() {
+                info!("Shutting down health check inspection for store"; "store_id" => store_id);
+                // Reset max latency for this store
+                {
+                    let mut max_latencies = max_latencies.lock().unwrap();
+                    max_latencies.remove(&store_id);
+                }
+                break;
+            }
+
+            // Wait for the specified interval
+            if let Err(e) = GLOBAL_TIMER_HANDLE
+                .delay(last_check_time + inspect_interval)
+                .compat()
+                .await
+            {
+                error!("failed to latency in network inspection"; "store_id" => store_id, "error" => ?e);
+                continue;
+            }
+
+            last_check_time = Instant::now();
+
+            // Get connections for this specific store
+            let store_connections: Vec<(usize, Arc<Queue>, Option<Channel>)> = {
+                let pool_guard = pool.lock().unwrap();
+                pool_guard
+                    .connections
+                    .iter()
+                    .filter_map(|((sid, conn_id), conn_info)| {
+                        if *sid == store_id {
+                            Some((*conn_id, conn_info.queue.clone(), conn_info.channel.clone()))
+                        } else {
+                            None
+                        }
+                    })
+                    .collect()
+            };
+
+            // If no connections for this store, continue
+            if store_connections.is_empty() {
+                continue;
+            }
+
+            // Perform health check for each connection of this store
+            for (conn_id, queue, channel_opt) in store_connections {
+                // Skip if the connection is not established
+                if queue.conn_state.load(Ordering::SeqCst) != ConnState::Established as u8 {
+                    continue;
+                }
+
+                // Get the channel if available
+                if let Some(channel) = channel_opt {
+                    Self::perform_health_check(
+                        self_store_id,
+                        store_id,
+                        conn_id,
+                        channel,
+                        max_latencies.clone(),
+                    )
+                    .await;
+
+                    break;
+                }
+            }
+        }
+    }
+
+    async fn perform_health_check(
+        self_store_id: u64,
+        store_id: u64,
+        conn_id: usize,
+        channel: Channel,
+        max_latencies: Arc<Mutex<HashMap<u64, (f64, Instant)>>>,
+    ) {
+        let start_time = Instant::now();
+
+        let health_client = HealthClient::new(channel);
+
+        let mut req = grpcio_health::proto::HealthCheckRequest::new();
+        req.set_service("".to_string()); // Empty service name for overall health
+
+        // Slow score calculation algorithm
+        //   1. By default, the latency is sampled every 100ms, and latencies exceeding
+        //      1s are considered timeouts.
+        //   2. A slow score is calculated every 3 samples. If there are n timeouts in
+        //      the 3 samples, the slow score is multiplied by 2^(n/3).
+        // If a request does not return within 5s, it will resulting in 40(4s) timeout
+        // samples. Thus, the slow score will reach 2^(40/3) > 100. Since the upper
+        // limit of the slow score (100) has already been reached, the probing
+        // can be stopped.
+        let call_opt = CallOption::default().timeout(Duration::from_secs(5));
+
+        let now = Instant::now();
+        {
+            let mut latencies = max_latencies.lock().unwrap();
+            latencies.entry(store_id).insert_entry((0.0, now));
+        }
+        match health_client.check_async_opt(&req, call_opt) {
+            Ok(resp_future) => {
+                let _ = resp_future.await;
+                let elapsed = start_time.elapsed();
+
+                let latency_ms = elapsed.as_secs_f64() * 1000.0;
+                {
+                    let mut latencies = max_latencies.lock().unwrap();
+                    let entry = latencies.entry(store_id).or_insert((0.0, now));
+                    entry.0 = latency_ms;
+                }
+            }
+            Err(e) => {
+                warn!(
+                    "Failed to create health check request";
+                    "self_store_id" => self_store_id,
+                    "store_id" => store_id,
+                    "conn_id" => conn_id,
+                    "error" => ?e
+                );
+            }
+        }
+    }
+
+    /// Get the maximum latency for a specific store
+    /// Returns the latency in milliseconds, or None if no latency recorded for
+    /// this store
+    /// This method just for test
+    pub fn get_max_latency(&self, store_id: u64) -> Option<f64> {
+        let latencies = self.max_latencies.lock().unwrap();
+        let now = Instant::now();
+        latencies.get(&store_id).map(|(lat, ts)| {
+            if *lat == 0.0 {
+                now.duration_since(*ts).as_secs_f64() * 1000.
+            } else {
+                *lat
+            }
+        })
+    }
+
+    /// Get all maximum latencies
+    /// Returns a HashMap of store_id -> max_latency_ms
+    pub fn get_all_max_latencies(&self) -> HashMap<u64, f64> {
+        let latencies = self.max_latencies.lock().unwrap();
+        let now = Instant::now();
+        latencies
+            .iter()
+            .map(|(k, (lat, ts))| {
+                let ret = if *lat == 0.0 {
+                    now.duration_since(*ts).as_secs_f64() * 1000.
+                } else {
+                    *lat
+                };
+                (*k, ret)
+            })
+            .collect()
+    }
+}
+
+impl Drop for HealthChecker {
+    fn drop(&mut self) {
+        info!(
+            "Shutting down HealthChecker, sending shutdown signals to all running inspection tasks"
+        );
+
+        // Send shutdown signals to all running inspection tasks
+        let mut handles = self.task_handles.lock().unwrap();
+        for (store_id, shutdown_tx) in handles.drain() {
+            info!("Sending shutdown signal to inspection task for store"; "store_id" => store_id);
+            if shutdown_tx.send(()).is_err() {
+                warn!("Failed to send shutdown signal to inspection task for store"; "store_id" => store_id);
+            }
+        }
+
+        info!("HealthChecker shutdown complete, all inspection tasks signaled to stop");
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::sync::Arc;
@@ -1347,4 +1759,96 @@ mod tests {
             test::black_box(&mut msg_buf);
         });
     }
+
+    #[test]
+    fn test_health_checker_creation() {
+        let self_store_id = 1;
+        let pool: Arc<Mutex<ConnectionPool>> = Arc::default();
+        let interval = Duration::from_millis(100);
+        let background_worker = Worker::new("test-worker");
+
+        let health_checker =
+            HealthChecker::new(self_store_id, pool.clone(), interval, background_worker);
+
+        assert_eq!(health_checker.self_store_id, self_store_id);
+        assert!(Arc::ptr_eq(&health_checker.pool, &pool));
+        assert_eq!(health_checker.inspect_interval, interval);
+        assert!(health_checker.task_handles.lock().unwrap().is_empty());
+        assert!(health_checker.max_latencies.lock().unwrap().is_empty());
+    }
+
+    #[test]
+    fn test_health_checker_latency_management() {
+        let self_store_id = 1;
+        let pool: Arc<Mutex<ConnectionPool>> = Arc::default();
+        let interval = Duration::from_millis(100);
+        let background_worker = Worker::new("test-worker");
+
+        let health_checker = HealthChecker::new(self_store_id, pool, interval, background_worker);
+
+        // Manually add some latencies for testing
+        use std::{thread::sleep, time::Duration as StdDuration};
+        let now = Instant::now();
+        {
+            let mut latencies = health_checker.max_latencies.lock().unwrap();
+            latencies.insert(1, (100.5, now));
+            latencies.insert(2, (200.8, now));
+            latencies.insert(3, (300.2, now));
+        }
+
+        // Test get
+        assert_eq!(health_checker.get_max_latency(1), Some(100.5));
+        assert_eq!(health_checker.get_max_latency(2), Some(200.8));
+        assert_eq!(health_checker.get_max_latency(4), None);
+
+        let all_latencies = health_checker.get_all_max_latencies();
+        assert_eq!(all_latencies.len(), 3);
+        assert_eq!(all_latencies[&1], 100.5);
+        assert_eq!(all_latencies[&2], 200.8);
+        assert_eq!(all_latencies[&3], 300.2);
+
+        let now = Instant::now();
+        {
+            let mut latencies = health_checker.max_latencies.lock().unwrap();
+            latencies.insert(1, (0.0, now));
+        }
+        sleep(StdDuration::from_millis(200));
+        let v = health_checker.get_max_latency(1).unwrap();
+        assert_ge!(v, 200.0);
+
+        let all_latencies = health_checker.get_all_max_latencies();
+        assert_eq!(all_latencies.len(), 3);
+        assert_ge!(all_latencies[&1], 200.0);
+        assert_eq!(all_latencies[&2], 200.8);
+        assert_eq!(all_latencies[&3], 300.2);
+    }
+
+    #[tokio::test]
+    async fn test_health_checker_start_stop_store_inspection() {
+        let self_store_id = 1;
+        let pool: Arc<Mutex<ConnectionPool>> = Arc::default();
+        let interval = Duration::from_millis(50);
+        let background_worker = Worker::new("test-worker");
+
+        let health_checker = HealthChecker::new(self_store_id, pool, interval, background_worker);
+        let store_id = 2;
+
+        // Start inspection for a store
+        health_checker.start_store_inspection(store_id);
+
+        // Verify the task handle was added
+        {
+            let handles = health_checker.task_handles.lock().unwrap();
+            assert!(handles.contains_key(&store_id));
+        }
+
+        // Stop inspection for the store
+        health_checker.stop_store_inspection(store_id);
+
+        // Verify the task handle was removed
+        {
+            let handles = health_checker.task_handles.lock().unwrap();
+            assert!(!handles.contains_key(&store_id));
+        }
+    }
 }
diff --git a/src/server/raft_server.rs b/src/server/raft_server.rs
index 225d449b80e..5852df44e6a 100644
--- a/src/server/raft_server.rs
+++ b/src/server/raft_server.rs
@@ -1,7 +1,7 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::AtomicU64, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::AtomicU64},
     thread,
     time::Duration,
 };
@@ -9,19 +9,19 @@ use std::{
 use api_version::api_v2::TIDB_RANGES_COMPLEMENT;
 use causal_ts::CausalTsProviderImpl;
 use concurrency_manager::ConcurrencyManager;
-use engine_traits::{Engines, Iterable, KvEngine, RaftEngine, DATA_CFS, DATA_KEY_PREFIX_LEN};
+use engine_traits::{DATA_CFS, DATA_KEY_PREFIX_LEN, Engines, Iterable, KvEngine, RaftEngine};
 use health_controller::HealthController;
 use kvproto::{
     kvrpcpb::ApiVersion, metapb, raft_serverpb::StoreIdent, replication_modepb::ReplicationStatus,
 };
-use pd_client::{Error as PdError, PdClient, INVALID_ID};
+use pd_client::{Error as PdError, INVALID_ID, PdClient};
 use raftstore::{
     coprocessor::dispatcher::CoprocessorHost,
     store::{
-        self,
-        fsm::{store::StoreMeta, ApplyRouter, RaftBatchSystem, RaftRouter},
-        initial_region, AutoSplitController, Config as StoreConfig, DiskCheckRunner,
-        GlobalReplicationState, PdTask, RefreshConfigTask, SnapManager, SplitCheckTask, Transport,
+        self, AutoSplitController, Config as StoreConfig, DiskCheckRunner, GlobalReplicationState,
+        PdTask, RefreshConfigTask, SnapManager, SplitCheckTask, Transport,
+        fsm::{ApplyRouter, RaftBatchSystem, RaftRouter, store::StoreMeta},
+        initial_region,
     },
 };
 use resource_metering::CollectorRegHandle;
@@ -167,14 +167,14 @@ where
         store_meta: Arc<Mutex<StoreMeta>>,
         coprocessor_host: CoprocessorHost<EK>,
         importer: Arc<SstImporter<EK>>,
-        split_check_scheduler: Scheduler<SplitCheckTask>,
+        split_check_scheduler: Scheduler<SplitCheckTask<EK>>,
         auto_split_controller: AutoSplitController,
         concurrency_manager: ConcurrencyManager,
         collector_reg_handle: CollectorRegHandle,
         causal_ts_provider: Option<Arc<CausalTsProviderImpl>>, // used for rawkv apiv2
         disk_check_runner: DiskCheckRunner,
         grpc_service_mgr: GrpcServiceManager,
-        safe_point: Arc<AtomicU64>,
+        gc_safe_point: Arc<AtomicU64>,
     ) -> Result<()>
     where
         T: Transport + 'static,
@@ -214,7 +214,7 @@ where
             causal_ts_provider,
             disk_check_runner,
             grpc_service_mgr,
-            safe_point,
+            gc_safe_point,
         )?;
 
         Ok(())
@@ -236,6 +236,10 @@ where
         self.system.refresh_config_scheduler()
     }
 
+    pub fn pd_scheduler(&self) -> Scheduler<PdTask<EK>> {
+        self.system.pd_scheduler()
+    }
+
     /// Gets a transmission end of a channel which is used to send `Msg` to the
     /// raftstore.
     pub fn get_router(&self) -> RaftRouter<EK, ER> {
@@ -457,14 +461,14 @@ where
         store_meta: Arc<Mutex<StoreMeta>>,
         coprocessor_host: CoprocessorHost<EK>,
         importer: Arc<SstImporter<EK>>,
-        split_check_scheduler: Scheduler<SplitCheckTask>,
+        split_check_scheduler: Scheduler<SplitCheckTask<EK>>,
         auto_split_controller: AutoSplitController,
         concurrency_manager: ConcurrencyManager,
         collector_reg_handle: CollectorRegHandle,
         causal_ts_provider: Option<Arc<CausalTsProviderImpl>>, // used for rawkv apiv2
         disk_check_runner: DiskCheckRunner,
         grpc_service_mgr: GrpcServiceManager,
-        safe_point: Arc<AtomicU64>,
+        gc_safe_point: Arc<AtomicU64>,
     ) -> Result<()>
     where
         T: Transport + 'static,
@@ -500,7 +504,7 @@ where
             causal_ts_provider,
             disk_check_runner,
             grpc_service_mgr,
-            safe_point,
+            gc_safe_point,
         )?;
         Ok(())
     }
diff --git a/src/server/raftkv/mod.rs b/src/server/raftkv/mod.rs
index d0734bf196b..e7f72d982ee 100644
--- a/src/server/raftkv/mod.rs
+++ b/src/server/raftkv/mod.rs
@@ -13,8 +13,8 @@ use std::{
     pin::Pin,
     result,
     sync::{
-        atomic::{AtomicU8, Ordering},
         Arc, RwLock,
+        atomic::{AtomicU8, Ordering},
     },
     task::Poll,
     time::Duration,
@@ -22,8 +22,8 @@ use std::{
 
 use collections::{HashMap, HashSet};
 use concurrency_manager::ConcurrencyManager;
-use engine_traits::{CfName, KvEngine, MvccProperties, Snapshot};
-use futures::{future::BoxFuture, task::AtomicWaker, Future, Stream, StreamExt, TryFutureExt};
+use engine_traits::{CF_LOCK, CfName, KvEngine, MvccProperties, Snapshot};
+use futures::{Future, Stream, StreamExt, TryFutureExt, future::BoxFuture, task::AtomicWaker};
 use hybrid_engine::HybridEngineSnapshot;
 use in_memory_engine::RegionCacheMemoryEngine;
 use kvproto::{
@@ -35,29 +35,31 @@ use kvproto::{
     },
 };
 use raft::{
-    eraftpb::{self, MessageType},
     StateRole,
+    eraftpb::{self, MessageType},
 };
 pub use raft_extension::RaftRouterWrap;
 use raftstore::{
+    RegionInfoAccessor, SeekRegionCallback,
     coprocessor::{
-        dispatcher::BoxReadIndexObserver, Coprocessor, CoprocessorHost, ReadIndexObserver,
+        Coprocessor, CoprocessorHost, ReadIndexObserver, RegionInfoProvider,
+        dispatcher::BoxReadIndexObserver,
     },
     errors::Error as RaftServerError,
     router::{LocalReadRouter, RaftStoreRouter, ReadContext},
     store::{
-        self, util::encode_start_ts_into_flag_data, Callback as StoreCallback, RaftCmdExtraOpts,
-        ReadIndexContext, ReadResponse, RegionSnapshot, StoreMsg, WriteResponse,
+        self, Callback as StoreCallback, RaftCmdExtraOpts, ReadIndexContext, ReadResponse,
+        RegionSnapshot, StoreMsg, WriteResponse, util::encode_start_ts_into_flag_data,
     },
 };
 use thiserror::Error;
-use tikv_kv::{write_modifies, OnAppliedCb, WriteEvent};
+use tikv_kv::{ExtraRegionOverride, OnAppliedCb, WriteEvent, write_modifies};
 use tikv_util::{
     callback::must_call,
     future::{paired_future_callback, paired_must_called_future_callback},
     time::Instant,
 };
-use tracker::{get_tls_tracker_token, GLOBAL_TRACKERS};
+use tracker::{GLOBAL_TRACKERS, get_tls_tracker_token};
 use txn_types::{Key, TimeStamp, TxnExtra, TxnExtraScheduler, WriteBatchFlags};
 
 use super::metrics::*;
@@ -165,13 +167,33 @@ where
 }
 
 #[inline]
-pub fn new_request_header(ctx: &Context) -> RaftRequestHeader {
+pub fn new_request_header(
+    ctx: &Context,
+    extra_snap_override: Option<&ExtraRegionOverride>,
+) -> RaftRequestHeader {
     let mut header = RaftRequestHeader::default();
-    header.set_region_id(ctx.get_region_id());
-    header.set_peer(ctx.get_peer().clone());
-    header.set_region_epoch(ctx.get_region_epoch().clone());
-    if ctx.get_term() != 0 {
-        header.set_term(ctx.get_term());
+    match extra_snap_override {
+        Some(&ExtraRegionOverride {
+            region_id,
+            ref region_epoch,
+            ref peer,
+            check_term,
+        }) => {
+            header.set_region_id(region_id);
+            header.set_peer(peer.clone());
+            header.set_region_epoch(region_epoch.clone());
+            if let Some(term) = check_term {
+                header.set_term(term);
+            }
+        }
+        _ => {
+            header.set_region_id(ctx.get_region_id());
+            header.set_peer(ctx.get_peer().clone());
+            header.set_region_epoch(ctx.get_region_epoch().clone());
+            if ctx.get_term() != 0 {
+                header.set_term(ctx.get_term());
+            }
+        }
     }
     header.set_sync_log(ctx.get_sync_log());
     header.set_replica_read(ctx.get_replica_read());
@@ -185,7 +207,7 @@ pub fn new_request_header(ctx: &Context) -> RaftRequestHeader {
 
 #[inline]
 pub fn new_flashback_req(ctx: &Context, ty: AdminCmdType) -> RaftCmdRequest {
-    let header = new_request_header(ctx);
+    let header = new_request_header(ctx, None);
     let mut req = RaftCmdRequest::default();
     req.set_header(header);
     req.mut_header()
@@ -356,6 +378,7 @@ where
     router: RaftRouterWrap<S, E>,
     engine: E,
     txn_extra_scheduler: Option<Arc<dyn TxnExtraScheduler>>,
+    region_info_accessor: Option<RegionInfoAccessor>,
     region_leaders: Arc<RwLock<HashSet<u64>>>,
 }
 
@@ -365,11 +388,17 @@ where
     S: RaftStoreRouter<E> + LocalReadRouter<E> + 'static,
 {
     /// Create a RaftKv using specified configuration.
-    pub fn new(router: S, engine: E, region_leaders: Arc<RwLock<HashSet<u64>>>) -> RaftKv<E, S> {
+    pub fn new(
+        router: S,
+        engine: E,
+        region_info_accessor: Option<RegionInfoAccessor>,
+        region_leaders: Arc<RwLock<HashSet<u64>>>,
+    ) -> RaftKv<E, S> {
         RaftKv {
             router: RaftRouterWrap::new(router),
             engine,
             txn_extra_scheduler: None,
+            region_info_accessor,
             region_leaders,
         }
     }
@@ -506,8 +535,34 @@ where
         }
 
         let reqs: Vec<Request> = batch.modifies.into_iter().map(Into::into).collect();
+
+        if txn_types::ENABLE_DUP_KEY_DEBUG.load(Ordering::Relaxed) {
+            // Ref: https://github.com/tikv/tikv/issues/18498.
+            // Check for duplicate key entries before proposing commands.
+            // TODO: remove this check when the cause of issue 18498 is located.
+            let mut keys_set = std::collections::HashSet::new();
+            for req in &reqs {
+                if req.has_put() && req.get_put().get_cf() == CF_LOCK {
+                    let key = req.get_put().get_key();
+                    if !keys_set.insert(key.to_vec()) {
+                        let wrapped_key = log_wrappers::Value::key(key);
+                        error!(
+                            "[for debug] found duplicate key in Lock CF PUT request, key: {:?}, \
+                        extra: {:?}, ctx: {:?}, reqs: {:?}, avoid_batch:{:?}",
+                            wrapped_key, batch.extra, ctx, reqs, batch.avoid_batch
+                        );
+                        // TODO: remove this in production or new release.
+                        panic!(
+                            "[for debug] found duplicate key in Lock CF PUT request, key: {:?}, \
+                        extra: {:?}, ctx: {:?}, reqs: {:?}, avoid_batch:{:?}",
+                            wrapped_key, batch.extra, ctx, reqs, batch.avoid_batch
+                        );
+                    }
+                }
+            }
+        }
         let txn_extra = batch.extra;
-        let mut header = new_request_header(ctx);
+        let mut header = new_request_header(ctx, None);
         if batch.avoid_batch {
             header.set_uuid(uuid::Uuid::new_v4().as_bytes().to_vec());
         }
@@ -668,6 +723,15 @@ where
                 warn!("unsafe destroy range: failed sending ClearRegionSizeInRange"; "err" => ?e);
             });
     }
+
+    fn seek_region(&self, from: &[u8], callback: SeekRegionCallback) -> kv::Result<()> {
+        match self.region_info_accessor {
+            Some(ref accessor) => accessor
+                .seek_region(from, callback)
+                .map_err(|e| box_err!(e)),
+            None => Err(box_err!("region_info_accessor is not available")),
+        }
+    }
 }
 
 fn async_snapshot<E, S>(
@@ -687,7 +751,7 @@ where
 
     let mut req = Request::default();
     req.set_cmd_type(CmdType::Snap);
-    if !ctx.key_ranges.is_empty() && ctx.start_ts.map_or(false, |ts| !ts.is_zero()) {
+    if !ctx.key_ranges.is_empty() && ctx.start_ts.is_some_and(|ts| !ts.is_zero()) {
         req.mut_read_index()
             .set_start_ts(ctx.start_ts.as_ref().unwrap().into_inner());
         req.mut_read_index()
@@ -697,9 +761,9 @@ where
     let begin_instant = Instant::now();
     let (cb, f) = paired_must_called_future_callback(drop_snapshot_callback);
 
-    let mut header = new_request_header(ctx.pb_ctx);
+    let mut header = new_request_header(ctx.pb_ctx, ctx.extra_region_override.as_ref());
     let mut flags = 0;
-    let need_encoded_start_ts = ctx.start_ts.map_or(true, |ts| !ts.is_zero());
+    let need_encoded_start_ts = ctx.start_ts.is_none_or(|ts| !ts.is_zero());
     if ctx.pb_ctx.get_stale_read() && need_encoded_start_ts {
         flags |= WriteBatchFlags::STALE_READ.bits();
     }
diff --git a/src/server/raftkv/raft_extension.rs b/src/server/raftkv/raft_extension.rs
index d4b1a1e8eec..9cf186ba707 100644
--- a/src/server/raftkv/raft_extension.rs
+++ b/src/server/raftkv/raft_extension.rs
@@ -15,8 +15,8 @@ use raft::SnapshotStatus;
 use raftstore::{
     router::RaftStoreRouter,
     store::{
-        region_meta::{RaftStateRole, RegionMeta},
         CasualMessage,
+        region_meta::{RaftStateRole, RegionMeta},
     },
 };
 use tikv_util::future::paired_future_callback;
diff --git a/src/server/raftkv2/mod.rs b/src/server/raftkv2/mod.rs
index 8b76d69da3e..3fd17a1a266 100644
--- a/src/server/raftkv2/mod.rs
+++ b/src/server/raftkv2/mod.rs
@@ -11,8 +11,8 @@ use std::{
 };
 
 use collections::HashSet;
-use engine_traits::{KvEngine, RaftEngine, CF_LOCK};
-use futures::{future::BoxFuture, Future, Stream, StreamExt, TryFutureExt};
+use engine_traits::{CF_LOCK, KvEngine, RaftEngine};
+use futures::{Future, Stream, StreamExt, TryFutureExt, future::BoxFuture};
 use kvproto::{
     kvrpcpb::Context,
     raft_cmdpb::{AdminCmdType, CmdType, RaftCmdRequest, Request},
@@ -20,21 +20,21 @@ use kvproto::{
 pub use node::NodeV2;
 pub use raft_extension::Extension;
 use raftstore::{
+    Error,
     store::{
-        cmd_resp, msg::ErrorCallback, util::encode_start_ts_into_flag_data, RaftCmdExtraOpts,
-        RegionSnapshot,
+        RaftCmdExtraOpts, RegionSnapshot, cmd_resp, msg::ErrorCallback,
+        util::encode_start_ts_into_flag_data,
     },
-    Error,
 };
 use raftstore_v2::{
+    SimpleWriteBinary, SimpleWriteEncoder,
     router::{
-        message::SimpleWrite, CmdResChannelBuilder, CmdResEvent, CmdResStream, PeerMsg, RaftRouter,
+        CmdResChannelBuilder, CmdResEvent, CmdResStream, PeerMsg, RaftRouter, message::SimpleWrite,
     },
-    SimpleWriteBinary, SimpleWriteEncoder,
 };
 use tikv_kv::{Modify, WriteEvent};
 use tikv_util::time::Instant;
-use tracker::{get_tls_tracker_token, GLOBAL_TRACKERS};
+use tracker::{GLOBAL_TRACKERS, get_tls_tracker_token};
 use txn_types::{TxnExtra, TxnExtraScheduler, WriteBatchFlags};
 
 use super::{
@@ -172,7 +172,7 @@ impl<EK: KvEngine, ER: RaftEngine> tikv_kv::Engine for RaftKv2<EK, ER> {
     fn async_snapshot(&mut self, mut ctx: tikv_kv::SnapContext<'_>) -> Self::SnapshotRes {
         let mut req = Request::default();
         req.set_cmd_type(CmdType::Snap);
-        if !ctx.key_ranges.is_empty() && ctx.start_ts.map_or(false, |ts| !ts.is_zero()) {
+        if !ctx.key_ranges.is_empty() && ctx.start_ts.is_some_and(|ts| !ts.is_zero()) {
             req.mut_read_index()
                 .set_start_ts(ctx.start_ts.as_ref().unwrap().into_inner());
             req.mut_read_index()
@@ -181,9 +181,9 @@ impl<EK: KvEngine, ER: RaftEngine> tikv_kv::Engine for RaftKv2<EK, ER> {
         ASYNC_REQUESTS_COUNTER_VEC.snapshot.all.inc();
         let begin_instant = Instant::now();
 
-        let mut header = new_request_header(ctx.pb_ctx);
+        let mut header = new_request_header(ctx.pb_ctx, ctx.extra_region_override.as_ref());
         let mut flags = 0;
-        let need_encoded_start_ts = ctx.start_ts.map_or(true, |ts| !ts.is_zero());
+        let need_encoded_start_ts = ctx.start_ts.is_none_or(|ts| !ts.is_zero());
         if ctx.pb_ctx.get_stale_read() && need_encoded_start_ts {
             flags |= WriteBatchFlags::STALE_READ.bits();
         }
@@ -256,7 +256,7 @@ impl<EK: KvEngine, ER: RaftEngine> tikv_kv::Engine for RaftKv2<EK, ER> {
                     if resp
                         .get_responses()
                         .first()
-                        .map_or(false, |r| r.get_read_index().has_locked())
+                        .is_some_and(|r| r.get_read_index().has_locked())
                     {
                         let locked = resp.mut_responses()[0].mut_read_index().take_locked();
                         Err(tikv_kv::Error::from(tikv_kv::ErrorInner::KeyIsLocked(
@@ -276,7 +276,9 @@ impl<EK: KvEngine, ER: RaftEngine> tikv_kv::Engine for RaftKv2<EK, ER> {
     }
 
     type IMSnap = Self::Snap;
-    type IMSnapshotRes = Self::SnapshotRes;
+    // TODO: revert this once https://github.com/rust-lang/rust/issues/140222 is fixed.
+    // type IMSnapshotRes = Self::SnapshotRes;
+    type IMSnapshotRes = impl Future<Output = tikv_kv::Result<Self::Snap>> + Send;
     fn async_in_memory_snapshot(&mut self, ctx: tikv_kv::SnapContext<'_>) -> Self::IMSnapshotRes {
         self.async_snapshot(ctx)
     }
@@ -299,13 +301,13 @@ impl<EK: KvEngine, ER: RaftEngine> tikv_kv::Engine for RaftKv2<EK, ER> {
             // If rid is None, all regions report error.
             fail_point!("raftkv_early_error_report", |rid| -> bool {
                 rid.and_then(|rid| rid.parse().ok())
-                    .map_or(true, |rid: u64| rid == region_id)
+                    .is_none_or(|rid: u64| rid == region_id)
             });
             false
         })();
 
         let begin_instant = Instant::now_coarse();
-        let mut header = Box::new(new_request_header(ctx));
+        let mut header = Box::new(new_request_header(ctx, None));
         let mut flags = 0;
         if batch.extra.one_pc {
             flags |= WriteBatchFlags::ONE_PC.bits();
diff --git a/src/server/raftkv2/node.rs b/src/server/raftkv2/node.rs
index 80807653e43..085a6a3928b 100644
--- a/src/server/raftkv2/node.rs
+++ b/src/server/raftkv2/node.rs
@@ -11,22 +11,22 @@ use pd_client::PdClient;
 use raftstore::{
     coprocessor::CoprocessorHost,
     store::{
-        AutoSplitController, GlobalReplicationState, RefreshConfigTask, TabletSnapManager,
-        Transport, RAFT_INIT_LOG_INDEX,
+        AutoSplitController, GlobalReplicationState, RAFT_INIT_LOG_INDEX, RefreshConfigTask,
+        TabletSnapManager, Transport,
     },
 };
-use raftstore_v2::{router::RaftRouter, Bootstrap, PdTask, StoreRouter, StoreSystem};
+use raftstore_v2::{Bootstrap, PdTask, StoreRouter, StoreSystem, router::RaftRouter};
 use resource_control::ResourceController;
 use resource_metering::CollectorRegHandle;
 use service::service_manager::GrpcServiceManager;
-use slog::{info, o, Logger};
+use slog::{Logger, info, o};
 use sst_importer::SstImporter;
 use tikv_util::{
     config::VersionTrack,
     worker::{LazyWorker, Scheduler, Worker},
 };
 
-use crate::server::{raft_server::init_store, Result};
+use crate::server::{Result, raft_server::init_store};
 
 // TODO: we will rename another better name like RaftStore later.
 pub struct NodeV2<C: PdClient + 'static, EK: KvEngine, ER: RaftEngine> {
@@ -176,6 +176,10 @@ where
         self.store.clone()
     }
 
+    pub fn system(&self) -> &StoreSystem<EK, ER> {
+        &self.system.as_ref().unwrap().1
+    }
+
     // TODO: support updating dynamic configuration.
 
     // TODO: check api version.
diff --git a/src/server/raftkv2/raft_extension.rs b/src/server/raftkv2/raft_extension.rs
index b2b6ce4db00..d7891738a0f 100644
--- a/src/server/raftkv2/raft_extension.rs
+++ b/src/server/raftkv2/raft_extension.rs
@@ -3,8 +3,8 @@
 use engine_traits::{KvEngine, RaftEngine};
 use kvproto::raft_serverpb::RaftMessage;
 use raftstore_v2::{
-    router::{DebugInfoChannel, PeerMsg, StoreMsg},
     StoreRouter,
+    router::{DebugInfoChannel, PeerMsg, StoreMsg},
 };
 
 #[derive(Clone)]
diff --git a/src/server/reset_to_version.rs b/src/server/reset_to_version.rs
index 59b509407bf..7abea5291e4 100644
--- a/src/server/reset_to_version.rs
+++ b/src/server/reset_to_version.rs
@@ -8,8 +8,8 @@ use std::{
 
 use engine_rocks::{RocksEngine, RocksEngineIterator, RocksWriteBatchVec};
 use engine_traits::{
-    IterOptions, Iterable, Iterator, Mutable, WriteBatch, WriteBatchExt, CF_DEFAULT, CF_LOCK,
-    CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_WRITE, IterOptions, Iterable, Iterator, Mutable, WriteBatch,
+    WriteBatchExt,
 };
 use tikv_util::sys::thread::StdThreadBuildWrapper;
 use txn_types::{Key, TimeStamp, Write, WriteRef};
@@ -268,7 +268,7 @@ impl ResetToVersionManager {
 
 #[cfg(test)]
 mod tests {
-    use engine_traits::{WriteBatch, WriteBatchExt, ALL_CFS, CF_LOCK};
+    use engine_traits::{ALL_CFS, CF_LOCK, WriteBatch, WriteBatchExt};
     use tempfile::Builder;
     use txn_types::{Lock, LockType, WriteType};
 
diff --git a/src/server/resolve.rs b/src/server/resolve.rs
index 01f737d6678..4031fec0b19 100644
--- a/src/server/resolve.rs
+++ b/src/server/resolve.rs
@@ -8,7 +8,7 @@ use std::{
 
 use collections::HashMap;
 use kvproto::replication_modepb::ReplicationMode;
-use pd_client::{take_peer_address, PdClient};
+use pd_client::{PdClient, take_peer_address};
 use raftstore::store::GlobalReplicationState;
 use thiserror::Error;
 use tikv_kv::RaftExtension;
diff --git a/src/server/server.rs b/src/server/server.rs
index 48c11fbd367..115458b5bf3 100644
--- a/src/server/server.rs
+++ b/src/server/server.rs
@@ -1,7 +1,6 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    i32,
     net::{IpAddr, SocketAddr},
     str::FromStr,
     sync::Arc,
@@ -17,23 +16,24 @@ use grpcio::{
     },
     Environment, ResourceQuota, Server as GrpcServer, ServerBuilder,
 };
-use grpcio_health::{create_health, HealthService};
+use grpcio_health::{HealthService, create_health};
 use health_controller::HealthController;
 use kvproto::tikvpb::*;
 use raftstore::store::{CheckLeaderTask, SnapManager, TabletSnapManager};
 use resource_control::ResourceGroupManager;
 use security::SecurityManager;
 use tikv_util::{
+    Either,
     config::VersionTrack,
     sys::{get_global_memory_usage, record_global_memory_usage},
     timer::GLOBAL_TIMER_HANDLE,
     worker::{LazyWorker, Scheduler, Worker},
-    Either,
 };
 use tokio::runtime::{Builder as RuntimeBuilder, Handle as RuntimeHandle, Runtime};
 use tokio_timer::timer::Handle;
 
 use super::{
+    Config, Error, Result,
     load_statistics::*,
     metrics::{MEMORY_USAGE_GAUGE, SERVER_INFO_GAUGE_VEC},
     raft_client::{ConnectionBuilder, RaftClient},
@@ -42,14 +42,13 @@ use super::{
     snap::{Runner as SnapHandler, Task as SnapTask},
     tablet_snap::SnapCacheBuilder,
     transport::ServerTransport,
-    Config, Error, Result,
 };
 use crate::{
     coprocessor::Endpoint,
     coprocessor_v2,
     read_pool::ReadPool,
-    server::{config::GrpcCompressionType, gc_worker::GcWorker, tablet_snap::TabletRunner, Proxy},
-    storage::{lock_manager::LockManager, Engine, Storage},
+    server::{Proxy, config::GrpcCompressionType, gc_worker::GcWorker, tablet_snap::TabletRunner},
+    storage::{Engine, Storage, lock_manager::LockManager},
     tikv_util::sys::thread::ThreadBuildWrapper,
 };
 
@@ -188,6 +187,7 @@ where
         health_controller: HealthController,
         resource_manager: Option<Arc<ResourceGroupManager>>,
         raft_message_filter: Arc<dyn RaftGrpcMessageFilter>,
+        background_worker: Worker,
     ) -> Result<Self> {
         // A helper thread (or pool) for transport layer.
         let stats_pool = if cfg.value().stats_concurrency > 0 {
@@ -256,7 +256,15 @@ where
             lazy_worker.scheduler(),
             grpc_thread_load.clone(),
         );
-        let raft_client = RaftClient::new(store_id, conn_builder);
+        let raft_client = RaftClient::new(
+            store_id,
+            conn_builder,
+            cfg.value().inspect_network_interval.0,
+            background_worker.clone(),
+        );
+
+        raft_client.start_network_inspection();
+        health_controller.set_health_checker(Box::new(raft_client.get_health_checker()));
 
         let trans = ServerTransport::new(raft_client);
 
@@ -468,7 +476,7 @@ pub mod test_router {
 
     use engine_rocks::{RocksEngine, RocksSnapshot};
     use kvproto::raft_serverpb::RaftMessage;
-    use raftstore::{router::RaftStoreRouter, store::*, Result as RaftStoreResult};
+    use raftstore::{Result as RaftStoreResult, router::RaftStoreRouter, store::*};
     use tikv_util::time::Instant as TiInstant;
 
     use super::*;
@@ -557,7 +565,7 @@ mod tests {
     use grpcio::EnvBuilder;
     use kvproto::raft_serverpb::RaftMessage;
     use raftstore::{
-        coprocessor::{region_info_accessor::MockRegionInfoProvider, CoprocessorHost},
+        coprocessor::{CoprocessorHost, region_info_accessor::MockRegionInfoProvider},
         router::RaftStoreRouter,
         store::{transport::Transport, *},
     };
@@ -568,16 +576,16 @@ mod tests {
 
     use super::{
         super::{
-            resolve::{self, Callback as ResolveCallback, StoreAddrResolver},
             Config,
+            resolve::{self, Callback as ResolveCallback, StoreAddrResolver},
         },
         *,
     };
     use crate::{
         config::CoprReadPoolConfig,
         coprocessor::{self, readpool_impl},
-        server::{raftkv::RaftRouterWrap, tablet_snap::NoSnapshotCache, TestRaftStoreRouter},
-        storage::{lock_manager::MockLockManager, TestEngineBuilder, TestStorageBuilderApiV1},
+        server::{TestRaftStoreRouter, raftkv::RaftRouterWrap, tablet_snap::NoSnapshotCache},
+        storage::{TestEngineBuilder, TestStorageBuilderApiV1, lock_manager::MockLockManager},
     };
 
     #[derive(Clone)]
@@ -707,6 +715,7 @@ mod tests {
             HealthController::new(),
             None,
             Arc::new(DefaultGrpcMessageFilter::new(0.2)),
+            tikv_util::worker::Worker::new("test-worker"),
         )
         .unwrap();
 
diff --git a/src/server/service/batch.rs b/src/server/service/batch.rs
index 72d708e8de5..ca656e98a3c 100644
--- a/src/server/service/batch.rs
+++ b/src/server/service/batch.rs
@@ -3,23 +3,24 @@
 // #[PerformanceCriticalPath]
 use api_version::KvFormat;
 use kvproto::kvrpcpb::*;
+use protobuf::Message;
 use tikv_util::{
     future::poll_future_notify,
     mpsc::future::{Sender, WakePolicy},
     time::Instant,
 };
-use tracker::{with_tls_tracker, RequestInfo, RequestType, Tracker, TrackerToken, GLOBAL_TRACKERS};
+use tracker::{GLOBAL_TRACKERS, RequestInfo, RequestType, Tracker, TrackerToken, with_tls_tracker};
 
 use crate::{
     server::{
-        metrics::{GrpcTypeKind, ResourcePriority, REQUEST_BATCH_SIZE_HISTOGRAM_VEC},
-        service::kv::{batch_commands_response, GrpcRequestDuration, MeasuredSingleResponse},
+        metrics::{GrpcTypeKind, REQUEST_BATCH_SIZE_HISTOGRAM_VEC, ResourcePriority},
+        service::kv::{GrpcRequestDuration, MeasuredSingleResponse, batch_commands_response},
     },
     storage::{
+        ResponseBatchConsumer, Result, Storage,
         errors::{extract_key_error, extract_region_error},
         kv::{Engine, Statistics},
         lock_manager::LockManager,
-        ResponseBatchConsumer, Result, Storage,
     },
 };
 
@@ -65,6 +66,9 @@ impl ReqBatcher {
             RequestType::KvBatchGetCommand,
             req.get_version(),
         )));
+        GLOBAL_TRACKERS.with_tracker(tracker, |the_tracker| {
+            the_tracker.metrics.grpc_req_size = req.compute_size() as u64;
+        });
         self.gets.push(req);
         self.get_ids.push(id);
         self.get_trackers.push(tracker);
diff --git a/src/server/service/diagnostics/log.rs b/src/server/service/diagnostics/log.rs
index f64ff440121..c434cad9740 100644
--- a/src/server/service/diagnostics/log.rs
+++ b/src/server/service/diagnostics/log.rs
@@ -2,7 +2,7 @@
 
 use std::{
     convert::From,
-    fs::{read_dir, File},
+    fs::{File, read_dir},
     io::{BufRead, BufReader, Seek, SeekFrom},
     path::Path,
 };
@@ -38,10 +38,10 @@ struct LogIterator {
 #[allow(clippy::enum_variant_names)]
 // Allowing this is actually more understandabled when used in code.
 pub enum Error {
-    InvalidRequest(String),
-    ParseError(String),
-    SearchError(String),
-    IoError(std::io::Error),
+    InvalidRequest(#[allow(dead_code)] String),
+    ParseError(#[allow(dead_code)] String),
+    SearchError(#[allow(dead_code)] String),
+    IoError(#[allow(dead_code)] std::io::Error),
 }
 
 impl From<std::io::Error> for Error {
diff --git a/src/server/service/diagnostics/mod.rs b/src/server/service/diagnostics/mod.rs
index 354108e6ab9..cead6981287 100644
--- a/src/server/service/diagnostics/mod.rs
+++ b/src/server/service/diagnostics/mod.rs
@@ -19,8 +19,9 @@ use kvproto::diagnosticspb::{
     Diagnostics, SearchLogRequest, SearchLogRequestTarget, SearchLogResponse, ServerInfoRequest,
     ServerInfoResponse, ServerInfoType,
 };
+use lazy_static::lazy_static;
 use tikv_util::{
-    sys::{ioload, SystemExt},
+    sys::{SystemExt, ioload},
     timer::GLOBAL_TIMER_HANDLE,
 };
 use tokio::runtime::Handle;
diff --git a/src/server/service/diagnostics/sys.rs b/src/server/service/diagnostics/sys.rs
index 8dc68c58950..d449d6a38e5 100644
--- a/src/server/service/diagnostics/sys.rs
+++ b/src/server/service/diagnostics/sys.rs
@@ -3,7 +3,7 @@
 use std::{collections::HashMap, string::ToString};
 
 use kvproto::diagnosticspb::{ServerInfoItem, ServerInfoPair};
-use tikv_util::sys::{cpu_time::LinuxStyleCpuTime, ioload, SysQuota, *};
+use tikv_util::sys::{SysQuota, cpu_time::LinuxStyleCpuTime, ioload, *};
 use walkdir::WalkDir;
 
 use crate::server::service::diagnostics::SYS_INFO;
diff --git a/src/server/service/kv.rs b/src/server/service/kv.rs
index 54229cffa4b..585861292b2 100644
--- a/src/server/service/kv.rs
+++ b/src/server/service/kv.rs
@@ -4,8 +4,8 @@
 use std::{
     mem,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicU64, Ordering},
     },
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
@@ -24,28 +24,29 @@ use grpcio::{
 };
 use health_controller::HealthController;
 use kvproto::{coprocessor::*, kvrpcpb::*, mpp::*, raft_serverpb::*, tikvpb::*};
-use protobuf::RepeatedField;
+use protobuf::{Message, RepeatedField};
 use raft::eraftpb::MessageType;
 use raftstore::{
+    Error as RaftStoreError, Result as RaftStoreResult,
     store::{
-        get_memory_usage_entry_cache,
+        CheckLeaderTask, get_memory_usage_entry_cache,
         memory::{MEMTRACE_APPLYS, MEMTRACE_RAFT_ENTRIES, MEMTRACE_RAFT_MESSAGES},
         metrics::MESSAGE_RECV_BY_STORE,
-        CheckLeaderTask,
     },
-    Error as RaftStoreError, Result as RaftStoreResult,
 };
 use resource_control::ResourceGroupManager;
 use tikv_alloc::trace::MemoryTraceGuard;
 use tikv_kv::{RaftExtension, StageLatencyStats};
 use tikv_util::{
     future::{paired_future_callback, poll_future_notify},
-    mpsc::future::{unbounded, BatchReceiver, Sender, WakePolicy},
+    mpsc::future::{BatchReceiver, Sender, WakePolicy, unbounded},
     sys::memory_usage_reaches_high_water,
-    time::{nanos_to_secs, Instant},
+    time::{Instant, nanos_to_secs},
     worker::Scheduler,
 };
-use tracker::{set_tls_tracker_token, RequestInfo, RequestType, Tracker, GLOBAL_TRACKERS};
+use tracker::{
+    GLOBAL_TRACKERS, RequestInfo, RequestType, Tracker, set_tls_tracker_token, with_tls_tracker,
+};
 use txn_types::{self, Key};
 
 use super::batch::{BatcherBuilder, ReqBatcher};
@@ -53,18 +54,17 @@ use crate::{
     coprocessor::Endpoint,
     coprocessor_v2, forward_duplex, forward_unary, log_net_error,
     server::{
-        gc_worker::GcWorker, load_statistics::ThreadLoadPool, metrics::*, snap::Task as SnapTask,
-        Error, MetadataSourceStoreId, Proxy, Result as ServerResult,
+        Error, MetadataSourceStoreId, Proxy, Result as ServerResult, gc_worker::GcWorker,
+        load_statistics::ThreadLoadPool, metrics::*, snap::Task as SnapTask,
     },
     storage::{
-        self,
+        self, SecondaryLocksStatus, Storage, TxnStatus,
         errors::{
             extract_committed, extract_key_error, extract_key_errors, extract_kv_pairs,
             extract_region_error, extract_region_error_from_error, map_kv_pairs,
         },
         kv::Engine,
         lock_manager::LockManager,
-        SecondaryLocksStatus, Storage, TxnStatus,
     },
 };
 
@@ -1398,7 +1398,7 @@ fn handle_batch_commands_request<E: Engine, L: LockManager, F: KvFormat>(
                     GRPC_RESOURCE_GROUP_COUNTER_VEC
                         .with_label_values(&[ resource_control_ctx.get_resource_group_name(), resource_control_ctx.get_resource_group_name()])
                         .inc();
-                    if batcher.as_mut().map_or(false, |req_batch| {
+                    if batcher.as_mut().is_some_and(|req_batch| {
                         req_batch.can_batch_get(&req)
                     }) {
                         batcher.as_mut().unwrap().add_get_request(req, id);
@@ -1422,7 +1422,7 @@ fn handle_batch_commands_request<E: Engine, L: LockManager, F: KvFormat>(
                     GRPC_RESOURCE_GROUP_COUNTER_VEC
                     .with_label_values(&[resource_control_ctx.get_resource_group_name(), resource_control_ctx.get_resource_group_name()])
                     .inc();
-                    if batcher.as_mut().map_or(false, |req_batch| {
+                    if batcher.as_mut().is_some_and(|req_batch| {
                         req_batch.can_batch_raw_get(&req)
                     }) {
                         batcher.as_mut().unwrap().add_raw_get_request(req, id);
@@ -1562,6 +1562,7 @@ fn handle_measures_for_batch_commands(measures: &mut MeasuredBatchResponse) {
             .get(label)
             .get(resource_priority)
             .observe(elapsed.as_secs_f64());
+        GRPC_BATCH_COMMANDS_WAIT_HISTOGRAM.observe(wait.as_secs_f64());
         record_request_source_metrics(source, elapsed);
         let exec_details = resp.cmd.as_mut().and_then(|cmd| match cmd {
             Get(resp) => Some(resp.mut_exec_details_v2()),
@@ -1619,6 +1620,9 @@ fn future_get<E: Engine, L: LockManager, F: KvFormat>(
         req.get_version(),
     )));
     set_tls_tracker_token(tracker);
+    with_tls_tracker(|tracker| {
+        tracker.metrics.grpc_req_size = req.compute_size() as u64;
+    });
     let start = Instant::now();
     let v = storage.get(
         req.take_context(),
@@ -1690,6 +1694,9 @@ fn future_scan<E: Engine, L: LockManager, F: KvFormat>(
         req.get_version(),
     )));
     set_tls_tracker_token(tracker);
+    with_tls_tracker(|tracker| {
+        tracker.metrics.grpc_req_size = req.compute_size() as u64;
+    });
     let end_key = Key::from_raw_maybe_unbounded(req.get_end_key());
 
     let v = storage.scan(
@@ -1739,6 +1746,9 @@ fn future_batch_get<E: Engine, L: LockManager, F: KvFormat>(
     )));
     set_tls_tracker_token(tracker);
     let start = Instant::now();
+    with_tls_tracker(|tracker| {
+        tracker.metrics.grpc_req_size = req.compute_size() as u64;
+    });
     let keys = req.get_keys().iter().map(|x| Key::from_raw(x)).collect();
     let v = storage.batch_get(req.take_context(), keys, req.get_version().into());
 
@@ -1788,6 +1798,9 @@ fn future_buffer_batch_get<E: Engine, L: LockManager, F: KvFormat>(
         req.get_version(),
     )));
     set_tls_tracker_token(tracker);
+    with_tls_tracker(|tracker| {
+        tracker.metrics.grpc_req_size = req.compute_size() as u64;
+    });
     let start = Instant::now();
     let keys = req.get_keys().iter().map(|x| Key::from_raw(x)).collect();
     let v = storage.buffer_batch_get(req.take_context(), keys, req.get_version().into());
@@ -1832,6 +1845,9 @@ fn future_scan_lock<E: Engine, L: LockManager, F: KvFormat>(
         req.get_max_version(),
     )));
     set_tls_tracker_token(tracker);
+    with_tls_tracker(|tracker| {
+        tracker.metrics.grpc_req_size = req.compute_size() as u64;
+    });
     let start_key = Key::from_raw_maybe_unbounded(req.get_start_key());
     let end_key = Key::from_raw_maybe_unbounded(req.get_end_key());
 
@@ -1859,6 +1875,7 @@ fn future_scan_lock<E: Engine, L: LockManager, F: KvFormat>(
     }
 }
 
+#[allow(clippy::unused_async)]
 async fn future_gc(_: GcRequest) -> ServerResult<GcResponse> {
     Err(Error::Grpc(GrpcError::RpcFailure(RpcStatus::new(
         RpcStatusCode::UNIMPLEMENTED,
@@ -2394,6 +2411,9 @@ macro_rules! txn_command_future {
                 0,
             )));
             set_tls_tracker_token($tracker);
+            with_tls_tracker(|tracker| {
+                tracker.metrics.grpc_req_size = $req.compute_size() as u64;
+            });
             let (cb, f) = paired_future_callback();
             let res = storage.sched_txn_command($req.into(), cb);
 
@@ -2753,6 +2773,7 @@ impl HealthFeedbackAttacher {
         feedback.set_store_id(self.store_id);
         feedback.set_feedback_seq_no(self.seq.fetch_add(1, Ordering::Relaxed));
         feedback.set_slow_score(self.health_controller.get_raftstore_slow_score() as i32);
+        // TODO: set network slow score?
         feedback
     }
 }
diff --git a/src/server/service/mod.rs b/src/server/service/mod.rs
index dc2c254afe2..b1dbfb9f375 100644
--- a/src/server/service/mod.rs
+++ b/src/server/service/mod.rs
@@ -9,9 +9,10 @@ pub use self::{
     debug::{ResolvedTsDiagnosisCallback, Service as DebugService},
     diagnostics::Service as DiagnosticsService,
     kv::{
+        DefaultGrpcMessageFilter, GrpcRequestDuration, MeasuredBatchResponse,
+        MeasuredSingleResponse, RaftGrpcMessageFilter, Service as KvService,
         batch_commands_request, batch_commands_response, future_flashback_to_version,
-        future_prepare_flashback_to_version, DefaultGrpcMessageFilter, GrpcRequestDuration,
-        MeasuredBatchResponse, MeasuredSingleResponse, RaftGrpcMessageFilter, Service as KvService,
+        future_prepare_flashback_to_version,
     },
 };
 
diff --git a/src/server/snap.rs b/src/server/snap.rs
index eff33d821bd..56f534bb200 100644
--- a/src/server/snap.rs
+++ b/src/server/snap.rs
@@ -2,11 +2,11 @@
 
 use std::{
     fmt::{self, Display, Formatter},
-    io::{Error as IoError, ErrorKind, Read, Write},
+    io::{Error as IoError, Read, Write},
     pin::Pin,
     sync::{
-        atomic::{AtomicU64, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicU64, AtomicUsize, Ordering},
     },
     time::{Duration, Instant as StdInstant},
 };
@@ -14,7 +14,7 @@ use std::{
 use file_system::{IoType, WithIoType};
 use futures::{
     compat::Future01CompatExt,
-    future::{select, Either, Future, TryFutureExt},
+    future::{Either, Future, TryFutureExt, select},
     pin_mut,
     sink::SinkExt,
     stream::{Stream, StreamExt, TryStreamExt},
@@ -38,16 +38,15 @@ use raftstore::store::{SnapEntry, SnapKey, SnapManager, Snapshot};
 use security::SecurityManager;
 use tikv_kv::RaftExtension;
 use tikv_util::{
-    box_err,
-    config::{Tracker, VersionTrack, MIB},
+    DeferContext, box_err,
+    config::{MIB, Tracker, VersionTrack},
     time::{Instant, UnixSecs},
     timer::GLOBAL_TIMER_HANDLE,
     worker::Runnable,
-    DeferContext,
 };
 use tokio::runtime::{Builder as RuntimeBuilder, Runtime};
 
-use super::{metrics::*, Config, Error, Result};
+use super::{Config, Error, Result, metrics::*};
 use crate::{server::tablet_snap::NoSnapshotCache, tikv_util::sys::thread::ThreadBuildWrapper};
 
 pub type Callback = Box<dyn FnOnce(Result<()>) + Send>;
@@ -170,7 +169,7 @@ pub fn send_snap(
         let snap = msg.get_message().get_snapshot();
         let mut snap_data = RaftSnapshotData::default();
         if let Err(e) = snap_data.merge_from_bytes(snap.get_data()) {
-            return Err(Error::Io(IoError::new(ErrorKind::Other, e)));
+            return Err(Error::Io(IoError::other(e)));
         }
         let key = SnapKey::from_region_snap(msg.get_region_id(), snap);
         let snap_start = snap_data.get_meta().get_start();
diff --git a/src/server/status_server/lite.rs b/src/server/status_server/lite.rs
index 68ca68cf3c5..3b050189f57 100644
--- a/src/server/status_server/lite.rs
+++ b/src/server/status_server/lite.rs
@@ -13,15 +13,15 @@ use std::{error::Error as StdError, net::SocketAddr, str::FromStr, sync::Arc};
 use futures_util::future::TryFutureExt;
 use http::{Method, Request, Response, StatusCode};
 use hyper::{
+    Body, Server as HyperSrv,
     server::{accept::Accept, conn::AddrIncoming},
     service::service_fn,
-    Body, Server as HyperSrv,
 };
 use openssl::x509::X509;
 use security::SecurityConfig;
 use tokio::io::{AsyncRead, AsyncWrite};
 
-use super::{make_response, tls_incoming, StatusServer};
+use super::{StatusServer, make_response, tls_incoming};
 use crate::server::Result;
 
 /// Svc is a type alias that help us to call static methods in the full status
diff --git a/src/server/status_server/metrics.rs b/src/server/status_server/metrics.rs
index 9786ebd0a10..5cbf505d348 100644
--- a/src/server/status_server/metrics.rs
+++ b/src/server/status_server/metrics.rs
@@ -1,6 +1,6 @@
 // Copyright 2023 TiKV Project Authors. Licensed under Apache-2.0.
 
-use prometheus::{exponential_buckets, register_histogram_vec, HistogramVec};
+use prometheus::{HistogramVec, exponential_buckets, register_histogram_vec};
 
 lazy_static::lazy_static! {
     pub static ref STATUS_REQUEST_DURATION: HistogramVec = register_histogram_vec!(
diff --git a/src/server/status_server/mod.rs b/src/server/status_server/mod.rs
index 332c6f1844c..78d649dc3a3 100644
--- a/src/server/status_server/mod.rs
+++ b/src/server/status_server/mod.rs
@@ -19,25 +19,25 @@ use std::{
 
 use async_stream::stream;
 use collections::HashMap;
-use flate2::{write::GzEncoder, Compression};
+use flate2::{Compression, write::GzEncoder};
 use futures::{
     compat::Compat01As03,
     future::{ok, poll_fn},
     prelude::*,
 };
-use http::header::{HeaderValue, ACCEPT_ENCODING, CONTENT_ENCODING, CONTENT_TYPE};
+use http::header::{ACCEPT_ENCODING, CONTENT_ENCODING, CONTENT_TYPE, HeaderValue};
 use hyper::{
-    self, header,
+    self, Body, Method, Request, Response, Server, StatusCode, header,
     server::{
+        Builder as HyperBuilder,
         accept::Accept,
         conn::{AddrIncoming, AddrStream},
-        Builder as HyperBuilder,
     },
     service::{make_service_fn, service_fn},
-    Body, Method, Request, Response, Server, StatusCode,
 };
 use in_memory_engine::RegionCacheMemoryEngine;
 use kvproto::resource_manager::ResourceGroup;
+use lazy_static::lazy_static;
 use metrics::STATUS_REQUEST_DURATION;
 use online_config::OnlineConfig;
 use openssl::{
@@ -47,18 +47,19 @@ use openssl::{
 use pin_project::pin_project;
 use profile::*;
 use prometheus::TEXT_FORMAT;
+use raftstore::store::ForcePartitionRangeManager;
 use regex::Regex;
 use resource_control::ResourceGroupManager;
 use security::{self, SecurityConfig};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use service::service_manager::GrpcServiceManager;
 use tikv_kv::RaftExtension;
 use tikv_util::{
+    GLOBAL_SERVER_READINESS,
     logger::set_log_level,
     metrics::{dump, dump_to},
     timer::GLOBAL_TIMER_HANDLE,
-    GLOBAL_SERVER_READINESS,
 };
 use tokio::{
     io::{AsyncRead, AsyncWrite},
@@ -70,7 +71,7 @@ use tracing_active_tree::tree::formating::FormatFlat;
 
 use crate::{
     config::{ConfigController, LogLevel},
-    server::Result,
+    server::{Result, debug},
     tikv_util::sys::thread::ThreadBuildWrapper,
 };
 
@@ -100,6 +101,7 @@ pub struct StatusServer<R> {
     resource_manager: Option<Arc<ResourceGroupManager>>,
     grpc_service_mgr: GrpcServiceManager,
     in_memory_engine: Option<RegionCacheMemoryEngine>,
+    force_partition_range_mgr: ForcePartitionRangeManager,
 }
 
 impl<R> StatusServer<R>
@@ -114,6 +116,7 @@ where
         resource_manager: Option<Arc<ResourceGroupManager>>,
         grpc_service_mgr: GrpcServiceManager,
         in_memory_engine: Option<RegionCacheMemoryEngine>,
+        force_partition_range_mgr: ForcePartitionRangeManager,
     ) -> Result<Self> {
         let thread_pool = Builder::new_multi_thread()
             .enable_all()
@@ -137,6 +140,7 @@ where
             resource_manager,
             grpc_service_mgr,
             in_memory_engine,
+            force_partition_range_mgr,
         })
     }
 
@@ -472,6 +476,101 @@ where
         ))
     }
 
+    pub fn dump_partition_ranges(
+        force_partition_range_mgr: &ForcePartitionRangeManager,
+    ) -> hyper::Result<Response<Body>> {
+        let mut ranges = vec![];
+        force_partition_range_mgr.iter_all_ranges(|start, end, ttl| {
+            ranges.push(HexRange {
+                start: hex::encode(keys::origin_key(start)),
+                end: hex::encode(keys::origin_end_key(end)),
+                ttl,
+            });
+        });
+
+        let body = match serde_json::to_vec(&ranges) {
+            Ok(body) => body,
+            Err(err) => {
+                return Ok(make_response(
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    format!("fails to json: {}", err),
+                ));
+            }
+        };
+        match Response::builder()
+            .header("content-type", "application/json")
+            .body(hyper::Body::from(body))
+        {
+            Ok(resp) => Ok(resp),
+            Err(err) => Ok(make_response(
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("fails to build response: {}", err),
+            )),
+        }
+    }
+
+    async fn add_partition_ranges(
+        req: Request<Body>,
+        force_partition_range_mgr: &ForcePartitionRangeManager,
+    ) -> hyper::Result<Response<Body>> {
+        let mut body = Vec::new();
+        req.into_body()
+            .try_for_each(|bytes| {
+                body.extend(bytes);
+                ok(())
+            })
+            .await?;
+
+        let res = || -> std::result::Result<_, String> {
+            let range: HexRange = serde_json::from_slice(&body).map_err(|e| e.to_string())?;
+            let start = hex::decode(&range.start)
+                .map_err(|e| format!("invalie start key, err: {:?}", e))?;
+            let end =
+                hex::decode(&range.end).map_err(|e| format!("invalie end key, err: {:?}", e))?;
+            Ok((range, (keys::data_key(&start), keys::data_end_key(&end))))
+        }();
+
+        match res {
+            Ok((hex_range, range)) => {
+                let added = force_partition_range_mgr.add_range(range.0, range.1, 3600);
+                info!("add force partition range"; "start" => &hex_range.start, "end" => &hex_range.end, "added" => added);
+                Ok(Response::new(Body::empty()))
+            }
+            Err(err) => Ok(make_response(StatusCode::BAD_REQUEST, err)),
+        }
+    }
+
+    async fn remove_partition_ranges(
+        req: Request<Body>,
+        force_partition_range_mgr: &ForcePartitionRangeManager,
+    ) -> hyper::Result<Response<Body>> {
+        let mut body = Vec::new();
+        req.into_body()
+            .try_for_each(|bytes| {
+                body.extend(bytes);
+                ok(())
+            })
+            .await?;
+
+        let res = || -> std::result::Result<_, String> {
+            let range: HexRange = serde_json::from_slice(&body).map_err(|e| e.to_string())?;
+            let start = hex::decode(&range.start)
+                .map_err(|e| format!("invalie start key, err: {:?}", e))?;
+            let end =
+                hex::decode(&range.end).map_err(|e| format!("invalie end key, err: {:?}", e))?;
+            Ok((range, (keys::data_key(&start), keys::data_end_key(&end))))
+        }();
+
+        match res {
+            Ok((hex_range, range)) => {
+                let removed = force_partition_range_mgr.remove_range(&range.0, &range.1);
+                info!("remove force partition range"; "start" => &hex_range.start, "end" => &hex_range.end, "removed" => removed);
+                Ok(Response::new(Body::empty()))
+            }
+            Err(err) => Ok(make_response(StatusCode::BAD_REQUEST, err)),
+        }
+    }
+
     fn metrics_to_resp(req: Request<Body>, should_simplify: bool) -> hyper::Result<Response<Body>> {
         let gz_encoding = client_accept_gzip(&req);
         let metrics = if gz_encoding {
@@ -494,6 +593,13 @@ where
     }
 }
 
+#[derive(Serialize, Deserialize)]
+struct HexRange {
+    start: String,
+    end: String,
+    ttl: u64,
+}
+
 impl<R> StatusServer<R>
 where
     R: 'static + Send + RaftExtension + Clone,
@@ -616,7 +722,7 @@ where
         let verbose = req
             .uri()
             .query()
-            .map_or(false, |query| query.contains("verbose"));
+            .is_some_and(|query| query.contains("verbose"));
 
         let status_code = if GLOBAL_SERVER_READINESS.is_ready() {
             StatusCode::OK
@@ -645,6 +751,7 @@ where
         let resource_manager = self.resource_manager.clone();
         let grpc_service_mgr = self.grpc_service_mgr.clone();
         let in_memory_engine = self.in_memory_engine.clone();
+        let force_partition_range_mgr = self.force_partition_range_mgr.clone();
         // Start to serve.
         let server = builder.serve(make_service_fn(move |conn: &C| {
             let x509 = conn.get_x509();
@@ -654,6 +761,7 @@ where
             let resource_manager = resource_manager.clone();
             let in_memory_engine = in_memory_engine.clone();
             let grpc_service_mgr = grpc_service_mgr.clone();
+            let force_partition_range_mgr = force_partition_range_mgr.clone();
             async move {
                 // Create a status service.
                 Ok::<_, hyper::Error>(service_fn(move |req: Request<Body>| {
@@ -664,6 +772,7 @@ where
                     let resource_manager = resource_manager.clone();
                     let grpc_service_mgr = grpc_service_mgr.clone();
                     let in_memory_engine = in_memory_engine.clone();
+                    let force_partition_range_mgr = force_partition_range_mgr.clone();
                     async move {
                         let path = req.uri().path().to_owned();
                         let method = req.method().to_owned();
@@ -772,6 +881,12 @@ where
                             }
                             (Method::GET, "/async_tasks") => Self::dump_async_trace(),
                             (Method::GET, "debug/ime/cached_regions") => Self::handle_dumple_cached_regions(in_memory_engine.as_ref()),
+                            (Method::GET, "/force_partition_ranges") => Self::dump_partition_ranges(&force_partition_range_mgr),
+                            (Method::POST, "/force_partition_ranges") => Self::add_partition_ranges(req, &force_partition_range_mgr).await,
+                            (Method::DELETE, "/force_partition_ranges") => Self::remove_partition_ranges(req, &force_partition_range_mgr).await,
+                            (_, path) if path.starts_with("/debug/dup-key") => {
+                                debug::handle_dup_key_debug(req)
+                            }
                             _ => {
                                 is_unknown_path = true;
                                 Ok(make_response(StatusCode::NOT_FOUND, "path not found"))
@@ -1234,18 +1349,18 @@ mod tests {
         env,
         io::Read,
         path::PathBuf,
-        sync::{atomic::Ordering, Arc},
+        sync::{Arc, atomic::Ordering},
     };
 
     use collections::HashSet;
     use flate2::read::GzDecoder;
     use futures::{
         executor::block_on,
-        future::{ok, BoxFuture},
+        future::{BoxFuture, ok},
         prelude::*,
     };
-    use http::header::{HeaderValue, ACCEPT_ENCODING};
-    use hyper::{body::Buf, client::HttpConnector, Body, Client, Method, Request, StatusCode, Uri};
+    use http::header::{ACCEPT_ENCODING, HeaderValue};
+    use hyper::{Body, Client, Method, Request, StatusCode, Uri, body::Buf, client::HttpConnector};
     use hyper_openssl::HttpsConnector;
     use online_config::OnlineConfig;
     use openssl::ssl::{SslConnector, SslFiletype, SslMethod};
@@ -1254,11 +1369,11 @@ mod tests {
     use service::service_manager::GrpcServiceManager;
     use test_util::new_security_cfg;
     use tikv_kv::RaftExtension;
-    use tikv_util::{logger::get_log_level, GLOBAL_SERVER_READINESS};
+    use tikv_util::{GLOBAL_SERVER_READINESS, logger::get_log_level};
 
     use crate::{
         config::{ConfigController, TikvConfig},
-        server::status_server::{profile::TEST_PROFILE_MUTEX, LogLevelRequest, StatusServer},
+        server::status_server::{LogLevelRequest, StatusServer, profile::TEST_PROFILE_MUTEX},
         storage::config::EngineType,
     };
 
@@ -1281,6 +1396,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1330,6 +1446,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1383,6 +1500,7 @@ mod tests {
                 None,
                 GrpcServiceManager::dummy(),
                 None,
+                Default::default(),
             )
             .unwrap();
             let addr = "127.0.0.1:0".to_owned();
@@ -1446,6 +1564,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1563,6 +1682,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1608,6 +1728,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1645,6 +1766,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1718,6 +1840,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1749,6 +1872,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1783,6 +1907,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1817,7 +1942,7 @@ mod tests {
             String::from_utf8(body_bytes.as_ref().to_owned())
                 .unwrap()
                 .split(' ')
-                .last()
+                .next_back()
                 .unwrap()
                 .starts_with("backtrace::backtrace")
         );
@@ -1835,6 +1960,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1891,6 +2017,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
@@ -1946,6 +2073,7 @@ mod tests {
                 None,
                 GrpcServiceManager::dummy(),
                 None,
+                Default::default(),
             )
             .unwrap();
             let addr = "127.0.0.1:0".to_owned();
@@ -1984,6 +2112,7 @@ mod tests {
                 None,
                 GrpcServiceManager::dummy(),
                 None,
+                Default::default(),
             )
             .unwrap();
             let addr = "127.0.0.1:0".to_owned();
@@ -2021,6 +2150,7 @@ mod tests {
             None,
             GrpcServiceManager::dummy(),
             None,
+            Default::default(),
         )
         .unwrap();
         let addr = "127.0.0.1:0".to_owned();
diff --git a/src/server/status_server/profile.rs b/src/server/status_server/profile.rs
index e9e592f1f9b..beb0f7e230d 100644
--- a/src/server/status_server/profile.rs
+++ b/src/server/status_server/profile.rs
@@ -8,9 +8,9 @@ use std::{
 };
 
 use futures::{
+    Future, FutureExt,
     future::BoxFuture,
     task::{Context, Poll},
-    Future, FutureExt,
 };
 use lazy_static::lazy_static;
 use pprof::protos::Message;
@@ -20,10 +20,10 @@ use tempfile::NamedTempFile;
 use tikv_alloc::dump_prof;
 use tikv_util::defer;
 
-#[cfg(test)]
-use self::test_utils::dump_prof;
 #[cfg(test)]
 pub use self::test_utils::TEST_PROFILE_MUTEX;
+#[cfg(test)]
+use self::test_utils::dump_prof;
 
 lazy_static! {
     // If it's some it means there are already a CPU profiling.
@@ -207,6 +207,7 @@ fn extract_thread_name(thread_name: &str) -> String {
 mod test_utils {
     use std::sync::Mutex;
 
+    use lazy_static::lazy_static;
     use tikv_alloc::error::ProfResult;
 
     lazy_static! {
@@ -240,7 +241,7 @@ mod tests {
     fn test_profile_guard_concurrency() {
         use std::{thread, time::Duration};
 
-        use futures::{channel::oneshot, TryFutureExt};
+        use futures::{TryFutureExt, channel::oneshot};
 
         let _test_guard = TEST_PROFILE_MUTEX.lock().unwrap();
         let rt = runtime::Builder::new_multi_thread()
diff --git a/src/server/tablet_snap.rs b/src/server/tablet_snap.rs
index 60d1fa82114..e5b028157fe 100644
--- a/src/server/tablet_snap.rs
+++ b/src/server/tablet_snap.rs
@@ -28,7 +28,7 @@ use std::{
     fs::{self, File},
     io::{self, BorrowedBuf, Read, Seek, SeekFrom, Write},
     path::Path,
-    sync::{atomic::Ordering, Arc},
+    sync::{Arc, atomic::Ordering},
     time::Duration,
 };
 
@@ -55,23 +55,23 @@ use kvproto::{
 };
 use protobuf::Message;
 use raftstore::store::{
-    snap::{ReceivingGuard, TabletSnapKey, TabletSnapManager},
     SnapManager,
+    snap::{ReceivingGuard, TabletSnapKey, TabletSnapManager},
 };
 use security::SecurityManager;
 use tikv_kv::RaftExtension;
 use tikv_util::{
+    DeferContext, Either,
     config::{ReadableSize, Tracker, VersionTrack},
     time::Instant,
     worker::Runnable,
-    DeferContext, Either,
 };
 use tokio::runtime::{Builder as RuntimeBuilder, Runtime};
 
 use super::{
-    metrics::*,
-    snap::{Task, DEFAULT_POOL_SIZE},
     Config, Error, Result,
+    metrics::*,
+    snap::{DEFAULT_POOL_SIZE, Task},
 };
 use crate::tikv_util::{sys::thread::ThreadBuildWrapper, time::Limiter};
 
@@ -246,9 +246,9 @@ fn protocol_error(exp: &str, act: impl Debug) -> Error {
 /// It's considered matched when:
 /// 1. Have the same file size;
 /// 2. The first `PREVIEW_CHUNK_LEN` bytes are the same, this contains the
-/// actual data of an SST;
+///    actual data of an SST;
 /// 3. The last `PREVIEW_CHUNK_LEN` bytes are the same, this contains checksum,
-/// properties and other medata of an SST.
+///    properties and other medata of an SST.
 async fn is_sst_match_preview(
     preview_meta: &TabletSnapshotFileMeta,
     target: &Path,
@@ -538,7 +538,7 @@ async fn recv_snap_imp<'a>(
     if let Some(m) = snap_mgr.key_manager() {
         m.link_file(path.to_str().unwrap(), final_path.to_str().unwrap())?;
     }
-    fs::rename(&path, &final_path).map_err(|e| {
+    fs::rename(&path, &final_path).inspect_err(|_e| {
         if let Some(m) = snap_mgr.key_manager() {
             if let Err(e) = m.remove_dir(&final_path, Some(&path)) {
                 error!(
@@ -549,7 +549,6 @@ async fn recv_snap_imp<'a>(
                 );
             }
         }
-        e
     })?;
     if let Some(m) = snap_mgr.key_manager() {
         m.remove_dir(&path, Some(&final_path))?;
@@ -1056,11 +1055,10 @@ pub fn copy_tablet_snapshot(
             let _ = m.remove_dir(&final_path, None);
         }
     }
-    fs::rename(&recv_path, &final_path).map_err(|e| {
+    fs::rename(&recv_path, &final_path).inspect_err(|_e| {
         if let Some(m) = recver_snap_mgr.key_manager() {
             let _ = m.remove_dir(&final_path, Some(&recv_path));
         }
-        e
     })?;
     if let Some(m) = recver_snap_mgr.key_manager() {
         m.remove_dir(&recv_path, Some(&final_path))?;
diff --git a/src/server/transport.rs b/src/server/transport.rs
index 1303eff81f5..4eecf71085f 100644
--- a/src/server/transport.rs
+++ b/src/server/transport.rs
@@ -1,7 +1,7 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
 use kvproto::raft_serverpb::RaftMessage;
-use raftstore::{store::Transport, Result as RaftStoreResult};
+use raftstore::{Result as RaftStoreResult, store::Transport};
 use tikv_kv::RaftExtension;
 
 use crate::server::{raft_client::RaftClient, resolve::StoreAddrResolver};
diff --git a/src/server/ttl/mod.rs b/src/server/ttl/mod.rs
index 756bfd6ff18..d2913dd6c13 100644
--- a/src/server/ttl/mod.rs
+++ b/src/server/ttl/mod.rs
@@ -3,5 +3,5 @@
 mod ttl_checker;
 mod ttl_compaction_filter;
 
-pub use ttl_checker::{check_ttl_and_compact_files, Task as TtlCheckerTask, TtlChecker};
+pub use ttl_checker::{Task as TtlCheckerTask, TtlChecker, check_ttl_and_compact_files};
 pub use ttl_compaction_filter::TtlCompactionFilterFactory;
diff --git a/src/server/ttl/ttl_checker.rs b/src/server/ttl/ttl_checker.rs
index baf1129ccb5..c2e8f298059 100644
--- a/src/server/ttl/ttl_checker.rs
+++ b/src/server/ttl/ttl_checker.rs
@@ -7,7 +7,7 @@ use std::{
     time::Duration,
 };
 
-use engine_traits::{KvEngine, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, KvEngine};
 use raftstore::coprocessor::RegionInfoProvider;
 use tikv_util::{
     time::{Instant, UnixSecs},
diff --git a/src/server/ttl/ttl_compaction_filter.rs b/src/server/ttl/ttl_compaction_filter.rs
index 11adc48ed8a..fcb8874742e 100644
--- a/src/server/ttl/ttl_compaction_filter.rs
+++ b/src/server/ttl/ttl_compaction_filter.rs
@@ -4,13 +4,14 @@ use std::{ffi::CString, marker::PhantomData};
 
 use api_version::{KeyMode, KvFormat, RawValue};
 use engine_rocks::{
+    RocksTtlProperties,
     raw::{
         CompactionFilter, CompactionFilterContext, CompactionFilterDecision,
         CompactionFilterFactory, CompactionFilterValueType, DBTableFileCreationReason,
     },
-    RocksTtlProperties,
 };
 use engine_traits::raw_ttl::ttl_current_ts;
+use lazy_static::lazy_static;
 use prometheus::*;
 
 use crate::server::metrics::TTL_CHECKER_ACTIONS_COUNTER_VEC;
diff --git a/src/storage/config.rs b/src/storage/config.rs
index a14377a697f..5542bb1a410 100644
--- a/src/storage/config.rs
+++ b/src/storage/config.rs
@@ -14,7 +14,10 @@ use tikv_util::{
     sys::SysQuota,
 };
 
-use crate::config::{DEFAULT_ROCKSDB_SUB_DIR, DEFAULT_TABLET_SUB_DIR, MIN_BLOCK_CACHE_SHARD_SIZE};
+use crate::{
+    config::{DEFAULT_ROCKSDB_SUB_DIR, DEFAULT_TABLET_SUB_DIR, MIN_BLOCK_CACHE_SHARD_SIZE},
+    server::CONFIG_FLOW_CONTROL_GAUGE,
+};
 
 pub const DEFAULT_DATA_DIR: &str = "./";
 const DEFAULT_GC_RATIO_THRESHOLD: f64 = 1.1;
@@ -279,6 +282,26 @@ impl Default for FlowControlConfig {
     }
 }
 
+impl FlowControlConfig {
+    pub fn write_into_metrics(&self) {
+        CONFIG_FLOW_CONTROL_GAUGE
+            .with_label_values(&["enabled"])
+            .set(self.enable.into());
+        CONFIG_FLOW_CONTROL_GAUGE
+            .with_label_values(&["soft_pending_compaction_bytes_limit"])
+            .set(self.soft_pending_compaction_bytes_limit.0 as f64);
+        CONFIG_FLOW_CONTROL_GAUGE
+            .with_label_values(&["hard_pending_compaction_bytes_limit"])
+            .set(self.hard_pending_compaction_bytes_limit.0 as f64);
+        CONFIG_FLOW_CONTROL_GAUGE
+            .with_label_values(&["memtables_threshold"])
+            .set(self.memtables_threshold as f64);
+        CONFIG_FLOW_CONTROL_GAUGE
+            .with_label_values(&["l0_files_threshold"])
+            .set(self.l0_files_threshold as f64);
+    }
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, OnlineConfig)]
 #[serde(default)]
 #[serde(rename_all = "kebab-case")]
diff --git a/src/storage/config_manager.rs b/src/storage/config_manager.rs
index 9716edb75ef..72c7c3c756b 100644
--- a/src/storage/config_manager.rs
+++ b/src/storage/config_manager.rs
@@ -6,7 +6,7 @@ use std::{convert::TryInto, sync::Arc};
 
 use concurrency_manager::ConcurrencyManager;
 use engine_traits::{ALL_CFS, CF_DEFAULT};
-use file_system::{get_io_rate_limiter, IoPriority, IoType};
+use file_system::{IoPriority, IoType, get_io_rate_limiter};
 use online_config::{ConfigChange, ConfigManager, ConfigValue, Result as CfgResult};
 use strum::IntoEnumIterator;
 use tikv_kv::Engine;
@@ -17,8 +17,8 @@ use tikv_util::{
 
 use crate::{
     config::ConfigurableDb,
-    server::{ttl::TtlCheckerTask, CONFIG_ROCKSDB_GAUGE},
-    storage::{lock_manager::LockManager, txn::flow_controller::FlowController, TxnScheduler},
+    server::{CONFIG_ROCKSDB_CF_GAUGE, ttl::TtlCheckerTask},
+    storage::{TxnScheduler, lock_manager::LockManager, txn::flow_controller::FlowController},
 };
 
 pub struct StorageConfigManger<E: Engine, K, L: LockManager> {
@@ -61,7 +61,7 @@ impl<EK: Engine, K: ConfigurableDb, L: LockManager> ConfigManager
                     self.configurable_db
                         .set_shared_block_cache_capacity(s.0 as usize)?;
                     // Write config to metric
-                    CONFIG_ROCKSDB_GAUGE
+                    CONFIG_ROCKSDB_CF_GAUGE
                         .with_label_values(&[CF_DEFAULT, "block_cache_size"])
                         .set(s.0 as f64);
                 }
diff --git a/src/storage/errors.rs b/src/storage/errors.rs
index 1eb3444d319..8e53e8ceb7f 100644
--- a/src/storage/errors.rs
+++ b/src/storage/errors.rs
@@ -12,14 +12,15 @@ use std::{
 use error_code::{self, ErrorCode, ErrorCodeExt};
 use kvproto::{errorpb, kvrpcpb, kvrpcpb::ApiVersion};
 use thiserror::Error;
-use tikv_util::deadline::{set_deadline_exceeded_busy_error, DeadlineError};
+use tikv_util::deadline::{DeadlineError, set_deadline_exceeded_busy_error};
 use txn_types::{KvPair, TimeStamp};
 
 use crate::storage::{
+    CommandKind, Result,
     kv::{self, Error as KvError, ErrorInner as KvErrorInner},
     mvcc::{Error as MvccError, ErrorInner as MvccErrorInner},
     txn::{self, Error as TxnError, ErrorInner as TxnErrorInner},
-    CommandKind, Result,
+    types,
 };
 
 #[derive(Debug, Error)]
@@ -364,6 +365,34 @@ pub fn extract_committed(err: &Error) -> Option<TimeStamp> {
     }
 }
 
+fn get_or_insert_default_for_key_error_debug_info(
+    err: &mut kvrpcpb::KeyError,
+) -> &mut kvrpcpb::DebugInfo {
+    let debug_info = &mut err.debug_info;
+    if debug_info.is_none() {
+        debug_info.set_default()
+    } else {
+        debug_info.as_mut().unwrap()
+    }
+}
+
+fn add_debug_mvcc_for_key_error(
+    err: &mut kvrpcpb::KeyError,
+    key: &[u8],
+    mvcc_info: Option<types::MvccInfo>,
+) {
+    if let Some(mut mvcc) = mvcc_info {
+        let debug_info = get_or_insert_default_for_key_error_debug_info(err);
+        // remove the values in default CF to reduce the size of the response.
+        mvcc.values.clear();
+        // set mvcc info to debug_info
+        let mut mvcc_debug_info = kvrpcpb::MvccDebugInfo::default();
+        mvcc_debug_info.set_key(key.to_owned());
+        mvcc_debug_info.set_mvcc(mvcc.into_proto());
+        debug_info.mvcc_info.push(mvcc_debug_info);
+    }
+}
+
 pub fn extract_key_error(err: &Error) -> kvrpcpb::KeyError {
     let mut key_error = kvrpcpb::KeyError::default();
     match err {
@@ -429,20 +458,7 @@ pub fn extract_key_error(err: &Error) -> kvrpcpb::KeyError {
             let mut txn_lock_not_found = kvrpcpb::TxnLockNotFound::default();
             txn_lock_not_found.set_key(key.clone());
             key_error.set_txn_lock_not_found(txn_lock_not_found);
-            // if mvcc_info is present, fill the debug_info for client's further debugging.
-            if let Some(mvcc_info) = mvcc_info {
-                // remove the values in default CF to reduce the size of the response.
-                let mut mvcc_info = mvcc_info.clone();
-                mvcc_info.values.clear();
-
-                let mut mvcc_debug_info = kvrpcpb::MvccDebugInfo::default();
-                mvcc_debug_info.set_key(key.clone());
-                mvcc_debug_info.set_mvcc(mvcc_info.into_proto());
-
-                let mut debug_info = kvrpcpb::DebugInfo::default();
-                debug_info.set_mvcc_info(vec![mvcc_debug_info].into());
-                key_error.set_debug_info(debug_info);
-            }
+            add_debug_mvcc_for_key_error(&mut key_error, key, mvcc_info.clone());
         }
         Error(box ErrorInner::Txn(TxnError(box TxnErrorInner::Mvcc(MvccError(
             box MvccErrorInner::TxnNotFound { start_ts, key },
@@ -475,6 +491,7 @@ pub fn extract_key_error(err: &Error) -> kvrpcpb::KeyError {
                 commit_ts,
                 key,
                 min_commit_ts,
+                mvcc_info,
             },
         ))))) => {
             let mut commit_ts_expired = kvrpcpb::CommitTsExpired::default();
@@ -483,6 +500,7 @@ pub fn extract_key_error(err: &Error) -> kvrpcpb::KeyError {
             commit_ts_expired.set_key(key.to_owned());
             commit_ts_expired.set_min_commit_ts(min_commit_ts.into_inner());
             key_error.set_commit_ts_expired(commit_ts_expired);
+            add_debug_mvcc_for_key_error(&mut key_error, key, mvcc_info.clone());
         }
         Error(box ErrorInner::Txn(TxnError(box TxnErrorInner::Mvcc(MvccError(
             box MvccErrorInner::CommitTsTooLarge { min_commit_ts, .. },
@@ -516,7 +534,7 @@ pub fn extract_key_error(err: &Error) -> kvrpcpb::KeyError {
             key_error.set_primary_mismatch(primary_mismatch);
         }
         _ => {
-            error!(?*err; "txn aborts");
+            warn!("txn aborts"; "err" => ?err);
             key_error.set_abort(format!("{:?}", err));
         }
     }
@@ -640,10 +658,8 @@ mod test {
         assert_eq!(got, expect);
     }
 
-    #[test]
-    fn test_extract_key_error_txn_lock_not_found() {
-        let key = b"key".to_vec();
-        let mvcc_info = MvccInfo {
+    fn mock_mvcc_info() -> MvccInfo {
+        MvccInfo {
             lock: Some(Lock::new(
                 LockType::Lock,
                 b"k".to_vec(),
@@ -660,17 +676,38 @@ mod test {
                 Write::new(WriteType::Lock, 7.into(), None),
             )],
             values: vec![(TimeStamp::new(7), b"v".to_vec())],
-        };
+        }
+    }
 
-        let case = Error::from(TxnError::from(MvccError::from(
-            MvccErrorInner::TxnLockNotFound {
-                start_ts: TimeStamp::new(123),
-                commit_ts: TimeStamp::new(456),
-                key: key.clone(),
-                mvcc_info: Some(mvcc_info.clone()),
-            },
-        )));
+    fn expected_debug_info_from_mvcc(key: Vec<u8>, mvcc: MvccInfo) -> kvrpcpb::DebugInfo {
+        let mut expect_pb_mvcc_info = mvcc.clone().into_proto();
+        // should clear the values in default CF to reduce the size of the response.
+        expect_pb_mvcc_info.values.clear();
+        kvrpcpb::DebugInfo {
+            mvcc_info: vec![kvrpcpb::MvccDebugInfo {
+                key,
+                mvcc: Some(expect_pb_mvcc_info).into(),
+                ..Default::default()
+            }]
+            .into(),
+            ..Default::default()
+        }
+    }
 
+    #[test]
+    fn test_extract_key_error_txn_lock_not_found() {
+        fn mock_txn_lock_not_found_err(has_mvcc: bool) -> kvrpcpb::KeyError {
+            extract_key_error(&Error::from(TxnError::from(MvccError::from(
+                MvccErrorInner::TxnLockNotFound {
+                    start_ts: TimeStamp::new(123),
+                    commit_ts: TimeStamp::new(456),
+                    key: b"key".to_vec(),
+                    mvcc_info: has_mvcc.then(|| mock_mvcc_info()),
+                },
+            ))))
+        }
+
+        let key = b"key".to_vec();
         let mut expect = kvrpcpb::KeyError::default();
         let mut txn_lock_not_found = kvrpcpb::TxnLockNotFound::default();
         txn_lock_not_found.set_key(key.clone());
@@ -687,20 +724,53 @@ mod test {
             ))),
         );
         expect.set_retryable(expected_retryable_msg);
-        let mut expect_pb_mvcc_info = mvcc_info.clone().into_proto();
-        // should clear the values in default CF to reduce the size of the response.
-        expect_pb_mvcc_info.values.clear();
-        expect.set_debug_info(kvrpcpb::DebugInfo {
-            mvcc_info: vec![kvrpcpb::MvccDebugInfo {
-                key: key.clone(),
-                mvcc: Some(expect_pb_mvcc_info).into(),
-                ..Default::default()
-            }]
-            .into(),
-            ..Default::default()
-        });
 
-        let got = extract_key_error(&case);
-        assert_eq!(got, expect);
+        // without mvcc
+        expect.clear_debug_info();
+        assert_eq!(mock_txn_lock_not_found_err(false), expect);
+
+        // with mvcc
+        let mvcc_info = Some(mock_mvcc_info());
+        expect.set_debug_info(expected_debug_info_from_mvcc(
+            key.clone(),
+            mvcc_info.clone().unwrap(),
+        ));
+        assert_eq!(mock_txn_lock_not_found_err(true), expect);
+    }
+
+    #[test]
+    fn test_extract_key_error_commit_ts_expired() {
+        fn mock_commit_ts_expired_err(has_mvcc: bool) -> kvrpcpb::KeyError {
+            extract_key_error(&Error::from(TxnError::from(MvccError::from(
+                MvccErrorInner::CommitTsExpired {
+                    start_ts: TimeStamp::new(123),
+                    commit_ts: TimeStamp::new(456),
+                    key: b"key".to_vec(),
+                    min_commit_ts: TimeStamp::new(789),
+                    mvcc_info: has_mvcc.then(|| mock_mvcc_info()),
+                },
+            ))))
+        }
+
+        let key = b"key".to_vec();
+        let mut expect = kvrpcpb::KeyError::default();
+        let mut commit_ts_expired = kvrpcpb::CommitTsExpired::default();
+        commit_ts_expired.set_key(key.clone());
+        commit_ts_expired.set_start_ts(123);
+        commit_ts_expired.set_attempted_commit_ts(456);
+        commit_ts_expired.set_min_commit_ts(789);
+        expect.set_commit_ts_expired(commit_ts_expired);
+
+        // without mvcc
+        expect.clear_debug_info();
+        assert_eq!(mock_commit_ts_expired_err(false), expect);
+
+        // with mvcc
+        let mvcc = Some(mock_mvcc_info());
+        expect.set_debug_info(expected_debug_info_from_mvcc(
+            key.clone(),
+            mvcc.clone().unwrap(),
+        ));
+        assert_eq!(mock_commit_ts_expired_err(true), expect);
     }
 }
diff --git a/src/storage/kv/test_engine_builder.rs b/src/storage/kv/test_engine_builder.rs
index 30b14d22274..c8210f6d1bc 100644
--- a/src/storage/kv/test_engine_builder.rs
+++ b/src/storage/kv/test_engine_builder.rs
@@ -6,7 +6,7 @@ use std::{
 };
 
 use engine_rocks::RocksCfOptions;
-use engine_traits::{CfName, ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE};
+use engine_traits::{ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, CfName};
 use file_system::IoRateLimiter;
 use kvproto::kvrpcpb::ApiVersion;
 use tikv_util::config::ReadableSize;
@@ -96,7 +96,8 @@ impl TestEngineBuilder {
         if !enable_block_cache {
             cache_opt.capacity = Some(ReadableSize::kb(0));
         }
-        let shared = cfg_rocksdb.build_cf_resources(cache_opt.build_shared_cache());
+        let shared =
+            cfg_rocksdb.build_cf_resources(cache_opt.build_shared_cache(), Default::default());
         let cfs_opts = cfs
             .iter()
             .map(|cf| match *cf {
diff --git a/src/storage/lock_manager/lock_wait_context.rs b/src/storage/lock_manager/lock_wait_context.rs
index 2677aee9a33..591a5520aa6 100644
--- a/src/storage/lock_manager/lock_wait_context.rs
+++ b/src/storage/lock_manager/lock_wait_context.rs
@@ -15,8 +15,9 @@ use std::{
     convert::TryInto,
     result::Result,
     sync::{
+        Arc,
         atomic::{AtomicBool, Ordering},
-        mpsc, Arc,
+        mpsc,
     },
 };
 
@@ -24,10 +25,10 @@ use parking_lot::Mutex;
 use txn_types::Key;
 
 use crate::storage::{
+    Error as StorageError, PessimisticLockResults, ProcessResult, StorageCallback,
     errors::SharedError,
-    lock_manager::{lock_waiting_queue::LockWaitQueues, LockManager, LockWaitToken},
+    lock_manager::{LockManager, LockWaitToken, lock_waiting_queue::LockWaitQueues},
     types::PessimisticLockKeyResult,
-    Error as StorageError, PessimisticLockResults, ProcessResult, StorageCallback,
 };
 
 // The arguments are: (result, is_canceled_before_enqueueing).
@@ -73,23 +74,22 @@ pub struct LockWaitContextSharedState {
     /// try to cancel the request. Therefore it leads to such a corner case:
     ///
     /// 1. (scheduler) A request enters lock waiting state, so an entry is
-    ///   pushed to the `LockWaitQueues`, and a    message is sent to
-    ///   `LockManager`.
-    /// 2. (scheduler) After a while the entry is popped out and resumed
-    ///   from the `LockWaitQueues`.
-    /// 3. (scheduler) The request resumes execution but still finds lock
-    ///   on the key.
+    ///    pushed to the `LockWaitQueues`, and a message is sent to
+    ///    `LockManager`.
+    /// 2. (scheduler) After a while the entry is popped out and resumed from
+    ///    the `LockWaitQueues`.
+    /// 3. (scheduler) The request resumes execution but still finds lock on the
+    ///    key.
     ///     * This is possible to be caused by delayed-waking up or encountering
     ///       error when writing a lock-releasing command to the engine.
-    /// 4. (lock_manager) At the same time, `LockManager` tries to cancel
-    ///   the request due to timeout. But when    calling `finish_request`,
-    ///   the entry cannot be found from the `LockWaitQueues`. So it
-    ///   believes that the entry is already popped out and resumed and does
-    ///   nothing.
+    /// 4. (lock_manager) At the same time, `LockManager` tries to cancel the
+    ///    request due to timeout. But when calling `finish_request`, the entry
+    ///    cannot be found from the `LockWaitQueues`. So it believes that the
+    ///    entry is already popped out and resumed and does nothing.
     /// 5. (scheduler) An entry is pushed to the `LockWaitQueues` due to
-    ///   encountering lock at step 3. 6. Then the request becomes unable to
-    ///   be canceled by timeout or other possible errors. In worst cases,
-    ///   the request may stuck in TiKV forever.
+    ///    encountering lock at step 3. 6. Then the request becomes unable to be
+    ///    canceled by timeout or other possible errors. In worst cases, the
+    ///    request may stuck in TiKV forever.
     ///
     /// To solve this problem, a `is_canceled` flag should be set when
     /// `LockManager` tries to cancel it, before accessing the
@@ -327,17 +327,17 @@ impl<L: LockManager> LockWaitContext<L> {
 mod tests {
     use std::{
         default::Default,
-        sync::mpsc::{channel, Receiver},
+        sync::mpsc::{Receiver, channel},
         time::Duration,
     };
 
     use super::*;
     use crate::storage::{
-        lock_manager::{lock_waiting_queue::LockWaitEntry, MockLockManager},
+        ErrorInner as StorageErrorInner, Result as StorageResult,
+        lock_manager::{MockLockManager, lock_waiting_queue::LockWaitEntry},
         mvcc::{Error as MvccError, ErrorInner as MvccErrorInner},
         txn::{Error as TxnError, ErrorInner as TxnErrorInner},
         types::PessimisticLockParameters,
-        ErrorInner as StorageErrorInner, Result as StorageResult,
     };
 
     fn create_storage_cb() -> (
diff --git a/src/storage/lock_manager/lock_waiting_queue.rs b/src/storage/lock_manager/lock_waiting_queue.rs
index dbe71f6267b..5917598392c 100644
--- a/src/storage/lock_manager/lock_waiting_queue.rs
+++ b/src/storage/lock_manager/lock_waiting_queue.rs
@@ -58,8 +58,8 @@ use std::{
     future::Future,
     pin::Pin,
     sync::{
-        atomic::{AtomicU64, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicU64, AtomicUsize, Ordering},
     },
     time::{Duration, Instant},
 };
@@ -74,15 +74,15 @@ use tikv_util::{time::InstantExt, timer::GLOBAL_TIMER_HANDLE};
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
+    Error as StorageError, ErrorInner as StorageErrorInner,
     lock_manager::{
-        lock_wait_context::{LockWaitContextSharedState, PessimisticLockKeyCallback},
         KeyLockWaitInfo, LockDigest, LockManager, LockWaitToken, UpdateWaitForEvent,
+        lock_wait_context::{LockWaitContextSharedState, PessimisticLockKeyCallback},
     },
     metrics::*,
     mvcc::{Error as MvccError, ErrorInner as MvccErrorInner},
     txn::{Error as TxnError, ErrorInner as TxnErrorInner},
     types::PessimisticLockParameters,
-    Error as StorageError, ErrorInner as StorageErrorInner,
 };
 
 /// Represents an `AcquirePessimisticLock` request that's waiting for a lock,
@@ -496,7 +496,7 @@ impl<L: LockManager> LockWaitQueues<L> {
             // recreated. Skip.
             if v.delayed_notify_all_state
                 .as_ref()
-                .map_or(true, |(id, ..)| *id != notify_id)
+                .is_none_or(|(id, ..)| *id != notify_id)
             {
                 return false;
             }
@@ -513,7 +513,7 @@ impl<L: LockManager> LockWaitQueues<L> {
             while let Some((_, front)) = v.queue.peek() {
                 if front
                     .legacy_wake_up_index
-                    .map_or(false, |idx| idx >= legacy_wake_up_index)
+                    .is_some_and(|idx| idx >= legacy_wake_up_index)
                 {
                     // This entry is added after the legacy-wakeup that issued the current
                     // delayed_notify_all operation. Keep it and other remaining items in the queue.
@@ -675,16 +675,16 @@ impl<L: LockManager> LockWaitQueues<L> {
 #[cfg(test)]
 mod tests {
     use std::{
-        sync::mpsc::{channel, Receiver, RecvTimeoutError},
+        sync::mpsc::{Receiver, RecvTimeoutError, channel},
         time::Duration,
     };
 
     use super::*;
     use crate::storage::{
+        ErrorInner as StorageErrorInner, PessimisticLockKeyResult, StorageCallback,
         errors::SharedError,
-        lock_manager::{lock_wait_context::LockWaitContext, MockLockManager, WaitTimeout},
+        lock_manager::{MockLockManager, WaitTimeout, lock_wait_context::LockWaitContext},
         txn::ErrorInner as TxnErrorInner,
-        ErrorInner as StorageErrorInner, PessimisticLockKeyResult, StorageCallback,
     };
 
     struct TestLockWaitEntryHandle {
diff --git a/src/storage/lock_manager/mod.rs b/src/storage/lock_manager/mod.rs
index 4c2b4b0ccca..6c242b19cda 100644
--- a/src/storage/lock_manager/mod.rs
+++ b/src/storage/lock_manager/mod.rs
@@ -3,8 +3,8 @@
 use std::{
     fmt::{Debug, Formatter},
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicU64, Ordering},
     },
     time::Duration,
 };
@@ -19,9 +19,9 @@ pub use crate::storage::lock_manager::lock_wait_context::CancellationCallback;
 use crate::{
     server::lock_manager::{waiter_manager, waiter_manager::Callback},
     storage::{
+        Error as StorageError,
         mvcc::{Error as MvccError, ErrorInner as MvccErrorInner},
         txn::Error as TxnError,
-        Error as StorageError,
     },
 };
 
diff --git a/src/storage/metrics.rs b/src/storage/metrics.rs
index a2d68bf6d07..5b01c859059 100644
--- a/src/storage/metrics.rs
+++ b/src/storage/metrics.rs
@@ -7,10 +7,11 @@ use std::{cell::RefCell, mem, sync::Arc};
 use collections::HashMap;
 use engine_traits::{PerfContext, PerfContextExt, PerfContextKind, PerfLevel};
 use kvproto::{kvrpcpb::KeyRange, metapb, pdpb::QueryKind};
+use lazy_static::lazy_static;
 use pd_client::{BucketMeta, RegionWriteCfCopDetail};
 use prometheus::*;
 use prometheus_static_metric::*;
-use raftstore::store::{util::build_key_range, ReadStats};
+use raftstore::store::{ReadStats, util::build_key_range};
 use tikv_kv::Engine;
 use tracker::get_tls_tracker_token;
 
diff --git a/src/storage/mod.rs b/src/storage/mod.rs
index 46d2b8aad5e..3a61a0b24a7 100644
--- a/src/storage/mod.rs
+++ b/src/storage/mod.rs
@@ -67,8 +67,8 @@ use std::{
     marker::PhantomData,
     mem,
     sync::{
-        atomic::{self, AtomicBool, AtomicU64, Ordering},
         Arc,
+        atomic::{self, AtomicBool, AtomicU64, Ordering},
     },
     time::{Duration, SystemTime},
 };
@@ -78,7 +78,7 @@ use causal_ts::{CausalTsProvider, CausalTsProviderImpl};
 use collections::HashMap;
 use concurrency_manager::{ConcurrencyManager, KeyHandleGuard};
 use engine_traits::{
-    raw_ttl::ttl_to_expire_ts, CfName, CF_DEFAULT, CF_LOCK, CF_WRITE, DATA_CFS, DATA_CFS_LEN,
+    CF_DEFAULT, CF_LOCK, CF_WRITE, CfName, DATA_CFS, DATA_CFS_LEN, raw_ttl::ttl_to_expire_ts,
 };
 use futures::{future::Either, prelude::*};
 use kvproto::{
@@ -90,26 +90,30 @@ use kvproto::{
     pdpb::QueryKind,
 };
 use pd_client::FeatureGate;
-use raftstore::store::{util::build_key_range, ReadStats, TxnExt, WriteStats};
+use protobuf::Message;
+use raftstore::store::{ReadStats, TxnExt, WriteStats, util::build_key_range};
 use rand::prelude::*;
 use resource_control::{ResourceController, ResourceGroupManager, ResourceLimiter, TaskMetadata};
-use resource_metering::{FutureExt, ResourceTagFactory};
+use resource_metering::{
+    FutureExt, ResourceTagFactory, record_logical_read_bytes, record_network_in_bytes,
+    record_network_out_bytes,
+};
 use tikv_kv::{OnAppliedCb, SnapshotExt};
 use tikv_util::{
     deadline::Deadline,
     future::try_poll,
     quota_limiter::QuotaLimiter,
-    time::{duration_to_ms, duration_to_sec, Instant, InstantExt, ThreadReadId},
+    time::{Instant, InstantExt, ThreadReadId, duration_to_ms, duration_to_sec},
 };
 use tracker::{
-    clear_tls_tracker_token, set_tls_tracker_token, with_tls_tracker, TlsTrackedFuture,
-    TrackerToken,
+    TlsTrackedFuture, TrackerToken, clear_tls_tracker_token, set_tls_tracker_token,
+    with_tls_tracker,
 };
 use txn_types::{Key, KvPair, Lock, LockType, TimeStamp, TsSet, Value};
 
 use self::kv::SnapContext;
 pub use self::{
-    errors::{get_error_kind_from_header, get_tag_from_header, Error, ErrorHeaderKind, ErrorInner},
+    errors::{Error, ErrorHeaderKind, ErrorInner, get_error_kind_from_header, get_tag_from_header},
     kv::{
         CfStatistics, Cursor, CursorBuilder, Engine, FlowStatistics, FlowStatsReporter, Iterator,
         RocksEngine, ScanMode, Snapshot, StageLatencyStats, Statistics, TestEngineBuilder,
@@ -127,17 +131,17 @@ use crate::{
     server::{lock_manager::waiter_manager, metrics::ResourcePriority},
     storage::{
         config::Config,
-        kv::{with_tls_engine, Modify, WriteData},
+        kv::{Modify, WriteData, with_tls_engine},
         lock_manager::{LockManager, MockLockManager},
         metrics::{CommandKind, *},
-        mvcc::{metrics::ScanLockReadTimeSource::resolve_lock, MvccReader, PointGetterBuilder},
+        mvcc::{MvccReader, PointGetterBuilder, metrics::ScanLockReadTimeSource::resolve_lock},
         test_util::latest_feature_gate,
         txn::{
+            Command, Error as TxnError, ErrorInner as TxnErrorInner,
             commands::{RawAtomicStore, RawCompareAndSwap, TypedCommand},
             flow_controller::{EngineFlowController, FlowController},
             scheduler::TxnScheduler,
             txn_status_cache::{TxnState, TxnStatusCache},
-            Command, Error as TxnError, ErrorInner as TxnErrorInner,
         },
         types::StorageCallbackType,
     },
@@ -462,6 +466,7 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
     /// When config.api_version = V2: accept the following:
     ///   * Request of V1 from TiDB, for compatibility.
     ///   * Request of V2 with legal prefix.
+    ///
     /// See the following for detail:
     ///   * rfc: https://github.com/tikv/rfcs/blob/master/text/0069-api-v2.md.
     ///   * proto: https://github.com/pingcap/kvproto/blob/master/proto/kvrpcpb.proto,
@@ -629,9 +634,11 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
 
         let quota_limiter = self.quota_limiter.clone();
         let mut sample = quota_limiter.new_sample(true);
+        let mut process_nanos = 0u64;
         with_tls_tracker(|tracker| {
             tracker.metrics.grpc_process_nanos =
                 tracker.req_info.begin.saturating_elapsed().as_nanos() as u64;
+            process_nanos = tracker.metrics.grpc_process_nanos;
         });
 
         let stage_begin_ts = Instant::now();
@@ -647,6 +654,9 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                     false,
                     QueryKind::Get,
                 );
+                with_tls_tracker(|tracker| {
+                    record_network_in_bytes(tracker.metrics.grpc_req_size);
+                });
 
                 KV_COMMAND_COUNTER_VEC_STATIC.get(CMD).inc();
                 SCHED_COMMANDS_PRI_COUNTER_VEC_STATIC
@@ -696,9 +706,8 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                             .get(&key, &mut statistics)
                             // map storage::txn::Error -> storage::Error
                             .map_err(Error::from)
-                            .map(|r| {
+                            .inspect(|_r| {
                                 KV_COMMAND_KEYREAD_HISTOGRAM_STATIC.get(CMD).observe(1_f64);
-                                r
                             })
                     });
                     if let Err(
@@ -730,12 +739,13 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                         now.saturating_duration_since(command_duration),
                     ));
 
-                    let read_bytes = key.len()
-                        + result
-                            .as_ref()
-                            .unwrap_or(&None)
-                            .as_ref()
-                            .map_or(0, |v| v.len());
+                    let result_len = result
+                        .as_ref()
+                        .unwrap_or(&None)
+                        .as_ref()
+                        .map_or(0, |v| v.len());
+                    record_network_out_bytes(result_len as u64);
+                    let read_bytes = key.len() + result_len;
                     sample.add_read_bytes(read_bytes);
                     let quota_delay = quota_limiter.consume_sample(sample, true).await;
                     if !quota_delay.is_zero() {
@@ -763,6 +773,7 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                         tracker.metrics.read_pool_schedule_wait_nanos =
                             schedule_wait_time.as_nanos() as u64;
                     });
+                    record_logical_read_bytes(statistics.processed_size as u64);
                     Ok((
                         result?,
                         KvGetStatistics {
@@ -860,6 +871,7 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                         false,
                         QueryKind::Get,
                     );
+                    record_network_in_bytes(req.get_key().len() as u64);
 
                     Self::check_api_version(api_version, ctx.api_version, CMD, [key.as_encoded()])?;
 
@@ -958,6 +970,11 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                                         buckets.as_ref(),
                                     );
                                     statistics.add(&stat);
+                                    let value_size = v
+                                        .as_ref()
+                                        .map_or(0, |v| v.as_ref().map_or(0, |v1| v1.len()) as u64);
+                                    record_network_out_bytes(value_size);
+                                    record_logical_read_bytes(statistics.processed_size as u64);
                                     consumer.consume(
                                         id,
                                         v.map_err(|e| Error::from(txn::Error::from(e)))
@@ -1049,6 +1066,9 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                     key_ranges,
                     QueryKind::Get,
                 );
+                with_tls_tracker(|tracker| {
+                    record_network_in_bytes(tracker.metrics.grpc_req_size);
+                });
 
                 KV_COMMAND_COUNTER_VEC_STATIC.get(CMD).inc();
                 SCHED_COMMANDS_PRI_COUNTER_VEC_STATIC
@@ -1132,6 +1152,12 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                                 pair.map(|r| r.map_err(|e| Error::from(TxnError::from(e))))
                             })
                             .collect();
+                        record_network_out_bytes(
+                            result.iter().fold(0u64, |acc, r| {
+                                acc + r.as_ref().map_or(0, |(k, v)| k.len() + v.len()) as u64
+                            })
+                        );
+                        record_logical_read_bytes(reader.statistics.processed_size as u64);
                         (result, reader.statistics)
                     });
                     metrics::tls_collect_scan_details(CMD, &stats);
@@ -1243,6 +1269,9 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                     key_ranges,
                     QueryKind::Get,
                 );
+                with_tls_tracker(|tracker| {
+                    record_network_in_bytes(tracker.metrics.grpc_req_size);
+                });
 
                 KV_COMMAND_COUNTER_VEC_STATIC.get(CMD).inc();
                 SCHED_COMMANDS_PRI_COUNTER_VEC_STATIC
@@ -1320,6 +1349,9 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                                 KV_COMMAND_KEYREAD_HISTOGRAM_STATIC
                                     .get(CMD)
                                     .observe(kv_pairs.len() as f64);
+                                record_network_out_bytes(kv_pairs.iter().fold(0u64, |acc, r| {
+                                    acc + r.as_ref().map_or(0, |(k, v)| k.len() + v.len()) as u64
+                                }));
                                 kv_pairs
                             });
                         (result, stats)
@@ -1376,6 +1408,7 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                         wait_wall_time_ns: duration_to_ms(wait_wall_time),
                         process_wall_time_ns: duration_to_ms(process_wall_time),
                     };
+                    record_logical_read_bytes(stats.processed_size as u64);
                     Ok((
                         result?,
                         KvGetStatistics {
@@ -1451,6 +1484,9 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                         reverse_scan,
                         QueryKind::Scan,
                     );
+                    with_tls_tracker(|tracker| {
+                        record_network_in_bytes(tracker.metrics.grpc_req_size);
+                    });
                 }
                 KV_COMMAND_COUNTER_VEC_STATIC.get(CMD).inc();
                 SCHED_COMMANDS_PRI_COUNTER_VEC_STATIC
@@ -1566,6 +1602,10 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                         KV_COMMAND_KEYREAD_HISTOGRAM_STATIC
                             .get(CMD)
                             .observe(results.len() as f64);
+                        record_network_out_bytes(results.iter().fold(0u64, |acc, r| {
+                            acc + r.as_ref().map_or(0, |(k, v)| k.len() + v.len()) as u64
+                        }));
+                        record_logical_read_bytes(statistics.processed_size as u64);
                         results
                             .into_iter()
                             .map(|x| x.map_err(Error::from))
@@ -1632,6 +1672,9 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                         false,
                         QueryKind::Scan,
                     );
+                    with_tls_tracker(|tracker| {
+                        record_network_in_bytes(tracker.metrics.grpc_req_size);
+                    });
                 }
 
                 KV_COMMAND_COUNTER_VEC_STATIC.get(CMD).inc();
@@ -1727,7 +1770,10 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                     SCHED_HISTOGRAM_VEC_STATIC.get(CMD).observe(duration_to_sec(
                         now.saturating_duration_since(command_duration),
                     ));
-
+                    record_network_out_bytes(
+                        locks.iter().map(|l| l.compute_size()).sum::<u32>() as u64
+                    );
+                    record_logical_read_bytes(statistics.processed_size as u64);
                     Ok(locks)
                 })
             }
@@ -2061,8 +2107,7 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                         get.get_context().api_version,
                         CMD,
                         [get.get_key()],
-                    )
-                    .map_err(Error::from)?;
+                    )?;
                 }
 
                 let command_duration = Instant::now();
@@ -2935,7 +2980,7 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                             buckets.as_ref(),
                         );
                         statistics.add(&stats);
-                        result.extend(pairs.into_iter().map(|res| res.map_err(Error::from)));
+                        result.extend(pairs);
                     }
 
                     tls_collect_query_batch(
@@ -3081,11 +3126,7 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
         self.sched_raw_command(metadata, priority, CMD, async move {
             let key = F::encode_raw_key_owned(key, None);
             let cmd = RawCompareAndSwap::new(cf, key, previous_value, value, ttl, api_version, ctx);
-            Self::sched_raw_atomic_command(
-                sched,
-                cmd,
-                Box::new(|res| callback(res.map_err(Error::from))),
-            );
+            Self::sched_raw_atomic_command(sched, cmd, Box::new(|res| callback(res)));
         })
     }
 
@@ -3114,11 +3155,7 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
         self.sched_raw_command(metadata, priority, CMD, async move {
             let modifies = Self::raw_batch_put_requests_to_modifies(cf, pairs, ttls, None);
             let cmd = RawAtomicStore::new(cf, modifies, ctx);
-            Self::sched_raw_atomic_command(
-                sched,
-                cmd,
-                Box::new(|res| callback(res.map_err(Error::from))),
-            );
+            Self::sched_raw_atomic_command(sched, cmd, Box::new(|res| callback(res)));
         })
     }
 
@@ -3143,11 +3180,7 @@ impl<E: Engine, L: LockManager, F: KvFormat> Storage<E, L, F> {
                 .map(|k| Self::raw_delete_request_to_modify(cf, k, None))
                 .collect();
             let cmd = RawAtomicStore::new(cf, modifies, ctx);
-            Self::sched_raw_atomic_command(
-                sched,
-                cmd,
-                Box::new(|res| callback(res.map_err(Error::from))),
-            );
+            Self::sched_raw_atomic_command(sched, cmd, Box::new(|res| callback(res)));
         })
     }
 
@@ -3514,7 +3547,9 @@ impl<E: Engine> Engine for TxnTestEngine<E> {
     }
 
     type IMSnap = Self::Snap;
-    type IMSnapshotRes = Self::SnapshotRes;
+    // TODO: revert this once https://github.com/rust-lang/rust/issues/140222 is fixed.
+    // type IMSnapshotRes = Self::SnapshotRes;
+    type IMSnapshotRes = impl Future<Output = tikv_kv::Result<Self::Snap>> + Send;
     fn async_in_memory_snapshot(&mut self, ctx: SnapContext<'_>) -> Self::IMSnapshotRes {
         self.async_snapshot(ctx)
     }
@@ -3539,7 +3574,10 @@ pub struct TxnTestSnapshot<S: Snapshot> {
 
 impl<S: Snapshot> Snapshot for TxnTestSnapshot<S> {
     type Iter = S::Iter;
-    type Ext<'a> = TxnTestSnapshotExt<'a> where S: 'a;
+    type Ext<'a>
+        = TxnTestSnapshotExt<'a>
+    where
+        S: 'a;
 
     fn get(&self, key: &Key) -> tikv_kv::Result<Option<Value>> {
         self.snapshot.get(key)
@@ -3573,7 +3611,7 @@ impl<S: Snapshot> Snapshot for TxnTestSnapshot<S> {
 
 pub struct TxnTestSnapshotExt<'a>(&'a Arc<TxnExt>);
 
-impl<'a> SnapshotExt for TxnTestSnapshotExt<'a> {
+impl SnapshotExt for TxnTestSnapshotExt<'_> {
     fn get_txn_ext(&self) -> Option<&Arc<TxnExt>> {
         Some(self.0)
     }
@@ -3778,8 +3816,8 @@ pub mod test_util {
     use std::{
         fmt::Debug,
         sync::{
-            mpsc::{channel, Sender},
             Mutex,
+            mpsc::{Sender, channel},
         },
     };
 
@@ -4246,17 +4284,17 @@ mod tests {
     use std::{
         iter::Iterator,
         sync::{
-            atomic::{AtomicBool, Ordering},
-            mpsc::{channel, Sender},
             Arc,
+            atomic::{AtomicBool, Ordering},
+            mpsc::{Sender, channel},
         },
         thread,
         time::Duration,
     };
 
-    use api_version::{test_kv_format_impl, ApiV2};
+    use api_version::{ApiV2, test_kv_format_impl};
     use collections::HashMap;
-    use engine_traits::{raw_ttl::ttl_current_ts, CF_LOCK, CF_RAFT, CF_WRITE};
+    use engine_traits::{CF_LOCK, CF_RAFT, CF_WRITE, raw_ttl::ttl_current_ts};
     use error_code::ErrorCodeExt;
     use errors::extract_key_error;
     use futures::executor::block_on;
@@ -4267,15 +4305,15 @@ mod tests {
     use parking_lot::Mutex;
     use tikv_util::config::ReadableSize;
     use tracker::INVALID_TRACKER_TOKEN;
-    use txn_types::{LastChange, Mutation, PessimisticLock, WriteType, SHORT_VALUE_MAX_LEN};
+    use txn_types::{LastChange, Mutation, PessimisticLock, SHORT_VALUE_MAX_LEN, WriteType};
 
     use super::{
         config::EngineType,
         mvcc::tests::{must_unlocked, must_written},
         test_util::*,
         txn::{
-            commands::{new_flashback_rollback_lock_cmd, new_flashback_write_cmd},
             FLASHBACK_BATCH_SIZE,
+            commands::{new_flashback_rollback_lock_cmd, new_flashback_write_cmd},
         },
         *,
     };
@@ -4291,13 +4329,12 @@ mod tests {
                 CancellationCallback, DiagnosticContext, KeyLockWaitInfo, LockDigest,
                 LockWaitToken, UpdateWaitForEvent, WaitTimeout,
             },
-            mvcc::{tests::must_locked, LockType},
+            mvcc::{LockType, tests::must_locked},
             txn::{
-                commands,
+                Error as TxnError, ErrorInner as TxnErrorInner, commands,
                 commands::{AcquirePessimisticLock, Prewrite},
                 tests::must_rollback,
                 txn_status_cache::TxnStatusCache,
-                Error as TxnError, ErrorInner as TxnErrorInner,
             },
             types::{PessimisticLockKeyResult, PessimisticLockResults},
         },
@@ -4815,8 +4852,10 @@ mod tests {
         let engine = {
             let path = "".to_owned();
             let cfg_rocksdb = db_config;
-            let shared =
-                cfg_rocksdb.build_cf_resources(BlockCacheConfig::default().build_shared_cache());
+            let shared = cfg_rocksdb.build_cf_resources(
+                BlockCacheConfig::default().build_shared_cache(),
+                Default::default(),
+            );
             let cfs_opts = vec![
                 (
                     CF_DEFAULT,
@@ -9642,18 +9681,25 @@ mod tests {
     #[allow(clippy::large_enum_variant)]
     pub enum Msg {
         WaitFor {
+            #[allow(dead_code)]
             token: LockWaitToken,
+            #[allow(dead_code)]
             region_id: u64,
+            #[allow(dead_code)]
             region_epoch: RegionEpoch,
+            #[allow(dead_code)]
             term: u64,
             start_ts: TimeStamp,
             wait_info: KeyLockWaitInfo,
             is_first_lock: bool,
             timeout: Option<WaitTimeout>,
+            #[allow(dead_code)]
             cancel_callback: CancellationCallback,
+            #[allow(dead_code)]
             diag_ctx: DiagnosticContext,
         },
         RemoveLockWait {
+            #[allow(dead_code)]
             token: LockWaitToken,
         },
     }
diff --git a/src/storage/mvcc/consistency_check.rs b/src/storage/mvcc/consistency_check.rs
index 5233526ef9e..aa5bc2d8009 100644
--- a/src/storage/mvcc/consistency_check.rs
+++ b/src/storage/mvcc/consistency_check.rs
@@ -6,19 +6,19 @@ use std::{
     convert::TryInto,
     marker::PhantomData,
     sync::{
-        atomic::{AtomicU64, Ordering as AtomicOrdering},
         Arc,
+        atomic::{AtomicU64, Ordering as AtomicOrdering},
     },
 };
 
 use engine_traits::{
-    IterOptions, Iterable, Iterator as EngineIterator, KvEngine, Peekable, CF_DEFAULT, CF_LOCK,
-    CF_RAFT, CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, IterOptions, Iterable, Iterator as EngineIterator,
+    KvEngine, Peekable,
 };
 use kvproto::kvrpcpb::{MvccInfo, MvccLock, MvccValue, MvccWrite, Op};
 use raftstore::{
-    coprocessor::{ConsistencyCheckMethod, ConsistencyCheckObserver, Coprocessor},
     Result,
+    coprocessor::{ConsistencyCheckMethod, ConsistencyCheckObserver, Coprocessor},
 };
 use tikv_util::keybuilder::KeyBuilder;
 use txn_types::Key;
diff --git a/src/storage/mvcc/metrics.rs b/src/storage/mvcc/metrics.rs
index eaef1134d81..5321a0e6ec6 100644
--- a/src/storage/mvcc/metrics.rs
+++ b/src/storage/mvcc/metrics.rs
@@ -1,5 +1,6 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
+use lazy_static::lazy_static;
 use prometheus::*;
 use prometheus_static_metric::*;
 
diff --git a/src/storage/mvcc/mod.rs b/src/storage/mvcc/mod.rs
index 064a29da4ce..05b4f983644 100644
--- a/src/storage/mvcc/mod.rs
+++ b/src/storage/mvcc/mod.rs
@@ -15,8 +15,8 @@ use kvproto::kvrpcpb::{self, Assertion, IsolationLevel};
 use thiserror::Error;
 use tikv_util::{metrics::CRITICAL_ERROR, panic_when_unexpected_key_or_data, set_panic_mark};
 pub use txn_types::{
-    Key, Lock, LockType, Mutation, TimeStamp, Value, Write, WriteRef, WriteType,
-    SHORT_VALUE_MAX_LEN,
+    Key, Lock, LockType, Mutation, SHORT_VALUE_MAX_LEN, TimeStamp, Value, Write, WriteRef,
+    WriteType,
 };
 
 pub use self::{
@@ -25,7 +25,7 @@ pub use self::{
     },
     metrics::{GC_DELETE_VERSIONS_HISTOGRAM, MVCC_VERSIONS_HISTOGRAM},
     reader::*,
-    txn::{GcInfo, MvccTxn, ReleasedLock, MAX_TXN_WRITE_SIZE},
+    txn::{GcInfo, MAX_TXN_WRITE_SIZE, MvccTxn, ReleasedLock},
 };
 pub use crate::storage::types::MvccInfo;
 
@@ -135,6 +135,7 @@ pub enum ErrorInner {
         commit_ts: TimeStamp,
         key: Vec<u8>,
         min_commit_ts: TimeStamp,
+        mvcc_info: Option<MvccInfo>,
     },
 
     #[error("bad format key(version)")]
@@ -265,11 +266,13 @@ impl ErrorInner {
                 commit_ts,
                 key,
                 min_commit_ts,
+                mvcc_info,
             } => Some(ErrorInner::CommitTsExpired {
                 start_ts: *start_ts,
                 commit_ts: *commit_ts,
                 key: key.clone(),
                 min_commit_ts: *min_commit_ts,
+                mvcc_info: mvcc_info.clone(),
             }),
             ErrorInner::KeyVersion => Some(ErrorInner::KeyVersion),
             ErrorInner::Committed {
diff --git a/src/storage/mvcc/reader/mod.rs b/src/storage/mvcc/reader/mod.rs
index 949d8094e72..c2b7acce3e1 100644
--- a/src/storage/mvcc/reader/mod.rs
+++ b/src/storage/mvcc/reader/mod.rs
@@ -12,8 +12,8 @@ pub use self::{
     point_getter::{PointGetter, PointGetterBuilder},
     reader::{MvccReader, SnapshotReader},
     scanner::{
-        has_data_in_range, near_load_data_by_write, seek_for_valid_write, test_util, DeltaScanner,
-        EntryScanner, Scanner, ScannerBuilder,
+        DeltaScanner, EntryScanner, Scanner, ScannerBuilder, has_data_in_range,
+        near_load_data_by_write, seek_for_valid_write, test_util,
     },
 };
 
diff --git a/src/storage/mvcc/reader/point_getter.rs b/src/storage/mvcc/reader/point_getter.rs
index 7026e3fe8ab..44a6300eea0 100644
--- a/src/storage/mvcc/reader/point_getter.rs
+++ b/src/storage/mvcc/reader/point_getter.rs
@@ -10,7 +10,7 @@ use txn_types::{Key, LastChange, Lock, LockType, TimeStamp, TsSet, Value, WriteR
 
 use crate::storage::{
     kv::{Cursor, CursorBuilder, ScanMode, Snapshot, Statistics},
-    mvcc::{default_not_found_error, ErrorInner::WriteConflict, NewerTsCheckState, Result},
+    mvcc::{ErrorInner::WriteConflict, NewerTsCheckState, Result, default_not_found_error},
     need_check_locks,
 };
 
@@ -428,8 +428,8 @@ mod tests {
     use kvproto::kvrpcpb::{Assertion, AssertionLevel, PrewriteRequestPessimisticAction::*};
     use tidb_query_datatype::{
         codec::row::v2::{
-            encoder_for_test::{prepare_cols_for_test, RowEncoder},
             RowSlice,
+            encoder_for_test::{RowEncoder, prepare_cols_for_test},
         },
         expr::EvalContext,
     };
diff --git a/src/storage/mvcc/reader/reader.rs b/src/storage/mvcc/reader/reader.rs
index 48bf5a70c51..c807929780f 100644
--- a/src/storage/mvcc/reader/reader.rs
+++ b/src/storage/mvcc/reader/reader.rs
@@ -9,7 +9,7 @@ use kvproto::{
     kvrpcpb::Context,
 };
 use raftstore::store::{LocksStatus, PeerPessimisticLocks};
-use tikv_kv::{SnapshotExt, SEEK_BOUND};
+use tikv_kv::{SEEK_BOUND, SnapshotExt};
 use tikv_util::time::Instant;
 use txn_types::{
     Key, LastChange, Lock, OldValue, PessimisticLock, TimeStamp, TxnLockRef, Value, Write,
@@ -21,10 +21,9 @@ use crate::storage::{
         Cursor, CursorBuilder, Error as KvError, ScanMode, Snapshot as EngineSnapshot, Statistics,
     },
     mvcc::{
-        default_not_found_error,
-        metrics::{ScanLockReadTimeSource, SCAN_LOCK_READ_TIME_VEC},
+        Result, default_not_found_error,
+        metrics::{SCAN_LOCK_READ_TIME_VEC, ScanLockReadTimeSource},
         reader::{OverlappedWrite, TxnCommitRecord},
-        Result,
     },
 };
 
@@ -460,7 +459,7 @@ impl<S: EngineSnapshot> MvccReader<S> {
         //
         // When it switches to another key in prefix seek mode, creates a new cursor for
         // it because the current position of the cursor is seldom around `key`.
-        if self.scan_mode.is_none() && self.current_key.as_ref().map_or(true, |k| k != key) {
+        if self.scan_mode.is_none() && self.current_key.as_ref().is_none_or(|k| k != key) {
             self.current_key = Some(key.clone());
             self.write_cursor.take();
         }
@@ -953,16 +952,16 @@ impl<S: EngineSnapshot> MvccReader<S> {
 
 #[cfg(test)]
 pub mod tests {
-    use std::{ops::Bound, u64};
+    use std::ops::Bound;
 
     use concurrency_manager::ConcurrencyManager;
     use engine_rocks::{
-        properties::MvccPropertiesCollectorFactory, RocksCfOptions, RocksDbOptions, RocksEngine,
-        RocksSnapshot,
+        RocksCfOptions, RocksDbOptions, RocksEngine, RocksSnapshot,
+        properties::MvccPropertiesCollectorFactory,
     };
     use engine_traits::{
-        CompactExt, IterOptions, ManualCompactionOptions, MiscExt, Mutable, SyncMutable,
-        WriteBatch, WriteBatchExt, ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE,
+        ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, CompactExt, IterOptions,
+        ManualCompactionOptions, MiscExt, Mutable, SyncMutable, WriteBatch, WriteBatchExt,
     };
     use kvproto::{
         kvrpcpb::{AssertionLevel, Context, PrewriteRequestPessimisticAction::*},
@@ -974,13 +973,13 @@ pub mod tests {
 
     use super::*;
     use crate::storage::{
+        Engine, TestEngineBuilder,
         kv::Modify,
-        mvcc::{tests::write, MvccReader, MvccTxn},
+        mvcc::{MvccReader, MvccTxn, tests::write},
         txn::{
-            acquire_pessimistic_lock, cleanup, commit, gc, prewrite,
-            sched_pool::set_tls_feature_gate, CommitKind, TransactionKind, TransactionProperties,
+            CommitKind, TransactionKind, TransactionProperties, acquire_pessimistic_lock, cleanup,
+            commit, gc, prewrite, sched_pool::set_tls_feature_gate,
         },
-        Engine, TestEngineBuilder,
     };
 
     pub struct RegionEngine {
diff --git a/src/storage/mvcc/reader/scanner/backward.rs b/src/storage/mvcc/reader/scanner/backward.rs
index 818410358ce..8cf1f7c9e37 100644
--- a/src/storage/mvcc/reader/scanner/backward.rs
+++ b/src/storage/mvcc/reader/scanner/backward.rs
@@ -9,7 +9,7 @@ use txn_types::{Key, Lock, TimeStamp, Value, Write, WriteRef, WriteType};
 
 use super::ScannerConfig;
 use crate::storage::{
-    kv::{Cursor, Snapshot, Statistics, SEEK_BOUND},
+    kv::{Cursor, SEEK_BOUND, Snapshot, Statistics},
     mvcc::{Error, ErrorInner::WriteConflict, NewerTsCheckState, Result},
     need_check_locks,
 };
@@ -492,17 +492,17 @@ mod tests {
     use kvproto::kvrpcpb::Context;
 
     use super::{
-        super::{test_util::prepare_test_data_for_check_gc_fence, ScannerBuilder},
+        super::{ScannerBuilder, test_util::prepare_test_data_for_check_gc_fence},
         *,
     };
     use crate::storage::{
+        Scanner,
         kv::{Engine, Modify, TestEngineBuilder},
         mvcc::tests::write,
         txn::tests::{
             must_acquire_pessimistic_lock, must_commit, must_gc, must_prewrite_delete,
             must_prewrite_lock, must_prewrite_put, must_rollback,
         },
-        Scanner,
     };
 
     #[test]
diff --git a/src/storage/mvcc/reader/scanner/forward.rs b/src/storage/mvcc/reader/scanner/forward.rs
index 3d2c2f831bf..870e3ba02a8 100644
--- a/src/storage/mvcc/reader/scanner/forward.rs
+++ b/src/storage/mvcc/reader/scanner/forward.rs
@@ -9,10 +9,10 @@ use txn_types::{Key, LastChange, Lock, LockType, OldValue, TimeStamp, Value, Wri
 
 use super::ScannerConfig;
 use crate::storage::{
+    Cursor, Snapshot, Statistics,
     kv::SEEK_BOUND,
     mvcc::{ErrorInner::WriteConflict, NewerTsCheckState, Result},
     txn::{Result as TxnResult, TxnEntry, TxnEntryScanner},
-    Cursor, Snapshot, Statistics,
 };
 
 /// Defines the behavior of the scanner.
@@ -421,8 +421,7 @@ impl<S: Snapshot> ScanPolicy<S> for LatestKvPolicy {
                 .map(|val| match val {
                     Some(v) => HandleRes::Return((current_user_key, v)),
                     None => HandleRes::MoveToNext,
-                })
-                .map_err(Into::into);
+                });
             }
             return Err(e.into());
         }
@@ -747,7 +746,7 @@ impl<S: Snapshot> ScanPolicy<S> for DeltaEntryPolicy {
 
         cursors.lock.as_mut().unwrap().next(&mut statistics.lock);
 
-        result.map_err(Into::into)
+        result
     }
 
     fn handle_write(
@@ -883,12 +882,12 @@ pub mod test_util {
 
     use super::*;
     use crate::storage::{
+        Engine,
         mvcc::Write,
         txn::tests::{
             must_cleanup_with_gc_fence, must_commit, must_prewrite_delete, must_prewrite_lock,
             must_prewrite_put,
         },
-        Engine,
     };
 
     pub struct EntryBuilder {
@@ -1143,10 +1142,10 @@ mod latest_kv_tests {
 
     use super::{super::ScannerBuilder, test_util::prepare_test_data_for_check_gc_fence, *};
     use crate::storage::{
+        Scanner,
         kv::{Engine, Modify, TestEngineBuilder},
         mvcc::tests::write,
         txn::tests::*,
-        Scanner,
     };
 
     /// Check whether everything works as usual when `ForwardKvScanner::get()`
@@ -1708,12 +1707,12 @@ mod latest_entry_tests {
 
     use super::{super::ScannerBuilder, test_util::*, *};
     use crate::storage::{
+        Engine, Modify, TestEngineBuilder,
         mvcc::tests::write,
         txn::{
-            tests::{must_commit, must_prewrite_delete, must_prewrite_put},
             EntryBatch,
+            tests::{must_commit, must_prewrite_delete, must_prewrite_put},
         },
-        Engine, Modify, TestEngineBuilder,
     };
 
     /// Check whether everything works as usual when `EntryScanner::get()` goes
@@ -2144,10 +2143,10 @@ mod latest_entry_tests {
 mod delta_entry_tests {
     use engine_traits::{CF_LOCK, CF_WRITE};
     use kvproto::kvrpcpb::{Context, PrewriteRequestPessimisticAction::*};
-    use txn_types::{is_short_value, SHORT_VALUE_MAX_LEN};
+    use txn_types::{SHORT_VALUE_MAX_LEN, is_short_value};
 
     use super::{super::ScannerBuilder, test_util::*, *};
-    use crate::storage::{mvcc::tests::write, txn::tests::*, Engine, Modify, TestEngineBuilder};
+    use crate::storage::{Engine, Modify, TestEngineBuilder, mvcc::tests::write, txn::tests::*};
 
     /// Check whether everything works as usual when `Delta::get()` goes out of
     /// bound.
@@ -2702,18 +2701,18 @@ mod delta_entry_tests {
             }
         };
 
-        check(b"", b"", 0, u64::max_value());
+        check(b"", b"", 0, u64::MAX);
         check(b"", b"", 20, 30);
         check(b"", b"", 14, 24);
         check(b"", b"", 15, 16);
         check(b"", b"", 80, 90);
-        check(b"", b"", 24, u64::max_value());
-        check(b"a", b"g", 0, u64::max_value());
+        check(b"", b"", 24, u64::MAX);
+        check(b"a", b"g", 0, u64::MAX);
         check(b"b", b"c", 20, 30);
         check(b"g", b"h", 14, 24);
         check(b"", b"a", 80, 90);
-        check(b"h", b"", 24, u64::max_value());
-        check(b"c", b"d", 0, u64::max_value());
+        check(b"h", b"", 24, u64::MAX);
+        check(b"c", b"d", 0, u64::MAX);
     }
 
     #[test]
diff --git a/src/storage/mvcc/reader/scanner/mod.rs b/src/storage/mvcc/reader/scanner/mod.rs
index 1cf80923d4a..bc856a32379 100644
--- a/src/storage/mvcc/reader/scanner/mod.rs
+++ b/src/storage/mvcc/reader/scanner/mod.rs
@@ -6,13 +6,13 @@ mod forward;
 
 use std::ops::Bound;
 
-use engine_traits::{CfName, CF_DEFAULT, CF_LOCK, CF_WRITE};
+use engine_traits::{CF_DEFAULT, CF_LOCK, CF_WRITE, CfName};
 use kvproto::kvrpcpb::{ExtraOp, IsolationLevel};
 use txn_types::{
     Key, Lock, LockType, OldValue, TimeStamp, TsSet, Value, Write, WriteRef, WriteType,
 };
 
-pub use self::forward::{test_util, DeltaScanner, EntryScanner};
+pub use self::forward::{DeltaScanner, EntryScanner, test_util};
 use self::{
     backward::BackwardKvScanner,
     forward::{
@@ -23,7 +23,7 @@ use crate::storage::{
     kv::{
         CfStatistics, Cursor, CursorBuilder, Iterator, LoadDataHint, ScanMode, Snapshot, Statistics,
     },
-    mvcc::{default_not_found_error, NewerTsCheckState, Result},
+    mvcc::{NewerTsCheckState, Result, default_not_found_error},
     need_check_locks,
     txn::{Result as TxnResult, Scanner as StoreScanner},
 };
@@ -612,10 +612,10 @@ mod tests {
 
     use super::*;
     use crate::storage::{
-        kv::{Engine, RocksEngine, TestEngineBuilder, SEEK_BOUND},
-        mvcc::{tests::*, Error as MvccError, ErrorInner as MvccErrorInner},
+        kv::{Engine, RocksEngine, SEEK_BOUND, TestEngineBuilder},
+        mvcc::{Error as MvccError, ErrorInner as MvccErrorInner, tests::*},
         txn::{
-            tests::*, Error as TxnError, ErrorInner as TxnErrorInner, TxnEntry, TxnEntryScanner,
+            Error as TxnError, ErrorInner as TxnErrorInner, TxnEntry, TxnEntryScanner, tests::*,
         },
     };
 
diff --git a/src/storage/mvcc/txn.rs b/src/storage/mvcc/txn.rs
index 9b0044ff46d..404a4b494e3 100644
--- a/src/storage/mvcc/txn.rs
+++ b/src/storage/mvcc/txn.rs
@@ -304,6 +304,7 @@ pub(crate) fn make_txn_error(
                 commit_ts: TimeStamp::zero(),
                 key: key.to_raw().unwrap(),
                 min_commit_ts: TimeStamp::zero(),
+                mvcc_info: None,
             },
             "pessimisticlocknotfound" => ErrorInner::PessimisticLockNotFound {
                 start_ts,
@@ -320,17 +321,17 @@ pub(crate) fn make_txn_error(
 #[cfg(test)]
 pub(crate) mod tests {
     use kvproto::kvrpcpb::{AssertionLevel, Context, PrewriteRequestPessimisticAction::*};
-    use txn_types::{TimeStamp, WriteType, SHORT_VALUE_MAX_LEN};
+    use txn_types::{SHORT_VALUE_MAX_LEN, TimeStamp, WriteType};
 
     use super::*;
     use crate::storage::{
+        SecondaryLocksStatus, TxnStatus,
         kv::{Engine, RocksEngine, ScanMode, TestEngineBuilder, WriteData},
-        mvcc::{tests::*, Error, ErrorInner, Mutation, MvccReader, SnapshotReader},
+        mvcc::{Error, ErrorInner, Mutation, MvccReader, SnapshotReader, tests::*},
         txn::{
-            commands::*, commit, prewrite, tests::*, CommitKind, TransactionKind,
-            TransactionProperties,
+            CommitKind, TransactionKind, TransactionProperties, commands::*, commit, prewrite,
+            tests::*,
         },
-        SecondaryLocksStatus, TxnStatus,
     };
 
     fn test_mvcc_txn_read_imp(k1: &[u8], k2: &[u8], v: &[u8]) {
@@ -355,9 +356,9 @@ pub(crate) mod tests {
         // should read pending locks
         must_get_err(&mut engine, k1, 7);
         // should ignore the primary lock and get none when reading the latest record
-        must_get_none(&mut engine, k1, u64::max_value());
+        must_get_none(&mut engine, k1, u64::MAX);
         // should read secondary locks even when reading the latest record
-        must_get_err(&mut engine, k2, u64::max_value());
+        must_get_err(&mut engine, k2, u64::MAX);
 
         must_commit(&mut engine, k1, 5, 10);
         must_commit(&mut engine, k2, 5, 10);
@@ -366,12 +367,12 @@ pub(crate) mod tests {
         must_get_none(&mut engine, k1, 7);
         // should read with ts > commit_ts
         must_get(&mut engine, k1, 13, v);
-        // should read the latest record if `ts == u64::max_value()`
-        must_get(&mut engine, k1, u64::max_value(), v);
+        // should read the latest record if `ts == u64::MAX`
+        must_get(&mut engine, k1, u64::MAX, v);
 
         must_prewrite_delete(&mut engine, k1, k1, 15);
         // should ignore the lock and get previous record when reading the latest record
-        must_get(&mut engine, k1, u64::max_value(), v);
+        must_get(&mut engine, k1, u64::MAX, v);
         must_commit(&mut engine, k1, 15, 20);
         must_get_none(&mut engine, k1, 3);
         must_get_none(&mut engine, k1, 7);
@@ -388,9 +389,9 @@ pub(crate) mod tests {
         must_get(&mut engine, k1, 30, v);
         must_pessimistic_prewrite_delete(&mut engine, k1, k1, 23, 29, DoPessimisticCheck);
         must_get_err(&mut engine, k1, 30);
-        // should read the latest record when `ts == u64::max_value()`
+        // should read the latest record when `ts == u64::MAX`
         // even if lock.start_ts(23) < latest write.commit_ts(27)
-        must_get(&mut engine, k1, u64::max_value(), v);
+        must_get(&mut engine, k1, u64::MAX, v);
         must_commit(&mut engine, k1, 23, 31);
         must_get(&mut engine, k1, 30, v);
         must_get_none(&mut engine, k1, 32);
diff --git a/src/storage/raw/encoded.rs b/src/storage/raw/encoded.rs
index 2c8937fd002..01e67bbe1d1 100644
--- a/src/storage/raw/encoded.rs
+++ b/src/storage/raw/encoded.rs
@@ -6,13 +6,13 @@ use std::marker::PhantomData;
 use api_version::KvFormat;
 use engine_rocks::PerfContext;
 use engine_traits::{
-    raw_ttl::ttl_current_ts, CfName, IterMetricsCollector, IterOptions, MetricsExt, ReadOptions,
+    CfName, IterMetricsCollector, IterOptions, MetricsExt, ReadOptions, raw_ttl::ttl_current_ts,
 };
 use txn_types::{Key, Value};
 
 use crate::storage::{
-    kv::{Iterator, Result, Snapshot, RAW_VALUE_TOMBSTONE},
     Statistics,
+    kv::{Iterator, RAW_VALUE_TOMBSTONE, Result, Snapshot},
 };
 
 #[derive(Clone)]
@@ -64,7 +64,10 @@ impl<S: Snapshot, F: KvFormat> RawEncodeSnapshot<S, F> {
 
 impl<S: Snapshot, F: KvFormat> Snapshot for RawEncodeSnapshot<S, F> {
     type Iter = RawEncodeIterator<S::Iter, F>;
-    type Ext<'a> = S::Ext<'a> where S: 'a;
+    type Ext<'a>
+        = S::Ext<'a>
+    where
+        S: 'a;
 
     fn get(&self, key: &Key) -> Result<Option<Value>> {
         self.map_value(self.snap.get(key))
diff --git a/src/storage/raw/raw_mvcc.rs b/src/storage/raw/raw_mvcc.rs
index c9a2ea006ca..9ea10e60eff 100644
--- a/src/storage/raw/raw_mvcc.rs
+++ b/src/storage/raw/raw_mvcc.rs
@@ -2,8 +2,8 @@
 
 use engine_rocks::PerfContext;
 use engine_traits::{
-    CfName, IterMetricsCollector, IterOptions, MetricsExt, ReadOptions, CF_DEFAULT,
-    DATA_KEY_PREFIX_LEN,
+    CF_DEFAULT, CfName, DATA_KEY_PREFIX_LEN, IterMetricsCollector, IterOptions, MetricsExt,
+    ReadOptions,
 };
 use txn_types::{Key, TimeStamp, Value};
 
@@ -28,7 +28,7 @@ impl<S: Snapshot> RawMvccSnapshot<S> {
         key: &Key,
     ) -> Result<Option<Value>> {
         let mut iter_opt = IterOptions::default();
-        iter_opt.set_fill_cache(opts.map_or(true, |v| v.fill_cache()));
+        iter_opt.set_fill_cache(opts.is_none_or(|v| v.fill_cache()));
         iter_opt.use_prefix_seek();
         iter_opt.set_prefix_same_as_start(true);
         let upper_bound = key.clone().append_ts(TimeStamp::zero()).into_encoded();
@@ -44,7 +44,10 @@ impl<S: Snapshot> RawMvccSnapshot<S> {
 
 impl<S: Snapshot> Snapshot for RawMvccSnapshot<S> {
     type Iter = RawMvccIterator<S::Iter>;
-    type Ext<'a> = S::Ext<'a> where S: 'a;
+    type Ext<'a>
+        = S::Ext<'a>
+    where
+        S: 'a;
 
     fn get(&self, key: &Key) -> Result<Option<Value>> {
         self.seek_first_key_value_cf(CF_DEFAULT, None, key)
@@ -259,12 +262,12 @@ mod tests {
     use std::iter::Iterator as StdIterator;
 
     use api_version::{ApiV2, KvFormat, RawValue};
-    use engine_traits::{raw_ttl::ttl_to_expire_ts, CF_DEFAULT};
+    use engine_traits::{CF_DEFAULT, raw_ttl::ttl_to_expire_ts};
     use kvproto::kvrpcpb::Context;
     use tikv_kv::{Engine, Iterator as EngineIterator, Modify, WriteData};
 
     use super::*;
-    use crate::storage::{kv, raw::encoded::RawEncodeSnapshot, TestEngineBuilder};
+    use crate::storage::{TestEngineBuilder, kv, raw::encoded::RawEncodeSnapshot};
 
     #[test]
     fn test_raw_mvcc_snapshot() {
diff --git a/src/storage/raw/store.rs b/src/storage/raw/store.rs
index 4d70c2bf5ff..1bc2fe13eb5 100644
--- a/src/storage/raw/store.rs
+++ b/src/storage/raw/store.rs
@@ -3,7 +3,7 @@
 use std::{marker::PhantomData, time::Duration};
 
 use api_version::{ApiV1, ApiV1Ttl, ApiV2, KvFormat};
-use engine_traits::{CfName, IterOptions, DATA_KEY_PREFIX_LEN};
+use engine_traits::{CfName, DATA_KEY_PREFIX_LEN, IterOptions};
 use kvproto::kvrpcpb::{ApiVersion, KeyRange};
 use tikv_util::time::Instant;
 use txn_types::{Key, KvPair};
@@ -13,8 +13,8 @@ use super::{encoded::RawEncodeSnapshot, raw_mvcc::RawMvccSnapshot};
 use crate::{
     coprocessor::checksum_crc64_xor,
     storage::{
-        kv::{Cursor, Result, ScanMode, Snapshot},
         Statistics,
+        kv::{Cursor, Result, ScanMode, Snapshot},
     },
 };
 
@@ -173,11 +173,10 @@ impl<'a, S: Snapshot, F: KvFormat> RawStoreInner<S, F> {
     ) -> Result<Option<Vec<u8>>> {
         // no scan_count for this kind of op.
         let key_len = key.as_encoded().len();
-        self.snapshot.get_cf(cf, key).map(|value| {
+        self.snapshot.get_cf(cf, key).inspect(|value| {
             stats.data.flow_stats.read_keys = 1;
             stats.data.flow_stats.read_bytes =
                 key_len + value.as_ref().map(|v| v.len()).unwrap_or(0);
-            value
         })
     }
 
diff --git a/src/storage/read_pool.rs b/src/storage/read_pool.rs
index a0aee5a185f..75fc60369a1 100644
--- a/src/storage/read_pool.rs
+++ b/src/storage/read_pool.rs
@@ -5,13 +5,13 @@
 
 use std::sync::{Arc, Mutex};
 
-use file_system::{set_io_type, IoType};
+use file_system::{IoType, set_io_type};
 use tikv_util::yatp_pool::{Config, DefaultTicker, FuturePool, PoolTicker, YatpPoolBuilder};
 
 use crate::{
     config::StorageReadPoolConfig,
     storage::{
-        kv::{destroy_tls_engine, set_tls_engine, Engine, FlowStatsReporter},
+        kv::{Engine, FlowStatsReporter, destroy_tls_engine, set_tls_engine},
         metrics,
     },
 };
diff --git a/src/storage/txn/actions/acquire_pessimistic_lock.rs b/src/storage/txn/actions/acquire_pessimistic_lock.rs
index 0704274a7e9..e32947712a0 100644
--- a/src/storage/txn/actions/acquire_pessimistic_lock.rs
+++ b/src/storage/txn/actions/acquire_pessimistic_lock.rs
@@ -5,9 +5,10 @@ use kvproto::kvrpcpb::WriteConflictReason;
 use txn_types::{Key, LastChange, OldValue, PessimisticLock, TimeStamp, Value, Write, WriteType};
 
 use crate::storage::{
+    Snapshot,
     mvcc::{
-        metrics::{MVCC_CONFLICT_COUNTER, MVCC_DUPLICATE_CMD_COUNTER_VEC},
         Error as MvccError, ErrorInner, MvccTxn, Result as MvccResult, SnapshotReader,
+        metrics::{MVCC_CONFLICT_COUNTER, MVCC_DUPLICATE_CMD_COUNTER_VEC},
     },
     txn::{
         actions::{check_data_constraint::check_data_constraint, common::next_last_change_info},
@@ -15,7 +16,6 @@ use crate::storage::{
         scheduler::LAST_CHANGE_TS,
     },
     types::PessimisticLockKeyResult,
-    Snapshot,
 };
 
 /// Acquires pessimistic lock on a single key. Optionally reads the previous
@@ -438,19 +438,19 @@ pub mod tests {
 
     use super::*;
     use crate::storage::{
+        Engine,
         kv::WriteData,
         mvcc::{Error as MvccError, MvccReader},
-        Engine,
     };
     #[cfg(test)]
     use crate::storage::{
+        TestEngineBuilder,
         mvcc::tests::*,
         txn::actions::prewrite::tests::{
-            old_value_put_delete_lock_insert, old_value_random, OldValueRandomTest,
+            OldValueRandomTest, old_value_put_delete_lock_insert, old_value_random,
         },
         txn::commands::pessimistic_rollback,
         txn::tests::*,
-        TestEngineBuilder,
     };
 
     pub fn acquire_pessimistic_lock_allow_lock_with_conflict<E: Engine>(
diff --git a/src/storage/txn/actions/check_data_constraint.rs b/src/storage/txn/actions/check_data_constraint.rs
index 96857534df9..f178df0e72d 100644
--- a/src/storage/txn/actions/check_data_constraint.rs
+++ b/src/storage/txn/actions/check_data_constraint.rs
@@ -4,8 +4,8 @@
 use txn_types::{Key, TimeStamp, Write, WriteType};
 
 use crate::storage::{
-    mvcc::{ErrorInner, Result as MvccResult, SnapshotReader},
     Snapshot,
+    mvcc::{ErrorInner, Result as MvccResult, SnapshotReader},
 };
 
 /// Checks the existence of the key according to `should_not_exist`.
@@ -56,8 +56,8 @@ mod tests {
 
     use super::*;
     use crate::storage::{
-        mvcc::{tests::write, MvccTxn},
         Engine, TestEngineBuilder,
+        mvcc::{MvccTxn, tests::write},
     };
 
     #[test]
diff --git a/src/storage/txn/actions/check_txn_status.rs b/src/storage/txn/actions/check_txn_status.rs
index 6a8a55e91ad..c98c7a7e48b 100644
--- a/src/storage/txn/actions/check_txn_status.rs
+++ b/src/storage/txn/actions/check_txn_status.rs
@@ -5,11 +5,11 @@ use tikv_kv::SnapshotExt;
 use txn_types::{Key, Lock, TimeStamp, Write, WriteType};
 
 use crate::storage::{
+    Snapshot, TxnStatus,
     mvcc::{
-        metrics::MVCC_CHECK_TXN_STATUS_COUNTER_VEC, reader::OverlappedWrite, ErrorInner, LockType,
-        MvccTxn, ReleasedLock, Result, SnapshotReader, TxnCommitRecord,
+        ErrorInner, LockType, MvccTxn, ReleasedLock, Result, SnapshotReader, TxnCommitRecord,
+        metrics::MVCC_CHECK_TXN_STATUS_COUNTER_VEC, reader::OverlappedWrite,
     },
-    Snapshot, TxnStatus,
 };
 
 // The returned `TxnStatus` is Some(..) if the transaction status is already
@@ -71,26 +71,24 @@ fn check_txn_status_from_pessimistic_primary_lock(
 /// 'start_ts'.
 ///
 /// 1. Validate whether the existing lock indeed corresponds to the
-/// primary lock. The primary key may switch under certain circumstances. If
-/// it's a stale lock, the transaction status should not be determined by it.
-/// Refer to https://github.com/pingcap/tidb/issues/42937 for additional information.
+///    primary lock. The primary key may switch under certain circumstances. If
+///    it's a stale lock, the transaction status should not be determined by it.
+///    Refer to https://github.com/pingcap/tidb/issues/42937 for additional information.
 ///    Note that the primary key should remain unaltered if the transaction is
-/// already in the commit or 2PC phase.
-///
-/// 2. Manage the check in accordance with the primary lock type:
-/// 2.1 For the pessimistic type:
-/// 2.1.1 If it's a forced lock, validate the storage data initially to ensure
-/// the forced lock isn't stale.
-/// 2.1.2 If it's a regular lock, verify the lock's TTL and the current
-/// timestamp to determine the status. If the `resolving_pessimistic` parameter
-/// is true, perform a pessimistic rollback, else carry out a real rollback.
-/// 2.2 For the prewrite type, verify the lock's TTL and the current timestamp
-/// to decide the status.
+///    already in the commit or 2PC phase.
 ///
+/// 2. Manage the check in accordance with the primary lock type: 2.1 For the
+///    pessimistic type: 2.1.1 If it's a forced lock, validate the storage data
+///    initially to ensure the forced lock isn't stale. 2.1.2 If it's a regular
+///    lock, verify the lock's TTL and the current timestamp to determine the
+///    status. If the `resolving_pessimistic` parameter is true, perform a
+///    pessimistic rollback, else carry out a real rollback. 2.2 For the
+///    prewrite type, verify the lock's TTL and the current timestamp to decide
+///    the status.
 /// 3. Perform required operations on the valid primary lock, such as
-/// incrementing `min_commit_ts`. The actual procedure for executing the
-/// rollback differs based on the presence or absence of an overlapping write
-/// record.
+///    incrementing `min_commit_ts`. The actual procedure for executing the
+///    rollback differs based on the presence or absence of an overlapping write
+///    record.
 pub fn check_txn_status_lock_exists(
     txn: &mut MvccTxn,
     reader: &mut SnapshotReader<impl Snapshot>,
diff --git a/src/storage/txn/actions/cleanup.rs b/src/storage/txn/actions/cleanup.rs
index 3bec26df17c..66d5f45dac2 100644
--- a/src/storage/txn/actions/cleanup.rs
+++ b/src/storage/txn/actions/cleanup.rs
@@ -2,14 +2,14 @@
 
 // #[PerformanceCriticalPath]
 use crate::storage::{
+    Snapshot, TxnStatus,
     mvcc::{
-        metrics::{MVCC_CONFLICT_COUNTER, MVCC_DUPLICATE_CMD_COUNTER_VEC},
         ErrorInner, Key, MvccTxn, ReleasedLock, Result as MvccResult, SnapshotReader, TimeStamp,
+        metrics::{MVCC_CONFLICT_COUNTER, MVCC_DUPLICATE_CMD_COUNTER_VEC},
     },
     txn::actions::check_txn_status::{
-        check_txn_status_missing_lock, rollback_lock, MissingLockAction,
+        MissingLockAction, check_txn_status_missing_lock, rollback_lock,
     },
-    Snapshot, TxnStatus,
 };
 
 /// Cleanup the lock if it's TTL has expired, comparing with `current_ts`. If
@@ -85,23 +85,23 @@ pub mod tests {
     use txn_types::TimeStamp;
 
     use super::*;
+    use crate::storage::{
+        Engine,
+        mvcc::{
+            Error as MvccError, WriteType,
+            tests::{must_have_write, must_not_have_write, write},
+        },
+        txn::tests::{must_commit, must_prewrite_put},
+    };
     #[cfg(test)]
     use crate::storage::{
+        TestEngineBuilder,
         mvcc::tests::{
             must_get_rollback_protected, must_get_rollback_ts, must_locked, must_unlocked,
             must_written,
         },
         txn::commands::txn_heart_beat,
         txn::tests::{must_acquire_pessimistic_lock, must_pessimistic_prewrite_put},
-        TestEngineBuilder,
-    };
-    use crate::storage::{
-        mvcc::{
-            tests::{must_have_write, must_not_have_write, write},
-            Error as MvccError, WriteType,
-        },
-        txn::tests::{must_commit, must_prewrite_put},
-        Engine,
     };
 
     pub fn must_succeed<E: Engine>(
diff --git a/src/storage/txn/actions/commit.rs b/src/storage/txn/actions/commit.rs
index d6be1e1d44b..dc3ef828fa6 100644
--- a/src/storage/txn/actions/commit.rs
+++ b/src/storage/txn/actions/commit.rs
@@ -4,12 +4,12 @@
 use txn_types::{CommitRole, Key, TimeStamp, Write, WriteType};
 
 use crate::storage::{
+    Snapshot,
     mvcc::{
-        metrics::{MVCC_CONFLICT_COUNTER, MVCC_DUPLICATE_CMD_COUNTER_VEC},
         ErrorInner, MvccInfo, MvccTxn, ReleasedLock, Result as MvccResult, SnapshotReader,
+        metrics::{MVCC_CONFLICT_COUNTER, MVCC_DUPLICATE_CMD_COUNTER_VEC},
     },
     txn::actions::mvcc::collect_mvcc_info_for_debug,
-    Snapshot,
 };
 
 pub fn commit<S: Snapshot>(
@@ -23,22 +23,45 @@ pub fn commit<S: Snapshot>(
         crate::storage::mvcc::txn::make_txn_error(err, &key, reader.start_ts,).into()
     ));
 
+    let collect_mvcc = |reader: &SnapshotReader<S>| {
+        collect_mvcc_info_for_debug(reader.reader.snapshot().clone(), &key).map(
+            |(lock, writes, values)| MvccInfo {
+                lock,
+                writes,
+                values,
+            },
+        )
+    };
+
     let (mut lock, commit) = match reader.load_lock(&key)? {
         Some(lock) if lock.ts == reader.start_ts => {
             // A lock with larger min_commit_ts than current commit_ts can't be committed
             if commit_ts < lock.min_commit_ts {
-                info!(
+                let primary_key = Key::from_raw(&lock.primary);
+                // The min_commit_ts can be pushed to a larger value before
+                // committing the primary.
+                // When committing the secondary, the commit_ts must be determined and
+                // should always be greater than the min_commit_ts.
+                // If not, it is an unexpected case and may be a bug.
+                let unexpected = key != primary_key;
+                // collect mvcc info when an unexpected case happens.
+                let mvcc_info = unexpected.then(|| collect_mvcc(reader)).flatten();
+                info_or_error!(
+                    !unexpected;
                     "trying to commit with smaller commit_ts than min_commit_ts";
                     "key" => %key,
+                    "primary_key" => %primary_key,
                     "start_ts" => reader.start_ts,
                     "commit_ts" => commit_ts,
                     "min_commit_ts" => lock.min_commit_ts,
+                    "mvcc_info" => ?mvcc_info,
                 );
                 return Err(ErrorInner::CommitTsExpired {
                     start_ts: reader.start_ts,
                     commit_ts,
                     key: key.into_raw()?,
                     min_commit_ts: lock.min_commit_ts,
+                    mvcc_info,
                 }
                 .into());
             }
@@ -57,7 +80,7 @@ pub fn commit<S: Snapshot>(
                     "commit_ts" => commit_ts,
                     // Though it may not be a bug here, but we still want to collect the mvcc
                     // info here for further debugging if needed.
-                    "mvcc_info" => ?collect_mvcc_info_for_debug(reader.reader.snapshot().clone(), &key),
+                    "mvcc_info" => ?collect_mvcc(reader),
                 );
                 (lock, false)
             } else {
@@ -75,17 +98,7 @@ pub fn commit<S: Snapshot>(
                     // collect more information for debugging.
                     let unexpected = matches!(commit_role, Some(CommitRole::Secondary));
                     // only collect the mvcc information if an unexpected case happens.
-                    let mvcc_info = unexpected
-                        .then(|| {
-                            collect_mvcc_info_for_debug(reader.reader.snapshot().clone(), &key)
-                        })
-                        .flatten()
-                        .map(|(lock, writes, values)| MvccInfo {
-                            lock,
-                            writes,
-                            values,
-                        });
-
+                    let mvcc_info = unexpected.then(|| collect_mvcc(reader)).flatten();
                     info_or_error!(
                         !unexpected;
                         "txn conflict (lock not found)";
@@ -147,6 +160,8 @@ pub mod tests {
     use kvproto::kvrpcpb::Context;
     #[cfg(test)]
     use kvproto::kvrpcpb::PrewriteRequestPessimisticAction::*;
+    #[cfg(test)]
+    use kvproto::kvrpcpb::{Assertion, AssertionLevel};
     use tikv_kv::SnapContext;
     #[cfg(test)]
     use txn_types::{LastChange, TimeStamp};
@@ -158,16 +173,16 @@ pub mod tests {
         must_prewrite_lock, must_prewrite_put, must_prewrite_put_for_large_txn,
         must_prewrite_put_impl, must_prewrite_put_with_txn_soucre, must_rollback,
     };
+    use crate::storage::{
+        Engine,
+        mvcc::{Error, MvccTxn, tests::*},
+    };
     #[cfg(test)]
     use crate::storage::{
+        TestEngineBuilder, TxnStatus,
         mvcc::SHORT_VALUE_MAX_LEN,
         txn::commands::check_txn_status,
         txn::tests::{must_acquire_pessimistic_lock, must_pessimistic_prewrite_put},
-        TestEngineBuilder, TxnStatus,
-    };
-    use crate::storage::{
-        mvcc::{tests::*, Error, MvccTxn},
-        Engine,
     };
 
     pub fn must_succeed<E: Engine>(
@@ -299,6 +314,7 @@ pub mod tests {
         let mut engine = TestEngineBuilder::new().build().unwrap();
 
         let (k, v) = (b"k", b"v");
+        let (k2, v2) = (b"k2", b"v2");
 
         // Shortcuts
         let ts = TimeStamp::compose;
@@ -313,6 +329,23 @@ pub mod tests {
         };
 
         must_prewrite_put_for_large_txn(&mut engine, k, v, k, ts(10, 0), 100, 0);
+        must_prewrite_put_impl(
+            &mut engine,
+            k2,
+            v2,
+            k,
+            &None,
+            ts(10, 0),
+            SkipPessimisticCheck,
+            100,
+            TimeStamp::default(),
+            0,
+            ts(20, 1),
+            TimeStamp::default(),
+            false,
+            Assertion::None,
+            AssertionLevel::Off,
+        );
         check_txn_status::tests::must_success(
             &mut engine,
             k,
@@ -325,9 +358,65 @@ pub mod tests {
             uncommitted(100, ts(20, 1)),
         );
 
+        fn check_commit_ts_expired_err(
+            err: Error,
+            expected_key: &[u8],
+            expected_start_ts: TimeStamp,
+            expected_commit_ts: TimeStamp,
+            expected_min_commit_ts: TimeStamp,
+            has_mvcc: bool,
+        ) {
+            assert_matches!(err, Error(box ErrorInner::CommitTsExpired {
+                start_ts,
+                commit_ts,
+                key,
+                min_commit_ts,
+                mvcc_info,
+            }) if {
+                assert_eq!(key, expected_key.to_vec());
+                assert_eq!(start_ts,  expected_start_ts);
+                assert_eq!(commit_ts,  expected_commit_ts);
+                assert_eq!(min_commit_ts,  expected_min_commit_ts);
+                assert_eq!(has_mvcc, mvcc_info.is_some());
+                true
+            })
+        }
+
         // The min_commit_ts should be ts(20, 1)
-        must_err(&mut engine, k, ts(10, 0), ts(15, 0), None);
-        must_err(&mut engine, k, ts(10, 0), ts(20, 0), None);
+        check_commit_ts_expired_err(
+            must_err(&mut engine, k, ts(10, 0), ts(15, 0), None),
+            k,
+            ts(10, 0),
+            ts(15, 0),
+            ts(20, 1),
+            // The primary key should not collect mvcc because it is an expected case.
+            false,
+        );
+        check_commit_ts_expired_err(
+            must_err(
+                &mut engine,
+                k2,
+                ts(10, 0),
+                ts(15, 0),
+                Some(CommitRole::Secondary),
+            ),
+            k2,
+            ts(10, 0),
+            ts(15, 0),
+            ts(20, 1),
+            // The secondary key should not collect mvcc because it may be a bug.
+            true,
+        );
+        check_commit_ts_expired_err(
+            must_err(&mut engine, k2, ts(10, 0), ts(20, 0), None),
+            k2,
+            ts(10, 0),
+            ts(20, 0),
+            ts(20, 1),
+            // The mvcc info should be collected committing secondary keys as it could be a bug.
+            // Although the commit role is none, the primary key could be read from the lock.
+            true,
+        );
         must_succeed(&mut engine, k, ts(10, 0), ts(20, 1));
 
         must_prewrite_put_for_large_txn(&mut engine, k, v, k, ts(30, 0), 100, 0);
diff --git a/src/storage/txn/actions/flashback_to_version.rs b/src/storage/txn/actions/flashback_to_version.rs
index 8a24278a5dc..57a5ebdbdf0 100644
--- a/src/storage/txn/actions/flashback_to_version.rs
+++ b/src/storage/txn/actions/flashback_to_version.rs
@@ -3,9 +3,9 @@
 use txn_types::{Key, Lock, LockType, TimeStamp, Write, WriteType};
 
 use crate::storage::{
-    mvcc::{self, MvccReader, MvccTxn, SnapshotReader, MAX_TXN_WRITE_SIZE},
-    txn::{self, actions::check_txn_status::rollback_lock, Result as TxnResult},
     Snapshot,
+    mvcc::{self, MAX_TXN_WRITE_SIZE, MvccReader, MvccTxn, SnapshotReader},
+    txn::{self, Result as TxnResult, actions::check_txn_status::rollback_lock},
 };
 
 pub const FLASHBACK_BATCH_SIZE: usize = 256 + 1 /* To store the next key for multiple batches */;
@@ -297,10 +297,11 @@ pub mod tests {
     use concurrency_manager::ConcurrencyManager;
     use kvproto::kvrpcpb::{Context, PrewriteRequestPessimisticAction::DoPessimisticCheck};
     use tikv_kv::ScanMode;
-    use txn_types::{TimeStamp, SHORT_VALUE_MAX_LEN};
+    use txn_types::{SHORT_VALUE_MAX_LEN, TimeStamp};
 
     use super::*;
     use crate::storage::{
+        Engine, TestEngineBuilder,
         mvcc::tests::{must_get, must_get_none, write},
         txn::{
             actions::{
@@ -310,7 +311,6 @@ pub mod tests {
             },
             tests::{must_acquire_pessimistic_lock, must_pessimistic_prewrite_put_err},
         },
-        Engine, TestEngineBuilder,
     };
 
     fn must_rollback_lock<E: Engine>(
diff --git a/src/storage/txn/actions/gc.rs b/src/storage/txn/actions/gc.rs
index 890d5ed7b46..9f0403c3a89 100644
--- a/src/storage/txn/actions/gc.rs
+++ b/src/storage/txn/actions/gc.rs
@@ -5,8 +5,8 @@ use txn_types::{Key, TimeStamp, Write, WriteType};
 use crate::{
     server::gc_worker::STAT_TXN_KEYMODE,
     storage::{
-        mvcc::{GcInfo, MvccReader, MvccTxn, Result as MvccResult, MAX_TXN_WRITE_SIZE},
         Snapshot,
+        mvcc::{GcInfo, MAX_TXN_WRITE_SIZE, MvccReader, MvccTxn, Result as MvccResult},
     },
 };
 
@@ -129,12 +129,12 @@ pub mod tests {
     use txn_types::SHORT_VALUE_MAX_LEN;
 
     use super::*;
-    use crate::storage::{kv::SnapContext, mvcc::tests::write, Engine, ScanMode};
+    use crate::storage::{Engine, ScanMode, kv::SnapContext, mvcc::tests::write};
     #[cfg(test)]
     use crate::storage::{
+        RocksEngine, TestEngineBuilder,
         mvcc::tests::{must_get, must_get_none},
         txn::tests::*,
-        RocksEngine, TestEngineBuilder,
     };
 
     pub fn must_succeed<E: Engine>(engine: &mut E, key: &[u8], safe_point: impl Into<TimeStamp>) {
diff --git a/src/storage/txn/actions/mvcc.rs b/src/storage/txn/actions/mvcc.rs
index c4569ba2329..ed8db3c73ec 100644
--- a/src/storage/txn/actions/mvcc.rs
+++ b/src/storage/txn/actions/mvcc.rs
@@ -63,17 +63,17 @@ pub mod tests {
     use tikv_kv::Snapshot;
     use txn_types::Key;
     #[cfg(test)]
-    use txn_types::{Lock, TimeStamp, Value, Write, SHORT_VALUE_MAX_LEN};
+    use txn_types::{Lock, SHORT_VALUE_MAX_LEN, TimeStamp, Value, Write};
 
-    use crate::storage::txn::actions::mvcc::{find_mvcc_infos_by_key, LockWritesVals, MvccReader};
+    use crate::storage::txn::actions::mvcc::{LockWritesVals, MvccReader, find_mvcc_infos_by_key};
     #[cfg(test)]
     use crate::storage::{
+        TestEngineBuilder,
         mvcc::SnapshotReader,
         txn::{
             actions::mvcc::collect_mvcc_info_for_debug,
             tests::{must_commit, must_prewrite_put},
         },
-        TestEngineBuilder,
     };
 
     #[cfg(test)]
diff --git a/src/storage/txn/actions/prewrite.rs b/src/storage/txn/actions/prewrite.rs
index 117f86dd2a6..296810e47b7 100644
--- a/src/storage/txn/actions/prewrite.rs
+++ b/src/storage/txn/actions/prewrite.rs
@@ -10,26 +10,26 @@ use kvproto::kvrpcpb::{
     WriteConflictReason,
 };
 use txn_types::{
-    is_short_value, Key, LastChange, Mutation, MutationType, OldValue, TimeStamp, Value, Write,
-    WriteType,
+    Key, LastChange, Mutation, MutationType, OldValue, TimeStamp, Value, Write, WriteType,
+    is_short_value,
 };
 
 use crate::storage::{
+    Snapshot,
     mvcc::{
+        Error, ErrorInner, Lock, LockType, MvccTxn, PessimisticLockNotFoundReason, Result,
+        SnapshotReader,
         metrics::{
             MVCC_CONFLICT_COUNTER, MVCC_DUPLICATE_CMD_COUNTER_VEC,
             MVCC_PREWRITE_ASSERTION_PERF_COUNTER_VEC,
         },
-        Error, ErrorInner, Lock, LockType, MvccTxn, PessimisticLockNotFoundReason, Result,
-        SnapshotReader,
     },
     txn::{
+        LockInfo,
         actions::{check_data_constraint::check_data_constraint, common::next_last_change_info},
         sched_pool::tls_can_enable,
         scheduler::LAST_CHANGE_TS,
-        LockInfo,
     },
-    Snapshot,
 };
 
 /// Prewrite a single mutation by creating and storing a lock and value.
@@ -226,7 +226,7 @@ pub struct TransactionProperties<'a> {
     pub txn_source: u64,
 }
 
-impl<'a> TransactionProperties<'a> {
+impl TransactionProperties<'_> {
     fn max_commit_ts(&self) -> TimeStamp {
         match &self.commit_kind {
             CommitKind::TwoPc => unreachable!(),
@@ -698,8 +698,7 @@ impl<'a> PrewriteMutation<'a> {
         let mut write = write;
 
         if write_loaded
-            && write.as_ref().map_or(
-                false,
+            && write.as_ref().is_some_and(
                 |(w, _)| matches!(w.gc_fence, Some(gc_fence_ts) if !gc_fence_ts.is_zero()),
             )
         {
@@ -711,7 +710,7 @@ impl<'a> PrewriteMutation<'a> {
         // Load the most recent version if prev write is not loaded yet, or the prev
         // write is not a data version (`Put` or `Delete`)
         let need_reload = !write_loaded
-            || write.as_ref().map_or(false, |(w, _)| {
+            || write.as_ref().is_some_and(|(w, _)| {
                 w.write_type != WriteType::Put && w.write_type != WriteType::Delete
             });
         if need_reload {
@@ -936,6 +935,7 @@ pub mod tests {
     use txn_types::{OldValue, TsSet};
 
     use super::*;
+    use crate::storage::{Engine, mvcc::tests::*};
     #[cfg(test)]
     use crate::storage::{
         kv::RocksSnapshot,
@@ -944,7 +944,6 @@ pub mod tests {
             commands::prewrite::fallback_1pc_locks, tests::*,
         },
     };
-    use crate::storage::{mvcc::tests::*, Engine};
 
     fn optimistic_txn_props(primary: &[u8], start_ts: TimeStamp) -> TransactionProperties<'_> {
         TransactionProperties {
diff --git a/src/storage/txn/actions/tests.rs b/src/storage/txn/actions/tests.rs
index ffc8b3b1692..2abc6e5616f 100644
--- a/src/storage/txn/actions/tests.rs
+++ b/src/storage/txn/actions/tests.rs
@@ -9,20 +9,20 @@ use kvproto::kvrpcpb::{
     Assertion, AssertionLevel, Context, ExtraOp,
     PrewriteRequestPessimisticAction::{self, *},
 };
-use prewrite::{prewrite, CommitKind, TransactionKind, TransactionProperties};
+use prewrite::{CommitKind, TransactionKind, TransactionProperties, prewrite};
 use tikv_kv::{SnapContext, Statistics};
 
 use super::*;
 use crate::storage::{
+    Engine,
     kv::WriteData,
     lock_manager::MockLockManager,
-    mvcc::{tests::write, Error, Key, Mutation, MvccTxn, SnapshotReader, TimeStamp},
+    mvcc::{Error, Key, Mutation, MvccTxn, SnapshotReader, TimeStamp, tests::write},
     txn,
     txn::{
         commands::{Flush, WriteContext, WriteResult},
         txn_status_cache::TxnStatusCache,
     },
-    Engine,
 };
 
 pub fn must_prewrite_put_impl<E: Engine>(
diff --git a/src/storage/txn/commands/acquire_pessimistic_lock.rs b/src/storage/txn/commands/acquire_pessimistic_lock.rs
index d8344f6da4e..f0d3ddd019a 100644
--- a/src/storage/txn/commands/acquire_pessimistic_lock.rs
+++ b/src/storage/txn/commands/acquire_pessimistic_lock.rs
@@ -2,24 +2,24 @@
 
 // #[PerformanceCriticalPath]
 use kvproto::kvrpcpb::ExtraOp;
+use resource_metering::record_network_out_bytes;
 use tikv_kv::Modify;
-use txn_types::{insert_old_value_if_resolved, Key, OldValues, TimeStamp, TxnExtra};
+use txn_types::{Key, OldValues, TimeStamp, TxnExtra, insert_old_value_if_resolved};
 
 use crate::storage::{
+    Error as StorageError, PessimisticLockKeyResult, ProcessResult, Result as StorageResult,
+    Snapshot,
     kv::WriteData,
     lock_manager::{LockManager, WaitTimeout},
     mvcc::{Error as MvccError, ErrorInner as MvccErrorInner, MvccTxn, SnapshotReader},
     txn::{
-        acquire_pessimistic_lock,
+        Error, ErrorInner, Result, acquire_pessimistic_lock,
         commands::{
             Command, CommandExt, ReaderWithStats, ReleasedLocks, ResponsePolicy, TypedCommand,
             WriteCommand, WriteContext, WriteResult, WriteResultLockInfo,
         },
-        Error, ErrorInner, Result,
     },
     types::{PessimisticLockParameters, PessimisticLockResults},
-    Error as StorageError, PessimisticLockKeyResult, ProcessResult, Result as StorageResult,
-    Snapshot,
 };
 
 command! {
@@ -176,6 +176,7 @@ impl<S: Snapshot, L: LockManager> WriteCommand<S, L> for AcquirePessimisticLock
 
         let rows = if res.is_ok() { total_keys } else { 0 };
 
+        record_network_out_bytes(res.as_ref().map_or(0, |v| v.estimate_resp_size()));
         let pr = ProcessResult::PessimisticLockRes { res };
 
         let to_be_write = make_write_data(modifies, old_values);
@@ -213,6 +214,7 @@ pub(super) fn make_write_data(modifies: Vec<Modify>, old_values: OldValues) -> W
 mod tests {
     use super::*;
     use crate::storage::{
+        Statistics, TestEngineBuilder,
         txn::{
             actions::{
                 acquire_pessimistic_lock::tests::must_pessimistic_locked,
@@ -221,7 +223,6 @@ mod tests {
             commands::test_util::pessimistic_lock,
             tests::{must_commit, must_rollback},
         },
-        Statistics, TestEngineBuilder,
     };
 
     impl PartialEq for PessimisticLockKeyResult {
diff --git a/src/storage/txn/commands/acquire_pessimistic_lock_resumed.rs b/src/storage/txn/commands/acquire_pessimistic_lock_resumed.rs
index ce937d7dceb..cb2ccf45884 100644
--- a/src/storage/txn/commands/acquire_pessimistic_lock_resumed.rs
+++ b/src/storage/txn/commands/acquire_pessimistic_lock_resumed.rs
@@ -7,26 +7,25 @@ use std::{
 
 // #[PerformanceCriticalPath]
 use kvproto::kvrpcpb::ExtraOp;
-use txn_types::{insert_old_value_if_resolved, Key, OldValues};
+use txn_types::{Key, OldValues, insert_old_value_if_resolved};
 
 use crate::storage::{
+    Error as StorageError, PessimisticLockKeyResult, ProcessResult, Result as StorageResult,
+    Snapshot,
     lock_manager::{
-        lock_wait_context::LockWaitContextSharedState, lock_waiting_queue::LockWaitEntry,
-        LockManager, LockWaitToken,
+        LockManager, LockWaitToken, lock_wait_context::LockWaitContextSharedState,
+        lock_waiting_queue::LockWaitEntry,
     },
     mvcc::{Error as MvccError, ErrorInner as MvccErrorInner, MvccTxn, SnapshotReader},
     txn::{
-        acquire_pessimistic_lock,
+        Error, Result, acquire_pessimistic_lock,
         commands::{
-            acquire_pessimistic_lock::make_write_data, Command, CommandExt, ReleasedLocks,
-            ResponsePolicy, TypedCommand, WriteCommand, WriteContext, WriteResult,
-            WriteResultLockInfo,
+            Command, CommandExt, ReleasedLocks, ResponsePolicy, TypedCommand, WriteCommand,
+            WriteContext, WriteResult, WriteResultLockInfo,
+            acquire_pessimistic_lock::make_write_data,
         },
-        Error, Result,
     },
     types::{PessimisticLockParameters, PessimisticLockResults},
-    Error as StorageError, PessimisticLockKeyResult, ProcessResult, Result as StorageResult,
-    Snapshot,
 };
 
 pub struct ResumedPessimisticLockItem {
@@ -115,7 +114,7 @@ impl<S: Snapshot, L: LockManager> WriteCommand<S, L> for AcquirePessimisticLockR
             // TODO: Refine the code for rebuilding txn state.
             if txn
                 .as_ref()
-                .map_or(true, |t: &MvccTxn| t.start_ts != params.start_ts)
+                .is_none_or(|t: &MvccTxn| t.start_ts != params.start_ts)
             {
                 if let Some(mut prev_txn) = txn.replace(MvccTxn::new(
                     params.start_ts,
@@ -244,6 +243,7 @@ mod tests {
 
     use super::*;
     use crate::storage::{
+        TestEngineBuilder,
         lock_manager::{MockLockManager, WaitTimeout},
         mvcc::tests::{must_locked, write},
         txn::{
@@ -251,7 +251,6 @@ mod tests {
             tests::{must_commit, must_pessimistic_locked, must_prewrite_put, must_rollback},
             txn_status_cache::TxnStatusCache,
         },
-        TestEngineBuilder,
     };
 
     #[allow(clippy::vec_box)]
diff --git a/src/storage/txn/commands/atomic_store.rs b/src/storage/txn/commands/atomic_store.rs
index 8262b13a249..94dc0e7da0c 100644
--- a/src/storage/txn/commands/atomic_store.rs
+++ b/src/storage/txn/commands/atomic_store.rs
@@ -4,16 +4,16 @@
 use engine_traits::CfName;
 
 use crate::storage::{
+    ProcessResult, Snapshot,
     kv::{Modify, WriteData},
     lock_manager::LockManager,
     txn::{
+        Result,
         commands::{
             Command, CommandExt, ReleasedLocks, ResponsePolicy, TypedCommand, WriteCommand,
             WriteContext, WriteResult,
         },
-        Result,
     },
-    ProcessResult, Snapshot,
 };
 
 command! {
@@ -73,7 +73,7 @@ impl<S: Snapshot, L: LockManager> WriteCommand<S, L> for RawAtomicStore {
 mod tests {
     use std::sync::Arc;
 
-    use api_version::{test_kv_format_impl, ApiV2, KvFormat, RawValue};
+    use api_version::{ApiV2, KvFormat, RawValue, test_kv_format_impl};
     use engine_traits::CF_DEFAULT;
     use futures::executor::block_on;
     use kvproto::kvrpcpb::{ApiVersion, Context};
@@ -81,9 +81,9 @@ mod tests {
 
     use super::*;
     use crate::storage::{
+        Statistics, TestEngineBuilder,
         lock_manager::MockLockManager,
         txn::{scheduler::get_raw_ext, txn_status_cache::TxnStatusCache},
-        Statistics, TestEngineBuilder,
     };
 
     #[test]
diff --git a/src/storage/txn/commands/check_secondary_locks.rs b/src/storage/txn/commands/check_secondary_locks.rs
index 1cb5f18c2da..2f5d5c7d737 100644
--- a/src/storage/txn/commands/check_secondary_locks.rs
+++ b/src/storage/txn/commands/check_secondary_locks.rs
@@ -1,22 +1,24 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 // #[PerformanceCriticalPath]
+use protobuf::Message;
+use resource_metering::record_network_out_bytes;
 use txn_types::{Key, Lock, WriteType};
 
 use crate::storage::{
+    ProcessResult, Snapshot,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{MvccTxn, OverlappedWrite, ReleasedLock, SnapshotReader, TimeStamp, TxnCommitRecord},
     txn::{
+        Result,
         actions::check_txn_status::{collapse_prev_rollback, make_rollback},
         commands::{
             Command, CommandExt, ReaderWithStats, ReleasedLocks, ResponsePolicy, TypedCommand,
             WriteCommand, WriteContext, WriteResult,
         },
-        Result,
     },
     types::SecondaryLocksStatus,
-    ProcessResult, Snapshot,
 };
 
 command! {
@@ -158,7 +160,7 @@ impl<S: Snapshot, L: LockManager> WriteCommand<S, L> for CheckSecondaryLocks {
         );
         let mut released_locks = ReleasedLocks::new();
         let mut result = SecondaryLocksStatus::Locked(Vec::new());
-
+        let mut result_size: u64 = 0;
         for key in self.keys {
             let mut released_lock = None;
             let mut mismatch_lock = None;
@@ -195,7 +197,9 @@ impl<S: Snapshot, L: LockManager> WriteCommand<S, L> for CheckSecondaryLocks {
             released_locks.push(released_lock);
             match status {
                 SecondaryLockStatus::Locked(lock) => {
-                    result.push(lock.into_lock_info(key.to_raw()?));
+                    let lock_info = lock.into_lock_info(key.to_raw()?);
+                    result_size += lock_info.compute_size() as u64;
+                    result.push(lock_info);
                 }
                 SecondaryLockStatus::Committed(commit_ts) => {
                     result = SecondaryLocksStatus::Committed(commit_ts);
@@ -208,6 +212,7 @@ impl<S: Snapshot, L: LockManager> WriteCommand<S, L> for CheckSecondaryLocks {
             }
         }
 
+        record_network_out_bytes(result_size);
         let write_result_known_txn_status =
             if let SecondaryLocksStatus::Committed(commit_ts) = &result {
                 vec![(self.start_ts, *commit_ts)]
@@ -248,6 +253,7 @@ pub mod tests {
 
     use super::*;
     use crate::storage::{
+        Engine,
         kv::TestEngineBuilder,
         lock_manager::MockLockManager,
         mvcc::tests::*,
@@ -255,7 +261,6 @@ pub mod tests {
             commands::WriteCommand, scheduler::DEFAULT_EXECUTION_DURATION_LIMIT, tests::*,
             txn_status_cache::TxnStatusCache,
         },
-        Engine,
     };
 
     pub fn must_success<E: Engine>(
diff --git a/src/storage/txn/commands/check_txn_status.rs b/src/storage/txn/commands/check_txn_status.rs
index a41feff7cd4..f5a3270558d 100644
--- a/src/storage/txn/commands/check_txn_status.rs
+++ b/src/storage/txn/commands/check_txn_status.rs
@@ -4,18 +4,18 @@
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
+    ProcessResult, Snapshot, TxnStatus,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{MvccTxn, SnapshotReader},
     txn::{
+        Result,
         actions::check_txn_status::*,
         commands::{
             Command, CommandExt, ReaderWithStats, ReleasedLocks, ResponsePolicy, TypedCommand,
             WriteCommand, WriteContext, WriteResult,
         },
-        Result,
     },
-    ProcessResult, Snapshot, TxnStatus,
 };
 
 command! {
@@ -179,20 +179,20 @@ pub mod tests {
 
     use super::{TxnStatus::*, *};
     use crate::storage::{
+        ProcessResult, TestEngineBuilder,
         kv::Engine,
         lock_manager::MockLockManager,
         mvcc,
-        mvcc::{tests::*, ErrorInner},
+        mvcc::{ErrorInner, tests::*},
         txn::{
             self,
             actions::acquire_pessimistic_lock::tests::acquire_pessimistic_lock_allow_lock_with_conflict,
-            commands::{pessimistic_rollback, WriteCommand, WriteContext},
+            commands::{WriteCommand, WriteContext, pessimistic_rollback},
             scheduler::DEFAULT_EXECUTION_DURATION_LIMIT,
             tests::*,
             txn_status_cache::TxnStatusCache,
         },
         types::TxnStatus,
-        ProcessResult, TestEngineBuilder,
     };
 
     pub fn must_success<E: Engine>(
@@ -954,7 +954,7 @@ pub mod tests {
             WriteType::Rollback,
         );
 
-        // Rollback when current_ts is u64::max_value()
+        // Rollback when current_ts is u64::MAX
         must_prewrite_put_for_large_txn(&mut engine, k, v, k, ts(270, 0), 100, 0);
         must_large_txn_locked(&mut engine, k, ts(270, 0), 100, ts(270, 1), false);
         must_success(
diff --git a/src/storage/txn/commands/cleanup.rs b/src/storage/txn/commands/cleanup.rs
index fa0b446284b..7a40640d670 100644
--- a/src/storage/txn/commands/cleanup.rs
+++ b/src/storage/txn/commands/cleanup.rs
@@ -4,18 +4,17 @@
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
+    ProcessResult, Snapshot,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{MvccTxn, SnapshotReader},
     txn::{
-        cleanup,
+        Result, cleanup,
         commands::{
             Command, CommandExt, ReaderWithStats, ReleasedLocks, ResponsePolicy, TypedCommand,
             WriteCommand, WriteContext, WriteResult,
         },
-        Result,
     },
-    ProcessResult, Snapshot,
 };
 
 command! {
diff --git a/src/storage/txn/commands/commit.rs b/src/storage/txn/commands/commit.rs
index d0771f294b2..c5ffcacdefa 100644
--- a/src/storage/txn/commands/commit.rs
+++ b/src/storage/txn/commands/commit.rs
@@ -4,17 +4,18 @@
 use txn_types::{CommitRole, Key};
 
 use crate::storage::{
+    ProcessResult, Snapshot, TxnStatus,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{MvccTxn, SnapshotReader},
     txn::{
+        Error, ErrorInner, Result,
         commands::{
             Command, CommandExt, ReaderWithStats, ReleasedLocks, ResponsePolicy, TypedCommand,
             WriteCommand, WriteContext, WriteResult,
         },
-        commit, Error, ErrorInner, Result,
+        commit,
     },
-    ProcessResult, Snapshot, TxnStatus,
 };
 
 command! {
diff --git a/src/storage/txn/commands/compare_and_swap.rs b/src/storage/txn/commands/compare_and_swap.rs
index 72d0077d5a7..c7c9160b2d5 100644
--- a/src/storage/txn/commands/compare_and_swap.rs
+++ b/src/storage/txn/commands/compare_and_swap.rs
@@ -1,25 +1,25 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
 // #[PerformanceCriticalPath]
-use api_version::{match_template_api_version, KvFormat, RawValue};
-use engine_traits::{raw_ttl::ttl_to_expire_ts, CfName};
+use api_version::{KvFormat, RawValue, match_template_api_version};
+use engine_traits::{CfName, raw_ttl::ttl_to_expire_ts};
 use kvproto::kvrpcpb::ApiVersion;
 use raw::RawStore;
 use tikv_kv::Statistics;
 use txn_types::{Key, Value};
 
 use crate::storage::{
+    ProcessResult, Snapshot,
     kv::{Modify, WriteData},
     lock_manager::LockManager,
     raw,
     txn::{
+        Result,
         commands::{
             Command, CommandExt, ReleasedLocks, ResponsePolicy, TypedCommand, WriteCommand,
             WriteContext, WriteResult,
         },
-        Result,
     },
-    ProcessResult, Snapshot,
 };
 
 // TODO: consider add `KvFormat` generic parameter.
@@ -131,7 +131,7 @@ impl<S: Snapshot, L: LockManager> WriteCommand<S, L> for RawCompareAndSwap {
 mod tests {
     use std::sync::Arc;
 
-    use api_version::{test_kv_format_impl, ApiV2};
+    use api_version::{ApiV2, test_kv_format_impl};
     use causal_ts::CausalTsProviderImpl;
     use concurrency_manager::ConcurrencyManager;
     use engine_traits::CF_DEFAULT;
@@ -140,9 +140,9 @@ mod tests {
 
     use super::*;
     use crate::storage::{
+        Engine, Statistics, TestEngineBuilder,
         lock_manager::MockLockManager,
         txn::{scheduler::get_raw_ext, txn_status_cache::TxnStatusCache},
-        Engine, Statistics, TestEngineBuilder,
     };
 
     #[test]
diff --git a/src/storage/txn/commands/flashback_to_version.rs b/src/storage/txn/commands/flashback_to_version.rs
index 132fae9cd73..b41c6a8c865 100644
--- a/src/storage/txn/commands/flashback_to_version.rs
+++ b/src/storage/txn/commands/flashback_to_version.rs
@@ -7,11 +7,13 @@ use tikv_kv::ScanMode;
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
+    ProcessResult, Snapshot,
     kv::WriteData,
     lock_manager::LockManager,
     metrics::{CommandKind, KV_COMMAND_COUNTER_VEC_STATIC},
     mvcc::{MvccReader, MvccTxn},
     txn::{
+        Result,
         actions::flashback_to_version::{
             commit_flashback_key, flashback_to_version_write, prewrite_flashback_key,
             rollback_locks,
@@ -20,9 +22,8 @@ use crate::storage::{
             Command, CommandExt, FlashbackToVersionReadPhase, FlashbackToVersionState,
             ReleasedLocks, ResponsePolicy, TypedCommand, WriteCommand, WriteContext, WriteResult,
         },
-        latch, Result,
+        latch,
     },
-    ProcessResult, Snapshot,
 };
 
 command! {
diff --git a/src/storage/txn/commands/flashback_to_version_read_phase.rs b/src/storage/txn/commands/flashback_to_version_read_phase.rs
index 097a565097b..659092c77d1 100644
--- a/src/storage/txn/commands/flashback_to_version_read_phase.rs
+++ b/src/storage/txn/commands/flashback_to_version_read_phase.rs
@@ -6,18 +6,18 @@ use std::ops::Bound;
 use txn_types::{Key, Lock, TimeStamp};
 
 use crate::storage::{
+    Context, ScanMode, Snapshot, Statistics,
     metrics::{CommandKind, KV_COMMAND_COUNTER_VEC_STATIC},
     mvcc::MvccReader,
     txn::{
+        Error, ErrorInner, Result,
         actions::flashback_to_version::{check_flashback_commit, get_first_user_key},
         commands::{
             Command, CommandExt, FlashbackToVersion, ProcessResult, ReadCommand, TypedCommand,
         },
         flashback_to_version_read_lock, flashback_to_version_read_write,
         sched_pool::tls_collect_keyread_histogram_vec,
-        Error, ErrorInner, Result,
     },
-    Context, ScanMode, Snapshot, Statistics,
 };
 
 #[derive(Debug)]
@@ -143,19 +143,19 @@ impl CommandExt for FlashbackToVersionReadPhase {
 
 /// The whole flashback progress contains four phases:
 ///   1. [PrepareFlashback] RollbackLock phase:
-///     - Scan all locks.
-///     - Rollback all these locks.
+///      - Scan all locks.
+///      - Rollback all these locks.
 ///   2. [PrepareFlashback] Prewrite phase:
-///     - Prewrite the first user key after `self.start_key` specifically to
-///       prevent the `resolved_ts` from advancing.
+///      - Prewrite the first user key after `self.start_key` specifically to
+///        prevent the `resolved_ts` from advancing.
 ///   3. [FinishFlashback] FlashbackWrite phase:
-///     - Scan all the latest writes and their corresponding values at
-///       `self.version`.
-///     - Write the old MVCC version writes again for all these keys with
-///       `self.commit_ts` excluding the first user key after `self.start_key`.
+///      - Scan all the latest writes and their corresponding values at
+///        `self.version`.
+///      - Write the old MVCC version writes again for all these keys with
+///        `self.commit_ts` excluding the first user key after `self.start_key`.
 ///   4. [FinishFlashback] Commit phase:
-///     - Commit the first user key after `self.start_key` we write at the
-///       second phase to finish the flashback.
+///      - Commit the first user key after `self.start_key` we write at the
+///        second phase to finish the flashback.
 impl<S: Snapshot> ReadCommand<S> for FlashbackToVersionReadPhase {
     fn process_read(self, snapshot: S, statistics: &mut Statistics) -> Result<ProcessResult> {
         let tag = self.tag().get_str();
diff --git a/src/storage/txn/commands/flush.rs b/src/storage/txn/commands/flush.rs
index 519786781de..530472fe4ca 100644
--- a/src/storage/txn/commands/flush.rs
+++ b/src/storage/txn/commands/flush.rs
@@ -4,21 +4,21 @@ use std::mem;
 
 use kvproto::kvrpcpb::{AssertionLevel, ExtraOp, PrewriteRequestPessimisticAction};
 // #[PerformanceCriticalPath]
-use txn_types::{insert_old_value_if_resolved, Mutation, OldValues, TimeStamp, TxnExtra};
+use txn_types::{Mutation, OldValues, TimeStamp, TxnExtra, insert_old_value_if_resolved};
 
 use crate::storage::{
+    Command, ProcessResult, Result as StorageResult, Snapshot, TypedCommand,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{MvccTxn, SnapshotReader},
     txn::{
+        CommitKind, Error, ErrorInner, Result, TransactionKind, TransactionProperties,
         actions::{common::check_committed_record_on_err, prewrite::prewrite_with_generation},
         commands::{
             CommandExt, ReaderWithStats, ReleasedLocks, ResponsePolicy, WriteCommand, WriteContext,
             WriteResult,
         },
-        CommitKind, Error, ErrorInner, Result, TransactionKind, TransactionProperties,
     },
-    Command, ProcessResult, Result as StorageResult, Snapshot, TypedCommand,
 };
 
 command! {
@@ -224,20 +224,20 @@ mod tests {
     use txn_types::TimeStamp;
 
     use crate::storage::{
+        ProcessResult, TestEngineBuilder,
         mvcc::{
-            tests::{must_get, must_locked},
             Error as MvccError, ErrorInner as MvccErrorInner,
+            tests::{must_get, must_locked},
         },
         txn,
         txn::{
+            Error, ErrorInner,
             tests::{
                 flush_put_impl, flush_put_impl_with_assertion, must_acquire_pessimistic_lock,
                 must_acquire_pessimistic_lock_err, must_commit, must_flush_put,
                 must_pessimistic_locked, must_prewrite_put, must_prewrite_put_err,
             },
-            Error, ErrorInner,
         },
-        ProcessResult, TestEngineBuilder,
     };
 
     pub fn must_flush_put_with_assertion<E: Engine>(
diff --git a/src/storage/txn/commands/macros.rs b/src/storage/txn/commands/macros.rs
index db7dddff110..356f91d2c9c 100644
--- a/src/storage/txn/commands/macros.rs
+++ b/src/storage/txn/commands/macros.rs
@@ -21,12 +21,12 @@ macro_rules! ctx {
 /// Parameters:
 ///
 /// * cmd -> Used as the type name for the generated struct. A variant of the
-/// enum `storage::txns::commands::Command` must exist whose name matches the
-/// value of `cmd` and which accepts one parameter whose type name matches
-/// the value of `cmd`.
+///   enum `storage::txns::commands::Command` must exist whose name matches the
+///   value of `cmd` and which accepts one parameter whose type name matches the
+///   value of `cmd`.
 /// * cmd_ty -> The type of the result of executing this command.
 /// * display -> Information needed to implement the `Display` trait for the
-/// command.
+///   command.
 /// * content -> The fields of the struct definition for the command.
 /// * in_heap -> The fields that have heap allocation.
 macro_rules! command {
diff --git a/src/storage/txn/commands/mod.rs b/src/storage/txn/commands/mod.rs
index 091c04d96cc..bb9f015514a 100644
--- a/src/storage/txn/commands/mod.rs
+++ b/src/storage/txn/commands/mod.rs
@@ -46,8 +46,8 @@ pub use compare_and_swap::RawCompareAndSwap;
 use concurrency_manager::{ConcurrencyManager, KeyHandleGuard};
 pub use flashback_to_version::FlashbackToVersion;
 pub use flashback_to_version_read_phase::{
-    new_flashback_rollback_lock_cmd, new_flashback_write_cmd, FlashbackToVersionReadPhase,
-    FlashbackToVersionState,
+    FlashbackToVersionReadPhase, FlashbackToVersionState, new_flashback_rollback_lock_cmd,
+    new_flashback_write_cmd,
 };
 pub use flush::Flush;
 use kvproto::kvrpcpb::*;
@@ -56,8 +56,8 @@ pub use mvcc_by_start_ts::MvccByStartTs;
 pub use pause::Pause;
 pub use pessimistic_rollback::PessimisticRollback;
 pub use pessimistic_rollback_read_phase::PessimisticRollbackReadPhase;
-pub use prewrite::{one_pc_commit, Prewrite, PrewritePessimistic};
-pub use resolve_lock::{ResolveLock, RESOLVE_LOCK_BATCH_SIZE};
+pub use prewrite::{Prewrite, PrewritePessimistic, one_pc_commit};
+pub use resolve_lock::{RESOLVE_LOCK_BATCH_SIZE, ResolveLock};
 pub use resolve_lock_lite::ResolveLockLite;
 pub use resolve_lock_readphase::ResolveLockReadPhase;
 pub use rollback::Rollback;
@@ -67,19 +67,19 @@ pub use txn_heart_beat::TxnHeartBeat;
 use txn_types::{CommitRole as TxnCommitRole, Key, TimeStamp};
 
 use crate::storage::{
+    Result as StorageResult, Snapshot, Statistics,
     kv::WriteData,
     lock_manager::{
-        self, lock_wait_context::LockWaitContextSharedState, LockManager, LockWaitToken,
-        WaitTimeout,
+        self, LockManager, LockWaitToken, WaitTimeout,
+        lock_wait_context::LockWaitContextSharedState,
     },
     metrics,
     mvcc::{ReleasedLock, SnapshotReader},
-    txn::{latch, txn_status_cache::TxnStatusCache, ProcessResult, Result},
+    txn::{ProcessResult, Result, latch, txn_status_cache::TxnStatusCache},
     types::{
         MvccInfo, PessimisticLockParameters, PessimisticLockResults, PrewriteResult,
         SecondaryLocksStatus, StorageCallbackType, TxnStatus,
     },
-    Result as StorageResult, Snapshot, Statistics,
 };
 
 /// Store Transaction scheduler commands.
@@ -122,20 +122,20 @@ pub enum Command {
 /// converted to this type via a series of transformations. That process is
 /// described below using `CommitRequest` as an example:
 /// 1. A `CommitRequest` is handled by the `future_commit` method in kv.rs,
-/// where it needs to be transformed to a `TypedCommand` before being passed to
-/// the `storage.sched_txn_command` method.
+///    where it needs to be transformed to a `TypedCommand` before being passed
+///    to the `storage.sched_txn_command` method.
 /// 2. The `From<CommitRequest>` impl for `TypedCommand` gets chosen, and its
-/// generic parameter indicates that the result type for this instance of
-/// `TypedCommand` is going to be `TxnStatus` - one of the variants of the
-/// `StorageCallback` enum.
-/// 3. In the above `from` method, the details of the
-/// commit request are captured by creating an instance of the struct
-/// `storage::txn::commands::commit::Command` via its `new` method.
+///    generic parameter indicates that the result type for this instance of
+///    `TypedCommand` is going to be `TxnStatus` - one of the variants of the
+///    `StorageCallback` enum.
+/// 3. In the above `from` method, the details of the commit request are
+///    captured by creating an instance of the struct
+///    `storage::txn::commands::commit::Command` via its `new` method.
 /// 4. This struct is wrapped in a variant of the enum
-/// `storage::txn::commands::Command`. This enum exists to facilitate generic
-/// operations over different commands. 5. Finally, the `Command` enum variant
-/// for `Commit` is converted to the `TypedCommand` using the `From<Command>`
-/// impl for `TypedCommand`.
+///    `storage::txn::commands::Command`. This enum exists to facilitate generic
+///    operations over different commands. 5. Finally, the `Command` enum
+///    variant for `Commit` is converted to the `TypedCommand` using the
+///    `From<Command>` impl for `TypedCommand`.
 ///
 /// For other requests, see the corresponding `future_` method, the `From` trait
 /// implementation and so on.
@@ -629,7 +629,7 @@ impl<'a, S: Snapshot> ReaderWithStats<'a, S> {
     }
 }
 
-impl<'a, S: Snapshot> Deref for ReaderWithStats<'a, S> {
+impl<S: Snapshot> Deref for ReaderWithStats<'_, S> {
     type Target = SnapshotReader<S>;
 
     fn deref(&self) -> &Self::Target {
@@ -637,13 +637,13 @@ impl<'a, S: Snapshot> Deref for ReaderWithStats<'a, S> {
     }
 }
 
-impl<'a, S: Snapshot> DerefMut for ReaderWithStats<'a, S> {
+impl<S: Snapshot> DerefMut for ReaderWithStats<'_, S> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.reader
     }
 }
 
-impl<'a, S: Snapshot> Drop for ReaderWithStats<'a, S> {
+impl<S: Snapshot> Drop for ReaderWithStats<'_, S> {
     fn drop(&mut self) {
         self.statistics.add(&self.reader.take_statistics())
     }
@@ -882,9 +882,9 @@ pub mod test_util {
 
     use super::*;
     use crate::storage::{
+        Engine, MockLockManager,
         mvcc::{Error as MvccError, ErrorInner as MvccErrorInner},
         txn::{Error, ErrorInner, Result},
-        Engine, MockLockManager,
     };
 
     // Some utils for tests that may be used in multiple source code files.
diff --git a/src/storage/txn/commands/mvcc_by_key.rs b/src/storage/txn/commands/mvcc_by_key.rs
index 868e068a548..405eca11e9e 100644
--- a/src/storage/txn/commands/mvcc_by_key.rs
+++ b/src/storage/txn/commands/mvcc_by_key.rs
@@ -4,14 +4,14 @@
 use txn_types::Key;
 
 use crate::storage::{
+    Snapshot, Statistics,
     mvcc::MvccReader,
     txn::{
+        ProcessResult, Result,
         actions::mvcc::find_mvcc_infos_by_key,
         commands::{Command, CommandExt, ReadCommand, TypedCommand},
-        ProcessResult, Result,
     },
     types::MvccInfo,
-    Snapshot, Statistics,
 };
 
 command! {
diff --git a/src/storage/txn/commands/mvcc_by_start_ts.rs b/src/storage/txn/commands/mvcc_by_start_ts.rs
index 98e60170e4c..c437984097b 100644
--- a/src/storage/txn/commands/mvcc_by_start_ts.rs
+++ b/src/storage/txn/commands/mvcc_by_start_ts.rs
@@ -4,14 +4,14 @@
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
+    ScanMode, Snapshot, Statistics,
     mvcc::MvccReader,
     txn::{
+        ProcessResult, Result,
         actions::mvcc::find_mvcc_infos_by_key,
         commands::{Command, CommandExt, ReadCommand, TypedCommand},
-        ProcessResult, Result,
     },
     types::MvccInfo,
-    ScanMode, Snapshot, Statistics,
 };
 
 command! {
diff --git a/src/storage/txn/commands/pause.rs b/src/storage/txn/commands/pause.rs
index 060529ba8f1..056bef6a3d9 100644
--- a/src/storage/txn/commands/pause.rs
+++ b/src/storage/txn/commands/pause.rs
@@ -6,16 +6,16 @@ use std::{thread, time::Duration};
 use txn_types::Key;
 
 use crate::storage::{
+    ProcessResult, Snapshot,
     kv::WriteData,
     lock_manager::LockManager,
     txn::{
+        Result,
         commands::{
             Command, CommandExt, ReleasedLocks, ResponsePolicy, TypedCommand, WriteCommand,
             WriteContext, WriteResult,
         },
-        Result,
     },
-    ProcessResult, Snapshot,
 };
 
 command! {
diff --git a/src/storage/txn/commands/pessimistic_rollback.rs b/src/storage/txn/commands/pessimistic_rollback.rs
index 77e9beeb06a..76aaec93f97 100644
--- a/src/storage/txn/commands/pessimistic_rollback.rs
+++ b/src/storage/txn/commands/pessimistic_rollback.rs
@@ -6,17 +6,17 @@ use std::mem;
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
+    ProcessResult, Result as StorageResult, Snapshot,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{MvccTxn, Result as MvccResult, SnapshotReader},
     txn::{
+        Result,
         commands::{
             Command, CommandExt, PessimisticRollbackReadPhase, ReaderWithStats, ReleasedLocks,
             ResponsePolicy, TypedCommand, WriteCommand, WriteContext, WriteResult,
         },
-        Result,
     },
-    ProcessResult, Result as StorageResult, Snapshot,
 };
 
 command! {
@@ -136,6 +136,7 @@ pub mod tests {
 
     use super::*;
     use crate::storage::{
+        TestEngineBuilder,
         kv::Engine,
         lock_manager::MockLockManager,
         mvcc::tests::*,
@@ -145,7 +146,6 @@ pub mod tests {
             tests::*,
             txn_status_cache::TxnStatusCache,
         },
-        TestEngineBuilder,
     };
 
     pub fn must_success<E: Engine>(
diff --git a/src/storage/txn/commands/pessimistic_rollback_read_phase.rs b/src/storage/txn/commands/pessimistic_rollback_read_phase.rs
index 9e07b04b538..f2acbb6d411 100644
--- a/src/storage/txn/commands/pessimistic_rollback_read_phase.rs
+++ b/src/storage/txn/commands/pessimistic_rollback_read_phase.rs
@@ -4,14 +4,14 @@
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
-    mvcc::{metrics::ScanLockReadTimeSource::pessimistic_rollback, MvccReader},
+    ScanMode, Snapshot, Statistics,
+    mvcc::{MvccReader, metrics::ScanLockReadTimeSource::pessimistic_rollback},
     txn,
     txn::{
+        ProcessResult, RESOLVE_LOCK_BATCH_SIZE, Result, StorageResult,
         commands::{Command, CommandExt, PessimisticRollback, ReadCommand, TypedCommand},
         sched_pool::tls_collect_keyread_histogram_vec,
-        ProcessResult, Result, StorageResult, RESOLVE_LOCK_BATCH_SIZE,
     },
-    ScanMode, Snapshot, Statistics,
 };
 command! {
     PessimisticRollbackReadPhase:
diff --git a/src/storage/txn/commands/prewrite.rs b/src/storage/txn/commands/prewrite.rs
index 83b27af9c24..bb2847198cb 100644
--- a/src/storage/txn/commands/prewrite.rs
+++ b/src/storage/txn/commands/prewrite.rs
@@ -15,30 +15,30 @@ use kvproto::kvrpcpb::{
 };
 use tikv_kv::SnapshotExt;
 use txn_types::{
-    insert_old_value_if_resolved, Key, Mutation, OldValues, TimeStamp, TxnExtra, Write, WriteType,
+    Key, Mutation, OldValues, TimeStamp, TxnExtra, Write, WriteType, insert_old_value_if_resolved,
 };
 
 use super::ReaderWithStats;
 use crate::storage::{
+    Context, Error as StorageError, ProcessResult, Snapshot,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{
-        has_data_in_range, metrics::*, Error as MvccError, ErrorInner as MvccErrorInner, MvccTxn,
-        SnapshotReader,
+        Error as MvccError, ErrorInner as MvccErrorInner, MvccTxn, SnapshotReader,
+        has_data_in_range, metrics::*,
     },
     txn::{
+        Error, ErrorInner, Result,
         actions::{
             common::check_committed_record_on_err,
-            prewrite::{prewrite, CommitKind, TransactionKind, TransactionProperties},
+            prewrite::{CommitKind, TransactionKind, TransactionProperties, prewrite},
         },
         commands::{
             Command, CommandExt, ReleasedLocks, ResponsePolicy, TypedCommand, WriteCommand,
             WriteContext, WriteResult,
         },
-        Error, ErrorInner, Result,
     },
     types::PrewriteResult,
-    Context, Error as StorageError, ProcessResult, Snapshot,
 };
 
 pub(crate) const FORWARD_MIN_MUTATIONS_NUM: usize = 12;
@@ -1007,8 +1007,10 @@ mod tests {
 
     use super::*;
     use crate::storage::{
-        mvcc::{tests::*, Error as MvccError, ErrorInner as MvccErrorInner},
+        Engine, MockLockManager, Snapshot, Statistics, TestEngineBuilder,
+        mvcc::{Error as MvccError, ErrorInner as MvccErrorInner, tests::*},
         txn::{
+            Error, ErrorInner,
             actions::{
                 acquire_pessimistic_lock::tests::must_pessimistic_locked,
                 tests::{
@@ -1028,10 +1030,8 @@ mod tests {
                 must_prewrite_put_err_impl, must_prewrite_put_impl, must_rollback,
             },
             txn_status_cache::TxnStatusCache,
-            Error, ErrorInner,
         },
         types::TxnStatus,
-        Engine, MockLockManager, Snapshot, Statistics, TestEngineBuilder,
     };
 
     fn inner_test_prewrite_skip_constraint_check(pri_key_number: u8, write_num: usize) {
@@ -1154,7 +1154,7 @@ mod tests {
 
     #[test]
     fn test_prewrite_skip_too_many_tombstone() {
-        use engine_rocks::{set_perf_level, PerfLevel};
+        use engine_rocks::{PerfLevel, set_perf_level};
 
         use crate::server::gc_worker::gc_by_compact;
         let mut mutations = Vec::default();
@@ -1631,7 +1631,7 @@ mod tests {
         use engine_traits::{IterOptions, ReadOptions};
         use kvproto::kvrpcpb::ExtraOp;
 
-        use crate::storage::{kv::Result, CfName, ConcurrencyManager, MockLockManager, Value};
+        use crate::storage::{CfName, ConcurrencyManager, MockLockManager, Value, kv::Result};
         #[derive(Clone)]
         struct MockSnapshot;
 
diff --git a/src/storage/txn/commands/resolve_lock.rs b/src/storage/txn/commands/resolve_lock.rs
index 22c5f3608d5..d543975284b 100644
--- a/src/storage/txn/commands/resolve_lock.rs
+++ b/src/storage/txn/commands/resolve_lock.rs
@@ -5,21 +5,21 @@ use collections::HashMap;
 use txn_types::{Key, Lock, TimeStamp};
 
 use crate::storage::{
+    ProcessResult, Snapshot,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{
-        Error as MvccError, ErrorInner as MvccErrorInner, MvccTxn, SnapshotReader,
-        MAX_TXN_WRITE_SIZE,
+        Error as MvccError, ErrorInner as MvccErrorInner, MAX_TXN_WRITE_SIZE, MvccTxn,
+        SnapshotReader,
     },
     txn::{
-        cleanup,
+        Error, ErrorInner, Result, cleanup,
         commands::{
             Command, CommandExt, ReaderWithStats, ReleasedLocks, ResolveLockReadPhase,
             ResponsePolicy, TypedCommand, WriteCommand, WriteContext, WriteResult,
         },
-        commit, Error, ErrorInner, Result,
+        commit,
     },
-    ProcessResult, Snapshot,
 };
 
 command! {
diff --git a/src/storage/txn/commands/resolve_lock_lite.rs b/src/storage/txn/commands/resolve_lock_lite.rs
index 3c7032a328d..974887ae740 100644
--- a/src/storage/txn/commands/resolve_lock_lite.rs
+++ b/src/storage/txn/commands/resolve_lock_lite.rs
@@ -4,18 +4,18 @@
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
+    ProcessResult, Snapshot,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{MvccTxn, SnapshotReader},
     txn::{
-        cleanup,
+        Result, cleanup,
         commands::{
             Command, CommandExt, ReaderWithStats, ReleasedLocks, ResponsePolicy, TypedCommand,
             WriteCommand, WriteContext, WriteResult,
         },
-        commit, Result,
+        commit,
     },
-    ProcessResult, Snapshot,
 };
 
 command! {
diff --git a/src/storage/txn/commands/resolve_lock_readphase.rs b/src/storage/txn/commands/resolve_lock_readphase.rs
index c005ff08bf3..d28411f0f54 100644
--- a/src/storage/txn/commands/resolve_lock_readphase.rs
+++ b/src/storage/txn/commands/resolve_lock_readphase.rs
@@ -5,13 +5,13 @@ use collections::HashMap;
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
+    ScanMode, Snapshot, Statistics,
     mvcc::MvccReader,
     txn::{
+        ProcessResult, RESOLVE_LOCK_BATCH_SIZE, Result,
         commands::{Command, CommandExt, ReadCommand, ResolveLock, TypedCommand},
         sched_pool::tls_collect_keyread_histogram_vec,
-        ProcessResult, Result, RESOLVE_LOCK_BATCH_SIZE,
     },
-    ScanMode, Snapshot, Statistics,
 };
 
 command! {
diff --git a/src/storage/txn/commands/rollback.rs b/src/storage/txn/commands/rollback.rs
index 8f845ad57eb..9e73097ea8e 100644
--- a/src/storage/txn/commands/rollback.rs
+++ b/src/storage/txn/commands/rollback.rs
@@ -4,18 +4,17 @@
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
+    ProcessResult, Snapshot,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{MvccTxn, SnapshotReader},
     txn::{
-        cleanup,
+        Result, cleanup,
         commands::{
             Command, CommandExt, ReaderWithStats, ReleasedLocks, ResponsePolicy, TypedCommand,
             WriteCommand, WriteContext, WriteResult,
         },
-        Result,
     },
-    ProcessResult, Snapshot,
 };
 
 command! {
@@ -86,7 +85,7 @@ impl<S: Snapshot, L: LockManager> WriteCommand<S, L> for Rollback {
 mod tests {
     use kvproto::kvrpcpb::PrewriteRequestPessimisticAction::*;
 
-    use crate::storage::{txn::tests::*, TestEngineBuilder};
+    use crate::storage::{TestEngineBuilder, txn::tests::*};
 
     #[test]
     fn rollback_lock_with_existing_rollback() {
diff --git a/src/storage/txn/commands/txn_heart_beat.rs b/src/storage/txn/commands/txn_heart_beat.rs
index a41492d7020..abd61ca75bb 100644
--- a/src/storage/txn/commands/txn_heart_beat.rs
+++ b/src/storage/txn/commands/txn_heart_beat.rs
@@ -4,17 +4,17 @@
 use txn_types::{Key, TimeStamp};
 
 use crate::storage::{
+    ProcessResult, Snapshot, TxnStatus,
     kv::WriteData,
     lock_manager::LockManager,
     mvcc::{Error as MvccError, ErrorInner as MvccErrorInner, MvccTxn, SnapshotReader},
     txn::{
+        Result,
         commands::{
             Command, CommandExt, ReaderWithStats, ReleasedLocks, ResponsePolicy, TypedCommand,
             WriteCommand, WriteContext, WriteResult,
         },
-        Result,
     },
-    ProcessResult, Snapshot, TxnStatus,
 };
 
 command! {
@@ -137,6 +137,7 @@ pub mod tests {
 
     use super::*;
     use crate::storage::{
+        Engine,
         kv::TestEngineBuilder,
         lock_manager::MockLockManager,
         mvcc::tests::*,
@@ -144,7 +145,6 @@ pub mod tests {
             commands::WriteCommand, scheduler::DEFAULT_EXECUTION_DURATION_LIMIT, tests::*,
             txn_status_cache::TxnStatusCache,
         },
-        Engine,
     };
 
     pub fn must_success<E: Engine>(
diff --git a/src/storage/txn/flow_controller/singleton_flow_controller.rs b/src/storage/txn/flow_controller/singleton_flow_controller.rs
index 54f568cf444..fecc33c2464 100644
--- a/src/storage/txn/flow_controller/singleton_flow_controller.rs
+++ b/src/storage/txn/flow_controller/singleton_flow_controller.rs
@@ -3,13 +3,12 @@
 // #[PerformanceCriticalPath]
 use std::{
     sync::{
+        Arc,
         atomic::{AtomicU32, Ordering},
         mpsc::{self, Receiver, RecvTimeoutError, SyncSender},
-        Arc,
     },
     thread::{Builder, JoinHandle},
     time::Duration,
-    u64,
 };
 
 use collections::HashMap;
@@ -20,7 +19,7 @@ use online_config::{ConfigChange, OnlineConfig};
 use rand::Rng;
 use tikv_util::{
     config::VersionTrack,
-    smoother::{Smoother, Trend, SMOOTHER_STALE_RECORD_THRESHOLD, SMOOTHER_TIME_RANGE_THRESHOLD},
+    smoother::{SMOOTHER_STALE_RECORD_THRESHOLD, SMOOTHER_TIME_RANGE_THRESHOLD, Smoother, Trend},
     sys::thread::StdThreadBuildWrapper,
     time::{Instant, Limiter},
 };
@@ -50,7 +49,7 @@ const EMA_FACTOR: f64 = 0.6; // EMA stands for Exponential Moving Average
 /// Also, it decreases the delayed write rate further if the factors still
 /// exceed the threshold. So under heavy write load, the write rate may be
 /// throttled to a very low rate from time to time, causing QPS drop eventually.
-
+///
 /// For compaction pending bytes, we use discardable ratio to do flow control
 /// which is separated mechanism from throttle speed. Compaction pending bytes
 /// is a approximate value, usually, changes up and down dramatically, so it's
@@ -115,6 +114,16 @@ impl EngineFlowController {
         let limiter = Arc::new(
             <Limiter>::builder(f64::INFINITY)
                 .refill(Duration::from_millis(1))
+                // `min_wait` is used in the `consume_duration` method of `Limiter`. The final delay
+                // duration is calculated in the `consume` method of `Bucket`. The formula is:
+                //     self.min_wait - self.value / self.speed_limit.
+                // where `self.value`` represents the current byte quota for write operations; it is
+                // initialized to the maximum allowed value and is decreased by the size of each 
+                // write. When the value becomes negative, write requests will be delayed.
+                // 
+                // By setting min_wait to 1, we can ensure flow control more smooth while avoid the
+                // overhead caused by many short sleep calls.
+                .min_wait(Duration::from_millis(1))
                 .build(),
         );
         let discard_ratio = Arc::new(AtomicU32::new(0));
@@ -442,22 +451,41 @@ impl<E: FlowControlFactorStore + Send + 'static> FlowChecker<E> {
                     if let Some(before) = cf_checker.pending_bytes_before_unsafe_destroy_range {
                         let soft =
                             (current_cfg.soft_pending_compaction_bytes_limit.0 as f64).log2();
-                        let after = (self.engine.pending_compaction_bytes(self.region_id, cf)
-                            as f64)
-                            .log2();
+                        let current_pending_bytes =
+                            (self.engine.pending_compaction_bytes(self.region_id, cf) as f64)
+                                .log2();
+
+                        let avg_pending_bytes = if let Some(long_term_pending_bytes) =
+                            cf_checker.long_term_pending_bytes.as_ref()
+                        {
+                            long_term_pending_bytes.get_avg()
+                        } else {
+                            current_pending_bytes
+                        };
 
                         assert!(before < soft);
-                        if after >= soft {
-                            // there is a pending bytes jump
+                        if current_pending_bytes >= soft || avg_pending_bytes >= soft {
+                            // There is a pending bytes jump. Flow control for
+                            // compaction bytes won't be re-enabled until the
+                            // pending bytes drop below the soft limit.
                             SCHED_THROTTLE_ACTION_COUNTER
                                 .with_label_values(&[cf, "pending_bytes_jump"])
                                 .inc();
+                        } else {
+                            cf_checker.pending_bytes_before_unsafe_destroy_range = None;
+                            info!(
+                                "re-enabled compaction pending bytes flow control";
+                                "cf" => cf,
+                            );
                         }
+
                         info!(
                             "after unsafe destroy range";
                             "cf" => cf,
                             "before" => before,
-                            "after" => after
+                            "current_pending_bytes" => current_pending_bytes,
+                            "avg_pending_bytes" => avg_pending_bytes,
+                            "soft_limit" => soft,
                         );
                     }
                 }
@@ -1264,4 +1292,46 @@ pub(super) mod tests {
         send_flow_info(&tx, region_id);
         assert!(flow_controller.discard_ratio(region_id) > f64::EPSILON);
     }
+
+    #[test]
+    fn test_flow_controller_pending_compaction_bytes_no_jump_control() {
+        let region_id = 0;
+        let stub = EngineStub::new();
+        let (tx, rx) = mpsc::sync_channel(0);
+        let flow_controller =
+            EngineFlowController::new(&FlowControlConfig::default(), stub.clone(), rx);
+        let flow_controller = FlowController::Singleton(flow_controller);
+
+        // Before unsafe destroy range, pending compaction bytes is 0.
+        stub.0.pending_compaction_bytes.store(0, Ordering::Relaxed);
+        send_flow_info(&tx, region_id);
+        assert!(flow_controller.discard_ratio(region_id) < f64::EPSILON);
+        tx.send(FlowInfo::BeforeUnsafeDestroyRange(region_id))
+            .unwrap();
+        assert!(flow_controller.discard_ratio(region_id) < f64::EPSILON);
+
+        // After unsafe destroy range, pending compaction bytes did not reach
+        // the threshold, so jump control should not be triggered.
+        stub.0
+            .pending_compaction_bytes
+            .store(1024 * 1024 * 1024, Ordering::Relaxed);
+        send_flow_info(&tx, region_id);
+        tx.send(FlowInfo::AfterUnsafeDestroyRange(region_id))
+            .unwrap();
+        assert!(flow_controller.discard_ratio(region_id) < f64::EPSILON);
+        // sleep a while to wait for the above message to be processed.
+        std::thread::sleep(Duration::from_millis(100));
+
+        // If pending_compaction_bytes increases and exceeds the threshold,
+        // should perform throttle.
+        stub.0
+            .pending_compaction_bytes
+            .store(1000000000 * 1024 * 1024 * 1024, Ordering::Relaxed);
+        // call `send_flow_info` multiple times to bring up the average pending
+        // compaction bytes.
+        send_flow_info(&tx, region_id);
+        send_flow_info(&tx, region_id);
+        send_flow_info(&tx, region_id);
+        assert!(flow_controller.discard_ratio(region_id) > f64::EPSILON);
+    }
 }
diff --git a/src/storage/txn/flow_controller/tablet_flow_controller.rs b/src/storage/txn/flow_controller/tablet_flow_controller.rs
index ee6fdb02bbc..07f57d9c81e 100644
--- a/src/storage/txn/flow_controller/tablet_flow_controller.rs
+++ b/src/storage/txn/flow_controller/tablet_flow_controller.rs
@@ -3,9 +3,9 @@
 // #[PerformanceCriticalPath]
 use std::{
     sync::{
+        Arc, RwLock,
         atomic::{AtomicU32, Ordering},
         mpsc::{self, Receiver, RecvTimeoutError, SyncSender},
-        Arc, RwLock,
     },
     thread::{Builder, JoinHandle},
     time::Duration,
@@ -13,7 +13,7 @@ use std::{
 
 use collections::{HashMap, HashMapEntry};
 use engine_rocks::FlowInfo;
-use engine_traits::{CfNamesExt, FlowControlFactorsExt, TabletRegistry, DATA_CFS};
+use engine_traits::{CfNamesExt, DATA_CFS, FlowControlFactorsExt, TabletRegistry};
 use online_config::{ConfigChange, OnlineConfig};
 use rand::Rng;
 use tikv_util::{config::VersionTrack, sys::thread::StdThreadBuildWrapper, time::Limiter};
@@ -446,7 +446,7 @@ mod tests {
     use tempfile::TempDir;
 
     use super::{
-        super::{singleton_flow_controller::tests::*, FlowController},
+        super::{FlowController, singleton_flow_controller::tests::*},
         *,
     };
 
diff --git a/src/storage/txn/latch.rs b/src/storage/txn/latch.rs
index 5c6000961f1..9495c449466 100644
--- a/src/storage/txn/latch.rs
+++ b/src/storage/txn/latch.rs
@@ -2,9 +2,8 @@
 
 // #[PerformanceCriticalPath]
 use std::{
-    collections::{hash_map::DefaultHasher, VecDeque},
+    collections::{VecDeque, hash_map::DefaultHasher},
     hash::{Hash, Hasher},
-    usize,
 };
 
 use crossbeam::utils::CachePadded;
diff --git a/src/storage/txn/mod.rs b/src/storage/txn/mod.rs
index cd1368ae0e9..e2840f3a9cc 100644
--- a/src/storage/txn/mod.rs
+++ b/src/storage/txn/mod.rs
@@ -27,11 +27,11 @@ pub use self::{
         cleanup::cleanup,
         commit::commit,
         flashback_to_version::{
-            flashback_to_version_read_lock, flashback_to_version_read_write,
-            flashback_to_version_write, rollback_locks, FLASHBACK_BATCH_SIZE,
+            FLASHBACK_BATCH_SIZE, flashback_to_version_read_lock, flashback_to_version_read_write,
+            flashback_to_version_write, rollback_locks,
         },
         gc::gc,
-        prewrite::{prewrite, CommitKind, TransactionKind, TransactionProperties},
+        prewrite::{CommitKind, TransactionKind, TransactionProperties, prewrite},
     },
     commands::{Command, RESOLVE_LOCK_BATCH_SIZE},
     latch::{Latches, Lock},
@@ -42,9 +42,9 @@ pub use self::{
     },
 };
 use crate::storage::{
+    Error as StorageError, Result as StorageResult,
     mvcc::Error as MvccError,
     types::{MvccInfo, PessimisticLockResults, PrewriteResult, SecondaryLocksStatus, TxnStatus},
-    Error as StorageError, Result as StorageResult,
 };
 
 /// Process result of a command.
diff --git a/src/storage/txn/sched_pool.rs b/src/storage/txn/sched_pool.rs
index 6881dfebe42..afbc81b25bc 100644
--- a/src/storage/txn/sched_pool.rs
+++ b/src/storage/txn/sched_pool.rs
@@ -7,13 +7,13 @@ use std::{
 };
 
 use collections::HashMap;
-use file_system::{set_io_type, IoType};
+use file_system::{IoType, set_io_type};
 use kvproto::{kvrpcpb::CommandPri, pdpb::QueryKind};
 use pd_client::{Feature, FeatureGate};
 use prometheus::local::*;
 use raftstore::store::WriteStats;
 use resource_control::{
-    with_resource_limiter, ControlledFuture, ResourceController, ResourceGroupManager, TaskMetadata,
+    ControlledFuture, ResourceController, ResourceGroupManager, TaskMetadata, with_resource_limiter,
 };
 use tikv_util::{
     sys::SysQuota,
@@ -22,7 +22,7 @@ use tikv_util::{
 use yatp::queue::Extras;
 
 use crate::storage::{
-    kv::{destroy_tls_engine, set_tls_engine, Engine, FlowStatsReporter, Statistics},
+    kv::{Engine, FlowStatsReporter, Statistics, destroy_tls_engine, set_tls_engine},
     metrics::*,
     test_util::latest_feature_gate,
 };
diff --git a/src/storage/txn/scheduler.rs b/src/storage/txn/scheduler.rs
index b19c9d571c0..7269b23d299 100644
--- a/src/storage/txn/scheduler.rs
+++ b/src/storage/txn/scheduler.rs
@@ -27,11 +27,10 @@ use std::{
     marker::PhantomData,
     mem,
     sync::{
-        atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
     },
     time::Duration,
-    u64,
 };
 
 use causal_ts::CausalTsProviderImpl;
@@ -39,7 +38,7 @@ use collections::HashMap;
 use concurrency_manager::{ConcurrencyManager, KeyHandleGuard};
 use crossbeam::utils::CachePadded;
 use engine_traits::{CF_DEFAULT, CF_LOCK, CF_WRITE};
-use futures::{compat::Future01CompatExt, FutureExt as _, StreamExt};
+use futures::{FutureExt as _, StreamExt, compat::Future01CompatExt};
 use kvproto::{
     kvrpcpb::{self, CommandPri, Context, DiskFullOpt},
     pdpb::QueryKind,
@@ -48,50 +47,51 @@ use parking_lot::{Mutex, MutexGuard, RwLockWriteGuard};
 use pd_client::{Feature, FeatureGate};
 use raftstore::store::TxnExt;
 use resource_control::{ResourceController, ResourceGroupManager, TaskMetadata};
-use resource_metering::{FutureExt, ResourceTagFactory};
-use smallvec::{smallvec, SmallVec};
+use resource_metering::{
+    FutureExt, ResourceTagFactory, record_logical_read_bytes, record_logical_write_bytes,
+    record_network_in_bytes,
+};
+use smallvec::{SmallVec, smallvec};
 use tikv_kv::{Modify, Snapshot, SnapshotExt, WriteData, WriteEvent};
 use tikv_util::{
     memory::MemoryQuota, quota_limiter::QuotaLimiter, time::Instant, timer::GLOBAL_TIMER_HANDLE,
 };
-use tracker::{set_tls_tracker_token, track, TrackerToken, TrackerTokenArray, GLOBAL_TRACKERS};
+use tracker::{GLOBAL_TRACKERS, TrackerToken, TrackerTokenArray, set_tls_tracker_token, track};
 use txn_types::TimeStamp;
 
 use super::task::Task;
 use crate::{
     server::lock_manager::waiter_manager,
     storage::{
+        DynamicConfigs, Error as StorageError, ErrorInner as StorageErrorInner,
+        PessimisticLockKeyResult, PessimisticLockResults,
         config::Config,
         errors::SharedError,
         get_causal_ts, get_priority_tag, get_raw_key_guard,
         kv::{
-            self, with_tls_engine, Engine, FlowStatsReporter, Result as EngineResult, SnapContext,
-            Statistics,
+            self, Engine, FlowStatsReporter, Result as EngineResult, SnapContext, Statistics,
+            with_tls_engine,
         },
         lock_manager::{
-            self,
+            self, DiagnosticContext, LockManager, LockWaitToken,
             lock_wait_context::{LockWaitContext, PessimisticLockKeyCallback},
             lock_waiting_queue::{DelayedNotifyAllFuture, LockWaitEntry, LockWaitQueues},
-            DiagnosticContext, LockManager, LockWaitToken,
         },
         metrics::*,
         mvcc::{Error as MvccError, ErrorInner as MvccErrorInner, ReleasedLock},
         txn::{
-            commands,
+            Error, ErrorInner, ProcessResult, commands,
             commands::{
                 Command, RawExt, ReleasedLocks, ResponsePolicy, WriteContext, WriteResult,
                 WriteResultLockInfo,
             },
             flow_controller::FlowController,
             latch::{Latches, Lock},
-            sched_pool::{tls_collect_query, tls_collect_scan_details, SchedPool},
+            sched_pool::{SchedPool, tls_collect_query, tls_collect_scan_details},
             tracker::TlsFutureTracker,
             txn_status_cache::TxnStatusCache,
-            Error, ErrorInner, ProcessResult,
         },
         types::StorageCallback,
-        DynamicConfigs, Error as StorageError, ErrorInner as StorageErrorInner,
-        PessimisticLockKeyResult, PessimisticLockResults,
     },
     tikv_util::time::InstantExt,
 };
@@ -323,7 +323,6 @@ impl<L: LockManager> TxnSchedulerInner<L> {
 
     fn dequeue_task_context(&self, cid: u64) -> TaskContext {
         let tctx = self.get_task_slot(cid).remove(&cid).unwrap();
-
         let running_write_bytes = self
             .running_write_bytes
             .fetch_sub(tctx.write_bytes, Ordering::AcqRel) as i64;
@@ -1244,9 +1243,15 @@ impl<E: Engine, L: LockManager> TxnScheduler<E, L> {
             }
 
             fail_point!("scheduler_process");
+            GLOBAL_TRACKERS.with_tracker(task.tracker_token(), |tracker| {
+                record_network_in_bytes(tracker.metrics.grpc_req_size);
+            });
+
             if task.cmd().readonly() {
                 self.process_read(snapshot, task, &mut sched_details);
+                record_logical_read_bytes(sched_details.stat.processed_size as u64);
             } else {
+                record_logical_write_bytes(task.cmd().write_bytes() as u64);
                 self.process_write(snapshot, task, &mut sched_details).await;
             };
             tls_collect_scan_details(tag.get_str(), &sched_details.stat);
@@ -1815,6 +1820,11 @@ impl<E: Engine, L: LockManager> TxnScheduler<E, L> {
         fail_point!("txn_before_process_write");
         let cid = task.cid();
         let tag = task.cmd().tag();
+        let task_cmd_str = if txn_types::ENABLE_DUP_KEY_DEBUG.load(Ordering::Relaxed) {
+            task.cmd().to_string()
+        } else {
+            String::default()
+        };
         let tracker_token = task.tracker_token();
         let mut task_meta_data = TaskMetadata::from_ctx(task.cmd().resource_control_ctx());
         let pipelined = task.cmd().can_be_pipelined()
@@ -1842,6 +1852,55 @@ impl<E: Engine, L: LockManager> TxnScheduler<E, L> {
             // `WriteFinished` message when it finishes.
             Ok(res) => res,
         };
+
+        // TODO: remove this check when the cause of issue 18498 is located.
+        if txn_types::ENABLE_DUP_KEY_DEBUG.load(Ordering::Relaxed)
+            && !write_result.to_be_write.modifies.is_empty()
+        {
+            let mut seen_keys =
+                std::collections::HashMap::<txn_types::Key, txn_types::Value>::new();
+            for modify in &write_result.to_be_write.modifies {
+                if let Modify::Put(cf, key, value) = modify {
+                    if *cf == CF_LOCK {
+                        let entry = seen_keys.entry(key.clone());
+                        match entry {
+                            std::collections::hash_map::Entry::Vacant(e) => {
+                                e.insert(value.clone());
+                            }
+                            std::collections::hash_map::Entry::Occupied(e) => {
+                                let existing_value = e.get();
+                                error!(
+                                    "[for debug] found duplicate key in CF_LOCK PUT";
+                                    "key" => ?key,
+                                    "existing_value" => ?existing_value,
+                                    "new_value" => ?value,
+                                    "tag" => ?tag,
+                                    "txn_ext" => ?txn_ext,
+                                    "task_cmd_str" => ?task_cmd_str,
+                                );
+
+                                fail_point!("scheduler_dup_key_check", |_| {
+                                    self.finish_with_err(
+                                        cid,
+                                        StorageErrorInner::Other(Box::from(
+                                            "dup_key_found_with_fp",
+                                        )),
+                                        Some(sched_details),
+                                    );
+                                });
+                                // TODO: remove this in production or new release.
+                                panic!(
+                                    "[for debug] found duplicate key in CF_LOCK PUT key={:?}, existing_value={:?}, \
+                                    new_value={:?}, tag={:?}, txn_ext={:?}, task_cmd_str={:?}",
+                                    key, existing_value, value, tag, txn_ext, task_cmd_str
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         SCHED_STAGE_COUNTER_VEC.get(tag).write.inc();
         debug!("process_write task handle result";
             "req_info" => TrackerTokenArray::new(&[tracker_token]),
@@ -2198,6 +2257,7 @@ mod tests {
 
     use super::*;
     use crate::storage::{
+        RocksEngine, SecondaryLocksStatus, TestEngineBuilder, TxnStatus,
         kv::{Error as KvError, ErrorInner as KvErrorInner},
         lock_manager::{MockLockManager, WaitTimeout},
         mvcc::{self, Mutation},
@@ -2208,7 +2268,6 @@ mod tests {
             flow_controller::{EngineFlowController, FlowController},
             latch::*,
         },
-        RocksEngine, SecondaryLocksStatus, TestEngineBuilder, TxnStatus,
     };
 
     #[derive(Clone)]
diff --git a/src/storage/txn/store.rs b/src/storage/txn/store.rs
index b7c0cf3498f..42e67b64552 100644
--- a/src/storage/txn/store.rs
+++ b/src/storage/txn/store.rs
@@ -30,6 +30,9 @@ pub trait Store: Send {
     /// Whether there was data > ts during previous incremental gets.
     fn incremental_get_met_newer_ts_data(&self) -> NewerTsCheckState;
 
+    /// Whether checks the newer ts data
+    fn is_check_has_newer_ts_data(&self) -> bool;
+
     /// Fetch the provided set of keys.
     fn batch_get(
         &self,
@@ -344,6 +347,11 @@ impl<S: Snapshot> Store for SnapshotStore<S> {
         }
     }
 
+    #[inline]
+    fn is_check_has_newer_ts_data(&self) -> bool {
+        self.check_has_newer_ts_data
+    }
+
     fn batch_get(
         &self,
         keys: &[Key],
@@ -451,16 +459,41 @@ impl<S: Snapshot> SnapshotStore<S> {
         self.start_ts = start_ts;
     }
 
+    #[inline]
+    pub fn get_start_ts(&self) -> TimeStamp {
+        self.start_ts
+    }
+
     #[inline]
     pub fn set_isolation_level(&mut self, isolation_level: IsolationLevel) {
         self.isolation_level = isolation_level;
     }
 
+    #[inline]
+    pub fn get_isolation_level(&self) -> IsolationLevel {
+        self.isolation_level
+    }
+
     #[inline]
     pub fn set_bypass_locks(&mut self, locks: TsSet) {
         self.bypass_locks = locks;
     }
 
+    #[inline]
+    pub fn get_by_pass_locks(&self) -> TsSet {
+        self.bypass_locks.clone()
+    }
+
+    #[inline]
+    pub fn get_access_locks(&self) -> TsSet {
+        self.access_locks.clone()
+    }
+
+    #[inline]
+    pub fn is_fill_cache(&self) -> bool {
+        self.fill_cache
+    }
+
     fn verify_range(&self, lower_bound: &Option<Key>, upper_bound: &Option<Key>) -> Result<()> {
         if let Some(ref l) = lower_bound {
             if let Some(b) = self.snapshot.lower_bound() {
@@ -551,6 +584,10 @@ impl Store for FixtureStore {
         NewerTsCheckState::Unknown
     }
 
+    fn is_check_has_newer_ts_data(&self) -> bool {
+        false
+    }
+
     #[inline]
     fn batch_get(
         &self,
@@ -666,7 +703,7 @@ mod tests {
             TestEngineBuilder, WriteData,
         },
         mvcc::{Mutation, MvccTxn, SnapshotReader},
-        txn::{commit, prewrite, CommitKind, TransactionKind, TransactionProperties},
+        txn::{CommitKind, TransactionKind, TransactionProperties, commit, prewrite},
     };
 
     const KEY_PREFIX: &str = "key_prefix";
diff --git a/src/storage/txn/task.rs b/src/storage/txn/task.rs
index d0c66eb616d..2366a166fab 100644
--- a/src/storage/txn/task.rs
+++ b/src/storage/txn/task.rs
@@ -5,15 +5,15 @@ use std::sync::Arc;
 use kvproto::kvrpcpb::ExtraOp;
 use tikv_kv::Snapshot;
 use tikv_util::memory::{HeapSize, MemoryQuota, MemoryQuotaExceeded, OwnedAllocated};
-use tracker::{get_tls_tracker_token, TrackerToken};
+use tracker::{TrackerToken, get_tls_tracker_token};
 
 use crate::storage::{
     kv::Statistics,
     lock_manager::LockManager,
     metrics::*,
     txn::{
-        commands::{Command, WriteContext, WriteResult},
         ProcessResult,
+        commands::{Command, WriteContext, WriteResult},
     },
 };
 
diff --git a/src/storage/txn/tracker.rs b/src/storage/txn/tracker.rs
index e6c5d05a70c..8d3f18559e6 100644
--- a/src/storage/txn/tracker.rs
+++ b/src/storage/txn/tracker.rs
@@ -3,7 +3,7 @@
 use std::cell::RefCell;
 
 use tikv_util::time::Instant;
-use tracker::{FutureTrack, TrackerToken, GLOBAL_TRACKERS};
+use tracker::{FutureTrack, GLOBAL_TRACKERS, TrackerToken};
 
 use crate::storage::metrics::CommandKind;
 
@@ -155,8 +155,8 @@ impl FutureTrack for TlsFutureTracker {
 mod tests {
     use std::{
         sync::{
-            atomic::{AtomicUsize, Ordering},
             Arc,
+            atomic::{AtomicUsize, Ordering},
         },
         thread::sleep,
         time::Duration,
diff --git a/src/storage/txn/txn_status_cache.rs b/src/storage/txn/txn_status_cache.rs
index bd86db30894..3db39fb6cd9 100644
--- a/src/storage/txn/txn_status_cache.rs
+++ b/src/storage/txn/txn_status_cache.rs
@@ -54,28 +54,28 @@
 //! Unfortunately, the solution is still imperfect. As it's already known, it
 //! may still be problematic due to the following reasons:
 //!
-//! 1. We don't have mechanism to refuse requests that have
-//! past more than [CACHE_ITEMS_REQUIRED_KEEP_TIME] since they were sent.
+//! 1. We don't have mechanism to refuse requests that have past more than
+//!    [CACHE_ITEMS_REQUIRED_KEEP_TIME] since they were sent.
 //! 2. To prevent the cache from consuming too much more memory than expected,
-//! we have a limit to the capacity (though the limit is very large), and it's
-//! configurable (so the cache can be disabled, see how the `capacity` parameter
-//! of function [TxnStatusCache::new] is used) as a way to escape from potential
-//! faults.
+//!    we have a limit to the capacity (though the limit is very large), and
+//!    it's configurable (so the cache can be disabled, see how the `capacity`
+//!    parameter of function [TxnStatusCache::new] is used) as a way to escape
+//!    from potential faults.
 //! 3. The cache can't be synced across different TiKV instances.
 //!
 //! The third case above needs detailed explanation to be clarified. This is
 //! an example of the problem:
 //!
 //! 1. Client try to send prewrite request to TiKV A, who has the leader of the
-//! region containing a index key. The request is not received by TiKV and the
-//! client retries.
-//! 2. The leader is transferred to TiKV B, and the retries prewrite request
-//! is sent to it and processed successfully.
+//!    region containing a index key. The request is not received by TiKV and
+//!    the client retries.
+//! 2. The leader is transferred to TiKV B, and the retries prewrite request is
+//!    sent to it and processed successfully.
 //! 3. The transaction is committed on TiKV B, not being known by TiKV A.
 //! 4. The leader transferred back to TiKV A.
-//! 5. The original request arrives to TiKV A and being executed. As the
-//! status of the transaction is not in the cache in TiKV A, the prewrite
-//! request will be handled in normal way, skipping constraint checks.
+//! 5. The original request arrives to TiKV A and being executed. As the status
+//!    of the transaction is not in the cache in TiKV A, the prewrite request
+//!    will be handled in normal way, skipping constraint checks.
 //!
 //! As of the time when this module is written, the above remaining cases have
 //! not yet been handled, considering the extremely low possibility to happen
@@ -90,7 +90,7 @@
 //! ### For read data locked by large transactions more efficiently
 //!
 //! * Note: the `TxnStatusCache` is designed prepared for this usage, but not
-//! used yet for now.
+//!   used yet for now.
 //!
 //! Consider the case that a very-large transaction locked a lot of keys after
 //! prewriting, while many simple reads and writes executes frequently, thus
@@ -132,7 +132,7 @@
 //! evicting information about transactions of the other type.
 use std::{
     cmp::max,
-    sync::{atomic::AtomicU64, Arc},
+    sync::{Arc, atomic::AtomicU64},
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
 
@@ -605,13 +605,13 @@ impl TxnStatusCache {
 mod tests {
     use std::{
         sync::{
-            atomic::{AtomicU64, Ordering},
             Arc,
+            atomic::{AtomicU64, Ordering},
         },
         time::{Duration, Instant, SystemTime},
     };
 
-    use rand::{prelude::SliceRandom, Rng};
+    use rand::{Rng, prelude::SliceRandom};
 
     use super::*;
 
diff --git a/src/storage/types.rs b/src/storage/types.rs
index dcb3a216f2f..8b2b468cc78 100644
--- a/src/storage/types.rs
+++ b/src/storage/types.rs
@@ -8,11 +8,11 @@ use kvproto::kvrpcpb;
 use txn_types::{Key, LastChange, Value};
 
 use crate::storage::{
+    Callback, Result,
     errors::SharedError,
     lock_manager::WaitTimeout,
     mvcc::{Lock, LockType, TimeStamp, Write, WriteType},
     txn::ProcessResult,
-    Callback, Result,
 };
 
 /// `MvccInfo` stores all mvcc information of given key.
@@ -402,6 +402,33 @@ impl PessimisticLockResults {
             _ => unreachable!(),
         }
     }
+
+    pub fn estimate_resp_size(&self) -> u64 {
+        AsRef::<Vec<PessimisticLockKeyResult>>::as_ref(&self.0)
+            .iter()
+            .map(|res| {
+                match res {
+                    PessimisticLockKeyResult::Empty => 1,
+                    PessimisticLockKeyResult::Value(v) => v.as_ref().map_or(0, |v| v.len() as u64),
+                    PessimisticLockKeyResult::Existence(_) => {
+                        2 // type + bool
+                    }
+                    PessimisticLockKeyResult::LockedWithConflict {
+                        value,
+                        conflict_ts: _,
+                    } => {
+                        10 + value.as_ref().map_or(0, |v| v.len() as u64) // 10 stands for type + bool + conflict_ts
+                    }
+                    PessimisticLockKeyResult::Waiting => {
+                        1 // for test only 
+                    }
+                    PessimisticLockKeyResult::Failed(_) => {
+                        1 // type, ignoring error message
+                    }
+                }
+            })
+            .sum::<u64>()
+    }
 }
 
 #[derive(Debug, PartialEq)]
diff --git a/tests/benches/coprocessor_executors/hash_aggr/util.rs b/tests/benches/coprocessor_executors/hash_aggr/util.rs
index b799276b193..6c17357411c 100644
--- a/tests/benches/coprocessor_executors/hash_aggr/util.rs
+++ b/tests/benches/coprocessor_executors/hash_aggr/util.rs
@@ -5,12 +5,12 @@ use std::sync::Arc;
 use criterion::{black_box, measurement::Measurement};
 use tidb_query_datatype::expr::EvalConfig;
 use tidb_query_executors::{
-    interface::*, BatchFastHashAggregationExecutor, BatchSlowHashAggregationExecutor,
+    BatchFastHashAggregationExecutor, BatchSlowHashAggregationExecutor, interface::*,
 };
 use tikv::storage::Statistics;
 use tipb::{Aggregation, Expr};
 
-use crate::util::{bencher::Bencher, FixtureBuilder};
+use crate::util::{FixtureBuilder, bencher::Bencher};
 
 pub trait HashAggrBencher<M>
 where
diff --git a/tests/benches/coprocessor_executors/index_scan/mod.rs b/tests/benches/coprocessor_executors/index_scan/mod.rs
index eb9f98ae73b..ef911928f8d 100644
--- a/tests/benches/coprocessor_executors/index_scan/mod.rs
+++ b/tests/benches/coprocessor_executors/index_scan/mod.rs
@@ -5,7 +5,7 @@ mod util;
 
 use criterion::measurement::Measurement;
 
-use crate::util::{scan_bencher::ScanBencher, store::*, BenchCase};
+use crate::util::{BenchCase, scan_bencher::ScanBencher, store::*};
 
 const ROWS: usize = 5000;
 
diff --git a/tests/benches/coprocessor_executors/index_scan/util.rs b/tests/benches/coprocessor_executors/index_scan/util.rs
index 8d579c98a4f..9ba3ea12422 100644
--- a/tests/benches/coprocessor_executors/index_scan/util.rs
+++ b/tests/benches/coprocessor_executors/index_scan/util.rs
@@ -8,9 +8,9 @@ use futures::executor::block_on;
 use kvproto::coprocessor::KeyRange;
 use test_coprocessor::*;
 use tidb_query_datatype::expr::EvalConfig;
-use tidb_query_executors::{interface::*, BatchIndexScanExecutor};
+use tidb_query_executors::{BatchIndexScanExecutor, interface::*};
 use tikv::{
-    coprocessor::{dag::TikvStorage, RequestHandler},
+    coprocessor::{RequestHandler, dag::TikvStorage},
     storage::{RocksEngine, Statistics, Store as TxnStore},
 };
 use tipb::ColumnInfo;
diff --git a/tests/benches/coprocessor_executors/integrated/mod.rs b/tests/benches/coprocessor_executors/integrated/mod.rs
index 0b3d638e854..78a4b6285fe 100644
--- a/tests/benches/coprocessor_executors/integrated/mod.rs
+++ b/tests/benches/coprocessor_executors/integrated/mod.rs
@@ -10,7 +10,7 @@ use tikv::storage::RocksEngine;
 use tipb::{ExprType, ScalarFuncSig};
 use tipb_helper::ExprDefBuilder;
 
-use crate::util::{executor_descriptor::*, store::*, BenchCase};
+use crate::util::{BenchCase, executor_descriptor::*, store::*};
 
 /// SELECT COUNT(1) FROM Table, or SELECT COUNT(PrimaryKey) FROM Table
 fn bench_select_count_1<M>(b: &mut criterion::Bencher<'_, M>, input: &Input<M>)
diff --git a/tests/benches/coprocessor_executors/integrated/util.rs b/tests/benches/coprocessor_executors/integrated/util.rs
index 4b747307049..8f75c8b640c 100644
--- a/tests/benches/coprocessor_executors/integrated/util.rs
+++ b/tests/benches/coprocessor_executors/integrated/util.rs
@@ -6,6 +6,7 @@ use api_version::ApiV1;
 use criterion::{black_box, measurement::Measurement};
 use kvproto::coprocessor::KeyRange;
 use test_coprocessor::*;
+use tidb_query_common::storage::StubAccessor;
 use tidb_query_datatype::expr::EvalConfig;
 use tikv::{
     coprocessor::dag::TikvStorage,
@@ -74,7 +75,9 @@ where
         crate::util::bencher::BatchNextAllBencher::new(|| {
             tidb_query_executors::runner::build_executors::<_, ApiV1>(
                 black_box(executors.to_vec()),
+                &[],
                 black_box(TikvStorage::new(ToTxnStore::<T>::to_store(store), false)),
+                StubAccessor::none(),
                 black_box(ranges.to_vec()),
                 black_box(Arc::new(EvalConfig::default())),
                 black_box(false),
diff --git a/tests/benches/coprocessor_executors/selection/util.rs b/tests/benches/coprocessor_executors/selection/util.rs
index 85e39f49cfe..91305f19aae 100644
--- a/tests/benches/coprocessor_executors/selection/util.rs
+++ b/tests/benches/coprocessor_executors/selection/util.rs
@@ -4,11 +4,11 @@ use std::sync::Arc;
 
 use criterion::{black_box, measurement::Measurement};
 use tidb_query_datatype::expr::EvalConfig;
-use tidb_query_executors::{interface::BatchExecutor, BatchSelectionExecutor};
+use tidb_query_executors::{BatchSelectionExecutor, interface::BatchExecutor};
 use tikv::storage::Statistics;
 use tipb::Expr;
 
-use crate::util::{bencher::Bencher, FixtureBuilder};
+use crate::util::{FixtureBuilder, bencher::Bencher};
 
 pub trait SelectionBencher<M>
 where
diff --git a/tests/benches/coprocessor_executors/simple_aggr/util.rs b/tests/benches/coprocessor_executors/simple_aggr/util.rs
index e13d1be503f..88051c00d30 100644
--- a/tests/benches/coprocessor_executors/simple_aggr/util.rs
+++ b/tests/benches/coprocessor_executors/simple_aggr/util.rs
@@ -4,11 +4,11 @@ use std::sync::Arc;
 
 use criterion::{black_box, measurement::Measurement};
 use tidb_query_datatype::expr::EvalConfig;
-use tidb_query_executors::{interface::BatchExecutor, BatchSimpleAggregationExecutor};
+use tidb_query_executors::{BatchSimpleAggregationExecutor, interface::BatchExecutor};
 use tikv::storage::Statistics;
 use tipb::Expr;
 
-use crate::util::{bencher::Bencher, FixtureBuilder};
+use crate::util::{FixtureBuilder, bencher::Bencher};
 
 pub trait SimpleAggrBencher<M>
 where
diff --git a/tests/benches/coprocessor_executors/stream_aggr/util.rs b/tests/benches/coprocessor_executors/stream_aggr/util.rs
index cba952150bb..8699e2cc13d 100644
--- a/tests/benches/coprocessor_executors/stream_aggr/util.rs
+++ b/tests/benches/coprocessor_executors/stream_aggr/util.rs
@@ -4,11 +4,11 @@ use std::sync::Arc;
 
 use criterion::{black_box, measurement::Measurement};
 use tidb_query_datatype::expr::EvalConfig;
-use tidb_query_executors::{interface::BatchExecutor, BatchStreamAggregationExecutor};
+use tidb_query_executors::{BatchStreamAggregationExecutor, interface::BatchExecutor};
 use tikv::storage::Statistics;
 use tipb::Expr;
 
-use crate::util::{bencher::Bencher, FixtureBuilder};
+use crate::util::{FixtureBuilder, bencher::Bencher};
 
 pub trait StreamAggrBencher<M>
 where
diff --git a/tests/benches/coprocessor_executors/table_scan/mod.rs b/tests/benches/coprocessor_executors/table_scan/mod.rs
index 63cba5f1d7e..e94385fb56e 100644
--- a/tests/benches/coprocessor_executors/table_scan/mod.rs
+++ b/tests/benches/coprocessor_executors/table_scan/mod.rs
@@ -5,7 +5,7 @@ mod util;
 
 use criterion::measurement::Measurement;
 
-use crate::util::{scan_bencher::ScanBencher, store::*, BenchCase};
+use crate::util::{BenchCase, scan_bencher::ScanBencher, store::*};
 
 const ROWS: usize = 5000;
 
diff --git a/tests/benches/coprocessor_executors/table_scan/util.rs b/tests/benches/coprocessor_executors/table_scan/util.rs
index 0b2185074c8..28b91ea3d2f 100644
--- a/tests/benches/coprocessor_executors/table_scan/util.rs
+++ b/tests/benches/coprocessor_executors/table_scan/util.rs
@@ -8,9 +8,9 @@ use futures::executor::block_on;
 use kvproto::coprocessor::KeyRange;
 use test_coprocessor::*;
 use tidb_query_datatype::expr::EvalConfig;
-use tidb_query_executors::{interface::*, BatchTableScanExecutor};
+use tidb_query_executors::{BatchTableScanExecutor, interface::*};
 use tikv::{
-    coprocessor::{dag::TikvStorage, RequestHandler},
+    coprocessor::{RequestHandler, dag::TikvStorage},
     storage::{RocksEngine, Statistics, Store as TxnStore},
 };
 use tipb::ColumnInfo;
diff --git a/tests/benches/coprocessor_executors/top_n/util.rs b/tests/benches/coprocessor_executors/top_n/util.rs
index 2e0ab98b908..0e692adfbb3 100644
--- a/tests/benches/coprocessor_executors/top_n/util.rs
+++ b/tests/benches/coprocessor_executors/top_n/util.rs
@@ -7,7 +7,7 @@ use tidb_query_datatype::expr::EvalConfig;
 use tidb_query_executors::BatchTopNExecutor;
 use tipb::Expr;
 
-use crate::util::{bencher::Bencher, FixtureBuilder};
+use crate::util::{FixtureBuilder, bencher::Bencher};
 
 pub trait TopNBencher<M>
 where
diff --git a/tests/benches/coprocessor_executors/util/fixture.rs b/tests/benches/coprocessor_executors/util/fixture.rs
index e3306d3e0ed..9c5826226f5 100644
--- a/tests/benches/coprocessor_executors/util/fixture.rs
+++ b/tests/benches/coprocessor_executors/util/fixture.rs
@@ -4,18 +4,18 @@ use std::str::FromStr;
 
 use async_trait::async_trait;
 use criterion::measurement::Measurement;
-use rand::{seq::SliceRandom, Rng, SeedableRng};
+use rand::{Rng, SeedableRng, seq::SliceRandom};
 use rand_xorshift::XorShiftRng;
 use test_coprocessor::*;
-use tidb_query_common::storage::IntervalRange;
+use tidb_query_common::{Result, storage::IntervalRange};
 use tidb_query_datatype::{
+    FieldTypeTp,
     codec::{
         batch::{LazyBatchColumn, LazyBatchColumnVec},
         data_type::Decimal,
         datum::{Datum, DatumEncoder},
     },
     expr::{EvalContext, EvalWarnings},
-    FieldTypeTp,
 };
 use tidb_query_executors::interface::*;
 use tikv::storage::{RocksEngine, Statistics};
@@ -293,6 +293,20 @@ impl BatchExecutor for BatchFixtureExecutor {
         &self.schema
     }
 
+    #[inline]
+    fn intermediate_schema(&self, _index: usize) -> Result<&[FieldType]> {
+        unreachable!()
+    }
+
+    #[inline]
+    fn consume_and_fill_intermediate_results(
+        &mut self,
+        _results: &mut [Vec<BatchExecuteResult>],
+    ) -> Result<()> {
+        // Do nothing
+        Ok(())
+    }
+
     #[inline]
     async fn next_batch(&mut self, scan_rows: usize) -> BatchExecuteResult {
         let mut columns = Vec::with_capacity(self.columns.len());
diff --git a/tests/benches/coprocessor_executors/util/mod.rs b/tests/benches/coprocessor_executors/util/mod.rs
index 0a5708c74ce..419732686cb 100644
--- a/tests/benches/coprocessor_executors/util/mod.rs
+++ b/tests/benches/coprocessor_executors/util/mod.rs
@@ -12,6 +12,7 @@ use api_version::ApiV1;
 use criterion::{black_box, measurement::Measurement};
 use kvproto::coprocessor::KeyRange;
 use test_coprocessor::*;
+use tidb_query_common::storage::StubAccessor;
 use tikv::{
     coprocessor::RequestHandler,
     storage::{RocksEngine, Store as TxnStore},
@@ -42,10 +43,11 @@ pub fn build_dag_handler<TargetTxnStore: TxnStore + 'static>(
     let mut dag = DagRequest::default();
     dag.set_executors(executors.to_vec().into());
 
-    tikv::coprocessor::dag::DagHandlerBuilder::<_, ApiV1>::new(
+    tikv::coprocessor::dag::DagHandlerBuilder::<_, _, ApiV1>::new(
         black_box(dag),
         black_box(ranges.to_vec()),
         black_box(ToTxnStore::<TargetTxnStore>::to_store(store)),
+        StubAccessor::none(),
         tikv_util::deadline::Deadline::from_now(std::time::Duration::from_secs(10)),
         64,
         false,
diff --git a/tests/benches/deadlock_detector/mod.rs b/tests/benches/deadlock_detector/mod.rs
index 360f7546fe9..9edb881388b 100644
--- a/tests/benches/deadlock_detector/mod.rs
+++ b/tests/benches/deadlock_detector/mod.rs
@@ -29,11 +29,7 @@ impl DetectGenerator {
             entry.set_txn(self.timestamp);
             let mut wait_for_txn = self.timestamp;
             while wait_for_txn == self.timestamp {
-                let low = if self.timestamp < self.range {
-                    0
-                } else {
-                    self.timestamp - self.range
-                };
+                let low = self.timestamp.saturating_sub(self.range);
                 let high = self.timestamp + self.range;
                 wait_for_txn = self.rng.gen_range(low..high);
             }
diff --git a/tests/benches/hierarchy/engine/mod.rs b/tests/benches/hierarchy/engine/mod.rs
index e089ef013ec..808524a9287 100644
--- a/tests/benches/hierarchy/engine/mod.rs
+++ b/tests/benches/hierarchy/engine/mod.rs
@@ -1,12 +1,12 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use criterion::{black_box, BatchSize, Bencher, Criterion};
+use criterion::{BatchSize, Bencher, Criterion, black_box};
 use kvproto::kvrpcpb::Context;
 use test_util::KvGenerator;
 use tikv::storage::kv::{Engine, Snapshot};
 use txn_types::{Key, Value};
 
-use super::{BenchConfig, EngineFactory, DEFAULT_ITERATIONS, DEFAULT_KV_GENERATOR_SEED};
+use super::{BenchConfig, DEFAULT_ITERATIONS, DEFAULT_KV_GENERATOR_SEED, EngineFactory};
 
 fn bench_engine_put<E: Engine, F: EngineFactory<E>>(
     bencher: &mut Bencher<'_>,
diff --git a/tests/benches/hierarchy/engine_factory.rs b/tests/benches/hierarchy/engine_factory.rs
index 66b168486e6..97a5a32796e 100644
--- a/tests/benches/hierarchy/engine_factory.rs
+++ b/tests/benches/hierarchy/engine_factory.rs
@@ -3,8 +3,8 @@
 use std::fmt;
 
 use tikv::storage::{
-    kv::{BTreeEngine, RocksEngine},
     Engine, TestEngineBuilder,
+    kv::{BTreeEngine, RocksEngine},
 };
 
 pub trait EngineFactory<E: Engine>: Clone + Copy + fmt::Debug + 'static {
diff --git a/tests/benches/hierarchy/mvcc/mod.rs b/tests/benches/hierarchy/mvcc/mod.rs
index 176de224b4f..cecd684e290 100644
--- a/tests/benches/hierarchy/mvcc/mod.rs
+++ b/tests/benches/hierarchy/mvcc/mod.rs
@@ -1,17 +1,17 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 use concurrency_manager::ConcurrencyManager;
-use criterion::{black_box, BatchSize, Bencher, Criterion};
+use criterion::{BatchSize, Bencher, Criterion, black_box};
 use kvproto::kvrpcpb::{AssertionLevel, Context, PrewriteRequestPessimisticAction::*};
 use test_util::KvGenerator;
 use tikv::storage::{
     kv::{Engine, WriteData},
     mvcc::{self, MvccReader, MvccTxn, SnapshotReader},
-    txn::{cleanup, commit, prewrite, CommitKind, TransactionKind, TransactionProperties},
+    txn::{CommitKind, TransactionKind, TransactionProperties, cleanup, commit, prewrite},
 };
 use txn_types::{Key, Mutation, TimeStamp};
 
-use super::{BenchConfig, EngineFactory, DEFAULT_ITERATIONS, DEFAULT_KV_GENERATOR_SEED};
+use super::{BenchConfig, DEFAULT_ITERATIONS, DEFAULT_KV_GENERATOR_SEED, EngineFactory};
 
 fn setup_prewrite<E, F>(
     engine: &mut E,
diff --git a/tests/benches/hierarchy/storage/mod.rs b/tests/benches/hierarchy/storage/mod.rs
index 15873e2e424..e88631b711d 100644
--- a/tests/benches/hierarchy/storage/mod.rs
+++ b/tests/benches/hierarchy/storage/mod.rs
@@ -1,6 +1,6 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use criterion::{black_box, BatchSize, Bencher, Criterion};
+use criterion::{BatchSize, Bencher, Criterion, black_box};
 use engine_traits::CF_DEFAULT;
 use kvproto::kvrpcpb::Context;
 use test_storage::SyncTestStorageBuilderApiV1;
@@ -8,7 +8,7 @@ use test_util::KvGenerator;
 use tikv::storage::kv::Engine;
 use txn_types::{Key, Mutation};
 
-use super::{BenchConfig, EngineFactory, DEFAULT_ITERATIONS};
+use super::{BenchConfig, DEFAULT_ITERATIONS, EngineFactory};
 
 fn storage_raw_get<E: Engine, F: EngineFactory<E>>(b: &mut Bencher<'_>, config: &BenchConfig<F>) {
     let engine = config.engine_factory.build();
diff --git a/tests/benches/hierarchy/txn/mod.rs b/tests/benches/hierarchy/txn/mod.rs
index 2927f8e9476..425324fc15e 100644
--- a/tests/benches/hierarchy/txn/mod.rs
+++ b/tests/benches/hierarchy/txn/mod.rs
@@ -1,17 +1,17 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 use concurrency_manager::ConcurrencyManager;
-use criterion::{black_box, BatchSize, Bencher, Criterion};
+use criterion::{BatchSize, Bencher, Criterion, black_box};
 use kvproto::kvrpcpb::{AssertionLevel, Context, PrewriteRequestPessimisticAction::*};
 use test_util::KvGenerator;
 use tikv::storage::{
     kv::{Engine, WriteData},
     mvcc::{self, MvccTxn, SnapshotReader},
-    txn::{cleanup, commit, prewrite, CommitKind, TransactionKind, TransactionProperties},
+    txn::{CommitKind, TransactionKind, TransactionProperties, cleanup, commit, prewrite},
 };
 use txn_types::{Key, Mutation, TimeStamp};
 
-use super::{BenchConfig, EngineFactory, DEFAULT_ITERATIONS};
+use super::{BenchConfig, DEFAULT_ITERATIONS, EngineFactory};
 
 fn setup_prewrite<E, F>(
     engine: &mut E,
diff --git a/tests/benches/memory/mod.rs b/tests/benches/memory/mod.rs
index 33b7b66f80b..ac2791e7b3c 100644
--- a/tests/benches/memory/mod.rs
+++ b/tests/benches/memory/mod.rs
@@ -2,14 +2,14 @@
 
 use std::{
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     },
     thread,
     time::Duration,
 };
 
-use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{BenchmarkId, Criterion, black_box, criterion_group, criterion_main};
 use tikv_util::memory::{MemoryQuota, OwnedAllocated};
 
 fn bench_memory_quota_alloc(c: &mut Criterion) {
diff --git a/tests/benches/misc/coprocessor/codec/mod.rs b/tests/benches/misc/coprocessor/codec/mod.rs
index 082f1c55894..d87e4842a9d 100644
--- a/tests/benches/misc/coprocessor/codec/mod.rs
+++ b/tests/benches/misc/coprocessor/codec/mod.rs
@@ -3,7 +3,7 @@
 mod mysql;
 
 use byteorder::{BigEndian, ByteOrder, LittleEndian};
-use test::{black_box, Bencher};
+use test::{Bencher, black_box};
 use tidb_query_datatype::codec::table::*;
 
 #[bench]
diff --git a/tests/benches/misc/coprocessor/dag/expr/scalar.rs b/tests/benches/misc/coprocessor/dag/expr/scalar.rs
index a662312d017..5aabcd5e661 100644
--- a/tests/benches/misc/coprocessor/dag/expr/scalar.rs
+++ b/tests/benches/misc/coprocessor/dag/expr/scalar.rs
@@ -1,9 +1,7 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::usize;
-
 use collections::HashMap;
-use test::{black_box, Bencher};
+use test::{Bencher, black_box};
 use tipb::ScalarFuncSig;
 
 fn get_scalar_args_with_match(sig: ScalarFuncSig) -> (usize, usize) {
diff --git a/tests/benches/misc/keybuilder/bench_keybuilder.rs b/tests/benches/misc/keybuilder/bench_keybuilder.rs
index b95697fbe97..702f1e516bf 100644
--- a/tests/benches/misc/keybuilder/bench_keybuilder.rs
+++ b/tests/benches/misc/keybuilder/bench_keybuilder.rs
@@ -1,6 +1,6 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use rand::{thread_rng, RngCore};
+use rand::{RngCore, thread_rng};
 use test::Bencher;
 use tikv_util::keybuilder::KeyBuilder;
 
diff --git a/tests/benches/misc/raftkv/mod.rs b/tests/benches/misc/raftkv/mod.rs
index 092a1fc25d0..862fccf3669 100644
--- a/tests/benches/misc/raftkv/mod.rs
+++ b/tests/benches/misc/raftkv/mod.rs
@@ -5,7 +5,7 @@ use std::sync::{Arc, RwLock};
 use collections::HashSet;
 use crossbeam::channel::TrySendError;
 use engine_rocks::{RocksEngine, RocksSnapshot};
-use engine_traits::{KvEngine, ALL_CFS, CF_DEFAULT};
+use engine_traits::{ALL_CFS, CF_DEFAULT, KvEngine};
 use futures::future::FutureExt;
 use kvproto::{
     kvrpcpb::{Context, ExtraOp as TxnExtraOp},
@@ -14,20 +14,20 @@ use kvproto::{
     raft_serverpb::RaftMessage,
 };
 use raftstore::{
+    Result,
     router::{LocalReadRouter, RaftStoreRouter, ReadContext},
     store::{
-        cmd_resp, Callback, CasualMessage, CasualRouter, PeerMsg, ProposalRouter, RaftCmdExtraOpts,
+        Callback, CasualMessage, CasualRouter, PeerMsg, ProposalRouter, RaftCmdExtraOpts,
         RaftCommand, ReadResponse, RegionSnapshot, SignificantMsg, SignificantRouter, StoreMsg,
-        StoreRouter, WriteResponse,
+        StoreRouter, WriteResponse, cmd_resp,
     },
-    Result,
 };
 use tempfile::{Builder, TempDir};
 use tikv::{
     server::raftkv::{CmdRes, RaftKv},
     storage::{
-        kv::{Callback as EngineCallback, Modify, SnapContext, WriteData},
         Engine,
+        kv::{Callback as EngineCallback, Modify, SnapContext, WriteData},
     },
 };
 use tikv_util::store::new_peer;
@@ -184,6 +184,7 @@ fn bench_async_snapshot(b: &mut test::Bencher) {
     let mut kv = RaftKv::new(
         SyncBenchRouter::new(region.clone(), db.clone()),
         db,
+        None,
         Arc::new(RwLock::new(HashSet::default())),
     );
 
@@ -218,6 +219,7 @@ fn bench_async_write(b: &mut test::Bencher) {
     let kv = RaftKv::new(
         SyncBenchRouter::new(region.clone(), db.clone()),
         db,
+        None,
         Arc::new(RwLock::new(HashSet::default())),
     );
 
diff --git a/tests/benches/misc/serialization/bench_serialization.rs b/tests/benches/misc/serialization/bench_serialization.rs
index 85ae6e553eb..4a97e2167b1 100644
--- a/tests/benches/misc/serialization/bench_serialization.rs
+++ b/tests/benches/misc/serialization/bench_serialization.rs
@@ -4,7 +4,7 @@ use collections::HashMap;
 use kvproto::raft_cmdpb::{CmdType, RaftCmdRequest, Request};
 use protobuf::{self, Message};
 use raft::eraftpb::Entry;
-use rand::{thread_rng, RngCore};
+use rand::{RngCore, thread_rng};
 use test::Bencher;
 
 #[inline]
diff --git a/tests/benches/misc/storage/incremental_get.rs b/tests/benches/misc/storage/incremental_get.rs
index 336f99cd35e..fcc99219128 100644
--- a/tests/benches/misc/storage/incremental_get.rs
+++ b/tests/benches/misc/storage/incremental_get.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use engine_rocks::RocksSnapshot;
 use kvproto::kvrpcpb::{Context, IsolationLevel};
-use test::{black_box, Bencher};
+use test::{Bencher, black_box};
 use test_storage::SyncTestStorageBuilder;
 use tidb_query_datatype::codec::table;
 use tikv::storage::{Engine, SnapshotStore, Statistics, Store};
diff --git a/tests/benches/misc/storage/key.rs b/tests/benches/misc/storage/key.rs
index dac66a9dbdb..31a55ff2d49 100644
--- a/tests/benches/misc/storage/key.rs
+++ b/tests/benches/misc/storage/key.rs
@@ -2,7 +2,7 @@
 
 use rand::{self, Rng, RngCore};
 use tidb_query_datatype::{
-    codec::{datum, table, Datum},
+    codec::{Datum, datum, table},
     expr::EvalContext,
 };
 use txn_types::Key;
diff --git a/tests/benches/misc/storage/mvcc_reader.rs b/tests/benches/misc/storage/mvcc_reader.rs
index 3e784ef6b73..4b2055b698f 100644
--- a/tests/benches/misc/storage/mvcc_reader.rs
+++ b/tests/benches/misc/storage/mvcc_reader.rs
@@ -3,7 +3,7 @@
 use kvproto::kvrpcpb::Context;
 use test_storage::{SyncTestStorageApiV1, SyncTestStorageBuilderApiV1};
 use tidb_query_datatype::codec::table;
-use tikv::storage::{kv::RocksEngine, mvcc::SnapshotReader, Engine};
+use tikv::storage::{Engine, kv::RocksEngine, mvcc::SnapshotReader};
 use txn_types::{Key, Mutation};
 
 fn prepare_mvcc_data(key: &Key, n: u64) -> SyncTestStorageApiV1<RocksEngine> {
diff --git a/tests/benches/misc/util/slice_compare.rs b/tests/benches/misc/util/slice_compare.rs
index 40d28b4fb60..3eea55fcb59 100644
--- a/tests/benches/misc/util/slice_compare.rs
+++ b/tests/benches/misc/util/slice_compare.rs
@@ -1,6 +1,6 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
-use rand::{thread_rng, RngCore};
+use rand::{RngCore, thread_rng};
 use test::Bencher;
 
 #[inline]
diff --git a/tests/benches/misc/writebatch/bench_writebatch.rs b/tests/benches/misc/writebatch/bench_writebatch.rs
index 446f7e991df..e20302809e4 100644
--- a/tests/benches/misc/writebatch/bench_writebatch.rs
+++ b/tests/benches/misc/writebatch/bench_writebatch.rs
@@ -1,7 +1,7 @@
 // Copyright 2017 TiKV Project Authors. Licensed under Apache-2.0.
 
 use engine_rocks::{RocksCfOptions, RocksDbOptions, RocksEngine, RocksWriteBatchVec};
-use engine_traits::{Mutable, WriteBatch, WriteBatchExt, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, Mutable, WriteBatch, WriteBatchExt};
 use tempfile::Builder;
 use test::Bencher;
 
diff --git a/tests/failpoints/cases/mod.rs b/tests/failpoints/cases/mod.rs
index 186f733b75a..593b1b4b134 100644
--- a/tests/failpoints/cases/mod.rs
+++ b/tests/failpoints/cases/mod.rs
@@ -2,6 +2,7 @@
 
 mod test_async_fetch;
 mod test_async_io;
+mod test_auto_compaction;
 mod test_backup;
 mod test_bootstrap;
 mod test_cmd_epoch_checker;
@@ -41,6 +42,7 @@ mod test_stale_read;
 mod test_stats;
 mod test_storage;
 mod test_table_properties;
+mod test_titan;
 mod test_transaction;
 mod test_transfer_leader;
 mod test_ttl;
diff --git a/tests/failpoints/cases/test_async_fetch.rs b/tests/failpoints/cases/test_async_fetch.rs
index 29fe6bfa610..e98b4659fcc 100644
--- a/tests/failpoints/cases/test_async_fetch.rs
+++ b/tests/failpoints/cases/test_async_fetch.rs
@@ -1,12 +1,12 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc, Mutex},
+    sync::{Mutex, mpsc},
     time::Duration,
 };
 
 use collections::HashMap;
-use engine_traits::{Peekable, CF_RAFT};
+use engine_traits::{CF_RAFT, Peekable};
 use kvproto::raft_serverpb::RaftApplyState;
 use pd_client::PdClient;
 use raftstore::store::*;
diff --git a/tests/failpoints/cases/test_async_io.rs b/tests/failpoints/cases/test_async_io.rs
index 5ed5a536d18..7d403a99653 100644
--- a/tests/failpoints/cases/test_async_io.rs
+++ b/tests/failpoints/cases/test_async_io.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::AtomicBool, mpsc, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::AtomicBool, mpsc},
     time::Duration,
 };
 
diff --git a/tests/failpoints/cases/test_auto_compaction.rs b/tests/failpoints/cases/test_auto_compaction.rs
new file mode 100644
index 00000000000..fbe5f77b78b
--- /dev/null
+++ b/tests/failpoints/cases/test_auto_compaction.rs
@@ -0,0 +1,365 @@
+// Copyright 2025 TiKV Project Authors. Licensed under Apache-2.0.
+
+use std::{
+    sync::{
+        Arc,
+        atomic::{AtomicBool, Ordering},
+    },
+    thread,
+    time::Duration,
+};
+
+use engine_traits::{CF_WRITE, MiscExt};
+use kvproto::kvrpcpb::*;
+use test_raftstore::*;
+use tikv_util::config::ReadableDuration;
+
+#[test]
+fn test_gc_worker_auto_compaction_with_failpoints() {
+    // Test that auto compaction can be started and stopped gracefully
+    // This test verifies that the auto compaction infrastructure works,
+    // even though it may not actually compact in test environments
+    let (mut cluster, client, _ctx) = must_new_cluster_with_cfg_and_kv_client_mul(1, |cluster| {
+        cluster.cfg.rocksdb.writecf.disable_auto_compactions = true;
+        cluster.cfg.gc.auto_compaction.check_interval = ReadableDuration::secs(1); // 1 second for fast testing
+        cluster.cfg.gc.auto_compaction.tombstones_num_threshold = 3; // Low threshold for testing
+        cluster.cfg.gc.auto_compaction.redundant_rows_threshold = 3; // Low threshold for testing
+        cluster.cfg.gc.auto_compaction.tombstones_percent_threshold = 10; // Low threshold for testing
+        cluster
+            .cfg
+            .gc
+            .auto_compaction
+            .redundant_rows_percent_threshold = 10; // Low threshold for testing
+    });
+
+    cluster.pd_client.disable_default_operator();
+    cluster
+        .sim
+        .write()
+        .unwrap()
+        .gc_safe_point
+        .store(17, Ordering::SeqCst);
+
+    let mut region = cluster.get_region(b"k1");
+
+    cluster.must_split(&region, b"k05");
+    region = cluster.get_region(b"k10");
+    cluster.must_split(&region, b"k10");
+    region = cluster.get_region(b"k15");
+    cluster.must_split(&region, b"k15");
+    region = cluster.get_region(b"k20");
+    cluster.must_split(&region, b"k20");
+
+    let region1 = cluster.get_region(b"k01");
+    let region2 = cluster.get_region(b"k05");
+    let region3 = cluster.get_region(b"k10");
+    let region4 = cluster.get_region(b"k15");
+    let region5 = cluster.get_region(b"k20");
+
+    let mut ctx1 = Context::new();
+    ctx1.set_region_id(region1.get_id());
+    ctx1.set_region_epoch(region1.get_region_epoch().clone());
+    ctx1.set_peer(region1.get_peers()[0].clone());
+    let mut ctx2 = Context::new();
+    ctx2.set_region_id(region2.get_id());
+    ctx2.set_region_epoch(region2.get_region_epoch().clone());
+    ctx2.set_peer(region2.get_peers()[0].clone());
+    let mut ctx3 = Context::new();
+    ctx3.set_region_id(region3.get_id());
+    ctx3.set_region_epoch(region3.get_region_epoch().clone());
+    ctx3.set_peer(region3.get_peers()[0].clone());
+    let mut ctx4 = Context::new();
+    ctx4.set_region_id(region4.get_id());
+    ctx4.set_region_epoch(region4.get_region_epoch().clone());
+    ctx4.set_peer(region4.get_peers()[0].clone());
+    let mut ctx5 = Context::new();
+    ctx5.set_region_id(region5.get_id());
+    ctx5.set_region_epoch(region5.get_region_epoch().clone());
+    ctx5.set_peer(region5.get_peers()[0].clone());
+
+    // Set up failpoint to notify test when auto compaction thread starts
+    let fp_thread_start = "gc_worker_auto_compaction_thread_start";
+    let thread_started = Arc::new(AtomicBool::new(false));
+    let thread_started_clone = thread_started.clone();
+
+    fail::cfg_callback(fp_thread_start, move || {
+        thread_started_clone.store(true, Ordering::SeqCst);
+    })
+    .unwrap();
+
+    // Set up failpoint to notify test when auto compaction main loop starts
+    let fp_start_notify = "gc_worker_auto_compaction_start";
+    let compaction_started = Arc::new(AtomicBool::new(false));
+    let compaction_started_clone = compaction_started.clone();
+
+    fail::cfg_callback(fp_start_notify, move || {
+        compaction_started_clone.store(true, Ordering::SeqCst);
+    })
+    .unwrap();
+
+    // Set up failpoint to pause execution after candidates are collected
+    let fp_pause_after_candidates = "gc_worker_auto_compaction_candidates_collected";
+    fail::cfg(fp_pause_after_candidates, "pause").unwrap();
+
+    let large_value = vec![b'x'; 100];
+
+    // Range 1: k0-k5 (low redundancy - clean data)
+    for i in 0..5 {
+        let key = format!("k{:02}", i);
+        let pk = key.as_bytes().to_vec();
+
+        // Only one version, no deletes
+        let commit_ts = 10;
+        let start_ts = commit_ts - 3;
+        let muts = vec![new_mutation(Op::Put, &pk, &large_value)];
+        must_kv_prewrite(&client, ctx1.clone(), muts, pk.clone(), start_ts);
+        let keys = vec![pk.clone()];
+        must_kv_commit(&client, ctx1.clone(), keys, start_ts, commit_ts, commit_ts);
+    }
+    cluster.engines[&1].kv.flush_cf(CF_WRITE, true).unwrap();
+
+    // Range 2: k5-k10 medium redundancy, 10 total entries, 5 redundant versions.
+    // Estimated num of redundant versions is 5, since redundant versions' max ts is
+    // 10, which is smaller than the GC safe point 17.
+    for i in 5..10 {
+        let key = format!("k{:02}", i);
+        let pk = key.as_bytes().to_vec();
+
+        // Create fewer versions
+        for commit_ts in [10, 20] {
+            let start_ts = commit_ts - 3;
+            let muts = vec![new_mutation(Op::Put, &pk, &large_value)];
+            must_kv_prewrite(&client, ctx2.clone(), muts, pk.clone(), start_ts);
+            let keys = vec![pk.clone()];
+            must_kv_commit(&client, ctx2.clone(), keys, start_ts, commit_ts, commit_ts);
+        }
+    }
+    cluster.engines[&1].kv.flush_cf(CF_WRITE, true).unwrap();
+
+    // Range 3: k10-k15 high redundancy, 15 total entries, 10 redundant versions.
+    // Estimated num of discardable versions is 2 = 10 * (17 - 15) / (25 - 15)
+    for i in 10..15 {
+        let key = format!("k{:02}", i);
+        let pk = key.as_bytes().to_vec();
+
+        // Create multiple versions
+        for commit_ts in [15, 25] {
+            let start_ts = commit_ts - 3;
+            let muts = vec![new_mutation(Op::Put, &pk, &large_value)];
+            must_kv_prewrite(&client, ctx3.clone(), muts, pk.clone(), start_ts);
+            let keys = vec![pk.clone()];
+            must_kv_commit(&client, ctx3.clone(), keys, start_ts, commit_ts, commit_ts);
+        }
+
+        let commit_ts = 30;
+        let start_ts = commit_ts - 3;
+        let muts = vec![new_mutation(Op::Del, &pk, &[])];
+        must_kv_prewrite(&client, ctx3.clone(), muts, pk.clone(), start_ts);
+        let keys = vec![pk.clone()];
+        must_kv_commit(&client, ctx3.clone(), keys, start_ts, commit_ts, commit_ts);
+    }
+    cluster.engines[&1].kv.flush_cf(CF_WRITE, true).unwrap();
+
+    // Range 4: k15-k20 (high redundancy with more versions before GC safe point)
+    // 20 total entries, 15 redundant versions.
+    // Estimated num of discardable versions is 7 = 15 * (17 - 10) / (25 - 10)
+    for i in 15..20 {
+        let key = format!("k{:02}", i);
+        let pk = key.as_bytes().to_vec();
+
+        for commit_ts in [10, 15, 25] {
+            let start_ts = commit_ts - 3;
+            let muts = vec![new_mutation(Op::Put, &pk, &large_value)];
+            must_kv_prewrite(&client, ctx4.clone(), muts, pk.clone(), start_ts);
+            let keys = vec![pk.clone()];
+            must_kv_commit(&client, ctx4.clone(), keys, start_ts, commit_ts, commit_ts);
+        }
+        let commit_ts = 30;
+        let start_ts = commit_ts - 3;
+        let muts = vec![new_mutation(Op::Del, &pk, &[])];
+        must_kv_prewrite(&client, ctx4.clone(), muts, pk.clone(), start_ts);
+        let keys = vec![pk.clone()];
+        must_kv_commit(&client, ctx4.clone(), keys, start_ts, commit_ts, commit_ts);
+    }
+    cluster.engines[&1].kv.flush_cf(CF_WRITE, true).unwrap();
+
+    // Range 5: k20-k35 (write ts 10-25, delete ts 15-30)
+    // Each key has 2 versions: 1 write and 1 delete
+    // 30 total entries, 15 redundant versions. 15 deletes.
+    // Estimated num of discardable versions is:
+    //  discardable_mvccs = 15 * (17 - 10) / (24 - 10) ~= 8
+    //  discardable_deletes = 15 * (17 - 15) / (29 - 15) ~= 2
+    // Total discardable = 8 + 2 = 10
+    for i in 20..35 {
+        let key = format!("k{:02}", i);
+        let pk = key.as_bytes().to_vec();
+
+        // Create one write with timestamp in range 10-24
+        let write_commit_ts = 10 + (i - 20);
+        let write_start_ts = write_commit_ts - 3;
+        let muts = vec![new_mutation(Op::Put, &pk, &large_value)];
+        must_kv_prewrite(&client, ctx5.clone(), muts, pk.clone(), write_start_ts);
+        let keys = vec![pk.clone()];
+        must_kv_commit(
+            &client,
+            ctx5.clone(),
+            keys,
+            write_start_ts,
+            write_commit_ts,
+            write_commit_ts,
+        );
+
+        // Create one delete with timestamp in range 15-30
+        let delete_commit_ts = 15 + (i - 20);
+        let delete_start_ts = delete_commit_ts - 3;
+        let muts = vec![new_mutation(Op::Del, &pk, &[])];
+        must_kv_prewrite(&client, ctx5.clone(), muts, pk.clone(), delete_start_ts);
+        let keys = vec![pk.clone()];
+        must_kv_commit(
+            &client,
+            ctx5.clone(),
+            keys,
+            delete_start_ts,
+            delete_commit_ts,
+            delete_commit_ts,
+        );
+    }
+    cluster.engines[&1].kv.flush_cf(CF_WRITE, true).unwrap();
+
+    // First check if the auto compaction thread was started
+    let mut timeout = 50; // 5 seconds
+    while !thread_started.load(Ordering::SeqCst) && timeout > 0 {
+        thread::sleep(Duration::from_millis(100));
+        timeout -= 1;
+    }
+
+    if !thread_started.load(Ordering::SeqCst) {
+        // Auto compaction couldn't start (likely due to test engine limitations)
+        // This is acceptable - just verify no crash occurred
+        fail::remove(fp_thread_start);
+        fail::remove(fp_start_notify);
+        fail::remove(fp_pause_after_candidates);
+        return;
+    }
+
+    // Auto compaction thread started successfully, now test the full flow
+    assert!(
+        thread_started.load(Ordering::SeqCst),
+        "Auto compaction thread should have started and hit the thread_start failpoint"
+    );
+
+    // Wait for auto compaction main loop to start and hit the pause
+    timeout = 100; // 10 seconds
+    while !compaction_started.load(Ordering::SeqCst) && timeout > 0 {
+        thread::sleep(Duration::from_millis(100));
+        timeout -= 1;
+    }
+    assert!(
+        compaction_started.load(Ordering::SeqCst),
+        "Auto compaction main loop should have started and hit the start failpoint"
+    );
+
+    // Remove the start notify failpoint and the pause to allow execution to proceed
+    fail::remove(fp_start_notify);
+    fail::remove(fp_pause_after_candidates);
+
+    // Set up failpoints to check which specific regions are found as candidates
+    // We expect ranges k05-k10, k10-k15, k15-k20, and k20-k35 to be candidates
+    // (high redundancy)
+    let fp_k05_k10 = "gc_worker_auto_compaction_candidate_k05_k10";
+    let k05_k10_found = Arc::new(AtomicBool::new(false));
+    let k05_k10_found_clone = k05_k10_found.clone();
+
+    fail::cfg_callback(fp_k05_k10, move || {
+        k05_k10_found_clone.store(true, Ordering::SeqCst);
+    })
+    .unwrap();
+
+    let fp_k10_k15 = "gc_worker_auto_compaction_candidate_k10_k15";
+    let k10_k15_found = Arc::new(AtomicBool::new(false));
+    let k10_k15_found_clone = k10_k15_found.clone();
+
+    fail::cfg_callback(fp_k10_k15, move || {
+        k10_k15_found_clone.store(true, Ordering::SeqCst);
+    })
+    .unwrap();
+
+    let fp_k15_k20 = "gc_worker_auto_compaction_candidate_k15_k20";
+    let k15_k20_found = Arc::new(AtomicBool::new(false));
+    let k15_k20_found_clone = k15_k20_found.clone();
+
+    fail::cfg_callback(fp_k15_k20, move || {
+        k15_k20_found_clone.store(true, Ordering::SeqCst);
+    })
+    .unwrap();
+
+    let fp_k20_k35 = "gc_worker_auto_compaction_candidate_k20_k35";
+    let k20_k35_found = Arc::new(AtomicBool::new(false));
+    let k20_k35_found_clone = k20_k35_found.clone();
+
+    fail::cfg_callback(fp_k20_k35, move || {
+        k20_k35_found_clone.store(true, Ordering::SeqCst);
+    })
+    .unwrap();
+
+    // Wait for candidate evaluation to complete
+    timeout = 100; // 10 seconds  
+    while (!k05_k10_found.load(Ordering::SeqCst)
+        || !k10_k15_found.load(Ordering::SeqCst)
+        || !k15_k20_found.load(Ordering::SeqCst)
+        || !k20_k35_found.load(Ordering::SeqCst))
+        && timeout > 0
+    {
+        thread::sleep(Duration::from_millis(100));
+        timeout -= 1;
+    }
+
+    // We expect ranges k5-k10, k10-k15, k15-k20, and k20-k35 to be found as
+    // compaction candidates but NOT k0-k5 (clean data with only single
+    // versions)
+
+    // Range k5-k10: Should be a candidate
+    // - 10 total entries (5 keys × 2 versions each)
+    // - 5 redundant versions (older puts that are superseded)
+    // - Medium redundancy ratio exceeds threshold
+    assert!(
+        k05_k10_found.load(Ordering::SeqCst),
+        "Expected range k5-k10 with 10 total entries, 5 discardable versions to be found as a compact candidate"
+    );
+
+    // Range k10-k15: Should be a candidate
+    // - 15 total entries (5 keys × 2 versions each) + 5 deletes = 15 total
+    // - 2 discardable versions estimated by formula
+    // - 5 tombstones (delete entries)
+    // - High redundancy ratio exceeds threshold
+    assert!(
+        k10_k15_found.load(Ordering::SeqCst),
+        "Expected range k10-k15 with 15 total entries, 2 discardable versions to be found as a compact candidate"
+    );
+
+    // Range k15-k20: Should be a candidate
+    // - 20 total entries (5 keys × 3 versions each) + 5 deletes = 20 total
+    // - 7 discardable versions estimated by formula
+    // - 5 tombstones (delete entries)
+    // - Very high redundancy ratio exceeds threshold
+    assert!(
+        k15_k20_found.load(Ordering::SeqCst),
+        "Expected range k15-k20 with 20 total entries, 7 discardable versions to be found as a compact candidate"
+    );
+
+    // Range k20-k35: Should be a candidate
+    // - 30 total entries (15 keys × 2 versions each: 1 write + 1 delete)
+    // - 10 discardable versions estimated by formula
+    // - High redundancy ratio exceeds threshold
+    assert!(
+        k20_k35_found.load(Ordering::SeqCst),
+        "Expected range k20-k35 with 30 total entries, 10 discardable versions to be found as a compact candidate"
+    );
+
+    // Clean up failpoints
+    fail::remove(fp_thread_start);
+    fail::remove(fp_k05_k10);
+    fail::remove(fp_k10_k15);
+    fail::remove(fp_k15_k20);
+    fail::remove(fp_k20_k35);
+}
diff --git a/tests/failpoints/cases/test_backup.rs b/tests/failpoints/cases/test_backup.rs
index 03411e1f2f0..d2d90d46b9f 100644
--- a/tests/failpoints/cases/test_backup.rs
+++ b/tests/failpoints/cases/test_backup.rs
@@ -2,7 +2,7 @@
 
 use std::{thread, time::Duration};
 
-use futures::{executor::block_on, StreamExt};
+use futures::{StreamExt, executor::block_on};
 use kvproto::{brpb::Error_oneof_detail, kvrpcpb::*};
 use tempfile::Builder;
 use test_backup::*;
diff --git a/tests/failpoints/cases/test_cmd_epoch_checker.rs b/tests/failpoints/cases/test_cmd_epoch_checker.rs
index 3b76ac78d35..0a4ba259044 100644
--- a/tests/failpoints/cases/test_cmd_epoch_checker.rs
+++ b/tests/failpoints/cases/test_cmd_epoch_checker.rs
@@ -10,7 +10,7 @@ use kvproto::raft_cmdpb::{RaftCmdRequest, RaftCmdResponse};
 use raft::eraftpb::MessageType;
 use raftstore::store::msg::*;
 use test_raftstore::*;
-use tikv_util::{future::block_on_timeout, mpsc::future, HandyRwLock};
+use tikv_util::{HandyRwLock, future::block_on_timeout, mpsc::future};
 
 struct CbReceivers {
     proposed: mpsc::Receiver<()>,
diff --git a/tests/failpoints/cases/test_conf_change.rs b/tests/failpoints/cases/test_conf_change.rs
index 6f91a2ff55b..58f507e8057 100644
--- a/tests/failpoints/cases/test_conf_change.rs
+++ b/tests/failpoints/cases/test_conf_change.rs
@@ -1,7 +1,7 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::AtomicBool, mpsc, Arc},
+    sync::{Arc, atomic::AtomicBool, mpsc},
     thread,
     time::Duration,
 };
@@ -12,7 +12,7 @@ use pd_client::PdClient;
 use raft::eraftpb::{ConfChangeType, MessageType};
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv_util::{config::ReadableDuration, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration};
 
 #[test_case(test_raftstore::new_node_cluster)]
 #[test_case(test_raftstore_v2::new_node_cluster)]
diff --git a/tests/failpoints/cases/test_coprocessor.rs b/tests/failpoints/cases/test_coprocessor.rs
index cbf9e14972a..b3bfeff0c8f 100644
--- a/tests/failpoints/cases/test_coprocessor.rs
+++ b/tests/failpoints/cases/test_coprocessor.rs
@@ -18,7 +18,7 @@ use test_raftstore::{must_kv_commit, must_kv_prewrite, must_new_cluster_and_kv_c
 use test_raftstore_macro::test_case;
 use test_storage::*;
 use tidb_query_datatype::{
-    codec::{datum, table::encode_row_key, Datum},
+    codec::{Datum, datum, table::encode_row_key},
     expr::EvalContext,
 };
 use tikv_util::HandyRwLock;
diff --git a/tests/failpoints/cases/test_debugger.rs b/tests/failpoints/cases/test_debugger.rs
index f70ebcb6d32..2228d4376a3 100644
--- a/tests/failpoints/cases/test_debugger.rs
+++ b/tests/failpoints/cases/test_debugger.rs
@@ -12,8 +12,8 @@ use raft_log_engine::RaftLogEngine;
 use test_raftstore::new_peer;
 use tikv::{
     config::TikvConfig,
-    server::{debug::Debugger, debug2::new_debugger, KvEngineFactoryBuilder},
-    storage::{txn::tests::must_prewrite_put, TestEngineBuilder},
+    server::{KvEngineFactoryBuilder, debug::Debugger, debug2::new_debugger},
+    storage::{TestEngineBuilder, txn::tests::must_prewrite_put},
 };
 
 const INITIAL_TABLET_INDEX: u64 = 5;
@@ -36,7 +36,7 @@ fn prepare_data_on_disk(path: &Path) {
     let cache = cfg.storage.block_cache.build_shared_cache();
     let env = cfg.build_shared_rocks_env(None, None).unwrap();
 
-    let factory = KvEngineFactoryBuilder::new(env, &cfg, cache, None).build();
+    let factory = KvEngineFactoryBuilder::new(env, &cfg, cache, None, Default::default()).build();
     let reg = TabletRegistry::new(Box::new(factory), path).unwrap();
 
     let raft_engine = RaftLogEngine::new(cfg.raft_engine.config(), None, None).unwrap();
diff --git a/tests/failpoints/cases/test_disk_snap_br.rs b/tests/failpoints/cases/test_disk_snap_br.rs
index 83956aa9367..37bf1f085d4 100644
--- a/tests/failpoints/cases/test_disk_snap_br.rs
+++ b/tests/failpoints/cases/test_disk_snap_br.rs
@@ -13,7 +13,7 @@
 fn test_merge() {
     use std::time::Duration;
 
-    use test_backup::disk_snap::{assert_success, Suite};
+    use test_backup::disk_snap::{Suite, assert_success};
 
     let mut suite = Suite::new(1);
     suite.split(b"k");
diff --git a/tests/failpoints/cases/test_early_apply.rs b/tests/failpoints/cases/test_early_apply.rs
index c2e8cb79608..d3c9f9cc9c5 100644
--- a/tests/failpoints/cases/test_early_apply.rs
+++ b/tests/failpoints/cases/test_early_apply.rs
@@ -2,8 +2,8 @@
 
 use std::{
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, Ordering},
     },
     time::Duration,
 };
diff --git a/tests/failpoints/cases/test_engine.rs b/tests/failpoints/cases/test_engine.rs
index 8fe02cb0bbb..8ac947a6db1 100644
--- a/tests/failpoints/cases/test_engine.rs
+++ b/tests/failpoints/cases/test_engine.rs
@@ -1,11 +1,11 @@
 // Copyright 2023 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc::channel, Mutex},
+    sync::{Mutex, mpsc::channel},
     time::Duration,
 };
 
-use engine_traits::{MiscExt, CF_DEFAULT, CF_LOCK, CF_WRITE};
+use engine_traits::{CF_DEFAULT, CF_LOCK, CF_WRITE, MiscExt};
 use tikv_util::config::ReadableSize;
 
 fn dummy_string(len: usize) -> String {
diff --git a/tests/failpoints/cases/test_gc_metrics.rs b/tests/failpoints/cases/test_gc_metrics.rs
index ce146d32baa..50a2e472243 100644
--- a/tests/failpoints/cases/test_gc_metrics.rs
+++ b/tests/failpoints/cases/test_gc_metrics.rs
@@ -1,13 +1,13 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::AtomicU64, mpsc, Arc},
+    sync::{Arc, atomic::AtomicU64, mpsc},
     thread,
     time::Duration,
 };
 
 use api_version::{ApiV2, KvFormat, RawValue};
-use engine_rocks::{raw::FlushOptions, util::get_cf_handle, RocksEngine};
+use engine_rocks::{RocksEngine, raw::FlushOptions, util::get_cf_handle};
 use engine_traits::{CF_DEFAULT, CF_WRITE};
 use kvproto::{
     kvrpcpb::*,
@@ -16,28 +16,27 @@ use kvproto::{
 use pd_client::FeatureGate;
 use raft::StateRole;
 use raftstore::{
+    RegionInfoAccessor,
     coprocessor::{
-        region_info_accessor::MockRegionInfoProvider, CoprocessorHost, RegionChangeEvent,
+        CoprocessorHost, RegionChangeEvent, region_info_accessor::MockRegionInfoProvider,
     },
-    RegionInfoAccessor,
 };
 use tikv::{
     config::DbConfig,
     server::gc_worker::{
+        AutoGcConfig, GcConfig, GcWorker, MockSafePointProvider, PrefixedEngine, STAT_RAW_KEYMODE,
+        STAT_TXN_KEYMODE, TestGcRunner,
         compaction_filter::{
-            GC_COMPACTION_FILTERED, GC_COMPACTION_FILTER_MVCC_DELETION_HANDLED,
-            GC_COMPACTION_FILTER_MVCC_DELETION_MET, GC_COMPACTION_FILTER_PERFORM,
-            GC_COMPACTION_FILTER_SKIP,
+            GC_COMPACTION_FILTER_MVCC_DELETION_HANDLED, GC_COMPACTION_FILTER_MVCC_DELETION_MET,
+            GC_COMPACTION_FILTER_PERFORM, GC_COMPACTION_FILTER_SKIP, GC_COMPACTION_FILTERED,
         },
         rawkv_compaction_filter::make_key,
-        AutoGcConfig, GcConfig, GcWorker, MockSafePointProvider, PrefixedEngine, TestGcRunner,
-        STAT_RAW_KEYMODE, STAT_TXN_KEYMODE,
     },
     storage::{
+        Engine,
         kv::{Modify, TestEngineBuilder, WriteData},
-        mvcc::{tests::must_get, MVCC_VERSIONS_HISTOGRAM},
+        mvcc::{MVCC_VERSIONS_HISTOGRAM, tests::must_get},
         txn::tests::{must_commit, must_prewrite_delete, must_prewrite_put},
-        Engine,
     },
 };
 use txn_types::{Key, TimeStamp};
diff --git a/tests/failpoints/cases/test_gc_worker.rs b/tests/failpoints/cases/test_gc_worker.rs
index 50b71b59f47..a6180aa1c47 100644
--- a/tests/failpoints/cases/test_gc_worker.rs
+++ b/tests/failpoints/cases/test_gc_worker.rs
@@ -1,7 +1,7 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::AtomicU64, Arc},
+    sync::{Arc, atomic::AtomicU64},
     thread,
     time::Duration,
 };
@@ -17,7 +17,7 @@ use test_raftstore::*;
 use test_raftstore_macro::test_case;
 use tikv::{
     server::gc_worker::{
-        sync_gc, AutoGcConfig, GcSafePointProvider, GcTask, Result as GcWorkerResult, TestGcRunner,
+        AutoGcConfig, GcSafePointProvider, GcTask, Result as GcWorkerResult, TestGcRunner, sync_gc,
     },
     storage::{
         kv::TestEngineBuilder,
diff --git a/tests/failpoints/cases/test_hibernate.rs b/tests/failpoints/cases/test_hibernate.rs
index 6557f4f6c65..c512cf323bc 100644
--- a/tests/failpoints/cases/test_hibernate.rs
+++ b/tests/failpoints/cases/test_hibernate.rs
@@ -10,7 +10,7 @@ use kvproto::raft_serverpb::{ExtraMessage, ExtraMessageType, RaftMessage};
 use raft::eraftpb::MessageType;
 use raftstore::store::{PeerMsg, PeerTick};
 use test_raftstore::*;
-use tikv_util::{config::ReadableDuration, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration};
 
 #[test]
 fn test_break_leadership_on_restart() {
diff --git a/tests/failpoints/cases/test_import_service.rs b/tests/failpoints/cases/test_import_service.rs
index 739c3207a4a..590ea70982a 100644
--- a/tests/failpoints/cases/test_import_service.rs
+++ b/tests/failpoints/cases/test_import_service.rs
@@ -1,7 +1,7 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc::channel, Arc, Mutex},
+    sync::{Arc, Mutex, mpsc::channel},
     time::Duration,
 };
 
@@ -9,10 +9,10 @@ use futures::{executor::block_on, stream::StreamExt};
 use grpcio::{ChannelBuilder, Environment};
 use kvproto::{disk_usage::DiskUsage, import_sstpb::*, tikvpb_grpc::TikvClient};
 use tempfile::{Builder, TempDir};
-use test_raftstore::{must_raw_put, Simulator};
+use test_raftstore::{Simulator, must_raw_put};
 use test_sst_importer::*;
 use tikv::config::TikvConfig;
-use tikv_util::{config::ReadableSize, sys::disk, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableSize, sys::disk};
 
 #[allow(dead_code)]
 #[path = "../../integrations/import/util.rs"]
diff --git a/tests/failpoints/cases/test_in_memory_engine.rs b/tests/failpoints/cases/test_in_memory_engine.rs
index 0ce27f3c52d..87f7d39b424 100644
--- a/tests/failpoints/cases/test_in_memory_engine.rs
+++ b/tests/failpoints/cases/test_in_memory_engine.rs
@@ -3,19 +3,19 @@
 use std::{
     fs::File,
     io::Read,
-    sync::{mpsc::sync_channel, Arc, Mutex},
+    sync::{Arc, Mutex, mpsc::sync_channel},
     thread::sleep,
     time::Duration,
 };
 
 use engine_rocks::RocksSstWriterBuilder;
 use engine_traits::{
-    CacheRegion, EvictReason, RegionCacheEngine, RegionCacheEngineExt, SstWriter, SstWriterBuilder,
-    CF_DEFAULT, DATA_CFS,
+    CF_DEFAULT, CacheRegion, DATA_CFS, EvictReason, RegionCacheEngine, RegionCacheEngineExt,
+    SstWriter, SstWriterBuilder,
 };
 use file_system::calc_crc32_bytes;
 use in_memory_engine::test_util::new_region;
-use keys::{data_key, DATA_MAX_KEY, DATA_MIN_KEY};
+use keys::{DATA_MAX_KEY, DATA_MIN_KEY, data_key};
 use kvproto::{
     import_sstpb::SstMeta,
     kvrpcpb::Context,
@@ -28,25 +28,25 @@ use raft::eraftpb::MessageType;
 use raftstore::{
     coprocessor::ObserveHandle,
     store::{
-        fsm::{apply::ChangeObserver, ApplyTask},
+        fsm::{ApplyTask, apply::ChangeObserver},
         msg::Callback,
     },
 };
 use tempfile::tempdir;
 use test_coprocessor::{
-    handle_request, init_data_with_details_pd_client, DagChunkSpliter, DagSelect, ProductTable,
+    DagChunkSpliter, DagSelect, ProductTable, handle_request, init_data_with_details_pd_client,
 };
 use test_raftstore::{
-    configure_for_merge, get_tso, must_get_equal, new_learner_peer, new_peer, new_put_cf_cmd,
-    new_server_cluster_with_hybrid_engine, sleep_ms, CloneFilterFactory, Cluster, Direction,
-    RegionPacketFilter, ServerCluster,
+    CloneFilterFactory, Cluster, Direction, RegionPacketFilter, ServerCluster, configure_for_merge,
+    get_tso, must_get_equal, new_learner_peer, new_peer, new_put_cf_cmd,
+    new_server_cluster_with_hybrid_engine, sleep_ms,
 };
 use test_util::eventually;
 use tidb_query_datatype::{
-    codec::{datum, Datum},
+    codec::{Datum, datum},
     expr::EvalContext,
 };
-use tikv_util::{mpsc::unbounded, HandyRwLock};
+use tikv_util::{HandyRwLock, mpsc::unbounded};
 use tipb::SelectResponse;
 use txn_types::Key;
 
diff --git a/tests/failpoints/cases/test_kv_service.rs b/tests/failpoints/cases/test_kv_service.rs
index c51b6232ba6..c4f8b329028 100644
--- a/tests/failpoints/cases/test_kv_service.rs
+++ b/tests/failpoints/cases/test_kv_service.rs
@@ -2,7 +2,7 @@
 
 use std::{sync::Arc, time::Duration};
 
-use engine_traits::{Peekable, CF_LOCK};
+use engine_traits::{CF_LOCK, Peekable};
 use grpcio::{ChannelBuilder, Environment};
 use kvproto::{
     kvrpcpb::{PrewriteRequestPessimisticAction::SkipPessimisticCheck, *},
@@ -14,7 +14,7 @@ use test_raftstore::{
     must_new_cluster_mul, new_server_cluster, try_kv_prewrite_with, try_kv_prewrite_with_impl,
 };
 use test_raftstore_macro::test_case;
-use tikv_util::{config::ReadableDuration, store::new_peer, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration, store::new_peer};
 use txn_types::Key;
 
 #[test_case(test_raftstore::must_new_cluster_and_kv_client)]
@@ -370,3 +370,46 @@ fn test_scan_locks_with_in_progress_transfer_leader() {
     assert_eq!(scan_lock_resp.locks.to_vec()[1].lock_version, start_ts);
     assert_eq!(scan_lock_resp.locks.to_vec()[1].key, k2);
 }
+
+#[test]
+#[ignore]
+fn test_dup_key_debug() {
+    let (mut cluster, _, mut ctx) = must_new_cluster_and_kv_client_mul(1);
+    cluster.pd_client.disable_default_operator();
+
+    cluster.must_transfer_leader(1, new_peer(1, 1));
+    let leader_peer = cluster.leader_of_region(1).unwrap();
+    ctx.set_peer(leader_peer.clone());
+    let key = b"k";
+    let leader_region = cluster.get_region(key);
+    ctx.set_region_epoch(leader_region.get_region_epoch().clone());
+    let env = Arc::new(Environment::new(1));
+    let channel =
+        ChannelBuilder::new(env).connect(&cluster.sim.rl().get_addr(leader_peer.get_store_id()));
+    let client = TikvClient::new(channel);
+
+    let mut mutation = Mutation::default();
+    mutation.set_op(Op::Put);
+    mutation.set_key(b"k".to_vec());
+    mutation.set_value(b"v".to_vec());
+
+    let mut mutation2 = Mutation::default();
+    mutation2.set_op(Op::Put);
+    mutation2.set_key(b"k".to_vec());
+    mutation2.set_value(b"v2".to_vec());
+    // ERROR would be returned with failpoint.
+    fail::cfg("scheduler_dup_key_check", "return").unwrap();
+    let mut prewrite_req = PrewriteRequest::default();
+    prewrite_req.set_context(ctx);
+    prewrite_req.set_mutations(vec![mutation.clone(), mutation2.clone()].into());
+    prewrite_req.primary_lock = b"k".to_vec();
+    prewrite_req.start_version = 10;
+    prewrite_req.lock_ttl = 3000;
+    prewrite_req.min_commit_ts = prewrite_req.start_version + 1;
+    prewrite_req.use_async_commit = false;
+    prewrite_req.try_one_pc = false;
+    let prewrite_resp = client.kv_prewrite(&prewrite_req).unwrap();
+    assert!(!prewrite_resp.get_errors().is_empty());
+
+    fail::remove("scheduler_dup_key_check");
+}
diff --git a/tests/failpoints/cases/test_memory_usage_limit.rs b/tests/failpoints/cases/test_memory_usage_limit.rs
index ee408ac6d4f..a8dca8338ec 100644
--- a/tests/failpoints/cases/test_memory_usage_limit.rs
+++ b/tests/failpoints/cases/test_memory_usage_limit.rs
@@ -2,8 +2,8 @@
 
 use std::{
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
     time::{Duration, Instant},
 };
@@ -214,11 +214,7 @@ fn test_evict_early_avoids_reject() {
     // process.
     put_n_entries(&mut cluster, 10, 1024);
     wait_msg_counter(append_to_2.clone(), unreachable_to_2.clone(), 10, 0);
-    assert!(
-        append_to_2.load(Ordering::SeqCst) == 10 ||
-         // This value could be 11 if a no-op entry.
-        append_to_2.load(Ordering::SeqCst) == 11
-    );
+    assert_ge!(append_to_2.load(Ordering::SeqCst), 10);
     assert_eq!(unreachable_to_2.load(Ordering::SeqCst), 0);
 
     // Verify that `evict_entry_cache` was triggered by checking that the entry
diff --git a/tests/failpoints/cases/test_merge.rs b/tests/failpoints/cases/test_merge.rs
index 82b0a9bd027..90bdc4b8cfa 100644
--- a/tests/failpoints/cases/test_merge.rs
+++ b/tests/failpoints/cases/test_merge.rs
@@ -3,14 +3,14 @@
 use std::{
     sync::{
         atomic::{AtomicBool, Ordering},
-        mpsc::{channel, sync_channel, Sender},
+        mpsc::{Sender, channel, sync_channel},
         *,
     },
     thread,
     time::Duration,
 };
 
-use engine_traits::{Peekable, CF_DEFAULT, CF_RAFT};
+use engine_traits::{CF_DEFAULT, CF_RAFT, Peekable};
 use grpcio::{ChannelBuilder, Environment};
 use kvproto::{
     kvrpcpb::{PrewriteRequestPessimisticAction::*, *},
@@ -24,8 +24,8 @@ use raftstore::{router::RaftStoreRouter, store::*};
 use raftstore_v2::router::{PeerMsg, PeerTick};
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv::storage::{kv::SnapshotExt, Snapshot};
-use tikv_util::{config::*, future::block_on_timeout, time::Instant, HandyRwLock};
+use tikv::storage::{Snapshot, kv::SnapshotExt};
+use tikv_util::{HandyRwLock, config::*, future::block_on_timeout, time::Instant};
 use txn_types::{Key, LastChange, PessimisticLock};
 
 /// Test if merge is rollback as expected.
@@ -1382,12 +1382,11 @@ fn test_source_peer_read_delegate_after_apply() {
     sleep_ms(100);
 
     assert!(
-        cluster.store_metas[&1]
+        !cluster.store_metas[&1]
             .lock()
             .unwrap()
             .readers
-            .get(&source.get_id())
-            .is_none()
+            .contains_key(&source.get_id())
     );
 }
 
@@ -2271,7 +2270,7 @@ fn test_destroy_race_during_atomic_snapshot_after_merge() {
     cluster.must_put(b"k4", b"v4");
 }
 
-// `test_raft_log_gc_after_merge` tests when a region is destoryed, e.g. due to
+// `test_raft_log_gc_after_merge` tests when a region is destroyed, e.g. due to
 // region merge, PeerFsm can still handle pending raft messages correctly.
 #[test]
 fn test_raft_log_gc_after_merge() {
diff --git a/tests/failpoints/cases/test_pd_client.rs b/tests/failpoints/cases/test_pd_client.rs
index 556067dfdae..5aab7f7ad7e 100644
--- a/tests/failpoints/cases/test_pd_client.rs
+++ b/tests/failpoints/cases/test_pd_client.rs
@@ -2,7 +2,7 @@
 
 use std::{
     cell::RefCell,
-    sync::{mpsc, Arc},
+    sync::{Arc, mpsc},
     thread,
     time::Duration,
 };
@@ -12,7 +12,7 @@ use grpcio::EnvBuilder;
 use kvproto::metapb::*;
 use pd_client::{PdClientV2, RegionInfo, RpcClientV2};
 use security::{SecurityConfig, SecurityManager};
-use test_pd::{mocker::*, util::*, Server as MockServer};
+use test_pd::{Server as MockServer, mocker::*, util::*};
 use tikv_util::config::ReadableDuration;
 use txn_types::TimeStamp;
 
diff --git a/tests/failpoints/cases/test_pd_client_legacy.rs b/tests/failpoints/cases/test_pd_client_legacy.rs
index c1dc2ff5304..5d92f4854cf 100644
--- a/tests/failpoints/cases/test_pd_client_legacy.rs
+++ b/tests/failpoints/cases/test_pd_client_legacy.rs
@@ -1,7 +1,7 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc, Arc},
+    sync::{Arc, mpsc},
     thread,
     time::Duration,
 };
@@ -10,7 +10,7 @@ use grpcio::EnvBuilder;
 use kvproto::metapb::*;
 use pd_client::{PdClient, RegionInfo, RegionStat, RpcClient};
 use security::{SecurityConfig, SecurityManager};
-use test_pd::{mocker::*, util::*, Server as MockServer};
+use test_pd::{Server as MockServer, mocker::*, util::*};
 use tikv_util::config::ReadableDuration;
 
 fn new_test_server_and_client(
diff --git a/tests/failpoints/cases/test_pending_peers.rs b/tests/failpoints/cases/test_pending_peers.rs
index b584f24c83c..4cb820e10ab 100644
--- a/tests/failpoints/cases/test_pending_peers.rs
+++ b/tests/failpoints/cases/test_pending_peers.rs
@@ -84,7 +84,7 @@ fn test_pending_snapshot() {
     cluster.clear_send_filters();
     let start = Instant::now();
     loop {
-        if cluster.pd_client.get_pending_peers().get(&1).is_none()
+        if !cluster.pd_client.get_pending_peers().contains_key(&1)
             || start.saturating_elapsed() > election_timeout * 10
         {
             break;
diff --git a/tests/failpoints/cases/test_rawkv.rs b/tests/failpoints/cases/test_rawkv.rs
index 12ec2d4d4ee..57a69f3ea2b 100644
--- a/tests/failpoints/cases/test_rawkv.rs
+++ b/tests/failpoints/cases/test_rawkv.rs
@@ -11,7 +11,7 @@ use kvproto::{
     tikvpb::TikvClient,
 };
 use test_raftstore::*;
-use tikv_util::{time::Instant, HandyRwLock};
+use tikv_util::{HandyRwLock, time::Instant};
 
 struct TestSuite {
     pub cluster: Cluster<ServerCluster>,
diff --git a/tests/failpoints/cases/test_read_execution_tracker.rs b/tests/failpoints/cases/test_read_execution_tracker.rs
index 372c01bcad2..b9960900ef4 100644
--- a/tests/failpoints/cases/test_read_execution_tracker.rs
+++ b/tests/failpoints/cases/test_read_execution_tracker.rs
@@ -1,7 +1,7 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
 
 use kvproto::kvrpcpb::*;
-use test_coprocessor::{init_with_data, DagSelect, ProductTable};
+use test_coprocessor::{DagSelect, ProductTable, init_with_data};
 use test_raftstore::{
     configure_for_lease_read, kv_batch_read, kv_read, must_kv_commit, must_kv_prewrite,
 };
diff --git a/tests/failpoints/cases/test_replica_read.rs b/tests/failpoints/cases/test_replica_read.rs
index 7b8f5c65132..3945b2c473d 100644
--- a/tests/failpoints/cases/test_replica_read.rs
+++ b/tests/failpoints/cases/test_replica_read.rs
@@ -1,21 +1,28 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::AtomicBool, Arc, Mutex},
-    thread,
+    sync::{Arc, Mutex, atomic::AtomicBool, mpsc},
+    thread::{self, spawn},
     time::Duration,
 };
 
 use crossbeam::channel;
-use engine_traits::RaftEngineReadOnly;
+use engine_traits::{Peekable, RaftEngineReadOnly};
 use futures::executor::block_on;
-use kvproto::raft_serverpb::{PeerState, RaftMessage, RegionLocalState};
+use kvproto::{
+    kvrpcpb::{Context, KeyRange},
+    pdpb,
+    raft_cmdpb::CmdType,
+    raft_serverpb::{PeerState, RaftMessage, RegionLocalState},
+};
+use pd_client::PdClient;
 use raft::eraftpb::MessageType;
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv::storage::config::EngineType;
-use tikv_util::{config::ReadableDuration, future::block_on_timeout, HandyRwLock};
-use txn_types::{Key, Lock, LockType};
+use tikv::storage::{config::EngineType, kv::SnapContext};
+use tikv_kv::{Engine, ErrorInner, Result, Snapshot};
+use tikv_util::{HandyRwLock, config::ReadableDuration, future::block_on_timeout};
+use txn_types::{Key, Lock, LockType, TimeStamp};
 
 #[test_case(test_raftstore::new_node_cluster)]
 #[test_case(test_raftstore_v2::new_node_cluster)]
@@ -837,6 +844,14 @@ fn test_read_index_cache() {
     let leader_id = 1;
     let r1 = cluster.get_region(b"k1");
 
+    for store_id in 1..=5 {
+        assert_eq!(
+            get_region_read_index_safe_ts(&cluster, store_id, rid),
+            0,
+            "initial state should be zero"
+        );
+    }
+
     // k1 has a memory lock on the new leader
     let leader_cm = cluster.sim.rl().get_concurrency_manager(leader_id);
     let lock = Lock::new(
@@ -859,8 +874,8 @@ fn test_read_index_cache() {
         // peer 1. But the lease of peer 1 has expired and it cannot get majority of
         // heartbeat. So, we cannot get the result here.
         fail::cfg(
-            "reading_from_cache",
-            "panic(reading_from_cache_not_allowed)",
+            "reading_from_follower_read_cache",
+            "panic(reading_from_follower_read_cache_not_allowed)",
         )
         .unwrap();
 
@@ -882,9 +897,10 @@ fn test_read_index_cache() {
         Some(2),
         Duration::from_millis(2000),
     );
+    assert_eq!(get_region_read_index_safe_ts(&cluster, 2, rid), 2);
 
     // this read should be from cache
-    fail::remove("reading_from_cache");
+    fail::remove("reading_from_follower_read_cache");
     fail::cfg(
         "reading_from_leader",
         "panic(reading_from_leader_not_allowed)",
@@ -902,16 +918,491 @@ fn test_read_index_cache() {
     // this read should be from leader
     fail::remove("reading_from_leader");
     fail::cfg(
-        "reading_from_cache",
-        "panic(reading_from_cache_not_allowed)",
+        "reading_from_follower_read_cache",
+        "panic(reading_from_follower_read_cache_not_allowed)",
     )
     .unwrap();
     let _ = get_snapshot(
         &mut cluster,
-        new_peer(2, 2),
+        new_peer(1, 1),
         r1.clone(),
         b"k1",
         Some(2),
         Duration::from_millis(2000),
     );
 }
+
+#[test_case(test_raftstore::new_server_cluster)]
+fn test_read_index_cache_in_destroyed_peer() {
+    let cluster = Arc::new(Mutex::new(new_cluster(0, 4)));
+    let pd_client = cluster.lock().unwrap().pd_client.clone();
+
+    fn async_snapshot(
+        cluster: Arc<Mutex<Cluster<ServerCluster>>>,
+        start_ts: TimeStamp,
+        store_id: u64,
+        region_id: u64,
+    ) -> mpsc::Receiver<Result<impl Snapshot + Peekable>> {
+        let cluster = cluster.clone();
+        let pd_client = cluster.lock().unwrap().pd_client.clone();
+        let mut cluster_guard = cluster.lock().unwrap();
+        let region = block_on(pd_client.get_region_by_id(region_id))
+            .unwrap()
+            .unwrap();
+        let epoch = region.get_region_epoch().clone();
+        let peer = region
+            .get_peers()
+            .iter()
+            .find(|p| p.get_store_id() == store_id)
+            .unwrap()
+            .clone();
+        let leader = cluster_guard.leader_of_region(region_id).unwrap();
+        let peer_is_leader = leader.get_id() == peer.get_id();
+        let mut ctx = Context::default();
+        ctx.set_region_id(region_id);
+        ctx.set_peer(peer);
+        ctx.set_region_epoch(epoch);
+        ctx.set_replica_read(!peer_is_leader);
+
+        let mut storage = cluster_guard
+            .sim
+            .rl()
+            .storages
+            .get(&store_id)
+            .unwrap()
+            .clone();
+
+        let (tx, rx) = mpsc::sync_channel(0);
+        spawn(move || {
+            let mut snap_ctx = SnapContext {
+                pb_ctx: &ctx,
+                ..Default::default()
+            };
+            if !peer_is_leader {
+                snap_ctx.key_ranges.push(KeyRange {
+                    start_key: region.get_start_key().to_vec(),
+                    end_key: region.get_end_key().to_vec(),
+                    ..Default::default()
+                });
+            }
+            snap_ctx.start_ts = Some(start_ts);
+            tx.send(block_on(storage.async_snapshot(snap_ctx))).unwrap();
+        });
+        rx
+    }
+
+    let mut cluster_guard = cluster.lock().unwrap();
+    pd_client.disable_default_operator();
+    let region_id = cluster_guard.run_conf_change();
+    pd_client.must_add_peer(region_id, new_peer(2, 2));
+    pd_client.must_add_peer(region_id, new_peer(3, 3));
+    pd_client.region_leader_must_be(region_id, new_peer(1, 1));
+    cluster_guard.must_put(b"k1", b"v1");
+    drop(cluster_guard);
+
+    pd_client.must_add_peer(region_id, new_peer(4, 4));
+
+    let ts1 = block_on(pd_client.get_tso()).unwrap();
+    let ts2 = block_on(pd_client.get_tso()).unwrap();
+    assert!(ts2 > ts1);
+
+    // push read_index_safe_ts to ts2, after that, ts1 can hit local replica read
+    // safely.
+    let rx2 = async_snapshot(cluster.clone(), ts2, 2, region_id);
+    let snap2 = rx2.recv().unwrap().unwrap();
+    let read_opt = engine_traits::ReadOptions::default();
+    assert!(
+        snap2
+            .get_value_opt(&read_opt, b"k1")
+            .unwrap()
+            .unwrap()
+            .eq(&b"v1".as_ref())
+    );
+    // release the snapshot sequence, so it's safe to cleanup the data when peer is
+    // destroied
+    drop(snap2);
+
+    // pause the verification of replica read in the FIRST check.
+    fail::cfg("skip_check_stale_read_safe", "pause").unwrap();
+    let rx1 = async_snapshot(cluster.clone(), ts1, 2, region_id);
+
+    // remove peer 2 and wait for peer destroy is finished.
+    let (tx, rx) = mpsc::sync_channel(0);
+    fail::cfg_callback("after_region_worker_destroy", move || {
+        tx.send(()).unwrap();
+    })
+    .unwrap();
+    pd_client.must_remove_peer(region_id, new_peer(2, 2));
+    rx.recv().unwrap();
+    fail::remove("after_region_worker_destroy");
+
+    // resume the verification of replica read.
+    fail::remove("skip_check_stale_read_safe");
+    match rx1.recv().unwrap() {
+        Ok(snap1) => {
+            // The test is already failed because we receive a snapshot in a destroyed peer.
+            // Go further check the read result from this INVALID snapshot.
+            assert!(
+                snap1
+                    .get_value_opt(&read_opt, b"k1")
+                    .unwrap()
+                    .unwrap()
+                    .eq(&b"v1".as_ref())
+            );
+            unreachable!("should not get a snapshot from a destroyed peer");
+        }
+        Err(err) => match err.0.as_ref() {
+            ErrorInner::Request(req_err) => {
+                assert!(req_err.has_region_not_found());
+                assert_eq!(req_err.get_region_not_found().get_region_id(), 1);
+            }
+            _ => {
+                unreachable!("unexpected error type: {:?}", err.0);
+            }
+        },
+    }
+}
+
+#[test_case(test_raftstore::new_node_cluster)]
+fn test_read_index_cache_region_split() {
+    let mut cluster = new_cluster(0, 5);
+    // Use long election timeout and short lease.
+    configure_for_lease_read(&mut cluster.cfg, Some(50), Some(200));
+    cluster.cfg.raft_store.raft_store_max_leader_lease =
+        ReadableDuration(Duration::from_millis(100));
+
+    let pd_client = Arc::clone(&cluster.pd_client);
+    pd_client.disable_default_operator();
+
+    let rid = cluster.run_conf_change();
+    cluster.must_put(b"k1", b"v1");
+    cluster.must_put(b"k3", b"v3");
+    for i in 2..=5 {
+        pd_client.must_add_peer(rid, new_peer(i, i));
+        must_get_equal(&cluster.get_engine(i), b"k1", b"v1");
+        must_get_equal(&cluster.get_engine(i), b"k3", b"v3");
+    }
+    cluster.must_transfer_leader(1, new_peer(1, 1));
+
+    let region = cluster.get_region(b"k1");
+    let follower_peer = find_peer(&region, 2).unwrap().clone();
+    for k in [b"k1", b"k3"] {
+        let snap = get_snapshot(
+            &mut cluster,
+            follower_peer.clone(),
+            region.clone(),
+            k,
+            Some(10),
+            Duration::from_millis(2000),
+        );
+        assert_eq!(snap.get_responses()[0].get_cmd_type(), CmdType::Snap);
+    }
+
+    let leader_cm = cluster.sim.rl().get_concurrency_manager(1);
+    assert_eq!(leader_cm.max_ts(), 10.into());
+
+    pd_client.must_split_region(region, pdpb::CheckPolicy::Usekey, vec![b"k2".to_vec()]);
+    let left_region = pd_client.get_region(b"k1").unwrap();
+    let right_region = pd_client.get_region(b"k3").unwrap();
+
+    let mut guards = vec![];
+    for key in [b"k1", b"k3"] {
+        let lock = Lock::new(
+            LockType::Put,
+            key.to_vec(),
+            11.into(),
+            20000,
+            None,
+            11.into(),
+            1,
+            11.into(),
+            false,
+        )
+        .use_async_commit(vec![]);
+        let guard = block_on(leader_cm.lock_key(&Key::from_raw(key)));
+        guard.with_lock(|l: &mut Option<Lock>| *l = Some(lock.clone()));
+        guards.push(guard);
+    }
+
+    let all_peers = [
+        left_region
+            .get_peers()
+            .iter()
+            .map(|p| (b"k1", left_region.clone(), p.clone()))
+            .collect::<Vec<_>>(),
+        right_region
+            .get_peers()
+            .iter()
+            .map(|p| (b"k3", right_region.clone(), p.clone()))
+            .collect::<Vec<_>>(),
+    ]
+    .concat();
+    for (key, region, peer) in all_peers {
+        if peer.get_store_id() == 1 {
+            continue;
+        }
+        let snap = get_snapshot(
+            &mut cluster,
+            peer.clone(),
+            region.clone(),
+            key,
+            Some(10),
+            Duration::from_millis(2000),
+        );
+        assert_eq!(
+            snap.get_responses()[0].get_cmd_type(),
+            CmdType::Snap,
+            "snap: {:?}",
+            snap
+        );
+        let snap = get_snapshot(
+            &mut cluster,
+            peer.clone(),
+            region.clone(),
+            key,
+            Some(11),
+            Duration::from_millis(2000),
+        );
+        assert_eq!(
+            snap.get_responses()[0].get_cmd_type(),
+            CmdType::Invalid,
+            "snap: {:?}",
+            snap
+        );
+        assert_eq!(
+            snap.get_responses()[0]
+                .get_read_index()
+                .get_locked()
+                .get_key(),
+            key
+        );
+    }
+}
+
+#[test_case(test_raftstore::new_node_cluster)]
+fn test_read_index_cache_region_merge() {
+    let mut cluster = new_cluster(0, 5);
+    // Use long election timeout and short lease.
+    configure_for_lease_read(&mut cluster.cfg, Some(50), Some(200));
+    cluster.cfg.raft_store.raft_store_max_leader_lease =
+        ReadableDuration(Duration::from_millis(100));
+
+    let pd_client = Arc::clone(&cluster.pd_client);
+    pd_client.disable_default_operator();
+
+    let rid = cluster.run_conf_change();
+    cluster.must_put(b"k1", b"v1");
+    cluster.must_put(b"k3", b"v3");
+    for i in 2..=5 {
+        pd_client.must_add_peer(rid, new_peer(i, i));
+        must_get_equal(&cluster.get_engine(i), b"k1", b"v1");
+        must_get_equal(&cluster.get_engine(i), b"k3", b"v3");
+    }
+    cluster.must_transfer_leader(1, new_peer(1, 1));
+
+    let region = pd_client.get_region(b"k1").unwrap();
+    pd_client.must_split_region(region, pdpb::CheckPolicy::Usekey, vec![b"k2".to_vec()]);
+
+    let left_region = pd_client.get_region(b"k1").unwrap();
+    let left_leader = left_region.get_peers()[0].clone();
+    assert_eq!(left_leader.get_store_id(), 1);
+    let left_follower = left_region.get_peers()[1].clone();
+    let right_region = pd_client.get_region(b"k3").unwrap();
+    let right_leader = right_region.get_peers()[0].clone();
+    let right_follower = right_region.get_peers()[1].clone();
+    assert_eq!(right_leader.get_store_id(), 1);
+    cluster.must_transfer_leader(left_region.get_id(), left_leader);
+    cluster.must_transfer_leader(right_region.get_id(), right_leader);
+
+    // lock k1 on left leader.
+    let leader_cm = cluster.sim.rl().get_concurrency_manager(1);
+
+    // push left region's read_index_safe_ts to 20.
+    let snap = get_snapshot(
+        &mut cluster,
+        left_follower.clone(),
+        left_region.clone(),
+        b"k1",
+        Some(20),
+        Duration::from_millis(2000),
+    );
+    assert_eq!(snap.get_responses()[0].get_cmd_type(), CmdType::Snap);
+    assert_eq!(leader_cm.max_ts(), 20.into());
+
+    // push right region's read_index_safe_ts to 30.
+    let snap = get_snapshot(
+        &mut cluster,
+        right_follower.clone(),
+        right_region.clone(),
+        b"k3",
+        Some(30),
+        Duration::from_millis(2000),
+    );
+    assert_eq!(snap.get_responses()[0].get_cmd_type(), CmdType::Snap);
+    assert_eq!(leader_cm.max_ts(), 30.into());
+
+    let lock = Lock::new(
+        LockType::Put,
+        b"k1".to_vec(),
+        25.into(),
+        20000,
+        None,
+        25.into(),
+        1,
+        25.into(),
+        false,
+    )
+    .use_async_commit(vec![]);
+    let guard = block_on(leader_cm.lock_key(&Key::from_raw(b"k1")));
+    guard.with_lock(|l| *l = Some(lock.clone()));
+
+    let snap = get_snapshot(
+        &mut cluster,
+        left_follower.clone(),
+        left_region.clone(),
+        b"k1",
+        Some(30),
+        Duration::from_millis(2000),
+    );
+    assert_eq!(
+        snap.get_responses()[0].get_cmd_type(),
+        CmdType::Invalid,
+        "snap: {:?}",
+        snap
+    );
+
+    cluster.must_try_merge(left_region.get_id(), right_region.get_id());
+    for i in 1..=5 {
+        cluster.must_region_not_exist(left_region.get_id(), i);
+    }
+    let merged_region = pd_client.get_region(b"k3").unwrap();
+    let merged_follower = merged_region.get_peers()[1].clone();
+    assert_eq!(leader_cm.max_ts(), 30.into());
+    for store_id in 1..=5 {
+        assert_eq!(
+            get_region_read_index_safe_ts(&cluster, store_id, merged_region.get_id()),
+            0,
+            "should reset merged region's read_index_safe_ts"
+        );
+    }
+
+    let snap = get_snapshot(
+        &mut cluster,
+        merged_follower.clone(),
+        merged_region.clone(),
+        b"k1",
+        Some(30),
+        Duration::from_millis(2000),
+    );
+    assert_eq!(
+        snap.get_responses()[0].get_cmd_type(),
+        CmdType::Invalid,
+        "snap: {:?}",
+        snap
+    );
+
+    drop(guard);
+
+    let lock = Lock::new(
+        LockType::Put,
+        b"k1".to_vec(),
+        31.into(),
+        20000,
+        None,
+        31.into(),
+        1,
+        31.into(),
+        false,
+    )
+    .use_async_commit(vec![]);
+    let guard = block_on(leader_cm.lock_key(&Key::from_raw(b"k1")));
+    guard.with_lock(|l| *l = Some(lock.clone()));
+
+    let snap = get_snapshot(
+        &mut cluster,
+        merged_follower.clone(),
+        merged_region.clone(),
+        b"k1",
+        Some(30),
+        Duration::from_millis(2000),
+    );
+    assert_eq!(
+        snap.get_responses()[0].get_cmd_type(),
+        CmdType::Snap,
+        "snap: {:?}",
+        snap
+    );
+
+    // safe_ts > 30 will see the lock.
+    let snap = get_snapshot(
+        &mut cluster,
+        merged_follower.clone(),
+        merged_region.clone(),
+        b"k1",
+        Some(31),
+        Duration::from_millis(2000),
+    );
+    assert_eq!(
+        snap.get_responses()[0].get_cmd_type(),
+        CmdType::Invalid,
+        "snap: {:?}",
+        snap
+    );
+}
+
+#[test_case(test_raftstore::new_node_cluster)]
+fn test_read_index_cache_region_transfer_leader() {
+    // During leader transfer, the new leader's store will update its max_ts from
+    // PD, which is guaranteed to be greater than the old leader's max_ts. Since
+    // the read-index-safe-ts is less than or equal to the old leader's max_ts, the
+    // cache remains correct on the new leader as well.
+    let mut cluster = new_cluster(0, 5);
+    // Use long election timeout and short lease.
+    configure_for_lease_read(&mut cluster.cfg, Some(50), Some(200));
+    cluster.cfg.raft_store.raft_store_max_leader_lease =
+        ReadableDuration(Duration::from_millis(100));
+
+    let pd_client = Arc::clone(&cluster.pd_client);
+    pd_client.disable_default_operator();
+
+    let rid = cluster.run_conf_change();
+    cluster.must_put(b"k1", b"v1");
+    for i in 2..=5 {
+        pd_client.must_add_peer(rid, new_peer(i, i));
+        must_get_equal(&cluster.get_engine(i), b"k1", b"v1");
+    }
+    cluster.must_transfer_leader(1, new_peer(1, 1));
+
+    let ts1 = block_on(pd_client.get_tso()).unwrap();
+
+    let region = cluster.get_region(b"k1");
+    let peers = region.get_peers();
+    for i in 2..=5 {
+        let peer = peers[i - 1].clone();
+        let snap = get_snapshot(
+            &mut cluster,
+            peer.clone(),
+            region.clone(),
+            b"k1",
+            Some(ts1.into_inner()),
+            Duration::from_millis(2000),
+        );
+        assert_eq!(snap.get_responses()[0].get_cmd_type(), CmdType::Snap);
+    }
+
+    let leader_cm = cluster.sim.rl().get_concurrency_manager(1);
+    assert_eq!(leader_cm.max_ts(), ts1);
+    let ts2 = block_on(pd_client.get_tso()).unwrap();
+    cluster.must_transfer_leader(1, peers.last().unwrap().clone());
+    let leader_cm = cluster.sim.rl().get_concurrency_manager(5);
+    // new leader's max_ts > ts2 > ts1 >= read-index-safe-ts
+    assert!(leader_cm.max_ts() > ts2);
+    assert_eq!(
+        get_region_read_index_safe_ts(&cluster, 1, region.get_id()),
+        0,
+        "when leader becomes follower, it's read_index_safe_ts should be 0"
+    );
+    for i in 2..=5 {
+        assert!(get_region_read_index_safe_ts(&cluster, i, region.get_id()) <= ts1.into_inner());
+    }
+}
diff --git a/tests/failpoints/cases/test_server.rs b/tests/failpoints/cases/test_server.rs
index c745442501e..ebc6dd2970d 100644
--- a/tests/failpoints/cases/test_server.rs
+++ b/tests/failpoints/cases/test_server.rs
@@ -3,11 +3,11 @@
 use std::{sync::Arc, thread, time::Duration};
 
 use grpcio::{ChannelBuilder, Environment, ServerBuilder};
-use grpcio_health::{create_health, proto::HealthCheckRequest, HealthClient, ServingStatus};
+use grpcio_health::{HealthClient, ServingStatus, create_health, proto::HealthCheckRequest};
 use pd_client::PdClient;
 use raft::eraftpb::MessageType;
 use test_raftstore::*;
-use tikv_util::{config::ReadableDuration, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration};
 
 /// When encountering raft/batch_raft mismatch store id error, the service is
 /// expected to drop connections in order to let raft_client re-resolve store
diff --git a/tests/failpoints/cases/test_snap.rs b/tests/failpoints/cases/test_snap.rs
index 9bb3ce672a3..8894b0632a2 100644
--- a/tests/failpoints/cases/test_snap.rs
+++ b/tests/failpoints/cases/test_snap.rs
@@ -6,7 +6,7 @@ use std::{
     io,
     io::prelude::*,
     path::PathBuf,
-    sync::{atomic::Ordering, mpsc, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::Ordering, mpsc},
     thread,
     time::Duration,
 };
@@ -16,7 +16,7 @@ use kvproto::raft_serverpb::RaftMessage;
 use raft::eraftpb::MessageType;
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv_util::{config::*, time::Instant, HandyRwLock};
+use tikv_util::{HandyRwLock, config::*, time::Instant};
 
 #[test]
 fn test_overlap_cleanup() {
diff --git a/tests/failpoints/cases/test_split_region.rs b/tests/failpoints/cases/test_split_region.rs
index 575130d4b83..ca5aa137a53 100644
--- a/tests/failpoints/cases/test_split_region.rs
+++ b/tests/failpoints/cases/test_split_region.rs
@@ -1,9 +1,9 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 use std::{
     sync::{
-        atomic::{AtomicBool, Ordering},
-        mpsc::{self, channel, sync_channel},
         Arc, Mutex,
+        atomic::{AtomicBool, Ordering},
+        mpsc::{self, channel},
     },
     thread,
     time::Duration,
@@ -17,30 +17,30 @@ use kvproto::{
         Mutation, Op, PessimisticLockRequest, PrewriteRequest, PrewriteRequestPessimisticAction::*,
     },
     metapb::Region,
-    pdpb::{self, CheckPolicy},
+    pdpb::CheckPolicy,
     raft_serverpb::{PeerState, RaftMessage},
     tikvpb::TikvClient,
 };
 use pd_client::PdClient;
 use raft::eraftpb::MessageType;
 use raftstore::{
+    Result,
     store::{
+        Callback, PeerMsg, WriteResponse,
         config::Config as RaftstoreConfig,
         util::{is_initial_msg, is_vote_msg},
-        Callback, PeerMsg, WriteResponse,
     },
-    Result,
 };
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv::storage::{kv::SnapshotExt, Snapshot};
+use tikv::storage::{Snapshot, kv::SnapshotExt};
 use tikv_util::{
+    HandyRwLock,
     config::{ReadableDuration, ReadableSize},
-    mpsc::{unbounded, Sender},
+    mpsc::{Sender, unbounded},
     time::Instant,
-    HandyRwLock,
 };
-use txn_types::{Key, LastChange, PessimisticLock, TimeStamp};
+use txn_types::{Key, LastChange, PessimisticLock};
 
 #[test]
 fn test_meta_inconsistency() {
@@ -329,7 +329,11 @@ struct PrevoteRangeFilter {
 impl Filter for PrevoteRangeFilter {
     fn before(&self, msgs: &mut Vec<RaftMessage>) -> Result<()> {
         self.filter.before(msgs)?;
-        if let Some(msg) = msgs.iter().filter(|m| is_vote_msg(m.get_message())).last() {
+        if let Some(msg) = msgs
+            .iter()
+            .filter(|m| is_vote_msg(m.get_message()))
+            .next_back()
+        {
             let start_key = msg.get_start_key().to_owned();
             let end_key = msg.get_end_key().to_owned();
             if let Some(before) = self.before.as_ref() {
@@ -701,7 +705,7 @@ fn test_split_continue_when_destroy_peer_after_mem_check() {
     let left_peer_2 = find_peer(&left, 2).cloned().unwrap();
     pd_client.must_remove_peer(left.get_id(), left_peer_2);
 
-    // Make sure it finish mem check before destorying.
+    // Make sure it finish mem check before destroying.
     let (mem_check_tx, mem_check_rx) = crossbeam::channel::bounded(0);
     let on_handle_apply_split_2_fp = "on_handle_apply_split_2_after_mem_check";
     fail::cfg_callback(on_handle_apply_split_2_fp, move || {
@@ -1610,61 +1614,6 @@ fn test_not_reset_has_dirty_data_due_to_slow_split() {
     cluster.must_put(b"k00001", b"val");
 }
 
-#[test]
-fn test_split_region_with_no_valid_split_keys() {
-    let mut cluster = test_raftstore::new_node_cluster(0, 3);
-    cluster.cfg.coprocessor.region_split_size = Some(ReadableSize::kb(1));
-    // `region_split_check_diff` must be set as well after adjusting
-    // `region_split_size`. Otherwise, split checks may be skipped and a split
-    // may not be triggered as expected.
-    cluster.cfg.raft_store.region_split_check_diff = Some(ReadableSize::kb(1));
-    cluster.cfg.raft_store.split_region_check_tick_interval = ReadableDuration::millis(500);
-    cluster.run();
-
-    let (tx, rx) = sync_channel(5);
-    fail::cfg_callback("on_compact_range_cf", move || {
-        tx.send(true).unwrap();
-    })
-    .unwrap();
-
-    let safe_point_inject = "safe_point_inject";
-    fail::cfg(safe_point_inject, "return(100)").unwrap();
-
-    let mut raw_key = String::new();
-    let _ = (0..250)
-        .map(|i: u8| {
-            raw_key.push(i as char);
-        })
-        .collect::<Vec<_>>();
-    for i in 0..20 {
-        let key = Key::from_raw(raw_key.as_bytes());
-        let key = key.append_ts(TimeStamp::new(i));
-        cluster.must_put_cf(CF_WRITE, key.as_encoded(), b"val");
-    }
-
-    // one for default cf, one for write cf
-    rx.recv_timeout(Duration::from_secs(5)).unwrap();
-    rx.recv_timeout(Duration::from_secs(5)).unwrap();
-
-    for i in 0..20 {
-        let key = Key::from_raw(raw_key.as_bytes());
-        let key = key.append_ts(TimeStamp::new(i));
-        cluster.must_put_cf(CF_WRITE, key.as_encoded(), b"val");
-    }
-    // at most one compaction will be triggered for each safe_point
-    rx.try_recv().unwrap_err();
-
-    fail::cfg(safe_point_inject, "return(200)").unwrap();
-    for i in 0..20 {
-        let key = Key::from_raw(raw_key.as_bytes());
-        let key = key.append_ts(TimeStamp::new(i));
-        cluster.must_put_cf(CF_WRITE, key.as_encoded(), b"val");
-    }
-    rx.recv_timeout(Duration::from_secs(5)).unwrap();
-    rx.recv_timeout(Duration::from_secs(5)).unwrap();
-    rx.try_recv().unwrap_err();
-}
-
 /// This test case test if a split failed for some reason,
 /// it can continue run split check and eventually the split will finish
 #[test_case(test_raftstore::new_node_cluster)]
@@ -1727,68 +1676,6 @@ fn test_split_by_split_check_on_keys() {
     cluster.wait_region_split(&region);
 }
 
-fn change(name: &str, value: &str) -> std::collections::HashMap<String, String> {
-    let mut m = std::collections::HashMap::new();
-    m.insert(name.to_owned(), value.to_owned());
-    m
-}
-
-#[test]
-fn test_turn_off_manual_compaction_caused_by_no_valid_split_key() {
-    let mut cluster = new_node_cluster(0, 1);
-    cluster.run();
-    let r = cluster.get_region(b"");
-    cluster.must_split(&r, b"k1");
-    let r = cluster.get_region(b"k1");
-    cluster.must_split(&r, b"k2");
-    cluster.must_put(b"k1", b"val");
-
-    let (tx, rx) = sync_channel(5);
-    fail::cfg_callback("on_compact_range_cf", move || {
-        tx.send(true).unwrap();
-    })
-    .unwrap();
-
-    let safe_point_inject = "safe_point_inject";
-    fail::cfg(safe_point_inject, "return(100)").unwrap();
-
-    {
-        let sim = cluster.sim.rl();
-        let cfg_controller = sim.get_cfg_controller(1).unwrap();
-        cfg_controller
-            .update(change(
-                "raftstore.skip-manual-compaction-in-clean_up-worker",
-                "true",
-            ))
-            .unwrap();
-    }
-
-    let r = cluster.get_region(b"k1");
-    cluster
-        .pd_client
-        .split_region(r.clone(), pdpb::CheckPolicy::Usekey, vec![b"k1".to_vec()]);
-    rx.recv_timeout(Duration::from_secs(1)).unwrap_err();
-
-    {
-        let sim = cluster.sim.rl();
-        let cfg_controller = sim.get_cfg_controller(1).unwrap();
-        cfg_controller
-            .update(change(
-                "raftstore.skip-manual-compaction-in-clean_up-worker",
-                "false",
-            ))
-            .unwrap();
-    }
-
-    cluster
-        .pd_client
-        .split_region(r, pdpb::CheckPolicy::Usekey, vec![b"k1".to_vec()]);
-    fail::cfg(safe_point_inject, "return(200)").unwrap();
-    rx.recv_timeout(Duration::from_secs(1)).unwrap();
-    rx.recv_timeout(Duration::from_secs(1)).unwrap();
-    rx.try_recv().unwrap_err();
-}
-
 /// Test that if the original leader of the parent region is tranfered to
 /// another peer, the new leader of the parent region will notify the new split
 /// region to campaign.
diff --git a/tests/failpoints/cases/test_sst_ingest.rs b/tests/failpoints/cases/test_sst_ingest.rs
index c8deb951143..fe5e2b100a9 100644
--- a/tests/failpoints/cases/test_sst_ingest.rs
+++ b/tests/failpoints/cases/test_sst_ingest.rs
@@ -2,8 +2,8 @@
 
 use std::{
     sync::{
-        mpsc::{sync_channel, Receiver, RecvTimeoutError},
         Arc,
+        mpsc::{Receiver, RecvTimeoutError, sync_channel},
     },
     thread,
     thread::JoinHandle,
diff --git a/tests/failpoints/cases/test_sst_recovery.rs b/tests/failpoints/cases/test_sst_recovery.rs
index da5a3da1a32..34ed579a25c 100644
--- a/tests/failpoints/cases/test_sst_recovery.rs
+++ b/tests/failpoints/cases/test_sst_recovery.rs
@@ -4,7 +4,7 @@ use std::{fmt::Debug, io::Write, path::Path, sync::Arc, time::Duration};
 
 use engine_rocks::RocksEngine;
 use engine_rocks_helper::sst_recovery::*;
-use engine_traits::{CompactExt, Peekable, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, CompactExt, Peekable};
 use test_pd_client::TestPdClient;
 use test_raftstore::*;
 
diff --git a/tests/failpoints/cases/test_stale_peer.rs b/tests/failpoints/cases/test_stale_peer.rs
index bd2a108751b..82fd48b7f98 100644
--- a/tests/failpoints/cases/test_stale_peer.rs
+++ b/tests/failpoints/cases/test_stale_peer.rs
@@ -3,7 +3,7 @@
 use std::{
     fs,
     path::Path,
-    sync::{atomic::AtomicBool, mpsc, Arc},
+    sync::{Arc, atomic::AtomicBool, mpsc},
     thread,
     time::Duration,
 };
@@ -15,7 +15,7 @@ use pd_client::PdClient;
 use raft::eraftpb::MessageType;
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv_util::{config::ReadableDuration, time::Instant, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration, time::Instant};
 
 #[test]
 fn test_one_node_leader_missing() {
@@ -101,7 +101,17 @@ fn test_clean_stale_peer() {
     must_get_equal(&engine, key, value);
     must_get_equal(&cluster.get_engine(3), b"k1", b"v1");
     // Remove the peer 4.
+    let (notify_tx, notify_rx) = mpsc::channel();
+    let notifier_fp = "raftstore_set_region_after_change_peer";
+    fail::cfg_callback(notifier_fp, move || {
+        let _ = notify_tx.send(notifier_fp);
+    })
+    .unwrap();
     pd_client.must_remove_peer(region_id, new_peer(3, 4));
+    assert_eq!(
+        notify_rx.recv_timeout(Duration::from_secs(1)).unwrap(),
+        notifier_fp
+    );
     sleep_ms(500);
     must_get_none(&engine, key);
 }
@@ -401,3 +411,65 @@ fn test_destroy_clean_up_logs_with_unfinished_log_gc() {
     // All logs should be deleted.
     assert!(dest.is_empty(), "{:?}", dest);
 }
+
+#[test_case(test_raftstore::new_node_cluster)]
+fn test_async_destroy_peer_delayed() {
+    let mut cluster = new_node_cluster(0, 3);
+    cluster.cfg.raft_store.pd_store_heartbeat_tick_interval = ReadableDuration::millis(10);
+    cluster.cfg.raft_store.hibernate_regions = false;
+
+    let pd_client = cluster.pd_client.clone();
+    // Disable default max peer count check.
+    pd_client.disable_default_operator();
+
+    let r1 = cluster.run_conf_change();
+
+    // Now region 1 only has peer (1, 1);
+    let (key, value) = (b"k1", b"v1");
+
+    cluster.must_put(key, value);
+    assert_eq!(cluster.get(key), Some(value.to_vec()));
+
+    // add peer (2,2) to region 1.
+    pd_client.must_add_peer(r1, new_peer(2, 2));
+
+    // add peer (3, 3) to region 1.
+    pd_client.must_add_peer(r1, new_peer(3, 3));
+
+    let epoch = pd_client.get_region_epoch(r1);
+
+    // Conf version must change.
+    assert!(epoch.get_conf_ver() > 2);
+
+    // Transfer leader to peer (2, 2).
+    cluster.must_transfer_leader(r1, new_peer(2, 2));
+
+    // Pause destroy peer
+    let (tx, rx) = mpsc::sync_channel(1);
+    let pause_destroy_peer_fp = "destroy_peer_after_pending_move";
+    fail::cfg_callback(pause_destroy_peer_fp, move || {
+        tx.send(pause_destroy_peer_fp).unwrap();
+    })
+    .unwrap();
+
+    // Remove the peer 3 and the relevant destroying handling should be
+    // paused
+    pd_client.must_remove_peer(r1, new_peer(3, 3));
+    assert_eq!(
+        rx.recv_timeout(Duration::from_secs(5)).unwrap(),
+        pause_destroy_peer_fp
+    );
+
+    // Add a new peer 4 to store 3, and remove the failpoint to enable
+    // the racing condition that the pending region has been added
+    // a new peer while the destroying task of the old peer is executing
+    // concurrentl.
+    pd_client.must_add_peer(r1, new_peer(3, 4));
+    fail::remove(pause_destroy_peer_fp);
+
+    // Again, remove the peer, and check the data should be cleared.
+    pd_client.must_remove_peer(r1, new_peer(3, 4));
+    sleep_ms(100); // wait for clearing data asynchronously.
+    let region = block_on(pd_client.get_region_by_id(r1)).unwrap();
+    must_region_cleared(&cluster.get_all_engines(3), &region.unwrap());
+}
diff --git a/tests/failpoints/cases/test_stale_read.rs b/tests/failpoints/cases/test_stale_read.rs
index cd12a80de80..684be1728a5 100644
--- a/tests/failpoints/cases/test_stale_read.rs
+++ b/tests/failpoints/cases/test_stale_read.rs
@@ -1,7 +1,7 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::*, mpsc, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::*, mpsc},
     thread,
     time::Duration,
 };
@@ -11,7 +11,7 @@ use pd_client::PdClient;
 use raft::eraftpb::MessageType;
 use raftstore::store::Callback;
 use test_raftstore::*;
-use tikv_util::{config::*, HandyRwLock};
+use tikv_util::{HandyRwLock, config::*};
 
 fn stale_read_during_splitting(right_derive: bool) {
     let count = 3;
@@ -465,6 +465,19 @@ fn test_read_after_peer_destroyed() {
     sleep_ms(200);
     fail::remove(destroy_peer_fp);
 
+    // Validate the async destroy progress.
+    let check_state_on_raft_gc_log_tick = "check_state_on_raft_gc_log_tick";
+    let (gc_tx, gc_rx) = mpsc::sync_channel(1);
+    fail::cfg_callback(check_state_on_raft_gc_log_tick, move || {
+        gc_tx.send(check_state_on_raft_gc_log_tick).unwrap();
+    })
+    .unwrap();
+    assert_eq!(
+        gc_rx.recv_timeout(Duration::from_secs(5)).unwrap(),
+        check_state_on_raft_gc_log_tick
+    );
+    fail::remove(check_state_on_raft_gc_log_tick);
+
     let resp = rx.recv_timeout(Duration::from_millis(200)).unwrap();
     assert!(
         resp.get_header().get_error().has_region_not_found(),
diff --git a/tests/failpoints/cases/test_stats.rs b/tests/failpoints/cases/test_stats.rs
index 7bc97edf759..475e54950cb 100644
--- a/tests/failpoints/cases/test_stats.rs
+++ b/tests/failpoints/cases/test_stats.rs
@@ -6,10 +6,13 @@ use tikv_util::config::*;
 
 #[test]
 fn test_bucket_stats() {
+    // set hibernate_regions to false to prevent region from becoming idle
+    // before bucket information is reported to pd
     let (mut cluster, client, ctx) = must_new_and_configure_cluster_and_kv_client(|cluster| {
         cluster.cfg.coprocessor.enable_region_bucket = Some(true);
         cluster.cfg.raft_store.split_region_check_tick_interval = ReadableDuration::days(1);
         cluster.cfg.raft_store.report_region_buckets_tick_interval = ReadableDuration::millis(100);
+        cluster.cfg.raft_store.hibernate_regions = false;
     });
 
     let fp = "mock_tick_interval";
diff --git a/tests/failpoints/cases/test_storage.rs b/tests/failpoints/cases/test_storage.rs
index f4d8cb5577f..dca0341b068 100644
--- a/tests/failpoints/cases/test_storage.rs
+++ b/tests/failpoints/cases/test_storage.rs
@@ -2,9 +2,9 @@
 
 use std::{
     sync::{
-        atomic::{AtomicBool, Ordering},
-        mpsc::{channel, RecvTimeoutError},
         Arc, Mutex,
+        atomic::{AtomicBool, Ordering},
+        mpsc::{RecvTimeoutError, channel},
     },
     thread,
     time::Duration,
@@ -28,21 +28,20 @@ use test_raftstore_macro::test_case;
 use tikv::{
     config::{ConfigController, Module},
     storage::{
-        self,
+        self, Error as StorageError, ErrorInner as StorageErrorInner,
         config_manager::StorageConfigManger,
         kv::{Error as KvError, ErrorInner as KvErrorInner, SnapContext, SnapshotExt},
         lock_manager::MockLockManager,
         mvcc::{Error as MvccError, ErrorInner as MvccErrorInner},
         test_util::*,
         txn::{
-            commands,
+            Error as TxnError, ErrorInner as TxnErrorInner, commands,
             flow_controller::{EngineFlowController, FlowController},
-            Error as TxnError, ErrorInner as TxnErrorInner,
         },
-        Error as StorageError, ErrorInner as StorageErrorInner, *,
+        *,
     },
 };
-use tikv_util::{future::paired_future_callback, worker::dummy_scheduler, HandyRwLock};
+use tikv_util::{HandyRwLock, future::paired_future_callback, worker::dummy_scheduler};
 use txn_types::{Key, Mutation, TimeStamp};
 
 #[test_case(test_raftstore::new_server_cluster)]
diff --git a/tests/failpoints/cases/test_table_properties.rs b/tests/failpoints/cases/test_table_properties.rs
index 559ad5b0746..6c0e1f5c759 100644
--- a/tests/failpoints/cases/test_table_properties.rs
+++ b/tests/failpoints/cases/test_table_properties.rs
@@ -2,21 +2,21 @@
 
 use api_version::{ApiV2, KvFormat, RawValue};
 use engine_rocks::RocksEngine;
-use engine_traits::{MiscExt, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, MiscExt};
 use kvproto::kvrpcpb::{Context, *};
 use tempfile::TempDir;
 use tikv::{
     config::DbConfig,
     server::gc_worker::{
+        STAT_RAW_KEYMODE, TestGcRunner,
         compaction_filter::{
-            test_utils::rocksdb_level_files, GC_COMPACTION_FILTER_PERFORM,
-            GC_COMPACTION_FILTER_SKIP,
+            GC_COMPACTION_FILTER_PERFORM, GC_COMPACTION_FILTER_SKIP,
+            test_utils::rocksdb_level_files,
         },
-        TestGcRunner, STAT_RAW_KEYMODE,
     },
     storage::{
-        kv::{Modify, TestEngineBuilder, WriteData},
         Engine,
+        kv::{Modify, TestEngineBuilder, WriteData},
     },
 };
 use txn_types::{Key, TimeStamp};
diff --git a/tests/failpoints/cases/test_titan.rs b/tests/failpoints/cases/test_titan.rs
new file mode 100644
index 00000000000..1d7f63c8660
--- /dev/null
+++ b/tests/failpoints/cases/test_titan.rs
@@ -0,0 +1,166 @@
+use engine_rocks::BlobRunMode;
+use engine_traits::{CF_DEFAULT, CompactExt, ManualCompactionOptions, MiscExt};
+use test_raftstore::*;
+use tikv_util::config::{ReadableDuration, ReadableSize};
+
+// Test Titan can be turned off even if there are blob indices left in the
+// sst files due to unfinished data cleanup during peer removal.
+// Peer removal first delete SST files that are fully covered by the region's
+// range, and then delete residual key-value pairs in rest of the SST files.
+// They are not atomic. It is possible that this strategy expose some older
+// RocksDB MVCC versions, causing deleted key-blob_ref pairs to be visible to
+// TiKV.
+#[test]
+fn test_titan() {
+    let mut cluster = new_node_cluster(0, 3);
+    cluster.cfg.raft_store.raft_engine_purge_interval = ReadableDuration::secs(0);
+    cluster.cfg.gc.enable_compaction_filter = false;
+    cluster.cfg.rocksdb.titan.enabled = Some(true);
+    cluster.cfg.rocksdb.defaultcf.disable_auto_compactions = true;
+    cluster.cfg.rocksdb.defaultcf.titan.min_blob_size = Some(ReadableSize::kb(10));
+    cluster.cfg.rocksdb.defaultcf.titan.min_gc_batch_size = ReadableSize::kb(0);
+    cluster.cfg.rocksdb.writecf.disable_auto_compactions = true;
+    cluster.run();
+
+    cluster.pd_client.disable_default_operator();
+
+    let region = cluster.get_region(b"k1");
+
+    let split_key = b"k2";
+    cluster.must_split(&region, split_key);
+    let region1 = cluster.get_region(b"k1");
+    // k1's value will be stored in blob file
+    // k3's value will be stored in sst file
+    cluster.must_put(b"k1", &b"v".repeat(20000));
+    cluster.must_put(b"k3", &b"v".repeat(5000));
+
+    let peer_on_store1 = region1
+        .get_peers()
+        .iter()
+        .find(|p| p.get_store_id() == 1)
+        .unwrap()
+        .clone();
+
+    cluster.must_transfer_leader(region1.get_id(), peer_on_store1);
+
+    cluster.engines[&3].kv.flush_cf(CF_DEFAULT, true).unwrap();
+    cluster.engines[&3]
+        .kv
+        .compact_range_cf(
+            CF_DEFAULT,
+            None,
+            None,
+            ManualCompactionOptions::new(true, 1, true),
+        )
+        .unwrap();
+    let db = cluster.engines[&3].kv.as_inner();
+    let defaultcf = db.cf_handle(CF_DEFAULT).unwrap();
+    assert_eq!(
+        1,
+        db.get_property_int_cf(defaultcf, "rocksdb.num-files-at-level6")
+            .unwrap()
+    );
+    assert_eq!(
+        1,
+        db.get_property_int_cf(defaultcf, "rocksdb.titandb.num-live-blob-file")
+            .unwrap()
+    );
+    // lv6: file0 [k1: ref_to_blob_file, k3: v]
+    // blob db: file0 [k1: v]
+
+    // Restart node 3 with titan in fallback mode
+    cluster.cfg.rocksdb.defaultcf.titan.blob_run_mode = BlobRunMode::Fallback;
+    cluster.cfg.rocksdb.defaultcf.titan.discardable_ratio = 1.0;
+    cluster.stop_node(3);
+    cluster.restart_engine(3);
+    cluster.run_node(3).unwrap();
+    // Check blob file is deleted
+    let mut blob_file_reclaimed = false;
+    let db = cluster.engines[&3].kv.as_inner();
+    let defaultcf = db.cf_handle(CF_DEFAULT).unwrap();
+    for _i in 0..10 {
+        if db
+            .get_property_int_cf(defaultcf, "rocksdb.titandb.num-live-blob-file")
+            .unwrap()
+            == 0
+        {
+            blob_file_reclaimed = true;
+            break;
+        }
+        sleep_ms(100);
+    }
+    assert!(blob_file_reclaimed);
+    cluster.engines[&3].kv.flush_cf(CF_DEFAULT, true).unwrap();
+    assert_eq!(
+        1,
+        db.get_property_int_cf(defaultcf, "rocksdb.num-files-at-level0")
+            .unwrap()
+    );
+    cluster.engines[&3]
+        .kv
+        .compact_files_in_range_cf(CF_DEFAULT, None, None, Some(5))
+        .unwrap();
+    assert_eq!(
+        1,
+        db.get_property_int_cf(defaultcf, "rocksdb.num-files-at-level6")
+            .unwrap()
+    );
+    assert_eq!(
+        1,
+        db.get_property_int_cf(defaultcf, "rocksdb.num-files-at-level5")
+            .unwrap()
+    );
+    // lv5: file1 [k1: v]
+    // lv6: file0 [k1: ref_to_blob_file, k3: v]
+
+    cluster.cfg.rocksdb.titan.enabled = Some(false);
+    cluster.stop_node(3);
+    cluster.restart_engine(3);
+    cluster.run_node(3).unwrap();
+    // Deletion record written by blob file GC is deleted by DeleteFiles, while the
+    // original record that is suppose to be deleted by DeleteByWriter is not
+    // deleted.
+    fail::cfg("after_delete_files_in_range", "return()").unwrap();
+    let peer = region1
+        .get_peers()
+        .iter()
+        .find(|p| p.get_store_id() == 3)
+        .unwrap()
+        .clone();
+    cluster
+        .pd_client
+        .must_remove_peer(region1.get_id(), peer.clone());
+    cluster.must_remove_region(3, region1.get_id());
+    cluster.engines[&3]
+        .kv
+        .compact_files_in_range_cf(CF_DEFAULT, None, None, None)
+        .unwrap();
+    // lv5: empty, file 1 got deleted, since it is fully covered by region1
+    // lv6: file0 [k1: ref_to_blob_file, k3: v]
+    let db = cluster.engines[&3].kv.as_inner();
+    let defaultcf = db.cf_handle(CF_DEFAULT).unwrap();
+    assert_eq!(
+        0,
+        db.get_property_int_cf(defaultcf, "rocksdb.num-files-at-level5")
+            .unwrap()
+    );
+    assert_eq!(
+        1,
+        db.get_property_int_cf(defaultcf, "rocksdb.num-files-at-level6")
+            .unwrap()
+    );
+    // lv5: file1 got deleted, since it is fully covered by region1
+    // lv6: file0 [k1: ref_to_blob_file, k3: v]
+    // blob db: file0 [k1: v]
+    cluster
+        .pd_client
+        .must_add_peer(region1.get_id(), peer.clone());
+    fail::remove("after_delete_files_in_range");
+    cluster.must_transfer_leader(region1.get_id(), peer.clone());
+    assert_eq!(cluster.must_get(b"k1").unwrap(), b"v".repeat(20000));
+    cluster.must_put(b"k11", &b"v".repeat(30000));
+    assert_eq!(cluster.must_get(b"k11").unwrap(), b"v".repeat(30000));
+    // TiKV does not crash, even the add peer will clean up the data again,
+    // thus able to see the obesolete blob reference, the blob reference will
+    // not be evaluated.
+}
diff --git a/tests/failpoints/cases/test_transaction.rs b/tests/failpoints/cases/test_transaction.rs
index af5b4946f50..c86fe2b568b 100644
--- a/tests/failpoints/cases/test_transaction.rs
+++ b/tests/failpoints/cases/test_transaction.rs
@@ -2,16 +2,16 @@
 
 use std::{
     sync::{
+        Arc, Mutex,
         atomic::{AtomicBool, Ordering},
         mpsc::{channel, sync_channel},
-        Arc, Mutex,
     },
     thread,
     time::Duration,
 };
 
 use engine_traits::CF_DEFAULT;
-use futures::{executor::block_on, StreamExt};
+use futures::{StreamExt, executor::block_on};
 use grpcio::{ChannelBuilder, Environment};
 use kvproto::{
     kvrpcpb::{
@@ -31,13 +31,13 @@ use storage::{
     txn::{self, commands},
 };
 use test_raftstore::{
-    configure_for_lease_read, new_learner_peer, new_server_cluster, try_kv_prewrite,
-    DropMessageFilter,
+    DropMessageFilter, configure_for_lease_read, new_learner_peer, new_server_cluster,
+    try_kv_prewrite,
 };
 use tikv::{
     server::gc_worker::gc_by_compact,
     storage::{
-        self,
+        self, Snapshot, TestEngineBuilder, TestStorageBuilderApiV1,
         kv::SnapshotExt,
         lock_manager::MockLockManager,
         txn::tests::{
@@ -45,14 +45,13 @@ use tikv::{
             must_pessimistic_prewrite_put, must_pessimistic_prewrite_put_err, must_prewrite_put,
             must_prewrite_put_err, must_rollback,
         },
-        Snapshot, TestEngineBuilder, TestStorageBuilderApiV1,
     },
 };
 use tikv_kv::{Engine, Modify, WriteData, WriteEvent};
 use tikv_util::{
+    HandyRwLock,
     config::ReadableDuration,
     store::{new_peer, peer::new_incoming_voter},
-    HandyRwLock,
 };
 use txn_types::{Key, LastChange, Mutation, PessimisticLock, TimeStamp};
 
diff --git a/tests/failpoints/cases/test_transfer_leader.rs b/tests/failpoints/cases/test_transfer_leader.rs
index b856d0afdbd..4b8e691231b 100644
--- a/tests/failpoints/cases/test_transfer_leader.rs
+++ b/tests/failpoints/cases/test_transfer_leader.rs
@@ -2,8 +2,8 @@
 
 use std::{
     sync::{
-        mpsc::{self, channel},
         Arc, Mutex,
+        mpsc::{self, channel},
     },
     thread,
     time::Duration,
@@ -21,8 +21,8 @@ use test_raftstore::*;
 use test_raftstore_macro::test_case;
 use tikv::storage::Snapshot;
 use tikv_util::{
-    config::{ReadableDuration, ReadableSize},
     HandyRwLock,
+    config::{ReadableDuration, ReadableSize},
 };
 use txn_types::{Key, LastChange, PessimisticLock};
 
diff --git a/tests/failpoints/cases/test_ttl.rs b/tests/failpoints/cases/test_ttl.rs
index 294b3b9481d..198227172be 100644
--- a/tests/failpoints/cases/test_ttl.rs
+++ b/tests/failpoints/cases/test_ttl.rs
@@ -2,9 +2,9 @@
 
 use std::{iter::Iterator as StdIterator, sync::mpsc::channel, time::Duration};
 
-use api_version::{test_kv_format_impl, ApiV1Ttl, KvFormat, RawValue};
+use api_version::{ApiV1Ttl, KvFormat, RawValue, test_kv_format_impl};
 use engine_rocks::{raw::CompactOptions, util::get_cf_handle};
-use engine_traits::{IterOptions, MiscExt, Peekable, SyncMutable, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, IterOptions, MiscExt, Peekable, SyncMutable};
 use futures::executor::block_on;
 use kvproto::{kvrpcpb, kvrpcpb::Context};
 use tikv::{
@@ -14,11 +14,11 @@ use tikv::{
         ttl::check_ttl_and_compact_files,
     },
     storage::{
+        Engine, Iterator, Snapshot, Statistics, TestStorageBuilder,
         kv::{SnapContext, TestEngineBuilder},
         lock_manager::MockLockManager,
         raw::encoded::RawEncodeSnapshot,
         test_util::{expect_ok_callback, expect_value},
-        Engine, Iterator, Snapshot, Statistics, TestStorageBuilder,
     },
 };
 use txn_types::Key;
diff --git a/tests/failpoints/cases/test_unsafe_recovery.rs b/tests/failpoints/cases/test_unsafe_recovery.rs
index 1ff77023b74..da3ee3eb362 100644
--- a/tests/failpoints/cases/test_unsafe_recovery.rs
+++ b/tests/failpoints/cases/test_unsafe_recovery.rs
@@ -2,7 +2,7 @@
 
 use std::{iter::FromIterator, sync::Arc, time::Duration};
 
-use engine_traits::{Peekable, RaftEngineReadOnly, CF_RAFT};
+use engine_traits::{CF_RAFT, Peekable, RaftEngineReadOnly};
 use futures::executor::block_on;
 use kvproto::{
     metapb, pdpb,
@@ -12,7 +12,7 @@ use pd_client::PdClient;
 use raft::eraftpb::MessageType;
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv_util::{config::ReadableDuration, mpsc, store::find_peer, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration, mpsc, store::find_peer};
 
 #[test_case(test_raftstore::new_node_cluster)]
 #[test_case(test_raftstore_v2::new_node_cluster)]
diff --git a/tests/integrations/backup/disk_snap.rs b/tests/integrations/backup/disk_snap.rs
index 4f9d0de6ff4..2549821373b 100644
--- a/tests/integrations/backup/disk_snap.rs
+++ b/tests/integrations/backup/disk_snap.rs
@@ -7,9 +7,9 @@ use kvproto::raft_cmdpb::{CmdType, PutRequest, RaftCmdRequest, Request};
 use raft::prelude::MessageType;
 use raftstore::store::Callback;
 use test_backup::disk_snap::{
-    assert_failure, assert_failure_because, assert_success, must_wait_apply_success, Suite,
+    Suite, assert_failure, assert_failure_because, assert_success, must_wait_apply_success,
 };
-use test_raftstore::{must_contains_error, Direction, RegionPacketFilter, Simulator};
+use test_raftstore::{Direction, RegionPacketFilter, Simulator, must_contains_error};
 use test_util::eventually;
 use tikv_util::HandyRwLock;
 
diff --git a/tests/integrations/backup/mod.rs b/tests/integrations/backup/mod.rs
index 79f3f8fcd80..6fb68818483 100644
--- a/tests/integrations/backup/mod.rs
+++ b/tests/integrations/backup/mod.rs
@@ -5,7 +5,7 @@ use std::{fs::File, time::Duration};
 use engine_traits::{CF_DEFAULT, CF_WRITE};
 use external_storage::{create_storage, make_local_backend};
 use file_system::calc_crc32_bytes;
-use futures::{executor::block_on, AsyncReadExt, StreamExt};
+use futures::{AsyncReadExt, StreamExt, executor::block_on};
 use kvproto::{
     import_sstpb::*,
     kvrpcpb::*,
diff --git a/tests/integrations/config/dynamic/gc_worker.rs b/tests/integrations/config/dynamic/gc_worker.rs
index bf3f2c0c7b8..e896d80457d 100644
--- a/tests/integrations/config/dynamic/gc_worker.rs
+++ b/tests/integrations/config/dynamic/gc_worker.rs
@@ -1,11 +1,11 @@
 // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc::channel, Arc},
+    sync::{Arc, mpsc::channel},
     time::Duration,
 };
 
-use raftstore::coprocessor::{region_info_accessor::MockRegionInfoProvider, CoprocessorHost};
+use raftstore::coprocessor::{CoprocessorHost, region_info_accessor::MockRegionInfoProvider};
 use tikv::{
     config::{ConfigController, Module, TikvConfig},
     server::gc_worker::{GcConfig, GcTask, GcWorker},
diff --git a/tests/integrations/config/dynamic/pessimistic_txn.rs b/tests/integrations/config/dynamic/pessimistic_txn.rs
index 4eede34a3cb..3eda423b596 100644
--- a/tests/integrations/config/dynamic/pessimistic_txn.rs
+++ b/tests/integrations/config/dynamic/pessimistic_txn.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::Ordering, mpsc, Arc},
+    sync::{Arc, atomic::Ordering, mpsc},
     time::Duration,
 };
 
diff --git a/tests/integrations/config/dynamic/raftstore.rs b/tests/integrations/config/dynamic/raftstore.rs
index 49e44153119..b55bf723a63 100644
--- a/tests/integrations/config/dynamic/raftstore.rs
+++ b/tests/integrations/config/dynamic/raftstore.rs
@@ -2,23 +2,23 @@
 
 use std::{
     iter::FromIterator,
-    sync::{atomic::AtomicU64, mpsc, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::AtomicU64, mpsc},
     time::Duration,
 };
 
 use concurrency_manager::ConcurrencyManager;
 use engine_rocks::RocksEngine;
-use engine_traits::{Engines, ALL_CFS, CF_DEFAULT};
+use engine_traits::{ALL_CFS, CF_DEFAULT, Engines};
 use health_controller::HealthController;
 use kvproto::raft_serverpb::RaftMessage;
 use raftstore::{
+    Result,
     coprocessor::CoprocessorHost,
     store::{
+        AutoSplitController, DiskCheckRunner, SnapManager, StoreMsg, Transport,
         config::{Config, RaftstoreConfigManager},
         fsm::{StoreMeta, *},
-        AutoSplitController, DiskCheckRunner, SnapManager, StoreMsg, Transport,
     },
-    Result,
 };
 use resource_metering::CollectorRegHandle;
 use service::service_manager::GrpcServiceManager;
@@ -30,7 +30,7 @@ use tikv::{
 };
 use tikv_util::{
     config::{ReadableDuration, ReadableSize, VersionTrack},
-    worker::{dummy_scheduler, LazyWorker, Worker},
+    worker::{LazyWorker, Worker, dummy_scheduler},
 };
 
 #[derive(Clone)]
diff --git a/tests/integrations/config/dynamic/snap.rs b/tests/integrations/config/dynamic/snap.rs
index 3cb7f6e43a3..8a846f5b326 100644
--- a/tests/integrations/config/dynamic/snap.rs
+++ b/tests/integrations/config/dynamic/snap.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc::channel, Arc},
+    sync::{Arc, mpsc::channel},
     time::Duration,
 };
 
@@ -9,7 +9,7 @@ use engine_rocks::RocksEngine;
 use grpcio::{EnvBuilder, ResourceQuota};
 use online_config::ConfigManager;
 use raft_log_engine::RaftLogEngine;
-use raftstore::store::{fsm::create_raft_batch_system, SnapManager};
+use raftstore::store::{SnapManager, fsm::create_raft_batch_system};
 use security::SecurityManager;
 use tempfile::TempDir;
 use tikv::{
diff --git a/tests/integrations/config/dynamic/split_check.rs b/tests/integrations/config/dynamic/split_check.rs
index eb9b1a63986..4d74297d93f 100644
--- a/tests/integrations/config/dynamic/split_check.rs
+++ b/tests/integrations/config/dynamic/split_check.rs
@@ -10,8 +10,8 @@ use engine_rocks::RocksEngine;
 use engine_traits::CF_DEFAULT;
 use raftstore::{
     coprocessor::{
-        config::{Config, SplitCheckConfigManager},
         CoprocessorHost,
+        config::{Config, SplitCheckConfigManager},
     },
     store::{SplitCheckRunner as Runner, SplitCheckTask as Task},
 };
@@ -26,12 +26,16 @@ fn tmp_engine<P: AsRef<Path>>(path: P) -> RocksEngine {
     .unwrap()
 }
 
-fn setup(cfg: TikvConfig, engine: RocksEngine) -> (ConfigController, LazyWorker<Task>) {
+fn setup(
+    cfg: TikvConfig,
+    engine: RocksEngine,
+) -> (ConfigController, LazyWorker<Task<RocksEngine>>) {
     let (router, _) = sync_channel(1);
     let runner = Runner::new(
         engine,
         router.clone(),
         CoprocessorHost::new(router, cfg.coprocessor.clone()),
+        None,
     );
     let share_worker = Worker::new("split-check-config");
     let mut worker = share_worker.lazy_build("split-check-config");
@@ -46,7 +50,7 @@ fn setup(cfg: TikvConfig, engine: RocksEngine) -> (ConfigController, LazyWorker<
     (cfg_controller, worker)
 }
 
-fn validate<F>(scheduler: &Scheduler<Task>, f: F)
+fn validate<F>(scheduler: &Scheduler<Task<RocksEngine>>, f: F)
 where
     F: FnOnce(&Config) + Send + 'static,
 {
diff --git a/tests/integrations/config/graceful_shutdown_config.rs b/tests/integrations/config/graceful_shutdown_config.rs
new file mode 100644
index 00000000000..223bd949a04
--- /dev/null
+++ b/tests/integrations/config/graceful_shutdown_config.rs
@@ -0,0 +1,28 @@
+// Copyright 2024 TiKV Project Authors. Licensed under Apache-2.0.
+
+use std::time::Duration;
+
+use tikv::config::TikvConfig;
+
+#[test]
+fn test_graceful_shutdown_config_defaults() {
+    let config = TikvConfig::default();
+
+    // Test default values
+    assert_eq!(
+        config.server.graceful_shutdown_timeout.0,
+        Duration::from_secs(20)
+    );
+}
+
+#[test]
+fn test_graceful_shutdown_config_serialization() {
+    let mut config = TikvConfig::default();
+    config.server.graceful_shutdown_timeout = tikv_util::config::ReadableDuration::secs(25);
+
+    // Test TOML serialization (basic structure test)
+    let toml_value = toml::Value::try_from(&config.server).unwrap();
+    let server_table = toml_value.as_table().unwrap();
+
+    assert!(server_table.contains_key("graceful-shutdown-timeout"));
+}
diff --git a/tests/integrations/config/mod.rs b/tests/integrations/config/mod.rs
index ee053784356..aace3baa876 100644
--- a/tests/integrations/config/mod.rs
+++ b/tests/integrations/config/mod.rs
@@ -32,8 +32,10 @@ use tikv::{
     config::*,
     import::Config as ImportConfig,
     server::{
-        config::GrpcCompressionType, gc_worker::GcConfig,
-        lock_manager::Config as PessimisticTxnConfig, Config as ServerConfig,
+        Config as ServerConfig,
+        config::GrpcCompressionType,
+        gc_worker::{AutoCompactionConfig, GcConfig},
+        lock_manager::Config as PessimisticTxnConfig,
     },
     storage::config::{
         BlockCacheConfig, Config as StorageConfig, EngineType, FlowControlConfig,
@@ -43,6 +45,7 @@ use tikv::{
 use tikv_util::config::{LogFormat, ReadableDuration, ReadableSchedule, ReadableSize};
 
 mod dynamic;
+mod graceful_shutdown_config;
 mod test_config_client;
 
 #[test]
@@ -128,6 +131,7 @@ fn test_serde_custom_tikv_config() {
         reject_messages_on_memory_ratio: 0.8,
         simplify_metrics: false,
         health_feedback_interval: ReadableDuration::secs(2),
+        inspect_network_interval: ReadableDuration::millis(222),
         ..Default::default()
     };
     value.readpool = ReadPoolConfig {
@@ -197,12 +201,6 @@ fn test_serde_custom_tikv_config() {
         raft_entry_cache_life_time: ReadableDuration::secs(12),
         split_region_check_tick_interval: ReadableDuration::secs(12),
         region_split_check_diff: Some(ReadableSize::mb(20)),
-        region_compact_check_interval: ReadableDuration::secs(12),
-        region_compact_check_step: Some(1_234),
-        region_compact_min_tombstones: 999,
-        region_compact_tombstones_percent: 33,
-        region_compact_min_redundant_rows: 999,
-        region_compact_redundant_rows_percent: Some(33),
         pd_heartbeat_tick_interval: ReadableDuration::minutes(12),
         pd_store_heartbeat_tick_interval: ReadableDuration::secs(12),
         pd_report_min_resolved_ts_interval: ReadableDuration::millis(233),
@@ -255,6 +253,7 @@ fn test_serde_custom_tikv_config() {
         io_reschedule_concurrent_max_count: 1234,
         io_reschedule_hotpot_duration: ReadableDuration::secs(4321),
         inspect_interval: ReadableDuration::millis(444),
+        inspect_kvdb_interval: ReadableDuration::millis(333),
         inspect_cpu_util_thd: 0.666,
         check_leader_lease_interval: ReadableDuration::millis(123),
         renew_leader_lease_advance_duration: ReadableDuration::millis(456),
@@ -369,7 +368,7 @@ fn test_serde_custom_tikv_config() {
                 max_bytes_for_level_base: ReadableSize::kb(12),
                 target_file_size_base: Some(ReadableSize::kb(123)),
                 level0_file_num_compaction_trigger: 123,
-                level0_slowdown_writes_trigger: Some(123),
+                level0_slowdown_writes_trigger: 123,
                 level0_stop_writes_trigger: Some(123),
                 max_compaction_bytes: ReadableSize::gb(1),
                 compaction_pri: CompactionPriority::MinOverlappingRatio,
@@ -379,7 +378,7 @@ fn test_serde_custom_tikv_config() {
                 compaction_style: DBCompactionStyle::Universal,
                 disable_auto_compactions: true,
                 disable_write_stall: true,
-                soft_pending_compaction_bytes_limit: Some(ReadableSize::gb(12)),
+                soft_pending_compaction_bytes_limit: ReadableSize::gb(12),
                 hard_pending_compaction_bytes_limit: Some(ReadableSize::gb(12)),
                 force_consistency_checks: true,
                 titan: titan_cf_config.clone(),
@@ -429,7 +428,7 @@ fn test_serde_custom_tikv_config() {
                 max_bytes_for_level_base: ReadableSize::kb(12),
                 target_file_size_base: Some(ReadableSize::kb(123)),
                 level0_file_num_compaction_trigger: 123,
-                level0_slowdown_writes_trigger: Some(123),
+                level0_slowdown_writes_trigger: 123,
                 level0_stop_writes_trigger: Some(123),
                 max_compaction_bytes: ReadableSize::gb(1),
                 compaction_pri: CompactionPriority::MinOverlappingRatio,
@@ -439,7 +438,7 @@ fn test_serde_custom_tikv_config() {
                 compaction_style: DBCompactionStyle::Universal,
                 disable_auto_compactions: true,
                 disable_write_stall: true,
-                soft_pending_compaction_bytes_limit: Some(ReadableSize::gb(12)),
+                soft_pending_compaction_bytes_limit: ReadableSize::gb(12),
                 hard_pending_compaction_bytes_limit: Some(ReadableSize::gb(12)),
                 force_consistency_checks: true,
                 titan: TitanCfConfig {
@@ -504,7 +503,7 @@ fn test_serde_custom_tikv_config() {
                 max_bytes_for_level_base: ReadableSize::kb(12),
                 target_file_size_base: Some(ReadableSize::kb(123)),
                 level0_file_num_compaction_trigger: 123,
-                level0_slowdown_writes_trigger: Some(123),
+                level0_slowdown_writes_trigger: 123,
                 level0_stop_writes_trigger: Some(123),
                 max_compaction_bytes: ReadableSize::gb(1),
                 compaction_pri: CompactionPriority::MinOverlappingRatio,
@@ -514,7 +513,7 @@ fn test_serde_custom_tikv_config() {
                 compaction_style: DBCompactionStyle::Universal,
                 disable_auto_compactions: true,
                 disable_write_stall: true,
-                soft_pending_compaction_bytes_limit: Some(ReadableSize::gb(12)),
+                soft_pending_compaction_bytes_limit: ReadableSize::gb(12),
                 hard_pending_compaction_bytes_limit: Some(ReadableSize::gb(12)),
                 force_consistency_checks: true,
                 titan: TitanCfConfig {
@@ -579,7 +578,7 @@ fn test_serde_custom_tikv_config() {
                 max_bytes_for_level_base: ReadableSize::kb(12),
                 target_file_size_base: Some(ReadableSize::kb(123)),
                 level0_file_num_compaction_trigger: 123,
-                level0_slowdown_writes_trigger: Some(123),
+                level0_slowdown_writes_trigger: 123,
                 level0_stop_writes_trigger: Some(123),
                 max_compaction_bytes: ReadableSize::gb(1),
                 compaction_pri: CompactionPriority::MinOverlappingRatio,
@@ -589,7 +588,7 @@ fn test_serde_custom_tikv_config() {
                 compaction_style: DBCompactionStyle::Universal,
                 disable_auto_compactions: true,
                 disable_write_stall: true,
-                soft_pending_compaction_bytes_limit: Some(ReadableSize::gb(12)),
+                soft_pending_compaction_bytes_limit: ReadableSize::gb(12),
                 hard_pending_compaction_bytes_limit: Some(ReadableSize::gb(12)),
                 force_consistency_checks: true,
                 titan: TitanCfConfig {
@@ -687,7 +686,7 @@ fn test_serde_custom_tikv_config() {
                 max_bytes_for_level_base: ReadableSize::kb(12),
                 target_file_size_base: Some(ReadableSize::kb(123)),
                 level0_file_num_compaction_trigger: 123,
-                level0_slowdown_writes_trigger: Some(123),
+                level0_slowdown_writes_trigger: 123,
                 level0_stop_writes_trigger: Some(123),
                 max_compaction_bytes: ReadableSize::gb(1),
                 compaction_pri: CompactionPriority::MinOverlappingRatio,
@@ -697,7 +696,7 @@ fn test_serde_custom_tikv_config() {
                 compaction_style: DBCompactionStyle::Universal,
                 disable_auto_compactions: true,
                 disable_write_stall: true,
-                soft_pending_compaction_bytes_limit: Some(ReadableSize::gb(12)),
+                soft_pending_compaction_bytes_limit: ReadableSize::gb(12),
                 hard_pending_compaction_bytes_limit: Some(ReadableSize::gb(12)),
                 force_consistency_checks: true,
                 titan: titan_cf_config,
@@ -860,6 +859,14 @@ fn test_serde_custom_tikv_config() {
         enable_compaction_filter: false,
         compaction_filter_skip_version_check: true,
         num_threads: 2,
+        auto_compaction: AutoCompactionConfig {
+            check_interval: ReadableDuration::secs(300),
+            tombstones_num_threshold: 10000,
+            tombstones_percent_threshold: 30,
+            redundant_rows_threshold: 50000,
+            redundant_rows_percent_threshold: 20,
+            bottommost_level_force: false,
+        },
     };
     value.pessimistic_txn = PessimisticTxnConfig {
         wait_for_lock_timeout: ReadableDuration::millis(10),
@@ -954,7 +961,7 @@ fn test_block_cache_backward_compatible() {
     let content = read_file_in_project_dir("integrations/config/test-cache-compatible.toml");
     let mut cfg: TikvConfig = toml::from_str(&content).unwrap();
     assert!(cfg.storage.block_cache.capacity.is_none());
-    cfg.compatible_adjust();
+    cfg.compatible_adjust(None);
     assert!(cfg.storage.block_cache.capacity.is_some());
     assert_eq!(
         cfg.storage.block_cache.capacity.unwrap().0,
diff --git a/tests/integrations/config/test-custom.toml b/tests/integrations/config/test-custom.toml
index 64eb3c21dfc..b7862083630 100644
--- a/tests/integrations/config/test-custom.toml
+++ b/tests/integrations/config/test-custom.toml
@@ -86,6 +86,7 @@ end-point-slow-log-threshold = "1s"
 forward-max-connections-per-address = 5
 reject-messages-on-memory-ratio = 0.8
 health-feedback-interval = "2s"
+inspect-network-interval = "222ms"
 
 [server.labels]
 a = "b"
@@ -170,13 +171,7 @@ max-manual-flush-rate = 5.0
 raft-entry-cache-life-time = "12s"
 split-region-check-tick-interval = "12s"
 region-split-check-diff = "20MB"
-region-compact-check-interval = "12s"
 clean-stale-peer-delay = "0s"
-region-compact-check-step = 1234
-region-compact-min-tombstones = 999
-region-compact-tombstones-percent = 33
-region-compact-min-redundant-rows = 999
-region-compact-redundant-rows-percent = 33
 pd-heartbeat-tick-interval = "12m"
 pd-store-heartbeat-tick-interval = "12s"
 pd-report-min-resolved-ts-interval = "233ms"
@@ -231,6 +226,7 @@ waterfall-metrics = true
 io-reschedule-concurrent-max-count = 1234
 io-reschedule-hotpot-duration = "4321s"
 inspect-interval = "444ms"
+inspect-kvdb-interval = "333ms"
 inspect-cpu-util-thd = 0.666
 check-leader-lease-interval = "123ms"
 renew-leader-lease-advance-duration = "456ms"
diff --git a/tests/integrations/coprocessor/test_checksum.rs b/tests/integrations/coprocessor/test_checksum.rs
index 405070842b4..b6040db0194 100644
--- a/tests/integrations/coprocessor/test_checksum.rs
+++ b/tests/integrations/coprocessor/test_checksum.rs
@@ -1,8 +1,6 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::u64;
-
-use api_version::{keyspace::KvPair, ApiV1};
+use api_version::{ApiV1, keyspace::KvPair};
 use futures::executor::block_on;
 use kvproto::{
     coprocessor::{KeyRange, Request},
@@ -11,8 +9,8 @@ use kvproto::{
 use protobuf::Message;
 use test_coprocessor::*;
 use tidb_query_common::storage::{
-    scanner::{RangesScanner, RangesScannerOptions},
     Range,
+    scanner::{RangesScanner, RangesScannerOptions},
 };
 use tikv::{
     coprocessor::{dag::TikvStorage, *},
diff --git a/tests/integrations/coprocessor/test_select.rs b/tests/integrations/coprocessor/test_select.rs
index 2ce61f6ff06..9c947260d05 100644
--- a/tests/integrations/coprocessor/test_select.rs
+++ b/tests/integrations/coprocessor/test_select.rs
@@ -6,15 +6,17 @@ use engine_traits::CF_LOCK;
 use kvproto::{
     coprocessor::{Request, Response, StoreBatchTask, StoreBatchTaskResponse},
     kvrpcpb::{Context, IsolationLevel},
+    metapb::{Peer, Region},
 };
 use protobuf::Message;
-use raftstore::store::Bucket;
+use raftstore::{coprocessor::region_info_accessor::MockRegionInfoProvider, store::Bucket};
 use test_coprocessor::*;
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
 use test_storage::*;
 use tidb_query_datatype::{
-    codec::{datum, Datum},
+    FieldTypeTp,
+    codec::{Datum, datum, table::encode_row_key},
     expr::EvalContext,
 };
 use tikv::{
@@ -22,15 +24,17 @@ use tikv::{
     server::Config,
     storage::TestEngineBuilder,
 };
+use tikv_kv::{RocksEngine, destroy_tls_engine, set_tls_engine, with_tls_engine};
 use tikv_util::{
+    HandyRwLock,
     codec::number::*,
     config::{ReadableDuration, ReadableSize},
-    HandyRwLock,
 };
 use tipb::{
     AnalyzeColumnsReq, AnalyzeReq, AnalyzeType, ChecksumRequest, Chunk, Expr, ExprType,
     ScalarFuncSig, SelectResponse,
 };
+use tipb_helper::ExprDefBuilder;
 use txn_types::{Key, Lock, LockType, TimeStamp};
 
 const FLAG_IGNORE_TRUNCATE: u64 = 1;
@@ -2392,3 +2396,142 @@ fn test_select_time_details() {
     let time_details_v2 = resp.get_exec_details_v2().get_time_detail_v2();
     assert!(time_details_v2.process_wall_time_ns != 0, "{:?}", resp);
 }
+
+#[test]
+fn test_index_lookup_select() {
+    set_tls_engine(TestEngineBuilder::new().build().unwrap());
+    defer! {
+         unsafe {destroy_tls_engine::<RocksEngine>()}
+    }
+
+    let product = ProductTable::new();
+    let data = vec![
+        (1, Some("name:0"), 2),
+        (2, Some("name:4"), 3),
+        (3, Some("name:2"), 5),
+        (4, Some("name:3"), 1),
+        (5, Some("name:7"), 6),
+        (15, Some("name:1"), 4),
+    ];
+    let index_scan_peer = {
+        let mut peer = Peer::default();
+        peer.set_id(1);
+        peer.set_store_id(1);
+        peer
+    };
+
+    let region = {
+        let mut peer = index_scan_peer.clone();
+        peer.set_id(10);
+        let mut r = Region::default();
+        r.set_id(10);
+        // only handle [2, 4] can be found in the local region.
+        r.set_start_key(Key::from_raw(&encode_row_key(product.table_id(), 2)).into_encoded());
+        r.set_end_key(Key::from_raw(&encode_row_key(product.table_id(), 15)).into_encoded());
+        r.set_peers(vec![peer].into());
+        r
+    };
+
+    let (_, endpoint, _) = unsafe {
+        with_tls_engine(|e: &mut RocksEngine| {
+            e.set_region_info_provider(MockRegionInfoProvider::new(vec![region]));
+            init_data_with_details(
+                Context::default(),
+                e.clone(),
+                &product,
+                &data,
+                true,
+                &Config::default(),
+            )
+        })
+    };
+    let mut ctx = Context::default();
+    ctx.set_peer(index_scan_peer);
+    let req = DagSelect::from_index(&product, &product["name"])
+        .index_lookup(&product, vec![2])
+        // id < 5
+        .where_expr({
+            let mut cond =
+                ExprDefBuilder::scalar_func(ScalarFuncSig::LtInt, FieldTypeTp::LongLong).build();
+            cond.mut_children().push(
+                ExprDefBuilder::column_ref(
+                    offset_for_column(&product.columns_info(), product["id"].id) as usize,
+                    FieldTypeTp::Long,
+                )
+                .build(),
+            );
+            cond.mut_children()
+                .push(ExprDefBuilder::constant_int(5).build());
+            cond
+        }).projection(vec![
+            ExprDefBuilder::column_ref(
+                offset_for_column(&product.columns_info(), product["id"].id) as usize,
+                FieldTypeTp::Long,
+            ).build(),
+            ExprDefBuilder::column_ref(
+                offset_for_column(&product.columns_info(), product["name"].id) as usize,
+                FieldTypeTp::Long,
+            ).build(),
+            {
+                let mut expr =
+                ExprDefBuilder::scalar_func(ScalarFuncSig::MultiplyInt, FieldTypeTp::LongLong).build();
+                expr.mut_children().push(
+                    ExprDefBuilder::column_ref(
+                        offset_for_column(&product.columns_info(), product["count"].id) as usize,
+                        FieldTypeTp::Long,
+                    )
+                    .build(),
+                );
+                expr.mut_children().push(
+                    ExprDefBuilder::constant_int(100).build(),
+                );
+                expr
+            },
+        ])
+        .build_with(ctx, &[0]);
+    let mut resp = handle_select(&endpoint, req);
+    // check the primary row results that can be found locally.
+    let chunks = resp.take_chunks().to_vec();
+    let rows: Vec<_> = DagChunkSpliter::new(chunks, 3).collect();
+    assert_eq!(
+        vec![
+            vec![
+                Datum::I64(2),
+                Datum::Bytes(b"name:4".to_vec()),
+                Datum::I64(300),
+            ],
+            vec![
+                Datum::I64(3),
+                Datum::Bytes(b"name:2".to_vec()),
+                Datum::I64(500),
+            ],
+            vec![
+                Datum::I64(4),
+                Datum::Bytes(b"name:3".to_vec()),
+                Datum::I64(100),
+            ]
+        ],
+        rows
+    );
+
+    // check the index results that cannot perform index-lookup locally.
+    let mut intermediate_outputs = resp.take_intermediate_outputs();
+    assert_eq!(1, intermediate_outputs.len());
+    let intermediate_chunks = intermediate_outputs[0].take_chunks().to_vec();
+    let intermediate_rows: Vec<_> = DagChunkSpliter::new(intermediate_chunks, 3).collect();
+    assert_eq!(
+        vec![
+            vec![
+                Datum::Bytes(b"name:0".to_vec()),
+                Datum::I64(2),
+                Datum::I64(1)
+            ],
+            vec![
+                Datum::Bytes(b"name:1".to_vec()),
+                Datum::I64(4),
+                Datum::I64(15)
+            ],
+        ],
+        intermediate_rows
+    );
+}
diff --git a/tests/integrations/import/test_sst_service.rs b/tests/integrations/import/test_sst_service.rs
index 9dc31c95f85..59cd3368d66 100644
--- a/tests/integrations/import/test_sst_service.rs
+++ b/tests/integrations/import/test_sst_service.rs
@@ -1,6 +1,6 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use std::time::Duration;
+use std::{path::Path, time::Duration};
 
 use futures::{executor::block_on, stream::StreamExt};
 use kvproto::{import_sstpb::*, kvrpcpb::Context, tikvpb::*};
@@ -10,7 +10,7 @@ use test_sst_importer::*;
 use tikv::config::TikvConfig;
 use tikv_util::{
     config::ReadableSize,
-    sys::disk::{set_disk_status, DiskUsage},
+    sys::disk::{DiskUsage, set_disk_status},
 };
 
 use super::util::*;
@@ -197,6 +197,14 @@ fn test_switch_mode_v2() {
     let mut cfg = TikvConfig::default();
     cfg.server.grpc_concurrency = 1;
     cfg.rocksdb.writecf.disable_auto_compactions = true;
+    // `ingest_maybe_slowdown_writes` uses `stop_writes_trigger` to check if ingest
+    // may cause a write stall. We also set `slowdown_writes_trigger` because
+    // RocksDB ignores `stop_writes_trigger` when it is smaller than
+    // `slowdown_writes_trigger`
+    cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger = 4;
+    cfg.rocksdb.writecf.level0_slowdown_writes_trigger = 4;
+    cfg.rocksdb.defaultcf.level0_stop_writes_trigger = Some(4);
+    cfg.rocksdb.writecf.level0_stop_writes_trigger = Some(4);
     cfg.raft_store.right_derive_when_split = true;
     // cfg.rocksdb.writecf.level0_slowdown_writes_trigger = Some(2);
     let (mut cluster, mut ctx, _tikv, import) = open_cluster_and_tikv_import_client_v2(Some(cfg));
@@ -680,3 +688,114 @@ fn test_suspend_import() {
     let ssts = write(sst_range).unwrap();
     multi_ingest(ssts.get_metas()).unwrap();
 }
+
+#[test]
+fn test_concurrent_ingest_admission_control() {
+    let mut cfg = TikvConfig::default();
+    cfg.server.grpc_concurrency = 1;
+    // `ingest_maybe_slowdown_writes` uses `stop_writes_trigger` to check if ingest
+    // may cause a write stall. We also set `slowdown_writes_trigger` because
+    // RocksDB ignores `stop_writes_trigger` when it is smaller than
+    // `slowdown_writes_trigger`
+    cfg.rocksdb.defaultcf.level0_slowdown_writes_trigger = 4;
+    cfg.rocksdb.writecf.level0_slowdown_writes_trigger = 4;
+    cfg.rocksdb.defaultcf.level0_stop_writes_trigger = Some(4);
+    cfg.rocksdb.writecf.level0_stop_writes_trigger = Some(4);
+    let (_cluster, ctx, _tikv, import) = open_cluster_and_tikv_import_client(Some(cfg));
+    let temp_dir = Builder::new().prefix("test_ingest_sst").tempdir().unwrap();
+    let sst_path = temp_dir.path().join("test.sst");
+    let mut metas = Vec::new();
+
+    // Upload multiple SST files targeting the write CF
+    for i in 0..10 {
+        let sst_range = (i * 10, (i + 1) * 10);
+        let (mut meta, data) = gen_sst_file(sst_path.clone(), sst_range);
+        meta.set_region_id(ctx.get_region_id());
+        meta.set_region_epoch(ctx.get_region_epoch().clone());
+        meta.set_cf_name("write".to_string());
+        send_upload_sst(&import, &meta, &data).unwrap();
+        metas.push(meta);
+    }
+
+    // Ingest in parallel. The admission control should limit the number of
+    // ingests that are allowed to proceed.
+    let handles: Vec<_> = metas
+        .into_iter()
+        .map(|meta| {
+            let import = import.clone();
+            let ctx = ctx.clone();
+            std::thread::spawn(move || ingest_sst(&import, ctx, meta))
+        })
+        .collect();
+
+    let mut success = 0;
+    let mut errors = Vec::new();
+    for handle in handles {
+        match handle.join().unwrap() {
+            ref resp if !resp.has_error() => success += 1,
+            resp => errors.push(resp.get_error().get_message().to_string()),
+        }
+    }
+    // With the test config (slowdown_trigger: 4, compaction_trigger: 4), we
+    // expect 4 ingests to succeed.
+    assert_eq!(success, 4);
+    assert!(
+        errors
+            .iter()
+            .any(|e| e.contains("too many sst files are ingesting"))
+    );
+}
+
+#[track_caller]
+fn check_sst_num(dir: &Path, expected_count: usize) {
+    let mut real_count = 0;
+    for entry in std::fs::read_dir(dir).unwrap() {
+        let entry = entry.unwrap();
+        if entry.file_name().to_str().unwrap().ends_with(".sst") {
+            real_count += 1;
+        }
+    }
+    assert_eq!(
+        real_count, expected_count,
+        "expected: {}, got: {}",
+        expected_count, real_count
+    );
+}
+
+#[test]
+fn test_force_partition_range() {
+    let (cluster, ctx, _tikv, import) = new_cluster_and_tikv_import_client();
+    let temp_dir = Builder::new()
+        .prefix("test_force_partition_range")
+        .tempdir()
+        .unwrap();
+    let sst_path = temp_dir.path().join("test.sst");
+
+    // ingest a sst with a big range
+    let (mut meta, data) =
+        gen_sst_file_with_tidb_kvs(sst_path.clone(), &[(b"a", b"a"), (b"z", b"z")], None);
+    meta.set_region_id(ctx.get_region_id());
+    meta.set_region_epoch(ctx.get_region_epoch().clone());
+    meta.set_cf_name("write".to_string());
+    send_upload_sst(&import, &meta, &data).unwrap();
+    ingest_sst(&import, ctx, meta);
+
+    let db_path = cluster.paths[0].path().join("db");
+    println!("{:?}", &db_path);
+    check_sst_num(&db_path, 1);
+
+    let mut partition_range_req = AddPartitionRangeRequest::default();
+    let mut range = Range::default();
+    // set a smaller force partition range to trigger compact.
+    range.set_start(b"b".to_vec());
+    range.set_end(b"c".to_vec());
+    partition_range_req.set_range(range);
+    partition_range_req.set_ttl_seconds(3600);
+    import
+        .add_force_partition_range(&partition_range_req)
+        .unwrap();
+
+    // force partition should trigger a manual compact and split the original sst to
+    // 2 sst.
+    check_sst_num(&db_path, 2);
+}
diff --git a/tests/integrations/import/util.rs b/tests/integrations/import/util.rs
index 75c23f1f51f..40c5b794ad2 100644
--- a/tests/integrations/import/util.rs
+++ b/tests/integrations/import/util.rs
@@ -61,6 +61,8 @@ pub fn open_cluster_and_tikv_import_client(
         let cleanup_interval = Duration::from_millis(CLEANUP_SST_MILLIS);
         config.raft_store.cleanup_import_sst_interval.0 = cleanup_interval;
         config.server.grpc_concurrency = 1;
+        config.rocksdb.defaultcf.enable_compaction_guard = Some(true);
+        config.rocksdb.writecf.enable_compaction_guard = Some(true);
         config
     });
 
diff --git a/tests/integrations/mod.rs b/tests/integrations/mod.rs
index 2b68c0a8ba9..1a1893ebb69 100644
--- a/tests/integrations/mod.rs
+++ b/tests/integrations/mod.rs
@@ -3,6 +3,7 @@
 #![feature(test)]
 #![feature(box_patterns)]
 #![feature(custom_test_frameworks)]
+#![feature(assert_matches)]
 #![test_runner(test_util::run_tests)]
 
 extern crate test;
diff --git a/tests/integrations/pd/test_rpc_client.rs b/tests/integrations/pd/test_rpc_client.rs
index f0142f72176..c6c7fb8c8cb 100644
--- a/tests/integrations/pd/test_rpc_client.rs
+++ b/tests/integrations/pd/test_rpc_client.rs
@@ -3,12 +3,12 @@
 use std::{sync::Arc, thread, time::Duration};
 
 use error_code::ErrorCodeExt;
-use futures::{executor::block_on, StreamExt};
+use futures::{StreamExt, executor::block_on};
 use grpcio::{EnvBuilder, Error as GrpcError, RpcStatus, RpcStatusCode};
 use kvproto::{metapb, pdpb};
 use pd_client::{Error as PdError, Feature, PdClientV2, PdConnector, RpcClientV2};
 use security::{SecurityConfig, SecurityManager};
-use test_pd::{mocker::*, util::*, Server as MockServer};
+use test_pd::{Server as MockServer, mocker::*, util::*};
 use tikv_util::{config::ReadableDuration, mpsc::future::WakePolicy, thd_name};
 use tokio::runtime::{Builder, Runtime};
 use txn_types::TimeStamp;
diff --git a/tests/integrations/pd/test_rpc_client_legacy.rs b/tests/integrations/pd/test_rpc_client_legacy.rs
index 5dce767fe24..9ffd5108085 100644
--- a/tests/integrations/pd/test_rpc_client_legacy.rs
+++ b/tests/integrations/pd/test_rpc_client_legacy.rs
@@ -2,8 +2,9 @@
 
 use std::{
     sync::{
+        Arc,
         atomic::{AtomicUsize, Ordering},
-        mpsc, Arc,
+        mpsc,
     },
     thread,
     time::Duration,
@@ -16,7 +17,7 @@ use kvproto::{metapb, pdpb};
 use pd_client::{Error as PdError, Feature, PdClient, PdConnector, RegionStat, RpcClient};
 use raftstore::store;
 use security::{SecurityConfig, SecurityManager};
-use test_pd::{mocker::*, util::*, Server as MockServer};
+use test_pd::{Server as MockServer, mocker::*, util::*};
 use tikv_util::config::ReadableDuration;
 use tokio::runtime::Builder;
 use txn_types::TimeStamp;
diff --git a/tests/integrations/raftstore/mod.rs b/tests/integrations/raftstore/mod.rs
index 3bb93f6809b..ef1b452c799 100644
--- a/tests/integrations/raftstore/mod.rs
+++ b/tests/integrations/raftstore/mod.rs
@@ -2,7 +2,6 @@
 
 mod test_bootstrap;
 mod test_clear_stale_data;
-mod test_compact_after_delete;
 mod test_compact_lock_cf;
 mod test_compact_log;
 mod test_conf_change;
diff --git a/tests/integrations/raftstore/test_bootstrap.rs b/tests/integrations/raftstore/test_bootstrap.rs
index dd044eb7369..ff5f269a31b 100644
--- a/tests/integrations/raftstore/test_bootstrap.rs
+++ b/tests/integrations/raftstore/test_bootstrap.rs
@@ -1,34 +1,34 @@
 // Copyright 2017 TiKV Project Authors. Licensed under Apache-2.0.
 use std::{
     path::Path,
-    sync::{atomic::AtomicU64, mpsc::sync_channel, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::AtomicU64, mpsc::sync_channel},
     time::Duration,
 };
 
 use concurrency_manager::ConcurrencyManager;
 use engine_traits::{
-    DbOptionsExt, Engines, MiscExt, Peekable, RaftEngine, RaftEngineReadOnly, ALL_CFS, CF_DEFAULT,
-    CF_LOCK, CF_RAFT, CF_WRITE,
+    ALL_CFS, CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, DbOptionsExt, Engines, MiscExt, Peekable,
+    RaftEngine, RaftEngineReadOnly,
 };
 use health_controller::HealthController;
 use kvproto::{kvrpcpb::ApiVersion, metapb, raft_serverpb::RegionLocalState};
 use raftstore::{
     coprocessor::CoprocessorHost,
     store::{
-        bootstrap_store, fsm, fsm::store::StoreMeta, AutoSplitController, DiskCheckRunner,
-        SnapManager,
+        AutoSplitController, DiskCheckRunner, SnapManager, bootstrap_store, fsm,
+        fsm::store::StoreMeta,
     },
 };
 use raftstore_v2::router::PeerMsg;
 use resource_metering::CollectorRegHandle;
 use service::service_manager::GrpcServiceManager;
 use tempfile::Builder;
-use test_pd_client::{bootstrap_with_first_region, TestPdClient};
+use test_pd_client::{TestPdClient, bootstrap_with_first_region};
 use test_raftstore::*;
 use tikv::{import::SstImporter, server::MultiRaftServer};
 use tikv_util::{
     config::VersionTrack,
-    worker::{dummy_scheduler, Builder as WorkerBuilder, LazyWorker},
+    worker::{Builder as WorkerBuilder, LazyWorker, dummy_scheduler},
 };
 
 fn test_bootstrap_idempotent<T: Simulator>(cluster: &mut Cluster<T>) {
diff --git a/tests/integrations/raftstore/test_clear_stale_data.rs b/tests/integrations/raftstore/test_clear_stale_data.rs
index 8010d4c956c..c43205221af 100644
--- a/tests/integrations/raftstore/test_clear_stale_data.rs
+++ b/tests/integrations/raftstore/test_clear_stale_data.rs
@@ -1,7 +1,7 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use engine_rocks::{raw::CompactOptions, RocksEngine};
-use engine_traits::{MiscExt, Peekable, SyncMutable, CF_DEFAULT, CF_LOCK};
+use engine_rocks::{RocksEngine, raw::CompactOptions};
+use engine_traits::{CF_DEFAULT, CF_LOCK, MiscExt, Peekable, SyncMutable};
 use test_raftstore::*;
 
 fn init_db_with_sst_files(db: &RocksEngine, level: i32, n: u8) {
diff --git a/tests/integrations/raftstore/test_compact_after_delete.rs b/tests/integrations/raftstore/test_compact_after_delete.rs
deleted file mode 100644
index 47d10b906c7..00000000000
--- a/tests/integrations/raftstore/test_compact_after_delete.rs
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
-
-use std::{
-    sync::{mpsc, Mutex},
-    time::Duration,
-};
-
-use collections::HashMap;
-use engine_rocks::{raw::Range, util::get_cf_handle};
-use engine_traits::{CachedTablet, MiscExt, CF_WRITE};
-use keys::{data_key, DATA_MAX_KEY};
-use test_raftstore::*;
-use tikv::storage::mvcc::{TimeStamp, Write, WriteType};
-use tikv_util::config::*;
-use txn_types::Key;
-
-fn gen_mvcc_put_kv(
-    k: &[u8],
-    v: &[u8],
-    start_ts: TimeStamp,
-    commit_ts: TimeStamp,
-) -> (Vec<u8>, Vec<u8>) {
-    let k = Key::from_encoded(data_key(k));
-    let k = k.append_ts(commit_ts);
-    let w = Write::new(WriteType::Put, start_ts, Some(v.to_vec()));
-    (k.as_encoded().clone(), w.as_ref().to_bytes())
-}
-
-fn gen_delete_k(k: &[u8], commit_ts: TimeStamp) -> Vec<u8> {
-    let k = Key::from_encoded(data_key(k));
-    let k = k.append_ts(commit_ts);
-    k.as_encoded().clone()
-}
-
-fn test_compact_after_delete<T: Simulator>(cluster: &mut Cluster<T>) {
-    cluster.cfg.raft_store.region_compact_check_interval = ReadableDuration::millis(100);
-    cluster.cfg.raft_store.region_compact_min_tombstones = 500;
-    cluster.cfg.raft_store.region_compact_tombstones_percent = 50;
-    cluster.cfg.raft_store.region_compact_redundant_rows_percent = Some(1);
-    cluster.cfg.raft_store.region_compact_check_step = Some(1);
-    cluster.cfg.rocksdb.titan.enabled = Some(true);
-    cluster.run();
-
-    for i in 0..1000 {
-        let (k, v) = (format!("k{}", i), format!("value{}", i));
-        let (k, v) = gen_mvcc_put_kv(k.as_bytes(), v.as_bytes(), 1.into(), 2.into());
-        cluster.must_put_cf(CF_WRITE, &k, &v);
-    }
-    for engines in cluster.engines.values() {
-        engines.kv.flush_cf(CF_WRITE, true).unwrap();
-    }
-    let (sender, receiver) = mpsc::channel();
-    let sync_sender = Mutex::new(sender);
-    fail::cfg_callback(
-        "raftstore::compact::CheckAndCompact:AfterCompact",
-        move || {
-            let sender = sync_sender.lock().unwrap();
-            sender.send(true).unwrap();
-        },
-    )
-    .unwrap();
-    for i in 0..1000 {
-        let k = format!("k{}", i);
-        let k = gen_delete_k(k.as_bytes(), 2.into());
-        cluster.must_delete_cf(CF_WRITE, &k);
-    }
-    for engines in cluster.engines.values() {
-        engines.kv.flush_cf(CF_WRITE, true).unwrap();
-    }
-
-    // wait for compaction.
-    receiver.recv_timeout(Duration::from_millis(5000)).unwrap();
-
-    for engines in cluster.engines.values() {
-        let cf_handle = get_cf_handle(engines.kv.as_inner(), CF_WRITE).unwrap();
-        let approximate_size = engines
-            .kv
-            .as_inner()
-            .get_approximate_sizes_cf(cf_handle, &[Range::new(b"", DATA_MAX_KEY)])[0];
-        assert_eq!(approximate_size, 0);
-    }
-}
-
-#[test]
-fn test_node_compact_after_delete() {
-    let count = 1;
-    let mut cluster = new_node_cluster(0, count);
-    test_compact_after_delete(&mut cluster);
-}
-
-#[test]
-fn test_node_compact_after_delete_v2() {
-    let count = 1;
-    let mut cluster = test_raftstore_v2::new_node_cluster(0, count);
-
-    cluster.cfg.raft_store.region_compact_check_interval = ReadableDuration::millis(100);
-    cluster.cfg.raft_store.region_compact_min_tombstones = 50;
-    cluster.cfg.raft_store.region_compact_tombstones_percent = 50;
-    // disable it
-    cluster.cfg.raft_store.region_compact_min_redundant_rows = 10000000;
-    cluster.cfg.raft_store.region_compact_redundant_rows_percent = Some(100);
-    cluster.cfg.raft_store.region_compact_check_step = Some(2);
-    // TODO: v2 doesn't support titan.
-    // cluster.cfg.rocksdb.titan.enabled = Some(true);
-    cluster.run();
-
-    let region = cluster.get_region(b"");
-    let (split_key, _) = gen_mvcc_put_kv(b"k100", b"", 1.into(), 2.into());
-    cluster.must_split(&region, &split_key);
-
-    for i in 0..200 {
-        let (k, v) = (format!("k{:03}", i), format!("value{}", i));
-        let (k, v) = gen_mvcc_put_kv(k.as_bytes(), v.as_bytes(), 1.into(), 2.into());
-        cluster.must_put_cf(CF_WRITE, &k, &v);
-    }
-    for (registry, _) in &cluster.engines {
-        registry.for_each_opened_tablet(|_, db: &mut CachedTablet<_>| {
-            if let Some(db) = db.latest() {
-                db.flush_cf(CF_WRITE, true).unwrap();
-            }
-            true
-        })
-    }
-
-    let (sender, receiver) = mpsc::channel();
-    let sync_sender = Mutex::new(sender);
-    fail::cfg_callback("raftstore-v2::CheckAndCompact::AfterCompact", move || {
-        let sender = sync_sender.lock().unwrap();
-        sender.send(true).unwrap();
-    })
-    .unwrap();
-    for i in 0..200 {
-        let k = format!("k{:03}", i);
-        let k = gen_delete_k(k.as_bytes(), 2.into());
-        cluster.must_delete_cf(CF_WRITE, &k);
-    }
-    for (registry, _) in &cluster.engines {
-        registry.for_each_opened_tablet(|_, db: &mut CachedTablet<_>| {
-            if let Some(db) = db.latest() {
-                db.flush_cf(CF_WRITE, true).unwrap();
-            }
-            true
-        })
-    }
-
-    // wait for 2 regions' compaction.
-    receiver.recv_timeout(Duration::from_millis(5000)).unwrap();
-    receiver.recv_timeout(Duration::from_millis(5000)).unwrap();
-
-    for (registry, _) in &cluster.engines {
-        registry.for_each_opened_tablet(|_, db: &mut CachedTablet<_>| {
-            if let Some(db) = db.latest() {
-                let cf_handle = get_cf_handle(db.as_inner(), CF_WRITE).unwrap();
-                let approximate_size = db
-                    .as_inner()
-                    .get_approximate_sizes_cf(cf_handle, &[Range::new(b"", DATA_MAX_KEY)])[0];
-                assert_eq!(approximate_size, 0);
-            }
-            true
-        })
-    }
-}
-
-#[test]
-fn test_node_compact_after_update_v2() {
-    let count = 1;
-    let mut cluster = test_raftstore_v2::new_node_cluster(0, count);
-
-    cluster.cfg.raft_store.region_compact_check_interval = ReadableDuration::millis(100);
-    // disable it
-    cluster.cfg.raft_store.region_compact_min_tombstones = 1000000;
-    cluster.cfg.raft_store.region_compact_redundant_rows_percent = Some(40);
-    cluster.cfg.raft_store.region_compact_min_redundant_rows = 50;
-    cluster.cfg.raft_store.region_compact_check_step = Some(2);
-    // TODO: titan is not supported in v2.
-    // cluster.cfg.rocksdb.titan.enabled = Some(true);
-    cluster.run();
-
-    let region = cluster.get_region(b"");
-    let (split_key, _) = gen_mvcc_put_kv(b"k100", b"", 1.into(), 2.into());
-    cluster.must_split(&region, &split_key);
-
-    for i in 0..200 {
-        let (k, v) = (format!("k{:03}", i), format!("value{}", i));
-        let (k, v) = gen_mvcc_put_kv(k.as_bytes(), v.as_bytes(), 1.into(), 2.into());
-        cluster.must_put_cf(CF_WRITE, &k, &v);
-
-        let (k, v) = (format!("k{:03}", i), format!("value{}", i));
-        let (k, v) = gen_mvcc_put_kv(k.as_bytes(), v.as_bytes(), 3.into(), 4.into());
-        cluster.must_put_cf(CF_WRITE, &k, &v);
-    }
-    for (registry, _) in &cluster.engines {
-        registry.for_each_opened_tablet(|_, db: &mut CachedTablet<_>| {
-            if let Some(db) = db.latest() {
-                db.flush_cf(CF_WRITE, true).unwrap();
-            }
-            true
-        })
-    }
-
-    fail::cfg("on_collect_regions_to_compact", "pause").unwrap();
-    let mut db_size_before_compact = HashMap::default();
-    for (registry, _) in &cluster.engines {
-        registry.for_each_opened_tablet(|id, db: &mut CachedTablet<_>| {
-            if let Some(db) = db.latest() {
-                let cf_handle = get_cf_handle(db.as_inner(), CF_WRITE).unwrap();
-                let approximate_size = db
-                    .as_inner()
-                    .get_approximate_sizes_cf(cf_handle, &[Range::new(b"", DATA_MAX_KEY)])[0];
-                db_size_before_compact.insert(id, approximate_size);
-            }
-            true
-        })
-    }
-    fail::remove("on_collect_regions_to_compact");
-
-    let (sender, receiver) = mpsc::channel();
-    let sync_sender = Mutex::new(sender);
-    fail::cfg_callback("raftstore-v2::CheckAndCompact::AfterCompact", move || {
-        let sender = sync_sender.lock().unwrap();
-        sender.send(true).unwrap();
-    })
-    .unwrap();
-
-    // wait for 2 regions' compaction.
-    receiver.recv_timeout(Duration::from_millis(5000)).unwrap();
-    receiver.recv_timeout(Duration::from_millis(5000)).unwrap();
-
-    for (registry, _) in &cluster.engines {
-        registry.for_each_opened_tablet(|id, db: &mut CachedTablet<_>| {
-            if let Some(db) = db.latest() {
-                let cf_handle = get_cf_handle(db.as_inner(), CF_WRITE).unwrap();
-                let approximate_size = db
-                    .as_inner()
-                    .get_approximate_sizes_cf(cf_handle, &[Range::new(b"", DATA_MAX_KEY)])[0];
-                let size_before = db_size_before_compact.get(&id).unwrap();
-                assert!(approximate_size < *size_before);
-            }
-            true
-        })
-    }
-}
diff --git a/tests/integrations/raftstore/test_compact_lock_cf.rs b/tests/integrations/raftstore/test_compact_lock_cf.rs
index fbc7629c73f..94c0027f01e 100644
--- a/tests/integrations/raftstore/test_compact_lock_cf.rs
+++ b/tests/integrations/raftstore/test_compact_lock_cf.rs
@@ -1,7 +1,7 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
 use engine_rocks::raw::DBStatisticsTickerType;
-use engine_traits::{MiscExt, CF_LOCK};
+use engine_traits::{CF_LOCK, MiscExt};
 use test_raftstore::*;
 use tikv_util::config::*;
 
diff --git a/tests/integrations/raftstore/test_conf_change.rs b/tests/integrations/raftstore/test_conf_change.rs
index 08a2ff48d17..79c9857f613 100644
--- a/tests/integrations/raftstore/test_conf_change.rs
+++ b/tests/integrations/raftstore/test_conf_change.rs
@@ -2,8 +2,8 @@
 
 use std::{
     sync::{
-        atomic::{AtomicBool, AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicBool, AtomicUsize, Ordering},
     },
     thread,
     time::Duration,
diff --git a/tests/integrations/raftstore/test_hibernate.rs b/tests/integrations/raftstore/test_hibernate.rs
index b9289bf8309..ce57fd3980b 100644
--- a/tests/integrations/raftstore/test_hibernate.rs
+++ b/tests/integrations/raftstore/test_hibernate.rs
@@ -10,7 +10,7 @@ use futures::executor::block_on;
 use pd_client::PdClient;
 use raft::eraftpb::{ConfChangeType, MessageType};
 use test_raftstore::*;
-use tikv_util::{time::Instant, HandyRwLock};
+use tikv_util::{HandyRwLock, time::Instant};
 
 #[test]
 fn test_proposal_prevent_sleep() {
diff --git a/tests/integrations/raftstore/test_lease_read.rs b/tests/integrations/raftstore/test_lease_read.rs
index 013550772f9..74e2ecc0200 100644
--- a/tests/integrations/raftstore/test_lease_read.rs
+++ b/tests/integrations/raftstore/test_lease_read.rs
@@ -4,7 +4,7 @@
 
 use std::{
     mem,
-    sync::{atomic::*, mpsc, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::*, mpsc},
     thread,
     time::Duration,
 };
@@ -16,7 +16,7 @@ use raft::eraftpb::{ConfChangeType, MessageType};
 use raftstore::store::Callback;
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv_util::{config::*, future::block_on_timeout, time::Instant, HandyRwLock};
+use tikv_util::{HandyRwLock, config::*, future::block_on_timeout, time::Instant};
 
 // A helper function for testing the lease reads and lease renewing.
 // The leader keeps a record of its leader lease, and uses the system's
@@ -663,7 +663,7 @@ fn test_not_leader_read_lease() {
 /// 3. Put a key and get the latest applied index.
 /// 4. Propose another read index request.
 /// 5. Remove the filter and check whether the latter read index is greater than
-/// applied index.
+///    applied index.
 ///
 /// In previous implementation, these two read index request will be batched and
 /// will get the same read index which breaks the correctness because the latter
diff --git a/tests/integrations/raftstore/test_life.rs b/tests/integrations/raftstore/test_life.rs
index 0d01799f534..a32a7b86059 100644
--- a/tests/integrations/raftstore/test_life.rs
+++ b/tests/integrations/raftstore/test_life.rs
@@ -1,7 +1,7 @@
 // Copyright 2023 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc::channel, Arc, Mutex},
+    sync::{Arc, Mutex, mpsc::channel},
     time::Duration,
 };
 
@@ -12,11 +12,11 @@ use kvproto::{
 use raft::{eraftpb::ConfChangeType, prelude::MessageType};
 use raftstore::errors::Result;
 use test_raftstore::{
-    new_admin_request, new_change_peer_request, new_learner_peer, new_peer, Direction, Filter,
-    FilterFactory, RegionPacketFilter, Simulator as S1,
+    Direction, Filter, FilterFactory, RegionPacketFilter, Simulator as S1, new_admin_request,
+    new_change_peer_request, new_learner_peer, new_peer,
 };
 use test_raftstore_v2::Simulator as S2;
-use tikv_util::{config::ReadableDuration, time::Instant, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration, time::Instant};
 
 struct ForwardFactory {
     node_id: u64,
diff --git a/tests/integrations/raftstore/test_merge.rs b/tests/integrations/raftstore/test_merge.rs
index cfee1c9f84e..3fb278cedbd 100644
--- a/tests/integrations/raftstore/test_merge.rs
+++ b/tests/integrations/raftstore/test_merge.rs
@@ -2,7 +2,7 @@
 
 use std::{iter::*, sync::*, thread, time::*};
 
-use api_version::{test_kv_format_impl, KvFormat};
+use api_version::{KvFormat, test_kv_format_impl};
 use engine_traits::{CF_LOCK, CF_WRITE};
 use kvproto::{
     raft_cmdpb::CmdType,
@@ -10,11 +10,11 @@ use kvproto::{
 };
 use pd_client::PdClient;
 use raft::eraftpb::{ConfChangeType, MessageType};
-use raftstore::store::{metrics::RAFT_ENABLE_UNPERSISTED_APPLY_GAUGE, Callback, LocksStatus};
+use raftstore::store::{Callback, LocksStatus, metrics::RAFT_ENABLE_UNPERSISTED_APPLY_GAUGE};
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv::storage::{kv::SnapshotExt, Snapshot};
-use tikv_util::{config::*, future::block_on_timeout, HandyRwLock};
+use tikv::storage::{Snapshot, kv::SnapshotExt};
+use tikv_util::{HandyRwLock, config::*, future::block_on_timeout};
 use txn_types::{Key, LastChange, PessimisticLock};
 
 /// Test if merge is working as expected in a general condition.
@@ -344,7 +344,7 @@ fn test_node_merge_prerequisites_check() {
     )));
     let mut large_bytes = vec![b'k', b'3'];
     // 3M
-    large_bytes.extend(repeat(b'0').take(1024 * 1024 * 3));
+    large_bytes.extend(repeat_n(b'0', 1024 * 1024 * 3));
     cluster.must_put(&large_bytes, &large_bytes);
     cluster.must_put(&large_bytes, &large_bytes);
     // So log gap now contains 12M data, which exceeds the default max entry size.
diff --git a/tests/integrations/raftstore/test_multi.rs b/tests/integrations/raftstore/test_multi.rs
index 32104042c55..d6c20c1b2cd 100644
--- a/tests/integrations/raftstore/test_multi.rs
+++ b/tests/integrations/raftstore/test_multi.rs
@@ -9,11 +9,11 @@ use std::{
 use engine_traits::Peekable;
 use kvproto::raft_cmdpb::RaftCmdResponse;
 use raft::eraftpb::MessageType;
-use raftstore::{router::RaftStoreRouter, store::*, Result};
+use raftstore::{Result, router::RaftStoreRouter, store::*};
 use rand::{Rng, RngCore};
 use test_raftstore::*;
-use tikv::storage::{kv::SnapshotExt, Snapshot};
-use tikv_util::{config::*, HandyRwLock};
+use tikv::storage::{Snapshot, kv::SnapshotExt};
+use tikv_util::{HandyRwLock, config::*};
 use txn_types::{Key, LastChange, PessimisticLock};
 
 fn test_multi_base<T: Simulator>(cluster: &mut Cluster<T>) {
@@ -114,7 +114,7 @@ fn test_multi_lost_majority<T: Simulator>(cluster: &mut Cluster<T>, count: usize
     cluster.run();
     let leader = cluster.leader_of_region(1);
 
-    let half = (count as u64 + 1) / 2;
+    let half = (count as u64).div_ceil(2);
     for i in 1..=half {
         cluster.stop_node(i);
     }
diff --git a/tests/integrations/raftstore/test_prevote.rs b/tests/integrations/raftstore/test_prevote.rs
index c81b34f0435..689f1dbaab7 100644
--- a/tests/integrations/raftstore/test_prevote.rs
+++ b/tests/integrations/raftstore/test_prevote.rs
@@ -1,7 +1,7 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{atomic::AtomicBool, mpsc, Arc},
+    sync::{Arc, atomic::AtomicBool, mpsc},
     thread,
     time::Duration,
 };
diff --git a/tests/integrations/raftstore/test_region_change_observer.rs b/tests/integrations/raftstore/test_region_change_observer.rs
index 72bbfdc9b8f..4934bf5eebf 100644
--- a/tests/integrations/raftstore/test_region_change_observer.rs
+++ b/tests/integrations/raftstore/test_region_change_observer.rs
@@ -3,8 +3,8 @@
 use std::{
     mem,
     sync::{
-        mpsc::{channel, sync_channel, Receiver, SyncSender},
         Arc,
+        mpsc::{Receiver, SyncSender, channel, sync_channel},
     },
     time::Duration,
 };
@@ -15,10 +15,10 @@ use raftstore::coprocessor::{
     BoxRegionChangeObserver, Coprocessor, ObserverContext, RegionChangeEvent, RegionChangeObserver,
     RegionChangeReason,
 };
-use test_raftstore::{new_node_cluster, Cluster, NodeCluster};
+use test_raftstore::{Cluster, NodeCluster, new_node_cluster};
 use tikv_util::{
-    store::{find_peer, new_peer},
     HandyRwLock,
+    store::{find_peer, new_peer},
 };
 
 #[derive(Clone)]
diff --git a/tests/integrations/raftstore/test_region_heartbeat.rs b/tests/integrations/raftstore/test_region_heartbeat.rs
index 29f7e8b10dd..fcd5bb5418a 100644
--- a/tests/integrations/raftstore/test_region_heartbeat.rs
+++ b/tests/integrations/raftstore/test_region_heartbeat.rs
@@ -1,7 +1,7 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc, Arc},
+    sync::{Arc, mpsc},
     thread::sleep,
     time::Duration,
 };
@@ -9,9 +9,9 @@ use std::{
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
 use tikv_util::{
+    HandyRwLock,
     config::*,
     time::{Instant, UnixSecs as PdInstant},
-    HandyRwLock,
 };
 
 macro_rules! test_down_peers {
diff --git a/tests/integrations/raftstore/test_region_info_accessor.rs b/tests/integrations/raftstore/test_region_info_accessor.rs
index b4b0f465016..efd2503387f 100644
--- a/tests/integrations/raftstore/test_region_info_accessor.rs
+++ b/tests/integrations/raftstore/test_region_info_accessor.rs
@@ -1,18 +1,21 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc::channel, Arc},
+    sync::{Arc, mpsc::channel},
     thread,
     time::Duration,
 };
 
 use kvproto::metapb::Region;
+use pd_client::PdClient;
 use raft::StateRole;
 use raftstore::coprocessor::{RangeKey, RegionInfo, RegionInfoAccessor};
-use test_raftstore::{configure_for_merge, new_node_cluster, Cluster, NodeCluster};
+use test_raftstore::{Cluster, NodeCluster, configure_for_merge, new_node_cluster};
+use test_raftstore_macro::test_case;
+use tikv_kv::Engine;
 use tikv_util::{
-    store::{find_peer, new_peer},
     HandyRwLock,
+    store::{find_peer, new_peer},
 };
 
 fn dump(c: &RegionInfoAccessor) -> Vec<(Region, StateRole)> {
@@ -199,3 +202,64 @@ fn test_node_cluster_region_info_accessor() {
     drop(cluster);
     c.stop();
 }
+
+#[test_case(test_raftstore::new_server_cluster)]
+fn test_raft_engine_seek_region() {
+    let mut cluster = new_cluster(0, 3);
+    configure_for_snapshot(&mut cluster.cfg);
+    cluster.run_conf_change();
+    let pd_client = cluster.pd_client.clone();
+    for key in [b"a", b"b", b"c", b"d"] {
+        let region = pd_client.get_region(key).unwrap();
+        cluster.must_split(&region, key);
+    }
+
+    let stores = pd_client.get_stores().unwrap();
+    assert_eq!(stores.len(), 3);
+    let r0 = pd_client.get_region_info(b"").unwrap();
+    let r1 = pd_client.get_region_info(b"a").unwrap();
+    let r2 = pd_client.get_region_info(b"b").unwrap();
+    let r3 = pd_client.get_region_info(b"c").unwrap();
+    let r4 = pd_client.get_region_info(b"d").unwrap();
+
+    for (i, r) in [&r0, &r1, &r2, &r3, &r4].iter().enumerate() {
+        let leader_store = stores[i % stores.len()].get_id();
+        if r.leader.is_none() || r.leader.as_ref().unwrap().store_id != leader_store {
+            let leader_peer = find_peer(r, leader_store).unwrap().clone();
+            pd_client.transfer_leader(r.get_id(), leader_peer.clone(), vec![]);
+            pd_client.region_leader_must_be(r.get_id(), leader_peer);
+        }
+    }
+
+    let raft_engine = cluster.must_get_raft_engine(stores[0].get_id());
+    let (tx, rx) = channel();
+    raft_engine
+        .seek_region(
+            b"b",
+            Box::new(move |iter| {
+                let mut regions = vec![];
+                for info in iter {
+                    regions.push(info.clone());
+                }
+                tx.send(regions).unwrap();
+            }),
+        )
+        .unwrap();
+
+    // seek_region should be available for raft engine
+    let scanned_regions = rx
+        .recv_timeout(Duration::from_secs(5))
+        .unwrap()
+        .iter()
+        .map(|info| (info.region.clone(), info.role))
+        .collect::<Vec<_>>();
+
+    assert_eq!(
+        scanned_regions,
+        vec![
+            (r2.region.clone(), StateRole::Follower),
+            (r3.region.clone(), StateRole::Leader),
+            (r4.region.clone(), StateRole::Follower),
+        ]
+    );
+}
diff --git a/tests/integrations/raftstore/test_replica_read.rs b/tests/integrations/raftstore/test_replica_read.rs
index f699e3af280..c9b59e70df6 100644
--- a/tests/integrations/raftstore/test_replica_read.rs
+++ b/tests/integrations/raftstore/test_replica_read.rs
@@ -4,9 +4,9 @@ use std::{
     collections::HashMap,
     mem,
     sync::{
+        Arc, Mutex,
         atomic::AtomicBool,
         mpsc::{self, RecvTimeoutError},
-        Arc, Mutex,
     },
     thread,
     time::Duration,
@@ -16,10 +16,10 @@ use futures::executor::block_on;
 use kvproto::raft_serverpb::RaftMessage;
 use pd_client::PdClient;
 use raft::eraftpb::MessageType;
-use raftstore::{store::ReadIndexContext, Result};
+use raftstore::{Result, store::ReadIndexContext};
 use test_raftstore::{Simulator as S1, *};
 use test_raftstore_macro::test_case;
-use tikv_util::{config::*, future::block_on_timeout, time::Instant, HandyRwLock};
+use tikv_util::{HandyRwLock, config::*, future::block_on_timeout, time::Instant};
 use txn_types::{Key, Lock, LockType};
 use uuid::Uuid;
 
@@ -397,7 +397,7 @@ fn test_read_index_retry_lock_checking() {
             && resp
                 .get_responses()
                 .first()
-                .map_or(true, |r| !r.get_read_index().has_locked()),
+                .is_none_or(|r| !r.get_read_index().has_locked()),
         "{:?}",
         resp,
     );
diff --git a/tests/integrations/raftstore/test_replication_mode.rs b/tests/integrations/raftstore/test_replication_mode.rs
index 05e38c41935..ccf6046e010 100644
--- a/tests/integrations/raftstore/test_replication_mode.rs
+++ b/tests/integrations/raftstore/test_replication_mode.rs
@@ -6,7 +6,7 @@ use kvproto::replication_modepb::*;
 use pd_client::PdClient;
 use raft::eraftpb::ConfChangeType;
 use test_raftstore::*;
-use tikv_util::{config::*, mpsc::future, HandyRwLock};
+use tikv_util::{HandyRwLock, config::*, mpsc::future};
 
 fn prepare_cluster() -> Cluster<ServerCluster> {
     let mut cluster = new_server_cluster(0, 3);
diff --git a/tests/integrations/raftstore/test_scale_pool.rs b/tests/integrations/raftstore/test_scale_pool.rs
index 6d210c6c764..d2455c11e55 100644
--- a/tests/integrations/raftstore/test_scale_pool.rs
+++ b/tests/integrations/raftstore/test_scale_pool.rs
@@ -2,7 +2,7 @@
 
 use std::{
     collections::HashMap,
-    sync::{mpsc::sync_channel, Mutex},
+    sync::{Mutex, mpsc::sync_channel},
     time::Duration,
 };
 
@@ -12,10 +12,10 @@ use test_raftstore::*;
 use test_raftstore_macro::test_case;
 use tikv::config::ConfigurableDb;
 use tikv_util::{
+    HandyRwLock,
     config::ReadableDuration,
     sys::thread::{self, Pid},
     time::Instant,
-    HandyRwLock,
 };
 
 #[test]
diff --git a/tests/integrations/raftstore/test_snap.rs b/tests/integrations/raftstore/test_snap.rs
index c5659b6f863..73d36a70608 100644
--- a/tests/integrations/raftstore/test_snap.rs
+++ b/tests/integrations/raftstore/test_snap.rs
@@ -1,12 +1,13 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
+    assert_matches::assert_matches,
     fs,
     path::PathBuf,
     sync::{
+        Arc, Mutex, RwLock,
         atomic::{AtomicBool, Ordering},
         mpsc::{self, Sender},
-        Arc, Mutex, RwLock,
     },
     time::Duration,
 };
@@ -17,15 +18,18 @@ use file_system::{IoOp, IoType};
 use futures::executor::block_on;
 use grpcio::{self, ChannelBuilder, Environment};
 use kvproto::{
+    kvrpcpb,
+    kvrpcpb::KeyRange,
     raft_serverpb::{ExtraMessageType, RaftMessage, RaftSnapshotData},
     tikvpb::TikvClient,
 };
+use pd_client::PdClient;
 use protobuf::Message as M1;
 use raft::eraftpb::{Message, MessageType, Snapshot};
 use raftstore::{
+    Result,
     coprocessor::{ApplySnapshotObserver, BoxApplySnapshotObserver, Coprocessor, CoprocessorHost},
     store::{snap::TABLET_SNAPSHOT_VERSION, *},
-    Result,
 };
 use rand::Rng;
 use security::SecurityManager;
@@ -33,10 +37,13 @@ use test_raftstore::*;
 use test_raftstore_macro::test_case;
 use test_raftstore_v2::WrapFactory;
 use tikv::server::{snap::send_snap, tablet_snap::send_snap as send_snap_v2};
+use tikv_kv::{
+    Engine, Error, ErrorInner, ExtraRegionOverride, SnapContext, Snapshot as _, SnapshotExt,
+};
 use tikv_util::{
+    HandyRwLock,
     config::*,
     time::{Instant, Limiter, UnixSecs},
-    HandyRwLock,
 };
 
 fn test_huge_snapshot<T: Simulator>(cluster: &mut Cluster<T>, max_snapshot_file_size: u64) {
@@ -1260,3 +1267,122 @@ fn test_node_apply_snapshot_by_or_without_ingest() {
         }
     }
 }
+
+#[test_case(test_raftstore::new_server_cluster)]
+fn test_extra_snapshot_override() {
+    let mut cluster = new_cluster(0, 3);
+    configure_for_snapshot(&mut cluster.cfg);
+    cluster.run_conf_change();
+    let pd_client = cluster.pd_client.clone();
+    pd_client.disable_default_operator();
+    for key in [b"a", b"b", b"c", b"d"] {
+        let region = pd_client.get_region_info(key).unwrap();
+        cluster.must_split(&region, key);
+    }
+
+    // make sure leaders of region0 and region2 are in the same store
+    let r0 = pd_client.get_region_info(b"a").unwrap();
+    let r0_leader = r0.leader.as_ref().unwrap();
+    let mut r2 = pd_client.get_region_info(b"c").unwrap();
+    r2.leader = Some(find_peer(&r2, r0_leader.get_store_id()).unwrap().clone());
+    let r2_leader = r2.leader.as_ref().unwrap();
+    pd_client.transfer_leader(r2.get_id(), r2_leader.clone(), vec![]);
+    pd_client.region_leader_must_be(r2.get_id(), r2_leader.clone());
+
+    // constructs a snap_ctx with the base info region 0.
+    let pb_ctx = {
+        let mut ctx = kvrpcpb::Context::default();
+        ctx.set_region_id(r0.get_id());
+        ctx.set_region_epoch(r0.get_region_epoch().clone());
+        ctx.set_peer(r0_leader.clone());
+        ctx.set_term(10000);
+        ctx
+    };
+
+    let mut snap_ctx = SnapContext {
+        pb_ctx: &pb_ctx,
+        start_ts: Some(get_tso(pd_client.as_ref()).into()),
+        key_ranges: vec![KeyRange {
+            start_key: b"c1".to_vec(),
+            end_key: b"c2".to_vec(),
+            ..Default::default()
+        }],
+        ..Default::default()
+    };
+
+    // when `extra_snap_override`, should use the override region info
+    snap_ctx.extra_region_override = Some(ExtraRegionOverride {
+        region_id: r2.get_id(),
+        region_epoch: r2.get_region_epoch().clone(),
+        peer: r2_leader.clone(),
+        // test None term will not check the term in snapshot
+        check_term: None,
+    });
+    let snap = cluster
+        .must_get_raft_engine(r0_leader.get_store_id())
+        .snapshot(snap_ctx.clone())
+        .unwrap();
+    let r2_term = snap.ext().get_term().unwrap().get();
+    assert_eq!(snap.get_region().clone(), r2.region.clone());
+
+    // If`extra_snap_override`.`term` is set with an invalid value, should return an
+    // error.
+    snap_ctx.extra_region_override.as_mut().unwrap().check_term = Some(r2_term - 2);
+    let err = cluster
+        .must_get_raft_engine(r0_leader.get_store_id())
+        .snapshot(snap_ctx.clone())
+        .err()
+        .unwrap();
+    assert_matches!(err, Error(box ErrorInner::Request(header)) if header.stale_command.is_some());
+    snap_ctx.extra_region_override.as_mut().unwrap().check_term = None;
+
+    // If `extra_snap_override`.`term` is set with a valid value, should return
+    // a snapshot.
+    snap_ctx.extra_region_override.as_mut().unwrap().check_term = Some(r2_term);
+    let snap = cluster
+        .must_get_raft_engine(r0_leader.get_store_id())
+        .snapshot(snap_ctx.clone())
+        .unwrap();
+    assert_eq!(snap.get_region().clone(), r2.region.clone());
+    snap_ctx.extra_region_override.as_mut().unwrap().check_term = None;
+
+    // test invalid req_epoch will return an error
+    let mut req_epoch = r2.get_region_epoch().clone();
+    req_epoch.version -= 1;
+    snap_ctx
+        .extra_region_override
+        .as_mut()
+        .unwrap()
+        .region_epoch = req_epoch;
+    let err = cluster
+        .must_get_raft_engine(r0_leader.get_store_id())
+        .snapshot(snap_ctx.clone())
+        .err()
+        .unwrap();
+    assert_matches!(err, Error(box ErrorInner::Request(header)) if header.epoch_not_match.is_some());
+    snap_ctx
+        .extra_region_override
+        .as_mut()
+        .unwrap()
+        .region_epoch = r2.get_region_epoch().clone();
+
+    // test no-leader request will return an error
+    let r2_old_leader = r2_leader.clone();
+    let r2_leader = r2
+        .peers
+        .iter()
+        .find(|p| p.get_id() != r2_old_leader.get_id())
+        .unwrap()
+        .clone();
+    pd_client.transfer_leader(r2.get_id(), r2_leader.clone(), vec![]);
+    pd_client.region_leader_must_be(r2.get_id(), r2_leader.clone());
+    r2.leader = Some(r2_leader.clone());
+    snap_ctx.extra_region_override.as_mut().unwrap().peer = r2_old_leader.clone();
+    assert!(!snap_ctx.pb_ctx.replica_read);
+    let err = cluster
+        .must_get_raft_engine(r0_leader.get_store_id())
+        .snapshot(snap_ctx.clone())
+        .err()
+        .unwrap();
+    assert_matches!(err, Error(box ErrorInner::Request(header)) if header.not_leader.is_some());
+}
diff --git a/tests/integrations/raftstore/test_snap_recovery.rs b/tests/integrations/raftstore/test_snap_recovery.rs
index e0f150576ed..5626a4ce434 100644
--- a/tests/integrations/raftstore/test_snap_recovery.rs
+++ b/tests/integrations/raftstore/test_snap_recovery.rs
@@ -2,14 +2,14 @@
 
 use std::time::Duration;
 
-use futures::{executor::block_on, StreamExt};
+use futures::{StreamExt, executor::block_on};
 use raft::eraftpb::MessageType;
 use raftstore::store::{
-    snapshot_backup::{SnapshotBrWaitApplyRequest, SyncReport},
     PeerMsg, SignificantMsg, SnapshotBrWaitApplySyncer,
+    snapshot_backup::{SnapshotBrWaitApplyRequest, SyncReport},
 };
 use test_raftstore::*;
-use tikv_util::{future::block_on_timeout, HandyRwLock};
+use tikv_util::{HandyRwLock, future::block_on_timeout};
 use tokio::sync::oneshot;
 
 #[test]
diff --git a/tests/integrations/raftstore/test_split_region.rs b/tests/integrations/raftstore/test_split_region.rs
index cd2436512df..62680f3a9b9 100644
--- a/tests/integrations/raftstore/test_split_region.rs
+++ b/tests/integrations/raftstore/test_split_region.rs
@@ -2,28 +2,29 @@
 
 use std::{
     fs,
-    sync::{mpsc::channel, Arc},
+    sync::{Arc, mpsc::channel},
     thread,
     time::Duration,
 };
 
-use engine_traits::{Peekable, CF_DEFAULT, CF_WRITE};
+use engine_traits::{CF_DEFAULT, CF_RAFT, CF_WRITE, Peekable, RaftEngineReadOnly};
 use keys::data_key;
 use kvproto::{
     metapb, pdpb,
     raft_cmdpb::*,
-    raft_serverpb::{ExtraMessageType, RaftMessage},
+    raft_serverpb::{ExtraMessageType, RaftMessage, RegionLocalState},
 };
 use pd_client::PdClient;
 use raft::eraftpb::MessageType;
 use raftstore::{
-    store::{Bucket, BucketRange, Callback, WriteResponse},
     Result,
+    store::{Bucket, BucketRange, Callback, WriteResponse},
 };
 use raftstore_v2::router::QueryResult;
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv::storage::{kv::SnapshotExt, Snapshot};
+use test_util::eventually;
+use tikv::storage::{Snapshot, kv::SnapshotExt};
 use tikv_util::{config::*, future::block_on_timeout};
 use txn_types::{Key, LastChange, PessimisticLock};
 
@@ -1541,3 +1542,134 @@ fn test_clear_uncampaigned_regions_after_split() {
         new_peer(3, 3)
     );
 }
+
+#[test]
+fn test_split_init_raft_state_recovery() {
+    let mut cluster = new_node_cluster(0, 3);
+    let pd_client = Arc::clone(&cluster.pd_client);
+    pd_client.disable_default_operator();
+    cluster.run();
+    cluster.must_put(b"k2", b"v2");
+    let region = cluster.get_region(b"k2");
+
+    // Block prevote so that new peers do not update and persist raft state.
+    cluster.add_send_filter(CloneFilterFactory(DropMessageFilter::new(Arc::new(
+        move |m| {
+            let msg_type = m.get_message().get_msg_type();
+            msg_type != MessageType::MsgRequestPreVote
+        },
+    ))));
+
+    // Split region
+    cluster.split_region(&region, b"k2", Callback::None);
+    // New regions are created with region id 1000.
+    let new_region_id = 1000;
+    eventually(Duration::from_millis(100), Duration::from_secs(5), || {
+        let region_state: Option<RegionLocalState> = cluster
+            .get_engine(2)
+            .get_msg_cf(CF_RAFT, &keys::region_state_key(new_region_id))
+            .unwrap();
+        region_state.is_some()
+    });
+    let new_region = cluster.get_region(b"");
+    assert_eq!(new_region.get_id(), new_region_id);
+    let new_peer_on_store_2 = find_peer(&new_region, 2).unwrap().to_owned();
+
+    // Restart node 2.
+    cluster.stop_node(2);
+
+    // Make sure raft_state is not persisted.
+    let raft_state = cluster
+        .get_raft_engine(2)
+        .get_raft_state(new_region_id)
+        .unwrap();
+    assert!(
+        raft_state.is_none(),
+        "raft state should not be persisted: {:?}",
+        raft_state
+    );
+
+    cluster.run_node(2).unwrap();
+
+    cluster.clear_send_filters();
+
+    // Make sure raft_state is recovered.
+    eventually(Duration::from_millis(100), Duration::from_secs(5), || {
+        let raft_state = cluster
+            .get_raft_engine(2)
+            .get_raft_state(new_region_id)
+            .unwrap();
+        raft_state.is_some()
+    });
+    cluster.must_transfer_leader(new_region_id, new_peer_on_store_2);
+    cluster.must_put(b"k1", b"v1");
+    cluster.must_put(b"k3", b"v3");
+}
+
+#[test]
+fn test_split_init_raft_state_overwritten_by_snapshot() {
+    let mut cluster = new_node_cluster(0, 3);
+    let pd_client = Arc::clone(&cluster.pd_client);
+    pd_client.disable_default_operator();
+    cluster.run();
+    let region = cluster.get_region(b"k2");
+    let peer1 = find_peer(&region, 1).unwrap().to_owned();
+    cluster.must_transfer_leader(region.get_id(), peer1);
+    cluster.must_put(b"k2", b"v2");
+
+    // New regions are created with region id 1000.
+    let new_region_id = 1000;
+
+    // Block messages to new regions on store 2 so that it does not update and
+    // persist raft state.
+    cluster.add_recv_filter_on_node(
+        2,
+        Box::new(DropMessageFilter::new(Arc::new(move |m| {
+            m.get_region_id() != new_region_id
+        }))),
+    );
+
+    // Split region
+    cluster.split_region(&region, b"k2", Callback::None);
+    eventually(Duration::from_millis(100), Duration::from_secs(5), || {
+        let region_state: Option<RegionLocalState> = cluster
+            .get_engine(2)
+            .get_msg_cf(CF_RAFT, &keys::region_state_key(new_region_id))
+            .unwrap();
+        region_state.is_some()
+    });
+
+    let new_region = cluster.get_region(b"");
+    assert_eq!(new_region.get_id(), new_region_id);
+    let new_peer_on_store_2 = find_peer(&new_region, 2).unwrap().to_owned();
+    pd_client.must_remove_peer(new_region_id, new_peer_on_store_2.clone());
+    let mut new_peer_on_store_2_successor = new_peer_on_store_2.clone();
+    new_peer_on_store_2_successor.set_id(pd_client.alloc_id().unwrap());
+    pd_client.must_add_peer(new_region_id, new_peer_on_store_2_successor.clone());
+
+    // Make sure raft_state is not persisted.
+    let raft_state = cluster
+        .get_raft_engine(2)
+        .get_raft_state(new_region_id)
+        .unwrap();
+    assert!(
+        raft_state.is_none(),
+        "raft state should not be persisted: {:?}",
+        raft_state
+    );
+
+    cluster.clear_recv_filter_on_node(2);
+
+    // Make sure raft_state is persisted.
+    eventually(Duration::from_millis(100), Duration::from_secs(5), || {
+        let raft_state = cluster
+            .get_raft_engine(2)
+            .get_raft_state(new_region_id)
+            .unwrap();
+        raft_state.is_some()
+    });
+
+    cluster.must_transfer_leader(new_region_id, new_peer_on_store_2_successor);
+    cluster.must_put(b"k1", b"v1");
+    cluster.must_put(b"k3", b"v3");
+}
diff --git a/tests/integrations/raftstore/test_stale_peer.rs b/tests/integrations/raftstore/test_stale_peer.rs
index c3a765ecf3d..9a659c34851 100644
--- a/tests/integrations/raftstore/test_stale_peer.rs
+++ b/tests/integrations/raftstore/test_stale_peer.rs
@@ -4,13 +4,13 @@
 
 use std::{sync::Arc, thread, time::*};
 
-use engine_traits::{Peekable, CF_RAFT};
+use engine_traits::{CF_RAFT, Peekable};
 use kvproto::raft_serverpb::{PeerState, RegionLocalState};
 use pd_client::PdClient;
 use raft::eraftpb::MessageType;
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv_util::{config::ReadableDuration, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration};
 
 /// A helper function for testing the behaviour of the gc of stale peer
 /// which is out of region.
@@ -26,6 +26,7 @@ use tikv_util::{config::ReadableDuration, HandyRwLock};
 ///     are removed from the cluster or probably destroyed.
 ///   - Meantime, D, E, F would not reach B, Since it's not in the cluster
 ///     anymore.
+///
 /// In this case, Peer B would notice that the leader is missing for a long
 /// time, and it would check with pd to confirm whether it's still a member of
 /// the cluster. If not, it should destroy itself as a stale peer which is
@@ -109,6 +110,7 @@ fn test_server_stale_peer_out_of_region() {
 ///   a single raft AE message. But then it goes through some process like the
 ///   case of `test_stale_peer_out_of_region`, it's removed out of the region
 ///   and wouldn't be contacted anymore.
+///
 /// In both cases, peer B would notice that the leader is missing for a long
 /// time, and it's an initialized peer without any data. It would destroy itself
 /// as stale peer directly and should not impact other region data on the
diff --git a/tests/integrations/raftstore/test_stale_read.rs b/tests/integrations/raftstore/test_stale_read.rs
index 5de9bda1f64..3d65b778824 100644
--- a/tests/integrations/raftstore/test_stale_read.rs
+++ b/tests/integrations/raftstore/test_stale_read.rs
@@ -181,7 +181,7 @@ fn test_resolved_ts_after_destroy_peer() {
     // Make sure region 1 is removed from store 1.
     cluster.wait_destroy_and_clean(r1, new_peer(1, 1));
 
-    // Must not get destory peer's read progress
+    // Must not get destroy peer's read progress
     let meta = cluster.store_metas[&r1].lock().unwrap();
     assert_eq!(None, meta.region_read_progress.get_resolved_ts(&r1))
 }
diff --git a/tests/integrations/raftstore/test_stats.rs b/tests/integrations/raftstore/test_stats.rs
index e41bc8ebd86..d135c53fd08 100644
--- a/tests/integrations/raftstore/test_stats.rs
+++ b/tests/integrations/raftstore/test_stats.rs
@@ -6,9 +6,9 @@ use std::{
     time::Duration,
 };
 
-use api_version::{test_kv_format_impl, KvFormat};
+use api_version::{KvFormat, test_kv_format_impl};
 use engine_traits::MiscExt;
-use futures::{executor::block_on, SinkExt, StreamExt};
+use futures::{SinkExt, StreamExt, executor::block_on};
 use grpcio::*;
 use kvproto::{kvrpcpb::*, pdpb::QueryKind, tikvpb::*, tikvpb_grpc::TikvClient};
 use pd_client::PdClient;
@@ -733,9 +733,7 @@ fn check_split_key(
             let region = cluster.pd_client.get_region(&start_key).unwrap();
             assert!(
                 start_key == region.get_start_key()
-                    || end_key
-                        .as_ref()
-                        .map_or(false, |k| k == region.get_end_key()),
+                    || end_key.as_ref().is_some_and(|k| k == region.get_end_key()),
                 "region: {:?}, start_key: {:?}, end_key: {:?}",
                 region,
                 start_key,
diff --git a/tests/integrations/raftstore/test_status_command.rs b/tests/integrations/raftstore/test_status_command.rs
index 0d42c1ec869..814206cd4a5 100644
--- a/tests/integrations/raftstore/test_status_command.rs
+++ b/tests/integrations/raftstore/test_status_command.rs
@@ -5,7 +5,7 @@ use raftstore::store::msg::StoreMsg as StoreMsgV1;
 use raftstore_v2::router::StoreMsg as StoreMsgV2;
 use test_raftstore::Simulator as S1;
 use test_raftstore_v2::Simulator as S2;
-use tikv_util::{config::ReadableDuration, time::Instant, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration, time::Instant};
 
 #[test]
 fn test_region_detail() {
@@ -44,7 +44,7 @@ fn test_latency_inspect() {
     {
         // Test send LatencyInspect to V1.
         let (tx, rx) = std::sync::mpsc::sync_channel(10);
-        // Inspect different factors.
+        // Inspect different disk_factors.
         for factor in [InspectFactor::RaftDisk, InspectFactor::KvDisk].iter() {
             let cloned_tx = tx.clone();
             let inspector = LatencyInspector::new(
@@ -89,7 +89,7 @@ fn test_sync_latency_inspect() {
     cluster.run();
     let router = cluster.sim.wl().get_router(1).unwrap();
     let (tx, rx) = std::sync::mpsc::sync_channel(10);
-    // Inspect different factors.
+    // Inspect different disk_factors.
     for factor in [InspectFactor::RaftDisk, InspectFactor::KvDisk].iter() {
         let cloned_tx = tx.clone();
         let inspector = LatencyInspector::new(
diff --git a/tests/integrations/raftstore/test_tombstone.rs b/tests/integrations/raftstore/test_tombstone.rs
index c1cd0befcf1..67326b525b6 100644
--- a/tests/integrations/raftstore/test_tombstone.rs
+++ b/tests/integrations/raftstore/test_tombstone.rs
@@ -3,7 +3,7 @@
 use std::{sync::Arc, thread, time::Duration};
 
 use crossbeam::channel;
-use engine_traits::{CfNamesExt, Iterable, Peekable, RaftEngineDebug, SyncMutable, CF_RAFT};
+use engine_traits::{CF_RAFT, CfNamesExt, Iterable, Peekable, RaftEngineDebug, SyncMutable};
 use kvproto::raft_serverpb::{PeerState, RaftMessage, RegionLocalState, StoreIdent};
 use protobuf::Message;
 use raft::eraftpb::MessageType;
@@ -356,6 +356,9 @@ fn test_destroy_clean_up_logs_with_log_gc() {
     assert!(dest.is_empty(), "{:?}", dest);
 
     pd_client.must_add_peer(1, new_peer(3, 4));
+    // Clear stale leader cache after config change
+    // to avoid using outdated leader info
+    cluster.reset_leader_of_region(1);
     must_get_equal(&cluster.get_engine(3), b"k1", b"v1");
     cluster.must_put(b"k3", b"v3");
     must_get_equal(&cluster.get_engine(3), b"k3", b"v3");
@@ -371,6 +374,7 @@ fn test_destroy_clean_up_logs_with_log_gc() {
     assert!(dest.is_empty(), "{:?}", dest);
 
     pd_client.must_add_peer(1, new_peer(3, 5));
+    cluster.reset_leader_of_region(1);
     must_get_equal(&cluster.get_engine(3), b"k1", b"v1");
     cluster.must_put(b"k4", b"v4");
     must_get_equal(&cluster.get_engine(3), b"k4", b"v4");
diff --git a/tests/integrations/raftstore/test_transfer_leader.rs b/tests/integrations/raftstore/test_transfer_leader.rs
index f33eaf836cf..44cb336cf41 100644
--- a/tests/integrations/raftstore/test_transfer_leader.rs
+++ b/tests/integrations/raftstore/test_transfer_leader.rs
@@ -2,7 +2,7 @@
 
 use std::{sync::Arc, thread, time::Duration};
 
-use api_version::{test_kv_format_impl, KvFormat};
+use api_version::{KvFormat, test_kv_format_impl};
 use engine_traits::CF_LOCK;
 use raft::eraftpb::MessageType;
 use raftstore::store::LocksStatus;
diff --git a/tests/integrations/raftstore/test_unsafe_recovery.rs b/tests/integrations/raftstore/test_unsafe_recovery.rs
index cab9a60b791..5fe087279b6 100644
--- a/tests/integrations/raftstore/test_unsafe_recovery.rs
+++ b/tests/integrations/raftstore/test_unsafe_recovery.rs
@@ -8,7 +8,7 @@ use pd_client::PdClient;
 use raft::eraftpb::{ConfChangeType, MessageType};
 use test_raftstore::*;
 use test_raftstore_macro::test_case;
-use tikv_util::{config::ReadableDuration, store::find_peer, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration, store::find_peer};
 
 macro_rules! confirm_quorum_is_lost {
     ($cluster:expr, $region:expr) => {{
@@ -28,7 +28,7 @@ macro_rules! confirm_quorum_is_lost {
 
 #[test_case(test_raftstore::new_node_cluster)]
 #[test_case(test_raftstore_v2::new_node_cluster)]
-fn test_unsafe_recovery_demote_failed_voters() {
+fn test_unsafe_recovery_demote_failed_peers() {
     let mut cluster = new_cluster(0, 3);
     cluster.run();
     let nodes = Vec::from_iter(cluster.get_node_ids());
@@ -40,6 +40,18 @@ fn test_unsafe_recovery_demote_failed_voters() {
 
     let region = block_on(pd_client.get_region_by_id(1)).unwrap().unwrap();
 
+    // Replace peer on node1 with a learner
+    let peer_on_store1 = find_peer(&region, nodes[1]).unwrap();
+    cluster
+        .pd_client
+        .must_remove_peer(region.get_id(), peer_on_store1.clone());
+    cluster.pd_client.must_add_peer(
+        region.get_id(),
+        new_learner_peer(nodes[1], cluster.pd_client.alloc_id().unwrap()),
+    );
+    // Sleep 100 ms to wait for the new learner to be initialized.
+    sleep_ms(100);
+
     let peer_on_store2 = find_peer(&region, nodes[2]).unwrap();
     cluster.must_transfer_leader(region.get_id(), peer_on_store2.clone());
     cluster.stop_node(nodes[1]);
@@ -49,36 +61,104 @@ fn test_unsafe_recovery_demote_failed_voters() {
 
     cluster.must_enter_force_leader(region.get_id(), nodes[0], vec![nodes[1], nodes[2]]);
 
-    let to_be_removed: Vec<metapb::Peer> = region
+    // Get the updated region info after setup
+    let updated_region = block_on(pd_client.get_region_by_id(1)).unwrap().unwrap();
+    let failed_peers: Vec<metapb::Peer> = updated_region
         .get_peers()
         .iter()
         .filter(|&peer| peer.get_store_id() != nodes[0])
         .cloned()
         .collect();
+
     let mut plan = pdpb::RecoveryPlan::default();
     let mut demote = pdpb::DemoteFailedVoters::default();
-    demote.set_region_id(region.get_id());
-    demote.set_failed_voters(to_be_removed.into());
+    demote.set_region_id(updated_region.get_id());
+    demote.set_failed_voters(failed_peers.into());
     plan.mut_demotes().push(demote);
     pd_client.must_set_unsafe_recovery_plan(nodes[0], plan);
     cluster.must_send_store_heartbeat(nodes[0]);
 
-    let mut demoted = true;
+    let mut recovery_complete = false;
     for _ in 0..10 {
         let region = block_on(pd_client.get_region_by_id(1)).unwrap().unwrap();
 
-        demoted = true;
+        let mut has_failed_learner = false;
+        let mut has_non_demoted_voter = false;
+
         for peer in region.get_peers() {
-            if peer.get_id() != nodes[0] && peer.get_role() == metapb::PeerRole::Voter {
-                demoted = false;
+            if peer.get_store_id() == nodes[1] {
+                // The failed learner should be removed
+                has_failed_learner = true;
+            } else if peer.get_store_id() != nodes[0] && peer.get_role() == metapb::PeerRole::Voter
+            {
+                // Failed voters should be demoted to learners
+                has_non_demoted_voter = true;
             }
         }
-        if demoted {
+
+        // Recovery is complete when failed learner is removed and failed voters are
+        // demoted
+        recovery_complete = !has_failed_learner && !has_non_demoted_voter;
+
+        if recovery_complete {
             break;
         }
         sleep_ms(200);
     }
-    assert!(demoted);
+    assert!(
+        recovery_complete,
+        "Failed learners should be removed and failed voters should be demoted"
+    );
+
+    // Verify final state
+    let final_region = block_on(pd_client.get_region_by_id(1)).unwrap().unwrap();
+
+    // Should have 2 peers now: 1 survivor (voter) + 1 demoted failed voter
+    // (learner)
+    assert_eq!(
+        final_region.get_peers().len(),
+        2,
+        "Should have 2 peers: 1 voter + 1 demoted learner"
+    );
+
+    // Verify roles
+    let mut voter_count = 0;
+    let mut learner_count = 0;
+    let mut survivor_found = false;
+    let mut failed_learner_removed = true;
+
+    for peer in final_region.get_peers() {
+        match peer.get_role() {
+            metapb::PeerRole::Voter => {
+                voter_count += 1;
+                if peer.get_store_id() == nodes[0] {
+                    survivor_found = true;
+                }
+            }
+            metapb::PeerRole::Learner => {
+                learner_count += 1;
+                // Should be the demoted failed voter on node2, not the failed learner on node1
+                assert_ne!(
+                    peer.get_store_id(),
+                    nodes[1],
+                    "Failed learner should be removed"
+                );
+            }
+            _ => {}
+        }
+
+        if peer.get_store_id() == nodes[1] {
+            failed_learner_removed = false;
+        }
+    }
+
+    assert_eq!(voter_count, 1, "Should have exactly 1 voter (the survivor)");
+    assert_eq!(
+        learner_count, 1,
+        "Should have exactly 1 learner (the demoted failed voter)"
+    );
+    assert!(survivor_found, "Survivor node should remain as voter");
+    assert!(failed_learner_removed, "Failed learner should be removed");
 }
 
 // Demote non-exist voters will not work, but TiKV should still report to PD.
diff --git a/tests/integrations/raftstore/test_v1_v2_mixed.rs b/tests/integrations/raftstore/test_v1_v2_mixed.rs
index 9ceb7938aaf..adac8405420 100644
--- a/tests/integrations/raftstore/test_v1_v2_mixed.rs
+++ b/tests/integrations/raftstore/test_v1_v2_mixed.rs
@@ -6,7 +6,7 @@ use std::{
 };
 
 use engine_rocks::{RocksCfOptions, RocksDbOptions};
-use engine_traits::{Checkpointer, KvEngine, Peekable, SyncMutable, LARGE_CFS};
+use engine_traits::{Checkpointer, KvEngine, LARGE_CFS, Peekable, SyncMutable};
 use futures::executor::block_on;
 use grpcio::{ChannelBuilder, Environment};
 use kvproto::{
@@ -16,11 +16,11 @@ use kvproto::{
 use raft::eraftpb::{MessageType, Snapshot};
 use raftstore::{
     errors::Result,
-    store::{snap::TABLET_SNAPSHOT_VERSION, TabletSnapKey, TabletSnapManager},
+    store::{TabletSnapKey, TabletSnapManager, snap::TABLET_SNAPSHOT_VERSION},
 };
 use rand::Rng;
 use test_raftstore::{
-    new_learner_peer, Direction, Filter, FilterFactory, RegionPacketFilter, Simulator as S1, *,
+    Direction, Filter, FilterFactory, RegionPacketFilter, Simulator as S1, new_learner_peer, *,
 };
 use test_raftstore_v2::{Simulator as S2, WrapFactory};
 use tikv::server::tablet_snap::send_snap as send_snap_v2;
diff --git a/tests/integrations/raftstore/test_witness.rs b/tests/integrations/raftstore/test_witness.rs
index d4332403cea..93da216ff9f 100644
--- a/tests/integrations/raftstore/test_witness.rs
+++ b/tests/integrations/raftstore/test_witness.rs
@@ -17,9 +17,9 @@ use pd_client::PdClient;
 use raft::eraftpb::{ConfChangeType, MessageType};
 use test_raftstore::*;
 use tikv_util::{
+    HandyRwLock,
     config::ReadableDuration,
     store::{find_peer, new_witness_peer},
-    HandyRwLock,
 };
 
 // Test the case that region split or merge with witness peer
diff --git a/tests/integrations/resource_metering/test_cpu.rs b/tests/integrations/resource_metering/test_cpu.rs
index b75a27320e2..2b880b652dc 100644
--- a/tests/integrations/resource_metering/test_cpu.rs
+++ b/tests/integrations/resource_metering/test_cpu.rs
@@ -3,21 +3,21 @@
 use std::{
     future::Future,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicU64, Ordering},
     },
     time::{Duration, Instant},
 };
 
 use concurrency_manager::ConcurrencyManager;
-use futures::{executor::block_on, StreamExt};
+use futures::{StreamExt, executor::block_on};
 use kvproto::kvrpcpb::Context;
 use resource_control::ResourceGroupManager;
 use test_coprocessor::{DagSelect, Insert, ProductTable, Store};
 use tidb_query_datatype::codec::Datum;
 use tikv::{
     config::CoprReadPoolConfig,
-    coprocessor::{readpool_impl, Endpoint},
+    coprocessor::{Endpoint, readpool_impl},
     read_pool::ReadPool,
     storage::RocksEngine,
 };
diff --git a/tests/integrations/resource_metering/test_dynamic_config.rs b/tests/integrations/resource_metering/test_dynamic_config.rs
index 57849f52db9..6352ba0121e 100644
--- a/tests/integrations/resource_metering/test_dynamic_config.rs
+++ b/tests/integrations/resource_metering/test_dynamic_config.rs
@@ -3,6 +3,7 @@
 use std::{iter, thread::sleep, time::Duration};
 
 use rand::prelude::SliceRandom;
+use resource_metering::ENABLE_NETWORK_IO_COLLECTION;
 use test_util::alloc_port;
 use tikv_util::config::ReadableDuration;
 use tokio::time::Instant;
@@ -16,6 +17,7 @@ pub fn test_enable() {
         report_receiver_interval: ReadableDuration::millis(2500),
         max_resource_groups: 5000,
         precision: ReadableDuration::secs(1),
+        enable_network_io_collection: false,
     });
 
     let port = alloc_port();
@@ -60,6 +62,7 @@ pub fn test_report_interval() {
         report_receiver_interval: ReadableDuration::secs(3),
         max_resource_groups: 5000,
         precision: ReadableDuration::secs(1),
+        enable_network_io_collection: false,
     });
     test_suite.start_receiver_at(port);
 
@@ -100,13 +103,13 @@ pub fn test_max_resource_groups() {
         report_receiver_interval: ReadableDuration::secs(4),
         max_resource_groups: 5000,
         precision: ReadableDuration::secs(2),
+        enable_network_io_collection: false,
     });
     test_suite.start_receiver_at(port);
 
     // Workload
     // [req-{1..3} * 6, req-{4..5} * 1]
-    let mut wl = iter::repeat(1..=3)
-        .take(6)
+    let mut wl = iter::repeat_n(1..=3, 6)
         .flatten()
         .chain(4..=5)
         .map(|n| format!("req-{}", n))
@@ -143,6 +146,7 @@ pub fn test_precision() {
         report_receiver_interval: ReadableDuration::secs(3),
         max_resource_groups: 5000,
         precision: ReadableDuration::secs(1),
+        enable_network_io_collection: false,
     });
     test_suite.start_receiver_at(port);
 
@@ -179,3 +183,24 @@ pub fn test_precision() {
         assert!((2..=4).contains(&diff));
     }
 }
+
+#[test]
+pub fn test_enable_network_io_collection() {
+    let port = alloc_port();
+    let mut test_suite = TestSuite::new(resource_metering::Config {
+        receiver_address: format!("127.0.0.1:{}", port),
+        report_receiver_interval: ReadableDuration::secs(3),
+        max_resource_groups: 5000,
+        precision: ReadableDuration::secs(1),
+        enable_network_io_collection: false,
+    });
+    test_suite.start_receiver_at(port);
+    // Workload
+    // [req-1]
+    test_suite.setup_workload(vec!["req-1"]);
+
+    test_suite.cfg_enable_network_io_collection("true");
+    test_suite.flush_receiver();
+    let _res = test_suite.block_receive_one();
+    assert!(ENABLE_NETWORK_IO_COLLECTION.load(std::sync::atomic::Ordering::Relaxed));
+}
diff --git a/tests/integrations/resource_metering/test_pubsub.rs b/tests/integrations/resource_metering/test_pubsub.rs
index 03a02d387fc..17de9150458 100644
--- a/tests/integrations/resource_metering/test_pubsub.rs
+++ b/tests/integrations/resource_metering/test_pubsub.rs
@@ -2,7 +2,7 @@
 
 use std::collections::HashSet;
 
-use futures::{executor::block_on, StreamExt};
+use futures::{StreamExt, executor::block_on};
 use tikv_util::config::ReadableDuration;
 
 use crate::resource_metering::test_suite::TestSuite;
diff --git a/tests/integrations/resource_metering/test_read_keys.rs b/tests/integrations/resource_metering/test_read_keys.rs
index 5f63d2cd031..abcb8e710c7 100644
--- a/tests/integrations/resource_metering/test_read_keys.rs
+++ b/tests/integrations/resource_metering/test_read_keys.rs
@@ -3,7 +3,7 @@
 use std::{sync::Arc, time::Duration};
 
 use concurrency_manager::ConcurrencyManager;
-use crossbeam::channel::{unbounded, Receiver, RecvTimeoutError, Sender};
+use crossbeam::channel::{Receiver, RecvTimeoutError, Sender, unbounded};
 use grpcio::{ChannelBuilder, Environment};
 use kvproto::{coprocessor, kvrpcpb::*, resource_usage_agent::ResourceUsageRecord, tikvpb::*};
 use protobuf::Message;
@@ -14,13 +14,13 @@ use test_util::alloc_port;
 use tidb_query_datatype::codec::Datum;
 use tikv::{
     config::CoprReadPoolConfig,
-    coprocessor::{readpool_impl, Endpoint},
+    coprocessor::{Endpoint, readpool_impl},
     read_pool::ReadPool,
     storage::{Engine, RocksEngine},
 };
 use tikv_util::{
-    config::ReadableDuration, quota_limiter::QuotaLimiter, thread_group::GroupProperties,
-    HandyRwLock,
+    HandyRwLock, config::ReadableDuration, quota_limiter::QuotaLimiter,
+    thread_group::GroupProperties,
 };
 use tipb::SelectResponse;
 
diff --git a/tests/integrations/resource_metering/test_receiver.rs b/tests/integrations/resource_metering/test_receiver.rs
index 4e5b8b49d7c..94125e450cf 100644
--- a/tests/integrations/resource_metering/test_receiver.rs
+++ b/tests/integrations/resource_metering/test_receiver.rs
@@ -15,6 +15,7 @@ pub fn test_alter_receiver_address() {
         report_receiver_interval: ReadableDuration::secs(3),
         max_resource_groups: 5000,
         precision: ReadableDuration::secs(1),
+        enable_network_io_collection: false,
     });
     test_suite.start_receiver_at(port);
 
@@ -51,6 +52,7 @@ pub fn test_receiver_blocking() {
         report_receiver_interval: ReadableDuration::secs(3),
         max_resource_groups: 5000,
         precision: ReadableDuration::secs(1),
+        enable_network_io_collection: false,
     });
     test_suite.start_receiver_at(port);
 
@@ -89,6 +91,7 @@ pub fn test_receiver_shutdown() {
         report_receiver_interval: ReadableDuration::secs(3),
         max_resource_groups: 5000,
         precision: ReadableDuration::secs(1),
+        enable_network_io_collection: false,
     });
     test_suite.start_receiver_at(port);
 
diff --git a/tests/integrations/resource_metering/test_suite/mock_receiver_server.rs b/tests/integrations/resource_metering/test_suite/mock_receiver_server.rs
index de91ca8c528..e32df395083 100644
--- a/tests/integrations/resource_metering/test_suite/mock_receiver_server.rs
+++ b/tests/integrations/resource_metering/test_suite/mock_receiver_server.rs
@@ -2,8 +2,8 @@
 
 use std::{
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc,
+        atomic::{AtomicBool, Ordering},
     },
     thread::sleep,
     time::Duration,
@@ -16,7 +16,7 @@ use grpcio::{
     ServerBuilder,
 };
 use kvproto::resource_usage_agent::{
-    create_resource_usage_agent, EmptyResponse, ResourceUsageAgent, ResourceUsageRecord,
+    EmptyResponse, ResourceUsageAgent, ResourceUsageRecord, create_resource_usage_agent,
 };
 
 pub struct MockReceiverServer {
diff --git a/tests/integrations/resource_metering/test_suite/mod.rs b/tests/integrations/resource_metering/test_suite/mod.rs
index 7dc6eceb0d5..593767c2c48 100644
--- a/tests/integrations/resource_metering/test_suite/mod.rs
+++ b/tests/integrations/resource_metering/test_suite/mod.rs
@@ -5,8 +5,8 @@ mod mock_receiver_server;
 
 use std::{collections::HashMap, sync::Arc, time::Duration};
 
-use crossbeam::channel::{unbounded, Receiver, Sender};
-use futures::{channel::oneshot, select, FutureExt};
+use crossbeam::channel::{Receiver, Sender, unbounded};
+use futures::{FutureExt, channel::oneshot, select};
 use grpcio::{ChannelBuilder, ClientSStreamReceiver, Environment};
 use kvproto::{
     kvrpcpb::Context,
@@ -21,8 +21,8 @@ use test_util::alloc_port;
 use tikv::{
     config::{ConfigController, TikvConfig},
     storage::{
-        lock_manager::MockLockManager, RocksEngine, StorageApiV1, TestEngineBuilder,
-        TestStorageBuilderApiV1,
+        RocksEngine, StorageApiV1, TestEngineBuilder, TestStorageBuilderApiV1,
+        lock_manager::MockLockManager,
     },
 };
 use tokio::runtime::{self, Runtime};
@@ -158,6 +158,13 @@ impl TestSuite {
             .unwrap();
     }
 
+    pub fn cfg_enable_network_io_collection(&self, flag: impl Into<String>) {
+        let flag = flag.into();
+        self.cfg_controller
+            .update_config("resource-metering.enable-network-io-collection", &flag)
+            .unwrap();
+    }
+
     pub fn cfg_report_receiver_interval(&self, interval: impl Into<String>) {
         let interval = interval.into();
         self.cfg_controller
diff --git a/tests/integrations/server/debugger.rs b/tests/integrations/server/debugger.rs
index 61bc570aafc..2ba194eae31 100644
--- a/tests/integrations/server/debugger.rs
+++ b/tests/integrations/server/debugger.rs
@@ -2,8 +2,8 @@
 
 use collections::{HashMap, HashSet};
 use engine_rocks::{raw::Range, util::get_cf_handle};
-use engine_traits::{CachedTablet, MiscExt, CF_WRITE};
-use keys::{data_key, DATA_MAX_KEY};
+use engine_traits::{CF_WRITE, CachedTablet, MiscExt};
+use keys::{DATA_MAX_KEY, data_key};
 use kvproto::{
     debugpb::{
         Db, FlashbackToVersionRequest, FlashbackToVersionResponse, GetAllRegionsInStoreRequest,
diff --git a/tests/integrations/server/gc_worker.rs b/tests/integrations/server/gc_worker.rs
index 238102df6b6..d2728b6fd29 100644
--- a/tests/integrations/server/gc_worker.rs
+++ b/tests/integrations/server/gc_worker.rs
@@ -2,7 +2,7 @@
 
 use std::sync::Arc;
 
-use engine_traits::{Peekable, CF_WRITE};
+use engine_traits::{CF_WRITE, Peekable};
 use grpcio::{ChannelBuilder, Environment};
 use keys::data_key;
 use kvproto::{kvrpcpb::*, tikvpb::TikvClient};
diff --git a/tests/integrations/server/kv_service.rs b/tests/integrations/server/kv_service.rs
index 6c130c375cd..cb614b09d63 100644
--- a/tests/integrations/server/kv_service.rs
+++ b/tests/integrations/server/kv_service.rs
@@ -12,10 +12,10 @@ use std::{
 use api_version::{ApiV1, ApiV1Ttl, ApiV2, KvFormat};
 use concurrency_manager::ConcurrencyManager;
 use engine_traits::{
-    MiscExt, Peekable, RaftEngine, RaftEngineReadOnly, RaftLogBatch, SyncMutable, CF_DEFAULT,
-    CF_LOCK, CF_RAFT, CF_WRITE,
+    CF_DEFAULT, CF_LOCK, CF_RAFT, CF_WRITE, MiscExt, Peekable, RaftEngine, RaftEngineReadOnly,
+    RaftLogBatch, SyncMutable,
 };
-use futures::{executor::block_on, future, SinkExt, StreamExt, TryStreamExt};
+use futures::{SinkExt, StreamExt, TryStreamExt, executor::block_on, future};
 use grpcio::*;
 use grpcio_health::{proto::HealthCheckRequest, *};
 use kvproto::{
@@ -30,7 +30,7 @@ use pd_client::PdClient;
 use raft::eraftpb;
 use raftstore::{
     coprocessor::CoprocessorHost,
-    store::{fsm::store::StoreMeta, AutoSplitController, DiskCheckRunner, SnapManager},
+    store::{AutoSplitController, DiskCheckRunner, SnapManager, fsm::store::StoreMeta},
 };
 use resource_metering::CollectorRegHandle;
 use service::service_manager::GrpcServiceManager;
@@ -49,9 +49,9 @@ use tikv::{
     storage::{config::EngineType, txn::FLASHBACK_BATCH_SIZE},
 };
 use tikv_util::{
-    config::ReadableSize,
-    worker::{dummy_scheduler, LazyWorker},
     HandyRwLock,
+    config::ReadableSize,
+    worker::{LazyWorker, dummy_scheduler},
 };
 use txn_types::{Key, Lock, LockType, TimeStamp};
 
@@ -2349,7 +2349,7 @@ fn test_get_lock_wait_info_api() {
         // The lock should be in waiting state here.
         let req = GetLockWaitInfoRequest::default();
         let resp = client.get_lock_wait_info(&req).unwrap();
-        if resp.entries.len() != 0 {
+        if !resp.entries.is_empty() {
             entries = Some(resp.entries.to_vec());
             break;
         }
diff --git a/tests/integrations/server/lock_manager.rs b/tests/integrations/server/lock_manager.rs
index 289b10303a8..44ea93a7b66 100644
--- a/tests/integrations/server/lock_manager.rs
+++ b/tests/integrations/server/lock_manager.rs
@@ -2,9 +2,8 @@
 
 use std::{
     sync::{
-        mpsc,
+        Arc, mpsc,
         mpsc::{RecvTimeoutError, TryRecvError},
-        Arc,
     },
     thread,
     time::Duration,
@@ -17,7 +16,7 @@ use kvproto::{
     tikvpb::TikvClient,
 };
 use test_raftstore::*;
-use tikv_util::{config::ReadableDuration, HandyRwLock};
+use tikv_util::{HandyRwLock, config::ReadableDuration};
 
 fn deadlock(client: &TikvClient, ctx: Context, key1: &[u8], ts: u64) -> bool {
     let key1 = key1.to_vec();
diff --git a/tests/integrations/server/mod.rs b/tests/integrations/server/mod.rs
index 3bf842d2b9a..8cdf7b0ad55 100644
--- a/tests/integrations/server/mod.rs
+++ b/tests/integrations/server/mod.rs
@@ -13,7 +13,7 @@ use std::sync::Arc;
 
 use ::security::{SecurityConfig, SecurityManager};
 use grpcio::*;
-use kvproto::tikvpb::{create_tikv, Tikv};
+use kvproto::tikvpb::{Tikv, create_tikv};
 
 fn tikv_service<T>(kv: T, ip: &str, port: u16) -> Result<Server>
 where
diff --git a/tests/integrations/server/raft_client.rs b/tests/integrations/server/raft_client.rs
index 2b51bb1f21b..9c632e1fcf4 100644
--- a/tests/integrations/server/raft_client.rs
+++ b/tests/integrations/server/raft_client.rs
@@ -2,8 +2,9 @@
 
 use std::{
     sync::{
+        Arc,
         atomic::{AtomicUsize, Ordering},
-        mpsc, Arc,
+        mpsc,
     },
     thread, time,
     time::Duration,
@@ -21,13 +22,14 @@ use kvproto::{
 use raft::eraftpb::Entry;
 use raftstore::errors::DiscardReason;
 use tikv::server::{
-    load_statistics::ThreadLoadPool, raftkv::RaftRouterWrap, resolve, Config, ConnectionBuilder,
-    RaftClient, StoreAddrResolver, TestRaftStoreRouter,
+    Config, ConnectionBuilder, RaftClient, StoreAddrResolver, TestRaftStoreRouter,
+    load_statistics::ThreadLoadPool, raftkv::RaftRouterWrap, resolve,
 };
 use tikv_kv::{FakeExtension, RaftExtension};
 use tikv_util::{
     config::{ReadableDuration, VersionTrack},
-    worker::{Builder as WorkerBuilder, LazyWorker},
+    debug,
+    worker::{Builder as WorkerBuilder, LazyWorker, Worker},
 };
 
 use super::*;
@@ -54,7 +56,12 @@ where
         worker.scheduler(),
         loads,
     );
-    RaftClient::new(0, builder)
+    RaftClient::new(
+        0,
+        builder,
+        Duration::from_millis(50),
+        Worker::new("test-worker"),
+    )
 }
 
 fn get_raft_client_by_port(port: u16) -> RaftClient<resolve::MockStoreAddrResolver, FakeExtension> {
@@ -428,3 +435,149 @@ fn test_store_allowlist() {
     check_msg_count(500, &msg_count1, 10);
     check_msg_count(500, &msg_count2, 5);
 }
+
+#[tokio::test]
+async fn test_health_checker_lifecycle() {
+    fail::cfg("network_inspection_interval", "return").unwrap();
+    let msg_count = Arc::new(AtomicUsize::new(0));
+    let batch_msg_count: Arc<AtomicUsize> = Arc::new(AtomicUsize::new(0));
+    let service = MockKvForRaft::new(Arc::clone(&msg_count), Arc::clone(&batch_msg_count), true);
+    let (mock_server, port) = create_mock_server(service, 60600, 60700).unwrap();
+
+    let mut raft_client = get_raft_client_by_port(port);
+
+    // Initially, there should be no stores with latency data
+    let initial_latencies = raft_client.get_all_max_latencies();
+    assert!(
+        initial_latencies.is_empty(),
+        "Initially no stores should have latency data"
+    );
+
+    // Step 1: Send messages to establish connections for stores 1, 2, 3
+    debug!("Establishing connections to stores 1, 2, 3");
+    for store_id in 1..=3 {
+        let mut raft_m = RaftMessage::default();
+        raft_m.mut_to_peer().set_store_id(store_id);
+        raft_m.set_region_id(store_id);
+        let _ = raft_client.send(raft_m);
+    }
+    raft_client.flush();
+
+    // Start network inspection before establishing any connections
+    raft_client.start_network_inspection();
+
+    // Wait for health checker to detect new stores and start inspection tasks
+    tokio::time::sleep(Duration::from_millis(200)).await;
+
+    // Check that latencies are being tracked for the connected stores
+    for store_id in 1..=3 {
+        assert!(raft_client.get_max_latency(store_id).is_some())
+    }
+    // Verify that stores 4 and 5 do not have latency data yet
+    for store_id in 4..=5 {
+        assert!(raft_client.get_max_latency(store_id).is_none());
+    }
+
+    // Step 2: Add more stores (4, 5) to test dynamic store detection
+    debug!("Adding connections to stores 4, 5");
+    for store_id in 4..=5 {
+        let mut raft_m = RaftMessage::default();
+        raft_m.mut_to_peer().set_store_id(store_id);
+        raft_m.set_region_id(store_id);
+        let _ = raft_client.send(raft_m);
+    }
+    raft_client.flush();
+
+    // Wait for health checker to detect the new stores
+    tokio::time::sleep(Duration::from_millis(200)).await;
+
+    // Verify that stores 4 and 5 might also have latency data
+    for store_id in 4..=5 {
+        assert!(raft_client.get_max_latency(store_id).is_some());
+    }
+
+    drop(mock_server);
+    fail::remove("network_inspection_interval")
+}
+
+#[tokio::test]
+async fn test_network_inspection_with_real_latency() {
+    let msg_count = Arc::new(AtomicUsize::new(0));
+    let batch_msg_count = Arc::new(AtomicUsize::new(0));
+    let service = MockKvForRaft::new(Arc::clone(&msg_count), Arc::clone(&batch_msg_count), true);
+    let (mock_server, port) = create_mock_server(service, 61100, 61200).unwrap();
+
+    let mut raft_client = get_raft_client_by_port(port);
+
+    // Send messages to establish connections for multiple stores
+    for store_id in 1..=3 {
+        let mut raft_m = RaftMessage::default();
+        raft_m.mut_to_peer().set_store_id(store_id);
+        raft_m.set_region_id(store_id);
+        let _ = raft_client.send(raft_m); // Some may fail, which is expected
+    }
+    raft_client.flush();
+
+    // Start network inspection
+    raft_client.start_network_inspection();
+
+    // Wait for inspection to potentially run several cycles
+    tokio::time::sleep(Duration::from_millis(200)).await;
+
+    let check_latency_not_empty = |store_id| {
+        let latency = raft_client.get_max_latency(store_id);
+        assert!(
+            latency.is_some(),
+            "latency for store {} should not be None",
+            store_id
+        );
+        assert_ne!(
+            latency.unwrap(),
+            0.0,
+            "latency for store {} should be greater than 0",
+            store_id
+        );
+    };
+    check_latency_not_empty(1);
+    check_latency_not_empty(2);
+    check_latency_not_empty(3);
+    assert_eq!(raft_client.get_max_latency(99), None);
+
+    drop(mock_server);
+}
+
+#[tokio::test]
+async fn test_network_inspection_with_connection_failures() {
+    fail::cfg("network_inspection_interval", "return").unwrap();
+    let msg_count = Arc::new(AtomicUsize::new(0));
+    let batch_msg_count: Arc<AtomicUsize> = Arc::new(AtomicUsize::new(0));
+    let service = MockKvForRaft::new(Arc::clone(&msg_count), Arc::clone(&batch_msg_count), true);
+    let (mut mock_server, port) = create_mock_server(service, 61300, 61400).unwrap();
+
+    let mut raft_client = get_raft_client_by_port(port);
+
+    // Send messages to establish connections
+    for store_id in 1..=2 {
+        let mut raft_m = RaftMessage::default();
+        raft_m.mut_to_peer().set_store_id(store_id);
+        raft_m.set_region_id(store_id);
+        let _ = raft_client.send(raft_m);
+    }
+    raft_client.flush();
+
+    // Start network inspection
+    raft_client.start_network_inspection();
+
+    // Wait for initial inspection cycles
+    tokio::time::sleep(Duration::from_millis(200)).await;
+
+    // Test that latency tracking API works initially
+    assert!(raft_client.get_max_latency(1).is_some());
+    assert!(raft_client.get_max_latency(2).is_some());
+
+    // Shutdown the mock server to simulate connection failure
+    mock_server.shutdown();
+    drop(mock_server);
+
+    fail::remove("network_inspection_interval")
+}
diff --git a/tests/integrations/server/server.rs b/tests/integrations/server/server.rs
index 58a5af3a89e..6309432b24f 100644
--- a/tests/integrations/server/server.rs
+++ b/tests/integrations/server/server.rs
@@ -1,7 +1,7 @@
 use std::{sync::Arc, time::Duration};
 
 use grpcio::*;
-use grpcio_health::{proto::HealthCheckRequest, HealthClient, ServingStatus};
+use grpcio_health::{HealthClient, ServingStatus, proto::HealthCheckRequest};
 use service::service_event::ServiceEvent;
 use test_pd::Server as MockServer;
 use tikv::config::TikvConfig;
@@ -9,7 +9,7 @@ use tikv::config::TikvConfig;
 #[test]
 fn test_restart_grpc_service() {
     fail::cfg("mock_force_uninitial_logger", "return").unwrap();
-    let check_heath_api = |max_retry, client: &HealthClient| {
+    let check_health_api = |max_retry, client: &HealthClient| {
         let req = HealthCheckRequest {
             service: "".to_string(),
             ..Default::default()
@@ -53,7 +53,7 @@ fn test_restart_grpc_service() {
         ..Default::default()
     };
     let max_retry = 30;
-    check_heath_api(max_retry, &client);
+    check_health_api(max_retry, &client);
     // PAUSE grpc service and validate.
     {
         let start = std::time::Instant::now();
@@ -74,7 +74,7 @@ fn test_restart_grpc_service() {
     // RESUME grpc service and validate.
     {
         sender.send(ServiceEvent::ResumeGrpc).unwrap();
-        check_heath_api(max_retry, &client);
+        check_health_api(max_retry, &client);
     }
     sender.send(ServiceEvent::Exit).unwrap();
     tikv_thread.join().unwrap();
diff --git a/tests/integrations/server/status_server.rs b/tests/integrations/server/status_server.rs
index 3673a8aa20b..7ff30e738c8 100644
--- a/tests/integrations/server/status_server.rs
+++ b/tests/integrations/server/status_server.rs
@@ -2,7 +2,7 @@
 
 use std::{error::Error, net::SocketAddr, sync::Arc};
 
-use hyper::{body, Client, StatusCode, Uri};
+use hyper::{Client, StatusCode, Uri, body};
 use raftstore::store::region_meta::RegionMeta;
 use security::SecurityConfig;
 use service::service_manager::GrpcServiceManager;
@@ -48,6 +48,7 @@ fn test_region_meta_endpoint() {
         None,
         GrpcServiceManager::dummy(),
         None,
+        Default::default(),
     )
     .unwrap();
     let addr = format!("127.0.0.1:{}", test_util::alloc_port());
diff --git a/tests/integrations/storage/test_raft_storage.rs b/tests/integrations/storage/test_raft_storage.rs
index 684b7a261fb..5a5d8365c70 100644
--- a/tests/integrations/storage/test_raft_storage.rs
+++ b/tests/integrations/storage/test_raft_storage.rs
@@ -1,24 +1,24 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 
 use std::{
-    sync::{mpsc::channel, Arc},
+    sync::{Arc, mpsc::channel},
     thread,
     time::Duration,
 };
 
 use api_version::{ApiV1, KvFormat};
 use collections::HashMap;
-use error_code::{raftstore::STALE_COMMAND, ErrorCodeExt};
+use error_code::{ErrorCodeExt, raftstore::STALE_COMMAND};
 use kvproto::kvrpcpb::Context;
 use test_raftstore::*;
 use test_storage::*;
 use tikv::{
     server::gc_worker::{AutoGcConfig, GcConfig},
     storage::{
+        Error as StorageError, ErrorInner as StorageErrorInner,
         kv::{Engine, Error as KvError, ErrorInner as KvErrorInner},
         mvcc::{Error as MvccError, ErrorInner as MvccErrorInner},
         txn::{Error as TxnError, ErrorInner as TxnErrorInner},
-        Error as StorageError, ErrorInner as StorageErrorInner,
     },
 };
 use tikv_util::HandyRwLock;
diff --git a/tests/integrations/storage/test_raftkv.rs b/tests/integrations/storage/test_raftkv.rs
index 1fb8075e10f..09bf492fb4b 100644
--- a/tests/integrations/storage/test_raftkv.rs
+++ b/tests/integrations/storage/test_raftkv.rs
@@ -1,16 +1,16 @@
 // Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
 use std::{
-    sync::{atomic::AtomicBool, Arc},
+    sync::{Arc, atomic::AtomicBool},
     thread, time,
 };
 
-use engine_traits::{CfName, IterOptions, CF_DEFAULT};
+use engine_traits::{CF_DEFAULT, CfName, IterOptions};
 use futures::executor::block_on;
 use kvproto::kvrpcpb::{Context, KeyRange};
 use raft::eraftpb::MessageType;
 use test_raftstore::*;
-use tikv::storage::{kv::*, CfStatistics};
-use tikv_util::{codec::bytes, HandyRwLock};
+use tikv::storage::{CfStatistics, kv::*};
+use tikv_util::{HandyRwLock, codec::bytes};
 use txn_types::{Key, Lock, LockType, TimeStamp};
 
 #[test]
diff --git a/tests/integrations/storage/test_region_info_accessor.rs b/tests/integrations/storage/test_region_info_accessor.rs
index 368dcb1b657..ebe49011e11 100644
--- a/tests/integrations/storage/test_region_info_accessor.rs
+++ b/tests/integrations/storage/test_region_info_accessor.rs
@@ -2,7 +2,7 @@
 
 use std::{
     num::NonZeroUsize,
-    sync::{mpsc::channel, Arc},
+    sync::{Arc, mpsc::channel},
     thread,
     time::Duration,
 };
@@ -12,8 +12,8 @@ use kvproto::metapb::Region;
 use more_asserts::{assert_gt, assert_le};
 use pd_client::{RegionStat, RegionWriteCfCopDetail};
 use raftstore::coprocessor::{
-    region_info_accessor::{RaftStoreEvent, RegionActivity, RegionInfoQuery},
     RegionInfoAccessor, RegionInfoProvider,
+    region_info_accessor::{RaftStoreEvent, RegionActivity, RegionInfoQuery},
 };
 use test_raftstore::*;
 use tikv_util::HandyRwLock;
diff --git a/tests/integrations/storage/test_storage.rs b/tests/integrations/storage/test_storage.rs
index 0221205454d..fc4f1e69f72 100644
--- a/tests/integrations/storage/test_storage.rs
+++ b/tests/integrations/storage/test_storage.rs
@@ -3,15 +3,14 @@
 use std::{
     iter::repeat,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc, Mutex,
+        atomic::{AtomicUsize, Ordering},
     },
     thread,
     time::Duration,
-    u64,
 };
 
-use api_version::{dispatch_api_version, KvFormat};
+use api_version::{KvFormat, dispatch_api_version};
 use engine_traits::{CF_DEFAULT, CF_LOCK};
 use kvproto::{
     kvrpcpb::{ApiVersion, Context, KeyRange, LockInfo},
@@ -23,7 +22,7 @@ use test_storage::*;
 use tikv::{
     coprocessor::checksum_crc64_xor,
     server::gc_worker::DEFAULT_GC_BATCH_KEYS,
-    storage::{mvcc::MAX_TXN_WRITE_SIZE, txn::RESOLVE_LOCK_BATCH_SIZE, Engine},
+    storage::{Engine, mvcc::MAX_TXN_WRITE_SIZE, txn::RESOLVE_LOCK_BATCH_SIZE},
 };
 use txn_types::{Key, Mutation, TimeStamp};
 
diff --git a/tests/integrations/storage/test_titan.rs b/tests/integrations/storage/test_titan.rs
index 5e6ed39b3f8..7b65203116d 100644
--- a/tests/integrations/storage/test_titan.rs
+++ b/tests/integrations/storage/test_titan.rs
@@ -7,17 +7,17 @@ use std::{
 };
 
 use engine_rocks::{
-    raw::IngestExternalFileOptions, RocksEngine, RocksSnapshot, RocksSstWriterBuilder,
+    RocksEngine, RocksSnapshot, RocksSstWriterBuilder, raw::IngestExternalFileOptions,
 };
 use engine_test::new_temp_engine;
 use engine_traits::{
-    CfOptionsExt, CompactExt, DeleteStrategy, Engines, KvEngine, MiscExt, Range, SstWriter,
-    SstWriterBuilder, SyncMutable, WriteOptions, CF_DEFAULT, CF_WRITE,
+    CF_DEFAULT, CF_WRITE, CfOptionsExt, CompactExt, DeleteStrategy, Engines, KvEngine, MiscExt,
+    Range, SstWriter, SstWriterBuilder, SyncMutable, WriteOptions,
 };
 use keys::data_key;
 use kvproto::metapb::{Peer, Region};
 use raftstore::store::{
-    apply_sst_cf_files_by_ingest, build_sst_cf_file_list, CfFile, RegionSnapshot,
+    CfFile, RegionSnapshot, apply_sst_cf_files_by_ingest, build_sst_cf_file_list,
 };
 use tempfile::Builder;
 use test_raftstore::*;
@@ -167,7 +167,7 @@ fn test_delete_files_in_range_for_titan() {
         .build_resources(Default::default(), cfg.storage.engine);
     let kv_db_opts = cfg.rocksdb.build_opt(&resource, cfg.storage.engine);
     let kv_cfs_opts = cfg.rocksdb.build_cf_opts(
-        &cfg.rocksdb.build_cf_resources(cache),
+        &cfg.rocksdb.build_cf_resources(cache, Default::default()),
         None,
         cfg.storage.api_version(),
         None,