feat: add slow log and configure by SLOW_FILE_SCAN_THRESHOLD

Signed-off-by: evenyag <realevenyag@gmail.com>
feat: divide build_cost to build_part_cost and build_reader_cost
2025-12-23 06:30:05 +00:00 · 2025-12-12 10:41:06 +08:00 · 2025-12-12 10:41:06 +08:00 · 2025-12-12 10:41:06 +08:00
195 changed files with 3385 additions and 10625 deletions
--- a/.github/actions/setup-greptimedb-cluster/action.yml
+++ b/.github/actions/setup-greptimedb-cluster/action.yml
@@ -51,7 +51,7 @@ runs:
    run: |
      helm upgrade \
        --install my-greptimedb \
-        --set 'meta.backendStorage.etcd.endpoints[0]=${{ inputs.etcd-endpoints }}' \
+        --set meta.backendStorage.etcd.endpoints=${{ inputs.etcd-endpoints }} \
        --set meta.enableRegionFailover=${{ inputs.enable-region-failover }} \
        --set image.registry=${{ inputs.image-registry }} \
        --set image.repository=${{ inputs.image-repository }}  \
--- a/.github/scripts/create-version.sh
+++ b/.github/scripts/create-version.sh
@@ -49,17 +49,6 @@ function create_version() {
      echo "GITHUB_REF_NAME is empty in push event" >&2
      exit 1
    fi
-    
-    # For tag releases, ensure GITHUB_REF_NAME matches the version in Cargo.toml
-    CARGO_VERSION=$(grep '^version = ' Cargo.toml | cut -d '"' -f 2 | head -n 1)
-    EXPECTED_REF_NAME="v${CARGO_VERSION}"
-    
-    if [ "$GITHUB_REF_NAME" != "$EXPECTED_REF_NAME" ]; then
-      echo "Error: GITHUB_REF_NAME '$GITHUB_REF_NAME' does not match Cargo.toml version 'v${CARGO_VERSION}'" >&2
-      echo "Expected tag name: '$EXPECTED_REF_NAME'" >&2
-      exit 1
-    fi
-    
    echo "$GITHUB_REF_NAME"
  elif [ "$GITHUB_EVENT_NAME" = workflow_dispatch ]; then
    echo "$NEXT_RELEASE_VERSION-$(git rev-parse --short HEAD)-$(date "+%Y%m%d-%s")"
--- a/.github/scripts/deploy-greptimedb.sh
+++ b/.github/scripts/deploy-greptimedb.sh
@@ -81,7 +81,7 @@ function deploy_greptimedb_cluster() {
    --create-namespace \
    --set image.tag="$GREPTIMEDB_IMAGE_TAG" \
    --set initializer.tag="$GREPTIMEDB_INITIALIZER_IMAGE_TAG" \
-    --set "meta.backendStorage.etcd.endpoints[0]=etcd.$install_namespace.svc.cluster.local:2379" \
+    --set meta.backendStorage.etcd.endpoints="etcd.$install_namespace:2379" \
    --set meta.backendStorage.etcd.storeKeyPrefix="$cluster_name" \
    -n "$install_namespace"

@@ -119,7 +119,7 @@ function deploy_greptimedb_cluster_with_s3_storage() {
    --create-namespace \
    --set image.tag="$GREPTIMEDB_IMAGE_TAG" \
    --set initializer.tag="$GREPTIMEDB_INITIALIZER_IMAGE_TAG" \
-    --set "meta.backendStorage.etcd.endpoints[0]=etcd.$install_namespace.svc.cluster.local:2379" \
+    --set meta.backendStorage.etcd.endpoints="etcd.$install_namespace:2379" \
    --set meta.backendStorage.etcd.storeKeyPrefix="$cluster_name" \
    --set objectStorage.s3.bucket="$AWS_CI_TEST_BUCKET" \
    --set objectStorage.s3.region="$AWS_REGION" \
--- a/.github/workflows/check-git-deps.yml
+++ b/.github/workflows/check-git-deps.yml
@@ -1,154 +0,0 @@
-name: Check Git Dependencies on Main Branch
-
-on:
-    pull_request:
-        branches: [main]
-        paths:
-            - 'Cargo.toml'
-    push:
-        branches: [main]
-        paths:
-            - 'Cargo.toml'
-
-jobs:
-    check-git-deps:
-        runs-on: ubuntu-latest
-
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v6
-
-            - name: Check git dependencies
-              env:
-                  WHITELIST_DEPS: "greptime-proto,meter-core,meter-macros"
-              run: |
-                  #!/bin/bash
-                  set -e
-
-                  echo "Checking whitelisted git dependencies..."
-
-                  # Function to check if a commit is on main branch
-                  check_commit_on_main() {
-                      local repo_url="$1"
-                      local commit="$2"
-                      local repo_name=$(basename "$repo_url" .git)
-
-                      echo "Checking $repo_name"
-                      echo "Repo: $repo_url"
-                      echo "Commit: $commit"
-
-                      # Create a temporary directory for cloning
-                      local temp_dir=$(mktemp -d)
-
-                      # Clone the repository
-                      if git clone "$repo_url" "$temp_dir" 2>/dev/null; then
-                          cd "$temp_dir"
-
-                          # Try to determine the main branch name
-                          local main_branch="main"
-                          if ! git rev-parse --verify origin/main >/dev/null 2>&1; then
-                              if git rev-parse --verify origin/master >/dev/null 2>&1; then
-                                  main_branch="master"
-                              else
-                                  # Try to get the default branch
-                                  main_branch=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
-                              fi
-                          fi
-
-                          echo "Main branch: $main_branch"
-
-                          # Check if commit exists
-                          if git cat-file -e "$commit" 2>/dev/null; then
-                              # Check if commit is on main branch
-                              if git merge-base --is-ancestor "$commit" "origin/$main_branch" 2>/dev/null; then
-                                  echo "PASS: Commit $commit is on $main_branch branch"
-                                  cd - >/dev/null
-                                  rm -rf "$temp_dir"
-                                  return 0
-                              else
-                                  echo "FAIL: Commit $commit is NOT on $main_branch branch"
-
-                                  # Try to find which branch contains this commit
-                                  local branch_name=$(git branch -r --contains "$commit" 2>/dev/null | head -1 | sed 's/^[[:space:]]*origin\///' | sed 's/[[:space:]]*$//')
-                                  if [[ -n "$branch_name" ]]; then
-                                      echo "Found on branch: $branch_name"
-                                  fi
-                                  cd - >/dev/null
-                                  rm -rf "$temp_dir"
-                                  return 1
-                              fi
-                          else
-                              echo "FAIL: Commit $commit not found in repository"
-                              cd - >/dev/null
-                              rm -rf "$temp_dir"
-                              return 1
-                          fi
-                      else
-                          echo "FAIL: Failed to clone $repo_url"
-                          rm -rf "$temp_dir"
-                          return 1
-                      fi
-                  }
-
-                  # Extract whitelisted git dependencies from Cargo.toml
-                  echo "Extracting git dependencies from Cargo.toml..."
-
-                  # Create temporary array to store dependencies
-                  declare -a deps=()
-
-                  # Build awk pattern from whitelist
-                  IFS=',' read -ra WHITELIST <<< "$WHITELIST_DEPS"
-                  awk_pattern=""
-                  for dep in "${WHITELIST[@]}"; do
-                      if [[ -n "$awk_pattern" ]]; then
-                          awk_pattern="$awk_pattern|"
-                      fi
-                      awk_pattern="$awk_pattern$dep"
-                  done
-
-                  # Extract whitelisted dependencies
-                  while IFS= read -r line; do
-                      if [[ -n "$line" ]]; then
-                          deps+=("$line")
-                      fi
-                  done < <(awk -v pattern="$awk_pattern" '
-                  $0 ~ pattern ".*git = \"https:/" {
-                      match($0, /git = "([^"]+)"/, arr)
-                      git_url = arr[1]
-                      if (match($0, /rev = "([^"]+)"/, rev_arr)) {
-                          rev = rev_arr[1]
-                          print git_url " " rev
-                      } else {
-                          # Check next line for rev
-                          getline
-                          if (match($0, /rev = "([^"]+)"/, rev_arr)) {
-                              rev = rev_arr[1]
-                              print git_url " " rev
-                          }
-                      }
-                  }
-                  ' Cargo.toml)
-
-                  echo "Found ${#deps[@]} dependencies to check:"
-                  for dep in "${deps[@]}"; do
-                      echo "  $dep"
-                  done
-
-                  failed=0
-
-                  for dep in "${deps[@]}"; do
-                      read -r repo_url commit <<< "$dep"
-                      if ! check_commit_on_main "$repo_url" "$commit"; then
-                          failed=1
-                      fi
-                  done
-
-                  echo "Check completed."
-
-                  if [[ $failed -eq 1 ]]; then
-                      echo "ERROR: Some git dependencies are not on their main branches!"
-                      echo "Please update the commits to point to main branch commits."
-                      exit 1
-                  else
-                      echo "SUCCESS: All git dependencies are on their main branches!"
-                  fi
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -212,7 +212,7 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"

 [[package]]
 name = "api"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "arrow-schema",
 "common-base",
@@ -733,7 +733,7 @@ dependencies = [

 [[package]]
 name = "auth"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "async-trait",
@@ -1383,7 +1383,7 @@ dependencies = [

 [[package]]
 name = "cache"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "catalog",
 "common-error",
@@ -1418,7 +1418,7 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "catalog"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "arrow",
@@ -1763,7 +1763,7 @@ checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"

 [[package]]
 name = "cli"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -1786,7 +1786,6 @@ dependencies = [
 "common-recordbatch",
 "common-runtime",
 "common-telemetry",
- "common-test-util",
 "common-time",
 "common-version",
 "common-wal",
@@ -1817,7 +1816,7 @@ dependencies = [

 [[package]]
 name = "client"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "arc-swap",
@@ -1850,7 +1849,7 @@ dependencies = [
 "snafu 0.8.6",
 "store-api",
 "substrait 0.37.3",
- "substrait 1.0.0-beta.3",
+ "substrait 1.0.0-beta.2",
 "tokio",
 "tokio-stream",
 "tonic 0.13.1",
@@ -1890,7 +1889,7 @@ dependencies = [

 [[package]]
 name = "cmd"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-trait",
 "auth",
@@ -1978,17 +1977,6 @@ dependencies = [
 "unicode-width 0.2.1",
 ]

-[[package]]
-name = "codespan-reporting"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
-dependencies = [
- "serde",
- "termcolor",
- "unicode-width 0.2.1",
-]
-
 [[package]]
 name = "colorchoice"
 version = "1.0.4"
@@ -2024,7 +2012,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"

 [[package]]
 name = "common-base"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "anymap2",
 "async-trait",
@@ -2048,14 +2036,14 @@ dependencies = [

 [[package]]
 name = "common-catalog"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "const_format",
 ]

 [[package]]
 name = "common-config"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "common-base",
 "common-error",
@@ -2080,7 +2068,7 @@ dependencies = [

 [[package]]
 name = "common-datasource"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "arrow",
 "arrow-schema",
@@ -2115,7 +2103,7 @@ dependencies = [

 [[package]]
 name = "common-decimal"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "bigdecimal 0.4.8",
 "common-error",
@@ -2128,7 +2116,7 @@ dependencies = [

 [[package]]
 name = "common-error"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "common-macro",
 "http 1.3.1",
@@ -2139,7 +2127,7 @@ dependencies = [

 [[package]]
 name = "common-event-recorder"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "async-trait",
@@ -2161,7 +2149,7 @@ dependencies = [

 [[package]]
 name = "common-frontend"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "async-trait",
@@ -2183,7 +2171,7 @@ dependencies = [

 [[package]]
 name = "common-function"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "ahash 0.8.12",
 "api",
@@ -2243,7 +2231,7 @@ dependencies = [

 [[package]]
 name = "common-greptimedb-telemetry"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-trait",
 "common-runtime",
@@ -2260,7 +2248,7 @@ dependencies = [

 [[package]]
 name = "common-grpc"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "arrow-flight",
@@ -2295,7 +2283,7 @@ dependencies = [

 [[package]]
 name = "common-grpc-expr"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "common-base",
@@ -2315,7 +2303,7 @@ dependencies = [

 [[package]]
 name = "common-macro"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "greptime-proto",
 "once_cell",
@@ -2326,7 +2314,7 @@ dependencies = [

 [[package]]
 name = "common-mem-prof"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "anyhow",
 "common-error",
@@ -2340,22 +2328,9 @@ dependencies = [
 "tokio",
 ]

-[[package]]
-name = "common-memory-manager"
-version = "1.0.0-beta.3"
-dependencies = [
- "common-error",
- "common-macro",
- "common-telemetry",
- "humantime",
- "serde",
- "snafu 0.8.6",
- "tokio",
-]
-
 [[package]]
 name = "common-meta"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "anymap2",
 "api",
@@ -2427,7 +2402,7 @@ dependencies = [

 [[package]]
 name = "common-options"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "common-grpc",
 "humantime-serde",
@@ -2436,11 +2411,11 @@ dependencies = [

 [[package]]
 name = "common-plugins"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"

 [[package]]
 name = "common-pprof"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "common-error",
 "common-macro",
@@ -2452,7 +2427,7 @@ dependencies = [

 [[package]]
 name = "common-procedure"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "async-stream",
@@ -2481,7 +2456,7 @@ dependencies = [

 [[package]]
 name = "common-procedure-test"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-trait",
 "common-procedure",
@@ -2491,7 +2466,7 @@ dependencies = [

 [[package]]
 name = "common-query"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "async-trait",
@@ -2517,7 +2492,7 @@ dependencies = [

 [[package]]
 name = "common-recordbatch"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "arc-swap",
 "common-base",
@@ -2541,7 +2516,7 @@ dependencies = [

 [[package]]
 name = "common-runtime"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-trait",
 "clap 4.5.40",
@@ -2570,7 +2545,7 @@ dependencies = [

 [[package]]
 name = "common-session"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "serde",
 "strum 0.27.1",
@@ -2578,14 +2553,12 @@ dependencies = [

 [[package]]
 name = "common-sql"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
- "arrow-schema",
 "common-base",
 "common-decimal",
 "common-error",
 "common-macro",
- "common-telemetry",
 "common-time",
 "datafusion-sql",
 "datatypes",
@@ -2598,7 +2571,7 @@ dependencies = [

 [[package]]
 name = "common-stat"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "common-base",
 "common-runtime",
@@ -2613,7 +2586,7 @@ dependencies = [

 [[package]]
 name = "common-telemetry"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "backtrace",
 "common-base",
@@ -2642,7 +2615,7 @@ dependencies = [

 [[package]]
 name = "common-test-util"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "client",
 "common-grpc",
@@ -2655,7 +2628,7 @@ dependencies = [

 [[package]]
 name = "common-time"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "arrow",
 "chrono",
@@ -2673,7 +2646,7 @@ dependencies = [

 [[package]]
 name = "common-version"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "build-data",
 "cargo-manifest",
@@ -2684,7 +2657,7 @@ dependencies = [

 [[package]]
 name = "common-wal"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "common-base",
 "common-error",
@@ -2707,7 +2680,7 @@ dependencies = [

 [[package]]
 name = "common-workload"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "common-telemetry",
 "serde",
@@ -3183,68 +3156,6 @@ dependencies = [
 "cipher",
 ]

-[[package]]
-name = "cxx"
-version = "1.0.190"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7620f6cfc4dcca21f2b085b7a890e16c60fd66f560cd69ee60594908dc72ab1"
-dependencies = [
- "cc",
- "cxx-build",
- "cxxbridge-cmd",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "foldhash 0.2.0",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.190"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9bc1a22964ff6a355fbec24cf68266a0ed28f8b84c0864c386474ea3d0e479"
-dependencies = [
- "cc",
- "codespan-reporting 0.13.1",
- "indexmap 2.11.4",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "cxxbridge-cmd"
-version = "1.0.190"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f29a879d35f7906e3c9b77d7a1005a6a0787d330c09dfe4ffb5f617728cb44"
-dependencies = [
- "clap 4.5.40",
- "codespan-reporting 0.13.1",
- "indexmap 2.11.4",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.190"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d67109015f93f683e364085aa6489a5b2118b4a40058482101d699936a7836d6"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.190"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d187e019e7b05a1f3e69a8396b70800ee867aa9fc2ab972761173ccee03742df"
-dependencies = [
- "indexmap 2.11.4",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "darling"
 version = "0.14.4"
@@ -4015,7 +3926,7 @@ dependencies = [

 [[package]]
 name = "datanode"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "arrow-flight",
@@ -4079,7 +3990,7 @@ dependencies = [

 [[package]]
 name = "datatypes"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "arrow",
 "arrow-array",
@@ -4636,9 +4547,8 @@ dependencies = [

 [[package]]
 name = "etcd-client"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88365f1a5671eb2f7fc240adb216786bc6494b38ce15f1d26ad6eaa303d5e822"
+version = "0.15.0"
+source = "git+https://github.com/GreptimeTeam/etcd-client?rev=f62df834f0cffda355eba96691fe1a9a332b75a7#f62df834f0cffda355eba96691fe1a9a332b75a7"
 dependencies = [
 "http 1.3.1",
 "prost 0.13.5",
@@ -4754,7 +4664,7 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"

 [[package]]
 name = "file-engine"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "async-trait",
@@ -4886,7 +4796,7 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"

 [[package]]
 name = "flow"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "arrow",
@@ -4955,7 +4865,7 @@ dependencies = [
 "sql",
 "store-api",
 "strum 0.27.1",
- "substrait 1.0.0-beta.3",
+ "substrait 1.0.0-beta.2",
 "table",
 "tokio",
 "tonic 0.13.1",
@@ -4993,12 +4903,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"

-[[package]]
-name = "foldhash"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.2"
@@ -5016,7 +4920,7 @@ checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"

 [[package]]
 name = "frontend"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "arc-swap",
@@ -5463,7 +5367,7 @@ dependencies = [
 [[package]]
 name = "greptime-proto"
 version = "0.1.0"
-source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=173efe5ec62722089db7c531c0b0d470a072b915#173efe5ec62722089db7c531c0b0d470a072b915"
+source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=0423fa30203187c75e2937a668df1da699c8b96c#0423fa30203187c75e2937a668df1da699c8b96c"
 dependencies = [
 "prost 0.13.5",
 "prost-types 0.13.5",
@@ -5599,7 +5503,7 @@ checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 dependencies = [
 "allocator-api2",
 "equivalent",
- "foldhash 0.1.5",
+ "foldhash",
 ]

 [[package]]
@@ -6231,7 +6135,7 @@ dependencies = [

 [[package]]
 name = "index"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-trait",
 "asynchronous-codec",
@@ -6244,7 +6148,6 @@ dependencies = [
 "common-telemetry",
 "common-test-util",
 "criterion 0.4.0",
- "datatypes",
 "fastbloom",
 "fst",
 "futures",
@@ -6253,7 +6156,6 @@ dependencies = [
 "jieba-rs",
 "lazy_static",
 "mockall",
- "nalgebra",
 "pin-project",
 "prost 0.13.5",
 "puffin",
@@ -6271,7 +6173,6 @@ dependencies = [
 "tempfile",
 "tokio",
 "tokio-util",
- "usearch",
 "uuid",
 ]

@@ -7103,15 +7004,6 @@ dependencies = [
 "vcpkg",
 ]

-[[package]]
-name = "link-cplusplus"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f78c730aaa7d0b9336a299029ea49f9ee53b0ed06e9202e8cb7db9bae7b8c82"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -7172,7 +7064,7 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"

 [[package]]
 name = "log-query"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "chrono",
 "common-error",
@@ -7184,7 +7076,7 @@ dependencies = [

 [[package]]
 name = "log-store"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -7425,6 +7317,12 @@ dependencies = [
 "digest",
 ]

+[[package]]
+name = "md5"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
+
 [[package]]
 name = "md5"
 version = "0.8.0"
@@ -7485,7 +7383,7 @@ dependencies = [

 [[package]]
 name = "meta-client"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "async-trait",
@@ -7513,7 +7411,7 @@ dependencies = [

 [[package]]
 name = "meta-srv"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "async-trait",
@@ -7613,7 +7511,7 @@ dependencies = [

 [[package]]
 name = "metric-engine"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "aquamarine",
@@ -7710,7 +7608,7 @@ dependencies = [

 [[package]]
 name = "mito-codec"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "bytes",
@@ -7735,7 +7633,7 @@ dependencies = [

 [[package]]
 name = "mito2"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "aquamarine",
@@ -7753,7 +7651,6 @@ dependencies = [
 "common-function",
 "common-grpc",
 "common-macro",
- "common-memory-manager",
 "common-meta",
 "common-query",
 "common-recordbatch",
@@ -7775,7 +7672,6 @@ dependencies = [
 "either",
 "futures",
 "greptime-proto",
- "humantime",
 "humantime-serde",
 "index",
 "itertools 0.14.0",
@@ -8475,7 +8371,7 @@ dependencies = [

 [[package]]
 name = "object-store"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "anyhow",
 "bytes",
@@ -8488,6 +8384,7 @@ dependencies = [
 "futures",
 "humantime-serde",
 "lazy_static",
+ "md5 0.7.0",
 "moka",
 "opendal",
 "prometheus",
@@ -8760,7 +8657,7 @@ dependencies = [

 [[package]]
 name = "operator"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "ahash 0.8.12",
 "api",
@@ -8820,7 +8717,7 @@ dependencies = [
 "sql",
 "sqlparser",
 "store-api",
- "substrait 1.0.0-beta.3",
+ "substrait 1.0.0-beta.2",
 "table",
 "tokio",
 "tokio-util",
@@ -9106,7 +9003,7 @@ dependencies = [

 [[package]]
 name = "partition"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "async-trait",
@@ -9322,9 +9219,9 @@ dependencies = [

 [[package]]
 name = "pgwire"
-version = "0.37.0"
+version = "0.36.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d86d57e732d40382ceb9bfea80901d839bae8571aa11c06af9177aed9dfb6c"
+checksum = "70a2bcdcc4b20a88e0648778ecf00415bbd5b447742275439c22176835056f99"
 dependencies = [
 "async-trait",
 "base64 0.22.1",
@@ -9334,7 +9231,7 @@ dependencies = [
 "futures",
 "hex",
 "lazy-regex",
- "md5",
+ "md5 0.8.0",
 "postgres-types",
 "rand 0.9.1",
 "ring",
@@ -9343,7 +9240,6 @@ dependencies = [
 "ryu",
 "serde",
 "serde_json",
- "smol_str",
 "stringprep",
 "thiserror 2.0.17",
 "tokio",
@@ -9464,7 +9360,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pipeline"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "ahash 0.8.12",
 "api",
@@ -9620,7 +9516,7 @@ dependencies = [

 [[package]]
 name = "plugins"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "auth",
 "catalog",
@@ -9922,7 +9818,7 @@ dependencies = [

 [[package]]
 name = "promql"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "ahash 0.8.12",
 "async-trait",
@@ -10205,7 +10101,7 @@ dependencies = [

 [[package]]
 name = "puffin"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-compression 0.4.19",
 "async-trait",
@@ -10247,7 +10143,7 @@ dependencies = [

 [[package]]
 name = "query"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "ahash 0.8.12",
 "api",
@@ -10314,7 +10210,7 @@ dependencies = [
 "sql",
 "sqlparser",
 "store-api",
- "substrait 1.0.0-beta.3",
+ "substrait 1.0.0-beta.2",
 "table",
 "tokio",
 "tokio-stream",
@@ -11386,12 +11282,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

-[[package]]
-name = "scratch"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2"
-
 [[package]]
 name = "scrypt"
 version = "0.11.0"
@@ -11508,11 +11398,10 @@ checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"

 [[package]]
 name = "serde"
-version = "1.0.228"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
- "serde_core",
 "serde_derive",
 ]

@@ -11526,20 +11415,11 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde_core"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
-dependencies = [
- "serde_derive",
-]
-
 [[package]]
 name = "serde_derive"
-version = "1.0.228"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -11666,7 +11546,7 @@ dependencies = [

 [[package]]
 name = "servers"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "ahash 0.8.12",
 "api",
@@ -11794,7 +11674,7 @@ dependencies = [

 [[package]]
 name = "session"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "ahash 0.8.12",
 "api",
@@ -12014,16 +11894,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "smol_str"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3498b0a27f93ef1402f20eefacfaa1691272ac4eca1cdc8c596cb0a245d6cbf5"
-dependencies = [
- "borsh",
- "serde_core",
-]
-
 [[package]]
 name = "snafu"
 version = "0.7.5"
@@ -12138,7 +12008,7 @@ dependencies = [

 [[package]]
 name = "sql"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "arrow-buffer",
@@ -12198,7 +12068,7 @@ dependencies = [

 [[package]]
 name = "sqlness-runner"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-trait",
 "clap 4.5.40",
@@ -12229,7 +12099,7 @@ dependencies = [
 [[package]]
 name = "sqlparser"
 version = "0.58.0"
-source = "git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=a0ce2bc6eb3e804532932f39833c32432f5c9a39#a0ce2bc6eb3e804532932f39833c32432f5c9a39"
+source = "git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=4b519a5caa95472cc3988f5556813a583dd35af1#4b519a5caa95472cc3988f5556813a583dd35af1"
 dependencies = [
 "lazy_static",
 "log",
@@ -12253,7 +12123,7 @@ dependencies = [
 [[package]]
 name = "sqlparser_derive"
 version = "0.3.0"
-source = "git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=a0ce2bc6eb3e804532932f39833c32432f5c9a39#a0ce2bc6eb3e804532932f39833c32432f5c9a39"
+source = "git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=4b519a5caa95472cc3988f5556813a583dd35af1#4b519a5caa95472cc3988f5556813a583dd35af1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -12475,7 +12345,7 @@ dependencies = [

 [[package]]
 name = "standalone"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-trait",
 "catalog",
@@ -12516,7 +12386,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

 [[package]]
 name = "store-api"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "aquamarine",
@@ -12729,7 +12599,7 @@ dependencies = [

 [[package]]
 name = "substrait"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "async-trait",
 "bytes",
@@ -12852,7 +12722,7 @@ dependencies = [

 [[package]]
 name = "table"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "async-trait",
@@ -13121,7 +12991,7 @@ checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"

 [[package]]
 name = "tests-fuzz"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "arbitrary",
 "async-trait",
@@ -13165,7 +13035,7 @@ dependencies = [

 [[package]]
 name = "tests-integration"
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 dependencies = [
 "api",
 "arrow-flight",
@@ -13240,7 +13110,7 @@ dependencies = [
 "sqlx",
 "standalone",
 "store-api",
- "substrait 1.0.0-beta.3",
+ "substrait 1.0.0-beta.2",
 "table",
 "tempfile",
 "time",
@@ -14265,16 +14135,6 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"

-[[package]]
-name = "usearch"
-version = "2.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc9fc5f872a3a4f9081d5f42624d788231b763e1846c829b9968a3755ac884d"
-dependencies = [
- "cxx",
- "cxx-build",
-]
-
 [[package]]
 name = "utf8-ranges"
 version = "1.0.5"
@@ -14414,7 +14274,7 @@ dependencies = [
 "ciborium",
 "cidr",
 "clap 4.5.40",
- "codespan-reporting 0.12.0",
+ "codespan-reporting",
 "community-id",
 "convert_case 0.7.1",
 "crc",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,6 @@ members = [
    "src/common/grpc-expr",
    "src/common/macro",
    "src/common/mem-prof",
-    "src/common/memory-manager",
    "src/common/meta",
    "src/common/options",
    "src/common/plugins",
@@ -75,7 +74,7 @@ members = [
 resolver = "2"

 [workspace.package]
-version = "1.0.0-beta.3"
+version = "1.0.0-beta.2"
 edition = "2024"
 license = "Apache-2.0"

@@ -143,14 +142,14 @@ derive_builder = "0.20"
 derive_more = { version = "2.1", features = ["full"] }
 dotenv = "0.15"
 either = "1.15"
-etcd-client = { version = "0.16.1", features = [
+etcd-client = { git = "https://github.com/GreptimeTeam/etcd-client", rev = "f62df834f0cffda355eba96691fe1a9a332b75a7", features = [
    "tls",
    "tls-roots",
 ] }
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "173efe5ec62722089db7c531c0b0d470a072b915" }
+greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "0423fa30203187c75e2937a668df1da699c8b96c" }
 hex = "0.4"
 http = "1"
 humantime = "2.1"
@@ -267,7 +266,6 @@ common-grpc = { path = "src/common/grpc" }
 common-grpc-expr = { path = "src/common/grpc-expr" }
 common-macro = { path = "src/common/macro" }
 common-mem-prof = { path = "src/common/mem-prof" }
-common-memory-manager = { path = "src/common/memory-manager" }
 common-meta = { path = "src/common/meta" }
 common-options = { path = "src/common/options" }
 common-plugins = { path = "src/common/plugins" }
@@ -332,7 +330,7 @@ datafusion-physical-plan = { git = "https://github.com/GreptimeTeam/datafusion.g
 datafusion-datasource = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
 datafusion-sql = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
 datafusion-substrait = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-sqlparser = { git = "https://github.com/GreptimeTeam/sqlparser-rs.git", rev = "a0ce2bc6eb3e804532932f39833c32432f5c9a39" }                           # branch = "v0.58.x"
+sqlparser = { git = "https://github.com/GreptimeTeam/sqlparser-rs.git", rev = "4b519a5caa95472cc3988f5556813a583dd35af1" }                           # branch = "v0.58.x"

 [profile.release]
 debug = 1
--- a/config/config.md
+++ b/config/config.md
@@ -83,8 +83,6 @@
 | `wal.sync_period` | String | `10s` | Duration for fsyncing log files.<br/>**It's only used when the provider is `raft_engine`**. |
 | `wal.recovery_parallelism` | Integer | `2` | Parallelism during WAL recovery. |
 | `wal.broker_endpoints` | Array | -- | The Kafka broker endpoints.<br/>**It's only used when the provider is `kafka`**. |
-| `wal.connect_timeout` | String | `3s` | The connect timeout for kafka client.<br/>**It's only used when the provider is `kafka`**. |
-| `wal.timeout` | String | `3s` | The timeout for kafka client.<br/>**It's only used when the provider is `kafka`**. |
 | `wal.auto_create_topics` | Bool | `true` | Automatically create topics for WAL.<br/>Set to `true` to automatically create topics for WAL.<br/>Otherwise, use topics named `topic_name_prefix_[0..num_topics)` |
 | `wal.num_topics` | Integer | `64` | Number of topics.<br/>**It's only used when the provider is `kafka`**. |
 | `wal.selector_type` | String | `round_robin` | Topic selector type.<br/>Available selector types:<br/>- `round_robin` (default)<br/>**It's only used when the provider is `kafka`**. |
@@ -110,6 +108,9 @@
 | `storage` | -- | -- | The data storage options. |
 | `storage.data_home` | String | `./greptimedb_data` | The working home directory. |
 | `storage.type` | String | `File` | The storage type used to store the data.<br/>- `File`: the data is stored in the local file system.<br/>- `S3`: the data is stored in the S3 object storage.<br/>- `Gcs`: the data is stored in the Google Cloud Storage.<br/>- `Azblob`: the data is stored in the Azure Blob Storage.<br/>- `Oss`: the data is stored in the Aliyun OSS. |
+| `storage.enable_read_cache` | Bool | `true` | Whether to enable read cache. If not set, the read cache will be enabled by default when using object storage. |
+| `storage.cache_path` | String | Unset | Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.<br/>A local file directory, defaults to `{data_home}`. An empty string means disabling. |
+| `storage.cache_capacity` | String | Unset | The local file cache capacity in bytes. If your disk space is sufficient, it is recommended to set it larger. |
 | `storage.bucket` | String | Unset | The S3 bucket name.<br/>**It's only used when the storage type is `S3`, `Oss` and `Gcs`**. |
 | `storage.root` | String | Unset | The S3 data will be stored in the specified prefix, for example, `s3://${bucket}/${root}`.<br/>**It's only used when the storage type is `S3`, `Oss` and `Azblob`**. |
 | `storage.access_key_id` | String | Unset | The access key id of the aws account.<br/>It's **highly recommended** to use AWS IAM roles instead of hardcoding the access key id and secret key.<br/>**It's only used when the storage type is `S3` and `Oss`**. |
@@ -140,8 +141,6 @@
 | `region_engine.mito.max_background_flushes` | Integer | Auto | Max number of running background flush jobs (default: 1/2 of cpu cores). |
 | `region_engine.mito.max_background_compactions` | Integer | Auto | Max number of running background compaction jobs (default: 1/4 of cpu cores). |
 | `region_engine.mito.max_background_purges` | Integer | Auto | Max number of running background purge jobs (default: number of cpu cores). |
-| `region_engine.mito.experimental_compaction_memory_limit` | String | 0 | Memory budget for compaction tasks. Setting it to 0 or "unlimited" disables the limit. |
-| `region_engine.mito.experimental_compaction_on_exhausted` | String | wait | Behavior when compaction cannot acquire memory from the budget.<br/>Options: "wait" (default, 10s), "wait(<duration>)", "fail" |
 | `region_engine.mito.auto_flush_interval` | String | `1h` | Interval to auto flush a region if it has not flushed yet. |
 | `region_engine.mito.global_write_buffer_size` | String | Auto | Global write buffer size for all regions. If not set, it's default to 1/8 of OS memory with a max limitation of 1GB. |
 | `region_engine.mito.global_write_buffer_reject_size` | String | Auto | Global write buffer size threshold to reject write requests. If not set, it's default to 2 times of `global_write_buffer_size`. |
@@ -155,8 +154,6 @@
 | `region_engine.mito.write_cache_ttl` | String | Unset | TTL for write cache. |
 | `region_engine.mito.preload_index_cache` | Bool | `true` | Preload index (puffin) files into cache on region open (default: true).<br/>When enabled, index files are loaded into the write cache during region initialization,<br/>which can improve query performance at the cost of longer startup times. |
 | `region_engine.mito.index_cache_percent` | Integer | `20` | Percentage of write cache capacity allocated for index (puffin) files (default: 20).<br/>The remaining capacity is used for data (parquet) files.<br/>Must be between 0 and 100 (exclusive). For example, with a 5GiB write cache and 20% allocation,<br/>1GiB is reserved for index files and 4GiB for data files. |
-| `region_engine.mito.enable_refill_cache_on_read` | Bool | `true` | Enable refilling cache on read operations (default: true).<br/>When disabled, cache refilling on read won't happen. |
-| `region_engine.mito.manifest_cache_size` | String | `256MB` | Capacity for manifest cache (default: 256MB). |
 | `region_engine.mito.sst_write_buffer_size` | String | `8MB` | Buffer size for SST writing. |
 | `region_engine.mito.parallel_scan_channel_size` | Integer | `32` | Capacity of the channel to send data from parallel scan tasks to the main task. |
 | `region_engine.mito.max_concurrent_scan_files` | Integer | `384` | Maximum number of SST files to scan concurrently. |
@@ -354,7 +351,6 @@
 | `region_failure_detector_initialization_delay` | String | `10m` | The delay before starting region failure detection.<br/>This delay helps prevent Metasrv from triggering unnecessary region failovers before all Datanodes are fully started.<br/>Especially useful when the cluster is not deployed with GreptimeDB Operator and maintenance mode is not enabled. |
 | `allow_region_failover_on_local_wal` | Bool | `false` | Whether to allow region failover on local WAL.<br/>**This option is not recommended to be set to true, because it may lead to data loss during failover.** |
 | `node_max_idle_time` | String | `24hours` | Max allowed idle time before removing node info from metasrv memory. |
-| `heartbeat_interval` | String | `3s` | Base heartbeat interval for calculating distributed time constants.<br/>The frontend heartbeat interval is 6 times of the base heartbeat interval.<br/>The flownode/datanode heartbeat interval is 1 times of the base heartbeat interval.<br/>e.g., If the base heartbeat interval is 3s, the frontend heartbeat interval is 18s, the flownode/datanode heartbeat interval is 3s.<br/>If you change this value, you need to change the heartbeat interval of the flownode/frontend/datanode accordingly. |
 | `enable_telemetry` | Bool | `true` | Whether to enable greptimedb telemetry. Enabled by default. |
 | `runtime` | -- | -- | The runtime options. |
 | `runtime.global_rt_size` | Integer | `8` | The number of threads to execute the runtime for global read operations. |
@@ -364,18 +360,12 @@
 | `backend_tls.cert_path` | String | `""` | Path to client certificate file (for client authentication)<br/>Like "/path/to/client.crt" |
 | `backend_tls.key_path` | String | `""` | Path to client private key file (for client authentication)<br/>Like "/path/to/client.key" |
 | `backend_tls.ca_cert_path` | String | `""` | Path to CA certificate file (for server certificate verification)<br/>Required when using custom CAs or self-signed certificates<br/>Leave empty to use system root certificates only<br/>Like "/path/to/ca.crt" |
-| `backend_client` | -- | -- | The backend client options.<br/>Currently, only applicable when using etcd as the metadata store. |
-| `backend_client.keep_alive_timeout` | String | `3s` | The keep alive timeout for backend client. |
-| `backend_client.keep_alive_interval` | String | `10s` | The keep alive interval for backend client. |
-| `backend_client.connect_timeout` | String | `3s` | The connect timeout for backend client. |
 | `grpc` | -- | -- | The gRPC server options. |
 | `grpc.bind_addr` | String | `127.0.0.1:3002` | The address to bind the gRPC server. |
 | `grpc.server_addr` | String | `127.0.0.1:3002` | The communication server address for the frontend and datanode to connect to metasrv.<br/>If left empty or unset, the server will automatically use the IP address of the first network interface<br/>on the host, with the same port number as the one specified in `bind_addr`. |
 | `grpc.runtime_size` | Integer | `8` | The number of server worker threads. |
 | `grpc.max_recv_message_size` | String | `512MB` | The maximum receive message size for gRPC server. |
 | `grpc.max_send_message_size` | String | `512MB` | The maximum send message size for gRPC server. |
-| `grpc.http2_keep_alive_interval` | String | `10s` | The server side HTTP/2 keep-alive interval |
-| `grpc.http2_keep_alive_timeout` | String | `3s` | The server side HTTP/2 keep-alive timeout. |
 | `http` | -- | -- | The HTTP server options. |
 | `http.addr` | String | `127.0.0.1:4000` | The address to bind the HTTP server. |
 | `http.timeout` | String | `0s` | HTTP request timeout. Set to 0 to disable timeout. |
@@ -485,8 +475,6 @@
 | `wal.sync_period` | String | `10s` | Duration for fsyncing log files.<br/>**It's only used when the provider is `raft_engine`**. |
 | `wal.recovery_parallelism` | Integer | `2` | Parallelism during WAL recovery. |
 | `wal.broker_endpoints` | Array | -- | The Kafka broker endpoints.<br/>**It's only used when the provider is `kafka`**. |
-| `wal.connect_timeout` | String | `3s` | The connect timeout for kafka client.<br/>**It's only used when the provider is `kafka`**. |
-| `wal.timeout` | String | `3s` | The timeout for kafka client.<br/>**It's only used when the provider is `kafka`**. |
 | `wal.max_batch_bytes` | String | `1MB` | The max size of a single producer batch.<br/>Warning: Kafka has a default limit of 1MB per message in a topic.<br/>**It's only used when the provider is `kafka`**. |
 | `wal.consumer_wait_timeout` | String | `100ms` | The consumer wait timeout.<br/>**It's only used when the provider is `kafka`**. |
 | `wal.create_index` | Bool | `true` | Whether to enable WAL index creation.<br/>**It's only used when the provider is `kafka`**. |
@@ -498,6 +486,9 @@
 | `storage` | -- | -- | The data storage options. |
 | `storage.data_home` | String | `./greptimedb_data` | The working home directory. |
 | `storage.type` | String | `File` | The storage type used to store the data.<br/>- `File`: the data is stored in the local file system.<br/>- `S3`: the data is stored in the S3 object storage.<br/>- `Gcs`: the data is stored in the Google Cloud Storage.<br/>- `Azblob`: the data is stored in the Azure Blob Storage.<br/>- `Oss`: the data is stored in the Aliyun OSS. |
+| `storage.cache_path` | String | Unset | Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.<br/>A local file directory, defaults to `{data_home}`. An empty string means disabling. |
+| `storage.enable_read_cache` | Bool | `true` | Whether to enable read cache. If not set, the read cache will be enabled by default when using object storage. |
+| `storage.cache_capacity` | String | Unset | The local file cache capacity in bytes. If your disk space is sufficient, it is recommended to set it larger. |
 | `storage.bucket` | String | Unset | The S3 bucket name.<br/>**It's only used when the storage type is `S3`, `Oss` and `Gcs`**. |
 | `storage.root` | String | Unset | The S3 data will be stored in the specified prefix, for example, `s3://${bucket}/${root}`.<br/>**It's only used when the storage type is `S3`, `Oss` and `Azblob`**. |
 | `storage.access_key_id` | String | Unset | The access key id of the aws account.<br/>It's **highly recommended** to use AWS IAM roles instead of hardcoding the access key id and secret key.<br/>**It's only used when the storage type is `S3` and `Oss`**. |
@@ -530,8 +521,6 @@
 | `region_engine.mito.max_background_flushes` | Integer | Auto | Max number of running background flush jobs (default: 1/2 of cpu cores). |
 | `region_engine.mito.max_background_compactions` | Integer | Auto | Max number of running background compaction jobs (default: 1/4 of cpu cores). |
 | `region_engine.mito.max_background_purges` | Integer | Auto | Max number of running background purge jobs (default: number of cpu cores). |
-| `region_engine.mito.experimental_compaction_memory_limit` | String | 0 | Memory budget for compaction tasks. Setting it to 0 or "unlimited" disables the limit. |
-| `region_engine.mito.experimental_compaction_on_exhausted` | String | wait | Behavior when compaction cannot acquire memory from the budget.<br/>Options: "wait" (default, 10s), "wait(<duration>)", "fail" |
 | `region_engine.mito.auto_flush_interval` | String | `1h` | Interval to auto flush a region if it has not flushed yet. |
 | `region_engine.mito.global_write_buffer_size` | String | Auto | Global write buffer size for all regions. If not set, it's default to 1/8 of OS memory with a max limitation of 1GB. |
 | `region_engine.mito.global_write_buffer_reject_size` | String | Auto | Global write buffer size threshold to reject write requests. If not set, it's default to 2 times of `global_write_buffer_size` |
@@ -545,8 +534,6 @@
 | `region_engine.mito.write_cache_ttl` | String | Unset | TTL for write cache. |
 | `region_engine.mito.preload_index_cache` | Bool | `true` | Preload index (puffin) files into cache on region open (default: true).<br/>When enabled, index files are loaded into the write cache during region initialization,<br/>which can improve query performance at the cost of longer startup times. |
 | `region_engine.mito.index_cache_percent` | Integer | `20` | Percentage of write cache capacity allocated for index (puffin) files (default: 20).<br/>The remaining capacity is used for data (parquet) files.<br/>Must be between 0 and 100 (exclusive). For example, with a 5GiB write cache and 20% allocation,<br/>1GiB is reserved for index files and 4GiB for data files. |
-| `region_engine.mito.enable_refill_cache_on_read` | Bool | `true` | Enable refilling cache on read operations (default: true).<br/>When disabled, cache refilling on read won't happen. |
-| `region_engine.mito.manifest_cache_size` | String | `256MB` | Capacity for manifest cache (default: 256MB). |
 | `region_engine.mito.sst_write_buffer_size` | String | `8MB` | Buffer size for SST writing. |
 | `region_engine.mito.parallel_scan_channel_size` | Integer | `32` | Capacity of the channel to send data from parallel scan tasks to the main task. |
 | `region_engine.mito.max_concurrent_scan_files` | Integer | `384` | Maximum number of SST files to scan concurrently. |
--- a/config/datanode.example.toml
+++ b/config/datanode.example.toml
@@ -169,14 +169,6 @@ recovery_parallelism = 2
 ## **It's only used when the provider is `kafka`**.
 broker_endpoints = ["127.0.0.1:9092"]

-## The connect timeout for kafka client.
-## **It's only used when the provider is `kafka`**.
-#+ connect_timeout = "3s"
-
-## The timeout for kafka client.
-## **It's only used when the provider is `kafka`**.
-#+ timeout = "3s"
-
 ## The max size of a single producer batch.
 ## Warning: Kafka has a default limit of 1MB per message in a topic.
 ## **It's only used when the provider is `kafka`**.
@@ -233,7 +225,6 @@ overwrite_entry_start_id = false
 # endpoint = "https://s3.amazonaws.com"
 # region = "us-west-2"
 # enable_virtual_host_style = false
-# disable_ec2_metadata = false

 # Example of using Oss as the storage.
 # [storage]
@@ -290,6 +281,18 @@ data_home = "./greptimedb_data"
 ## - `Oss`: the data is stored in the Aliyun OSS.
 type = "File"

+## Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.
+## A local file directory, defaults to `{data_home}`. An empty string means disabling.
+## @toml2docs:none-default
+#+ cache_path = ""
+
+## Whether to enable read cache. If not set, the read cache will be enabled by default when using object storage.
+#+ enable_read_cache = true
+
+## The local file cache capacity in bytes. If your disk space is sufficient, it is recommended to set it larger.
+## @toml2docs:none-default
+cache_capacity = "5GiB"
+
 ## The S3 bucket name.
 ## **It's only used when the storage type is `S3`, `Oss` and `Gcs`**.
 ## @toml2docs:none-default
@@ -449,15 +452,6 @@ compress_manifest = false
 ## @toml2docs:none-default="Auto"
 #+ max_background_purges = 8

-## Memory budget for compaction tasks. Setting it to 0 or "unlimited" disables the limit.
-## @toml2docs:none-default="0"
-#+ experimental_compaction_memory_limit = "0"
-
-## Behavior when compaction cannot acquire memory from the budget.
-## Options: "wait" (default, 10s), "wait(<duration>)", "fail"
-## @toml2docs:none-default="wait"
-#+ experimental_compaction_on_exhausted = "wait"
-
 ## Interval to auto flush a region if it has not flushed yet.
 auto_flush_interval = "1h"

@@ -513,13 +507,6 @@ preload_index_cache = true
 ## 1GiB is reserved for index files and 4GiB for data files.
 index_cache_percent = 20

-## Enable refilling cache on read operations (default: true).
-## When disabled, cache refilling on read won't happen.
-enable_refill_cache_on_read = true
-
-## Capacity for manifest cache (default: 256MB).
-manifest_cache_size = "256MB"
-
 ## Buffer size for SST writing.
 sst_write_buffer_size = "8MB"

--- a/config/frontend.example.toml
+++ b/config/frontend.example.toml
@@ -131,6 +131,7 @@ key_path = ""
 ## For now, gRPC tls config does not support auto reload.
 watch = false

+
 ## MySQL server options.
 [mysql]
 ## Whether to enable.
--- a/config/metasrv.example.toml
+++ b/config/metasrv.example.toml
@@ -71,13 +71,6 @@ allow_region_failover_on_local_wal = false
 ## Max allowed idle time before removing node info from metasrv memory.
 node_max_idle_time = "24hours"

-## Base heartbeat interval for calculating distributed time constants.
-## The frontend heartbeat interval is 6 times of the base heartbeat interval.
-## The flownode/datanode heartbeat interval is 1 times of the base heartbeat interval.
-## e.g., If the base heartbeat interval is 3s, the frontend heartbeat interval is 18s, the flownode/datanode heartbeat interval is 3s.
-## If you change this value, you need to change the heartbeat interval of the flownode/frontend/datanode accordingly.
-#+ heartbeat_interval = "3s"
-
 ## Whether to enable greptimedb telemetry. Enabled by default.
 #+ enable_telemetry = true

@@ -116,16 +109,6 @@ key_path = ""
 ## Like "/path/to/ca.crt"
 ca_cert_path = ""

-## The backend client options.
-## Currently, only applicable when using etcd as the metadata store.
-#+ [backend_client]
-## The keep alive timeout for backend client.
-#+ keep_alive_timeout = "3s"
-## The keep alive interval for backend client.
-#+ keep_alive_interval = "10s"
-## The connect timeout for backend client.
-#+ connect_timeout = "3s"
-
 ## The gRPC server options.
 [grpc]
 ## The address to bind the gRPC server.
@@ -140,10 +123,6 @@ runtime_size = 8
 max_recv_message_size = "512MB"
 ## The maximum send message size for gRPC server.
 max_send_message_size = "512MB"
-## The server side HTTP/2 keep-alive interval
-#+ http2_keep_alive_interval = "10s"
-## The server side HTTP/2 keep-alive timeout.
-#+ http2_keep_alive_timeout = "3s"

 ## The HTTP server options.
 [http]
--- a/config/standalone.example.toml
+++ b/config/standalone.example.toml
@@ -230,14 +230,6 @@ recovery_parallelism = 2
 ## **It's only used when the provider is `kafka`**.
 broker_endpoints = ["127.0.0.1:9092"]

-## The connect timeout for kafka client.
-## **It's only used when the provider is `kafka`**.
-#+ connect_timeout = "3s"
-
-## The timeout for kafka client.
-## **It's only used when the provider is `kafka`**.
-#+ timeout = "3s"
-
 ## Automatically create topics for WAL.
 ## Set to `true` to automatically create topics for WAL.
 ## Otherwise, use topics named `topic_name_prefix_[0..num_topics)`
@@ -340,7 +332,6 @@ max_running_procedures = 128
 # endpoint = "https://s3.amazonaws.com"
 # region = "us-west-2"
 # enable_virtual_host_style = false
-# disable_ec2_metadata = false

 # Example of using Oss as the storage.
 # [storage]
@@ -397,6 +388,18 @@ data_home = "./greptimedb_data"
 ## - `Oss`: the data is stored in the Aliyun OSS.
 type = "File"

+## Whether to enable read cache. If not set, the read cache will be enabled by default when using object storage.
+#+ enable_read_cache = true
+
+## Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.
+## A local file directory, defaults to `{data_home}`. An empty string means disabling.
+## @toml2docs:none-default
+#+ cache_path = ""
+
+## The local file cache capacity in bytes. If your disk space is sufficient, it is recommended to set it larger.
+## @toml2docs:none-default
+cache_capacity = "5GiB"
+
 ## The S3 bucket name.
 ## **It's only used when the storage type is `S3`, `Oss` and `Gcs`**.
 ## @toml2docs:none-default
@@ -543,15 +546,6 @@ compress_manifest = false
 ## @toml2docs:none-default="Auto"
 #+ max_background_purges = 8

-## Memory budget for compaction tasks. Setting it to 0 or "unlimited" disables the limit.
-## @toml2docs:none-default="0"
-#+ experimental_compaction_memory_limit = "0"
-
-## Behavior when compaction cannot acquire memory from the budget.
-## Options: "wait" (default, 10s), "wait(<duration>)", "fail"
-## @toml2docs:none-default="wait"
-#+ experimental_compaction_on_exhausted = "wait"
-
 ## Interval to auto flush a region if it has not flushed yet.
 auto_flush_interval = "1h"

@@ -607,13 +601,6 @@ preload_index_cache = true
 ## 1GiB is reserved for index files and 4GiB for data files.
 index_cache_percent = 20

-## Enable refilling cache on read operations (default: true).
-## When disabled, cache refilling on read won't happen.
-enable_refill_cache_on_read = true
-
-## Capacity for manifest cache (default: 256MB).
-manifest_cache_size = "256MB"
-
 ## Buffer size for SST writing.
 sst_write_buffer_size = "8MB"

--- a/src/catalog/src/system_schema/information_schema.rs
+++ b/src/catalog/src/system_schema/information_schema.rs
@@ -428,7 +428,7 @@ pub trait InformationExtension {
 }

 /// The request to inspect the datanode.
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct DatanodeInspectRequest {
    /// Kind to fetch from datanode.
    pub kind: DatanodeInspectKind,
--- a/src/cli/Cargo.toml
+++ b/src/cli/Cargo.toml
@@ -67,7 +67,6 @@ tracing-appender.workspace = true

 [dev-dependencies]
 common-meta = { workspace = true, features = ["testing"] }
-common-test-util.workspace = true
 common-version.workspace = true
 serde.workspace = true
 tempfile.workspace = true
--- a/src/cli/src/common.rs
+++ b/src/cli/src/common.rs
@@ -15,8 +15,5 @@
 mod object_store;
 mod store;

-pub use object_store::{
-    ObjectStoreConfig, PrefixedAzblobConnection, PrefixedGcsConnection, PrefixedOssConnection,
-    PrefixedS3Connection, new_fs_object_store,
-};
+pub use object_store::{ObjectStoreConfig, new_fs_object_store};
 pub use store::StoreConfig;
--- a/src/cli/src/common/object_store.rs
+++ b/src/cli/src/common/object_store.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use common_base::secrets::{ExposeSecret, SecretString};
+use common_base::secrets::SecretString;
 use common_error::ext::BoxedError;
 use object_store::services::{Azblob, Fs, Gcs, Oss, S3};
 use object_store::util::{with_instrument_layers, with_retry_layers};
@@ -22,69 +22,9 @@ use snafu::ResultExt;

 use crate::error::{self};

-/// Trait to convert CLI field types to target struct field types.
-/// This enables `Option<SecretString>` (CLI) -> `SecretString` (target) conversions,
-/// allowing us to distinguish "not provided" from "provided but empty".
-trait IntoField<T> {
-    fn into_field(self) -> T;
-}
-
-/// Identity conversion for types that are the same.
-impl<T> IntoField<T> for T {
-    fn into_field(self) -> T {
-        self
-    }
-}
-
-/// Convert `Option<SecretString>` to `SecretString`, using default for None.
-impl IntoField<SecretString> for Option<SecretString> {
-    fn into_field(self) -> SecretString {
-        self.unwrap_or_default()
-    }
-}
-
-/// Trait for checking if a field is effectively empty.
-///
-/// **`is_empty()`**: Checks if the field has no meaningful value
-/// - Used when backend is enabled to validate required fields
-/// - `None`, `Some("")`, `false`, or `""` are considered empty
-trait FieldValidator {
-    /// Check if the field is empty (has no meaningful value).
-    fn is_empty(&self) -> bool;
-}
-
-/// String fields: empty if the string is empty
-impl FieldValidator for String {
-    fn is_empty(&self) -> bool {
-        self.is_empty()
-    }
-}
-
-/// Bool fields: false is considered "empty", true is "provided"
-impl FieldValidator for bool {
-    fn is_empty(&self) -> bool {
-        !self
-    }
-}
-
-/// Option<String> fields: None or empty content is empty
-impl FieldValidator for Option<String> {
-    fn is_empty(&self) -> bool {
-        self.as_ref().is_none_or(|s| s.is_empty())
-    }
-}
-
-/// Option<SecretString> fields: None or empty secret is empty
-/// For secrets, Some("") is treated as "not provided" for both checks
-impl FieldValidator for Option<SecretString> {
-    fn is_empty(&self) -> bool {
-        self.as_ref().is_none_or(|s| s.expose_secret().is_empty())
-    }
-}
-
 macro_rules! wrap_with_clap_prefix {
    (
-        $new_name:ident, $prefix:literal, $enable_flag:literal, $base:ty, {
+        $new_name:ident, $prefix:literal, $base:ty, {
            $( $( #[doc = $doc:expr] )? $( #[alias = $alias:literal] )? $field:ident : $type:ty $( = $default:expr )? ),* $(,)?
        }
    ) => {
@@ -94,16 +34,15 @@ macro_rules! wrap_with_clap_prefix {
                $(
                    $( #[doc = $doc] )?
                    $( #[clap(alias = $alias)] )?
-                    #[clap(long, requires = $enable_flag $(, default_value_t = $default )? )]
-                    pub [<$prefix $field>]: $type,
+                    #[clap(long $(, default_value_t = $default )? )]
+                    [<$prefix $field>]: $type,
                )*
            }

            impl From<$new_name> for $base {
                fn from(w: $new_name) -> Self {
                    Self {
-                        // Use into_field() to handle Option<SecretString> -> SecretString conversion
-                        $( $field: w.[<$prefix $field>].into_field() ),*
+                        $( $field: w.[<$prefix $field>] ),*
                    }
                }
            }
@@ -111,90 +50,9 @@ macro_rules! wrap_with_clap_prefix {
    };
 }

-/// Macro for declarative backend validation.
-///
-/// # Validation Rules
-///
-/// For each storage backend (S3, OSS, GCS, Azblob), this function validates:
-/// **When backend is enabled** (e.g., `--s3`): All required fields must be non-empty
-///
-/// Note: When backend is disabled, clap's `requires` attribute ensures no configuration
-/// fields can be provided at parse time.
-///
-/// # Syntax
-///
-/// ```ignore
-/// validate_backend!(
-///     enable: self.enable_s3,
-///     name: "S3",
-///     required: [(field1, "name1"), (field2, "name2"), ...],
-///     custom_validator: |missing| { ... }  // optional
-/// )
-/// ```
-///
-/// # Arguments
-///
-/// - `enable`: Boolean expression indicating if backend is enabled
-/// - `name`: Human-readable backend name for error messages
-/// - `required`: Array of (field_ref, field_name) tuples for required fields
-/// - `custom_validator`: Optional closure for complex validation logic
-///
-/// # Example
-///
-/// ```ignore
-/// validate_backend!(
-///     enable: self.enable_s3,
-///     name: "S3",
-///     required: [
-///         (&self.s3.s3_bucket, "bucket"),
-///         (&self.s3.s3_access_key_id, "access key ID"),
-///     ]
-/// )
-/// ```
-macro_rules! validate_backend {
-    (
-        enable: $enable:expr,
-        name: $backend_name:expr,
-        required: [ $( ($field:expr, $field_name:expr) ),* $(,)? ]
-        $(, custom_validator: $custom_validator:expr)?
-    ) => {{
-        if $enable {
-            // Check required fields when backend is enabled
-            let mut missing = Vec::new();
-            $(
-                if FieldValidator::is_empty($field) {
-                    missing.push($field_name);
-                }
-            )*
-
-            // Run custom validation if provided
-            $(
-                $custom_validator(&mut missing);
-            )?
-
-            if !missing.is_empty() {
-                return Err(BoxedError::new(
-                    error::MissingConfigSnafu {
-                        msg: format!(
-                            "{} {} must be set when --{} is enabled.",
-                            $backend_name,
-                            missing.join(", "),
-                            $backend_name.to_lowercase()
-                        ),
-                    }
-                    .build(),
-                ));
-            }
-        }
-
-        Ok(())
-    }};
-}
-
 wrap_with_clap_prefix! {
    PrefixedAzblobConnection,
    "azblob-",
-    "enable_azblob",
    AzblobConnection,
    {
        #[doc = "The container of the object store."]
@@ -202,9 +60,9 @@ wrap_with_clap_prefix! {
        #[doc = "The root of the object store."]
        root: String = Default::default(),
        #[doc = "The account name of the object store."]
-        account_name: Option<SecretString>,
+        account_name: SecretString = Default::default(),
        #[doc = "The account key of the object store."]
-        account_key: Option<SecretString>,
+        account_key: SecretString = Default::default(),
        #[doc = "The endpoint of the object store."]
        endpoint: String = Default::default(),
        #[doc = "The SAS token of the object store."]
@@ -212,33 +70,9 @@ wrap_with_clap_prefix! {
    }
 }

-impl PrefixedAzblobConnection {
-    pub fn validate(&self) -> Result<(), BoxedError> {
-        validate_backend!(
-            enable: true,
-            name: "AzBlob",
-            required: [
-                (&self.azblob_container, "container"),
-                (&self.azblob_root, "root"),
-                (&self.azblob_account_name, "account name"),
-                (&self.azblob_endpoint, "endpoint"),
-            ],
-            custom_validator: |missing: &mut Vec<&str>| {
-                // account_key is only required if sas_token is not provided
-                if self.azblob_sas_token.is_none()
-                    && self.azblob_account_key.is_empty()
-                {
-                    missing.push("account key (when sas_token is not provided)");
-                }
-            }
-        )
-    }
-}
-
 wrap_with_clap_prefix! {
    PrefixedS3Connection,
    "s3-",
-    "enable_s3",
    S3Connection,
    {
        #[doc = "The bucket of the object store."]
@@ -246,39 +80,21 @@ wrap_with_clap_prefix! {
        #[doc = "The root of the object store."]
        root: String = Default::default(),
        #[doc = "The access key ID of the object store."]
-        access_key_id: Option<SecretString>,
+        access_key_id: SecretString = Default::default(),
        #[doc = "The secret access key of the object store."]
-        secret_access_key: Option<SecretString>,
+        secret_access_key: SecretString = Default::default(),
        #[doc = "The endpoint of the object store."]
        endpoint: Option<String>,
        #[doc = "The region of the object store."]
        region: Option<String>,
        #[doc = "Enable virtual host style for the object store."]
        enable_virtual_host_style: bool = Default::default(),
-        #[doc = "Disable EC2 metadata service for the object store."]
-        disable_ec2_metadata: bool = Default::default(),
-    }
-}
-
-impl PrefixedS3Connection {
-    pub fn validate(&self) -> Result<(), BoxedError> {
-        validate_backend!(
-            enable: true,
-            name: "S3",
-            required: [
-                (&self.s3_bucket, "bucket"),
-                (&self.s3_access_key_id, "access key ID"),
-                (&self.s3_secret_access_key, "secret access key"),
-                (&self.s3_region, "region"),
-            ]
-        )
    }
 }

 wrap_with_clap_prefix! {
    PrefixedOssConnection,
    "oss-",
-    "enable_oss",
    OssConnection,
    {
        #[doc = "The bucket of the object store."]
@@ -286,33 +102,17 @@ wrap_with_clap_prefix! {
        #[doc = "The root of the object store."]
        root: String = Default::default(),
        #[doc = "The access key ID of the object store."]
-        access_key_id: Option<SecretString>,
+        access_key_id: SecretString = Default::default(),
        #[doc = "The access key secret of the object store."]
-        access_key_secret: Option<SecretString>,
+        access_key_secret: SecretString = Default::default(),
        #[doc = "The endpoint of the object store."]
        endpoint: String = Default::default(),
    }
 }

-impl PrefixedOssConnection {
-    pub fn validate(&self) -> Result<(), BoxedError> {
-        validate_backend!(
-            enable: true,
-            name: "OSS",
-            required: [
-                (&self.oss_bucket, "bucket"),
-                (&self.oss_access_key_id, "access key ID"),
-                (&self.oss_access_key_secret, "access key secret"),
-                (&self.oss_endpoint, "endpoint"),
-            ]
-        )
-    }
-}
-
 wrap_with_clap_prefix! {
    PrefixedGcsConnection,
    "gcs-",
-    "enable_gcs",
    GcsConnection,
    {
        #[doc = "The root of the object store."]
@@ -322,72 +122,40 @@ wrap_with_clap_prefix! {
        #[doc = "The scope of the object store."]
        scope: String = Default::default(),
        #[doc = "The credential path of the object store."]
-        credential_path: Option<SecretString>,
+        credential_path: SecretString = Default::default(),
        #[doc = "The credential of the object store."]
-        credential: Option<SecretString>,
+        credential: SecretString = Default::default(),
        #[doc = "The endpoint of the object store."]
        endpoint: String = Default::default(),
    }
 }

-impl PrefixedGcsConnection {
-    pub fn validate(&self) -> Result<(), BoxedError> {
-        validate_backend!(
-            enable: true,
-            name: "GCS",
-            required: [
-                (&self.gcs_bucket, "bucket"),
-                (&self.gcs_root, "root"),
-                (&self.gcs_scope, "scope"),
-            ]
-            // No custom_validator needed: GCS supports Application Default Credentials (ADC)
-            // where neither credential_path nor credential is required.
-            // Endpoint is also optional (defaults to https://storage.googleapis.com).
-        )
-    }
-}
-
-/// Common config for object store.
-///
-/// # Dependency Enforcement
-///
-/// Each backend's configuration fields (e.g., `--s3-bucket`) requires its corresponding
-/// enable flag (e.g., `--s3`) to be present. This is enforced by `clap` at parse time
-/// using the `requires` attribute.
-///
-/// For example, attempting to use `--s3-bucket my-bucket` without `--s3` will result in:
-/// ```text
-/// error: The argument '--s3-bucket <BUCKET>' requires '--s3'
-/// ```
-///
-/// This ensures that users cannot accidentally provide backend-specific configuration
-/// without explicitly enabling that backend.
+/// common config for object store.
 #[derive(clap::Parser, Debug, Clone, PartialEq, Default)]
-#[clap(group(clap::ArgGroup::new("storage_backend").required(false).multiple(false)))]
 pub struct ObjectStoreConfig {
    /// Whether to use S3 object store.
-    #[clap(long = "s3", group = "storage_backend")]
+    #[clap(long, alias = "s3")]
    pub enable_s3: bool,

    #[clap(flatten)]
    pub s3: PrefixedS3Connection,

    /// Whether to use OSS.
-    #[clap(long = "oss", group = "storage_backend")]
+    #[clap(long, alias = "oss")]
    pub enable_oss: bool,

    #[clap(flatten)]
    pub oss: PrefixedOssConnection,

    /// Whether to use GCS.
-    #[clap(long = "gcs", group = "storage_backend")]
+    #[clap(long, alias = "gcs")]
    pub enable_gcs: bool,

    #[clap(flatten)]
    pub gcs: PrefixedGcsConnection,

    /// Whether to use Azure Blob.
-    #[clap(long = "azblob", group = "storage_backend")]
+    #[clap(long, alias = "azblob")]
    pub enable_azblob: bool,

    #[clap(flatten)]
@@ -405,66 +173,52 @@ pub fn new_fs_object_store(root: &str) -> std::result::Result<ObjectStore, Boxed
    Ok(with_instrument_layers(object_store, false))
 }

-macro_rules! gen_object_store_builder {
-    ($method:ident, $field:ident, $conn_type:ty, $service_type:ty) => {
-        pub fn $method(&self) -> Result<ObjectStore, BoxedError> {
-            let config = <$conn_type>::from(self.$field.clone());
-            common_telemetry::info!(
-                "Building object store with {}: {:?}",
-                stringify!($field),
-                config
-            );
-            let object_store = ObjectStore::new(<$service_type>::from(&config))
-                .context(error::InitBackendSnafu)
-                .map_err(BoxedError::new)?
-                .finish();
-            Ok(with_instrument_layers(
-                with_retry_layers(object_store),
-                false,
-            ))
-        }
-    };
-}
-
 impl ObjectStoreConfig {
-    gen_object_store_builder!(build_s3, s3, S3Connection, S3);
-
-    gen_object_store_builder!(build_oss, oss, OssConnection, Oss);
-
-    gen_object_store_builder!(build_gcs, gcs, GcsConnection, Gcs);
-
-    gen_object_store_builder!(build_azblob, azblob, AzblobConnection, Azblob);
-
-    pub fn validate(&self) -> Result<(), BoxedError> {
-        if self.enable_s3 {
-            self.s3.validate()?;
-        }
-        if self.enable_oss {
-            self.oss.validate()?;
-        }
-        if self.enable_gcs {
-            self.gcs.validate()?;
-        }
-        if self.enable_azblob {
-            self.azblob.validate()?;
-        }
-        Ok(())
-    }
-
    /// Builds the object store from the config.
    pub fn build(&self) -> Result<Option<ObjectStore>, BoxedError> {
-        self.validate()?;
-
-        if self.enable_s3 {
-            self.build_s3().map(Some)
+        let object_store = if self.enable_s3 {
+            let s3 = S3Connection::from(self.s3.clone());
+            common_telemetry::info!("Building object store with s3: {:?}", s3);
+            Some(
+                ObjectStore::new(S3::from(&s3))
+                    .context(error::InitBackendSnafu)
+                    .map_err(BoxedError::new)?
+                    .finish(),
+            )
        } else if self.enable_oss {
-            self.build_oss().map(Some)
+            let oss = OssConnection::from(self.oss.clone());
+            common_telemetry::info!("Building object store with oss: {:?}", oss);
+            Some(
+                ObjectStore::new(Oss::from(&oss))
+                    .context(error::InitBackendSnafu)
+                    .map_err(BoxedError::new)?
+                    .finish(),
+            )
        } else if self.enable_gcs {
-            self.build_gcs().map(Some)
+            let gcs = GcsConnection::from(self.gcs.clone());
+            common_telemetry::info!("Building object store with gcs: {:?}", gcs);
+            Some(
+                ObjectStore::new(Gcs::from(&gcs))
+                    .context(error::InitBackendSnafu)
+                    .map_err(BoxedError::new)?
+                    .finish(),
+            )
        } else if self.enable_azblob {
-            self.build_azblob().map(Some)
+            let azblob = AzblobConnection::from(self.azblob.clone());
+            common_telemetry::info!("Building object store with azblob: {:?}", azblob);
+            Some(
+                ObjectStore::new(Azblob::from(&azblob))
+                    .context(error::InitBackendSnafu)
+                    .map_err(BoxedError::new)?
+                    .finish(),
+            )
        } else {
-            Ok(None)
-        }
+            None
+        };
+
+        let object_store = object_store
+            .map(|object_store| with_instrument_layers(with_retry_layers(object_store), false));
+
+        Ok(object_store)
    }
 }
--- a/src/cli/src/common/store.rs
+++ b/src/cli/src/common/store.rs
@@ -19,7 +19,7 @@ use common_error::ext::BoxedError;
 use common_meta::kv_backend::KvBackendRef;
 use common_meta::kv_backend::chroot::ChrootKvBackend;
 use common_meta::kv_backend::etcd::EtcdStore;
-use meta_srv::metasrv::{BackendClientOptions, BackendImpl};
+use meta_srv::metasrv::BackendImpl;
 use meta_srv::utils::etcd::create_etcd_client_with_tls;
 use servers::tls::{TlsMode, TlsOption};

@@ -112,13 +112,9 @@ impl StoreConfig {
            let kvbackend = match self.backend {
                BackendImpl::EtcdStore => {
                    let tls_config = self.tls_config();
-                    let etcd_client = create_etcd_client_with_tls(
-                        store_addrs,
-                        &BackendClientOptions::default(),
-                        tls_config.as_ref(),
-                    )
-                    .await
-                    .map_err(BoxedError::new)?;
+                    let etcd_client = create_etcd_client_with_tls(store_addrs, tls_config.as_ref())
+                        .await
+                        .map_err(BoxedError::new)?;
                    Ok(EtcdStore::with_etcd_client(etcd_client, max_txn_ops))
                }
                #[cfg(feature = "pg_kvbackend")]
--- a/src/cli/src/data.rs
+++ b/src/cli/src/data.rs
@@ -14,7 +14,6 @@

 mod export;
 mod import;
-mod storage_export;

 use clap::Subcommand;
 use client::DEFAULT_CATALOG_NAME;
--- a/src/cli/src/data/export.rs
+++ b/src/cli/src/data/export.rs
--- a/src/cli/src/data/storage_export.rs
+++ b/src/cli/src/data/storage_export.rs
@@ -1,373 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::path::PathBuf;
-
-use common_base::secrets::{ExposeSecret, SecretString};
-use common_error::ext::BoxedError;
-
-use crate::common::{
-    PrefixedAzblobConnection, PrefixedGcsConnection, PrefixedOssConnection, PrefixedS3Connection,
-};
-
-/// Helper function to extract secret string from Option<SecretString>.
-/// Returns empty string if None.
-fn expose_optional_secret(secret: &Option<SecretString>) -> &str {
-    secret
-        .as_ref()
-        .map(|s| s.expose_secret().as_str())
-        .unwrap_or("")
-}
-
-/// Helper function to format root path with leading slash if non-empty.
-fn format_root_path(root: &str) -> String {
-    if root.is_empty() {
-        String::new()
-    } else {
-        format!("/{}", root)
-    }
-}
-
-/// Helper function to mask multiple secrets in a string.
-fn mask_secrets(mut sql: String, secrets: &[&str]) -> String {
-    for secret in secrets {
-        if !secret.is_empty() {
-            sql = sql.replace(secret, "[REDACTED]");
-        }
-    }
-    sql
-}
-
-/// Helper function to format storage URI.
-fn format_uri(scheme: &str, bucket: &str, root: &str, path: &str) -> String {
-    let root = format_root_path(root);
-    format!("{}://{}{}/{}", scheme, bucket, root, path)
-}
-
-/// Trait for storage backends that can be used for data export.
-pub trait StorageExport: Send + Sync {
-    /// Generate the storage path for COPY DATABASE command.
-    /// Returns (path, connection_string) where connection_string includes CONNECTION clause.
-    fn get_storage_path(&self, catalog: &str, schema: &str) -> (String, String);
-
-    /// Format the output path for logging purposes.
-    fn format_output_path(&self, file_path: &str) -> String;
-
-    /// Mask sensitive information in SQL commands for safe logging.
-    fn mask_sensitive_info(&self, sql: &str) -> String;
-}
-
-macro_rules! define_backend {
-    ($name:ident, $config:ty) => {
-        #[derive(Clone)]
-        pub struct $name {
-            config: $config,
-        }
-
-        impl $name {
-            pub fn new(config: $config) -> Result<Self, BoxedError> {
-                config.validate()?;
-                Ok(Self { config })
-            }
-        }
-    };
-}
-
-/// Local file system storage backend.
-#[derive(Clone)]
-pub struct FsBackend {
-    output_dir: String,
-}
-
-impl FsBackend {
-    pub fn new(output_dir: String) -> Self {
-        Self { output_dir }
-    }
-}
-
-impl StorageExport for FsBackend {
-    fn get_storage_path(&self, catalog: &str, schema: &str) -> (String, String) {
-        if self.output_dir.is_empty() {
-            unreachable!("output_dir must be set when not using remote storage")
-        }
-        let path = PathBuf::from(&self.output_dir)
-            .join(catalog)
-            .join(format!("{schema}/"))
-            .to_string_lossy()
-            .to_string();
-        (path, String::new())
-    }
-
-    fn format_output_path(&self, file_path: &str) -> String {
-        format!("{}/{}", self.output_dir, file_path)
-    }
-
-    fn mask_sensitive_info(&self, sql: &str) -> String {
-        sql.to_string()
-    }
-}
-
-define_backend!(S3Backend, PrefixedS3Connection);
-
-impl StorageExport for S3Backend {
-    fn get_storage_path(&self, catalog: &str, schema: &str) -> (String, String) {
-        let s3_path = format_uri(
-            "s3",
-            &self.config.s3_bucket,
-            &self.config.s3_root,
-            &format!("{}/{}/", catalog, schema),
-        );
-
-        let mut connection_options = vec![
-            format!(
-                "ACCESS_KEY_ID='{}'",
-                expose_optional_secret(&self.config.s3_access_key_id)
-            ),
-            format!(
-                "SECRET_ACCESS_KEY='{}'",
-                expose_optional_secret(&self.config.s3_secret_access_key)
-            ),
-        ];
-
-        if let Some(region) = &self.config.s3_region {
-            connection_options.push(format!("REGION='{}'", region));
-        }
-
-        if let Some(endpoint) = &self.config.s3_endpoint {
-            connection_options.push(format!("ENDPOINT='{}'", endpoint));
-        }
-
-        let connection_str = format!(" CONNECTION ({})", connection_options.join(", "));
-        (s3_path, connection_str)
-    }
-
-    fn format_output_path(&self, file_path: &str) -> String {
-        format_uri(
-            "s3",
-            &self.config.s3_bucket,
-            &self.config.s3_root,
-            file_path,
-        )
-    }
-
-    fn mask_sensitive_info(&self, sql: &str) -> String {
-        mask_secrets(
-            sql.to_string(),
-            &[
-                expose_optional_secret(&self.config.s3_access_key_id),
-                expose_optional_secret(&self.config.s3_secret_access_key),
-            ],
-        )
-    }
-}
-
-define_backend!(OssBackend, PrefixedOssConnection);
-
-impl StorageExport for OssBackend {
-    fn get_storage_path(&self, catalog: &str, schema: &str) -> (String, String) {
-        let oss_path = format_uri(
-            "oss",
-            &self.config.oss_bucket,
-            &self.config.oss_root,
-            &format!("{}/{}/", catalog, schema),
-        );
-
-        let connection_options = [
-            format!(
-                "ACCESS_KEY_ID='{}'",
-                expose_optional_secret(&self.config.oss_access_key_id)
-            ),
-            format!(
-                "ACCESS_KEY_SECRET='{}'",
-                expose_optional_secret(&self.config.oss_access_key_secret)
-            ),
-        ];
-
-        let connection_str = format!(" CONNECTION ({})", connection_options.join(", "));
-        (oss_path, connection_str)
-    }
-
-    fn format_output_path(&self, file_path: &str) -> String {
-        format_uri(
-            "oss",
-            &self.config.oss_bucket,
-            &self.config.oss_root,
-            file_path,
-        )
-    }
-
-    fn mask_sensitive_info(&self, sql: &str) -> String {
-        mask_secrets(
-            sql.to_string(),
-            &[
-                expose_optional_secret(&self.config.oss_access_key_id),
-                expose_optional_secret(&self.config.oss_access_key_secret),
-            ],
-        )
-    }
-}
-
-define_backend!(GcsBackend, PrefixedGcsConnection);
-
-impl StorageExport for GcsBackend {
-    fn get_storage_path(&self, catalog: &str, schema: &str) -> (String, String) {
-        let gcs_path = format_uri(
-            "gcs",
-            &self.config.gcs_bucket,
-            &self.config.gcs_root,
-            &format!("{}/{}/", catalog, schema),
-        );
-
-        let mut connection_options = Vec::new();
-
-        let credential_path = expose_optional_secret(&self.config.gcs_credential_path);
-        if !credential_path.is_empty() {
-            connection_options.push(format!("CREDENTIAL_PATH='{}'", credential_path));
-        }
-
-        let credential = expose_optional_secret(&self.config.gcs_credential);
-        if !credential.is_empty() {
-            connection_options.push(format!("CREDENTIAL='{}'", credential));
-        }
-
-        if !self.config.gcs_endpoint.is_empty() {
-            connection_options.push(format!("ENDPOINT='{}'", self.config.gcs_endpoint));
-        }
-
-        let connection_str = if connection_options.is_empty() {
-            String::new()
-        } else {
-            format!(" CONNECTION ({})", connection_options.join(", "))
-        };
-
-        (gcs_path, connection_str)
-    }
-
-    fn format_output_path(&self, file_path: &str) -> String {
-        format_uri(
-            "gcs",
-            &self.config.gcs_bucket,
-            &self.config.gcs_root,
-            file_path,
-        )
-    }
-
-    fn mask_sensitive_info(&self, sql: &str) -> String {
-        mask_secrets(
-            sql.to_string(),
-            &[
-                expose_optional_secret(&self.config.gcs_credential_path),
-                expose_optional_secret(&self.config.gcs_credential),
-            ],
-        )
-    }
-}
-
-define_backend!(AzblobBackend, PrefixedAzblobConnection);
-
-impl StorageExport for AzblobBackend {
-    fn get_storage_path(&self, catalog: &str, schema: &str) -> (String, String) {
-        let azblob_path = format_uri(
-            "azblob",
-            &self.config.azblob_container,
-            &self.config.azblob_root,
-            &format!("{}/{}/", catalog, schema),
-        );
-
-        let mut connection_options = vec![
-            format!(
-                "ACCOUNT_NAME='{}'",
-                expose_optional_secret(&self.config.azblob_account_name)
-            ),
-            format!(
-                "ACCOUNT_KEY='{}'",
-                expose_optional_secret(&self.config.azblob_account_key)
-            ),
-        ];
-
-        if let Some(sas_token) = &self.config.azblob_sas_token {
-            connection_options.push(format!("SAS_TOKEN='{}'", sas_token));
-        }
-
-        let connection_str = format!(" CONNECTION ({})", connection_options.join(", "));
-        (azblob_path, connection_str)
-    }
-
-    fn format_output_path(&self, file_path: &str) -> String {
-        format_uri(
-            "azblob",
-            &self.config.azblob_container,
-            &self.config.azblob_root,
-            file_path,
-        )
-    }
-
-    fn mask_sensitive_info(&self, sql: &str) -> String {
-        mask_secrets(
-            sql.to_string(),
-            &[
-                expose_optional_secret(&self.config.azblob_account_name),
-                expose_optional_secret(&self.config.azblob_account_key),
-            ],
-        )
-    }
-}
-
-#[derive(Clone)]
-pub enum StorageType {
-    Fs(FsBackend),
-    S3(S3Backend),
-    Oss(OssBackend),
-    Gcs(GcsBackend),
-    Azblob(AzblobBackend),
-}
-
-impl StorageExport for StorageType {
-    fn get_storage_path(&self, catalog: &str, schema: &str) -> (String, String) {
-        match self {
-            StorageType::Fs(backend) => backend.get_storage_path(catalog, schema),
-            StorageType::S3(backend) => backend.get_storage_path(catalog, schema),
-            StorageType::Oss(backend) => backend.get_storage_path(catalog, schema),
-            StorageType::Gcs(backend) => backend.get_storage_path(catalog, schema),
-            StorageType::Azblob(backend) => backend.get_storage_path(catalog, schema),
-        }
-    }
-
-    fn format_output_path(&self, file_path: &str) -> String {
-        match self {
-            StorageType::Fs(backend) => backend.format_output_path(file_path),
-            StorageType::S3(backend) => backend.format_output_path(file_path),
-            StorageType::Oss(backend) => backend.format_output_path(file_path),
-            StorageType::Gcs(backend) => backend.format_output_path(file_path),
-            StorageType::Azblob(backend) => backend.format_output_path(file_path),
-        }
-    }
-
-    fn mask_sensitive_info(&self, sql: &str) -> String {
-        match self {
-            StorageType::Fs(backend) => backend.mask_sensitive_info(sql),
-            StorageType::S3(backend) => backend.mask_sensitive_info(sql),
-            StorageType::Oss(backend) => backend.mask_sensitive_info(sql),
-            StorageType::Gcs(backend) => backend.mask_sensitive_info(sql),
-            StorageType::Azblob(backend) => backend.mask_sensitive_info(sql),
-        }
-    }
-}
-
-impl StorageType {
-    /// Returns true if the storage backend is remote (not local filesystem).
-    pub fn is_remote_storage(&self) -> bool {
-        !matches!(self, StorageType::Fs(_))
-    }
-}
--- a/src/cli/src/error.rs
+++ b/src/cli/src/error.rs
@@ -253,6 +253,12 @@ pub enum Error {
        error: ObjectStoreError,
    },

+    #[snafu(display("S3 config need be set"))]
+    S3ConfigNotSet {
+        #[snafu(implicit)]
+        location: Location,
+    },
+
    #[snafu(display("Output directory not set"))]
    OutputDirNotSet {
        #[snafu(implicit)]
@@ -358,9 +364,9 @@ impl ErrorExt for Error {

            Error::Other { source, .. } => source.status_code(),
            Error::OpenDal { .. } | Error::InitBackend { .. } => StatusCode::Internal,
-            Error::OutputDirNotSet { .. } | Error::EmptyStoreAddrs { .. } => {
-                StatusCode::InvalidArguments
-            }
+            Error::S3ConfigNotSet { .. }
+            | Error::OutputDirNotSet { .. }
+            | Error::EmptyStoreAddrs { .. } => StatusCode::InvalidArguments,

            Error::BuildRuntime { source, .. } => source.status_code(),

--- a/src/cmd/src/datanode/objbench.rs
+++ b/src/cmd/src/datanode/objbench.rs
@@ -145,17 +145,6 @@ impl ObjbenchCommand {
        let region_meta = extract_region_metadata(&self.source, &parquet_meta)?;
        let num_rows = parquet_meta.file_metadata().num_rows() as u64;
        let num_row_groups = parquet_meta.num_row_groups() as u64;
-        let max_row_group_uncompressed_size: u64 = parquet_meta
-            .row_groups()
-            .iter()
-            .map(|rg| {
-                rg.columns()
-                    .iter()
-                    .map(|c| c.uncompressed_size() as u64)
-                    .sum::<u64>()
-            })
-            .max()
-            .unwrap_or(0);

        println!(
            "{} Metadata loaded - rows: {}, size: {} bytes",
@@ -171,7 +160,6 @@ impl ObjbenchCommand {
            time_range: Default::default(),
            level: 0,
            file_size,
-            max_row_group_uncompressed_size,
            available_indexes: Default::default(),
            indexes: Default::default(),
            index_file_size: 0,
--- a/src/cmd/src/frontend.rs
+++ b/src/cmd/src/frontend.rs
@@ -52,7 +52,7 @@ use plugins::frontend::context::{
 };
 use servers::addrs;
 use servers::grpc::GrpcOptions;
-use servers::tls::{TlsMode, TlsOption, merge_tls_option};
+use servers::tls::{TlsMode, TlsOption};
 use snafu::{OptionExt, ResultExt};
 use tracing_appender::non_blocking::WorkerGuard;

@@ -256,7 +256,7 @@ impl StartCommand {

        if let Some(addr) = &self.rpc_bind_addr {
            opts.grpc.bind_addr.clone_from(addr);
-            opts.grpc.tls = merge_tls_option(&opts.grpc.tls, tls_opts.clone());
+            opts.grpc.tls = tls_opts.clone();
        }

        if let Some(addr) = &self.rpc_server_addr {
@@ -291,13 +291,13 @@ impl StartCommand {
        if let Some(addr) = &self.mysql_addr {
            opts.mysql.enable = true;
            opts.mysql.addr.clone_from(addr);
-            opts.mysql.tls = merge_tls_option(&opts.mysql.tls, tls_opts.clone());
+            opts.mysql.tls = tls_opts.clone();
        }

        if let Some(addr) = &self.postgres_addr {
            opts.postgres.enable = true;
            opts.postgres.addr.clone_from(addr);
-            opts.postgres.tls = merge_tls_option(&opts.postgres.tls, tls_opts.clone());
+            opts.postgres.tls = tls_opts;
        }

        if let Some(enable) = self.influxdb_enable {
--- a/src/cmd/src/metasrv.rs
+++ b/src/cmd/src/metasrv.rs
@@ -20,7 +20,6 @@ use async_trait::async_trait;
 use clap::Parser;
 use common_base::Plugins;
 use common_config::Configurable;
-use common_meta::distributed_time_constants::init_distributed_time_constants;
 use common_telemetry::info;
 use common_telemetry::logging::{DEFAULT_LOGGING_DIR, TracingOptions};
 use common_version::{short_version, verbose_version};
@@ -328,7 +327,6 @@ impl StartCommand {
        log_versions(verbose_version(), short_version(), APP_NAME);
        maybe_activate_heap_profile(&opts.component.memory);
        create_resource_limit_metrics(APP_NAME);
-        init_distributed_time_constants(opts.component.heartbeat_interval);

        info!("Metasrv start command: {:#?}", self);

--- a/src/cmd/src/standalone.rs
+++ b/src/cmd/src/standalone.rs
@@ -62,7 +62,7 @@ use plugins::frontend::context::{
    CatalogManagerConfigureContext, StandaloneCatalogManagerConfigureContext,
 };
 use plugins::standalone::context::DdlManagerConfigureContext;
-use servers::tls::{TlsMode, TlsOption, merge_tls_option};
+use servers::tls::{TlsMode, TlsOption};
 use snafu::ResultExt;
 use standalone::StandaloneInformationExtension;
 use standalone::options::StandaloneOptions;
@@ -293,20 +293,19 @@ impl StartCommand {
                    ),
                }.fail();
            }
-            opts.grpc.bind_addr.clone_from(addr);
-            opts.grpc.tls = merge_tls_option(&opts.grpc.tls, tls_opts.clone());
+            opts.grpc.bind_addr.clone_from(addr)
        }

        if let Some(addr) = &self.mysql_addr {
            opts.mysql.enable = true;
            opts.mysql.addr.clone_from(addr);
-            opts.mysql.tls = merge_tls_option(&opts.mysql.tls, tls_opts.clone());
+            opts.mysql.tls = tls_opts.clone();
        }

        if let Some(addr) = &self.postgres_addr {
            opts.postgres.enable = true;
            opts.postgres.addr.clone_from(addr);
-            opts.postgres.tls = merge_tls_option(&opts.postgres.tls, tls_opts.clone());
+            opts.postgres.tls = tls_opts;
        }

        if self.influxdb_enable {
@@ -552,8 +551,9 @@ impl StartCommand {
        let grpc_handler = fe_instance.clone() as Arc<dyn GrpcQueryHandlerWithBoxedError>;
        let weak_grpc_handler = Arc::downgrade(&grpc_handler);
        frontend_instance_handler
-            .set_handler(weak_grpc_handler)
-            .await;
+            .lock()
+            .unwrap()
+            .replace(weak_grpc_handler);

        // set the frontend invoker for flownode
        let flow_streaming_engine = flownode.flow_engine().streaming_engine();
@@ -765,6 +765,7 @@ mod tests {
            user_provider: Some("static_user_provider:cmd:test=test".to_string()),
            mysql_addr: Some("127.0.0.1:4002".to_string()),
            postgres_addr: Some("127.0.0.1:4003".to_string()),
+            tls_watch: true,
            ..Default::default()
        };

@@ -781,6 +782,8 @@ mod tests {

        assert_eq!("./greptimedb_data/test/logs", opts.logging.dir);
        assert_eq!("debug", opts.logging.level.unwrap());
+        assert!(opts.mysql.tls.watch);
+        assert!(opts.postgres.tls.watch);
    }

    #[test]
--- a/src/common/config/src/error.rs
+++ b/src/common/config/src/error.rs
@@ -59,6 +59,15 @@ pub enum Error {
        location: Location,
    },

+    #[snafu(display("Failed to canonicalize path: {}", path))]
+    CanonicalizePath {
+        path: String,
+        #[snafu(source)]
+        error: std::io::Error,
+        #[snafu(implicit)]
+        location: Location,
+    },
+
    #[snafu(display("Invalid path '{}': expected a file, not a directory", path))]
    InvalidPath {
        path: String,
@@ -73,7 +82,8 @@ impl ErrorExt for Error {
            Error::TomlFormat { .. }
            | Error::LoadLayeredConfig { .. }
            | Error::FileWatch { .. }
-            | Error::InvalidPath { .. } => StatusCode::InvalidArguments,
+            | Error::InvalidPath { .. }
+            | Error::CanonicalizePath { .. } => StatusCode::InvalidArguments,
            Error::SerdeJson { .. } => StatusCode::Unexpected,
        }
    }
--- a/src/common/config/src/file_watcher.rs
+++ b/src/common/config/src/file_watcher.rs
@@ -30,7 +30,7 @@ use common_telemetry::{error, info, warn};
 use notify::{EventKind, RecursiveMode, Watcher};
 use snafu::ResultExt;

-use crate::error::{FileWatchSnafu, InvalidPathSnafu, Result};
+use crate::error::{CanonicalizePathSnafu, FileWatchSnafu, InvalidPathSnafu, Result};

 /// Configuration for the file watcher behavior.
 #[derive(Debug, Clone, Default)]
@@ -41,10 +41,15 @@ pub struct FileWatcherConfig {

 impl FileWatcherConfig {
    pub fn new() -> Self {
-        Default::default()
+        Self::default()
    }

-    pub fn include_remove_events(mut self) -> Self {
+    pub fn with_modify_and_create(mut self) -> Self {
+        self.include_remove_events = false;
+        self
+    }
+
+    pub fn with_remove_events(mut self) -> Self {
        self.include_remove_events = true;
        self
    }
@@ -88,8 +93,11 @@ impl FileWatcherBuilder {
                path: path.display().to_string(),
            }
        );
-
-        self.file_paths.push(path.to_path_buf());
+        // Canonicalize the path for reliable comparison with event paths
+        let canonical = path.canonicalize().context(CanonicalizePathSnafu {
+            path: path.display().to_string(),
+        })?;
+        self.file_paths.push(canonical);
        Ok(self)
    }

@@ -136,6 +144,7 @@ impl FileWatcherBuilder {
        }

        let config = self.config;
+        let watched_files: HashSet<PathBuf> = self.file_paths.iter().cloned().collect();

        info!(
            "Spawning file watcher for paths: {:?} (watching parent directories)",
@@ -156,7 +165,25 @@ impl FileWatcherBuilder {
                            continue;
                        }

-                        info!(?event.kind, ?event.paths, "Detected folder change");
+                        // Check if any of the event paths match our watched files
+                        let is_watched_file = event.paths.iter().any(|event_path| {
+                            // Try to canonicalize the event path for comparison
+                            // If the file was deleted, canonicalize will fail, so we also
+                            // compare the raw path
+                            if let Ok(canonical) = event_path.canonicalize()
+                                && watched_files.contains(&canonical)
+                            {
+                                return true;
+                            }
+                            // For deleted files, compare using the raw path
+                            watched_files.contains(event_path)
+                        });
+
+                        if !is_watched_file {
+                            continue;
+                        }
+
+                        info!(?event.kind, ?event.paths, "Detected file change");
                        callback();
                    }
                    Err(err) => {
@@ -274,4 +301,55 @@ mod tests {
            "Watcher should have detected file recreation"
        );
    }
+
+    #[test]
+    fn test_file_watcher_ignores_other_files() {
+        common_telemetry::init_default_ut_logging();
+
+        let dir = create_temp_dir("test_file_watcher_other");
+        let watched_file = dir.path().join("watched.txt");
+        let other_file = dir.path().join("other.txt");
+
+        // Create both files
+        std::fs::write(&watched_file, "watched content").unwrap();
+        std::fs::write(&other_file, "other content").unwrap();
+
+        let counter = Arc::new(AtomicUsize::new(0));
+        let counter_clone = counter.clone();
+
+        FileWatcherBuilder::new()
+            .watch_path(&watched_file)
+            .unwrap()
+            .config(FileWatcherConfig::new())
+            .spawn(move || {
+                counter_clone.fetch_add(1, Ordering::SeqCst);
+            })
+            .unwrap();
+
+        // Give watcher time to start
+        std::thread::sleep(Duration::from_millis(100));
+
+        // Modify the other file - should NOT trigger callback
+        std::fs::write(&other_file, "modified other content").unwrap();
+
+        // Wait for potential event
+        std::thread::sleep(Duration::from_millis(500));
+
+        assert_eq!(
+            counter.load(Ordering::SeqCst),
+            0,
+            "Watcher should not have detected changes to other files"
+        );
+
+        // Now modify the watched file - SHOULD trigger callback
+        std::fs::write(&watched_file, "modified watched content").unwrap();
+
+        // Wait for the event to be processed
+        std::thread::sleep(Duration::from_millis(500));
+
+        assert!(
+            counter.load(Ordering::SeqCst) >= 1,
+            "Watcher should have detected change to watched file"
+        );
+    }
 }
--- a/src/common/datasource/src/object_store/s3.rs
+++ b/src/common/datasource/src/object_store/s3.rs
@@ -27,7 +27,6 @@ const SECRET_ACCESS_KEY: &str = "secret_access_key";
 const SESSION_TOKEN: &str = "session_token";
 const REGION: &str = "region";
 const ENABLE_VIRTUAL_HOST_STYLE: &str = "enable_virtual_host_style";
-const DISABLE_EC2_METADATA: &str = "disable_ec2_metadata";

 pub fn is_supported_in_s3(key: &str) -> bool {
    [
@@ -37,7 +36,6 @@ pub fn is_supported_in_s3(key: &str) -> bool {
        SESSION_TOKEN,
        REGION,
        ENABLE_VIRTUAL_HOST_STYLE,
-        DISABLE_EC2_METADATA,
    ]
    .contains(&key)
 }
@@ -84,21 +82,6 @@ pub fn build_s3_backend(
        }
    }

-    if let Some(disable_str) = connection.get(DISABLE_EC2_METADATA) {
-        let disable = disable_str.as_str().parse::<bool>().map_err(|e| {
-            error::InvalidConnectionSnafu {
-                msg: format!(
-                    "failed to parse the option {}={}, {}",
-                    DISABLE_EC2_METADATA, disable_str, e
-                ),
-            }
-            .build()
-        })?;
-        if disable {
-            builder = builder.disable_ec2_metadata();
-        }
-    }
-
    // TODO(weny): Consider finding a better way to eliminate duplicate code.
    Ok(ObjectStore::new(builder)
        .context(error::BuildBackendSnafu)?
@@ -126,7 +109,6 @@ mod tests {
        assert!(is_supported_in_s3(SESSION_TOKEN));
        assert!(is_supported_in_s3(REGION));
        assert!(is_supported_in_s3(ENABLE_VIRTUAL_HOST_STYLE));
-        assert!(is_supported_in_s3(DISABLE_EC2_METADATA));
        assert!(!is_supported_in_s3("foo"))
    }
 }
--- a/src/common/function/Cargo.toml
+++ b/src/common/function/Cargo.toml
@@ -19,7 +19,7 @@ arc-swap = "1.0"
 arrow.workspace = true
 arrow-schema.workspace = true
 async-trait.workspace = true
-bincode = "=1.3.3"
+bincode = "1.3"
 catalog.workspace = true
 chrono.workspace = true
 common-base.workspace = true
--- a/src/common/memory-manager/Cargo.toml
+++ b/src/common/memory-manager/Cargo.toml
@@ -1,20 +0,0 @@
-[package]
-name = "common-memory-manager"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[lints]
-workspace = true
-
-[dependencies]
-common-error = { workspace = true }
-common-macro = { workspace = true }
-common-telemetry = { workspace = true }
-humantime = { workspace = true }
-serde = { workspace = true }
-snafu = { workspace = true }
-tokio = { workspace = true, features = ["sync"] }
-
-[dev-dependencies]
-tokio = { workspace = true, features = ["rt", "macros"] }
--- a/src/common/memory-manager/src/error.rs
+++ b/src/common/memory-manager/src/error.rs
@@ -1,63 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::any::Any;
-use std::time::Duration;
-
-use common_error::ext::ErrorExt;
-use common_error::status_code::StatusCode;
-use common_macro::stack_trace_debug;
-use snafu::Snafu;
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-#[derive(Snafu)]
-#[snafu(visibility(pub))]
-#[stack_trace_debug]
-pub enum Error {
-    #[snafu(display(
-        "Memory limit exceeded: requested {requested_bytes} bytes, limit {limit_bytes} bytes"
-    ))]
-    MemoryLimitExceeded {
-        requested_bytes: u64,
-        limit_bytes: u64,
-    },
-
-    #[snafu(display("Memory semaphore unexpectedly closed"))]
-    MemorySemaphoreClosed,
-
-    #[snafu(display(
-        "Timeout waiting for memory quota: requested {requested_bytes} bytes, waited {waited:?}"
-    ))]
-    MemoryAcquireTimeout {
-        requested_bytes: u64,
-        waited: Duration,
-    },
-}
-
-impl ErrorExt for Error {
-    fn status_code(&self) -> StatusCode {
-        use Error::*;
-
-        match self {
-            MemoryLimitExceeded { .. } => StatusCode::RuntimeResourcesExhausted,
-            MemorySemaphoreClosed => StatusCode::Unexpected,
-            MemoryAcquireTimeout { .. } => StatusCode::RuntimeResourcesExhausted,
-        }
-    }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-}
--- a/src/common/memory-manager/src/granularity.rs
+++ b/src/common/memory-manager/src/granularity.rs
@@ -1,168 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::fmt;
-
-/// Memory permit granularity for different use cases.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub enum PermitGranularity {
-    /// 1 KB per permit
-    ///
-    /// Use for:
-    /// - HTTP/gRPC request limiting (small, high-concurrency operations)
-    /// - Small batch operations
-    /// - Scenarios requiring fine-grained fairness
-    Kilobyte,
-
-    /// 1 MB per permit (default)
-    ///
-    /// Use for:
-    /// - Query execution memory management
-    /// - Compaction memory control
-    /// - Large, long-running operations
-    #[default]
-    Megabyte,
-}
-
-impl PermitGranularity {
-    /// Returns the number of bytes per permit.
-    #[inline]
-    pub const fn bytes(self) -> u64 {
-        match self {
-            Self::Kilobyte => 1024,
-            Self::Megabyte => 1024 * 1024,
-        }
-    }
-
-    /// Returns a human-readable string representation.
-    pub const fn as_str(self) -> &'static str {
-        match self {
-            Self::Kilobyte => "1KB",
-            Self::Megabyte => "1MB",
-        }
-    }
-
-    /// Converts bytes to permits based on this granularity.
-    ///
-    /// Rounds up to ensure the requested bytes are fully covered.
-    /// Clamped to Semaphore::MAX_PERMITS.
-    #[inline]
-    pub fn bytes_to_permits(self, bytes: u64) -> u32 {
-        use tokio::sync::Semaphore;
-
-        let granularity_bytes = self.bytes();
-        bytes
-            .saturating_add(granularity_bytes - 1)
-            .saturating_div(granularity_bytes)
-            .min(Semaphore::MAX_PERMITS as u64)
-            .min(u32::MAX as u64) as u32
-    }
-
-    /// Converts permits to bytes based on this granularity.
-    #[inline]
-    pub fn permits_to_bytes(self, permits: u32) -> u64 {
-        (permits as u64).saturating_mul(self.bytes())
-    }
-}
-
-impl fmt::Display for PermitGranularity {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.as_str())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_bytes_to_permits_kilobyte() {
-        let granularity = PermitGranularity::Kilobyte;
-
-        // Exact multiples
-        assert_eq!(granularity.bytes_to_permits(1024), 1);
-        assert_eq!(granularity.bytes_to_permits(2048), 2);
-        assert_eq!(granularity.bytes_to_permits(10 * 1024), 10);
-
-        // Rounds up
-        assert_eq!(granularity.bytes_to_permits(1), 1);
-        assert_eq!(granularity.bytes_to_permits(1025), 2);
-        assert_eq!(granularity.bytes_to_permits(2047), 2);
-    }
-
-    #[test]
-    fn test_bytes_to_permits_megabyte() {
-        let granularity = PermitGranularity::Megabyte;
-
-        // Exact multiples
-        assert_eq!(granularity.bytes_to_permits(1024 * 1024), 1);
-        assert_eq!(granularity.bytes_to_permits(2 * 1024 * 1024), 2);
-
-        // Rounds up
-        assert_eq!(granularity.bytes_to_permits(1), 1);
-        assert_eq!(granularity.bytes_to_permits(1024), 1);
-        assert_eq!(granularity.bytes_to_permits(1024 * 1024 + 1), 2);
-    }
-
-    #[test]
-    fn test_bytes_to_permits_zero_bytes() {
-        assert_eq!(PermitGranularity::Kilobyte.bytes_to_permits(0), 0);
-        assert_eq!(PermitGranularity::Megabyte.bytes_to_permits(0), 0);
-    }
-
-    #[test]
-    fn test_bytes_to_permits_clamps_to_maximum() {
-        use tokio::sync::Semaphore;
-
-        let max_permits = (Semaphore::MAX_PERMITS as u64).min(u32::MAX as u64) as u32;
-
-        assert_eq!(
-            PermitGranularity::Kilobyte.bytes_to_permits(u64::MAX),
-            max_permits
-        );
-        assert_eq!(
-            PermitGranularity::Megabyte.bytes_to_permits(u64::MAX),
-            max_permits
-        );
-    }
-
-    #[test]
-    fn test_permits_to_bytes() {
-        assert_eq!(PermitGranularity::Kilobyte.permits_to_bytes(1), 1024);
-        assert_eq!(PermitGranularity::Kilobyte.permits_to_bytes(10), 10 * 1024);
-
-        assert_eq!(PermitGranularity::Megabyte.permits_to_bytes(1), 1024 * 1024);
-        assert_eq!(
-            PermitGranularity::Megabyte.permits_to_bytes(10),
-            10 * 1024 * 1024
-        );
-    }
-
-    #[test]
-    fn test_round_trip_conversion() {
-        // Kilobyte: bytes -> permits -> bytes (should round up)
-        let kb = PermitGranularity::Kilobyte;
-        let permits = kb.bytes_to_permits(1500);
-        let bytes = kb.permits_to_bytes(permits);
-        assert!(bytes >= 1500); // Must cover original request
-        assert_eq!(bytes, 2048); // 2KB
-
-        // Megabyte: bytes -> permits -> bytes (should round up)
-        let mb = PermitGranularity::Megabyte;
-        let permits = mb.bytes_to_permits(1500);
-        let bytes = mb.permits_to_bytes(permits);
-        assert!(bytes >= 1500);
-        assert_eq!(bytes, 1024 * 1024); // 1MB
-    }
-}
--- a/src/common/memory-manager/src/guard.rs
+++ b/src/common/memory-manager/src/guard.rs
@@ -1,141 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::{fmt, mem};
-
-use common_telemetry::debug;
-use tokio::sync::{OwnedSemaphorePermit, TryAcquireError};
-
-use crate::manager::{MemoryMetrics, MemoryQuota};
-
-/// Guard representing a slice of reserved memory.
-pub struct MemoryGuard<M: MemoryMetrics> {
-    pub(crate) state: GuardState<M>,
-}
-
-pub(crate) enum GuardState<M: MemoryMetrics> {
-    Unlimited,
-    Limited {
-        permit: OwnedSemaphorePermit,
-        quota: MemoryQuota<M>,
-    },
-}
-
-impl<M: MemoryMetrics> MemoryGuard<M> {
-    pub(crate) fn unlimited() -> Self {
-        Self {
-            state: GuardState::Unlimited,
-        }
-    }
-
-    pub(crate) fn limited(permit: OwnedSemaphorePermit, quota: MemoryQuota<M>) -> Self {
-        Self {
-            state: GuardState::Limited { permit, quota },
-        }
-    }
-
-    /// Returns granted quota in bytes.
-    pub fn granted_bytes(&self) -> u64 {
-        match &self.state {
-            GuardState::Unlimited => 0,
-            GuardState::Limited { permit, quota } => {
-                quota.permits_to_bytes(permit.num_permits() as u32)
-            }
-        }
-    }
-
-    /// Tries to allocate additional memory during task execution.
-    ///
-    /// On success, merges the new memory into this guard and returns true.
-    /// On failure, returns false and leaves this guard unchanged.
-    pub fn request_additional(&mut self, bytes: u64) -> bool {
-        match &mut self.state {
-            GuardState::Unlimited => true,
-            GuardState::Limited { permit, quota } => {
-                if bytes == 0 {
-                    return true;
-                }
-
-                let additional_permits = quota.bytes_to_permits(bytes);
-
-                match quota
-                    .semaphore
-                    .clone()
-                    .try_acquire_many_owned(additional_permits)
-                {
-                    Ok(additional_permit) => {
-                        permit.merge(additional_permit);
-                        quota.update_in_use_metric();
-                        debug!("Allocated additional {} bytes", bytes);
-                        true
-                    }
-                    Err(TryAcquireError::NoPermits) | Err(TryAcquireError::Closed) => {
-                        quota.metrics.inc_rejected("request_additional");
-                        false
-                    }
-                }
-            }
-        }
-    }
-
-    /// Releases a portion of granted memory back to the pool early,
-    /// before the guard is dropped.
-    ///
-    /// Returns true if the release succeeds or is a no-op; false if the request exceeds granted.
-    pub fn early_release_partial(&mut self, bytes: u64) -> bool {
-        match &mut self.state {
-            GuardState::Unlimited => true,
-            GuardState::Limited { permit, quota } => {
-                if bytes == 0 {
-                    return true;
-                }
-
-                let release_permits = quota.bytes_to_permits(bytes);
-
-                match permit.split(release_permits as usize) {
-                    Some(released_permit) => {
-                        let released_bytes =
-                            quota.permits_to_bytes(released_permit.num_permits() as u32);
-                        drop(released_permit);
-                        quota.update_in_use_metric();
-                        debug!("Early released {} bytes from memory guard", released_bytes);
-                        true
-                    }
-                    None => false,
-                }
-            }
-        }
-    }
-}
-
-impl<M: MemoryMetrics> Drop for MemoryGuard<M> {
-    fn drop(&mut self) {
-        if let GuardState::Limited { permit, quota } =
-            mem::replace(&mut self.state, GuardState::Unlimited)
-        {
-            let bytes = quota.permits_to_bytes(permit.num_permits() as u32);
-            drop(permit);
-            quota.update_in_use_metric();
-            debug!("Released memory: {} bytes", bytes);
-        }
-    }
-}
-
-impl<M: MemoryMetrics> fmt::Debug for MemoryGuard<M> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("MemoryGuard")
-            .field("granted_bytes", &self.granted_bytes())
-            .finish()
-    }
-}
--- a/src/common/memory-manager/src/lib.rs
+++ b/src/common/memory-manager/src/lib.rs
@@ -1,49 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Generic memory management for resource-constrained operations.
-//!
-//! This crate provides a reusable memory quota system based on semaphores,
-//! allowing different subsystems (compaction, flush, index build, etc.) to
-//! share the same allocation logic while using their own metrics.
-
-mod error;
-mod granularity;
-mod guard;
-mod manager;
-mod policy;
-
-#[cfg(test)]
-mod tests;
-
-pub use error::{Error, Result};
-pub use granularity::PermitGranularity;
-pub use guard::MemoryGuard;
-pub use manager::{MemoryManager, MemoryMetrics};
-pub use policy::{DEFAULT_MEMORY_WAIT_TIMEOUT, OnExhaustedPolicy};
-
-/// No-op metrics implementation for testing.
-#[derive(Clone, Copy, Debug, Default)]
-pub struct NoOpMetrics;
-
-impl MemoryMetrics for NoOpMetrics {
-    #[inline(always)]
-    fn set_limit(&self, _: i64) {}
-
-    #[inline(always)]
-    fn set_in_use(&self, _: i64) {}
-
-    #[inline(always)]
-    fn inc_rejected(&self, _: &str) {}
-}
--- a/src/common/memory-manager/src/manager.rs
+++ b/src/common/memory-manager/src/manager.rs
@@ -1,216 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::sync::Arc;
-
-use snafu::ensure;
-use tokio::sync::{Semaphore, TryAcquireError};
-
-use crate::error::{
-    MemoryAcquireTimeoutSnafu, MemoryLimitExceededSnafu, MemorySemaphoreClosedSnafu, Result,
-};
-use crate::granularity::PermitGranularity;
-use crate::guard::MemoryGuard;
-use crate::policy::OnExhaustedPolicy;
-
-/// Trait for recording memory usage metrics.
-pub trait MemoryMetrics: Clone + Send + Sync + 'static {
-    fn set_limit(&self, bytes: i64);
-    fn set_in_use(&self, bytes: i64);
-    fn inc_rejected(&self, reason: &str);
-}
-
-/// Generic memory manager for quota-controlled operations.
-#[derive(Clone)]
-pub struct MemoryManager<M: MemoryMetrics> {
-    quota: Option<MemoryQuota<M>>,
-}
-
-#[derive(Clone)]
-pub(crate) struct MemoryQuota<M: MemoryMetrics> {
-    pub(crate) semaphore: Arc<Semaphore>,
-    pub(crate) limit_permits: u32,
-    pub(crate) granularity: PermitGranularity,
-    pub(crate) metrics: M,
-}
-
-impl<M: MemoryMetrics> MemoryManager<M> {
-    /// Creates a new memory manager with the given limit in bytes.
-    /// `limit_bytes = 0` disables the limit.
-    pub fn new(limit_bytes: u64, metrics: M) -> Self {
-        Self::with_granularity(limit_bytes, PermitGranularity::default(), metrics)
-    }
-
-    /// Creates a new memory manager with specified granularity.
-    pub fn with_granularity(limit_bytes: u64, granularity: PermitGranularity, metrics: M) -> Self {
-        if limit_bytes == 0 {
-            metrics.set_limit(0);
-            return Self { quota: None };
-        }
-
-        let limit_permits = granularity.bytes_to_permits(limit_bytes);
-        let limit_aligned_bytes = granularity.permits_to_bytes(limit_permits);
-        metrics.set_limit(limit_aligned_bytes as i64);
-
-        Self {
-            quota: Some(MemoryQuota {
-                semaphore: Arc::new(Semaphore::new(limit_permits as usize)),
-                limit_permits,
-                granularity,
-                metrics,
-            }),
-        }
-    }
-
-    /// Returns the configured limit in bytes (0 if unlimited).
-    pub fn limit_bytes(&self) -> u64 {
-        self.quota
-            .as_ref()
-            .map(|quota| quota.permits_to_bytes(quota.limit_permits))
-            .unwrap_or(0)
-    }
-
-    /// Returns currently used bytes.
-    pub fn used_bytes(&self) -> u64 {
-        self.quota
-            .as_ref()
-            .map(|quota| quota.permits_to_bytes(quota.used_permits()))
-            .unwrap_or(0)
-    }
-
-    /// Returns available bytes.
-    pub fn available_bytes(&self) -> u64 {
-        self.quota
-            .as_ref()
-            .map(|quota| quota.permits_to_bytes(quota.available_permits_clamped()))
-            .unwrap_or(0)
-    }
-
-    /// Acquires memory, waiting if necessary until enough is available.
-    ///
-    /// # Errors
-    /// - Returns error if requested bytes exceed the total limit
-    /// - Returns error if the semaphore is unexpectedly closed
-    pub async fn acquire(&self, bytes: u64) -> Result<MemoryGuard<M>> {
-        match &self.quota {
-            None => Ok(MemoryGuard::unlimited()),
-            Some(quota) => {
-                let permits = quota.bytes_to_permits(bytes);
-
-                ensure!(
-                    permits <= quota.limit_permits,
-                    MemoryLimitExceededSnafu {
-                        requested_bytes: bytes,
-                        limit_bytes: self.limit_bytes()
-                    }
-                );
-
-                let permit = quota
-                    .semaphore
-                    .clone()
-                    .acquire_many_owned(permits)
-                    .await
-                    .map_err(|_| MemorySemaphoreClosedSnafu.build())?;
-                quota.update_in_use_metric();
-                Ok(MemoryGuard::limited(permit, quota.clone()))
-            }
-        }
-    }
-
-    /// Tries to acquire memory. Returns Some(guard) on success, None if insufficient.
-    pub fn try_acquire(&self, bytes: u64) -> Option<MemoryGuard<M>> {
-        match &self.quota {
-            None => Some(MemoryGuard::unlimited()),
-            Some(quota) => {
-                let permits = quota.bytes_to_permits(bytes);
-
-                match quota.semaphore.clone().try_acquire_many_owned(permits) {
-                    Ok(permit) => {
-                        quota.update_in_use_metric();
-                        Some(MemoryGuard::limited(permit, quota.clone()))
-                    }
-                    Err(TryAcquireError::NoPermits) | Err(TryAcquireError::Closed) => {
-                        quota.metrics.inc_rejected("try_acquire");
-                        None
-                    }
-                }
-            }
-        }
-    }
-
-    /// Acquires memory based on the given policy.
-    ///
-    /// - For `OnExhaustedPolicy::Wait`: Waits up to the timeout duration for memory to become available
-    /// - For `OnExhaustedPolicy::Fail`: Returns immediately if memory is not available
-    ///
-    /// # Errors
-    /// - `MemoryLimitExceeded`: Requested bytes exceed the total limit (both policies), or memory is currently exhausted (Fail policy only)
-    /// - `MemoryAcquireTimeout`: Timeout elapsed while waiting for memory (Wait policy only)
-    /// - `MemorySemaphoreClosed`: The internal semaphore is unexpectedly closed (rare, indicates system issue)
-    pub async fn acquire_with_policy(
-        &self,
-        bytes: u64,
-        policy: OnExhaustedPolicy,
-    ) -> Result<MemoryGuard<M>> {
-        match policy {
-            OnExhaustedPolicy::Wait { timeout } => {
-                match tokio::time::timeout(timeout, self.acquire(bytes)).await {
-                    Ok(Ok(guard)) => Ok(guard),
-                    Ok(Err(e)) => Err(e),
-                    Err(_elapsed) => {
-                        // Timeout elapsed while waiting
-                        MemoryAcquireTimeoutSnafu {
-                            requested_bytes: bytes,
-                            waited: timeout,
-                        }
-                        .fail()
-                    }
-                }
-            }
-            OnExhaustedPolicy::Fail => self.try_acquire(bytes).ok_or_else(|| {
-                MemoryLimitExceededSnafu {
-                    requested_bytes: bytes,
-                    limit_bytes: self.limit_bytes(),
-                }
-                .build()
-            }),
-        }
-    }
-}
-
-impl<M: MemoryMetrics> MemoryQuota<M> {
-    pub(crate) fn bytes_to_permits(&self, bytes: u64) -> u32 {
-        self.granularity.bytes_to_permits(bytes)
-    }
-
-    pub(crate) fn permits_to_bytes(&self, permits: u32) -> u64 {
-        self.granularity.permits_to_bytes(permits)
-    }
-
-    pub(crate) fn used_permits(&self) -> u32 {
-        self.limit_permits
-            .saturating_sub(self.available_permits_clamped())
-    }
-
-    pub(crate) fn available_permits_clamped(&self) -> u32 {
-        self.semaphore
-            .available_permits()
-            .min(self.limit_permits as usize) as u32
-    }
-
-    pub(crate) fn update_in_use_metric(&self) {
-        let bytes = self.permits_to_bytes(self.used_permits());
-        self.metrics.set_in_use(bytes as i64);
-    }
-}
--- a/src/common/memory-manager/src/policy.rs
+++ b/src/common/memory-manager/src/policy.rs
@@ -1,83 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::time::Duration;
-
-use humantime::{format_duration, parse_duration};
-use serde::{Deserialize, Serialize};
-
-/// Default wait timeout for memory acquisition.
-pub const DEFAULT_MEMORY_WAIT_TIMEOUT: Duration = Duration::from_secs(10);
-
-/// Defines how to react when memory cannot be acquired immediately.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum OnExhaustedPolicy {
-    /// Wait until enough memory is released, bounded by timeout.
-    Wait { timeout: Duration },
-
-    /// Fail immediately if memory is not available.
-    Fail,
-}
-
-impl Default for OnExhaustedPolicy {
-    fn default() -> Self {
-        OnExhaustedPolicy::Wait {
-            timeout: DEFAULT_MEMORY_WAIT_TIMEOUT,
-        }
-    }
-}
-
-impl Serialize for OnExhaustedPolicy {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        let text = match self {
-            OnExhaustedPolicy::Fail => "fail".to_string(),
-            OnExhaustedPolicy::Wait { timeout } if *timeout == DEFAULT_MEMORY_WAIT_TIMEOUT => {
-                "wait".to_string()
-            }
-            OnExhaustedPolicy::Wait { timeout } => format!("wait({})", format_duration(*timeout)),
-        };
-        serializer.serialize_str(&text)
-    }
-}
-
-impl<'de> Deserialize<'de> for OnExhaustedPolicy {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let raw = String::deserialize(deserializer)?;
-        let lower = raw.to_ascii_lowercase();
-
-        // Accept both "skip" (legacy) and "fail".
-        if lower == "skip" || lower == "fail" {
-            return Ok(OnExhaustedPolicy::Fail);
-        }
-        if lower == "wait" {
-            return Ok(OnExhaustedPolicy::default());
-        }
-        if lower.starts_with("wait(") && lower.ends_with(')') {
-            let inner = &raw[5..raw.len() - 1];
-            let timeout = parse_duration(inner).map_err(serde::de::Error::custom)?;
-            return Ok(OnExhaustedPolicy::Wait { timeout });
-        }
-
-        Err(serde::de::Error::custom(format!(
-            "invalid memory policy: {}, expected wait, wait(<duration>), fail",
-            raw
-        )))
-    }
-}
--- a/src/common/memory-manager/src/tests.rs
+++ b/src/common/memory-manager/src/tests.rs
@@ -1,250 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use tokio::time::{Duration, sleep};
-
-use crate::{MemoryManager, NoOpMetrics, PermitGranularity};
-
-// Helper constant for tests - use default Megabyte granularity
-const PERMIT_GRANULARITY_BYTES: u64 = PermitGranularity::Megabyte.bytes();
-
-#[test]
-fn test_try_acquire_unlimited() {
-    let manager = MemoryManager::new(0, NoOpMetrics);
-    let guard = manager.try_acquire(10 * PERMIT_GRANULARITY_BYTES).unwrap();
-    assert_eq!(manager.limit_bytes(), 0);
-    assert_eq!(guard.granted_bytes(), 0);
-}
-
-#[test]
-fn test_try_acquire_limited_success_and_release() {
-    let bytes = 2 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(bytes, NoOpMetrics);
-    {
-        let guard = manager.try_acquire(PERMIT_GRANULARITY_BYTES).unwrap();
-        assert_eq!(guard.granted_bytes(), PERMIT_GRANULARITY_BYTES);
-        assert_eq!(manager.used_bytes(), PERMIT_GRANULARITY_BYTES);
-        drop(guard);
-    }
-    assert_eq!(manager.used_bytes(), 0);
-}
-
-#[test]
-fn test_try_acquire_exceeds_limit() {
-    let limit = PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-    let result = manager.try_acquire(limit + PERMIT_GRANULARITY_BYTES);
-    assert!(result.is_none());
-}
-
-#[tokio::test(flavor = "current_thread")]
-async fn test_acquire_blocks_and_unblocks() {
-    let bytes = 2 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(bytes, NoOpMetrics);
-    let guard = manager.try_acquire(bytes).unwrap();
-
-    // Spawn a task that will block on acquire()
-    let waiter = {
-        let manager = manager.clone();
-        tokio::spawn(async move {
-            // This will block until memory is available
-            let _guard = manager.acquire(bytes).await.unwrap();
-        })
-    };
-
-    sleep(Duration::from_millis(10)).await;
-    // Release memory - this should unblock the waiter
-    drop(guard);
-
-    // Waiter should complete now
-    waiter.await.unwrap();
-}
-
-#[test]
-fn test_request_additional_success() {
-    let limit = 10 * PERMIT_GRANULARITY_BYTES; // 10MB limit
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    // Acquire base quota (5MB)
-    let base = 5 * PERMIT_GRANULARITY_BYTES;
-    let mut guard = manager.try_acquire(base).unwrap();
-    assert_eq!(guard.granted_bytes(), base);
-    assert_eq!(manager.used_bytes(), base);
-
-    // Request additional memory (3MB) - should succeed and merge
-    assert!(guard.request_additional(3 * PERMIT_GRANULARITY_BYTES));
-    assert_eq!(guard.granted_bytes(), 8 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(manager.used_bytes(), 8 * PERMIT_GRANULARITY_BYTES);
-}
-
-#[test]
-fn test_request_additional_exceeds_limit() {
-    let limit = 10 * PERMIT_GRANULARITY_BYTES; // 10MB limit
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    // Acquire base quota (5MB)
-    let base = 5 * PERMIT_GRANULARITY_BYTES;
-    let mut guard = manager.try_acquire(base).unwrap();
-
-    // Request additional memory (3MB) - should succeed
-    assert!(guard.request_additional(3 * PERMIT_GRANULARITY_BYTES));
-    assert_eq!(manager.used_bytes(), 8 * PERMIT_GRANULARITY_BYTES);
-
-    // Request more (3MB) - should fail (would exceed 10MB limit)
-    let result = guard.request_additional(3 * PERMIT_GRANULARITY_BYTES);
-    assert!(!result);
-
-    // Still at 8MB
-    assert_eq!(manager.used_bytes(), 8 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(guard.granted_bytes(), 8 * PERMIT_GRANULARITY_BYTES);
-}
-
-#[test]
-fn test_request_additional_auto_release_on_guard_drop() {
-    let limit = 10 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    {
-        let mut guard = manager.try_acquire(5 * PERMIT_GRANULARITY_BYTES).unwrap();
-
-        // Request additional - memory is merged into guard
-        assert!(guard.request_additional(3 * PERMIT_GRANULARITY_BYTES));
-        assert_eq!(manager.used_bytes(), 8 * PERMIT_GRANULARITY_BYTES);
-
-        // When guard drops, all memory (base + additional) is released together
-    }
-
-    // After scope, all memory should be released
-    assert_eq!(manager.used_bytes(), 0);
-}
-
-#[test]
-fn test_request_additional_unlimited() {
-    let manager = MemoryManager::new(0, NoOpMetrics); // Unlimited
-    let mut guard = manager.try_acquire(5 * PERMIT_GRANULARITY_BYTES).unwrap();
-
-    // Should always succeed with unlimited manager
-    assert!(guard.request_additional(100 * PERMIT_GRANULARITY_BYTES));
-    assert_eq!(guard.granted_bytes(), 0);
-    assert_eq!(manager.used_bytes(), 0);
-}
-
-#[test]
-fn test_request_additional_zero_bytes() {
-    let limit = 10 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    let mut guard = manager.try_acquire(5 * PERMIT_GRANULARITY_BYTES).unwrap();
-
-    // Request 0 bytes should succeed without affecting anything
-    assert!(guard.request_additional(0));
-    assert_eq!(guard.granted_bytes(), 5 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(manager.used_bytes(), 5 * PERMIT_GRANULARITY_BYTES);
-}
-
-#[test]
-fn test_early_release_partial_success() {
-    let limit = 10 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    let mut guard = manager.try_acquire(8 * PERMIT_GRANULARITY_BYTES).unwrap();
-    assert_eq!(manager.used_bytes(), 8 * PERMIT_GRANULARITY_BYTES);
-
-    // Release half
-    assert!(guard.early_release_partial(4 * PERMIT_GRANULARITY_BYTES));
-    assert_eq!(guard.granted_bytes(), 4 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(manager.used_bytes(), 4 * PERMIT_GRANULARITY_BYTES);
-
-    // Released memory should be available to others
-    let _guard2 = manager.try_acquire(4 * PERMIT_GRANULARITY_BYTES).unwrap();
-    assert_eq!(manager.used_bytes(), 8 * PERMIT_GRANULARITY_BYTES);
-}
-
-#[test]
-fn test_early_release_partial_exceeds_granted() {
-    let manager = MemoryManager::new(10 * PERMIT_GRANULARITY_BYTES, NoOpMetrics);
-    let mut guard = manager.try_acquire(5 * PERMIT_GRANULARITY_BYTES).unwrap();
-
-    // Try to release more than granted - should fail
-    assert!(!guard.early_release_partial(10 * PERMIT_GRANULARITY_BYTES));
-    assert_eq!(guard.granted_bytes(), 5 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(manager.used_bytes(), 5 * PERMIT_GRANULARITY_BYTES);
-}
-
-#[test]
-fn test_early_release_partial_unlimited() {
-    let manager = MemoryManager::new(0, NoOpMetrics);
-    let mut guard = manager.try_acquire(100 * PERMIT_GRANULARITY_BYTES).unwrap();
-
-    // Unlimited guard - release should succeed (no-op)
-    assert!(guard.early_release_partial(50 * PERMIT_GRANULARITY_BYTES));
-    assert_eq!(guard.granted_bytes(), 0);
-}
-
-#[test]
-fn test_request_and_early_release_symmetry() {
-    let limit = 20 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    let mut guard = manager.try_acquire(5 * PERMIT_GRANULARITY_BYTES).unwrap();
-
-    // Request additional
-    assert!(guard.request_additional(5 * PERMIT_GRANULARITY_BYTES));
-    assert_eq!(guard.granted_bytes(), 10 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(manager.used_bytes(), 10 * PERMIT_GRANULARITY_BYTES);
-
-    // Early release some
-    assert!(guard.early_release_partial(3 * PERMIT_GRANULARITY_BYTES));
-    assert_eq!(guard.granted_bytes(), 7 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(manager.used_bytes(), 7 * PERMIT_GRANULARITY_BYTES);
-
-    // Request again
-    assert!(guard.request_additional(2 * PERMIT_GRANULARITY_BYTES));
-    assert_eq!(guard.granted_bytes(), 9 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(manager.used_bytes(), 9 * PERMIT_GRANULARITY_BYTES);
-
-    // Early release again
-    assert!(guard.early_release_partial(4 * PERMIT_GRANULARITY_BYTES));
-    assert_eq!(guard.granted_bytes(), 5 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(manager.used_bytes(), 5 * PERMIT_GRANULARITY_BYTES);
-
-    drop(guard);
-    assert_eq!(manager.used_bytes(), 0);
-}
-
-#[test]
-fn test_small_allocation_rounds_up() {
-    // Test that allocations smaller than PERMIT_GRANULARITY_BYTES
-    // round up to 1 permit and can use request_additional()
-    let limit = 10 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    let mut guard = manager.try_acquire(512 * 1024).unwrap(); // 512KB
-    assert_eq!(guard.granted_bytes(), PERMIT_GRANULARITY_BYTES); // Rounds up to 1MB
-    assert!(guard.request_additional(2 * PERMIT_GRANULARITY_BYTES)); // Can request more
-    assert_eq!(guard.granted_bytes(), 3 * PERMIT_GRANULARITY_BYTES);
-}
-
-#[test]
-fn test_acquire_zero_bytes_lazy_allocation() {
-    // Test that acquire(0) returns 0 permits but can request_additional() later
-    let manager = MemoryManager::new(10 * PERMIT_GRANULARITY_BYTES, NoOpMetrics);
-
-    let mut guard = manager.try_acquire(0).unwrap();
-    assert_eq!(guard.granted_bytes(), 0); // No permits consumed
-    assert_eq!(manager.used_bytes(), 0);
-
-    assert!(guard.request_additional(3 * PERMIT_GRANULARITY_BYTES)); // Lazy allocation
-    assert_eq!(guard.granted_bytes(), 3 * PERMIT_GRANULARITY_BYTES);
-}
--- a/src/common/meta/src/distributed_time_constants.rs
+++ b/src/common/meta/src/distributed_time_constants.rs
@@ -12,10 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::sync::OnceLock;
 use std::time::Duration;

-pub const BASE_HEARTBEAT_INTERVAL: Duration = Duration::from_secs(3);
+use etcd_client::ConnectOptions;
+
+/// Heartbeat interval time (is the basic unit of various time).
+pub const HEARTBEAT_INTERVAL_MILLIS: u64 = 3000;
+
+/// The frontend will also send heartbeats to Metasrv, sending an empty
+/// heartbeat every HEARTBEAT_INTERVAL_MILLIS * 6 seconds.
+pub const FRONTEND_HEARTBEAT_INTERVAL_MILLIS: u64 = HEARTBEAT_INTERVAL_MILLIS * 6;
+
+/// The lease seconds of a region. It's set by 3 heartbeat intervals
+/// (HEARTBEAT_INTERVAL_MILLIS × 3), plus some extra buffer (1 second).
+pub const REGION_LEASE_SECS: u64 =
+    Duration::from_millis(HEARTBEAT_INTERVAL_MILLIS * 3).as_secs() + 1;
+
+/// When creating table or region failover, a target node needs to be selected.
+/// If the node's lease has expired, the `Selector` will not select it.
+pub const DATANODE_LEASE_SECS: u64 = REGION_LEASE_SECS;
+
+pub const FLOWNODE_LEASE_SECS: u64 = DATANODE_LEASE_SECS;

 /// The lease seconds of metasrv leader.
 pub const META_LEASE_SECS: u64 = 5;
@@ -35,6 +52,14 @@ pub const HEARTBEAT_CHANNEL_KEEP_ALIVE_INTERVAL_SECS: Duration = Duration::from_
 /// The keep-alive timeout of the heartbeat channel.
 pub const HEARTBEAT_CHANNEL_KEEP_ALIVE_TIMEOUT_SECS: Duration = Duration::from_secs(5);

+/// The default options for the etcd client.
+pub fn default_etcd_client_options() -> ConnectOptions {
+    ConnectOptions::new()
+        .with_keep_alive_while_idle(true)
+        .with_keep_alive(Duration::from_secs(15), Duration::from_secs(5))
+        .with_connect_timeout(Duration::from_secs(10))
+}
+
 /// The default mailbox round-trip timeout.
 pub const MAILBOX_RTT_SECS: u64 = 1;

@@ -43,60 +68,3 @@ pub const TOPIC_STATS_REPORT_INTERVAL_SECS: u64 = 15;

 /// The retention seconds of topic stats.
 pub const TOPIC_STATS_RETENTION_SECS: u64 = TOPIC_STATS_REPORT_INTERVAL_SECS * 100;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-/// The distributed time constants.
-pub struct DistributedTimeConstants {
-    pub heartbeat_interval: Duration,
-    pub frontend_heartbeat_interval: Duration,
-    pub region_lease: Duration,
-    pub datanode_lease: Duration,
-    pub flownode_lease: Duration,
-}
-
-/// The frontend heartbeat interval is 6 times of the base heartbeat interval.
-pub fn frontend_heartbeat_interval(base_heartbeat_interval: Duration) -> Duration {
-    base_heartbeat_interval * 6
-}
-
-impl DistributedTimeConstants {
-    /// Create a new DistributedTimeConstants from the heartbeat interval.
-    pub fn from_heartbeat_interval(heartbeat_interval: Duration) -> Self {
-        let region_lease = heartbeat_interval * 3 + Duration::from_secs(1);
-        let datanode_lease = region_lease;
-        let flownode_lease = datanode_lease;
-        Self {
-            heartbeat_interval,
-            frontend_heartbeat_interval: frontend_heartbeat_interval(heartbeat_interval),
-            region_lease,
-            datanode_lease,
-            flownode_lease,
-        }
-    }
-}
-
-impl Default for DistributedTimeConstants {
-    fn default() -> Self {
-        Self::from_heartbeat_interval(BASE_HEARTBEAT_INTERVAL)
-    }
-}
-
-static DEFAULT_DISTRIBUTED_TIME_CONSTANTS: OnceLock<DistributedTimeConstants> = OnceLock::new();
-
-/// Get the default distributed time constants.
-pub fn default_distributed_time_constants() -> &'static DistributedTimeConstants {
-    DEFAULT_DISTRIBUTED_TIME_CONSTANTS.get_or_init(Default::default)
-}
-
-/// Initialize the default distributed time constants.
-pub fn init_distributed_time_constants(base_heartbeat_interval: Duration) {
-    let distributed_time_constants =
-        DistributedTimeConstants::from_heartbeat_interval(base_heartbeat_interval);
-    DEFAULT_DISTRIBUTED_TIME_CONSTANTS
-        .set(distributed_time_constants)
-        .expect("Failed to set default distributed time constants");
-    common_telemetry::info!(
-        "Initialized default distributed time constants: {:#?}",
-        distributed_time_constants
-    );
-}
--- a/src/common/meta/src/wal_options_allocator/topic_creator.rs
+++ b/src/common/meta/src/wal_options_allocator/topic_creator.rs
@@ -14,7 +14,7 @@

 use common_telemetry::{debug, error, info};
 use common_wal::config::kafka::common::{
-    DEFAULT_BACKOFF_CONFIG, KafkaConnectionConfig, KafkaTopicConfig,
+    DEFAULT_BACKOFF_CONFIG, DEFAULT_CONNECT_TIMEOUT, KafkaConnectionConfig, KafkaTopicConfig,
 };
 use rskafka::client::error::Error as RsKafkaError;
 use rskafka::client::error::ProtocolError::TopicAlreadyExists;
@@ -211,8 +211,7 @@ pub async fn build_kafka_client(connection: &KafkaConnectionConfig) -> Result<Cl
    // Builds an kafka controller client for creating topics.
    let mut builder = ClientBuilder::new(connection.broker_endpoints.clone())
        .backoff_config(DEFAULT_BACKOFF_CONFIG)
-        .connect_timeout(Some(connection.connect_timeout))
-        .timeout(Some(connection.timeout));
+        .connect_timeout(Some(DEFAULT_CONNECT_TIMEOUT));
    if let Some(sasl) = &connection.sasl {
        builder = builder.sasl_config(sasl.config.clone().into_sasl_config());
    };
--- a/src/common/sql/Cargo.toml
+++ b/src/common/sql/Cargo.toml
@@ -5,12 +5,10 @@ edition.workspace = true
 license.workspace = true

 [dependencies]
-arrow-schema.workspace = true
 common-base.workspace = true
 common-decimal.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
-common-telemetry.workspace = true
 common-time.workspace = true
 datafusion-sql.workspace = true
 datatypes.workspace = true
--- a/src/common/sql/src/convert.rs
+++ b/src/common/sql/src/convert.rs
@@ -14,12 +14,11 @@

 use std::str::FromStr;

-use arrow_schema::extension::ExtensionType;
 use common_time::Timestamp;
 use common_time::timezone::Timezone;
-use datatypes::extension::json::JsonExtensionType;
+use datatypes::json::JsonStructureSettings;
 use datatypes::prelude::ConcreteDataType;
-use datatypes::schema::{ColumnDefaultConstraint, ColumnSchema};
+use datatypes::schema::ColumnDefaultConstraint;
 use datatypes::types::{JsonFormat, parse_string_to_jsonb, parse_string_to_vector_type_value};
 use datatypes::value::{OrderedF32, OrderedF64, Value};
 use snafu::{OptionExt, ResultExt, ensure};
@@ -125,14 +124,13 @@ pub(crate) fn sql_number_to_value(data_type: &ConcreteDataType, n: &str) -> Resu
 /// If `auto_string_to_numeric` is true, tries to cast the string value to numeric values,
 /// and returns error if the cast fails.
 pub fn sql_value_to_value(
-    column_schema: &ColumnSchema,
+    column_name: &str,
+    data_type: &ConcreteDataType,
    sql_val: &SqlValue,
    timezone: Option<&Timezone>,
    unary_op: Option<UnaryOperator>,
    auto_string_to_numeric: bool,
 ) -> Result<Value> {
-    let column_name = &column_schema.name;
-    let data_type = &column_schema.data_type;
    let mut value = match sql_val {
        SqlValue::Number(n, _) => sql_number_to_value(data_type, n)?,
        SqlValue::Null => Value::Null,
@@ -148,9 +146,13 @@ pub fn sql_value_to_value(

            (*b).into()
        }
-        SqlValue::DoubleQuotedString(s) | SqlValue::SingleQuotedString(s) => {
-            parse_string_to_value(column_schema, s.clone(), timezone, auto_string_to_numeric)?
-        }
+        SqlValue::DoubleQuotedString(s) | SqlValue::SingleQuotedString(s) => parse_string_to_value(
+            column_name,
+            s.clone(),
+            data_type,
+            timezone,
+            auto_string_to_numeric,
+        )?,
        SqlValue::HexStringLiteral(s) => {
            // Should not directly write binary into json column
            ensure!(
@@ -242,12 +244,12 @@ pub fn sql_value_to_value(
 }

 pub(crate) fn parse_string_to_value(
-    column_schema: &ColumnSchema,
+    column_name: &str,
    s: String,
+    data_type: &ConcreteDataType,
    timezone: Option<&Timezone>,
    auto_string_to_numeric: bool,
 ) -> Result<Value> {
-    let data_type = &column_schema.data_type;
    if auto_string_to_numeric && let Some(value) = auto_cast_to_numeric(&s, data_type)? {
        return Ok(value);
    }
@@ -255,7 +257,7 @@ pub(crate) fn parse_string_to_value(
    ensure!(
        data_type.is_stringifiable(),
        ColumnTypeMismatchSnafu {
-            column_name: column_schema.name.clone(),
+            column_name,
            expect: data_type.clone(),
            actual: ConcreteDataType::string_datatype(),
        }
@@ -301,21 +303,23 @@ pub(crate) fn parse_string_to_value(
            }
        }
        ConcreteDataType::Binary(_) => Ok(Value::Binary(s.as_bytes().into())),
-        ConcreteDataType::Json(j) => match &j.format {
-            JsonFormat::Jsonb => {
-                let v = parse_string_to_jsonb(&s).context(DatatypeSnafu)?;
-                Ok(Value::Binary(v.into()))
+        ConcreteDataType::Json(j) => {
+            match &j.format {
+                JsonFormat::Jsonb => {
+                    let v = parse_string_to_jsonb(&s).context(DatatypeSnafu)?;
+                    Ok(Value::Binary(v.into()))
+                }
+                JsonFormat::Native(_inner) => {
+                    // Always use the structured version at this level.
+                    let serde_json_value =
+                        serde_json::from_str(&s).context(DeserializeSnafu { json: s })?;
+                    let json_structure_settings = JsonStructureSettings::Structured(None);
+                    json_structure_settings
+                        .encode(serde_json_value)
+                        .context(DatatypeSnafu)
+                }
            }
-            JsonFormat::Native(_) => {
-                let extension_type: Option<JsonExtensionType> =
-                    column_schema.extension_type().context(DatatypeSnafu)?;
-                let json_structure_settings = extension_type
-                    .and_then(|x| x.metadata().json_structure_settings.clone())
-                    .unwrap_or_default();
-                let v = serde_json::from_str(&s).context(DeserializeSnafu { json: s })?;
-                json_structure_settings.encode(v).context(DatatypeSnafu)
-            }
-        },
+        }
        ConcreteDataType::Vector(d) => {
            let v = parse_string_to_vector_type_value(&s, Some(d.dim)).context(DatatypeSnafu)?;
            Ok(Value::Binary(v.into()))
@@ -413,265 +417,305 @@ mod test {

    use super::*;

-    macro_rules! call_parse_string_to_value {
-        ($column_name: expr, $input: expr, $data_type: expr) => {
-            call_parse_string_to_value!($column_name, $input, $data_type, None)
-        };
-        ($column_name: expr, $input: expr, $data_type: expr, timezone = $timezone: expr) => {
-            call_parse_string_to_value!($column_name, $input, $data_type, Some($timezone))
-        };
-        ($column_name: expr, $input: expr, $data_type: expr, $timezone: expr) => {{
-            let column_schema = ColumnSchema::new($column_name, $data_type, true);
-            parse_string_to_value(&column_schema, $input, $timezone, true)
-        }};
-    }
-
    #[test]
-    fn test_string_to_value_auto_numeric() -> Result<()> {
+    fn test_string_to_value_auto_numeric() {
        // Test string to boolean with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "true".to_string(),
-            ConcreteDataType::boolean_datatype()
-        )?;
+            &ConcreteDataType::boolean_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::Boolean(true), result);

        // Test invalid string to boolean with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_a_boolean".to_string(),
-            ConcreteDataType::boolean_datatype()
+            &ConcreteDataType::boolean_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());

        // Test string to int8
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "42".to_string(),
-            ConcreteDataType::int8_datatype()
-        )?;
+            &ConcreteDataType::int8_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::Int8(42), result);

        // Test invalid string to int8 with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_an_int8".to_string(),
-            ConcreteDataType::int8_datatype()
+            &ConcreteDataType::int8_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());

        // Test string to int16
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "1000".to_string(),
-            ConcreteDataType::int16_datatype()
-        )?;
+            &ConcreteDataType::int16_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::Int16(1000), result);

        // Test invalid string to int16 with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_an_int16".to_string(),
-            ConcreteDataType::int16_datatype()
+            &ConcreteDataType::int16_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());

        // Test string to int32
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "100000".to_string(),
-            ConcreteDataType::int32_datatype()
-        )?;
+            &ConcreteDataType::int32_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::Int32(100000), result);

        // Test invalid string to int32 with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_an_int32".to_string(),
-            ConcreteDataType::int32_datatype()
+            &ConcreteDataType::int32_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());

        // Test string to int64
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "1000000".to_string(),
-            ConcreteDataType::int64_datatype()
-        )?;
+            &ConcreteDataType::int64_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::Int64(1000000), result);

        // Test invalid string to int64 with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_an_int64".to_string(),
-            ConcreteDataType::int64_datatype()
+            &ConcreteDataType::int64_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());

        // Test string to uint8
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "200".to_string(),
-            ConcreteDataType::uint8_datatype()
-        )?;
+            &ConcreteDataType::uint8_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::UInt8(200), result);

        // Test invalid string to uint8 with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_a_uint8".to_string(),
-            ConcreteDataType::uint8_datatype()
+            &ConcreteDataType::uint8_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());

        // Test string to uint16
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "60000".to_string(),
-            ConcreteDataType::uint16_datatype()
-        )?;
+            &ConcreteDataType::uint16_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::UInt16(60000), result);

        // Test invalid string to uint16 with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_a_uint16".to_string(),
-            ConcreteDataType::uint16_datatype()
+            &ConcreteDataType::uint16_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());

        // Test string to uint32
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "4000000000".to_string(),
-            ConcreteDataType::uint32_datatype()
-        )?;
+            &ConcreteDataType::uint32_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::UInt32(4000000000), result);

        // Test invalid string to uint32 with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_a_uint32".to_string(),
-            ConcreteDataType::uint32_datatype()
+            &ConcreteDataType::uint32_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());

        // Test string to uint64
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "18446744073709551615".to_string(),
-            ConcreteDataType::uint64_datatype()
-        )?;
+            &ConcreteDataType::uint64_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::UInt64(18446744073709551615), result);

        // Test invalid string to uint64 with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_a_uint64".to_string(),
-            ConcreteDataType::uint64_datatype()
+            &ConcreteDataType::uint64_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());

        // Test string to float32
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "3.5".to_string(),
-            ConcreteDataType::float32_datatype()
-        )?;
+            &ConcreteDataType::float32_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::Float32(OrderedF32::from(3.5)), result);

        // Test invalid string to float32 with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_a_float32".to_string(),
-            ConcreteDataType::float32_datatype()
+            &ConcreteDataType::float32_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());

        // Test string to float64
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "3.5".to_string(),
-            ConcreteDataType::float64_datatype()
-        )?;
+            &ConcreteDataType::float64_datatype(),
+            None,
+            true,
+        )
+        .unwrap();
        assert_eq!(Value::Float64(OrderedF64::from(3.5)), result);

        // Test invalid string to float64 with auto cast
-        let result = call_parse_string_to_value!(
+        let result = parse_string_to_value(
            "col",
            "not_a_float64".to_string(),
-            ConcreteDataType::float64_datatype()
+            &ConcreteDataType::float64_datatype(),
+            None,
+            true,
        );
        assert!(result.is_err());
-        Ok(())
-    }
-
-    macro_rules! call_sql_value_to_value {
-        ($column_name: expr, $data_type: expr, $sql_value: expr) => {
-            call_sql_value_to_value!($column_name, $data_type, $sql_value, None, None, false)
-        };
-        ($column_name: expr, $data_type: expr, $sql_value: expr, timezone = $timezone: expr) => {
-            call_sql_value_to_value!(
-                $column_name,
-                $data_type,
-                $sql_value,
-                Some($timezone),
-                None,
-                false
-            )
-        };
-        ($column_name: expr, $data_type: expr, $sql_value: expr, unary_op = $unary_op: expr) => {
-            call_sql_value_to_value!(
-                $column_name,
-                $data_type,
-                $sql_value,
-                None,
-                Some($unary_op),
-                false
-            )
-        };
-        ($column_name: expr, $data_type: expr, $sql_value: expr, auto_string_to_numeric) => {
-            call_sql_value_to_value!($column_name, $data_type, $sql_value, None, None, true)
-        };
-        ($column_name: expr, $data_type: expr, $sql_value: expr, $timezone: expr, $unary_op: expr, $auto_string_to_numeric: expr) => {{
-            let column_schema = ColumnSchema::new($column_name, $data_type, true);
-            sql_value_to_value(
-                &column_schema,
-                $sql_value,
-                $timezone,
-                $unary_op,
-                $auto_string_to_numeric,
-            )
-        }};
    }

    #[test]
-    fn test_sql_value_to_value() -> Result<()> {
+    fn test_sql_value_to_value() {
        let sql_val = SqlValue::Null;
        assert_eq!(
            Value::Null,
-            call_sql_value_to_value!("a", ConcreteDataType::float64_datatype(), &sql_val)?
+            sql_value_to_value(
+                "a",
+                &ConcreteDataType::float64_datatype(),
+                &sql_val,
+                None,
+                None,
+                false
+            )
+            .unwrap()
        );

        let sql_val = SqlValue::Boolean(true);
        assert_eq!(
            Value::Boolean(true),
-            call_sql_value_to_value!("a", ConcreteDataType::boolean_datatype(), &sql_val)?
+            sql_value_to_value(
+                "a",
+                &ConcreteDataType::boolean_datatype(),
+                &sql_val,
+                None,
+                None,
+                false
+            )
+            .unwrap()
        );

        let sql_val = SqlValue::Number("3.0".to_string(), false);
        assert_eq!(
            Value::Float64(OrderedFloat(3.0)),
-            call_sql_value_to_value!("a", ConcreteDataType::float64_datatype(), &sql_val)?
+            sql_value_to_value(
+                "a",
+                &ConcreteDataType::float64_datatype(),
+                &sql_val,
+                None,
+                None,
+                false
+            )
+            .unwrap()
        );

        let sql_val = SqlValue::Number("3.0".to_string(), false);
-        let v = call_sql_value_to_value!("a", ConcreteDataType::boolean_datatype(), &sql_val);
+        let v = sql_value_to_value(
+            "a",
+            &ConcreteDataType::boolean_datatype(),
+            &sql_val,
+            None,
+            None,
+            false,
+        );
        assert!(v.is_err());
        assert!(format!("{v:?}").contains("Failed to parse number '3.0' to boolean column type"));

        let sql_val = SqlValue::Boolean(true);
-        let v = call_sql_value_to_value!("a", ConcreteDataType::float64_datatype(), &sql_val);
+        let v = sql_value_to_value(
+            "a",
+            &ConcreteDataType::float64_datatype(),
+            &sql_val,
+            None,
+            None,
+            false,
+        );
        assert!(v.is_err());
        assert!(
            format!("{v:?}").contains(
@@ -681,18 +725,41 @@ mod test {
        );

        let sql_val = SqlValue::HexStringLiteral("48656c6c6f20776f726c6421".to_string());
-        let v = call_sql_value_to_value!("a", ConcreteDataType::binary_datatype(), &sql_val)?;
+        let v = sql_value_to_value(
+            "a",
+            &ConcreteDataType::binary_datatype(),
+            &sql_val,
+            None,
+            None,
+            false,
+        )
+        .unwrap();
        assert_eq!(Value::Binary(Bytes::from(b"Hello world!".as_slice())), v);

        let sql_val = SqlValue::DoubleQuotedString("MorningMyFriends".to_string());
-        let v = call_sql_value_to_value!("a", ConcreteDataType::binary_datatype(), &sql_val)?;
+        let v = sql_value_to_value(
+            "a",
+            &ConcreteDataType::binary_datatype(),
+            &sql_val,
+            None,
+            None,
+            false,
+        )
+        .unwrap();
        assert_eq!(
            Value::Binary(Bytes::from(b"MorningMyFriends".as_slice())),
            v
        );

        let sql_val = SqlValue::HexStringLiteral("9AF".to_string());
-        let v = call_sql_value_to_value!("a", ConcreteDataType::binary_datatype(), &sql_val);
+        let v = sql_value_to_value(
+            "a",
+            &ConcreteDataType::binary_datatype(),
+            &sql_val,
+            None,
+            None,
+            false,
+        );
        assert!(v.is_err());
        assert!(
            format!("{v:?}").contains("odd number of digits"),
@@ -700,16 +767,38 @@ mod test {
        );

        let sql_val = SqlValue::HexStringLiteral("AG".to_string());
-        let v = call_sql_value_to_value!("a", ConcreteDataType::binary_datatype(), &sql_val);
+        let v = sql_value_to_value(
+            "a",
+            &ConcreteDataType::binary_datatype(),
+            &sql_val,
+            None,
+            None,
+            false,
+        );
        assert!(v.is_err());
        assert!(format!("{v:?}").contains("invalid character"), "v is {v:?}",);

        let sql_val = SqlValue::DoubleQuotedString("MorningMyFriends".to_string());
-        let v = call_sql_value_to_value!("a", ConcreteDataType::json_datatype(), &sql_val);
+        let v = sql_value_to_value(
+            "a",
+            &ConcreteDataType::json_datatype(),
+            &sql_val,
+            None,
+            None,
+            false,
+        );
        assert!(v.is_err());

        let sql_val = SqlValue::DoubleQuotedString(r#"{"a":"b"}"#.to_string());
-        let v = call_sql_value_to_value!("a", ConcreteDataType::json_datatype(), &sql_val)?;
+        let v = sql_value_to_value(
+            "a",
+            &ConcreteDataType::json_datatype(),
+            &sql_val,
+            None,
+            None,
+            false,
+        )
+        .unwrap();
        assert_eq!(
            Value::Binary(Bytes::from(
                jsonb::parse_value(r#"{"a":"b"}"#.as_bytes())
@@ -719,15 +808,16 @@ mod test {
            )),
            v
        );
-        Ok(())
    }

    #[test]
    fn test_parse_json_to_jsonb() {
-        match call_parse_string_to_value!(
+        match parse_string_to_value(
            "json_col",
            r#"{"a": "b"}"#.to_string(),
-            ConcreteDataType::json_datatype()
+            &ConcreteDataType::json_datatype(),
+            None,
+            false,
        ) {
            Ok(Value::Binary(b)) => {
                assert_eq!(
@@ -743,10 +833,12 @@ mod test {
        }

        assert!(
-            call_parse_string_to_value!(
+            parse_string_to_value(
                "json_col",
                r#"Nicola Kovac is the best rifler in the world"#.to_string(),
-                ConcreteDataType::json_datatype()
+                &ConcreteDataType::json_datatype(),
+                None,
+                false,
            )
            .is_err()
        )
@@ -786,10 +878,13 @@ mod test {

    #[test]
    fn test_parse_date_literal() {
-        let value = call_sql_value_to_value!(
+        let value = sql_value_to_value(
            "date",
-            ConcreteDataType::date_datatype(),
-            &SqlValue::DoubleQuotedString("2022-02-22".to_string())
+            &ConcreteDataType::date_datatype(),
+            &SqlValue::DoubleQuotedString("2022-02-22".to_string()),
+            None,
+            None,
+            false,
        )
        .unwrap();
        assert_eq!(ConcreteDataType::date_datatype(), value.data_type());
@@ -800,11 +895,13 @@ mod test {
        }

        // with timezone
-        let value = call_sql_value_to_value!(
+        let value = sql_value_to_value(
            "date",
-            ConcreteDataType::date_datatype(),
+            &ConcreteDataType::date_datatype(),
            &SqlValue::DoubleQuotedString("2022-02-22".to_string()),
-            timezone = &Timezone::from_tz_string("+07:00").unwrap()
+            Some(&Timezone::from_tz_string("+07:00").unwrap()),
+            None,
+            false,
        )
        .unwrap();
        assert_eq!(ConcreteDataType::date_datatype(), value.data_type());
@@ -816,12 +913,16 @@ mod test {
    }

    #[test]
-    fn test_parse_timestamp_literal() -> Result<()> {
-        match call_parse_string_to_value!(
+    fn test_parse_timestamp_literal() {
+        match parse_string_to_value(
            "timestamp_col",
            "2022-02-22T00:01:01+08:00".to_string(),
-            ConcreteDataType::timestamp_millisecond_datatype()
-        )? {
+            &ConcreteDataType::timestamp_millisecond_datatype(),
+            None,
+            false,
+        )
+        .unwrap()
+        {
            Value::Timestamp(ts) => {
                assert_eq!(1645459261000, ts.value());
                assert_eq!(TimeUnit::Millisecond, ts.unit());
@@ -831,11 +932,15 @@ mod test {
            }
        }

-        match call_parse_string_to_value!(
+        match parse_string_to_value(
            "timestamp_col",
            "2022-02-22T00:01:01+08:00".to_string(),
-            ConcreteDataType::timestamp_datatype(TimeUnit::Second)
-        )? {
+            &ConcreteDataType::timestamp_datatype(TimeUnit::Second),
+            None,
+            false,
+        )
+        .unwrap()
+        {
            Value::Timestamp(ts) => {
                assert_eq!(1645459261, ts.value());
                assert_eq!(TimeUnit::Second, ts.unit());
@@ -845,11 +950,15 @@ mod test {
            }
        }

-        match call_parse_string_to_value!(
+        match parse_string_to_value(
            "timestamp_col",
            "2022-02-22T00:01:01+08:00".to_string(),
-            ConcreteDataType::timestamp_datatype(TimeUnit::Microsecond)
-        )? {
+            &ConcreteDataType::timestamp_datatype(TimeUnit::Microsecond),
+            None,
+            false,
+        )
+        .unwrap()
+        {
            Value::Timestamp(ts) => {
                assert_eq!(1645459261000000, ts.value());
                assert_eq!(TimeUnit::Microsecond, ts.unit());
@@ -859,11 +968,15 @@ mod test {
            }
        }

-        match call_parse_string_to_value!(
+        match parse_string_to_value(
            "timestamp_col",
            "2022-02-22T00:01:01+08:00".to_string(),
-            ConcreteDataType::timestamp_datatype(TimeUnit::Nanosecond)
-        )? {
+            &ConcreteDataType::timestamp_datatype(TimeUnit::Nanosecond),
+            None,
+            false,
+        )
+        .unwrap()
+        {
            Value::Timestamp(ts) => {
                assert_eq!(1645459261000000000, ts.value());
                assert_eq!(TimeUnit::Nanosecond, ts.unit());
@@ -874,21 +987,26 @@ mod test {
        }

        assert!(
-            call_parse_string_to_value!(
+            parse_string_to_value(
                "timestamp_col",
                "2022-02-22T00:01:01+08".to_string(),
-                ConcreteDataType::timestamp_datatype(TimeUnit::Nanosecond)
+                &ConcreteDataType::timestamp_datatype(TimeUnit::Nanosecond),
+                None,
+                false,
            )
            .is_err()
        );

        // with timezone
-        match call_parse_string_to_value!(
+        match parse_string_to_value(
            "timestamp_col",
            "2022-02-22T00:01:01".to_string(),
-            ConcreteDataType::timestamp_datatype(TimeUnit::Nanosecond),
-            timezone = &Timezone::from_tz_string("Asia/Shanghai").unwrap()
-        )? {
+            &ConcreteDataType::timestamp_datatype(TimeUnit::Nanosecond),
+            Some(&Timezone::from_tz_string("Asia/Shanghai").unwrap()),
+            false,
+        )
+        .unwrap()
+        {
            Value::Timestamp(ts) => {
                assert_eq!(1645459261000000000, ts.value());
                assert_eq!("2022-02-21 16:01:01+0000", ts.to_iso8601_string());
@@ -898,42 +1016,51 @@ mod test {
                unreachable!()
            }
        }
-        Ok(())
    }

    #[test]
    fn test_parse_placeholder_value() {
        assert!(
-            call_sql_value_to_value!(
+            sql_value_to_value(
                "test",
-                ConcreteDataType::string_datatype(),
-                &SqlValue::Placeholder("default".into())
-            )
-            .is_err()
-        );
-        assert!(
-            call_sql_value_to_value!(
-                "test",
-                ConcreteDataType::string_datatype(),
+                &ConcreteDataType::string_datatype(),
                &SqlValue::Placeholder("default".into()),
-                unary_op = UnaryOperator::Minus
+                None,
+                None,
+                false
            )
            .is_err()
        );
        assert!(
-            call_sql_value_to_value!(
+            sql_value_to_value(
                "test",
-                ConcreteDataType::uint16_datatype(),
+                &ConcreteDataType::string_datatype(),
+                &SqlValue::Placeholder("default".into()),
+                None,
+                Some(UnaryOperator::Minus),
+                false
+            )
+            .is_err()
+        );
+        assert!(
+            sql_value_to_value(
+                "test",
+                &ConcreteDataType::uint16_datatype(),
                &SqlValue::Number("3".into(), false),
-                unary_op = UnaryOperator::Minus
+                None,
+                Some(UnaryOperator::Minus),
+                false
            )
            .is_err()
        );
        assert!(
-            call_sql_value_to_value!(
+            sql_value_to_value(
                "test",
-                ConcreteDataType::uint16_datatype(),
-                &SqlValue::Number("3".into(), false)
+                &ConcreteDataType::uint16_datatype(),
+                &SqlValue::Number("3".into(), false),
+                None,
+                None,
+                false
            )
            .is_ok()
        );
@@ -943,60 +1070,77 @@ mod test {
    fn test_auto_string_to_numeric() {
        // Test with auto_string_to_numeric=true
        let sql_val = SqlValue::SingleQuotedString("123".to_string());
-        let v = call_sql_value_to_value!(
+        let v = sql_value_to_value(
            "a",
-            ConcreteDataType::int32_datatype(),
+            &ConcreteDataType::int32_datatype(),
            &sql_val,
-            auto_string_to_numeric
+            None,
+            None,
+            true,
        )
        .unwrap();
        assert_eq!(Value::Int32(123), v);

        // Test with a float string
        let sql_val = SqlValue::SingleQuotedString("3.5".to_string());
-        let v = call_sql_value_to_value!(
+        let v = sql_value_to_value(
            "a",
-            ConcreteDataType::float64_datatype(),
+            &ConcreteDataType::float64_datatype(),
            &sql_val,
-            auto_string_to_numeric
+            None,
+            None,
+            true,
        )
        .unwrap();
        assert_eq!(Value::Float64(OrderedFloat(3.5)), v);

        // Test with auto_string_to_numeric=false
        let sql_val = SqlValue::SingleQuotedString("123".to_string());
-        let v = call_sql_value_to_value!("a", ConcreteDataType::int32_datatype(), &sql_val);
+        let v = sql_value_to_value(
+            "a",
+            &ConcreteDataType::int32_datatype(),
+            &sql_val,
+            None,
+            None,
+            false,
+        );
        assert!(v.is_err());

        // Test with an invalid numeric string but auto_string_to_numeric=true
        // Should return an error now with the new auto_cast_to_numeric behavior
        let sql_val = SqlValue::SingleQuotedString("not_a_number".to_string());
-        let v = call_sql_value_to_value!(
+        let v = sql_value_to_value(
            "a",
-            ConcreteDataType::int32_datatype(),
+            &ConcreteDataType::int32_datatype(),
            &sql_val,
-            auto_string_to_numeric
+            None,
+            None,
+            true,
        );
        assert!(v.is_err());

        // Test with boolean type
        let sql_val = SqlValue::SingleQuotedString("true".to_string());
-        let v = call_sql_value_to_value!(
+        let v = sql_value_to_value(
            "a",
-            ConcreteDataType::boolean_datatype(),
+            &ConcreteDataType::boolean_datatype(),
            &sql_val,
-            auto_string_to_numeric
+            None,
+            None,
+            true,
        )
        .unwrap();
        assert_eq!(Value::Boolean(true), v);

        // Non-numeric types should still be handled normally
        let sql_val = SqlValue::SingleQuotedString("hello".to_string());
-        let v = call_sql_value_to_value!(
+        let v = sql_value_to_value(
            "a",
-            ConcreteDataType::string_datatype(),
+            &ConcreteDataType::string_datatype(),
            &sql_val,
-            auto_string_to_numeric
+            None,
+            None,
+            true,
        );
        assert!(v.is_ok());
    }
--- a/src/common/sql/src/default_constraint.rs
+++ b/src/common/sql/src/default_constraint.rs
@@ -14,8 +14,8 @@

 use common_time::timezone::Timezone;
 use datatypes::prelude::ConcreteDataType;
+use datatypes::schema::ColumnDefaultConstraint;
 use datatypes::schema::constraint::{CURRENT_TIMESTAMP, CURRENT_TIMESTAMP_FN};
-use datatypes::schema::{ColumnDefaultConstraint, ColumnSchema};
 use snafu::ensure;
 use sqlparser::ast::ValueWithSpan;
 pub use sqlparser::ast::{
@@ -47,12 +47,9 @@ pub fn parse_column_default_constraint(
        );

        let default_constraint = match &opt.option {
-            ColumnOption::Default(Expr::Value(v)) => {
-                let schema = ColumnSchema::new(column_name, data_type.clone(), true);
-                ColumnDefaultConstraint::Value(sql_value_to_value(
-                    &schema, &v.value, timezone, None, false,
-                )?)
-            }
+            ColumnOption::Default(Expr::Value(v)) => ColumnDefaultConstraint::Value(
+                sql_value_to_value(column_name, data_type, &v.value, timezone, None, false)?,
+            ),
            ColumnOption::Default(Expr::Function(func)) => {
                let mut func = format!("{func}").to_lowercase();
                // normalize CURRENT_TIMESTAMP to CURRENT_TIMESTAMP()
@@ -83,7 +80,8 @@ pub fn parse_column_default_constraint(

                if let Expr::Value(v) = &**expr {
                    let value = sql_value_to_value(
-                        &ColumnSchema::new(column_name, data_type.clone(), true),
+                        column_name,
+                        data_type,
                        &v.value,
                        timezone,
                        Some(*op),
--- a/src/common/stat/src/resource.rs
+++ b/src/common/stat/src/resource.rs
@@ -58,14 +58,10 @@ pub fn get_total_memory_bytes() -> i64 {
    }
 }

-/// Get the total CPU cores. The result will be rounded up to the next integer (ceiling).
-/// For example, if the total CPU is 1.1 cores (1100 millicores) or 1.5 cores (1500 millicores), the result will be 2.
+/// Get the total CPU cores. The result will be rounded to the nearest integer.
+/// For example, if the total CPU is 1.5 cores(1500 millicores), the result will be 2.
 pub fn get_total_cpu_cores() -> usize {
-    cpu_cores(get_total_cpu_millicores())
-}
-
-fn cpu_cores(cpu_millicores: i64) -> usize {
-    ((cpu_millicores as f64) / 1_000.0).ceil() as usize
+    ((get_total_cpu_millicores() as f64) / 1000.0).round() as usize
 }

 /// Get the total memory in readable size.
@@ -182,13 +178,6 @@ mod tests {
    #[test]
    fn test_get_total_cpu_cores() {
        assert!(get_total_cpu_cores() > 0);
-        assert_eq!(cpu_cores(1), 1);
-        assert_eq!(cpu_cores(100), 1);
-        assert_eq!(cpu_cores(500), 1);
-        assert_eq!(cpu_cores(1000), 1);
-        assert_eq!(cpu_cores(1100), 2);
-        assert_eq!(cpu_cores(1900), 2);
-        assert_eq!(cpu_cores(10_000), 10);
    }

    #[test]
--- a/src/common/telemetry/src/metric.rs
+++ b/src/common/telemetry/src/metric.rs
@@ -71,7 +71,6 @@ pub fn convert_metric_to_write_request(
                        timestamp,
                    }],
                    exemplars: vec![],
-                    histograms: vec![],
                }),
                MetricType::GAUGE => timeseries.push(TimeSeries {
                    labels: convert_label(m.get_label(), mf_name, None),
@@ -80,7 +79,6 @@ pub fn convert_metric_to_write_request(
                        timestamp,
                    }],
                    exemplars: vec![],
-                    histograms: vec![],
                }),
                MetricType::HISTOGRAM => {
                    let h = m.get_histogram();
@@ -99,7 +97,6 @@ pub fn convert_metric_to_write_request(
                                timestamp,
                            }],
                            exemplars: vec![],
-                            histograms: vec![],
                        });
                        if upper_bound.is_sign_positive() && upper_bound.is_infinite() {
                            inf_seen = true;
@@ -117,7 +114,6 @@ pub fn convert_metric_to_write_request(
                                timestamp,
                            }],
                            exemplars: vec![],
-                            histograms: vec![],
                        });
                    }
                    timeseries.push(TimeSeries {
@@ -131,7 +127,6 @@ pub fn convert_metric_to_write_request(
                            timestamp,
                        }],
                        exemplars: vec![],
-                        histograms: vec![],
                    });
                    timeseries.push(TimeSeries {
                        labels: convert_label(
@@ -144,7 +139,6 @@ pub fn convert_metric_to_write_request(
                            timestamp,
                        }],
                        exemplars: vec![],
-                        histograms: vec![],
                    });
                }
                MetricType::SUMMARY => {
@@ -161,7 +155,6 @@ pub fn convert_metric_to_write_request(
                                timestamp,
                            }],
                            exemplars: vec![],
-                            histograms: vec![],
                        });
                    }
                    timeseries.push(TimeSeries {
@@ -175,7 +168,6 @@ pub fn convert_metric_to_write_request(
                            timestamp,
                        }],
                        exemplars: vec![],
-                        histograms: vec![],
                    });
                    timeseries.push(TimeSeries {
                        labels: convert_label(
@@ -188,7 +180,6 @@ pub fn convert_metric_to_write_request(
                            timestamp,
                        }],
                        exemplars: vec![],
-                        histograms: vec![],
                    });
                }
                MetricType::UNTYPED => {
@@ -283,7 +274,7 @@ mod test {

        assert_eq!(
            format!("{:?}", write_quest.timeseries),
-            r#"[TimeSeries { labels: [Label { name: "__name__", value: "test_counter" }, Label { name: "a", value: "1" }, Label { name: "b", value: "2" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [], histograms: [] }]"#
+            r#"[TimeSeries { labels: [Label { name: "__name__", value: "test_counter" }, Label { name: "a", value: "1" }, Label { name: "b", value: "2" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [] }]"#
        );

        let gauge_opts = Opts::new("test_gauge", "test help")
@@ -297,7 +288,7 @@ mod test {
        let write_quest = convert_metric_to_write_request(mf, None, 0);
        assert_eq!(
            format!("{:?}", write_quest.timeseries),
-            r#"[TimeSeries { labels: [Label { name: "__name__", value: "test_gauge" }, Label { name: "a", value: "1" }, Label { name: "b", value: "2" }], samples: [Sample { value: 42.0, timestamp: 0 }], exemplars: [], histograms: [] }]"#
+            r#"[TimeSeries { labels: [Label { name: "__name__", value: "test_gauge" }, Label { name: "a", value: "1" }, Label { name: "b", value: "2" }], samples: [Sample { value: 42.0, timestamp: 0 }], exemplars: [] }]"#
        );
    }

@@ -314,20 +305,20 @@ mod test {
            .iter()
            .map(|x| format!("{:?}", x))
            .collect();
-        let ans = r#"TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.005" }], samples: [Sample { value: 0.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.01" }], samples: [Sample { value: 0.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.025" }], samples: [Sample { value: 0.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.05" }], samples: [Sample { value: 0.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.1" }], samples: [Sample { value: 0.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.25" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.5" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "1" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "2.5" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "5" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "10" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "+Inf" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_sum" }, Label { name: "a", value: "1" }], samples: [Sample { value: 0.25, timestamp: 0 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_count" }, Label { name: "a", value: "1" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [], histograms: [] }"#;
+        let ans = r#"TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.005" }], samples: [Sample { value: 0.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.01" }], samples: [Sample { value: 0.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.025" }], samples: [Sample { value: 0.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.05" }], samples: [Sample { value: 0.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.1" }], samples: [Sample { value: 0.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.25" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "0.5" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "1" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "2.5" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "5" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "10" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_bucket" }, Label { name: "a", value: "1" }, Label { name: "le", value: "+Inf" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_sum" }, Label { name: "a", value: "1" }], samples: [Sample { value: 0.25, timestamp: 0 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_count" }, Label { name: "a", value: "1" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [] }"#;
        assert_eq!(write_quest_str.join("\n"), ans);
    }

@@ -364,10 +355,10 @@ TimeSeries { labels: [Label { name: "__name__", value: "test_histogram_count" },
            .iter()
            .map(|x| format!("{:?}", x))
            .collect();
-        let ans = r#"TimeSeries { labels: [Label { name: "__name__", value: "test_summary" }, Label { name: "quantile", value: "50" }], samples: [Sample { value: 3.0, timestamp: 20 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_summary" }, Label { name: "quantile", value: "100" }], samples: [Sample { value: 5.0, timestamp: 20 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_summary_sum" }], samples: [Sample { value: 15.0, timestamp: 20 }], exemplars: [], histograms: [] }
-TimeSeries { labels: [Label { name: "__name__", value: "test_summary_count" }], samples: [Sample { value: 5.0, timestamp: 20 }], exemplars: [], histograms: [] }"#;
+        let ans = r#"TimeSeries { labels: [Label { name: "__name__", value: "test_summary" }, Label { name: "quantile", value: "50" }], samples: [Sample { value: 3.0, timestamp: 20 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_summary" }, Label { name: "quantile", value: "100" }], samples: [Sample { value: 5.0, timestamp: 20 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_summary_sum" }], samples: [Sample { value: 15.0, timestamp: 20 }], exemplars: [] }
+TimeSeries { labels: [Label { name: "__name__", value: "test_summary_count" }], samples: [Sample { value: 5.0, timestamp: 20 }], exemplars: [] }"#;
        assert_eq!(write_quest_str.join("\n"), ans);
    }

@@ -394,11 +385,11 @@ TimeSeries { labels: [Label { name: "__name__", value: "test_summary_count" }],
        let write_quest2 = convert_metric_to_write_request(mf, Some(&filter), 0);
        assert_eq!(
            format!("{:?}", write_quest1.timeseries),
-            r#"[TimeSeries { labels: [Label { name: "__name__", value: "filter_counter" }, Label { name: "a", value: "1" }, Label { name: "b", value: "2" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [], histograms: [] }, TimeSeries { labels: [Label { name: "__name__", value: "test_counter" }, Label { name: "a", value: "1" }, Label { name: "b", value: "2" }], samples: [Sample { value: 2.0, timestamp: 0 }], exemplars: [], histograms: [] }]"#
+            r#"[TimeSeries { labels: [Label { name: "__name__", value: "filter_counter" }, Label { name: "a", value: "1" }, Label { name: "b", value: "2" }], samples: [Sample { value: 1.0, timestamp: 0 }], exemplars: [] }, TimeSeries { labels: [Label { name: "__name__", value: "test_counter" }, Label { name: "a", value: "1" }, Label { name: "b", value: "2" }], samples: [Sample { value: 2.0, timestamp: 0 }], exemplars: [] }]"#
        );
        assert_eq!(
            format!("{:?}", write_quest2.timeseries),
-            r#"[TimeSeries { labels: [Label { name: "__name__", value: "test_counter" }, Label { name: "a", value: "1" }, Label { name: "b", value: "2" }], samples: [Sample { value: 2.0, timestamp: 0 }], exemplars: [], histograms: [] }]"#
+            r#"[TimeSeries { labels: [Label { name: "__name__", value: "test_counter" }, Label { name: "a", value: "1" }, Label { name: "b", value: "2" }], samples: [Sample { value: 2.0, timestamp: 0 }], exemplars: [] }]"#
        );
    }
 }
--- a/src/common/wal/src/config.rs
+++ b/src/common/wal/src/config.rs
@@ -206,8 +206,6 @@ mod tests {
                    client_cert_path: None,
                    client_key_path: None,
                }),
-                connect_timeout: Duration::from_secs(3),
-                timeout: Duration::from_secs(3),
            },
            kafka_topic: KafkaTopicConfig {
                num_topics: 32,
@@ -241,8 +239,6 @@ mod tests {
                    client_cert_path: None,
                    client_key_path: None,
                }),
-                connect_timeout: Duration::from_secs(3),
-                timeout: Duration::from_secs(3),
            },
            max_batch_bytes: ReadableSize::mb(1),
            consumer_wait_timeout: Duration::from_millis(100),
--- a/src/common/wal/src/config/kafka/common.rs
+++ b/src/common/wal/src/config/kafka/common.rs
@@ -36,6 +36,9 @@ pub const DEFAULT_BACKOFF_CONFIG: BackoffConfig = BackoffConfig {
    deadline: Some(Duration::from_secs(3)),
 };

+/// The default connect timeout for kafka client.
+pub const DEFAULT_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
+
 /// Default interval for auto WAL pruning.
 pub const DEFAULT_AUTO_PRUNE_INTERVAL: Duration = Duration::from_mins(30);
 /// Default limit for concurrent auto pruning tasks.
@@ -164,12 +167,6 @@ pub struct KafkaConnectionConfig {
    pub sasl: Option<KafkaClientSasl>,
    /// Client TLS config
    pub tls: Option<KafkaClientTls>,
-    /// The connect timeout for kafka client.
-    #[serde(with = "humantime_serde")]
-    pub connect_timeout: Duration,
-    /// The timeout for kafka client.
-    #[serde(with = "humantime_serde")]
-    pub timeout: Duration,
 }

 impl Default for KafkaConnectionConfig {
@@ -178,8 +175,6 @@ impl Default for KafkaConnectionConfig {
            broker_endpoints: vec![BROKER_ENDPOINT.to_string()],
            sasl: None,
            tls: None,
-            connect_timeout: Duration::from_secs(3),
-            timeout: Duration::from_secs(3),
        }
    }
 }
--- a/src/datanode/src/error.rs
+++ b/src/datanode/src/error.rs
@@ -410,6 +410,14 @@ pub enum Error {
        location: Location,
    },

+    #[snafu(display("Failed to build cache store"))]
+    BuildCacheStore {
+        #[snafu(source)]
+        error: object_store::Error,
+        #[snafu(implicit)]
+        location: Location,
+    },
+
    #[snafu(display("Not yet implemented: {what}"))]
    NotYetImplemented { what: String },
 }
@@ -485,6 +493,7 @@ impl ErrorExt for Error {
            SerializeJson { .. } => StatusCode::Internal,

            ObjectStore { source, .. } => source.status_code(),
+            BuildCacheStore { .. } => StatusCode::StorageUnavailable,
        }
    }

--- a/src/datanode/src/store.rs
+++ b/src/datanode/src/store.rs
@@ -14,10 +14,15 @@

 //! object storage utilities

-use common_telemetry::{info, warn};
+use std::sync::Arc;
+
+use common_telemetry::info;
+use object_store::config::ObjectStorageCacheConfig;
 use object_store::factory::new_raw_object_store;
+use object_store::layers::LruCacheLayer;
+use object_store::services::Fs;
 use object_store::util::{clean_temp_dir, join_dir, with_instrument_layers, with_retry_layers};
-use object_store::{ATOMIC_WRITE_DIR, ObjectStore};
+use object_store::{ATOMIC_WRITE_DIR, Access, ObjectStore, ObjectStoreBuilder};
 use snafu::prelude::*;

 use crate::config::ObjectStoreConfig;
@@ -42,58 +47,23 @@ pub(crate) async fn new_object_store_without_cache(
    Ok(object_store)
 }

-/// Cleans up old LRU read cache directories that were removed.
-fn clean_old_read_cache(store: &ObjectStoreConfig, data_home: &str) {
-    if !store.is_object_storage() {
-        return;
-    }
-
-    let Some(cache_config) = store.cache_config() else {
-        return;
-    };
-
-    // Only cleans if read cache was enabled
-    if !cache_config.enable_read_cache {
-        return;
-    }
-
-    let cache_base_dir = if cache_config.cache_path.is_empty() {
-        data_home
-    } else {
-        &cache_config.cache_path
-    };
-
-    // Cleans up the old read cache directory
-    let old_read_cache_dir = join_dir(cache_base_dir, "cache/object/read");
-    info!(
-        "Cleaning up old read cache directory: {}",
-        old_read_cache_dir
-    );
-    if let Err(e) = clean_temp_dir(&old_read_cache_dir) {
-        warn!(e; "Failed to clean old read cache directory {}", old_read_cache_dir);
-    }
-
-    // Cleans up the atomic temp dir used by the cache layer
-    let cache_atomic_temp_dir = join_dir(cache_base_dir, ATOMIC_WRITE_DIR);
-    info!(
-        "Cleaning up old cache atomic temp directory: {}",
-        cache_atomic_temp_dir
-    );
-    if let Err(e) = clean_temp_dir(&cache_atomic_temp_dir) {
-        warn!(e; "Failed to clean old cache atomic temp directory {}", cache_atomic_temp_dir);
-    }
-}
-
 pub async fn new_object_store(store: ObjectStoreConfig, data_home: &str) -> Result<ObjectStore> {
-    // Cleans up old LRU read cache directories.
-    // TODO: Remove this line after the 1.0 release.
-    clean_old_read_cache(&store, data_home);
-
    let object_store = new_raw_object_store(&store, data_home)
        .await
        .context(error::ObjectStoreSnafu)?;
-    // Enables retry layer for non-fs object storages
+    // Enable retry layer and cache layer for non-fs object storages
    let object_store = if store.is_object_storage() {
+        let object_store = {
+            // It's safe to unwrap here because we already checked above.
+            let cache_config = store.cache_config().unwrap();
+            if let Some(cache_layer) = build_cache_layer(cache_config, data_home).await? {
+                // Adds cache layer
+                object_store.layer(cache_layer)
+            } else {
+                object_store
+            }
+        };
+
        // Adds retry layer
        with_retry_layers(object_store)
    } else {
@@ -103,3 +73,40 @@ pub async fn new_object_store(store: ObjectStoreConfig, data_home: &str) -> Resu
    let object_store = with_instrument_layers(object_store, true);
    Ok(object_store)
 }
+
+async fn build_cache_layer(
+    cache_config: &ObjectStorageCacheConfig,
+    data_home: &str,
+) -> Result<Option<LruCacheLayer<impl Access>>> {
+    // No need to build cache layer if read cache is disabled.
+    if !cache_config.enable_read_cache {
+        return Ok(None);
+    }
+    let cache_base_dir = if cache_config.cache_path.is_empty() {
+        data_home
+    } else {
+        &cache_config.cache_path
+    };
+    let atomic_temp_dir = join_dir(cache_base_dir, ATOMIC_WRITE_DIR);
+    clean_temp_dir(&atomic_temp_dir).context(error::ObjectStoreSnafu)?;
+
+    let cache_store = Fs::default()
+        .root(cache_base_dir)
+        .atomic_write_dir(&atomic_temp_dir)
+        .build()
+        .context(error::BuildCacheStoreSnafu)?;
+
+    let cache_layer = LruCacheLayer::new(
+        Arc::new(cache_store),
+        cache_config.cache_capacity.0 as usize,
+    )
+    .context(error::BuildCacheStoreSnafu)?;
+    cache_layer.recover_cache(false).await;
+
+    info!(
+        "Enabled local object storage cache, path: {}, capacity: {}.",
+        cache_config.cache_path, cache_config.cache_capacity
+    );
+
+    Ok(Some(cache_layer))
+}
--- a/src/datanode/src/tests.rs
+++ b/src/datanode/src/tests.rs
@@ -33,9 +33,9 @@ use servers::grpc::FlightCompression;
 use session::context::QueryContextRef;
 use store_api::metadata::RegionMetadataRef;
 use store_api::region_engine::{
-    CopyRegionFromRequest, CopyRegionFromResponse, RegionEngine, RegionManifestInfo, RegionRole,
-    RegionScannerRef, RegionStatistic, RemapManifestsRequest, RemapManifestsResponse,
-    SetRegionRoleStateResponse, SettableRegionRoleState, SyncManifestResponse,
+    RegionEngine, RegionManifestInfo, RegionRole, RegionScannerRef, RegionStatistic,
+    RemapManifestsRequest, RemapManifestsResponse, SetRegionRoleStateResponse,
+    SettableRegionRoleState, SyncManifestResponse,
 };
 use store_api::region_request::{AffectedRows, RegionRequest};
 use store_api::storage::{RegionId, ScanRequest, SequenceNumber};
@@ -299,14 +299,6 @@ impl RegionEngine for MockRegionEngine {
        unimplemented!()
    }

-    async fn copy_region_from(
-        &self,
-        _region_id: RegionId,
-        _request: CopyRegionFromRequest,
-    ) -> Result<CopyRegionFromResponse, BoxedError> {
-        unimplemented!()
-    }
-
    fn as_any(&self) -> &dyn Any {
        self
    }
--- a/src/datatypes/src/schema.rs
+++ b/src/datatypes/src/schema.rs
@@ -33,8 +33,7 @@ pub use crate::schema::column_schema::{
    COLUMN_SKIPPING_INDEX_OPT_KEY_FALSE_POSITIVE_RATE, COLUMN_SKIPPING_INDEX_OPT_KEY_GRANULARITY,
    COLUMN_SKIPPING_INDEX_OPT_KEY_TYPE, COMMENT_KEY, ColumnExtType, ColumnSchema, FULLTEXT_KEY,
    FulltextAnalyzer, FulltextBackend, FulltextOptions, INVERTED_INDEX_KEY, Metadata,
-    SKIPPING_INDEX_KEY, SkippingIndexOptions, SkippingIndexType, TIME_INDEX_KEY, VECTOR_INDEX_KEY,
-    VectorDistanceMetric, VectorIndexEngineType, VectorIndexOptions,
+    SKIPPING_INDEX_KEY, SkippingIndexOptions, SkippingIndexType, TIME_INDEX_KEY,
 };
 pub use crate::schema::constraint::ColumnDefaultConstraint;
 pub use crate::schema::raw::RawSchema;
--- a/src/datatypes/src/schema/column_schema.rs
+++ b/src/datatypes/src/schema/column_schema.rs
@@ -46,8 +46,6 @@ pub const FULLTEXT_KEY: &str = "greptime:fulltext";
 pub const INVERTED_INDEX_KEY: &str = "greptime:inverted_index";
 /// Key used to store skip options in arrow field's metadata.
 pub const SKIPPING_INDEX_KEY: &str = "greptime:skipping_index";
-/// Key used to store vector index options in arrow field's metadata.
-pub const VECTOR_INDEX_KEY: &str = "greptime:vector_index";

 /// Keys used in fulltext options
 pub const COLUMN_FULLTEXT_CHANGE_OPT_KEY_ENABLE: &str = "enable";
@@ -218,53 +216,6 @@ impl ColumnSchema {
        self.metadata.contains_key(INVERTED_INDEX_KEY)
    }

-    /// Checks if this column has a vector index.
-    pub fn is_vector_indexed(&self) -> bool {
-        match self.vector_index_options() {
-            Ok(opts) => opts.is_some(),
-            Err(e) => {
-                common_telemetry::warn!(
-                    "Failed to deserialize vector_index_options for column '{}': {}",
-                    self.name,
-                    e
-                );
-                false
-            }
-        }
-    }
-
-    /// Gets the vector index options.
-    pub fn vector_index_options(&self) -> Result<Option<VectorIndexOptions>> {
-        match self.metadata.get(VECTOR_INDEX_KEY) {
-            None => Ok(None),
-            Some(json) => {
-                let options =
-                    serde_json::from_str(json).context(error::DeserializeSnafu { json })?;
-                Ok(Some(options))
-            }
-        }
-    }
-
-    /// Sets the vector index options.
-    pub fn set_vector_index_options(&mut self, options: &VectorIndexOptions) -> Result<()> {
-        self.metadata.insert(
-            VECTOR_INDEX_KEY.to_string(),
-            serde_json::to_string(options).context(error::SerializeSnafu)?,
-        );
-        Ok(())
-    }
-
-    /// Removes the vector index options.
-    pub fn unset_vector_index_options(&mut self) {
-        self.metadata.remove(VECTOR_INDEX_KEY);
-    }
-
-    /// Sets vector index options and returns self for chaining.
-    pub fn with_vector_index_options(mut self, options: &VectorIndexOptions) -> Result<Self> {
-        self.set_vector_index_options(options)?;
-        Ok(self)
-    }
-
    /// Set default constraint.
    ///
    /// If a default constraint exists for the column, this method will
@@ -1013,181 +964,6 @@ impl TryFrom<HashMap<String, String>> for SkippingIndexOptions {
    }
 }

-/// Distance metric for vector similarity search.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default, Visit, VisitMut)]
-#[serde(rename_all = "lowercase")]
-pub enum VectorDistanceMetric {
-    /// Squared Euclidean distance (L2^2).
-    #[default]
-    L2sq,
-    /// Cosine distance (1 - cosine similarity).
-    Cosine,
-    /// Inner product (negative, for maximum inner product search).
-    #[serde(alias = "ip")]
-    InnerProduct,
-}
-
-impl fmt::Display for VectorDistanceMetric {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            VectorDistanceMetric::L2sq => write!(f, "l2sq"),
-            VectorDistanceMetric::Cosine => write!(f, "cosine"),
-            VectorDistanceMetric::InnerProduct => write!(f, "ip"),
-        }
-    }
-}
-
-impl std::str::FromStr for VectorDistanceMetric {
-    type Err = String;
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        match s.to_lowercase().as_str() {
-            "l2sq" | "l2" | "euclidean" => Ok(VectorDistanceMetric::L2sq),
-            "cosine" | "cos" => Ok(VectorDistanceMetric::Cosine),
-            "inner_product" | "ip" | "dot" => Ok(VectorDistanceMetric::InnerProduct),
-            _ => Err(format!(
-                "Unknown distance metric: {}. Expected: l2sq, cosine, or ip",
-                s
-            )),
-        }
-    }
-}
-
-impl VectorDistanceMetric {
-    /// Returns the metric as u8 for blob serialization.
-    pub fn as_u8(&self) -> u8 {
-        match self {
-            Self::L2sq => 0,
-            Self::Cosine => 1,
-            Self::InnerProduct => 2,
-        }
-    }
-
-    /// Parses metric from u8 (used when reading blob).
-    pub fn try_from_u8(v: u8) -> Option<Self> {
-        match v {
-            0 => Some(Self::L2sq),
-            1 => Some(Self::Cosine),
-            2 => Some(Self::InnerProduct),
-            _ => None,
-        }
-    }
-}
-
-/// Default HNSW connectivity parameter.
-const DEFAULT_VECTOR_INDEX_CONNECTIVITY: u32 = 16;
-/// Default expansion factor during index construction.
-const DEFAULT_VECTOR_INDEX_EXPANSION_ADD: u32 = 128;
-/// Default expansion factor during search.
-const DEFAULT_VECTOR_INDEX_EXPANSION_SEARCH: u32 = 64;
-
-fn default_vector_index_connectivity() -> u32 {
-    DEFAULT_VECTOR_INDEX_CONNECTIVITY
-}
-
-fn default_vector_index_expansion_add() -> u32 {
-    DEFAULT_VECTOR_INDEX_EXPANSION_ADD
-}
-
-fn default_vector_index_expansion_search() -> u32 {
-    DEFAULT_VECTOR_INDEX_EXPANSION_SEARCH
-}
-
-/// Supported vector index engine types.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize, Visit, VisitMut)]
-#[serde(rename_all = "lowercase")]
-pub enum VectorIndexEngineType {
-    /// USearch HNSW implementation.
-    #[default]
-    Usearch,
-    // Future: Vsag,
-}
-
-impl VectorIndexEngineType {
-    /// Returns the engine type as u8 for blob serialization.
-    pub fn as_u8(&self) -> u8 {
-        match self {
-            Self::Usearch => 0,
-        }
-    }
-
-    /// Parses engine type from u8 (used when reading blob).
-    pub fn try_from_u8(v: u8) -> Option<Self> {
-        match v {
-            0 => Some(Self::Usearch),
-            _ => None,
-        }
-    }
-}
-
-impl fmt::Display for VectorIndexEngineType {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Usearch => write!(f, "usearch"),
-        }
-    }
-}
-
-impl std::str::FromStr for VectorIndexEngineType {
-    type Err = String;
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        match s.to_lowercase().as_str() {
-            "usearch" => Ok(Self::Usearch),
-            _ => Err(format!(
-                "Unknown vector index engine: {}. Expected: usearch",
-                s
-            )),
-        }
-    }
-}
-
-/// Options for vector index (HNSW).
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Visit, VisitMut)]
-#[serde(rename_all = "kebab-case")]
-pub struct VectorIndexOptions {
-    /// Vector index engine type (default: usearch).
-    #[serde(default)]
-    pub engine: VectorIndexEngineType,
-    /// Distance metric for similarity search.
-    #[serde(default)]
-    pub metric: VectorDistanceMetric,
-    /// HNSW connectivity parameter (M in the paper).
-    /// Higher values improve recall but increase memory usage.
-    #[serde(default = "default_vector_index_connectivity")]
-    pub connectivity: u32,
-    /// Expansion factor during index construction (ef_construction).
-    /// Higher values improve index quality but slow down construction.
-    #[serde(default = "default_vector_index_expansion_add")]
-    pub expansion_add: u32,
-    /// Expansion factor during search (ef_search).
-    /// Higher values improve recall but slow down search.
-    #[serde(default = "default_vector_index_expansion_search")]
-    pub expansion_search: u32,
-}
-
-impl Default for VectorIndexOptions {
-    fn default() -> Self {
-        Self {
-            engine: VectorIndexEngineType::default(),
-            metric: VectorDistanceMetric::default(),
-            connectivity: DEFAULT_VECTOR_INDEX_CONNECTIVITY,
-            expansion_add: DEFAULT_VECTOR_INDEX_EXPANSION_ADD,
-            expansion_search: DEFAULT_VECTOR_INDEX_EXPANSION_SEARCH,
-        }
-    }
-}
-
-impl fmt::Display for VectorIndexOptions {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "engine={}, metric={}, connectivity={}, expansion_add={}, expansion_search={}",
-            self.engine, self.metric, self.connectivity, self.expansion_add, self.expansion_search
-        )
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use std::sync::Arc;
--- a/src/file-engine/src/engine.rs
+++ b/src/file-engine/src/engine.rs
@@ -26,10 +26,10 @@ use object_store::ObjectStore;
 use snafu::{OptionExt, ensure};
 use store_api::metadata::RegionMetadataRef;
 use store_api::region_engine::{
-    CopyRegionFromRequest, CopyRegionFromResponse, RegionEngine, RegionManifestInfo, RegionRole,
-    RegionScannerRef, RegionStatistic, RemapManifestsRequest, RemapManifestsResponse,
-    SetRegionRoleStateResponse, SetRegionRoleStateSuccess, SettableRegionRoleState,
-    SinglePartitionScanner, SyncManifestResponse,
+    RegionEngine, RegionManifestInfo, RegionRole, RegionScannerRef, RegionStatistic,
+    RemapManifestsRequest, RemapManifestsResponse, SetRegionRoleStateResponse,
+    SetRegionRoleStateSuccess, SettableRegionRoleState, SinglePartitionScanner,
+    SyncManifestResponse,
 };
 use store_api::region_request::{
    AffectedRows, RegionCloseRequest, RegionCreateRequest, RegionDropRequest, RegionOpenRequest,
@@ -163,19 +163,6 @@ impl RegionEngine for FileRegionEngine {
        ))
    }

-    async fn copy_region_from(
-        &self,
-        _region_id: RegionId,
-        _request: CopyRegionFromRequest,
-    ) -> Result<CopyRegionFromResponse, BoxedError> {
-        Err(BoxedError::new(
-            UnsupportedSnafu {
-                operation: "copy_region_from",
-            }
-            .build(),
-        ))
-    }
-
    fn role(&self, region_id: RegionId) -> Option<RegionRole> {
        self.inner.state(region_id)
    }
--- a/src/flow/src/batching_mode/frontend_client.rs
+++ b/src/flow/src/batching_mode/frontend_client.rs
@@ -15,7 +15,7 @@
 //! Frontend client to run flow as batching task which is time-window-aware normal query triggered every tick set by user

 use std::collections::HashMap;
-use std::sync::{Arc, Mutex, Weak};
+use std::sync::{Arc, Weak};
 use std::time::SystemTime;

 use api::v1::greptime_request::Request;
@@ -38,7 +38,6 @@ use servers::query_handler::grpc::GrpcQueryHandler;
 use session::context::{QueryContextBuilder, QueryContextRef};
 use session::hints::READ_PREFERENCE_HINT;
 use snafu::{OptionExt, ResultExt};
-use tokio::sync::SetOnce;

 use crate::batching_mode::BatchingModeOptions;
 use crate::error::{
@@ -76,19 +75,7 @@ impl<E: ErrorExt + Send + Sync + 'static, T: GrpcQueryHandler<Error = E> + Send
    }
 }

-#[derive(Debug, Clone)]
-pub struct HandlerMutable {
-    handler: Arc<Mutex<Option<Weak<dyn GrpcQueryHandlerWithBoxedError>>>>,
-    is_initialized: Arc<SetOnce<()>>,
-}
-
-impl HandlerMutable {
-    pub async fn set_handler(&self, handler: Weak<dyn GrpcQueryHandlerWithBoxedError>) {
-        *self.handler.lock().unwrap() = Some(handler);
-        // Ignore the error, as we allow the handler to be set multiple times.
-        let _ = self.is_initialized.set(());
-    }
-}
+type HandlerMutable = Arc<std::sync::Mutex<Option<Weak<dyn GrpcQueryHandlerWithBoxedError>>>>;

 /// A simple frontend client able to execute sql using grpc protocol
 ///
@@ -113,11 +100,7 @@ pub enum FrontendClient {
 impl FrontendClient {
    /// Create a new empty frontend client, with a `HandlerMutable` to set the grpc handler later
    pub fn from_empty_grpc_handler(query: QueryOptions) -> (Self, HandlerMutable) {
-        let is_initialized = Arc::new(SetOnce::new());
-        let handler = HandlerMutable {
-            handler: Arc::new(Mutex::new(None)),
-            is_initialized,
-        };
+        let handler = Arc::new(std::sync::Mutex::new(None));
        (
            Self::Standalone {
                database_client: handler.clone(),
@@ -127,16 +110,6 @@ impl FrontendClient {
        )
    }

-    /// Waits until the frontend client is initialized.
-    pub async fn wait_initialized(&self) {
-        if let FrontendClient::Standalone {
-            database_client, ..
-        } = self
-        {
-            database_client.is_initialized.wait().await;
-        }
-    }
-
    pub fn from_meta_client(
        meta_client: Arc<MetaClient>,
        auth: Option<FlowAuthHeader>,
@@ -165,14 +138,8 @@ impl FrontendClient {
        grpc_handler: Weak<dyn GrpcQueryHandlerWithBoxedError>,
        query: QueryOptions,
    ) -> Self {
-        let is_initialized = Arc::new(SetOnce::new_with(Some(())));
-        let handler = HandlerMutable {
-            handler: Arc::new(Mutex::new(Some(grpc_handler))),
-            is_initialized: is_initialized.clone(),
-        };
-
        Self::Standalone {
-            database_client: handler,
+            database_client: Arc::new(std::sync::Mutex::new(Some(grpc_handler))),
            query,
        }
    }
@@ -354,7 +321,6 @@ impl FrontendClient {
                {
                    let database_client = {
                        database_client
-                            .handler
                            .lock()
                            .map_err(|e| {
                                UnexpectedSnafu {
@@ -432,7 +398,6 @@ impl FrontendClient {
                {
                    let database_client = {
                        database_client
-                            .handler
                            .lock()
                            .map_err(|e| {
                                UnexpectedSnafu {
@@ -495,73 +460,3 @@ impl std::fmt::Display for PeerDesc {
        }
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::time::Duration;
-
-    use common_query::Output;
-    use tokio::time::timeout;
-
-    use super::*;
-
-    #[derive(Debug)]
-    struct NoopHandler;
-
-    #[async_trait::async_trait]
-    impl GrpcQueryHandlerWithBoxedError for NoopHandler {
-        async fn do_query(
-            &self,
-            _query: Request,
-            _ctx: QueryContextRef,
-        ) -> std::result::Result<Output, BoxedError> {
-            Ok(Output::new_with_affected_rows(0))
-        }
-    }
-
-    #[tokio::test]
-    async fn wait_initialized() {
-        let (client, handler_mut) =
-            FrontendClient::from_empty_grpc_handler(QueryOptions::default());
-
-        assert!(
-            timeout(Duration::from_millis(50), client.wait_initialized())
-                .await
-                .is_err()
-        );
-
-        let handler: Arc<dyn GrpcQueryHandlerWithBoxedError> = Arc::new(NoopHandler);
-        handler_mut.set_handler(Arc::downgrade(&handler)).await;
-
-        timeout(Duration::from_secs(1), client.wait_initialized())
-            .await
-            .expect("wait_initialized should complete after handler is set");
-
-        timeout(Duration::from_millis(10), client.wait_initialized())
-            .await
-            .expect("wait_initialized should be a no-op once initialized");
-
-        let handler: Arc<dyn GrpcQueryHandlerWithBoxedError> = Arc::new(NoopHandler);
-        let client =
-            FrontendClient::from_grpc_handler(Arc::downgrade(&handler), QueryOptions::default());
-        assert!(
-            timeout(Duration::from_millis(10), client.wait_initialized())
-                .await
-                .is_ok()
-        );
-
-        let meta_client = Arc::new(MetaClient::default());
-        let client = FrontendClient::from_meta_client(
-            meta_client,
-            None,
-            QueryOptions::default(),
-            BatchingModeOptions::default(),
-        )
-        .unwrap();
-        assert!(
-            timeout(Duration::from_millis(10), client.wait_initialized())
-                .await
-                .is_ok()
-        );
-    }
-}
--- a/src/frontend/src/frontend.rs
+++ b/src/frontend/src/frontend.rs
@@ -157,6 +157,7 @@ mod tests {
    use common_error::from_header_to_err_code_msg;
    use common_error::status_code::StatusCode;
    use common_grpc::channel_manager::ChannelManager;
+    use common_meta::distributed_time_constants::FRONTEND_HEARTBEAT_INTERVAL_MILLIS;
    use common_meta::heartbeat::handler::HandlerGroupExecutor;
    use common_meta::heartbeat::handler::parse_mailbox_message::ParseMailboxMessageHandler;
    use common_meta::heartbeat::handler::suspend::SuspendHandler;
@@ -399,10 +400,6 @@ mod tests {
                ..Default::default()
            },
            meta_client: Some(meta_client_options.clone()),
-            heartbeat: HeartbeatOptions {
-                interval: Duration::from_secs(1),
-                ..Default::default()
-            },
            ..Default::default()
        };

@@ -412,8 +409,7 @@ mod tests {
        let meta_client = create_meta_client(&meta_client_options, server.clone()).await;
        let frontend = create_frontend(&options, meta_client).await?;

-        let frontend_heartbeat_interval = options.heartbeat.interval;
-        tokio::time::sleep(frontend_heartbeat_interval).await;
+        tokio::time::sleep(Duration::from_millis(FRONTEND_HEARTBEAT_INTERVAL_MILLIS)).await;
        // initial state: not suspend:
        assert!(!frontend.instance.is_suspended());
        verify_suspend_state_by_http(&frontend, Ok(r#"[{"records":{"schema":{"column_schemas":[{"name":"Int64(1)","data_type":"Int64"}]},"rows":[[1]],"total_rows":1}}]"#)).await;
@@ -430,7 +426,7 @@ mod tests {

        // make heartbeat server returned "suspend" instruction,
        server.suspend.store(true, Ordering::Relaxed);
-        tokio::time::sleep(frontend_heartbeat_interval).await;
+        tokio::time::sleep(Duration::from_millis(FRONTEND_HEARTBEAT_INTERVAL_MILLIS)).await;
        // ... then the frontend is suspended:
        assert!(frontend.instance.is_suspended());
        verify_suspend_state_by_http(
@@ -446,7 +442,7 @@ mod tests {

        // make heartbeat server NOT returned "suspend" instruction,
        server.suspend.store(false, Ordering::Relaxed);
-        tokio::time::sleep(frontend_heartbeat_interval).await;
+        tokio::time::sleep(Duration::from_millis(FRONTEND_HEARTBEAT_INTERVAL_MILLIS)).await;
        // ... then frontend's suspend state is cleared:
        assert!(!frontend.instance.is_suspended());
        verify_suspend_state_by_http(&frontend, Ok(r#"[{"records":{"schema":{"column_schemas":[{"name":"Int64(1)","data_type":"Int64"}]},"rows":[[1]],"total_rows":1}}]"#)).await;
--- a/src/frontend/src/instance/grpc.rs
+++ b/src/frontend/src/instance/grpc.rs
@@ -301,15 +301,39 @@ impl GrpcQueryHandler for Instance {
        mut stream: servers::grpc::flight::PutRecordBatchRequestStream,
        ctx: QueryContextRef,
    ) -> Pin<Box<dyn Stream<Item = Result<DoPutResponse>> + Send>> {
+        // Resolve table once for the stream
        // Clone all necessary data to make it 'static
        let catalog_manager = self.catalog_manager().clone();
        let plugins = self.plugins.clone();
        let inserter = self.inserter.clone();
+        let table_name = stream.table_name().clone();
        let ctx = ctx.clone();
-        let mut table_ref: Option<TableRef> = None;
-        let mut table_checked = false;

        Box::pin(try_stream! {
+            plugins
+                .get::<PermissionCheckerRef>()
+                .as_ref()
+                .check_permission(ctx.current_user(), PermissionReq::BulkInsert)
+                .context(PermissionSnafu)?;
+            // Cache for resolved table reference - resolve once and reuse
+            let table_ref = catalog_manager
+                .table(
+                    &table_name.catalog_name,
+                    &table_name.schema_name,
+                    &table_name.table_name,
+                    None,
+                )
+                .await
+                .context(CatalogSnafu)?
+                .with_context(|| TableNotFoundSnafu {
+                    table_name: table_name.to_string(),
+                })?;
+
+            // Check permissions once for the stream
+            let interceptor_ref = plugins.get::<GrpcQueryInterceptorRef<Error>>();
+            let interceptor = interceptor_ref.as_ref();
+            interceptor.pre_bulk_insert(table_ref.clone(), ctx.clone())?;
+
            // Process each request in the stream
            while let Some(request_result) = stream.next().await {
                let request = request_result.map_err(|e| {
@@ -317,45 +341,11 @@ impl GrpcQueryHandler for Instance {
                    IncompleteGrpcRequestSnafu { err_msg: error_msg }.build()
                })?;

-                // Resolve table and check permissions on first RecordBatch (after schema is received)
-                if !table_checked {
-                    let table_name = &request.table_name;
-
-                    plugins
-                        .get::<PermissionCheckerRef>()
-                        .as_ref()
-                        .check_permission(ctx.current_user(), PermissionReq::BulkInsert)
-                        .context(PermissionSnafu)?;
-
-                    // Resolve table reference
-                    table_ref = Some(
-                        catalog_manager
-                            .table(
-                                &table_name.catalog_name,
-                                &table_name.schema_name,
-                                &table_name.table_name,
-                                None,
-                            )
-                            .await
-                            .context(CatalogSnafu)?
-                            .with_context(|| TableNotFoundSnafu {
-                                table_name: table_name.to_string(),
-                            })?,
-                    );
-
-                    // Check permissions for the table
-                    let interceptor_ref = plugins.get::<GrpcQueryInterceptorRef<Error>>();
-                    let interceptor = interceptor_ref.as_ref();
-                    interceptor.pre_bulk_insert(table_ref.clone().unwrap(), ctx.clone())?;
-
-                    table_checked = true;
-                }
-
                let request_id = request.request_id;
                let start = Instant::now();
                let rows = inserter
                    .handle_bulk_insert(
-                        table_ref.clone().unwrap(),
+                        table_ref.clone(),
                        request.flight_data,
                        request.record_batch,
                        request.schema_bytes,
--- a/src/index/Cargo.toml
+++ b/src/index/Cargo.toml
@@ -7,9 +7,6 @@ license.workspace = true
 [lints]
 workspace = true

-[features]
-vector_index = ["dep:usearch"]
-
 [dependencies]
 async-trait.workspace = true
 asynchronous-codec = "0.7.0"
@@ -20,7 +17,6 @@ common-error.workspace = true
 common-macro.workspace = true
 common-runtime.workspace = true
 common-telemetry.workspace = true
-datatypes.workspace = true
 fastbloom = "0.8"
 fst.workspace = true
 futures.workspace = true
@@ -29,7 +25,6 @@ itertools.workspace = true
 jieba-rs = "0.8"
 lazy_static.workspace = true
 mockall.workspace = true
-nalgebra.workspace = true
 pin-project.workspace = true
 prost.workspace = true
 puffin.workspace = true
@@ -44,7 +39,6 @@ tantivy = { version = "0.24", features = ["zstd-compression"] }
 tantivy-jieba = "0.16"
 tokio.workspace = true
 tokio-util.workspace = true
-usearch = { version = "2.21", default-features = false, features = ["fp16lib"], optional = true }
 uuid.workspace = true

 [dev-dependencies]
--- a/src/index/src/lib.rs
+++ b/src/index/src/lib.rs
@@ -22,8 +22,6 @@ pub mod external_provider;
 pub mod fulltext_index;
 pub mod inverted_index;
 pub mod target;
-#[cfg(feature = "vector_index")]
-pub mod vector;

 pub type Bytes = Vec<u8>;
 pub type BytesRef<'a> = &'a [u8];
--- a/src/index/src/vector.rs
+++ b/src/index/src/vector.rs
@@ -1,163 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Vector index types and options.
-//!
-//! This module re-exports types from `datatypes` and provides conversions
-//! to USearch types, as well as distance computation functions.
-
-pub use datatypes::schema::{VectorDistanceMetric, VectorIndexOptions};
-use nalgebra::DVectorView;
-pub use usearch::MetricKind;
-
-/// Converts a VectorDistanceMetric to a USearch MetricKind.
-pub fn distance_metric_to_usearch(metric: VectorDistanceMetric) -> MetricKind {
-    match metric {
-        VectorDistanceMetric::L2sq => MetricKind::L2sq,
-        VectorDistanceMetric::Cosine => MetricKind::Cos,
-        VectorDistanceMetric::InnerProduct => MetricKind::IP,
-    }
-}
-
-/// Computes distance between two vectors using the specified metric.
-///
-/// Uses SIMD-optimized implementations via nalgebra.
-///
-/// **Note:** The caller must ensure that the two vectors have the same length
-/// and are non-empty. Empty vectors return 0.0 for all metrics.
-pub fn compute_distance(v1: &[f32], v2: &[f32], metric: VectorDistanceMetric) -> f32 {
-    // Empty vectors are degenerate; return 0.0 uniformly across all metrics.
-    if v1.is_empty() || v2.is_empty() {
-        return 0.0;
-    }
-
-    match metric {
-        VectorDistanceMetric::L2sq => l2sq(v1, v2),
-        VectorDistanceMetric::Cosine => cosine(v1, v2),
-        VectorDistanceMetric::InnerProduct => -dot(v1, v2),
-    }
-}
-
-/// Calculates the squared L2 distance between two vectors.
-fn l2sq(lhs: &[f32], rhs: &[f32]) -> f32 {
-    let lhs = DVectorView::from_slice(lhs, lhs.len());
-    let rhs = DVectorView::from_slice(rhs, rhs.len());
-    (lhs - rhs).norm_squared()
-}
-
-/// Calculates the cosine distance between two vectors.
-///
-/// Returns a value in `[0.0, 2.0]` where 0.0 means identical direction and 2.0 means
-/// opposite direction. For degenerate cases (zero or near-zero magnitude vectors),
-/// returns 1.0 (maximum uncertainty) to avoid NaN and ensure safe index operations.
-fn cosine(lhs: &[f32], rhs: &[f32]) -> f32 {
-    let lhs_vec = DVectorView::from_slice(lhs, lhs.len());
-    let rhs_vec = DVectorView::from_slice(rhs, rhs.len());
-
-    let dot_product = lhs_vec.dot(&rhs_vec);
-    let lhs_norm = lhs_vec.norm();
-    let rhs_norm = rhs_vec.norm();
-
-    // Zero-magnitude vectors have undefined direction; return max distance as safe fallback.
-    if dot_product.abs() < f32::EPSILON
-        || lhs_norm.abs() < f32::EPSILON
-        || rhs_norm.abs() < f32::EPSILON
-    {
-        return 1.0;
-    }
-
-    let cos_similar = dot_product / (lhs_norm * rhs_norm);
-    let res = 1.0 - cos_similar;
-    // Clamp near-zero results to exactly 0.0 to avoid floating-point artifacts.
-    if res.abs() < f32::EPSILON { 0.0 } else { res }
-}
-
-/// Calculates the dot product between two vectors.
-fn dot(lhs: &[f32], rhs: &[f32]) -> f32 {
-    let lhs = DVectorView::from_slice(lhs, lhs.len());
-    let rhs = DVectorView::from_slice(rhs, rhs.len());
-    lhs.dot(&rhs)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_distance_metric_to_usearch() {
-        assert_eq!(
-            distance_metric_to_usearch(VectorDistanceMetric::L2sq),
-            MetricKind::L2sq
-        );
-        assert_eq!(
-            distance_metric_to_usearch(VectorDistanceMetric::Cosine),
-            MetricKind::Cos
-        );
-        assert_eq!(
-            distance_metric_to_usearch(VectorDistanceMetric::InnerProduct),
-            MetricKind::IP
-        );
-    }
-
-    #[test]
-    fn test_vector_index_options_default() {
-        let options = VectorIndexOptions::default();
-        assert_eq!(options.metric, VectorDistanceMetric::L2sq);
-        assert_eq!(options.connectivity, 16);
-        assert_eq!(options.expansion_add, 128);
-        assert_eq!(options.expansion_search, 64);
-    }
-
-    #[test]
-    fn test_compute_distance_l2sq() {
-        let v1 = vec![1.0, 2.0, 3.0];
-        let v2 = vec![4.0, 5.0, 6.0];
-        // L2sq = (4-1)^2 + (5-2)^2 + (6-3)^2 = 9 + 9 + 9 = 27
-        let dist = compute_distance(&v1, &v2, VectorDistanceMetric::L2sq);
-        assert!((dist - 27.0).abs() < 1e-6);
-    }
-
-    #[test]
-    fn test_compute_distance_cosine() {
-        let v1 = vec![1.0, 0.0, 0.0];
-        let v2 = vec![0.0, 1.0, 0.0];
-        // Orthogonal vectors have cosine similarity of 0, distance of 1
-        let dist = compute_distance(&v1, &v2, VectorDistanceMetric::Cosine);
-        assert!((dist - 1.0).abs() < 1e-6);
-    }
-
-    #[test]
-    fn test_compute_distance_inner_product() {
-        let v1 = vec![1.0, 2.0, 3.0];
-        let v2 = vec![4.0, 5.0, 6.0];
-        // Inner product = 1*4 + 2*5 + 3*6 = 4 + 10 + 18 = 32
-        // Distance is negated: -32
-        let dist = compute_distance(&v1, &v2, VectorDistanceMetric::InnerProduct);
-        assert!((dist - (-32.0)).abs() < 1e-6);
-    }
-
-    #[test]
-    fn test_compute_distance_empty_vectors() {
-        // Empty vectors should return 0.0 uniformly for all metrics
-        assert_eq!(compute_distance(&[], &[], VectorDistanceMetric::L2sq), 0.0);
-        assert_eq!(
-            compute_distance(&[], &[], VectorDistanceMetric::Cosine),
-            0.0
-        );
-        assert_eq!(
-            compute_distance(&[], &[], VectorDistanceMetric::InnerProduct),
-            0.0
-        );
-    }
-}
--- a/src/log-store/src/kafka/client_manager.rs
+++ b/src/log-store/src/kafka/client_manager.rs
@@ -16,7 +16,7 @@ use std::collections::HashMap;
 use std::sync::Arc;

 use common_wal::config::kafka::DatanodeKafkaConfig;
-use common_wal::config::kafka::common::DEFAULT_BACKOFF_CONFIG;
+use common_wal::config::kafka::common::{DEFAULT_BACKOFF_CONFIG, DEFAULT_CONNECT_TIMEOUT};
 use dashmap::DashMap;
 use rskafka::client::ClientBuilder;
 use rskafka::client::partition::{Compression, PartitionClient, UnknownTopicHandling};
@@ -79,8 +79,7 @@ impl ClientManager {
        // Sets backoff config for the top-level kafka client and all clients constructed by it.
        let mut builder = ClientBuilder::new(config.connection.broker_endpoints.clone())
            .backoff_config(DEFAULT_BACKOFF_CONFIG)
-            .connect_timeout(Some(config.connection.connect_timeout))
-            .timeout(Some(config.connection.timeout));
+            .connect_timeout(Some(DEFAULT_CONNECT_TIMEOUT));
        if let Some(sasl) = &config.connection.sasl {
            builder = builder.sasl_config(sasl.config.clone().into_sasl_config());
        };
--- a/src/meta-srv/src/bootstrap.rs
+++ b/src/meta-srv/src/bootstrap.rs
@@ -14,6 +14,7 @@

 use std::net::SocketAddr;
 use std::sync::Arc;
+use std::time::Duration;

 use api::v1::meta::cluster_server::ClusterServer;
 use api::v1::meta::heartbeat_server::HeartbeatServer;
@@ -59,6 +60,11 @@ use crate::service::admin::admin_axum_router;
 use crate::utils::etcd::create_etcd_client_with_tls;
 use crate::{Result, error};

+/// The default keep-alive interval for gRPC.
+const DEFAULT_GRPC_KEEP_ALIVE_INTERVAL: Duration = Duration::from_secs(10);
+/// The default keep-alive timeout for gRPC.
+const DEFAULT_GRPC_KEEP_ALIVE_TIMEOUT: Duration = Duration::from_secs(10);
+
 pub struct MetasrvInstance {
    metasrv: Arc<Metasrv>,

@@ -249,8 +255,8 @@ pub fn router(metasrv: Arc<Metasrv>) -> Router {
        // for admin services
        .accept_http1(true)
        // For quick network failures detection.
-        .http2_keepalive_interval(Some(metasrv.options().grpc.http2_keep_alive_interval))
-        .http2_keepalive_timeout(Some(metasrv.options().grpc.http2_keep_alive_timeout));
+        .http2_keepalive_interval(Some(DEFAULT_GRPC_KEEP_ALIVE_INTERVAL))
+        .http2_keepalive_timeout(Some(DEFAULT_GRPC_KEEP_ALIVE_TIMEOUT));
    let router = add_compressed_service!(router, HeartbeatServer::from_arc(metasrv.clone()));
    let router = add_compressed_service!(router, StoreServer::from_arc(metasrv.clone()));
    let router = add_compressed_service!(router, ClusterServer::from_arc(metasrv.clone()));
@@ -267,12 +273,8 @@ pub async fn metasrv_builder(
        (Some(kv_backend), _) => (kv_backend, None),
        (None, BackendImpl::MemoryStore) => (Arc::new(MemoryKvBackend::new()) as _, None),
        (None, BackendImpl::EtcdStore) => {
-            let etcd_client = create_etcd_client_with_tls(
-                &opts.store_addrs,
-                &opts.backend_client,
-                opts.backend_tls.as_ref(),
-            )
-            .await?;
+            let etcd_client =
+                create_etcd_client_with_tls(&opts.store_addrs, opts.backend_tls.as_ref()).await?;
            let kv_backend = EtcdStore::with_etcd_client(etcd_client.clone(), opts.max_txn_ops);
            let election = EtcdElection::with_etcd_client(
                &opts.grpc.server_addr,
@@ -289,7 +291,7 @@ pub async fn metasrv_builder(

            use common_meta::distributed_time_constants::POSTGRES_KEEP_ALIVE_SECS;
            use common_meta::kv_backend::rds::PgStore;
-            use deadpool_postgres::{Config, ManagerConfig, RecyclingMethod};
+            use deadpool_postgres::Config;

            use crate::election::rds::postgres::{ElectionPgClient, PgElection};
            use crate::utils::postgres::create_postgres_pool;
@@ -303,16 +305,9 @@ pub async fn metasrv_builder(
            let mut cfg = Config::new();
            cfg.keepalives = Some(true);
            cfg.keepalives_idle = Some(Duration::from_secs(POSTGRES_KEEP_ALIVE_SECS));
-            cfg.manager = Some(ManagerConfig {
-                recycling_method: RecyclingMethod::Verified,
-            });
-            // Use a dedicated pool for the election client to allow customized session settings.
-            let pool = create_postgres_pool(
-                &opts.store_addrs,
-                Some(cfg.clone()),
-                opts.backend_tls.clone(),
-            )
-            .await?;
+            // We use a separate pool for election since we need a different session keep-alive idle time.
+            let pool = create_postgres_pool(&opts.store_addrs, Some(cfg), opts.backend_tls.clone())
+                .await?;

            let election_client = ElectionPgClient::new(
                pool,
@@ -332,8 +327,8 @@ pub async fn metasrv_builder(
            )
            .await?;

-            let pool = create_postgres_pool(&opts.store_addrs, Some(cfg), opts.backend_tls.clone())
-                .await?;
+            let pool =
+                create_postgres_pool(&opts.store_addrs, None, opts.backend_tls.clone()).await?;
            let kv_backend = PgStore::with_pg_pool(
                pool,
                opts.meta_schema_name.as_deref(),
--- a/src/meta-srv/src/discovery.rs
+++ b/src/meta-srv/src/discovery.rs
@@ -16,9 +16,13 @@ pub mod lease;
 pub mod node_info;
 pub mod utils;

+use std::time::Duration;
+
 use api::v1::meta::heartbeat_request::NodeWorkloads;
 use common_error::ext::BoxedError;
-use common_meta::distributed_time_constants::default_distributed_time_constants;
+use common_meta::distributed_time_constants::{
+    DATANODE_LEASE_SECS, FLOWNODE_LEASE_SECS, FRONTEND_HEARTBEAT_INTERVAL_MILLIS,
+};
 use common_meta::error::Result;
 use common_meta::peer::{Peer, PeerDiscovery, PeerResolver};
 use common_meta::{DatanodeId, FlownodeId};
@@ -34,7 +38,7 @@ impl PeerDiscovery for MetaPeerClient {
        utils::alive_frontends(
            &DefaultSystemTimer,
            self,
-            default_distributed_time_constants().frontend_heartbeat_interval,
+            Duration::from_millis(FRONTEND_HEARTBEAT_INTERVAL_MILLIS),
        )
        .await
        .map_err(BoxedError::new)
@@ -48,7 +52,7 @@ impl PeerDiscovery for MetaPeerClient {
        utils::alive_datanodes(
            &DefaultSystemTimer,
            self,
-            default_distributed_time_constants().datanode_lease,
+            Duration::from_secs(DATANODE_LEASE_SECS),
            filter,
        )
        .await
@@ -63,7 +67,7 @@ impl PeerDiscovery for MetaPeerClient {
        utils::alive_flownodes(
            &DefaultSystemTimer,
            self,
-            default_distributed_time_constants().flownode_lease,
+            Duration::from_secs(FLOWNODE_LEASE_SECS),
            filter,
        )
        .await
--- a/src/meta-srv/src/discovery/lease.rs
+++ b/src/meta-srv/src/discovery/lease.rs
@@ -102,7 +102,7 @@ mod tests {
    use api::v1::meta::heartbeat_request::NodeWorkloads;
    use api::v1::meta::{DatanodeWorkloads, FlownodeWorkloads};
    use common_meta::cluster::{FrontendStatus, NodeInfo, NodeInfoKey, NodeStatus, Role};
-    use common_meta::distributed_time_constants::default_distributed_time_constants;
+    use common_meta::distributed_time_constants::FRONTEND_HEARTBEAT_INTERVAL_MILLIS;
    use common_meta::kv_backend::ResettableKvBackendRef;
    use common_meta::peer::{Peer, PeerDiscovery};
    use common_meta::rpc::store::PutRequest;
@@ -473,10 +473,8 @@ mod tests {
        let client = create_meta_peer_client();
        let in_memory = client.memory_backend();

-        let frontend_heartbeat_interval =
-            default_distributed_time_constants().frontend_heartbeat_interval;
        let last_activity_ts =
-            current_time_millis() - frontend_heartbeat_interval.as_millis() as i64 - 1000;
+            current_time_millis() - FRONTEND_HEARTBEAT_INTERVAL_MILLIS as i64 - 1000;
        let active_frontend_node = NodeInfo {
            peer: Peer {
                id: 0,
--- a/src/meta-srv/src/failure_detector.rs
+++ b/src/meta-srv/src/failure_detector.rs
@@ -15,6 +15,7 @@
 use std::collections::VecDeque;
 use std::time::Duration;

+use common_meta::distributed_time_constants;
 use serde::{Deserialize, Serialize};

 const FIRST_HEARTBEAT_ESTIMATE_MILLIS: i64 = 1000;
@@ -78,7 +79,9 @@ impl Default for PhiAccrualFailureDetectorOptions {
        Self {
            threshold: 8_f32,
            min_std_deviation: Duration::from_millis(100),
-            acceptable_heartbeat_pause: Duration::from_secs(10),
+            acceptable_heartbeat_pause: Duration::from_secs(
+                distributed_time_constants::DATANODE_LEASE_SECS,
+            ),
        }
    }
 }
--- a/src/meta-srv/src/gc/mock/integration.rs
+++ b/src/meta-srv/src/gc/mock/integration.rs
@@ -135,9 +135,6 @@ async fn test_full_gc_workflow() {
    );
 }

-/// Due to https://github.com/rust-lang/rust/issues/100141 can't have Instant early than process start time on non-linux OS
-/// This is fine since in real usage instant will always be after process start time
-#[cfg(target_os = "linux")]
 #[tokio::test]
 async fn test_tracker_cleanup() {
    init_default_ut_logging();
--- a/src/meta-srv/src/handler/region_lease_handler.rs
+++ b/src/meta-srv/src/handler/region_lease_handler.rs
@@ -134,7 +134,7 @@ mod test {
    use std::sync::Arc;

    use common_meta::datanode::{RegionManifestInfo, RegionStat, Stat};
-    use common_meta::distributed_time_constants::default_distributed_time_constants;
+    use common_meta::distributed_time_constants;
    use common_meta::key::TableMetadataManager;
    use common_meta::key::table_route::TableRouteValue;
    use common_meta::key::test_utils::new_test_table_info;
@@ -236,7 +236,7 @@ mod test {
        let opening_region_keeper = Arc::new(MemoryRegionKeeper::default());

        let handler = RegionLeaseHandler::new(
-            default_distributed_time_constants().region_lease.as_secs(),
+            distributed_time_constants::REGION_LEASE_SECS,
            table_metadata_manager.clone(),
            opening_region_keeper.clone(),
            None,
@@ -266,7 +266,7 @@ mod test {

        assert_eq!(
            acc.region_lease.as_ref().unwrap().lease_seconds,
-            default_distributed_time_constants().region_lease.as_secs()
+            distributed_time_constants::REGION_LEASE_SECS
        );

        assert_region_lease(
@@ -300,7 +300,7 @@ mod test {

        assert_eq!(
            acc.region_lease.as_ref().unwrap().lease_seconds,
-            default_distributed_time_constants().region_lease.as_secs()
+            distributed_time_constants::REGION_LEASE_SECS
        );

        assert_region_lease(
@@ -379,7 +379,7 @@ mod test {
        });

        let handler = RegionLeaseHandler::new(
-            default_distributed_time_constants().region_lease.as_secs(),
+            distributed_time_constants::REGION_LEASE_SECS,
            table_metadata_manager.clone(),
            Default::default(),
            None,
@@ -461,7 +461,7 @@ mod test {
            ..Default::default()
        });
        let handler = RegionLeaseHandler::new(
-            default_distributed_time_constants().region_lease.as_secs(),
+            distributed_time_constants::REGION_LEASE_SECS,
            table_metadata_manager.clone(),
            Default::default(),
            None,
--- a/src/meta-srv/src/metasrv.rs
+++ b/src/meta-srv/src/metasrv.rs
@@ -27,7 +27,7 @@ use common_event_recorder::EventRecorderOptions;
 use common_greptimedb_telemetry::GreptimeDBTelemetryTask;
 use common_meta::cache_invalidator::CacheInvalidatorRef;
 use common_meta::ddl_manager::DdlManagerRef;
-use common_meta::distributed_time_constants::{self, default_distributed_time_constants};
+use common_meta::distributed_time_constants;
 use common_meta::key::TableMetadataManagerRef;
 use common_meta::key::runtime_switch::RuntimeSwitchManagerRef;
 use common_meta::kv_backend::{KvBackendRef, ResettableKvBackend, ResettableKvBackendRef};
@@ -121,27 +121,6 @@ impl Default for StatsPersistenceOptions {
    }
 }

-#[derive(Clone, PartialEq, Serialize, Deserialize, Debug)]
-#[serde(default)]
-pub struct BackendClientOptions {
-    #[serde(with = "humantime_serde")]
-    pub keep_alive_timeout: Duration,
-    #[serde(with = "humantime_serde")]
-    pub keep_alive_interval: Duration,
-    #[serde(with = "humantime_serde")]
-    pub connect_timeout: Duration,
-}
-
-impl Default for BackendClientOptions {
-    fn default() -> Self {
-        Self {
-            keep_alive_interval: Duration::from_secs(10),
-            keep_alive_timeout: Duration::from_secs(3),
-            connect_timeout: Duration::from_secs(3),
-        }
-    }
-}
-
 #[derive(Clone, PartialEq, Serialize, Deserialize)]
 #[serde(default)]
 pub struct MetasrvOptions {
@@ -157,22 +136,12 @@ pub struct MetasrvOptions {
    /// Only applicable when using PostgreSQL or MySQL as the metadata store
    #[serde(default)]
    pub backend_tls: Option<TlsOption>,
-    /// The backend client options.
-    /// Currently, only applicable when using etcd as the metadata store.
-    #[serde(default)]
-    pub backend_client: BackendClientOptions,
    /// The type of selector.
    pub selector: SelectorType,
    /// Whether to use the memory store.
    pub use_memory_store: bool,
    /// Whether to enable region failover.
    pub enable_region_failover: bool,
-    /// The base heartbeat interval.
-    ///
-    /// This value is used to calculate the distributed time constants for components.
-    /// e.g., the region lease time is `heartbeat_interval * 3 + Duration::from_secs(1)`.
-    #[serde(with = "humantime_serde")]
-    pub heartbeat_interval: Duration,
    /// The delay before starting region failure detection.
    /// This delay helps prevent Metasrv from triggering unnecessary region failovers before all Datanodes are fully started.
    /// Especially useful when the cluster is not deployed with GreptimeDB Operator and maintenance mode is not enabled.
@@ -271,9 +240,7 @@ impl fmt::Debug for MetasrvOptions {
            .field("tracing", &self.tracing)
            .field("backend", &self.backend)
            .field("event_recorder", &self.event_recorder)
-            .field("stats_persistence", &self.stats_persistence)
-            .field("heartbeat_interval", &self.heartbeat_interval)
-            .field("backend_client", &self.backend_client);
+            .field("stats_persistence", &self.stats_persistence);

        #[cfg(any(feature = "pg_kvbackend", feature = "mysql_kvbackend"))]
        debug_struct.field("meta_table_name", &self.meta_table_name);
@@ -303,7 +270,6 @@ impl Default for MetasrvOptions {
            selector: SelectorType::default(),
            use_memory_store: false,
            enable_region_failover: false,
-            heartbeat_interval: distributed_time_constants::BASE_HEARTBEAT_INTERVAL,
            region_failure_detector_initialization_delay: Duration::from_secs(10 * 60),
            allow_region_failover_on_local_wal: false,
            grpc: GrpcOptions {
@@ -341,7 +307,6 @@ impl Default for MetasrvOptions {
            event_recorder: EventRecorderOptions::default(),
            stats_persistence: StatsPersistenceOptions::default(),
            gc: GcSchedulerOptions::default(),
-            backend_client: BackendClientOptions::default(),
        }
    }
 }
@@ -782,7 +747,7 @@ impl Metasrv {
            &DefaultSystemTimer,
            self.meta_peer_client.as_ref(),
            peer_id,
-            default_distributed_time_constants().datanode_lease,
+            Duration::from_secs(distributed_time_constants::DATANODE_LEASE_SECS),
        )
        .await
    }
--- a/src/meta-srv/src/metasrv/builder.rs
+++ b/src/meta-srv/src/metasrv/builder.rs
@@ -29,7 +29,7 @@ use common_meta::ddl::{
    DdlContext, NoopRegionFailureDetectorControl, RegionFailureDetectorControllerRef,
 };
 use common_meta::ddl_manager::{DdlManager, DdlManagerConfiguratorRef};
-use common_meta::distributed_time_constants::default_distributed_time_constants;
+use common_meta::distributed_time_constants::{self};
 use common_meta::key::TableMetadataManager;
 use common_meta::key::flow::FlowMetadataManager;
 use common_meta::key::flow::flow_state::FlowStateManager;
@@ -513,7 +513,7 @@ impl MetasrvBuilder {
            Some(handler_group_builder) => handler_group_builder,
            None => {
                let region_lease_handler = RegionLeaseHandler::new(
-                    default_distributed_time_constants().region_lease.as_secs(),
+                    distributed_time_constants::REGION_LEASE_SECS,
                    table_metadata_manager.clone(),
                    memory_region_keeper.clone(),
                    customized_region_lease_renewer,
--- a/src/meta-srv/src/procedure/region_migration.rs
+++ b/src/meta-srv/src/procedure/region_migration.rs
@@ -921,7 +921,7 @@ mod tests {
    use std::assert_matches::assert_matches;
    use std::sync::Arc;

-    use common_meta::distributed_time_constants::default_distributed_time_constants;
+    use common_meta::distributed_time_constants::REGION_LEASE_SECS;
    use common_meta::instruction::Instruction;
    use common_meta::key::test_utils::new_test_table_info;
    use common_meta::rpc::router::{Region, RegionRoute};
@@ -1192,10 +1192,8 @@ mod tests {
            .run_once()
            .await;

-        let region_lease = default_distributed_time_constants().region_lease.as_secs();
-
        // Ensure it didn't run into the slow path.
-        assert!(timer.elapsed().as_secs() < region_lease / 2);
+        assert!(timer.elapsed().as_secs() < REGION_LEASE_SECS / 2);

        runner.suite.verify_table_metadata().await;
    }
@@ -1541,9 +1539,8 @@ mod tests {
            .run_once()
            .await;

-        let region_lease = default_distributed_time_constants().region_lease.as_secs();
        // Ensure it didn't run into the slow path.
-        assert!(timer.elapsed().as_secs() < region_lease);
+        assert!(timer.elapsed().as_secs() < REGION_LEASE_SECS);
        runner.suite.verify_table_metadata().await;
    }
 }
--- a/src/meta-srv/src/procedure/region_migration/close_downgraded_region.rs
+++ b/src/meta-srv/src/procedure/region_migration/close_downgraded_region.rs
@@ -13,10 +13,11 @@
 // limitations under the License.

 use std::any::Any;
+use std::time::Duration;

 use api::v1::meta::MailboxMessage;
 use common_meta::RegionIdent;
-use common_meta::distributed_time_constants::default_distributed_time_constants;
+use common_meta::distributed_time_constants::REGION_LEASE_SECS;
 use common_meta::instruction::{Instruction, InstructionReply, SimpleReply};
 use common_procedure::{Context as ProcedureContext, Status};
 use common_telemetry::{info, warn};
@@ -29,6 +30,9 @@ use crate::procedure::region_migration::migration_end::RegionMigrationEnd;
 use crate::procedure::region_migration::{Context, State};
 use crate::service::mailbox::Channel;

+/// Uses lease time of a region as the timeout of closing a downgraded region.
+const CLOSE_DOWNGRADED_REGION_TIMEOUT: Duration = Duration::from_secs(REGION_LEASE_SECS);
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct CloseDowngradedRegion;

@@ -108,7 +112,7 @@ impl CloseDowngradedRegion {
        let ch = Channel::Datanode(downgrade_leader_datanode.id);
        let receiver = ctx
            .mailbox
-            .send(&ch, msg, default_distributed_time_constants().region_lease)
+            .send(&ch, msg, CLOSE_DOWNGRADED_REGION_TIMEOUT)
            .await?;

        match receiver.await {
--- a/src/meta-srv/src/procedure/region_migration/downgrade_leader_region.rs
+++ b/src/meta-srv/src/procedure/region_migration/downgrade_leader_region.rs
@@ -17,7 +17,7 @@ use std::time::Duration;

 use api::v1::meta::MailboxMessage;
 use common_error::ext::BoxedError;
-use common_meta::distributed_time_constants::default_distributed_time_constants;
+use common_meta::distributed_time_constants::REGION_LEASE_SECS;
 use common_meta::instruction::{
    DowngradeRegion, DowngradeRegionReply, DowngradeRegionsReply, Instruction, InstructionReply,
 };
@@ -64,7 +64,7 @@ impl State for DowngradeLeaderRegion {
        let now = Instant::now();
        // Ensures the `leader_region_lease_deadline` must exist after recovering.
        ctx.volatile_ctx
-            .set_leader_region_lease_deadline(default_distributed_time_constants().region_lease);
+            .set_leader_region_lease_deadline(Duration::from_secs(REGION_LEASE_SECS));

        match self.downgrade_region_with_retry(ctx).await {
            Ok(_) => {
@@ -277,14 +277,14 @@ impl DowngradeLeaderRegion {
        if let Some(last_connection_at) = last_connection_at {
            let now = current_time_millis();
            let elapsed = now - last_connection_at;
-            let region_lease = default_distributed_time_constants().region_lease;
+            let region_lease = Duration::from_secs(REGION_LEASE_SECS);

            // It's safe to update the region leader lease deadline here because:
            // 1. The old region leader has already been marked as downgraded in metadata,
            //    which means any attempts to renew its lease will be rejected.
            // 2. The pusher disconnect time record only gets removed when the datanode (from_peer)
            //    establishes a new heartbeat connection stream.
-            if elapsed >= (region_lease.as_secs() * 1000) as i64 {
+            if elapsed >= (REGION_LEASE_SECS * 1000) as i64 {
                ctx.volatile_ctx.reset_leader_region_lease_deadline();
                info!(
                    "Datanode {}({}) has been disconnected for longer than the region lease period ({:?}), reset leader region lease deadline to None, region: {:?}",
@@ -697,8 +697,7 @@ mod tests {
        let procedure_ctx = new_procedure_context();
        let (next, _) = state.next(&mut ctx, &procedure_ctx).await.unwrap();
        let elapsed = timer.elapsed().as_secs();
-        let region_lease = default_distributed_time_constants().region_lease.as_secs();
-        assert!(elapsed < region_lease / 2);
+        assert!(elapsed < REGION_LEASE_SECS / 2);
        assert_eq!(
            ctx.volatile_ctx
                .leader_region_last_entry_ids
--- a/src/meta-srv/src/procedure/region_migration/open_candidate_region.rs
+++ b/src/meta-srv/src/procedure/region_migration/open_candidate_region.rs
@@ -14,10 +14,11 @@

 use std::any::Any;
 use std::ops::Div;
+use std::time::Duration;

 use api::v1::meta::MailboxMessage;
 use common_meta::RegionIdent;
-use common_meta::distributed_time_constants::default_distributed_time_constants;
+use common_meta::distributed_time_constants::REGION_LEASE_SECS;
 use common_meta::instruction::{Instruction, InstructionReply, OpenRegion, SimpleReply};
 use common_meta::key::datanode_table::RegionInfo;
 use common_procedure::{Context as ProcedureContext, Status};
@@ -32,6 +33,9 @@ use crate::procedure::region_migration::flush_leader_region::PreFlushRegion;
 use crate::procedure::region_migration::{Context, State};
 use crate::service::mailbox::Channel;

+/// Uses lease time of a region as the timeout of opening a candidate region.
+const OPEN_CANDIDATE_REGION_TIMEOUT: Duration = Duration::from_secs(REGION_LEASE_SECS);
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct OpenCandidateRegion;

@@ -153,9 +157,7 @@ impl OpenCandidateRegion {
                .context(error::ExceededDeadlineSnafu {
                    operation: "Open candidate region",
                })?;
-        let operation_timeout = operation_timeout
-            .div(2)
-            .max(default_distributed_time_constants().region_lease);
+        let operation_timeout = operation_timeout.div(2).max(OPEN_CANDIDATE_REGION_TIMEOUT);
        let ch = Channel::Datanode(candidate.id);
        let now = Instant::now();
        let receiver = ctx.mailbox.send(&ch, msg, operation_timeout).await?;
--- a/src/meta-srv/src/service/heartbeat.rs
+++ b/src/meta-srv/src/service/heartbeat.rs
@@ -99,7 +99,6 @@ impl heartbeat_server::Heartbeat for Metasrv {
                            error!("Client disconnected: broken pipe");
                            break;
                        }
-                        error!(err; "Sending heartbeat response error");

                        if tx.send(Err(err)).await.is_err() {
                            info!("ReceiverStream was dropped; shutting down");
--- a/src/meta-srv/src/utils/etcd.rs
+++ b/src/meta-srv/src/utils/etcd.rs
@@ -12,18 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+use common_meta::distributed_time_constants::default_etcd_client_options;
 use common_meta::kv_backend::etcd::create_etcd_tls_options;
-use etcd_client::{Client, ConnectOptions};
+use etcd_client::Client;
 use servers::tls::{TlsMode, TlsOption};
 use snafu::ResultExt;

 use crate::error::{self, BuildTlsOptionsSnafu, Result};
-use crate::metasrv::BackendClientOptions;

 /// Creates an etcd client with TLS configuration.
 pub async fn create_etcd_client_with_tls(
    store_addrs: &[String],
-    client_options: &BackendClientOptions,
    tls_config: Option<&TlsOption>,
 ) -> Result<Client> {
    let etcd_endpoints = store_addrs
@@ -32,12 +31,7 @@ pub async fn create_etcd_client_with_tls(
        .filter(|x| !x.is_empty())
        .collect::<Vec<_>>();

-    let mut connect_options = ConnectOptions::new()
-        .with_keep_alive_while_idle(true)
-        .with_keep_alive(
-            client_options.keep_alive_interval,
-            client_options.keep_alive_timeout,
-        );
+    let mut connect_options = default_etcd_client_options();
    if let Some(tls_config) = tls_config
        && let Some(tls_options) = create_etcd_tls_options(&convert_tls_option(tls_config))
            .context(BuildTlsOptionsSnafu)?
--- a/src/metric-engine/src/engine.rs
+++ b/src/metric-engine/src/engine.rs
@@ -43,10 +43,9 @@ pub(crate) use state::MetricEngineState;
 use store_api::metadata::RegionMetadataRef;
 use store_api::metric_engine_consts::METRIC_ENGINE_NAME;
 use store_api::region_engine::{
-    BatchResponses, CopyRegionFromRequest, CopyRegionFromResponse, RegionEngine,
-    RegionManifestInfo, RegionRole, RegionScannerRef, RegionStatistic, RemapManifestsRequest,
-    RemapManifestsResponse, SetRegionRoleStateResponse, SetRegionRoleStateSuccess,
-    SettableRegionRoleState, SyncManifestResponse,
+    BatchResponses, RegionEngine, RegionManifestInfo, RegionRole, RegionScannerRef,
+    RegionStatistic, RemapManifestsRequest, RemapManifestsResponse, SetRegionRoleStateResponse,
+    SetRegionRoleStateSuccess, SettableRegionRoleState, SyncManifestResponse,
 };
 use store_api::region_request::{
    BatchRegionDdlRequest, RegionCatchupRequest, RegionOpenRequest, RegionRequest,
@@ -376,14 +375,6 @@ impl RegionEngine for MetricEngine {
        }
    }

-    async fn copy_region_from(
-        &self,
-        _region_id: RegionId,
-        _request: CopyRegionFromRequest,
-    ) -> Result<CopyRegionFromResponse, BoxedError> {
-        todo!()
-    }
-
    async fn set_region_role_state_gracefully(
        &self,
        region_id: RegionId,
--- a/src/mito-codec/src/index.rs
+++ b/src/mito-codec/src/index.rs
@@ -48,7 +48,7 @@ impl IndexValueCodec {
    ) -> Result<()> {
        ensure!(!value.is_null(), IndexEncodeNullSnafu);

-        if field.encode_data_type().is_string() {
+        if field.data_type().is_string() {
            let value = value
                .try_into_string()
                .context(FieldTypeMismatchSnafu)?
--- a/src/mito-codec/src/row_converter/dense.rs
+++ b/src/mito-codec/src/row_converter/dense.rs
@@ -57,18 +57,13 @@ impl SortField {
        &self.data_type
    }

-    /// Returns the physical data type to encode of the field.
-    ///
-    /// For example, a dictionary field will be encoded as its value type.
-    pub fn encode_data_type(&self) -> &ConcreteDataType {
-        match &self.data_type {
-            ConcreteDataType::Dictionary(dict_type) => dict_type.value_type(),
-            _ => &self.data_type,
-        }
-    }
-
    pub fn estimated_size(&self) -> usize {
-        Self::estimated_size_by_type(self.encode_data_type())
+        match &self.data_type {
+            ConcreteDataType::Dictionary(dict_type) => {
+                Self::estimated_size_by_type(dict_type.value_type())
+            }
+            data_type => Self::estimated_size_by_type(data_type),
+        }
    }

    fn estimated_size_by_type(data_type: &ConcreteDataType) -> usize {
@@ -103,7 +98,12 @@ impl SortField {
        serializer: &mut Serializer<&mut Vec<u8>>,
        value: &ValueRef,
    ) -> Result<()> {
-        Self::serialize_by_type(self.encode_data_type(), serializer, value)
+        match self.data_type() {
+            ConcreteDataType::Dictionary(dict_type) => {
+                Self::serialize_by_type(dict_type.value_type(), serializer, value)
+            }
+            data_type => Self::serialize_by_type(data_type, serializer, value),
+        }
    }

    fn serialize_by_type(
@@ -194,7 +194,12 @@ impl SortField {

    /// Deserialize a value from the deserializer.
    pub fn deserialize<B: Buf>(&self, deserializer: &mut Deserializer<B>) -> Result<Value> {
-        Self::deserialize_by_type(self.encode_data_type(), deserializer)
+        match &self.data_type {
+            ConcreteDataType::Dictionary(dict_type) => {
+                Self::deserialize_by_type(dict_type.value_type(), deserializer)
+            }
+            data_type => Self::deserialize_by_type(data_type, deserializer),
+        }
    }

    fn deserialize_by_type<B: Buf>(
@@ -296,7 +301,12 @@ impl SortField {
            return Ok(1);
        }

-        Self::skip_deserialize_by_type(self.encode_data_type(), bytes, deserializer)
+        match &self.data_type {
+            ConcreteDataType::Dictionary(dict_type) => {
+                Self::skip_deserialize_by_type(dict_type.value_type(), bytes, deserializer)
+            }
+            data_type => Self::skip_deserialize_by_type(data_type, bytes, deserializer),
+        }
    }

    fn skip_deserialize_by_type(
--- a/src/mito2/Cargo.toml
+++ b/src/mito2/Cargo.toml
@@ -30,7 +30,6 @@ common-error.workspace = true
 common-grpc.workspace = true
 common-macro.workspace = true
 common-meta.workspace = true
-common-memory-manager.workspace = true
 common-query.workspace = true
 common-recordbatch.workspace = true
 common-runtime.workspace = true
@@ -49,7 +48,6 @@ dotenv.workspace = true
 either.workspace = true
 futures.workspace = true
 humantime-serde.workspace = true
-humantime.workspace = true
 index.workspace = true
 itertools.workspace = true
 greptime-proto.workspace = true
--- a/src/mito2/src/cache.rs
+++ b/src/mito2/src/cache.rs
@@ -34,7 +34,6 @@ use index::bloom_filter_index::{BloomFilterIndexCache, BloomFilterIndexCacheRef}
 use index::result_cache::IndexResultCache;
 use moka::notification::RemovalCause;
 use moka::sync::Cache;
-use object_store::ObjectStore;
 use parquet::file::metadata::ParquetMetaData;
 use puffin::puffin_manager::cache::{PuffinMetadataCache, PuffinMetadataCacheRef};
 use store_api::storage::{ConcreteDataType, FileId, RegionId, TimeSeriesRowSelector};
@@ -264,26 +263,6 @@ impl CacheStrategy {
            CacheStrategy::Compaction(_) | CacheStrategy::Disabled => None,
        }
    }
-
-    /// Triggers download if the strategy is [CacheStrategy::EnableAll] and write cache is available.
-    pub fn maybe_download_background(
-        &self,
-        index_key: IndexKey,
-        remote_path: String,
-        remote_store: ObjectStore,
-        file_size: u64,
-    ) {
-        if let CacheStrategy::EnableAll(cache_manager) = self
-            && let Some(write_cache) = cache_manager.write_cache()
-        {
-            write_cache.file_cache().maybe_download_background(
-                index_key,
-                remote_path,
-                remote_store,
-                file_size,
-            );
-        }
-    }
 }

 /// Manages cached data for the engine.
--- a/src/mito2/src/cache/file_cache.rs
+++ b/src/mito2/src/cache/file_cache.rs
@@ -31,7 +31,7 @@ use object_store::{ErrorKind, ObjectStore, Reader};
 use parquet::file::metadata::ParquetMetaData;
 use snafu::ResultExt;
 use store_api::storage::{FileId, RegionId};
-use tokio::sync::mpsc::{Sender, UnboundedReceiver};
+use tokio::sync::mpsc::UnboundedReceiver;

 use crate::access_layer::TempFileCleaner;
 use crate::cache::{FILE_TYPE, INDEX_TYPE};
@@ -55,17 +55,6 @@ pub(crate) const DEFAULT_INDEX_CACHE_PERCENT: u8 = 20;
 /// Minimum capacity for each cache (512MB).
 const MIN_CACHE_CAPACITY: u64 = 512 * 1024 * 1024;

-/// Channel capacity for background download tasks.
-const DOWNLOAD_TASK_CHANNEL_SIZE: usize = 64;
-
-/// A task to download a file in the background.
-struct DownloadTask {
-    index_key: IndexKey,
-    remote_path: String,
-    remote_store: ObjectStore,
-    file_size: u64,
-}
-
 /// Inner struct for FileCache that can be used in spawned tasks.
 #[derive(Debug)]
 struct FileCacheInner {
@@ -181,8 +170,8 @@ impl FileCacheInner {
        remote_path: &str,
        remote_store: &ObjectStore,
        file_size: u64,
-        concurrency: usize,
    ) -> Result<()> {
+        const DOWNLOAD_READER_CONCURRENCY: usize = 8;
        const DOWNLOAD_READER_CHUNK_SIZE: ReadableSize = ReadableSize::mb(8);

        let file_type = index_key.file_type;
@@ -195,7 +184,7 @@ impl FileCacheInner {

        let reader = remote_store
            .reader_with(remote_path)
-            .concurrent(concurrency)
+            .concurrent(DOWNLOAD_READER_CONCURRENCY)
            .chunk(DOWNLOAD_READER_CHUNK_SIZE.as_bytes() as usize)
            .await
            .context(error::OpenDalSnafu)?
@@ -249,14 +238,11 @@ impl FileCacheInner {
        remote_path: &str,
        remote_store: &ObjectStore,
        file_size: u64,
-        concurrency: usize,
    ) -> Result<()> {
        if let Err(e) = self
-            .download_without_cleaning(index_key, remote_path, remote_store, file_size, concurrency)
+            .download_without_cleaning(index_key, remote_path, remote_store, file_size)
            .await
        {
-            error!(e; "Failed to download file '{}' for region {}", remote_path, index_key.region_id);
-
            let filename = index_key.to_string();
            TempFileCleaner::clean_atomic_dir_files(&self.local_store, &[&filename]).await;

@@ -265,11 +251,6 @@ impl FileCacheInner {

        Ok(())
    }
-
-    /// Checks if the key is in the file cache.
-    fn contains_key(&self, key: &IndexKey) -> bool {
-        self.memory_index(key.file_type).contains_key(key)
-    }
 }

 /// A file cache manages files on local store and evict files based
@@ -280,8 +261,6 @@ pub(crate) struct FileCache {
    inner: Arc<FileCacheInner>,
    /// Capacity of the puffin (index) cache in bytes.
    puffin_capacity: u64,
-    /// Channel for background download tasks. None if background worker is disabled.
-    download_task_tx: Option<Sender<DownloadTask>>,
 }

 pub(crate) type FileCacheRef = Arc<FileCache>;
@@ -293,7 +272,6 @@ impl FileCache {
        capacity: ReadableSize,
        ttl: Option<Duration>,
        index_cache_percent: Option<u8>,
-        enable_background_worker: bool,
    ) -> FileCache {
        // Validate and use the provided percent or default
        let index_percent = index_cache_percent
@@ -328,54 +306,12 @@ impl FileCache {
            puffin_index,
        });

-        // Only create channel and spawn worker if background download is enabled
-        let download_task_tx = if enable_background_worker {
-            let (tx, rx) = tokio::sync::mpsc::channel(DOWNLOAD_TASK_CHANNEL_SIZE);
-            Self::spawn_download_worker(inner.clone(), rx);
-            Some(tx)
-        } else {
-            None
-        };
-
        FileCache {
            inner,
            puffin_capacity,
-            download_task_tx,
        }
    }

-    /// Spawns a background worker to process download tasks.
-    fn spawn_download_worker(
-        inner: Arc<FileCacheInner>,
-        mut download_task_rx: tokio::sync::mpsc::Receiver<DownloadTask>,
-    ) {
-        tokio::spawn(async move {
-            info!("Background download worker started");
-            while let Some(task) = download_task_rx.recv().await {
-                // Check if the file is already in the cache
-                if inner.contains_key(&task.index_key) {
-                    debug!(
-                        "Skipping background download for region {}, file {} - already in cache",
-                        task.index_key.region_id, task.index_key.file_id
-                    );
-                    continue;
-                }
-
-                // Ignores background download errors.
-                let _ = inner
-                    .download(
-                        task.index_key,
-                        &task.remote_path,
-                        &task.remote_store,
-                        task.file_size,
-                        1, // Background downloads use concurrency=1
-                    )
-                    .await;
-            }
-            info!("Background download worker stopped");
-        });
-    }
-
    /// Builds a cache for a specific file type.
    fn build_cache(
        local_store: ObjectStore,
@@ -397,9 +333,11 @@ impl FileCache {
                let file_path = cache_file_path(FILE_DIR, *key);
                async move {
                    if let RemovalCause::Replaced = cause {
-                        // The cache is replaced by another file (maybe download again). We don't remove the same
+                        // The cache is replaced by another file. This is unexpected, we don't remove the same
                        // file but updates the metrics as the file is already replaced by users.
                        CACHE_BYTES.with_label_values(&[label]).sub(value.file_size.into());
+                        // TODO(yingwen): Don't log warn later.
+                        warn!("Replace existing cache {} for region {} unexpectedly", file_path, key.region_id);
                        return;
                    }

@@ -615,7 +553,7 @@ impl FileCache {

    /// Checks if the key is in the file cache.
    pub(crate) fn contains_key(&self, key: &IndexKey) -> bool {
-        self.inner.contains_key(key)
+        self.inner.memory_index(key.file_type).contains_key(key)
    }

    /// Returns the capacity of the puffin (index) cache in bytes.
@@ -638,42 +576,9 @@ impl FileCache {
        file_size: u64,
    ) -> Result<()> {
        self.inner
-            .download(index_key, remote_path, remote_store, file_size, 8) // Foreground uses concurrency=8
+            .download(index_key, remote_path, remote_store, file_size)
            .await
    }
-
-    /// Downloads a file in `remote_path` from the remote object store to the local cache
-    /// (specified by `index_key`) in the background. Errors are logged but not returned.
-    ///
-    /// This method attempts to send a download task to the background worker.
-    /// If the channel is full, the task is silently dropped.
-    pub(crate) fn maybe_download_background(
-        &self,
-        index_key: IndexKey,
-        remote_path: String,
-        remote_store: ObjectStore,
-        file_size: u64,
-    ) {
-        // Do nothing if background worker is disabled (channel is None)
-        let Some(tx) = &self.download_task_tx else {
-            return;
-        };
-
-        let task = DownloadTask {
-            index_key,
-            remote_path,
-            remote_store,
-            file_size,
-        };
-
-        // Try to send the task; if the channel is full, just drop it
-        if let Err(e) = tx.try_send(task) {
-            debug!(
-                "Failed to queue background download task for region {}, file {}: {:?}",
-                index_key.region_id, index_key.file_id, e
-            );
-        }
-    }
 }

 /// Key of file cache index.
@@ -803,7 +708,6 @@ mod tests {
            ReadableSize::mb(10),
            Some(Duration::from_millis(10)),
            None,
-            true, // enable_background_worker
        );
        let region_id = RegionId::new(2000, 0);
        let file_id = FileId::random();
@@ -840,13 +744,7 @@ mod tests {
        let dir = create_temp_dir("");
        let local_store = new_fs_store(dir.path().to_str().unwrap());

-        let cache = FileCache::new(
-            local_store.clone(),
-            ReadableSize::mb(10),
-            None,
-            None,
-            true, // enable_background_worker
-        );
+        let cache = FileCache::new(local_store.clone(), ReadableSize::mb(10), None, None);
        let region_id = RegionId::new(2000, 0);
        let file_id = FileId::random();
        let key = IndexKey::new(region_id, file_id, FileType::Parquet);
@@ -894,13 +792,7 @@ mod tests {
        let dir = create_temp_dir("");
        let local_store = new_fs_store(dir.path().to_str().unwrap());

-        let cache = FileCache::new(
-            local_store.clone(),
-            ReadableSize::mb(10),
-            None,
-            None,
-            true, // enable_background_worker
-        );
+        let cache = FileCache::new(local_store.clone(), ReadableSize::mb(10), None, None);
        let region_id = RegionId::new(2000, 0);
        let file_id = FileId::random();
        let key = IndexKey::new(region_id, file_id, FileType::Parquet);
@@ -932,13 +824,7 @@ mod tests {
    async fn test_file_cache_recover() {
        let dir = create_temp_dir("");
        let local_store = new_fs_store(dir.path().to_str().unwrap());
-        let cache = FileCache::new(
-            local_store.clone(),
-            ReadableSize::mb(10),
-            None,
-            None,
-            true, // enable_background_worker
-        );
+        let cache = FileCache::new(local_store.clone(), ReadableSize::mb(10), None, None);

        let region_id = RegionId::new(2000, 0);
        let file_type = FileType::Parquet;
@@ -964,13 +850,7 @@ mod tests {
        }

        // Recover the cache.
-        let cache = FileCache::new(
-            local_store.clone(),
-            ReadableSize::mb(10),
-            None,
-            None,
-            true, // enable_background_worker
-        );
+        let cache = FileCache::new(local_store.clone(), ReadableSize::mb(10), None, None);
        // No entry before recovery.
        assert!(
            cache
@@ -999,13 +879,7 @@ mod tests {
    async fn test_file_cache_read_ranges() {
        let dir = create_temp_dir("");
        let local_store = new_fs_store(dir.path().to_str().unwrap());
-        let file_cache = FileCache::new(
-            local_store.clone(),
-            ReadableSize::mb(10),
-            None,
-            None,
-            true, // enable_background_worker
-        );
+        let file_cache = FileCache::new(local_store.clone(), ReadableSize::mb(10), None, None);
        let region_id = RegionId::new(2000, 0);
        let file_id = FileId::random();
        let key = IndexKey::new(region_id, file_id, FileType::Parquet);
--- a/src/mito2/src/cache/manifest_cache.rs
+++ b/src/mito2/src/cache/manifest_cache.rs
@@ -370,22 +370,7 @@ impl ManifestCache {
    /// If `check_mtime` is true, only removes directories that have not been modified
    /// for at least 1 hour.
    fn clean_empty_dirs_sync(dir: &PathBuf, check_mtime: bool) -> std::io::Result<()> {
-        let is_empty = Self::remove_empty_dirs_recursive_sync(dir, check_mtime)?;
-        if is_empty {
-            if let Err(e) = std::fs::remove_dir(dir) {
-                if e.kind() != std::io::ErrorKind::NotFound {
-                    warn!(e; "Failed to remove empty root dir {}", dir.display());
-                    return Err(e);
-                } else {
-                    warn!("Empty root dir not found before removal {}", dir.display());
-                }
-            } else {
-                info!(
-                    "Removed empty root dir {} from manifest cache",
-                    dir.display()
-                );
-            }
-        }
+        Self::remove_empty_dirs_recursive_sync(dir, check_mtime)?;
        Ok(())
    }

@@ -427,16 +412,11 @@ impl ManifestCache {

                let subdir_empty = Self::remove_empty_dirs_recursive_sync(&path, check_mtime)?;
                if subdir_empty {
-                    if let Err(e) = std::fs::remove_dir(&path) {
-                        if e.kind() != std::io::ErrorKind::NotFound {
-                            warn!(e; "Failed to remove empty directory {}", path.display());
-                            is_empty = false;
-                        } else {
-                            info!(
-                                "Empty directory {} not found before removal",
-                                path.display()
-                            );
-                        }
+                    if let Err(e) = std::fs::remove_dir(&path)
+                        && e.kind() != std::io::ErrorKind::NotFound
+                    {
+                        warn!(e; "Failed to remove empty directory {}", path.display());
+                        is_empty = false;
                    } else {
                        info!(
                            "Removed empty directory {} from manifest cache",
@@ -591,116 +571,4 @@ mod tests {
            cache.cache_file_path("region_1/manifest/00000000000000000007.checkpoint")
        );
    }
-
-    #[tokio::test]
-    async fn test_clean_empty_dirs_sync_no_mtime_check() {
-        common_telemetry::init_default_ut_logging();
-
-        let dir = create_temp_dir("");
-        let root = PathBuf::from(dir.path());
-
-        // Create a directory structure:
-        // root/
-        //   empty_dir1/
-        //   empty_dir2/
-        //     empty_subdir/
-        //   non_empty_dir/
-        //     file.txt
-        //   nested/
-        //     empty_subdir1/
-        //     non_empty_subdir/
-        //       file.txt
-
-        let empty_dir1 = root.join("empty_dir1");
-        let empty_dir2 = root.join("empty_dir2");
-        let empty_subdir = empty_dir2.join("empty_subdir");
-        let non_empty_dir = root.join("non_empty_dir");
-        let nested = root.join("nested");
-        let nested_empty = nested.join("empty_subdir1");
-        let nested_non_empty = nested.join("non_empty_subdir");
-
-        // Create directories
-        std::fs::create_dir_all(&empty_dir1).unwrap();
-        std::fs::create_dir_all(&empty_subdir).unwrap();
-        std::fs::create_dir_all(&non_empty_dir).unwrap();
-        std::fs::create_dir_all(&nested_empty).unwrap();
-        std::fs::create_dir_all(&nested_non_empty).unwrap();
-
-        // Create files in non-empty directories
-        std::fs::write(non_empty_dir.join("file.txt"), b"content").unwrap();
-        std::fs::write(nested_non_empty.join("file.txt"), b"content").unwrap();
-
-        // Verify initial state
-        assert!(empty_dir1.exists());
-        assert!(empty_dir2.exists());
-        assert!(empty_subdir.exists());
-        assert!(non_empty_dir.exists());
-        assert!(nested.exists());
-        assert!(nested_empty.exists());
-        assert!(nested_non_empty.exists());
-
-        // Clean empty directories with check_mtime = false
-        ManifestCache::clean_empty_dirs_sync(&root, false).unwrap();
-
-        // Verify empty directories are removed
-        assert!(!empty_dir1.exists());
-        assert!(!empty_dir2.exists());
-        assert!(!empty_subdir.exists());
-        assert!(!nested_empty.exists());
-
-        // Verify non-empty directories still exist
-        assert!(non_empty_dir.exists());
-        assert!(non_empty_dir.join("file.txt").exists());
-        assert!(nested.exists());
-        assert!(nested_non_empty.exists());
-        assert!(nested_non_empty.join("file.txt").exists());
-    }
-
-    #[tokio::test]
-    async fn test_clean_empty_dirs_sync_with_mtime_check() {
-        common_telemetry::init_default_ut_logging();
-
-        let dir = create_temp_dir("");
-        let root = PathBuf::from(dir.path());
-
-        // Create a directory structure with recently created empty directories
-        // root/
-        //   empty_dir1/
-        //   empty_dir2/
-        //     empty_subdir/
-        //   non_empty_dir/
-        //     file.txt
-
-        let empty_dir1 = root.join("empty_dir1");
-        let empty_dir2 = root.join("empty_dir2");
-        let empty_subdir = empty_dir2.join("empty_subdir");
-        let non_empty_dir = root.join("non_empty_dir");
-
-        // Create directories
-        std::fs::create_dir_all(&empty_dir1).unwrap();
-        std::fs::create_dir_all(&empty_subdir).unwrap();
-        std::fs::create_dir_all(&non_empty_dir).unwrap();
-
-        // Create file in non-empty directory
-        std::fs::write(non_empty_dir.join("file.txt"), b"content").unwrap();
-
-        // Verify initial state
-        assert!(empty_dir1.exists());
-        assert!(empty_dir2.exists());
-        assert!(empty_subdir.exists());
-        assert!(non_empty_dir.exists());
-
-        // Clean empty directories with check_mtime = true
-        // Since the directories were just created (mtime < 1 hour), they should NOT be removed
-        ManifestCache::clean_empty_dirs_sync(&root, true).unwrap();
-
-        // Verify empty directories are NOT removed (they're too recent)
-        assert!(empty_dir1.exists());
-        assert!(empty_dir2.exists());
-        assert!(empty_subdir.exists());
-
-        // Verify non-empty directory still exists
-        assert!(non_empty_dir.exists());
-        assert!(non_empty_dir.join("file.txt").exists());
-    }
 }
--- a/src/mito2/src/cache/write_cache.rs
+++ b/src/mito2/src/cache/write_cache.rs
@@ -63,13 +63,11 @@ pub type WriteCacheRef = Arc<WriteCache>;
 impl WriteCache {
    /// Create the cache with a `local_store` to cache files and a
    /// `object_store_manager` for all object stores.
-    #[allow(clippy::too_many_arguments)]
    pub async fn new(
        local_store: ObjectStore,
        cache_capacity: ReadableSize,
        ttl: Option<Duration>,
        index_cache_percent: Option<u8>,
-        enable_background_worker: bool,
        puffin_manager_factory: PuffinManagerFactory,
        intermediate_manager: IntermediateManager,
        manifest_cache: Option<ManifestCache>,
@@ -81,7 +79,6 @@ impl WriteCache {
            cache_capacity,
            ttl,
            index_cache_percent,
-            enable_background_worker,
        ));
        file_cache.recover(false, Some(task_receiver)).await;

@@ -95,13 +92,11 @@ impl WriteCache {
    }

    /// Creates a write cache based on local fs.
-    #[allow(clippy::too_many_arguments)]
    pub async fn new_fs(
        cache_dir: &str,
        cache_capacity: ReadableSize,
        ttl: Option<Duration>,
        index_cache_percent: Option<u8>,
-        enable_background_worker: bool,
        puffin_manager_factory: PuffinManagerFactory,
        intermediate_manager: IntermediateManager,
        manifest_cache_capacity: ReadableSize,
@@ -122,7 +117,6 @@ impl WriteCache {
            cache_capacity,
            ttl,
            index_cache_percent,
-            enable_background_worker,
            puffin_manager_factory,
            intermediate_manager,
            manifest_cache,
--- a/src/mito2/src/compaction.rs
+++ b/src/mito2/src/compaction.rs
@@ -14,7 +14,6 @@

 mod buckets;
 pub mod compactor;
-pub mod memory_manager;
 pub mod picker;
 pub mod run;
 mod task;
@@ -30,7 +29,6 @@ use std::time::Instant;
 use api::v1::region::compact_request;
 use api::v1::region::compact_request::Options;
 use common_base::Plugins;
-use common_memory_manager::OnExhaustedPolicy;
 use common_meta::key::SchemaMetadataManagerRef;
 use common_telemetry::{debug, error, info, warn};
 use common_time::range::TimestampRange;
@@ -48,8 +46,7 @@ use tokio::sync::mpsc::{self, Sender};
 use crate::access_layer::AccessLayerRef;
 use crate::cache::{CacheManagerRef, CacheStrategy};
 use crate::compaction::compactor::{CompactionRegion, CompactionVersion, DefaultCompactor};
-use crate::compaction::memory_manager::CompactionMemoryManager;
-use crate::compaction::picker::{CompactionTask, PickerOutput, new_picker};
+use crate::compaction::picker::{CompactionTask, new_picker};
 use crate::compaction::task::CompactionTaskImpl;
 use crate::config::MitoConfig;
 use crate::error::{
@@ -107,15 +104,12 @@ pub(crate) struct CompactionScheduler {
    request_sender: Sender<WorkerRequestWithTime>,
    cache_manager: CacheManagerRef,
    engine_config: Arc<MitoConfig>,
-    memory_manager: Arc<CompactionMemoryManager>,
-    memory_policy: OnExhaustedPolicy,
    listener: WorkerListener,
    /// Plugins for the compaction scheduler.
    plugins: Plugins,
 }

 impl CompactionScheduler {
-    #[allow(clippy::too_many_arguments)]
    pub(crate) fn new(
        scheduler: SchedulerRef,
        request_sender: Sender<WorkerRequestWithTime>,
@@ -123,8 +117,6 @@ impl CompactionScheduler {
        engine_config: Arc<MitoConfig>,
        listener: WorkerListener,
        plugins: Plugins,
-        memory_manager: Arc<CompactionMemoryManager>,
-        memory_policy: OnExhaustedPolicy,
    ) -> Self {
        Self {
            scheduler,
@@ -132,8 +124,6 @@ impl CompactionScheduler {
            request_sender,
            cache_manager,
            engine_config,
-            memory_manager,
-            memory_policy,
            listener,
            plugins,
        }
@@ -439,8 +429,7 @@ impl CompactionScheduler {
        };

        // Create a local compaction task.
-        let estimated_bytes = estimate_compaction_bytes(&picker_output);
-        let local_compaction_task = Box::new(CompactionTaskImpl {
+        let mut local_compaction_task = Box::new(CompactionTaskImpl {
            request_sender,
            waiters,
            start_time,
@@ -448,27 +437,18 @@ impl CompactionScheduler {
            picker_output,
            compaction_region,
            compactor: Arc::new(DefaultCompactor {}),
-            memory_manager: self.memory_manager.clone(),
-            memory_policy: self.memory_policy,
-            estimated_memory_bytes: estimated_bytes,
        });

-        self.submit_compaction_task(local_compaction_task, region_id)
-    }
-
-    fn submit_compaction_task(
-        &mut self,
-        mut task: Box<CompactionTaskImpl>,
-        region_id: RegionId,
-    ) -> Result<()> {
+        // Submit the compaction task.
        self.scheduler
            .schedule(Box::pin(async move {
                INFLIGHT_COMPACTION_COUNT.inc();
-                task.run().await;
+                local_compaction_task.run().await;
                INFLIGHT_COMPACTION_COUNT.dec();
            }))
            .map_err(|e| {
                error!(e; "Failed to submit compaction request for region {}", region_id);
+                // If failed to submit the job, we need to remove the region from the scheduler.
                self.region_status.remove(&region_id);
                e
            })
@@ -778,20 +758,6 @@ fn get_expired_ssts(
        .collect()
 }

-/// Estimates compaction memory as the sum of all input files' maximum row-group
-/// uncompressed sizes.
-fn estimate_compaction_bytes(picker_output: &PickerOutput) -> u64 {
-    picker_output
-        .outputs
-        .iter()
-        .flat_map(|output| output.inputs.iter())
-        .map(|file: &FileHandle| {
-            let meta = file.meta_ref();
-            meta.max_row_group_uncompressed_size
-        })
-        .sum()
-}
-
 /// Pending compaction request that is supposed to run after current task is finished,
 /// typically used for manual compactions.
 struct PendingCompaction {
@@ -807,10 +773,9 @@ struct PendingCompaction {
 mod tests {
    use api::v1::region::StrictWindow;
    use common_datasource::compression::CompressionType;
-    use tokio::sync::{Barrier, oneshot};
+    use tokio::sync::oneshot;

    use super::*;
-    use crate::compaction::memory_manager::{CompactionMemoryGuard, new_compaction_memory_manager};
    use crate::manifest::manager::{RegionManifestManager, RegionManifestOptions};
    use crate::region::ManifestContext;
    use crate::sst::FormatType;
@@ -1180,39 +1145,4 @@ mod tests {
        assert_eq!(result.unwrap(), 0); // is there a better way to check this?
        assert_eq!(0, scheduler.region_status.len());
    }
-
-    #[tokio::test]
-    async fn test_concurrent_memory_competition() {
-        let manager = Arc::new(new_compaction_memory_manager(3 * 1024 * 1024)); // 3MB
-        let barrier = Arc::new(Barrier::new(3));
-        let mut handles = vec![];
-
-        // Spawn 3 tasks competing for memory, each trying to acquire 2MB
-        for _i in 0..3 {
-            let mgr = manager.clone();
-            let bar = barrier.clone();
-            let handle = tokio::spawn(async move {
-                bar.wait().await; // Synchronize start
-                mgr.try_acquire(2 * 1024 * 1024)
-            });
-            handles.push(handle);
-        }
-
-        let results: Vec<Option<CompactionMemoryGuard>> = futures::future::join_all(handles)
-            .await
-            .into_iter()
-            .map(|r| r.unwrap())
-            .collect();
-
-        // Only 1 should succeed (3MB limit, 2MB request, can only fit one)
-        let succeeded = results.iter().filter(|r| r.is_some()).count();
-        let failed = results.iter().filter(|r| r.is_none()).count();
-
-        assert_eq!(succeeded, 1, "Expected exactly 1 task to acquire memory");
-        assert_eq!(failed, 2, "Expected 2 tasks to fail");
-
-        // Clean up
-        drop(results);
-        assert_eq!(manager.used_bytes(), 0);
-    }
 }
--- a/src/mito2/src/compaction/compactor.rs
+++ b/src/mito2/src/compaction/compactor.rs
@@ -396,7 +396,6 @@ impl DefaultCompactor {
                time_range: sst_info.time_range,
                level: output.output_level,
                file_size: sst_info.file_size,
-                max_row_group_uncompressed_size: sst_info.max_row_group_uncompressed_size,
                available_indexes: sst_info.index_metadata.build_available_indexes(),
                indexes: sst_info.index_metadata.build_indexes(),
                index_file_size: sst_info.index_metadata.file_size,
--- a/src/mito2/src/compaction/memory_manager.rs
+++ b/src/mito2/src/compaction/memory_manager.rs
@@ -1,50 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use common_memory_manager::{MemoryGuard, MemoryManager, MemoryMetrics};
-
-use crate::metrics::{
-    COMPACTION_MEMORY_IN_USE, COMPACTION_MEMORY_LIMIT, COMPACTION_MEMORY_REJECTED,
-};
-
-/// Compaction-specific memory metrics implementation.
-#[derive(Clone, Copy, Debug, Default)]
-pub struct CompactionMemoryMetrics;
-
-impl MemoryMetrics for CompactionMemoryMetrics {
-    fn set_limit(&self, bytes: i64) {
-        COMPACTION_MEMORY_LIMIT.set(bytes);
-    }
-
-    fn set_in_use(&self, bytes: i64) {
-        COMPACTION_MEMORY_IN_USE.set(bytes);
-    }
-
-    fn inc_rejected(&self, reason: &str) {
-        COMPACTION_MEMORY_REJECTED
-            .with_label_values(&[reason])
-            .inc();
-    }
-}
-
-/// Compaction memory manager.
-pub type CompactionMemoryManager = MemoryManager<CompactionMemoryMetrics>;
-
-/// Compaction memory guard.
-pub type CompactionMemoryGuard = MemoryGuard<CompactionMemoryMetrics>;
-
-/// Helper to construct a compaction memory manager without passing metrics explicitly.
-pub fn new_compaction_memory_manager(limit_bytes: u64) -> CompactionMemoryManager {
-    CompactionMemoryManager::new(limit_bytes, CompactionMemoryMetrics)
-}
--- a/src/mito2/src/compaction/task.rs
+++ b/src/mito2/src/compaction/task.rs
@@ -16,18 +16,16 @@ use std::fmt::{Debug, Formatter};
 use std::sync::Arc;
 use std::time::Instant;

-use common_memory_manager::OnExhaustedPolicy;
 use common_telemetry::{error, info, warn};
 use itertools::Itertools;
 use snafu::ResultExt;
 use tokio::sync::mpsc;

 use crate::compaction::compactor::{CompactionRegion, Compactor};
-use crate::compaction::memory_manager::{CompactionMemoryGuard, CompactionMemoryManager};
 use crate::compaction::picker::{CompactionTask, PickerOutput};
-use crate::error::{CompactRegionSnafu, CompactionMemoryExhaustedSnafu};
+use crate::error::CompactRegionSnafu;
 use crate::manifest::action::{RegionEdit, RegionMetaAction, RegionMetaActionList};
-use crate::metrics::{COMPACTION_FAILURE_COUNT, COMPACTION_MEMORY_WAIT, COMPACTION_STAGE_ELAPSED};
+use crate::metrics::{COMPACTION_FAILURE_COUNT, COMPACTION_STAGE_ELAPSED};
 use crate::region::RegionRoleState;
 use crate::request::{
    BackgroundNotify, CompactionFailed, CompactionFinished, OutputTx, RegionEditResult,
@@ -54,12 +52,6 @@ pub(crate) struct CompactionTaskImpl {
    pub(crate) compactor: Arc<dyn Compactor>,
    /// Output of the picker.
    pub(crate) picker_output: PickerOutput,
-    /// Memory manager to acquire memory budget.
-    pub(crate) memory_manager: Arc<CompactionMemoryManager>,
-    /// Policy when memory is exhausted.
-    pub(crate) memory_policy: OnExhaustedPolicy,
-    /// Estimated memory bytes needed for this compaction.
-    pub(crate) estimated_memory_bytes: u64,
 }

 impl Debug for CompactionTaskImpl {
@@ -89,24 +81,6 @@ impl CompactionTaskImpl {
            .for_each(|o| o.inputs.iter().for_each(|f| f.set_compacting(compacting)));
    }

-    /// Acquires memory budget based on the configured policy.
-    ///
-    /// Returns an error if memory cannot be acquired according to the policy.
-    async fn acquire_memory_with_policy(&self) -> error::Result<CompactionMemoryGuard> {
-        let region_id = self.compaction_region.region_id;
-        let requested_bytes = self.estimated_memory_bytes;
-        let policy = self.memory_policy;
-
-        let _timer = COMPACTION_MEMORY_WAIT.start_timer();
-        self.memory_manager
-            .acquire_with_policy(requested_bytes, policy)
-            .await
-            .context(CompactionMemoryExhaustedSnafu {
-                region_id,
-                policy: format!("{policy:?}"),
-            })
-    }
-
    /// Remove expired ssts files, update manifest immediately
    /// and apply the edit to region version.
    ///
@@ -248,7 +222,7 @@ impl CompactionTaskImpl {
    }

    /// Handles compaction failure, notifies all waiters.
-    pub(crate) fn on_failure(&mut self, err: Arc<error::Error>) {
+    fn on_failure(&mut self, err: Arc<error::Error>) {
        COMPACTION_FAILURE_COUNT.inc();
        for waiter in self.waiters.drain(..) {
            waiter.send(Err(err.clone()).context(CompactRegionSnafu {
@@ -275,26 +249,6 @@ impl CompactionTaskImpl {
 #[async_trait::async_trait]
 impl CompactionTask for CompactionTaskImpl {
    async fn run(&mut self) {
-        // Acquire memory budget before starting compaction
-        let _memory_guard = match self.acquire_memory_with_policy().await {
-            Ok(guard) => guard,
-            Err(e) => {
-                error!(e; "Failed to acquire memory for compaction, region id: {}", self.compaction_region.region_id);
-                let err = Arc::new(e);
-                self.on_failure(err.clone());
-                let notify = BackgroundNotify::CompactionFailed(CompactionFailed {
-                    region_id: self.compaction_region.region_id,
-                    err,
-                });
-                self.send_to_worker(WorkerRequest::Background {
-                    region_id: self.compaction_region.region_id,
-                    notify,
-                })
-                .await;
-                return;
-            }
-        };
-
        let notify = match self.handle_expiration_and_compaction().await {
            Ok(edit) => BackgroundNotify::CompactionFinished(CompactionFinished {
                region_id: self.compaction_region.region_id,
--- a/src/mito2/src/compaction/test_util.rs
+++ b/src/mito2/src/compaction/test_util.rs
@@ -74,7 +74,6 @@ pub fn new_file_handle_with_size_and_sequence(
            ),
            level,
            file_size,
-            max_row_group_uncompressed_size: file_size,
            available_indexes: Default::default(),
            indexes: Default::default(),
            index_file_size: 0,
--- a/src/mito2/src/config.rs
+++ b/src/mito2/src/config.rs
@@ -20,7 +20,6 @@ use std::time::Duration;

 use common_base::memory_limit::MemoryLimit;
 use common_base::readable_size::ReadableSize;
-use common_memory_manager::OnExhaustedPolicy;
 use common_stat::{get_total_cpu_cores, get_total_memory_readable};
 use common_telemetry::warn;
 use serde::{Deserialize, Serialize};
@@ -93,10 +92,6 @@ pub struct MitoConfig {
    pub max_background_compactions: usize,
    /// Max number of running background purge jobs (default: number of cpu cores).
    pub max_background_purges: usize,
-    /// Memory budget for compaction tasks. Setting it to 0 or "unlimited" disables the limit.
-    pub experimental_compaction_memory_limit: MemoryLimit,
-    /// Behavior when compaction cannot acquire memory from the budget.
-    pub experimental_compaction_on_exhausted: OnExhaustedPolicy,

    // Flush configs:
    /// Interval to auto flush a region if it has not flushed yet (default 30 min).
@@ -131,11 +126,6 @@ pub struct MitoConfig {
    /// The remaining capacity is used for data (parquet) files.
    /// Must be between 0 and 100 (exclusive).
    pub index_cache_percent: u8,
-    /// Enable background downloading of files to the local cache when accessed during queries (default: true).
-    /// When enabled, files will be asynchronously downloaded to improve performance for subsequent reads.
-    pub enable_refill_cache_on_read: bool,
-    /// Capacity for manifest cache (default: 256MB).
-    pub manifest_cache_size: ReadableSize,

    // Other configs:
    /// Buffer size for SST writing.
@@ -188,8 +178,6 @@ impl Default for MitoConfig {
            max_background_flushes: divide_num_cpus(2),
            max_background_compactions: divide_num_cpus(4),
            max_background_purges: get_total_cpu_cores(),
-            experimental_compaction_memory_limit: MemoryLimit::Unlimited,
-            experimental_compaction_on_exhausted: OnExhaustedPolicy::default(),
            auto_flush_interval: Duration::from_secs(30 * 60),
            global_write_buffer_size: ReadableSize::gb(1),
            global_write_buffer_reject_size: ReadableSize::gb(2),
@@ -203,8 +191,6 @@ impl Default for MitoConfig {
            write_cache_ttl: None,
            preload_index_cache: true,
            index_cache_percent: DEFAULT_INDEX_CACHE_PERCENT,
-            enable_refill_cache_on_read: true,
-            manifest_cache_size: ReadableSize::mb(256),
            sst_write_buffer_size: DEFAULT_WRITE_BUFFER_SIZE,
            parallel_scan_channel_size: DEFAULT_SCAN_CHANNEL_SIZE,
            max_concurrent_scan_files: DEFAULT_MAX_CONCURRENT_SCAN_FILES,
--- a/src/mito2/src/engine.rs
+++ b/src/mito2/src/engine.rs
@@ -71,8 +71,6 @@ mod sync_test;
 #[cfg(test)]
 mod truncate_test;

-#[cfg(test)]
-mod copy_region_from_test;
 #[cfg(test)]
 mod remap_manifests_test;

@@ -105,9 +103,8 @@ use store_api::metric_engine_consts::{
    MANIFEST_INFO_EXTENSION_KEY, TABLE_COLUMN_METADATA_EXTENSION_KEY,
 };
 use store_api::region_engine::{
-    BatchResponses, CopyRegionFromRequest, CopyRegionFromResponse, MitoCopyRegionFromResponse,
-    RegionEngine, RegionManifestInfo, RegionRole, RegionScannerRef, RegionStatistic,
-    RemapManifestsRequest, RemapManifestsResponse, SetRegionRoleStateResponse,
+    BatchResponses, RegionEngine, RegionManifestInfo, RegionRole, RegionScannerRef,
+    RegionStatistic, RemapManifestsRequest, RemapManifestsResponse, SetRegionRoleStateResponse,
    SettableRegionRoleState, SyncManifestResponse,
 };
 use store_api::region_request::{
@@ -122,8 +119,8 @@ use crate::cache::{CacheManagerRef, CacheStrategy};
 use crate::config::MitoConfig;
 use crate::engine::puffin_index::{IndexEntryContext, collect_index_entries_from_puffin};
 use crate::error::{
-    self, InvalidRequestSnafu, JoinSnafu, MitoManifestInfoSnafu, RecvSnafu, RegionNotFoundSnafu,
-    Result, SerdeJsonSnafu, SerializeColumnMetadataSnafu, SerializeManifestSnafu,
+    InvalidRequestSnafu, JoinSnafu, MitoManifestInfoSnafu, RecvSnafu, RegionNotFoundSnafu, Result,
+    SerdeJsonSnafu, SerializeColumnMetadataSnafu, SerializeManifestSnafu,
 };
 #[cfg(feature = "enterprise")]
 use crate::extension::BoxedExtensionRangeProviderFactory;
@@ -424,17 +421,6 @@ impl MitoEngine {
        rx.await.context(RecvSnafu)?
    }

-    /// Handles copy region from request.
-    ///
-    /// This method is only supported for internal use and is not exposed in the trait implementation.
-    pub async fn copy_region_from(
-        &self,
-        region_id: RegionId,
-        request: CopyRegionFromRequest,
-    ) -> Result<MitoCopyRegionFromResponse> {
-        self.inner.copy_region_from(region_id, request).await
-    }
-
    #[cfg(test)]
    pub(crate) fn get_region(&self, id: RegionId) -> Option<crate::region::MitoRegionRef> {
        self.find_region(id)
@@ -635,9 +621,7 @@ impl MitoEngine {
    }
 }

-/// Check whether the region edit is valid.
-///
-/// Only adding or removing files to region is considered valid now.
+/// Check whether the region edit is valid. Only adding files to region is considered valid now.
 fn is_valid_region_edit(edit: &RegionEdit) -> bool {
    !edit.files_to_add.is_empty()
        && edit.files_to_remove.is_empty()
@@ -1070,18 +1054,6 @@ impl EngineInner {
        Ok(RemapManifestsResponse { new_manifests })
    }

-    async fn copy_region_from(
-        &self,
-        region_id: RegionId,
-        request: CopyRegionFromRequest,
-    ) -> Result<MitoCopyRegionFromResponse> {
-        let (request, receiver) =
-            WorkerRequest::try_from_copy_region_from_request(region_id, request)?;
-        self.workers.submit_to_worker(region_id, request).await?;
-        let response = receiver.await.context(RecvSnafu)??;
-        Ok(response)
-    }
-
    fn role(&self, region_id: RegionId) -> Option<RegionRole> {
        self.workers.get_region(region_id).map(|region| {
            if region.is_follower() {
@@ -1268,19 +1240,6 @@ impl RegionEngine for MitoEngine {
            .map_err(BoxedError::new)
    }

-    async fn copy_region_from(
-        &self,
-        _region_id: RegionId,
-        _request: CopyRegionFromRequest,
-    ) -> Result<CopyRegionFromResponse, BoxedError> {
-        Err(BoxedError::new(
-            error::UnsupportedOperationSnafu {
-                err_msg: "copy_region_from is not supported",
-            }
-            .build(),
-        ))
-    }
-
    fn role(&self, region_id: RegionId) -> Option<RegionRole> {
        self.inner.role(region_id)
    }
--- a/src/mito2/src/engine/basic_test.rs
+++ b/src/mito2/src/engine/basic_test.rs
@@ -872,9 +872,9 @@ StorageSstEntry { file_path: "test/11_0000000002/index/<file_id>.puffin", file_s
 StorageSstEntry { file_path: "test/22_0000000042/<file_id>.parquet", file_size: None, last_modified_ms: None, node_id: None }
 StorageSstEntry { file_path: "test/22_0000000042/index/<file_id>.puffin", file_size: None, last_modified_ms: None, node_id: None }"#).await;
    test_list_ssts_with_format(true, r#"
-ManifestSstEntry { table_dir: "test/", region_id: 47244640257(11, 1), table_id: 11, region_number: 1, region_group: 0, region_sequence: 1, file_id: "<file_id>", index_version: 0, level: 0, file_path: "test/11_0000000001/<file_id>.parquet", file_size: 2837, index_file_path: Some("test/11_0000000001/index/<file_id>.puffin"), index_file_size: Some(250), num_rows: 10, num_row_groups: 1, num_series: Some(1), min_ts: 0::Millisecond, max_ts: 9000::Millisecond, sequence: Some(10), origin_region_id: 47244640257(11, 1), node_id: None, visible: true }
-ManifestSstEntry { table_dir: "test/", region_id: 47244640258(11, 2), table_id: 11, region_number: 2, region_group: 0, region_sequence: 2, file_id: "<file_id>", index_version: 0, level: 0, file_path: "test/11_0000000002/<file_id>.parquet", file_size: 2837, index_file_path: Some("test/11_0000000002/index/<file_id>.puffin"), index_file_size: Some(250), num_rows: 10, num_row_groups: 1, num_series: Some(1), min_ts: 0::Millisecond, max_ts: 9000::Millisecond, sequence: Some(10), origin_region_id: 47244640258(11, 2), node_id: None, visible: true }
-ManifestSstEntry { table_dir: "test/", region_id: 94489280554(22, 42), table_id: 22, region_number: 42, region_group: 0, region_sequence: 42, file_id: "<file_id>", index_version: 0, level: 0, file_path: "test/22_0000000042/<file_id>.parquet", file_size: 2837, index_file_path: Some("test/22_0000000042/index/<file_id>.puffin"), index_file_size: Some(250), num_rows: 10, num_row_groups: 1, num_series: Some(1), min_ts: 0::Millisecond, max_ts: 9000::Millisecond, sequence: Some(10), origin_region_id: 94489280554(22, 42), node_id: None, visible: true }"#, 
+ManifestSstEntry { table_dir: "test/", region_id: 47244640257(11, 1), table_id: 11, region_number: 1, region_group: 0, region_sequence: 1, file_id: "<file_id>", index_version: 0, level: 0, file_path: "test/11_0000000001/<file_id>.parquet", file_size: 2837, index_file_path: Some("test/11_0000000001/index/<file_id>.puffin"), index_file_size: Some(292), num_rows: 10, num_row_groups: 1, num_series: Some(1), min_ts: 0::Millisecond, max_ts: 9000::Millisecond, sequence: Some(10), origin_region_id: 47244640257(11, 1), node_id: None, visible: true }
+ManifestSstEntry { table_dir: "test/", region_id: 47244640258(11, 2), table_id: 11, region_number: 2, region_group: 0, region_sequence: 2, file_id: "<file_id>", index_version: 0, level: 0, file_path: "test/11_0000000002/<file_id>.parquet", file_size: 2837, index_file_path: Some("test/11_0000000002/index/<file_id>.puffin"), index_file_size: Some(292), num_rows: 10, num_row_groups: 1, num_series: Some(1), min_ts: 0::Millisecond, max_ts: 9000::Millisecond, sequence: Some(10), origin_region_id: 47244640258(11, 2), node_id: None, visible: true }
+ManifestSstEntry { table_dir: "test/", region_id: 94489280554(22, 42), table_id: 22, region_number: 42, region_group: 0, region_sequence: 42, file_id: "<file_id>", index_version: 0, level: 0, file_path: "test/22_0000000042/<file_id>.parquet", file_size: 2837, index_file_path: Some("test/22_0000000042/index/<file_id>.puffin"), index_file_size: Some(292), num_rows: 10, num_row_groups: 1, num_series: Some(1), min_ts: 0::Millisecond, max_ts: 9000::Millisecond, sequence: Some(10), origin_region_id: 94489280554(22, 42), node_id: None, visible: true }"#, 
 r#"
 StorageSstEntry { file_path: "test/11_0000000001/<file_id>.parquet", file_size: None, last_modified_ms: None, node_id: None }
 StorageSstEntry { file_path: "test/11_0000000001/index/<file_id>.puffin", file_size: None, last_modified_ms: None, node_id: None }
--- a/src/mito2/src/engine/copy_region_from_test.rs
+++ b/src/mito2/src/engine/copy_region_from_test.rs
@@ -1,361 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::assert_matches::assert_matches;
-use std::fs;
-use std::sync::Arc;
-
-use api::v1::Rows;
-use common_error::ext::ErrorExt;
-use common_error::status_code::StatusCode;
-use object_store::layers::mock::{Error as MockError, ErrorKind, MockLayerBuilder};
-use store_api::region_engine::{CopyRegionFromRequest, RegionEngine, RegionRole};
-use store_api::region_request::{RegionFlushRequest, RegionRequest};
-use store_api::storage::RegionId;
-
-use crate::config::MitoConfig;
-use crate::error::Error;
-use crate::test_util::{CreateRequestBuilder, TestEnv, build_rows, put_rows, rows_schema};
-
-#[tokio::test]
-async fn test_engine_copy_region_from() {
-    common_telemetry::init_default_ut_logging();
-
-    test_engine_copy_region_from_with_format(true, true).await;
-    test_engine_copy_region_from_with_format(true, false).await;
-    test_engine_copy_region_from_with_format(false, true).await;
-    test_engine_copy_region_from_with_format(false, false).await;
-}
-
-async fn test_engine_copy_region_from_with_format(flat_format: bool, with_index: bool) {
-    let mut env = TestEnv::with_prefix("copy-region-from").await;
-    let engine = env
-        .create_engine(MitoConfig {
-            default_experimental_flat_format: flat_format,
-            ..Default::default()
-        })
-        .await;
-    // Creates a source region and adds some data
-    let source_region_id = RegionId::new(1, 1);
-    let mut request = CreateRequestBuilder::new().build();
-    if with_index {
-        request
-            .column_metadatas
-            .iter_mut()
-            .find(|c| c.column_schema.name == "tag_0")
-            .unwrap()
-            .column_schema
-            .set_inverted_index(true);
-    }
-
-    let column_schemas = rows_schema(&request);
-    engine
-        .handle_request(source_region_id, RegionRequest::Create(request.clone()))
-        .await
-        .unwrap();
-    let rows = Rows {
-        schema: column_schemas,
-        rows: build_rows(0, 42),
-    };
-    put_rows(&engine, source_region_id, rows).await;
-    engine
-        .handle_request(
-            source_region_id,
-            RegionRequest::Flush(RegionFlushRequest {
-                row_group_size: None,
-            }),
-        )
-        .await
-        .unwrap();
-
-    // Creates a target region and enters staging mode
-    let target_region_id = RegionId::new(1, 2);
-    engine
-        .handle_request(target_region_id, RegionRequest::Create(request))
-        .await
-        .unwrap();
-    common_telemetry::debug!("copy region from");
-    let resp = engine
-        .copy_region_from(
-            target_region_id,
-            CopyRegionFromRequest {
-                source_region_id,
-                parallelism: 1,
-            },
-        )
-        .await
-        .unwrap();
-
-    let manifest = engine
-        .get_region(target_region_id)
-        .unwrap()
-        .manifest_ctx
-        .manifest()
-        .await;
-    assert!(!manifest.files.is_empty());
-    for meta in manifest.files.values() {
-        assert_eq!(meta.region_id, target_region_id);
-        assert_eq!(meta.exists_index(), with_index);
-    }
-
-    let source_region_dir = format!("{}/data/test/1_0000000001", env.data_home().display());
-    let source_region_files = collect_filename_in_dir(&source_region_dir);
-    let target_region_dir = format!("{}/data/test/1_0000000002", env.data_home().display());
-    let target_region_files = collect_filename_in_dir(&target_region_dir);
-    assert_eq!(source_region_files, target_region_files);
-
-    if with_index {
-        let source_region_index_files =
-            collect_filename_in_dir(&format!("{}/index", source_region_dir));
-        let target_region_index_files =
-            collect_filename_in_dir(&format!("{}/index", target_region_dir));
-        assert_eq!(source_region_index_files, target_region_index_files);
-    }
-    common_telemetry::debug!("copy region from again");
-    let resp2 = engine
-        .copy_region_from(
-            target_region_id,
-            CopyRegionFromRequest {
-                source_region_id,
-                parallelism: 1,
-            },
-        )
-        .await
-        .unwrap();
-    assert_eq!(resp.copied_file_ids, resp2.copied_file_ids);
-}
-
-#[tokio::test]
-async fn test_engine_copy_region_failure() {
-    common_telemetry::init_default_ut_logging();
-    test_engine_copy_region_failure_with_format(false).await;
-    test_engine_copy_region_failure_with_format(true).await;
-}
-
-async fn test_engine_copy_region_failure_with_format(flat_format: bool) {
-    let mock_layer = MockLayerBuilder::default()
-        .copy_interceptor(Arc::new(|from, _, _args| {
-            if from.contains(".puffin") {
-                Some(Err(MockError::new(ErrorKind::Unexpected, "mock err")))
-            } else {
-                None
-            }
-        }))
-        .build()
-        .unwrap();
-    let mut env = TestEnv::new().await.with_mock_layer(mock_layer);
-    let engine = env
-        .create_engine(MitoConfig {
-            default_experimental_flat_format: flat_format,
-            ..Default::default()
-        })
-        .await;
-    // Creates a source region and adds some data
-    let source_region_id = RegionId::new(1, 1);
-    let mut request = CreateRequestBuilder::new().build();
-    request
-        .column_metadatas
-        .iter_mut()
-        .find(|c| c.column_schema.name == "tag_0")
-        .unwrap()
-        .column_schema
-        .set_inverted_index(true);
-
-    let column_schemas = rows_schema(&request);
-    engine
-        .handle_request(source_region_id, RegionRequest::Create(request.clone()))
-        .await
-        .unwrap();
-    let rows = Rows {
-        schema: column_schemas,
-        rows: build_rows(0, 42),
-    };
-    put_rows(&engine, source_region_id, rows).await;
-    engine
-        .handle_request(
-            source_region_id,
-            RegionRequest::Flush(RegionFlushRequest {
-                row_group_size: None,
-            }),
-        )
-        .await
-        .unwrap();
-    let source_region_dir = format!("{}/data/test/1_0000000001", env.data_home().display());
-    assert_file_num_in_dir(&source_region_dir, 1);
-    assert_file_num_in_dir(&format!("{}/index", source_region_dir), 1);
-    let source_region_files = collect_filename_in_dir(&source_region_dir);
-    let source_region_index_files =
-        collect_filename_in_dir(&format!("{}/index", source_region_dir));
-
-    // Creates a target region and enters staging mode
-    let target_region_id = RegionId::new(1, 2);
-    engine
-        .handle_request(target_region_id, RegionRequest::Create(request))
-        .await
-        .unwrap();
-    let err = engine
-        .copy_region_from(
-            target_region_id,
-            CopyRegionFromRequest {
-                source_region_id,
-                parallelism: 1,
-            },
-        )
-        .await
-        .unwrap_err();
-    assert_eq!(err.status_code(), StatusCode::StorageUnavailable);
-
-    // Check target region directory is empty
-    let target_region_dir = format!("{}/data/test/1_0000000002", env.data_home().display());
-    assert_file_num_in_dir(&target_region_dir, 0);
-    assert!(!fs::exists(format!("{}/index", target_region_dir)).unwrap());
-
-    // Check source region directory is not affected
-    let source_region_dir = format!("{}/data/test/1_0000000001", env.data_home().display());
-    assert_file_num_in_dir(&source_region_dir, 1);
-    assert_file_num_in_dir(&format!("{}/index", source_region_dir), 1);
-
-    assert_eq!(
-        source_region_files,
-        collect_filename_in_dir(&source_region_dir)
-    );
-    assert_eq!(
-        source_region_index_files,
-        collect_filename_in_dir(&format!("{}/index", source_region_dir))
-    );
-}
-
-fn assert_file_num_in_dir(dir: &str, expected_num: usize) {
-    let files = fs::read_dir(dir)
-        .unwrap()
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap()
-        .into_iter()
-        .filter(|f| f.metadata().unwrap().is_file())
-        .collect::<Vec<_>>();
-    assert_eq!(
-        files.len(),
-        expected_num,
-        "The number of files in the directory should be {}, got: {:?}",
-        expected_num,
-        files
-    );
-}
-
-fn collect_filename_in_dir(dir: &str) -> Vec<String> {
-    let mut files = fs::read_dir(dir)
-        .unwrap()
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap()
-        .into_iter()
-        .filter(|f| f.metadata().unwrap().is_file())
-        .map(|f| {
-            f.path()
-                .to_string_lossy()
-                .rsplit("/")
-                .last()
-                .unwrap()
-                .to_string()
-        })
-        .collect::<Vec<_>>();
-    files.sort_unstable();
-
-    files
-}
-
-#[tokio::test]
-async fn test_engine_copy_region_invalid_args() {
-    common_telemetry::init_default_ut_logging();
-    test_engine_copy_region_invalid_args_with_format(false).await;
-    test_engine_copy_region_invalid_args_with_format(true).await;
-}
-
-async fn test_engine_copy_region_invalid_args_with_format(flat_format: bool) {
-    let mut env = TestEnv::new().await;
-    let engine = env
-        .create_engine(MitoConfig {
-            default_experimental_flat_format: flat_format,
-            ..Default::default()
-        })
-        .await;
-    let region_id = RegionId::new(1, 1);
-    let request = CreateRequestBuilder::new().build();
-    engine
-        .handle_request(region_id, RegionRequest::Create(request.clone()))
-        .await
-        .unwrap();
-    let err = engine
-        .copy_region_from(
-            region_id,
-            CopyRegionFromRequest {
-                source_region_id: RegionId::new(2, 1),
-                parallelism: 1,
-            },
-        )
-        .await
-        .unwrap_err();
-    assert_eq!(err.status_code(), StatusCode::InvalidArguments);
-    let err = engine
-        .copy_region_from(
-            region_id,
-            CopyRegionFromRequest {
-                source_region_id: RegionId::new(1, 1),
-                parallelism: 1,
-            },
-        )
-        .await
-        .unwrap_err();
-    assert_eq!(err.status_code(), StatusCode::InvalidArguments);
-}
-
-#[tokio::test]
-async fn test_engine_copy_region_unexpected_state() {
-    common_telemetry::init_default_ut_logging();
-    test_engine_copy_region_unexpected_state_with_format(false).await;
-    test_engine_copy_region_unexpected_state_with_format(true).await;
-}
-
-async fn test_engine_copy_region_unexpected_state_with_format(flat_format: bool) {
-    let mut env = TestEnv::new().await;
-    let engine = env
-        .create_engine(MitoConfig {
-            default_experimental_flat_format: flat_format,
-            ..Default::default()
-        })
-        .await;
-    let region_id = RegionId::new(1, 1);
-    let request = CreateRequestBuilder::new().build();
-    engine
-        .handle_request(region_id, RegionRequest::Create(request.clone()))
-        .await
-        .unwrap();
-    engine
-        .set_region_role(region_id, RegionRole::Follower)
-        .unwrap();
-
-    let err = engine
-        .copy_region_from(
-            region_id,
-            CopyRegionFromRequest {
-                source_region_id: RegionId::new(1, 2),
-                parallelism: 1,
-            },
-        )
-        .await
-        .unwrap_err();
-    assert_matches!(
-        err.as_any().downcast_ref::<Error>().unwrap(),
-        Error::RegionState { .. }
-    )
-}
--- a/src/mito2/src/engine/index_build_test.rs
+++ b/src/mito2/src/engine/index_build_test.rs
@@ -160,8 +160,6 @@ async fn test_index_build_type_flush() {

 #[tokio::test]
 async fn test_index_build_type_compact() {
-    common_telemetry::init_default_ut_logging();
-
    let mut env = TestEnv::with_prefix("test_index_build_type_compact_").await;
    let listener = Arc::new(IndexBuildListener::default());
    let engine = env
--- a/src/mito2/src/error.rs
+++ b/src/mito2/src/error.rs
@@ -19,7 +19,6 @@ use common_datasource::compression::CompressionType;
 use common_error::ext::{BoxedError, ErrorExt};
 use common_error::status_code::StatusCode;
 use common_macro::stack_trace_debug;
-use common_memory_manager;
 use common_runtime::JoinError;
 use common_time::Timestamp;
 use common_time::timestamp::TimeUnit;
@@ -1042,16 +1041,6 @@ pub enum Error {
    #[snafu(display("Manual compaction is override by following operations."))]
    ManualCompactionOverride {},

-    #[snafu(display("Compaction memory exhausted for region {region_id} (policy: {policy})",))]
-    CompactionMemoryExhausted {
-        region_id: RegionId,
-        policy: String,
-        #[snafu(source)]
-        source: common_memory_manager::Error,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
    #[snafu(display(
        "Incompatible WAL provider change. This is typically caused by changing WAL provider in database config file without completely cleaning existing files. Global provider: {}, region provider: {}",
        global,
@@ -1173,18 +1162,6 @@ pub enum Error {
        #[snafu(implicit)]
        location: Location,
    },
-
-    #[snafu(display(
-        "Invalid source and target region, source: {}, target: {}",
-        source_region_id,
-        target_region_id
-    ))]
-    InvalidSourceAndTargetRegion {
-        source_region_id: RegionId,
-        target_region_id: RegionId,
-        #[snafu(implicit)]
-        location: Location,
-    },
 }

 pub type Result<T, E = Error> = std::result::Result<T, E>;
@@ -1253,8 +1230,7 @@ impl ErrorExt for Error {
            | MissingManifest { .. }
            | NoOldManifests { .. }
            | MissingPartitionExpr { .. }
-            | SerializePartitionExpr { .. }
-            | InvalidSourceAndTargetRegion { .. } => StatusCode::InvalidArguments,
+            | SerializePartitionExpr { .. } => StatusCode::InvalidArguments,

            RegionMetadataNotFound { .. }
            | Join { .. }
@@ -1347,8 +1323,6 @@ impl ErrorExt for Error {

            ManualCompactionOverride {} => StatusCode::Cancelled,

-            CompactionMemoryExhausted { source, .. } => source.status_code(),
-
            IncompatibleWalProviderChange { .. } => StatusCode::InvalidArguments,

            ScanSeries { source, .. } => source.status_code(),
--- a/src/mito2/src/flush.rs
+++ b/src/mito2/src/flush.rs
@@ -640,7 +640,6 @@ impl RegionFlushTask {
            time_range: sst_info.time_range,
            level: 0,
            file_size: sst_info.file_size,
-            max_row_group_uncompressed_size: sst_info.max_row_group_uncompressed_size,
            available_indexes: sst_info.index_metadata.build_available_indexes(),
            indexes: sst_info.index_metadata.build_indexes(),
            index_file_size: sst_info.index_metadata.file_size,
@@ -774,12 +773,7 @@ fn memtable_flat_sources(
            let iter = only_range.build_record_batch_iter(None)?;
            // Dedup according to append mode and merge mode.
            // Even single range may have duplicate rows.
-            let iter = maybe_dedup_one(
-                options.append_mode,
-                options.merge_mode(),
-                field_column_start,
-                iter,
-            );
+            let iter = maybe_dedup_one(options, field_column_start, iter);
            flat_sources.sources.push(FlatSource::Iter(iter));
        };
    } else {
@@ -801,8 +795,7 @@ fn memtable_flat_sources(
            if last_iter_rows > min_flush_rows {
                let maybe_dedup = merge_and_dedup(
                    &schema,
-                    options.append_mode,
-                    options.merge_mode(),
+                    options,
                    field_column_start,
                    std::mem::replace(&mut input_iters, Vec::with_capacity(num_ranges)),
                )?;
@@ -814,13 +807,7 @@ fn memtable_flat_sources(

        // Handle remaining iters.
        if !input_iters.is_empty() {
-            let maybe_dedup = merge_and_dedup(
-                &schema,
-                options.append_mode,
-                options.merge_mode(),
-                field_column_start,
-                input_iters,
-            )?;
+            let maybe_dedup = merge_and_dedup(&schema, options, field_column_start, input_iters)?;

            flat_sources.sources.push(FlatSource::Iter(maybe_dedup));
        }
@@ -829,64 +816,19 @@ fn memtable_flat_sources(
    Ok(flat_sources)
 }

-/// Merges multiple record batch iterators and applies deduplication based on the specified mode.
-///
-/// This function is used during the flush process to combine data from multiple memtable ranges
-/// into a single stream while handling duplicate records according to the configured merge strategy.
-///
-/// # Arguments
-///
-/// * `schema` - The Arrow schema reference that defines the structure of the record batches
-/// * `append_mode` - When true, no deduplication is performed and all records are preserved.
-///                  This is used for append-only workloads where duplicate handling is not required.
-/// * `merge_mode` - The strategy used for deduplication when not in append mode:
-///   - `MergeMode::LastRow`: Keeps the last record for each primary key
-///   - `MergeMode::LastNonNull`: Keeps the last non-null values for each field
-/// * `field_column_start` - The starting column index for fields in the record batch.
-///                          Used when `MergeMode::LastNonNull` to identify which columns
-///                          contain field values versus primary key columns.
-/// * `input_iters` - A vector of record batch iterators to be merged and deduplicated
-///
-/// # Returns
-///
-/// Returns a boxed record batch iterator that yields the merged and potentially deduplicated
-/// record batches.
-///
-/// # Behavior
-///
-/// 1. Creates a `FlatMergeIterator` to merge all input iterators in sorted order based on
-///    primary key and timestamp
-/// 2. If `append_mode` is true, returns the merge iterator directly without deduplication
-/// 3. If `append_mode` is false, wraps the merge iterator with a `FlatDedupIterator` that
-///    applies the specified merge mode:
-///    - `LastRow`: Removes duplicate rows, keeping only the last one
-///    - `LastNonNull`: Removes duplicates but preserves the last non-null value for each field
-///
-/// # Examples
-///
-/// ```ignore
-/// let merged_iter = merge_and_dedup(
-///     &schema,
-///     false,  // not append mode, apply dedup
-///     MergeMode::LastRow,
-///     2,  // fields start at column 2 after primary key columns
-///     vec![iter1, iter2, iter3],
-/// )?;
-/// ```
-pub fn merge_and_dedup(
+fn merge_and_dedup(
    schema: &SchemaRef,
-    append_mode: bool,
-    merge_mode: MergeMode,
+    options: &RegionOptions,
    field_column_start: usize,
    input_iters: Vec<BoxedRecordBatchIterator>,
 ) -> Result<BoxedRecordBatchIterator> {
    let merge_iter = FlatMergeIterator::new(schema.clone(), input_iters, DEFAULT_READ_BATCH_SIZE)?;
-    let maybe_dedup = if append_mode {
+    let maybe_dedup = if options.append_mode {
        // No dedup in append mode
        Box::new(merge_iter) as _
    } else {
        // Dedup according to merge mode.
-        match merge_mode {
+        match options.merge_mode() {
            MergeMode::LastRow => {
                Box::new(FlatDedupIterator::new(merge_iter, FlatLastRow::new(false))) as _
            }
@@ -899,18 +841,17 @@ pub fn merge_and_dedup(
    Ok(maybe_dedup)
 }

-pub fn maybe_dedup_one(
-    append_mode: bool,
-    merge_mode: MergeMode,
+fn maybe_dedup_one(
+    options: &RegionOptions,
    field_column_start: usize,
    input_iter: BoxedRecordBatchIterator,
 ) -> BoxedRecordBatchIterator {
-    if append_mode {
+    if options.append_mode {
        // No dedup in append mode
        input_iter
    } else {
        // Dedup according to merge mode.
-        match merge_mode {
+        match options.merge_mode() {
            MergeMode::LastRow => {
                Box::new(FlatDedupIterator::new(input_iter, FlatLastRow::new(false)))
            }
--- a/src/mito2/src/gc.rs
+++ b/src/mito2/src/gc.rs
@@ -540,7 +540,7 @@ impl LocalGcWorker {
    fn filter_deletable_files(
        &self,
        entries: Vec<Entry>,
-        in_use_filenames: &HashSet<FileId>,
+        in_use_filenames: &HashSet<&FileId>,
        may_linger_filenames: &HashSet<&FileId>,
        eligible_for_removal: &HashSet<&FileId>,
        unknown_file_may_linger_until: chrono::DateTime<chrono::Utc>,
@@ -641,6 +641,9 @@ impl LocalGcWorker {
            .flatten()
            .collect::<HashSet<_>>();

+        // in use filenames, include sst and index files
+        let in_use_filenames = in_used.iter().collect::<HashSet<_>>();
+
        // When full_file_listing is false, skip expensive list operations and only delete
        // files that are tracked in recently_removed_files
        if !self.full_file_listing {
@@ -650,7 +653,7 @@ impl LocalGcWorker {
            // 3. Have passed the lingering time
            let files_to_delete: Vec<FileId> = eligible_for_removal
                .iter()
-                .filter(|file_id| !in_used.contains(*file_id))
+                .filter(|file_id| !in_use_filenames.contains(*file_id))
                .map(|&f| *f)
                .collect();

@@ -669,7 +672,7 @@ impl LocalGcWorker {
        let (all_unused_files_ready_for_delete, all_in_exist_linger_files) = self
            .filter_deletable_files(
                all_entries,
-                in_used,
+                &in_use_filenames,
                &may_linger_filenames,
                &eligible_for_removal,
                unknown_file_may_linger_until,
--- a/src/mito2/src/manifest/storage.rs
+++ b/src/mito2/src/manifest/storage.rs
@@ -157,8 +157,6 @@ impl ManifestObjectStore {
        total_manifest_size: Arc<AtomicU64>,
        manifest_cache: Option<ManifestCache>,
    ) -> Self {
-        common_telemetry::info!("Create manifest store, cache: {}", manifest_cache.is_some());
-
        let path = util::normalize_dir(path);
        let staging_path = {
            // Convert "region_dir/manifest/" to "region_dir/staging/manifest/"
--- a/src/mito2/src/manifest/tests/checkpoint.rs
+++ b/src/mito2/src/manifest/tests/checkpoint.rs
@@ -244,7 +244,6 @@ async fn checkpoint_with_different_compression_types() {
            time_range: (0.into(), 10000000.into()),
            level: 0,
            file_size: 1024000,
-            max_row_group_uncompressed_size: 1024000,
            available_indexes: Default::default(),
            indexes: Default::default(),
            index_file_size: 0,
@@ -310,7 +309,6 @@ fn generate_action_lists(num: usize) -> (Vec<FileId>, Vec<RegionMetaActionList>)
            time_range: (0.into(), 10000000.into()),
            level: 0,
            file_size: 1024000,
-            max_row_group_uncompressed_size: 1024000,
            available_indexes: Default::default(),
            indexes: Default::default(),
            index_file_size: 0,
--- a/src/mito2/src/memtable.rs
+++ b/src/mito2/src/memtable.rs
@@ -55,8 +55,10 @@ pub mod time_partition;
 pub mod time_series;
 pub(crate) mod version;

+#[cfg(any(test, feature = "test"))]
+pub use bulk::part::BulkPart;
 pub use bulk::part::{
-    BulkPart, BulkPartEncoder, BulkPartMeta, UnorderedPart, record_batch_estimated_size,
+    BulkPartEncoder, BulkPartMeta, UnorderedPart, record_batch_estimated_size,
    sort_primary_key_record_batch,
 };
 #[cfg(any(test, feature = "test"))]
--- a/src/mito2/src/memtable/bulk.rs
+++ b/src/mito2/src/memtable/bulk.rs
@@ -668,10 +668,10 @@ impl BulkMemtable {
 }

 /// Iterator builder for bulk range
-pub struct BulkRangeIterBuilder {
-    pub part: BulkPart,
-    pub context: Arc<BulkIterContext>,
-    pub sequence: Option<SequenceRange>,
+struct BulkRangeIterBuilder {
+    part: BulkPart,
+    context: Arc<BulkIterContext>,
+    sequence: Option<SequenceRange>,
 }

 impl IterBuilder for BulkRangeIterBuilder {
@@ -1188,6 +1188,7 @@ impl MemtableBuilder for BulkMemtableBuilder {

 #[cfg(test)]
 mod tests {
+
    use mito_codec::row_converter::build_primary_key_codec;

    use super::*;
--- a/src/mito2/src/memtable/bulk/part.rs
+++ b/src/mito2/src/memtable/bulk/part.rs
@@ -974,19 +974,6 @@ impl EncodedBulkPart {
    /// Returns a `SstInfo` instance with information derived from this bulk part's metadata
    pub(crate) fn to_sst_info(&self, file_id: FileId) -> SstInfo {
        let unit = self.metadata.region_metadata.time_index_type().unit();
-        let max_row_group_uncompressed_size: u64 = self
-            .metadata
-            .parquet_metadata
-            .row_groups()
-            .iter()
-            .map(|rg| {
-                rg.columns()
-                    .iter()
-                    .map(|c| c.uncompressed_size() as u64)
-                    .sum::<u64>()
-            })
-            .max()
-            .unwrap_or(0);
        SstInfo {
            file_id,
            time_range: (
@@ -994,7 +981,6 @@ impl EncodedBulkPart {
                Timestamp::new(self.metadata.max_timestamp, unit),
            ),
            file_size: self.data.len() as u64,
-            max_row_group_uncompressed_size,
            num_rows: self.metadata.num_rows,
            num_row_groups: self.metadata.parquet_metadata.num_row_groups() as u64,
            file_metadata: Some(self.metadata.parquet_metadata.clone()),
@@ -1211,24 +1197,343 @@ impl BulkPartEncoder {
    }
 }

+/// Converts mutations to record batches.
+fn mutations_to_record_batch(
+    mutations: &[Mutation],
+    metadata: &RegionMetadataRef,
+    pk_encoder: &DensePrimaryKeyCodec,
+    dedup: bool,
+) -> Result<Option<(RecordBatch, i64, i64)>> {
+    let total_rows: usize = mutations
+        .iter()
+        .map(|m| m.rows.as_ref().map(|r| r.rows.len()).unwrap_or(0))
+        .sum();
+
+    if total_rows == 0 {
+        return Ok(None);
+    }
+
+    let mut pk_builder = BinaryBuilder::with_capacity(total_rows, 0);
+
+    let mut ts_vector: Box<dyn MutableVector> = metadata
+        .time_index_column()
+        .column_schema
+        .data_type
+        .create_mutable_vector(total_rows);
+    let mut sequence_builder = UInt64Builder::with_capacity(total_rows);
+    let mut op_type_builder = UInt8Builder::with_capacity(total_rows);
+
+    let mut field_builders: Vec<Box<dyn MutableVector>> = metadata
+        .field_columns()
+        .map(|f| f.column_schema.data_type.create_mutable_vector(total_rows))
+        .collect();
+
+    let mut pk_buffer = vec![];
+    for m in mutations {
+        let Some(key_values) = KeyValuesRef::new(metadata, m) else {
+            continue;
+        };
+
+        for row in key_values.iter() {
+            pk_buffer.clear();
+            pk_encoder
+                .encode_to_vec(row.primary_keys(), &mut pk_buffer)
+                .context(EncodeSnafu)?;
+            pk_builder.append_value(pk_buffer.as_bytes());
+            ts_vector.push_value_ref(&row.timestamp());
+            sequence_builder.append_value(row.sequence());
+            op_type_builder.append_value(row.op_type() as u8);
+            for (builder, field) in field_builders.iter_mut().zip(row.fields()) {
+                builder.push_value_ref(&field);
+            }
+        }
+    }
+
+    let arrow_schema = to_sst_arrow_schema(metadata);
+    // safety: timestamp column must be valid, and values must not be None.
+    let timestamp_unit = metadata
+        .time_index_column()
+        .column_schema
+        .data_type
+        .as_timestamp()
+        .unwrap()
+        .unit();
+    let sorter = ArraysSorter {
+        encoded_primary_keys: pk_builder.finish(),
+        timestamp_unit,
+        timestamp: ts_vector.to_vector().to_arrow_array(),
+        sequence: sequence_builder.finish(),
+        op_type: op_type_builder.finish(),
+        fields: field_builders
+            .iter_mut()
+            .map(|f| f.to_vector().to_arrow_array()),
+        dedup,
+        arrow_schema,
+    };
+
+    sorter.sort().map(Some)
+}
+
+struct ArraysSorter<I> {
+    encoded_primary_keys: BinaryArray,
+    timestamp_unit: TimeUnit,
+    timestamp: ArrayRef,
+    sequence: UInt64Array,
+    op_type: UInt8Array,
+    fields: I,
+    dedup: bool,
+    arrow_schema: SchemaRef,
+}
+
+impl<I> ArraysSorter<I>
+where
+    I: Iterator<Item = ArrayRef>,
+{
+    /// Converts arrays to record batch.
+    fn sort(self) -> Result<(RecordBatch, i64, i64)> {
+        debug_assert!(!self.timestamp.is_empty());
+        debug_assert!(self.timestamp.len() == self.sequence.len());
+        debug_assert!(self.timestamp.len() == self.op_type.len());
+        debug_assert!(self.timestamp.len() == self.encoded_primary_keys.len());
+
+        let timestamp_iter = timestamp_array_to_iter(self.timestamp_unit, &self.timestamp);
+        let (mut min_timestamp, mut max_timestamp) = (i64::MAX, i64::MIN);
+        let mut to_sort = self
+            .encoded_primary_keys
+            .iter()
+            .zip(timestamp_iter)
+            .zip(self.sequence.iter())
+            .map(|((pk, timestamp), sequence)| {
+                max_timestamp = max_timestamp.max(*timestamp);
+                min_timestamp = min_timestamp.min(*timestamp);
+                (pk, timestamp, sequence)
+            })
+            .enumerate()
+            .collect::<Vec<_>>();
+
+        to_sort.sort_unstable_by(|(_, (l_pk, l_ts, l_seq)), (_, (r_pk, r_ts, r_seq))| {
+            l_pk.cmp(r_pk)
+                .then(l_ts.cmp(r_ts))
+                .then(l_seq.cmp(r_seq).reverse())
+        });
+
+        if self.dedup {
+            // Dedup by timestamps while ignore sequence.
+            to_sort.dedup_by(|(_, (l_pk, l_ts, _)), (_, (r_pk, r_ts, _))| {
+                l_pk == r_pk && l_ts == r_ts
+            });
+        }
+
+        let indices = UInt32Array::from_iter_values(to_sort.iter().map(|v| v.0 as u32));
+
+        let pk_dictionary = Arc::new(binary_array_to_dictionary(
+            // safety: pk must be BinaryArray
+            arrow::compute::take(
+                &self.encoded_primary_keys,
+                &indices,
+                Some(TakeOptions {
+                    check_bounds: false,
+                }),
+            )
+            .context(ComputeArrowSnafu)?
+            .as_any()
+            .downcast_ref::<BinaryArray>()
+            .unwrap(),
+        )?) as ArrayRef;
+
+        let mut arrays = Vec::with_capacity(self.arrow_schema.fields.len());
+        for arr in self.fields {
+            arrays.push(
+                arrow::compute::take(
+                    &arr,
+                    &indices,
+                    Some(TakeOptions {
+                        check_bounds: false,
+                    }),
+                )
+                .context(ComputeArrowSnafu)?,
+            );
+        }
+
+        let timestamp = arrow::compute::take(
+            &self.timestamp,
+            &indices,
+            Some(TakeOptions {
+                check_bounds: false,
+            }),
+        )
+        .context(ComputeArrowSnafu)?;
+
+        arrays.push(timestamp);
+        arrays.push(pk_dictionary);
+        arrays.push(
+            arrow::compute::take(
+                &self.sequence,
+                &indices,
+                Some(TakeOptions {
+                    check_bounds: false,
+                }),
+            )
+            .context(ComputeArrowSnafu)?,
+        );
+
+        arrays.push(
+            arrow::compute::take(
+                &self.op_type,
+                &indices,
+                Some(TakeOptions {
+                    check_bounds: false,
+                }),
+            )
+            .context(ComputeArrowSnafu)?,
+        );
+
+        let batch = RecordBatch::try_new(self.arrow_schema, arrays).context(NewRecordBatchSnafu)?;
+        Ok((batch, min_timestamp, max_timestamp))
+    }
+}
+
+/// Converts timestamp array to an iter of i64 values.
+fn timestamp_array_to_iter(
+    timestamp_unit: TimeUnit,
+    timestamp: &ArrayRef,
+) -> impl Iterator<Item = &i64> {
+    match timestamp_unit {
+        // safety: timestamp column must be valid.
+        TimeUnit::Second => timestamp
+            .as_any()
+            .downcast_ref::<TimestampSecondArray>()
+            .unwrap()
+            .values()
+            .iter(),
+        TimeUnit::Millisecond => timestamp
+            .as_any()
+            .downcast_ref::<TimestampMillisecondArray>()
+            .unwrap()
+            .values()
+            .iter(),
+        TimeUnit::Microsecond => timestamp
+            .as_any()
+            .downcast_ref::<TimestampMicrosecondArray>()
+            .unwrap()
+            .values()
+            .iter(),
+        TimeUnit::Nanosecond => timestamp
+            .as_any()
+            .downcast_ref::<TimestampNanosecondArray>()
+            .unwrap()
+            .values()
+            .iter(),
+    }
+}
+
+/// Converts a **sorted** [BinaryArray] to [DictionaryArray].
+fn binary_array_to_dictionary(input: &BinaryArray) -> Result<PrimaryKeyArray> {
+    if input.is_empty() {
+        return Ok(DictionaryArray::new(
+            UInt32Array::from(Vec::<u32>::new()),
+            Arc::new(BinaryArray::from_vec(vec![])) as ArrayRef,
+        ));
+    }
+    let mut keys = Vec::with_capacity(16);
+    let mut values = BinaryBuilder::new();
+    let mut prev: usize = 0;
+    keys.push(prev as u32);
+    values.append_value(input.value(prev));
+
+    for current_bytes in input.iter().skip(1) {
+        // safety: encoded pk must present.
+        let current_bytes = current_bytes.unwrap();
+        let prev_bytes = input.value(prev);
+        if current_bytes != prev_bytes {
+            values.append_value(current_bytes);
+            prev += 1;
+        }
+        keys.push(prev as u32);
+    }
+
+    Ok(DictionaryArray::new(
+        UInt32Array::from(keys),
+        Arc::new(values.finish()) as ArrayRef,
+    ))
+}
+
 #[cfg(test)]
 mod tests {
+    use std::collections::VecDeque;
+
    use api::v1::{Row, SemanticType, WriteHint};
    use datafusion_common::ScalarValue;
    use datatypes::arrow::array::Float64Array;
-    use datatypes::prelude::{ConcreteDataType, Value};
+    use datatypes::prelude::{ConcreteDataType, ScalarVector, Value};
    use datatypes::schema::ColumnSchema;
+    use datatypes::vectors::{Float64Vector, TimestampMillisecondVector};
    use store_api::metadata::{ColumnMetadata, RegionMetadataBuilder};
    use store_api::storage::RegionId;
    use store_api::storage::consts::ReservedColumnId;

    use super::*;
    use crate::memtable::bulk::context::BulkIterContext;
+    use crate::sst::parquet::format::{PrimaryKeyReadFormat, ReadFormat};
    use crate::sst::{FlatSchemaOptions, to_flat_sst_arrow_schema};
    use crate::test_util::memtable_util::{
        build_key_values_with_ts_seq_values, metadata_for_test, region_metadata_to_row_schema,
    };

+    fn check_binary_array_to_dictionary(
+        input: &[&[u8]],
+        expected_keys: &[u32],
+        expected_values: &[&[u8]],
+    ) {
+        let input = BinaryArray::from_iter_values(input.iter());
+        let array = binary_array_to_dictionary(&input).unwrap();
+        assert_eq!(
+            &expected_keys,
+            &array.keys().iter().map(|v| v.unwrap()).collect::<Vec<_>>()
+        );
+        assert_eq!(
+            expected_values,
+            &array
+                .values()
+                .as_any()
+                .downcast_ref::<BinaryArray>()
+                .unwrap()
+                .iter()
+                .map(|v| v.unwrap())
+                .collect::<Vec<_>>()
+        );
+    }
+
+    #[test]
+    fn test_binary_array_to_dictionary() {
+        check_binary_array_to_dictionary(&[], &[], &[]);
+
+        check_binary_array_to_dictionary(&["a".as_bytes()], &[0], &["a".as_bytes()]);
+
+        check_binary_array_to_dictionary(
+            &["a".as_bytes(), "a".as_bytes()],
+            &[0, 0],
+            &["a".as_bytes()],
+        );
+
+        check_binary_array_to_dictionary(
+            &["a".as_bytes(), "a".as_bytes(), "b".as_bytes()],
+            &[0, 0, 1],
+            &["a".as_bytes(), "b".as_bytes()],
+        );
+
+        check_binary_array_to_dictionary(
+            &[
+                "a".as_bytes(),
+                "a".as_bytes(),
+                "b".as_bytes(),
+                "c".as_bytes(),
+            ],
+            &[0, 0, 1, 2],
+            &["a".as_bytes(), "b".as_bytes(), "c".as_bytes()],
+        );
+    }
+
    struct MutationInput<'a> {
        k0: &'a str,
        k1: u32,
@@ -1244,6 +1549,232 @@ mod tests {
        v1: &'a [Option<f64>],
    }

+    fn check_mutations_to_record_batches(
+        input: &[MutationInput],
+        expected: &[BatchOutput],
+        expected_timestamp: (i64, i64),
+        dedup: bool,
+    ) {
+        let metadata = metadata_for_test();
+        let mutations = input
+            .iter()
+            .map(|m| {
+                build_key_values_with_ts_seq_values(
+                    &metadata,
+                    m.k0.to_string(),
+                    m.k1,
+                    m.timestamps.iter().copied(),
+                    m.v1.iter().copied(),
+                    m.sequence,
+                )
+                .mutation
+            })
+            .collect::<Vec<_>>();
+        let total_rows: usize = mutations
+            .iter()
+            .flat_map(|m| m.rows.iter())
+            .map(|r| r.rows.len())
+            .sum();
+
+        let pk_encoder = DensePrimaryKeyCodec::new(&metadata);
+
+        let (batch, _, _) = mutations_to_record_batch(&mutations, &metadata, &pk_encoder, dedup)
+            .unwrap()
+            .unwrap();
+        let read_format = PrimaryKeyReadFormat::new_with_all_columns(metadata.clone());
+        let mut batches = VecDeque::new();
+        read_format
+            .convert_record_batch(&batch, None, &mut batches)
+            .unwrap();
+        if !dedup {
+            assert_eq!(
+                total_rows,
+                batches.iter().map(|b| { b.num_rows() }).sum::<usize>()
+            );
+        }
+        let batch_values = batches
+            .into_iter()
+            .map(|b| {
+                let pk_values = pk_encoder.decode(b.primary_key()).unwrap().into_dense();
+                let timestamps = b
+                    .timestamps()
+                    .as_any()
+                    .downcast_ref::<TimestampMillisecondVector>()
+                    .unwrap()
+                    .iter_data()
+                    .map(|v| v.unwrap().0.value())
+                    .collect::<Vec<_>>();
+                let float_values = b.fields()[1]
+                    .data
+                    .as_any()
+                    .downcast_ref::<Float64Vector>()
+                    .unwrap()
+                    .iter_data()
+                    .collect::<Vec<_>>();
+
+                (pk_values, timestamps, float_values)
+            })
+            .collect::<Vec<_>>();
+        assert_eq!(expected.len(), batch_values.len());
+
+        for idx in 0..expected.len() {
+            assert_eq!(expected[idx].pk_values, &batch_values[idx].0);
+            assert_eq!(expected[idx].timestamps, &batch_values[idx].1);
+            assert_eq!(expected[idx].v1, &batch_values[idx].2);
+        }
+    }
+
+    #[test]
+    fn test_mutations_to_record_batch() {
+        check_mutations_to_record_batches(
+            &[MutationInput {
+                k0: "a",
+                k1: 0,
+                timestamps: &[0],
+                v1: &[Some(0.1)],
+                sequence: 0,
+            }],
+            &[BatchOutput {
+                pk_values: &[Value::String("a".into()), Value::UInt32(0)],
+                timestamps: &[0],
+                v1: &[Some(0.1)],
+            }],
+            (0, 0),
+            true,
+        );
+
+        check_mutations_to_record_batches(
+            &[
+                MutationInput {
+                    k0: "a",
+                    k1: 0,
+                    timestamps: &[0],
+                    v1: &[Some(0.1)],
+                    sequence: 0,
+                },
+                MutationInput {
+                    k0: "b",
+                    k1: 0,
+                    timestamps: &[0],
+                    v1: &[Some(0.0)],
+                    sequence: 0,
+                },
+                MutationInput {
+                    k0: "a",
+                    k1: 0,
+                    timestamps: &[1],
+                    v1: &[Some(0.2)],
+                    sequence: 1,
+                },
+                MutationInput {
+                    k0: "a",
+                    k1: 1,
+                    timestamps: &[1],
+                    v1: &[Some(0.3)],
+                    sequence: 2,
+                },
+            ],
+            &[
+                BatchOutput {
+                    pk_values: &[Value::String("a".into()), Value::UInt32(0)],
+                    timestamps: &[0, 1],
+                    v1: &[Some(0.1), Some(0.2)],
+                },
+                BatchOutput {
+                    pk_values: &[Value::String("a".into()), Value::UInt32(1)],
+                    timestamps: &[1],
+                    v1: &[Some(0.3)],
+                },
+                BatchOutput {
+                    pk_values: &[Value::String("b".into()), Value::UInt32(0)],
+                    timestamps: &[0],
+                    v1: &[Some(0.0)],
+                },
+            ],
+            (0, 1),
+            true,
+        );
+
+        check_mutations_to_record_batches(
+            &[
+                MutationInput {
+                    k0: "a",
+                    k1: 0,
+                    timestamps: &[0],
+                    v1: &[Some(0.1)],
+                    sequence: 0,
+                },
+                MutationInput {
+                    k0: "b",
+                    k1: 0,
+                    timestamps: &[0],
+                    v1: &[Some(0.0)],
+                    sequence: 0,
+                },
+                MutationInput {
+                    k0: "a",
+                    k1: 0,
+                    timestamps: &[0],
+                    v1: &[Some(0.2)],
+                    sequence: 1,
+                },
+            ],
+            &[
+                BatchOutput {
+                    pk_values: &[Value::String("a".into()), Value::UInt32(0)],
+                    timestamps: &[0],
+                    v1: &[Some(0.2)],
+                },
+                BatchOutput {
+                    pk_values: &[Value::String("b".into()), Value::UInt32(0)],
+                    timestamps: &[0],
+                    v1: &[Some(0.0)],
+                },
+            ],
+            (0, 0),
+            true,
+        );
+        check_mutations_to_record_batches(
+            &[
+                MutationInput {
+                    k0: "a",
+                    k1: 0,
+                    timestamps: &[0],
+                    v1: &[Some(0.1)],
+                    sequence: 0,
+                },
+                MutationInput {
+                    k0: "b",
+                    k1: 0,
+                    timestamps: &[0],
+                    v1: &[Some(0.0)],
+                    sequence: 0,
+                },
+                MutationInput {
+                    k0: "a",
+                    k1: 0,
+                    timestamps: &[0],
+                    v1: &[Some(0.2)],
+                    sequence: 1,
+                },
+            ],
+            &[
+                BatchOutput {
+                    pk_values: &[Value::String("a".into()), Value::UInt32(0)],
+                    timestamps: &[0, 0],
+                    v1: &[Some(0.2), Some(0.1)],
+                },
+                BatchOutput {
+                    pk_values: &[Value::String("b".into()), Value::UInt32(0)],
+                    timestamps: &[0],
+                    v1: &[Some(0.0)],
+                },
+            ],
+            (0, 0),
+            false,
+        );
+    }
+
    fn encode(input: &[MutationInput]) -> EncodedBulkPart {
        let metadata = metadata_for_test();
        let kvs = input
--- a/src/mito2/src/metrics.rs
+++ b/src/mito2/src/metrics.rs
@@ -157,35 +157,6 @@ lazy_static! {
            "greptime_mito_inflight_compaction_count",
            "inflight compaction count",
        ).unwrap();
-
-    /// Bytes reserved by compaction memory manager.
-    pub static ref COMPACTION_MEMORY_IN_USE: IntGauge =
-        register_int_gauge!(
-            "greptime_mito_compaction_memory_in_use_bytes",
-            "bytes currently reserved for compaction tasks",
-        )
-        .unwrap();
-    /// Configured compaction memory limit.
-    pub static ref COMPACTION_MEMORY_LIMIT: IntGauge =
-        register_int_gauge!(
-            "greptime_mito_compaction_memory_limit_bytes",
-            "maximum bytes allowed for compaction tasks",
-        )
-        .unwrap();
-    /// Wait time to obtain compaction memory.
-    pub static ref COMPACTION_MEMORY_WAIT: Histogram = register_histogram!(
-        "greptime_mito_compaction_memory_wait_seconds",
-        "time waiting for compaction memory",
-        // 0.01s ~ ~10s
-        exponential_buckets(0.01, 2.0, 10).unwrap(),
-    ).unwrap();
-    /// Counter of rejected compaction memory allocations.
-    pub static ref COMPACTION_MEMORY_REJECTED: IntCounterVec =
-        register_int_counter_vec!(
-            "greptime_mito_compaction_memory_rejected_total",
-            "number of compaction tasks rejected due to memory limit",
-            &[TYPE_LABEL]
-        ).unwrap();
 }

 // Query metrics.
--- a/src/mito2/src/read/scan_util.rs
+++ b/src/mito2/src/read/scan_util.rs
@@ -14,7 +14,7 @@

 //! Utilities for scanners.

-use std::collections::{BinaryHeap, HashMap, VecDeque};
+use std::collections::{HashMap, VecDeque};
 use std::fmt;
 use std::pin::Pin;
 use std::sync::{Arc, Mutex};
@@ -26,6 +26,7 @@ use datafusion::physical_plan::metrics::{ExecutionPlanMetricsSet, MetricBuilder,
 use datatypes::arrow::record_batch::RecordBatch;
 use datatypes::timestamp::timestamp_array_to_primitive;
 use futures::Stream;
+use lazy_static::lazy_static;
 use prometheus::IntGauge;
 use smallvec::SmallVec;
 use snafu::OptionExt;
@@ -52,6 +53,19 @@ use crate::sst::parquet::flat_format::time_index_column_index;
 use crate::sst::parquet::reader::{MetadataCacheMetrics, ReaderFilterMetrics, ReaderMetrics};
 use crate::sst::parquet::row_group::ParquetFetchMetrics;

+lazy_static! {
+    /// Threshold for slow file scan warning in milliseconds.
+    /// Can be configured via SLOW_FILE_SCAN_THRESHOLD_MS environment variable.
+    /// Defaults to 1000ms (1 second).
+    static ref SLOW_FILE_SCAN_THRESHOLD: Duration = {
+        let threshold_ms = std::env::var("SLOW_FILE_SCAN_THRESHOLD_MS")
+            .ok()
+            .and_then(|s| s.parse::<u64>().ok())
+            .unwrap_or(1000);
+        Duration::from_millis(threshold_ms)
+    };
+}
+
 /// Per-file scan metrics.
 #[derive(Default, Clone)]
 pub struct FileScanMetrics {
@@ -206,35 +220,6 @@ pub(crate) struct ScanMetricsSet {
    per_file_metrics: Option<HashMap<RegionFileId, FileScanMetrics>>,
 }

-/// Wrapper for file metrics that compares by total cost in reverse order.
-/// This allows using BinaryHeap as a min-heap for efficient top-K selection.
-struct CompareCostReverse<'a> {
-    total_cost: Duration,
-    file_id: RegionFileId,
-    metrics: &'a FileScanMetrics,
-}
-
-impl Ord for CompareCostReverse<'_> {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        // Reverse comparison: smaller costs are "greater"
-        other.total_cost.cmp(&self.total_cost)
-    }
-}
-
-impl PartialOrd for CompareCostReverse<'_> {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Eq for CompareCostReverse<'_> {}
-
-impl PartialEq for CompareCostReverse<'_> {
-    fn eq(&self, other: &Self) -> bool {
-        self.total_cost == other.total_cost
-    }
-}
-
 impl fmt::Debug for ScanMetricsSet {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        let ScanMetricsSet {
@@ -409,44 +394,12 @@ impl fmt::Debug for ScanMetricsSet {
            write!(f, ", \"dedup_metrics\":{:?}", dedup_metrics)?;
        }

-        // Write top file metrics if present and non-empty
+        // Write per-file metrics if present and non-empty
        if let Some(file_metrics) = per_file_metrics
            && !file_metrics.is_empty()
        {
-            // Use min-heap (BinaryHeap with reverse comparison) to keep only top 10
-            let mut heap = BinaryHeap::new();
-            for (file_id, metrics) in file_metrics.iter() {
-                let total_cost =
-                    metrics.build_part_cost + metrics.build_reader_cost + metrics.scan_cost;
-
-                if heap.len() < 10 {
-                    // Haven't reached 10 yet, just push
-                    heap.push(CompareCostReverse {
-                        total_cost,
-                        file_id: *file_id,
-                        metrics,
-                    });
-                } else if let Some(min_entry) = heap.peek() {
-                    // If current cost is higher than the minimum in our top-10, replace it
-                    if total_cost > min_entry.total_cost {
-                        heap.pop();
-                        heap.push(CompareCostReverse {
-                            total_cost,
-                            file_id: *file_id,
-                            metrics,
-                        });
-                    }
-                }
-            }
-
-            let top_files = heap.into_sorted_vec();
-            write!(f, ", \"top_file_metrics\": {{")?;
-            for (i, item) in top_files.iter().enumerate() {
-                let CompareCostReverse {
-                    total_cost: _,
-                    file_id,
-                    metrics,
-                } = item;
+            write!(f, ", \"per_file_metrics\": {{")?;
+            for (i, (file_id, metrics)) in file_metrics.iter().enumerate() {
                if i > 0 {
                    write!(f, ", ")?;
                }
@@ -1107,6 +1060,18 @@ pub(crate) async fn scan_file_ranges(
        None
    };

+    // Warn if build_part_cost exceeds threshold
+    if reader_metrics.build_cost > *SLOW_FILE_SCAN_THRESHOLD {
+        let file = stream_ctx.input.file_from_index(index);
+        let file_id = file.file_id();
+        common_telemetry::warn!(
+            "Slow file part build detected - region_id: {}, file_id: {}, build_part_cost: {:?}",
+            part_metrics.0.region_id,
+            file_id,
+            reader_metrics.build_cost
+        );
+    }
+
    Ok(build_file_range_scan_stream(
        stream_ctx,
        part_metrics,
@@ -1152,6 +1117,18 @@ pub(crate) async fn scan_flat_file_ranges(
        None
    };

+    // Warn if build_part_cost exceeds threshold
+    if reader_metrics.build_cost > *SLOW_FILE_SCAN_THRESHOLD {
+        let file = stream_ctx.input.file_from_index(index);
+        let file_id = file.file_id();
+        common_telemetry::warn!(
+            "Slow file part build detected - region_id: {}, file_id: {}, build_part_cost: {:?}",
+            part_metrics.0.region_id,
+            file_id,
+            reader_metrics.build_cost
+        );
+    }
+
    Ok(build_flat_file_range_scan_stream(
        stream_ctx,
        part_metrics,
@@ -1195,6 +1172,20 @@ pub fn build_file_range_scan_stream(
            if let Source::PruneReader(reader) = source {
                let prune_metrics = reader.metrics();

+                // Warn if build_cost + scan_cost exceeds threshold
+                let total_cost = build_cost + prune_metrics.scan_cost;
+                if total_cost > *SLOW_FILE_SCAN_THRESHOLD {
+                    let file_id = range.file_handle().file_id();
+                    common_telemetry::warn!(
+                        "Slow file scan detected - region_id: {}, file_id: {}, total_cost: {:?} (build_reader_cost: {:?}, scan_cost: {:?})",
+                        part_metrics.0.region_id,
+                        file_id,
+                        total_cost,
+                        build_cost,
+                        prune_metrics.scan_cost
+                    );
+                }
+
                // Update per-file metrics if tracking is enabled
                if let Some(file_metrics_map) = per_file_metrics.as_mut() {
                    let file_id = range.file_handle().file_id();
@@ -1262,6 +1253,20 @@ pub fn build_flat_file_range_scan_stream(

            let prune_metrics = reader.metrics();

+            // Warn if build_cost + scan_cost exceeds threshold
+            let total_cost = build_cost + prune_metrics.scan_cost;
+            if total_cost > *SLOW_FILE_SCAN_THRESHOLD {
+                let file_id = range.file_handle().file_id();
+                common_telemetry::warn!(
+                    "Slow file scan detected - region_id: {}, file_id: {}, total_cost: {:?} (build_reader_cost: {:?}, scan_cost: {:?})",
+                    part_metrics.0.region_id,
+                    file_id,
+                    total_cost,
+                    build_cost,
+                    prune_metrics.scan_cost
+                );
+            }
+
            // Update per-file metrics if tracking is enabled
            if let Some(file_metrics_map) = per_file_metrics.as_mut() {
                let file_id = range.file_handle().file_id();
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
evenyag	3ed33e1aeb	feat: add slow log and configure by SLOW_FILE_SCAN_THRESHOLD Signed-off-by: evenyag <realevenyag@gmail.com>	2025-12-12 10:41:06 +08:00
evenyag	2fcaa5ebc3	feat: divide build_cost to build_part_cost and build_reader_cost Signed-off-by: evenyag <realevenyag@gmail.com>	2025-12-12 10:41:06 +08:00
evenyag	e2517dec80	feat: collect per file metrics Signed-off-by: evenyag <realevenyag@gmail.com>	2025-12-12 10:41:06 +08:00