sanity check

Signed-off-by: discord9 <discord9@163.com>
more test
2026-01-09 06:42:57 +00:00 · 2025-12-22 13:54:19 +08:00 · 2025-12-22 13:44:00 +08:00
423 changed files with 5371 additions and 24131 deletions
--- a/.github/actions/setup-greptimedb-cluster/action.yml
+++ b/.github/actions/setup-greptimedb-cluster/action.yml
@@ -70,23 +70,19 @@ runs:
        --wait \
        --wait-for-jobs
  - name: Wait for GreptimeDB
-    uses: nick-fields/retry@v3
-    with:
-      timeout_minutes: 3
-      max_attempts: 1
-      shell: bash
-      command: |
-        while true; do
-          PHASE=$(kubectl -n my-greptimedb get gtc my-greptimedb -o jsonpath='{.status.clusterPhase}')
-          if [ "$PHASE" == "Running" ]; then
-            echo "Cluster is ready"
-            break
-          else
-            echo "Cluster is not ready yet: Current phase: $PHASE"
-            kubectl get pods -n my-greptimedb
-            sleep 5 # wait for 5 seconds before check again.
-          fi
-        done
+    shell: bash
+    run: |
+      while true; do
+        PHASE=$(kubectl -n my-greptimedb get gtc my-greptimedb -o jsonpath='{.status.clusterPhase}')
+        if [ "$PHASE" == "Running" ]; then
+          echo "Cluster is ready"
+          break
+        else
+          echo "Cluster is not ready yet: Current phase: $PHASE"
+          kubectl get pods -n my-greptimedb
+          sleep 5 # wait for 5 seconds before check again.
+        fi
+      done
  - name: Print GreptimeDB info
    if: always()
    shell: bash
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -755,7 +755,7 @@ jobs:
        run: ../../.github/scripts/pull-test-deps-images.sh && docker compose up -d --wait

      - name: Run nextest cases
-        run: cargo nextest run --workspace -F dashboard -F pg_kvbackend -F mysql_kvbackend -F vector_index
+        run: cargo nextest run --workspace -F dashboard -F pg_kvbackend -F mysql_kvbackend
        env:
          CARGO_BUILD_RUSTFLAGS: "-C link-arg=-fuse-ld=mold"
          RUST_BACKTRACE: 1
@@ -813,7 +813,7 @@ jobs:
        run: ../../.github/scripts/pull-test-deps-images.sh && docker compose up -d --wait

      - name: Run nextest cases
-        run: cargo llvm-cov nextest --workspace --lcov --output-path lcov.info -F dashboard -F pg_kvbackend -F mysql_kvbackend -F vector_index
+        run: cargo llvm-cov nextest --workspace --lcov --output-path lcov.info -F dashboard -F pg_kvbackend -F mysql_kvbackend
        env:
          CARGO_BUILD_RUSTFLAGS: "-C link-arg=-fuse-ld=mold"
          RUST_BACKTRACE: 1
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,3 @@ greptimedb_data

 # Claude code
 CLAUDE.md
-
-# AGENTS.md
-AGENTS.md
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,11 +15,8 @@ repos:
    rev: v1.0
    hooks:
    -    id: fmt
-         args: ["--", "--check"]
-         stages: [commit-msg]
    -    id: clippy
         args: ["--workspace", "--all-targets", "--all-features", "--", "-D", "warnings"]
-         stages: [commit-msg]
+         stages: [pre-push]
    -    id: cargo-check
         args: ["--workspace", "--all-targets", "--all-features"]
-         stages: [commit-msg]
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -102,30 +102,6 @@ like `feat`/`fix`/`docs`, with a concise summary of code change following. AVOID

 All commit messages SHOULD adhere to the [Conventional Commits specification](https://conventionalcommits.org/).

-## AI-Assisted contributions
-
-We have the following policy for AI-assisted PRs:
-
- The PR author should **understand the core ideas** behind the implementation **end-to-end**, and be able to justify the design and code during review.
- **Calls out unknowns and assumptions**. It's okay to not fully understand some bits of AI generated code. You should comment on these cases and point them out to reviewers so that they can use their knowledge of the codebase to clear up any concerns. For example, you might comment "calling this function here seems to work but I'm not familiar with how it works internally, I wonder if there's a race condition if it is called concurrently".
-
-### Why fully AI-generated PRs without understanding are not helpful
-
-Today, AI tools cannot reliably make complex changes to GreptimeDB on their own, which is why we rely on pull requests and code review.
-
-The purposes of code review are:
-
-1. Finish the intended task.
-2. Share knowledge between authors and reviewers, as a long-term investment in the project. For this reason, even if someone familiar with the codebase can finish a task quickly, we're still happy to help a new contributor work on it even if it takes longer.
-
-An AI dump for an issue doesn’t meet these purposes. Maintainers could finish the task faster by using AI directly, and the submitters gain little knowledge if they act only as a pass through AI proxy without understanding.
-
-Please understand the reviewing capacity is **very limited** for the project, so large PRs which appear to not have the requisite understanding might not get reviewed, and eventually closed or redirected.
-
-### Better ways to contribute than an “AI dump”
-
-It's recommended to write a high-quality issue with a clear problem statement and a minimal, reproducible example. This can make it easier for others to contribute.
-
 ## Getting Help

 There are many ways to get help when you're stuck. It is recommended to ask for help by opening an issue, with a detailed description
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -212,7 +212,7 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"

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

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

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

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

 [[package]]
 name = "cli"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -1817,7 +1817,7 @@ dependencies = [

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

 [[package]]
 name = "cmd"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "async-trait",
 "auth",
@@ -2024,7 +2024,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"

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

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

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

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

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

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

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

 [[package]]
 name = "common-frontend"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "async-trait",
@@ -2183,14 +2183,13 @@ dependencies = [

 [[package]]
 name = "common-function"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "ahash 0.8.12",
 "api",
 "approx 0.5.1",
 "arc-swap",
 "arrow",
- "arrow-cast",
 "arrow-schema",
 "async-trait",
 "bincode",
@@ -2221,7 +2220,6 @@ dependencies = [
 "h3o",
 "hyperloglogplus",
 "jsonb",
- "jsonpath-rust 0.7.5",
 "memchr",
 "mito-codec",
 "nalgebra",
@@ -2245,7 +2243,7 @@ dependencies = [

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

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

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

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

 [[package]]
 name = "common-mem-prof"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "anyhow",
 "common-error",
@@ -2344,7 +2342,7 @@ dependencies = [

 [[package]]
 name = "common-memory-manager"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "common-error",
 "common-macro",
@@ -2357,7 +2355,7 @@ dependencies = [

 [[package]]
 name = "common-meta"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "anymap2",
 "api",
@@ -2429,7 +2427,7 @@ dependencies = [

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

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

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

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

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

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

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

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

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

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

 [[package]]
 name = "common-stat"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "common-base",
 "common-runtime",
@@ -2615,7 +2611,7 @@ dependencies = [

 [[package]]
 name = "common-telemetry"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "backtrace",
 "common-base",
@@ -2644,7 +2640,7 @@ dependencies = [

 [[package]]
 name = "common-test-util"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "client",
 "common-grpc",
@@ -2657,7 +2653,7 @@ dependencies = [

 [[package]]
 name = "common-time"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "arrow",
 "chrono",
@@ -2675,7 +2671,7 @@ dependencies = [

 [[package]]
 name = "common-version"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "build-data",
 "cargo-manifest",
@@ -2686,7 +2682,7 @@ dependencies = [

 [[package]]
 name = "common-wal"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "common-base",
 "common-error",
@@ -2709,7 +2705,7 @@ dependencies = [

 [[package]]
 name = "common-workload"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "common-telemetry",
 "serde",
@@ -4017,7 +4013,7 @@ dependencies = [

 [[package]]
 name = "datanode"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "arrow-flight",
@@ -4062,7 +4058,6 @@ dependencies = [
 "mito2",
 "num_cpus",
 "object-store",
- "partition",
 "prometheus",
 "prost 0.13.5",
 "query",
@@ -4082,7 +4077,7 @@ dependencies = [

 [[package]]
 name = "datatypes"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "arrow",
 "arrow-array",
@@ -4757,7 +4752,7 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"

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

 [[package]]
 name = "flow"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "arrow",
@@ -4958,7 +4953,7 @@ dependencies = [
 "sql",
 "store-api",
 "strum 0.27.1",
- "substrait 1.0.0-beta.4",
+ "substrait 1.0.0-beta.3",
 "table",
 "tokio",
 "tonic 0.13.1",
@@ -5019,7 +5014,7 @@ checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"

 [[package]]
 name = "frontend"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "arc-swap",
@@ -5041,7 +5036,6 @@ dependencies = [
 "common-function",
 "common-grpc",
 "common-macro",
- "common-memory-manager",
 "common-meta",
 "common-options",
 "common-procedure",
@@ -5467,7 +5461,7 @@ dependencies = [
 [[package]]
 name = "greptime-proto"
 version = "0.1.0"
-source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=0e316b86d765e4718d6f0ca77b1ad179f222b822#0e316b86d765e4718d6f0ca77b1ad179f222b822"
+source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=173efe5ec62722089db7c531c0b0d470a072b915#173efe5ec62722089db7c531c0b0d470a072b915"
 dependencies = [
 "prost 0.13.5",
 "prost-types 0.13.5",
@@ -6235,7 +6229,7 @@ dependencies = [

 [[package]]
 name = "index"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "async-trait",
 "asynchronous-codec",
@@ -7176,7 +7170,7 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"

 [[package]]
 name = "log-query"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "chrono",
 "common-error",
@@ -7188,7 +7182,7 @@ dependencies = [

 [[package]]
 name = "log-store"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -7489,7 +7483,7 @@ dependencies = [

 [[package]]
 name = "meta-client"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "async-trait",
@@ -7517,7 +7511,7 @@ dependencies = [

 [[package]]
 name = "meta-srv"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "async-trait",
@@ -7617,7 +7611,7 @@ dependencies = [

 [[package]]
 name = "metric-engine"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "aquamarine",
@@ -7625,7 +7619,6 @@ dependencies = [
 "async-trait",
 "base64 0.22.1",
 "bytes",
- "chrono",
 "common-base",
 "common-error",
 "common-macro",
@@ -7715,7 +7708,7 @@ dependencies = [

 [[package]]
 name = "mito-codec"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "bytes",
@@ -7740,7 +7733,7 @@ dependencies = [

 [[package]]
 name = "mito2"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "aquamarine",
@@ -7780,6 +7773,7 @@ dependencies = [
 "either",
 "futures",
 "greptime-proto",
+ "humantime",
 "humantime-serde",
 "index",
 "itertools 0.14.0",
@@ -7798,7 +7792,6 @@ dependencies = [
 "rand 0.9.1",
 "rayon",
 "regex",
- "roaring",
 "rskafka",
 "rstest",
 "rstest_reuse",
@@ -7817,7 +7810,6 @@ dependencies = [
 "tokio-util",
 "toml 0.8.23",
 "tracing",
- "usearch",
 "uuid",
 ]

@@ -8481,7 +8473,7 @@ dependencies = [

 [[package]]
 name = "object-store"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "anyhow",
 "bytes",
@@ -8766,7 +8758,7 @@ dependencies = [

 [[package]]
 name = "operator"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "ahash 0.8.12",
 "api",
@@ -8826,7 +8818,7 @@ dependencies = [
 "sql",
 "sqlparser",
 "store-api",
- "substrait 1.0.0-beta.4",
+ "substrait 1.0.0-beta.3",
 "table",
 "tokio",
 "tokio-util",
@@ -9112,7 +9104,7 @@ dependencies = [

 [[package]]
 name = "partition"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "async-trait",
@@ -9328,9 +9320,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",
@@ -9349,7 +9341,6 @@ dependencies = [
 "ryu",
 "serde",
 "serde_json",
- "smol_str",
 "stringprep",
 "thiserror 2.0.17",
 "tokio",
@@ -9470,12 +9461,11 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pipeline"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "ahash 0.8.12",
 "api",
 "arrow",
- "arrow-schema",
 "async-trait",
 "catalog",
 "chrono",
@@ -9627,7 +9617,7 @@ dependencies = [

 [[package]]
 name = "plugins"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "auth",
 "catalog",
@@ -9929,7 +9919,7 @@ dependencies = [

 [[package]]
 name = "promql"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "ahash 0.8.12",
 "async-trait",
@@ -9953,9 +9943,9 @@ dependencies = [

 [[package]]
 name = "promql-parser"
-version = "0.7.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c3c2199b84e1253aade469e92ae16cd8dbe1de031c66a00f4f5cdd650290a86"
+checksum = "328fe69c2443ec4f8e6c33ea925dde04a1026e6c95928e89ed02343944cac9bf"
 dependencies = [
 "cfgrammar",
 "chrono",
@@ -9965,6 +9955,7 @@ dependencies = [
 "regex",
 "serde",
 "serde_json",
+ "unescaper",
 ]

 [[package]]
@@ -10211,7 +10202,7 @@ dependencies = [

 [[package]]
 name = "puffin"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "async-compression 0.4.19",
 "async-trait",
@@ -10253,7 +10244,7 @@ dependencies = [

 [[package]]
 name = "query"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "ahash 0.8.12",
 "api",
@@ -10320,11 +10311,12 @@ dependencies = [
 "sql",
 "sqlparser",
 "store-api",
- "substrait 1.0.0-beta.4",
+ "substrait 1.0.0-beta.3",
 "table",
 "tokio",
 "tokio-stream",
 "tracing",
+ "unescaper",
 "uuid",
 ]

@@ -11513,11 +11505,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",
 ]

@@ -11531,20 +11522,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",
@@ -11671,7 +11653,7 @@ dependencies = [

 [[package]]
 name = "servers"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "ahash 0.8.12",
 "api",
@@ -11697,7 +11679,6 @@ dependencies = [
 "common-grpc",
 "common-macro",
 "common-mem-prof",
- "common-memory-manager",
 "common-meta",
 "common-plugins",
 "common-pprof",
@@ -11800,7 +11781,7 @@ dependencies = [

 [[package]]
 name = "session"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "ahash 0.8.12",
 "api",
@@ -12020,16 +12001,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"
@@ -12144,7 +12115,7 @@ dependencies = [

 [[package]]
 name = "sql"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "arrow-buffer",
@@ -12204,7 +12175,7 @@ dependencies = [

 [[package]]
 name = "sqlness-runner"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "async-trait",
 "clap 4.5.40",
@@ -12235,7 +12206,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",
@@ -12259,7 +12230,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",
@@ -12481,7 +12452,7 @@ dependencies = [

 [[package]]
 name = "standalone"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "async-trait",
 "catalog",
@@ -12490,7 +12461,6 @@ dependencies = [
 "common-config",
 "common-error",
 "common-macro",
- "common-memory-manager",
 "common-meta",
 "common-options",
 "common-procedure",
@@ -12523,7 +12493,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

 [[package]]
 name = "store-api"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "aquamarine",
@@ -12736,7 +12706,7 @@ dependencies = [

 [[package]]
 name = "substrait"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "async-trait",
 "bytes",
@@ -12859,7 +12829,7 @@ dependencies = [

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

 [[package]]
 name = "tests-fuzz"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "arbitrary",
 "async-trait",
@@ -13172,7 +13142,7 @@ dependencies = [

 [[package]]
 name = "tests-integration"
-version = "1.0.0-beta.4"
+version = "1.0.0-beta.3"
 dependencies = [
 "api",
 "arrow-flight",
@@ -13193,7 +13163,6 @@ dependencies = [
 "common-event-recorder",
 "common-frontend",
 "common-grpc",
- "common-memory-manager",
 "common-meta",
 "common-procedure",
 "common-query",
@@ -13248,7 +13217,7 @@ dependencies = [
 "sqlx",
 "standalone",
 "store-api",
- "substrait 1.0.0-beta.4",
+ "substrait 1.0.0-beta.3",
 "table",
 "tempfile",
 "time",
@@ -14167,6 +14136,15 @@ dependencies = [
 "version_check",
 ]

+[[package]]
+name = "unescaper"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c01d12e3a56a4432a8b436f293c25f4808bdf9e9f9f98f9260bba1f1bc5a1f26"
+dependencies = [
+ "thiserror 2.0.17",
+]
+
 [[package]]
 name = "unicase"
 version = "2.8.1"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ members = [
 resolver = "2"

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

@@ -103,7 +103,6 @@ aquamarine = "0.6"
 arrow = { version = "56.2", features = ["prettyprint"] }
 arrow-array = { version = "56.2", default-features = false, features = ["chrono-tz"] }
 arrow-buffer = "56.2"
-arrow-cast = "56.2"
 arrow-flight = "56.2"
 arrow-ipc = { version = "56.2", default-features = false, features = ["lz4", "zstd"] }
 arrow-schema = { version = "56.2", features = ["serde"] }
@@ -151,7 +150,7 @@ etcd-client = { version = "0.16.1", features = [
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "0e316b86d765e4718d6f0ca77b1ad179f222b822" }
+greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "173efe5ec62722089db7c531c0b0d470a072b915" }
 hex = "0.4"
 http = "1"
 humantime = "2.1"
@@ -189,7 +188,7 @@ paste = "1.0"
 pin-project = "1.0"
 pretty_assertions = "1.4.0"
 prometheus = { version = "0.13.3", features = ["process"] }
-promql-parser = { version = "0.7.1", features = ["ser"] }
+promql-parser = { version = "0.6", features = ["ser"] }
 prost = { version = "0.13", features = ["no-recursion-limit"] }
 prost-types = "0.13"
 raft-engine = { version = "0.4.1", default-features = false }
@@ -333,7 +332,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/9
+++ b/9
@@ -14,7 +14,6 @@ BUILDX_BUILDER_NAME ?= gtbuilder
 BASE_IMAGE ?= ubuntu
 RUST_TOOLCHAIN ?= $(shell cat rust-toolchain.toml | grep channel | cut -d'"' -f2)
 CARGO_REGISTRY_CACHE ?= ${HOME}/.cargo/registry
-CARGO_GIT_CACHE ?= ${HOME}/.cargo/git
 ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
 OUTPUT_DIR := $(shell if [ "$(RELEASE)" = "true" ]; then echo "release"; elif [ ! -z "$(CARGO_PROFILE)" ]; then echo "$(CARGO_PROFILE)" ; else echo "debug"; fi)
 SQLNESS_OPTS ?=
@@ -87,7 +86,7 @@ build: ## Build debug version greptime.
 build-by-dev-builder: ## Build greptime by dev-builder.
 	docker run --network=host \
 	${ASSEMBLED_EXTRA_BUILD_ENV} \
-	-v ${PWD}:/greptimedb -v ${CARGO_REGISTRY_CACHE}:/root/.cargo/registry -v ${CARGO_GIT_CACHE}:/root/.cargo/git \
+	-v ${PWD}:/greptimedb -v ${CARGO_REGISTRY_CACHE}:/root/.cargo/registry \
 	-w /greptimedb ${IMAGE_REGISTRY}/${IMAGE_NAMESPACE}/dev-builder-${BASE_IMAGE}:${DEV_BUILDER_IMAGE_TAG} \
 	make build \
 	CARGO_EXTENSION="${CARGO_EXTENSION}" \
@@ -101,7 +100,7 @@ build-by-dev-builder: ## Build greptime by dev-builder.
 .PHONY: build-android-bin
 build-android-bin: ## Build greptime binary for android.
 	docker run --network=host \
-	-v ${PWD}:/greptimedb -v ${CARGO_REGISTRY_CACHE}:/root/.cargo/registry -v ${CARGO_GIT_CACHE}:/root/.cargo/git \
+	-v ${PWD}:/greptimedb -v ${CARGO_REGISTRY_CACHE}:/root/.cargo/registry \
 	-w /greptimedb ${IMAGE_REGISTRY}/${IMAGE_NAMESPACE}/dev-builder-android:${DEV_BUILDER_IMAGE_TAG} \
 	make build \
 	CARGO_EXTENSION="ndk --platform 23 -t aarch64-linux-android" \
@@ -207,7 +206,7 @@ fix-udeps: ## Remove unused dependencies automatically.
 	@cargo udeps --workspace --all-targets --output json > udeps-report.json || true
 	@echo "Removing unused dependencies..."
 	@python3 scripts/fix-udeps.py udeps-report.json
-
+	
 .PHONY: fmt-check
 fmt-check: ## Check code format.
 	cargo fmt --all -- --check
@@ -225,7 +224,7 @@ stop-etcd: ## Stop single node etcd for testing purpose.
 .PHONY: run-it-in-container
 run-it-in-container: start-etcd ## Run integration tests in dev-builder.
 	docker run --network=host \
-	-v ${PWD}:/greptimedb -v ${CARGO_REGISTRY_CACHE}:/root/.cargo/registry -v ${CARGO_GIT_CACHE}:/root/.cargo/git -v /tmp:/tmp \
+	-v ${PWD}:/greptimedb -v ${CARGO_REGISTRY_CACHE}:/root/.cargo/registry -v /tmp:/tmp \
 	-w /greptimedb ${IMAGE_REGISTRY}/${IMAGE_NAMESPACE}/dev-builder-${BASE_IMAGE}:${DEV_BUILDER_IMAGE_TAG} \
 	make test sqlness-test BUILD_JOBS=${BUILD_JOBS}

--- a/cliff.toml
+++ b/cliff.toml
@@ -17,7 +17,7 @@ Release date: {{ timestamp | date(format="%B %d, %Y") }}
 {%- set breakings = commits | filter(attribute="breaking", value=true) -%}
 {%- if breakings | length > 0 %}

-### Breaking changes
+## Breaking changes
    {% for commit in breakings %}
      * {{ commit.github.pr_title }}\
        {% if commit.github.username %} by \
--- a/config/config.md
+++ b/config/config.md
@@ -14,12 +14,11 @@
 | --- | -----| ------- | ----------- |
 | `default_timezone` | String | Unset | The default timezone of the server. |
 | `default_column_prefix` | String | Unset | The default column prefix for auto-created time index and value columns. |
-| `max_in_flight_write_bytes` | String | Unset | Maximum total memory for all concurrent write request bodies and messages (HTTP, gRPC, Flight).<br/>Set to 0 to disable the limit. Default: "0" (unlimited) |
-| `write_bytes_exhausted_policy` | String | Unset | Policy when write bytes quota is exhausted.<br/>Options: "wait" (default, 10s timeout), "wait(<duration>)" (e.g., "wait(30s)"), "fail" |
 | `init_regions_in_background` | Bool | `false` | Initialize all regions in the background during the startup.<br/>By default, it provides services after all regions have been initialized. |
 | `init_regions_parallelism` | Integer | `16` | Parallelism of initializing regions. |
 | `max_concurrent_queries` | Integer | `0` | The maximum current queries allowed to be executed. Zero means unlimited.<br/>NOTE: This setting affects scan_memory_limit's privileged tier allocation.<br/>When set, 70% of queries get privileged memory access (full scan_memory_limit).<br/>The remaining 30% get standard tier access (70% of scan_memory_limit). |
 | `enable_telemetry` | Bool | `true` | Enable telemetry to collect anonymous usage data. Enabled by default. |
+| `max_in_flight_write_bytes` | String | Unset | The maximum in-flight write bytes. |
 | `runtime` | -- | -- | The runtime options. |
 | `runtime.global_rt_size` | Integer | `8` | The number of threads to execute the runtime for global read operations. |
 | `runtime.compact_rt_size` | Integer | `4` | The number of threads to execute the runtime for global write operations. |
@@ -27,12 +26,14 @@
 | `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. |
 | `http.body_limit` | String | `64MB` | HTTP request body limit.<br/>The following units are supported: `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`.<br/>Set to 0 to disable limit. |
+| `http.max_total_body_memory` | String | Unset | Maximum total memory for all concurrent HTTP request bodies.<br/>Set to 0 to disable the limit. Default: "0" (unlimited) |
 | `http.enable_cors` | Bool | `true` | HTTP CORS support, it's turned on by default<br/>This allows browser to access http APIs without CORS restrictions |
 | `http.cors_allowed_origins` | Array | Unset | Customize allowed origins for HTTP CORS. |
 | `http.prom_validation_mode` | String | `strict` | Whether to enable validation for Prometheus remote write requests.<br/>Available options:<br/>- strict: deny invalid UTF-8 strings (default).<br/>- lossy: allow invalid UTF-8 strings, replace invalid characters with REPLACEMENT_CHARACTER(U+FFFD).<br/>- unchecked: do not valid strings. |
 | `grpc` | -- | -- | The gRPC server options. |
 | `grpc.bind_addr` | String | `127.0.0.1:4001` | The address to bind the gRPC server. |
 | `grpc.runtime_size` | Integer | `8` | The number of server worker threads. |
+| `grpc.max_total_message_memory` | String | Unset | Maximum total memory for all concurrent gRPC request messages.<br/>Set to 0 to disable the limit. Default: "0" (unlimited) |
 | `grpc.max_connection_age` | String | Unset | The maximum connection age for gRPC connection.<br/>The value can be a human-readable time string. For example: `10m` for ten minutes or `1h` for one hour.<br/>Refer to https://grpc.io/docs/guides/keepalive/ for more details. |
 | `grpc.tls` | -- | -- | gRPC server TLS options, see `mysql.tls` section. |
 | `grpc.tls.mode` | String | `disable` | TLS mode. |
@@ -226,8 +227,7 @@
 | --- | -----| ------- | ----------- |
 | `default_timezone` | String | Unset | The default timezone of the server. |
 | `default_column_prefix` | String | Unset | The default column prefix for auto-created time index and value columns. |
-| `max_in_flight_write_bytes` | String | Unset | Maximum total memory for all concurrent write request bodies and messages (HTTP, gRPC, Flight).<br/>Set to 0 to disable the limit. Default: "0" (unlimited) |
-| `write_bytes_exhausted_policy` | String | Unset | Policy when write bytes quota is exhausted.<br/>Options: "wait" (default, 10s timeout), "wait(<duration>)" (e.g., "wait(30s)"), "fail" |
+| `max_in_flight_write_bytes` | String | Unset | The maximum in-flight write bytes. |
 | `runtime` | -- | -- | The runtime options. |
 | `runtime.global_rt_size` | Integer | `8` | The number of threads to execute the runtime for global read operations. |
 | `runtime.compact_rt_size` | Integer | `4` | The number of threads to execute the runtime for global write operations. |
@@ -238,6 +238,7 @@
 | `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. |
 | `http.body_limit` | String | `64MB` | HTTP request body limit.<br/>The following units are supported: `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`.<br/>Set to 0 to disable limit. |
+| `http.max_total_body_memory` | String | Unset | Maximum total memory for all concurrent HTTP request bodies.<br/>Set to 0 to disable the limit. Default: "0" (unlimited) |
 | `http.enable_cors` | Bool | `true` | HTTP CORS support, it's turned on by default<br/>This allows browser to access http APIs without CORS restrictions |
 | `http.cors_allowed_origins` | Array | Unset | Customize allowed origins for HTTP CORS. |
 | `http.prom_validation_mode` | String | `strict` | Whether to enable validation for Prometheus remote write requests.<br/>Available options:<br/>- strict: deny invalid UTF-8 strings (default).<br/>- lossy: allow invalid UTF-8 strings, replace invalid characters with REPLACEMENT_CHARACTER(U+FFFD).<br/>- unchecked: do not valid strings. |
@@ -245,6 +246,7 @@
 | `grpc.bind_addr` | String | `127.0.0.1:4001` | The address to bind the gRPC server. |
 | `grpc.server_addr` | String | `127.0.0.1:4001` | The address advertised to the metasrv, and used for connections from outside the host.<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 `grpc.bind_addr`. |
 | `grpc.runtime_size` | Integer | `8` | The number of server worker threads. |
+| `grpc.max_total_message_memory` | String | Unset | Maximum total memory for all concurrent gRPC request messages.<br/>Set to 0 to disable the limit. Default: "0" (unlimited) |
 | `grpc.flight_compression` | String | `arrow_ipc` | Compression mode for frontend side Arrow IPC service. Available options:<br/>- `none`: disable all compression<br/>- `transport`: only enable gRPC transport compression (zstd)<br/>- `arrow_ipc`: only enable Arrow IPC compression (lz4)<br/>- `all`: enable all compression.<br/>Default to `none` |
 | `grpc.max_connection_age` | String | Unset | The maximum connection age for gRPC connection.<br/>The value can be a human-readable time string. For example: `10m` for ten minutes or `1h` for one hour.<br/>Refer to https://grpc.io/docs/guides/keepalive/ for more details. |
 | `grpc.tls` | -- | -- | gRPC server TLS options, see `mysql.tls` section. |
@@ -344,10 +346,10 @@
 | `store_key_prefix` | String | `""` | If it's not empty, the metasrv will store all data with this key prefix. |
 | `backend` | String | `etcd_store` | The datastore for meta server.<br/>Available values:<br/>- `etcd_store` (default value)<br/>- `memory_store`<br/>- `postgres_store`<br/>- `mysql_store` |
 | `meta_table_name` | String | `greptime_metakv` | Table name in RDS to store metadata. Effect when using a RDS kvbackend.<br/>**Only used when backend is `postgres_store`.** |
-| `meta_schema_name` | String | `greptime_schema` | Optional PostgreSQL schema for metadata table and election table name qualification.<br/>When PostgreSQL public schema is not writable (e.g., PostgreSQL 15+ with restricted public),<br/>set this to a writable schema. GreptimeDB will use `meta_schema_name`.`meta_table_name`.<br/>**Only used when backend is `postgres_store`.** |
-| `auto_create_schema` | Bool | `true` | Automatically create PostgreSQL schema if it doesn't exist.<br/>When enabled, the system will execute `CREATE SCHEMA IF NOT EXISTS <schema_name>`<br/>before creating metadata tables. This is useful in production environments where<br/>manual schema creation may be restricted.<br/>Default is true.<br/>Note: The PostgreSQL user must have CREATE SCHEMA permission for this to work.<br/>**Only used when backend is `postgres_store`.** |
+| `meta_schema_name` | String | `greptime_schema` | Optional PostgreSQL schema for metadata table and election table name qualification.<br/>When PostgreSQL public schema is not writable (e.g., PostgreSQL 15+ with restricted public),<br/>set this to a writable schema. GreptimeDB will use `meta_schema_name`.`meta_table_name`.<br/>GreptimeDB will NOT create the schema automatically; please ensure it exists or the user has permission.<br/>**Only used when backend is `postgres_store`.** |
 | `meta_election_lock_id` | Integer | `1` | Advisory lock id in PostgreSQL for election. Effect when using PostgreSQL as kvbackend<br/>Only used when backend is `postgres_store`. |
 | `selector` | String | `round_robin` | Datanode selector type.<br/>- `round_robin` (default value)<br/>- `lease_based`<br/>- `load_based`<br/>For details, please see "https://docs.greptime.com/developer-guide/metasrv/selector". |
+| `use_memory_store` | Bool | `false` | Store data in memory. |
 | `enable_region_failover` | Bool | `false` | Whether to enable region failover.<br/>This feature is only available on GreptimeDB running on cluster mode and<br/>- Using Remote WAL<br/>- Using shared storage (e.g., s3). |
 | `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.** |
--- a/config/frontend.example.toml
+++ b/config/frontend.example.toml
@@ -6,15 +6,9 @@ default_timezone = "UTC"
 ## @toml2docs:none-default
 default_column_prefix = "greptime"

-## Maximum total memory for all concurrent write request bodies and messages (HTTP, gRPC, Flight).
-## Set to 0 to disable the limit. Default: "0" (unlimited)
+## The maximum in-flight write bytes.
 ## @toml2docs:none-default
-#+ max_in_flight_write_bytes = "1GB"
-
-## Policy when write bytes quota is exhausted.
-## Options: "wait" (default, 10s timeout), "wait(<duration>)" (e.g., "wait(30s)"), "fail"
-## @toml2docs:none-default
-#+ write_bytes_exhausted_policy = "wait"
+#+ max_in_flight_write_bytes = "500MB"

 ## The runtime options.
 #+ [runtime]
@@ -41,6 +35,10 @@ timeout = "0s"
 ## The following units are supported: `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`.
 ## Set to 0 to disable limit.
 body_limit = "64MB"
+## Maximum total memory for all concurrent HTTP request bodies.
+## Set to 0 to disable the limit. Default: "0" (unlimited)
+## @toml2docs:none-default
+#+ max_total_body_memory = "1GB"
 ## HTTP CORS support, it's turned on by default
 ## This allows browser to access http APIs without CORS restrictions
 enable_cors = true
@@ -64,6 +62,10 @@ bind_addr = "127.0.0.1:4001"
 server_addr = "127.0.0.1:4001"
 ## The number of server worker threads.
 runtime_size = 8
+## Maximum total memory for all concurrent gRPC request messages.
+## Set to 0 to disable the limit. Default: "0" (unlimited)
+## @toml2docs:none-default
+#+ max_total_message_memory = "1GB"
 ## Compression mode for frontend side Arrow IPC service. Available options:
 ## - `none`: disable all compression
 ## - `transport`: only enable gRPC transport compression (zstd)
--- a/config/metasrv.example.toml
+++ b/config/metasrv.example.toml
@@ -34,17 +34,10 @@ meta_table_name = "greptime_metakv"
 ## Optional PostgreSQL schema for metadata table and election table name qualification.
 ## When PostgreSQL public schema is not writable (e.g., PostgreSQL 15+ with restricted public),
 ## set this to a writable schema. GreptimeDB will use `meta_schema_name`.`meta_table_name`.
+## GreptimeDB will NOT create the schema automatically; please ensure it exists or the user has permission.
 ## **Only used when backend is `postgres_store`.**
-meta_schema_name = "greptime_schema"

-## Automatically create PostgreSQL schema if it doesn't exist.
-## When enabled, the system will execute `CREATE SCHEMA IF NOT EXISTS <schema_name>`
-## before creating metadata tables. This is useful in production environments where
-## manual schema creation may be restricted.
-## Default is true.
-## Note: The PostgreSQL user must have CREATE SCHEMA permission for this to work.
-## **Only used when backend is `postgres_store`.**
-auto_create_schema = true
+meta_schema_name = "greptime_schema"

 ## Advisory lock id in PostgreSQL for election. Effect when using PostgreSQL as kvbackend
 ## Only used when backend is `postgres_store`.
@@ -57,6 +50,9 @@ meta_election_lock_id = 1
 ## For details, please see "https://docs.greptime.com/developer-guide/metasrv/selector".
 selector = "round_robin"

+## Store data in memory.
+use_memory_store = false
+
 ## Whether to enable region failover.
 ## This feature is only available on GreptimeDB running on cluster mode and
 ## - Using Remote WAL
--- a/config/standalone.example.toml
+++ b/config/standalone.example.toml
@@ -6,16 +6,6 @@ default_timezone = "UTC"
 ## @toml2docs:none-default
 default_column_prefix = "greptime"

-## Maximum total memory for all concurrent write request bodies and messages (HTTP, gRPC, Flight).
-## Set to 0 to disable the limit. Default: "0" (unlimited)
-## @toml2docs:none-default
-#+ max_in_flight_write_bytes = "1GB"
-
-## Policy when write bytes quota is exhausted.
-## Options: "wait" (default, 10s timeout), "wait(<duration>)" (e.g., "wait(30s)"), "fail"
-## @toml2docs:none-default
-#+ write_bytes_exhausted_policy = "wait"
-
 ## Initialize all regions in the background during the startup.
 ## By default, it provides services after all regions have been initialized.
 init_regions_in_background = false
@@ -32,6 +22,10 @@ max_concurrent_queries = 0
 ## Enable telemetry to collect anonymous usage data. Enabled by default.
 #+ enable_telemetry = true

+## The maximum in-flight write bytes.
+## @toml2docs:none-default
+#+ max_in_flight_write_bytes = "500MB"
+
 ## The runtime options.
 #+ [runtime]
 ## The number of threads to execute the runtime for global read operations.
@@ -49,6 +43,10 @@ timeout = "0s"
 ## The following units are supported: `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`.
 ## Set to 0 to disable limit.
 body_limit = "64MB"
+## Maximum total memory for all concurrent HTTP request bodies.
+## Set to 0 to disable the limit. Default: "0" (unlimited)
+## @toml2docs:none-default
+#+ max_total_body_memory = "1GB"
 ## HTTP CORS support, it's turned on by default
 ## This allows browser to access http APIs without CORS restrictions
 enable_cors = true
@@ -69,6 +67,10 @@ prom_validation_mode = "strict"
 bind_addr = "127.0.0.1:4001"
 ## The number of server worker threads.
 runtime_size = 8
+## Maximum total memory for all concurrent gRPC request messages.
+## Set to 0 to disable the limit. Default: "0" (unlimited)
+## @toml2docs:none-default
+#+ max_total_message_memory = "1GB"
 ## The maximum connection age for gRPC connection.
 ## The value can be a human-readable time string. For example: `10m` for ten minutes or `1h` for one hour.
 ## Refer to https://grpc.io/docs/guides/keepalive/ for more details.
--- a/cyborg/bin/bump-versions.ts
+++ b/cyborg/bin/bump-versions.ts
@@ -57,20 +57,6 @@ const REPO_CONFIGS: Record<string, RepoConfig> = {
        return ['bump-nightly-version.yml', version];
      }

-      // Check for prerelease versions (e.g., 1.0.0-beta.3, 1.0.0-rc.1)
-      const prereleaseMatch = version.match(/^(\d+)\.(\d+)\.(\d+)-(beta|rc)\.(\d+)$/);
-      if (prereleaseMatch) {
-        const [, major, minor, patch, prereleaseType, prereleaseNum] = prereleaseMatch;
-
-        // If it's beta.1 and patch version is 0, treat as major version
-        if (prereleaseType === 'beta' && prereleaseNum === '1' && patch === '0') {
-          return ['bump-version.yml', `${major}.${minor}`];
-        }
-
-        // Otherwise (beta.x where x > 1, or rc.x), treat as patch version
-        return ['bump-patch-version.yml', version];
-      }
-
      const parts = version.split('.');
      if (parts.length !== 3) {
        throw new Error('Invalid version format');
--- a/docs/rfcs/2025-12-05-vector-index.md
+++ b/docs/rfcs/2025-12-05-vector-index.md
@@ -1,94 +0,0 @@
---
-Feature Name: Vector Index
-Tracking Issue: TBD
-Date: 2025-12-04
-Author: "TBD"
---
-
-# Summary
-Introduce a per-SST approximate nearest neighbor (ANN) index for `VECTOR(dim)` columns with a pluggable engine. USearch HNSW is the initial engine, while the design keeps VSAG (default when linked) and future engines selectable at DDL or alter time and encoded in the index metadata. The index is built alongside SST creation and accelerates `ORDER BY vec_*_distance(column, <literal vector>) LIMIT k` queries, falling back to the existing brute-force path when an index is unavailable or ineligible.
-
-# Motivation
-Vector distances are currently computed with nalgebra across all rows (O(N)) before sorting, which does not scale to millions of vectors. An on-disk ANN index with sub-linear search reduces latency and compute cost for common RAG, semantic search, and recommendation workloads without changing SQL.
-
-# Details
-
-## Current Behavior
-`VECTOR(dim)` values are stored as binary blobs. Queries call `vec_cos_distance`/`vec_l2sq_distance`/`vec_dot_product` via nalgebra for every row and then sort; there is no indexing or caching.
-
-## Index Eligibility and Configuration
-Only `VECTOR(dim)` columns can be indexed. A column metadata flag follows the existing column-option pattern with an intentionally small surface area:
- `engine`: `vsag` (default when the binding is built) or `usearch`. If a configured engine is unavailable at runtime, the builder logs and falls back to `usearch` while leaving the option intact for future rebuilds.
- `metric`: `cosine` (default), `l2sq`, or `dot`; mismatches with query functions force brute-force execution.
- `m`: HNSW graph connectivity (higher = denser graph, more memory, better recall), default `16`.
- `ef_construct`: build-time expansion, default `128`.
- `ef_search`: query-time expansion, default `64`; engines may clamp values.
-
-Option semantics mirror HNSW defaults so both USearch and VSAG can honor them; engine-specific tunables stay in reserved key-value pairs inside the blob header for forward compatibility.
-
-DDL reuses column extensions similar to inverted/fulltext indexes:
-
-```sql
-CREATE TABLE embeddings (
-  ts TIMESTAMP TIME INDEX,
-  id STRING PRIMARY KEY,
-  vec VECTOR(384) VECTOR INDEX WITH (engine = 'vsag', metric = 'cosine', ef_search = 64)
-);
-```
-
-Altering column options toggles the flag, can switch engines (for example `usearch` -> `vsag`), and triggers rebuilds through the existing alter/compaction flow. Engine choice stays in table metadata and each blob header; new SSTs use the configured engine while older SSTs remain readable under their recorded engine until compaction or a manual rebuild rewrites them.
-
-## Storage and Format
- One vector index per indexed column per SST, stored as a Puffin blob with type `greptime-vector-index-v1`.
- Each blob records the engine (`usearch`, `vsag`, future values) and engine parameters in the header so readers can select the matching decoder. Mixed-engine SSTs remain readable because the engine id travels with the blob.
- USearch uses `f32` vectors and SST row offsets (`u64`) as keys; nulls and `OpType::Delete` rows are skipped. Row ids are the absolute SST ordinal so readers can derive `RowSelection` directly from parquet row group lengths without extra side tables.
- Blob layout:
-  - Header: version, column id, dimension, engine id, metric, `m`, `ef_construct`, `ef_search`, and reserved engine-specific key-value pairs.
-  - Counts: total rows written and indexed rows.
-  - Payload: USearch binary produced by `save_to_buffer`.
- An empty index (no eligible vectors) results in no available index entry for that column.
- `puffin_manager` registers the blob type so caches and readers discover it alongside inverted/fulltext/bloom blobs in the same index file.
-
-## Row Visibility and Duplicates
- The indexer increments `row_offset` for every incoming row (including skipped/null/delete rows) so offsets stay aligned with parquet ordering across row groups.
- Only `OpType::Put` rows with the expected dimension are inserted; `OpType::Delete` and malformed rows are skipped but still advance `row_offset`, matching the data plane’s visibility rules.
- Multiple versions of the same primary key remain in the graph; the read path intersects search hits with the standard mito2 deduplication/visibility pipeline (sequence-aware dedup, delete filtering, projection) before returning results.
- Searches overfetch beyond `k` to compensate for rows discarded by visibility checks and to avoid reissuing index reads.
-
-## Build Path (mito2 write)
-Extend `sst::index::Indexer` to optionally create a `VectorIndexer` when region metadata marks a column as vector-indexed, mirroring how inverted/fulltext/bloom filters attach to `IndexerBuilderImpl` in `mito2`.
-
-The indexer consumes `Batch`/`RecordBatch` data and shares memory tracking and abort semantics with existing indexers:
- Maintain a running `row_offset` that follows SST write order and spans row groups so the search result can be turned into `RowSelection`.
- For each `OpType::Put`, if the vector is non-null and matches the declared dimension, insert into USearch with `row_offset` as the key; otherwise skip.
- Track memory with existing index build metrics; on failure, abort only the vector index while keeping SST writing unaffected.
-
-Engine selection is table-driven: the builder picks the configured engine (default `vsag`, fallback `usearch` if `vsag` is not compiled in) and dispatches to the matching implementation. Unknown engines skip index build with a warning.
-
-On `finish`, serialize the engine-tagged index into the Puffin writer and record `IndexType::Vector` metadata for the column. `IndexOutput` and `FileMeta::indexes/available_indexes` gain a vector entry so manifest updates and `RegionVersion` surface per-column presence, following patterns used by inverted/fulltext/bloom indexes. Planner/metadata validation ensures that mismatched dimensions only reduce the indexed-row count and do not break reads.
-
-## Read Path (mito2 query)
-A planner rule in `query` identifies eligible plans on mito2 tables: a single `ORDER BY vec_cos_distance|vec_l2sq_distance|vec_dot_product(<vector column>, <literal vector>)` in ascending order plus a `LIMIT`/`TopK`. The rule rejects plans with multiple sort keys, non-literal query vectors, or additional projections that would change the distance expression and falls back to brute-force in those cases.
-
-For eligible scans, build a `VectorIndexScan` execution node that:
- Consults SST metadata for `IndexType::Vector`, loads the index via Puffin using the existing `mito2::cache::index` infrastructure, and dispatches to the engine declared in the blob header (USearch/VSAG/etc.).
- Runs the engine’s `search` with an overfetch (for example 2×k) to tolerate rows filtered by deletes, dimension mismatches, or late-stage dedup; keys already match SST row offsets produced by the writer.
- Converts hits to `RowSelection` using parquet row group lengths and reuses the parquet reader so visibility, projection, and deduplication logic stay unchanged; distances are recomputed with `vec_*_distance` before the final trim to k to guarantee ordering and to merge distributed partial results deterministically.
-
-Any unsupported shape, load error, or cache miss falls back to the current brute-force execution path.
-
-## Lifecycle and Maintenance
-Lifecycle piggybacks on the existing SST/index flow: rebuilds run where other secondary indexes do, graphs are always rebuilt from source rows (no HNSW merge), and cleanup/versioning/caching reuse the existing Puffin and index cache paths.
-
-# Implementation Plan
-1. Add the `usearch` dependency (wrapper module in `index` or `mito2`) and map minimal HNSW options; keep an engine trait that allows plugging VSAG without changing the rest of the pipeline.
-2. Introduce `IndexType::Vector` and a column metadata key for vector index options (including `engine`); add SQL parser and `SHOW CREATE TABLE` support for `VECTOR INDEX WITH (...)`.
-3. Implement `vector_index` build/read modules under `mito2` (and `index` if shared), including Puffin serialization that records engine id, blob-type registration with `puffin_manager`, and integration with the `Indexer` builder, `IndexOutput`, manifest updates, and compaction rebuild.
-4. Extend the query planner/execution to detect eligible plans and drive a `RowSelection`-based ANN scan with a fallback path, dispatching by engine at read time and using existing Puffin and index caches.
-5. Add unit tests for serialization/search correctness and an end-to-end test covering plan rewrite, cache usage, engine selection, and fallback; add a mixed-engine test to confirm old USearch blobs still serve after a VSAG switch.
-6. Follow up with an optional VSAG engine binding (feature flag), validate parity with USearch on dense vectors, exercise alternative algorithms (for example PQ), and flip the default `engine` to `vsag` when the binding is present.
-
-# Alternatives
- **VSAG (follow-up engine):** C++ library with HNSW and additional algorithms (for example SINDI for sparse vectors and PQ) targeting in-memory and disk-friendly search. Provides parameter generators and a roadmap for GPU-assisted build and graph compression. Compared to FAISS it is newer with fewer integrations but bundles sparse/dense coverage and out-of-core focus in one engine. Fits the pluggable-engine design and would become the default `engine = 'vsag'` when linked; USearch remains available for lighter dependencies.
- **FAISS:** Broad feature set (IVF/IVFPQ/PQ/HNSW, GPU acceleration, scalar filtering, pre/post filters) and battle-tested performance across datasets, but it requires a heavier C++/GPU toolchain, has no official Rust binding, and is less disk-centric than VSAG; integrating it would add more build/distribution burden than USearch/VSAG.
- **Do nothing:** Keep brute-force evaluation, which remains O(N) and unacceptable at scale.
--- a/grafana/dashboards/metrics/cluster/dashboard.json
+++ b/grafana/dashboards/metrics/cluster/dashboard.json
@@ -8863,7 +8863,7 @@
        "type": "prometheus",
        "uid": "${metrics}"
      },
-      "description": "Elapsed of Reconciliation steps",
+      "description": "Elapsed of Reconciliation steps ",
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -9366,7 +9366,7 @@
              "editorMode": "code",
              "expr": "greptime_flow_input_buf_size",
              "instant": false,
-              "legendFormat": "[{{instance}}]-[{{pod}}]",
+              "legendFormat": "[{{instance}}]-[{{pod}]",
              "range": true,
              "refId": "A"
            }
@@ -9472,755 +9472,6 @@
      ],
      "title": "Flownode",
      "type": "row"
-    },
-    {
-      "collapsed": true,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 187
-      },
-      "id": 357,
-      "panels": [],
-      "title": "Trigger",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "bf9fzta69bhtsa"
-      },
-      "description": "Total number of triggers currently defined.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 188
-      },
-      "id": 358,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "greptime_trigger_count{}",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Trigger Count",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Elapsed time for trigger evaluation, including query execution and condition evaluation.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 196
-      },
-      "id": 359,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, \n  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-p99",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.75, \n  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-p75",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Trigger Eval Elapsed",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Rate of failed trigger evaluations.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 196
-      },
-      "id": 360,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "rate(greptime_trigger_evaluate_failure_count[$__rate_interval])",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Trigger Eval Failure Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Elapsed time to send trigger alerts to notification channels.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 204
-      },
-      "id": 361,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, \n  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-[{{channel_type}}]-p99",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.75, \n  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-[{{channel_type}}]-p75",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Send Alert Elapsed",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Rate of failures when sending trigger alerts.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 204
-      },
-      "id": 364,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "rate(greptime_trigger_send_alert_failure_count[$__rate_interval])",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Send Alert Failure Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Elapsed time to persist trigger alert records.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 212
-      },
-      "id": 363,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, \n  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-[{{storage_type}}]-p99",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.75, \n  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-[{{storage_type}}]-p75",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Save Alert Elapsed",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Rate of failures when persisting trigger alert records.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 212
-      },
-      "id": 362,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "rate(greptime_trigger_save_alert_record_failure_count[$__rate_interval])",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Save Alert Failure Rate",
-      "type": "timeseries"
    }
  ],
  "preload": false,
@@ -10362,4 +9613,4 @@
  "title": "GreptimeDB",
  "uid": "dejf3k5e7g2kgb",
  "version": 15
-}
+}
--- a/grafana/dashboards/metrics/cluster/dashboard.md
+++ b/grafana/dashboards/metrics/cluster/dashboard.md
@@ -111,34 +111,12 @@
 | Rate of meta KV Ops | `rate(greptime_meta_kv_request_elapsed_count[$__rate_interval])` | `timeseries` | Gauge of load information of each datanode, collected via heartbeat between datanode and metasrv. This information is for metasrv to schedule workloads. | `prometheus` | `none` | `{{pod}}-{{op}} p99` |
 | DDL Latency | `histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_create_tables_bucket))`<br/>`histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_create_table))`<br/>`histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_create_view))`<br/>`histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_create_flow))`<br/>`histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_drop_table))`<br/>`histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_alter_table))` | `timeseries` | Gauge of load information of each datanode, collected via heartbeat between datanode and metasrv. This information is for metasrv to schedule workloads. | `prometheus` | `s` | `CreateLogicalTables-{{step}} p90` |
 | Reconciliation stats | `greptime_meta_reconciliation_stats` | `timeseries` | Reconciliation stats | `prometheus` | `s` | `{{pod}}-{{table_type}}-{{type}}` |
-| Reconciliation steps | `histogram_quantile(0.9, greptime_meta_reconciliation_procedure_bucket)` | `timeseries` | Elapsed of Reconciliation steps | `prometheus` | `s` | `{{procedure_name}}-{{step}}-P90` |
+| Reconciliation steps | `histogram_quantile(0.9, greptime_meta_reconciliation_procedure_bucket)` | `timeseries` | Elapsed of Reconciliation steps  | `prometheus` | `s` | `{{procedure_name}}-{{step}}-P90` |
 # Flownode
 | Title | Query | Type | Description | Datasource | Unit | Legend Format |
 | --- | --- | --- | --- | --- | --- | --- |
 | Flow Ingest / Output Rate | `sum by(instance, pod, direction) (rate(greptime_flow_processed_rows[$__rate_interval]))` | `timeseries` | Flow Ingest / Output Rate. | `prometheus` | -- | `[{{pod}}]-[{{instance}}]-[{{direction}}]` |
 | Flow Ingest Latency | `histogram_quantile(0.95, sum(rate(greptime_flow_insert_elapsed_bucket[$__rate_interval])) by (le, instance, pod))`<br/>`histogram_quantile(0.99, sum(rate(greptime_flow_insert_elapsed_bucket[$__rate_interval])) by (le, instance, pod))` | `timeseries` | Flow Ingest Latency. | `prometheus` | -- | `[{{instance}}]-[{{pod}}]-p95` |
 | Flow Operation Latency | `histogram_quantile(0.95, sum(rate(greptime_flow_processing_time_bucket[$__rate_interval])) by (le,instance,pod,type))`<br/>`histogram_quantile(0.99, sum(rate(greptime_flow_processing_time_bucket[$__rate_interval])) by (le,instance,pod,type))` | `timeseries` | Flow Operation Latency. | `prometheus` | -- | `[{{instance}}]-[{{pod}}]-[{{type}}]-p95` |
-| Flow Buffer Size per Instance | `greptime_flow_input_buf_size` | `timeseries` | Flow Buffer Size per Instance. | `prometheus` | -- | `[{{instance}}]-[{{pod}}]` |
+| Flow Buffer Size per Instance | `greptime_flow_input_buf_size` | `timeseries` | Flow Buffer Size per Instance. | `prometheus` | -- | `[{{instance}}]-[{{pod}]` |
 | Flow Processing Error per Instance | `sum by(instance,pod,code) (rate(greptime_flow_errors[$__rate_interval]))` | `timeseries` | Flow Processing Error per Instance. | `prometheus` | -- | `[{{instance}}]-[{{pod}}]-[{{code}}]` |
-# Trigger
-| Title | Query | Type | Description | Datasource | Unit | Legend Format |
-| --- | --- | --- | --- | --- | --- | --- |
-| Trigger Count | `greptime_trigger_count{}` | `timeseries` | Total number of triggers currently defined. | `prometheus` | -- | `__auto` |
-| Trigger Eval Elapsed | `histogram_quantile(0.99, 
-  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])
-)`<br/>`histogram_quantile(0.75, 
-  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])
-)` | `timeseries` | Elapsed time for trigger evaluation, including query execution and condition evaluation. | `prometheus` | `s` | `[{{instance}}]-[{{pod}}]-p99` |
-| Trigger Eval Failure Rate | `rate(greptime_trigger_evaluate_failure_count[$__rate_interval])` | `timeseries` | Rate of failed trigger evaluations. | `prometheus` | `none` | `__auto` |
-| Send Alert Elapsed | `histogram_quantile(0.99, 
-  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])
-)`<br/>`histogram_quantile(0.75, 
-  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])
-)` | `timeseries` | Elapsed time to send trigger alerts to notification channels. | `prometheus` | `s` | `[{{instance}}]-[{{pod}}]-[{{channel_type}}]-p99` |
-| Send Alert Failure Rate | `rate(greptime_trigger_send_alert_failure_count[$__rate_interval])` | `timeseries` | Rate of failures when sending trigger alerts. | `prometheus` | `none` | `__auto` |
-| Save Alert Elapsed | `histogram_quantile(0.99, 
-  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])
-)`<br/>`histogram_quantile(0.75, 
-  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])
-)` | `timeseries` | Elapsed time to persist trigger alert records. | `prometheus` | `s` | `[{{instance}}]-[{{pod}}]-[{{storage_type}}]-p99` |
-| Save Alert Failure Rate | `rate(greptime_trigger_save_alert_record_failure_count[$__rate_interval])` | `timeseries` | Rate of failures when persisting trigger alert records. | `prometheus` | `none` | `__auto` |
--- a/grafana/dashboards/metrics/cluster/dashboard.yaml
+++ b/grafana/dashboards/metrics/cluster/dashboard.yaml
@@ -1002,7 +1002,7 @@ groups:
              legendFormat: '{{pod}}-{{table_type}}-{{type}}'
        - title: Reconciliation steps
          type: timeseries
-          description: Elapsed of Reconciliation steps
+          description: 'Elapsed of Reconciliation steps '
          unit: s
          queries:
            - expr: histogram_quantile(0.9, greptime_meta_reconciliation_procedure_bucket)
@@ -1057,7 +1057,7 @@ groups:
              datasource:
                type: prometheus
                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]'
+              legendFormat: '[{{instance}}]-[{{pod}]'
        - title: Flow Processing Error per Instance
          type: timeseries
          description: Flow Processing Error per Instance.
@@ -1067,89 +1067,3 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{instance}}]-[{{pod}}]-[{{code}}]'
-    - title: Trigger
-      panels:
-        - title: Trigger Count
-          type: timeseries
-          description: Total number of triggers currently defined.
-          queries:
-            - expr: greptime_trigger_count{}
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: __auto
-        - title: Trigger Eval Elapsed
-          type: timeseries
-          description: Elapsed time for trigger evaluation, including query execution and condition evaluation.
-          unit: s
-          queries:
-            - expr: "histogram_quantile(0.99, \n  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-p99'
-            - expr: "histogram_quantile(0.75, \n  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-p75'
-        - title: Trigger Eval Failure Rate
-          type: timeseries
-          description: Rate of failed trigger evaluations.
-          unit: none
-          queries:
-            - expr: rate(greptime_trigger_evaluate_failure_count[$__rate_interval])
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: __auto
-        - title: Send Alert Elapsed
-          type: timeseries
-          description: Elapsed time to send trigger alerts to notification channels.
-          unit: s
-          queries:
-            - expr: "histogram_quantile(0.99, \n  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-[{{channel_type}}]-p99'
-            - expr: "histogram_quantile(0.75, \n  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-[{{channel_type}}]-p75'
-        - title: Send Alert Failure Rate
-          type: timeseries
-          description: Rate of failures when sending trigger alerts.
-          unit: none
-          queries:
-            - expr: rate(greptime_trigger_send_alert_failure_count[$__rate_interval])
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: __auto
-        - title: Save Alert Elapsed
-          type: timeseries
-          description: Elapsed time to persist trigger alert records.
-          unit: s
-          queries:
-            - expr: "histogram_quantile(0.99, \n  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-[{{storage_type}}]-p99'
-            - expr: "histogram_quantile(0.75, \n  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-[{{storage_type}}]-p75'
-        - title: Save Alert Failure Rate
-          type: timeseries
-          description: Rate of failures when persisting trigger alert records.
-          unit: none
-          queries:
-            - expr: rate(greptime_trigger_save_alert_record_failure_count[$__rate_interval])
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: __auto
--- a/grafana/dashboards/metrics/standalone/dashboard.json
+++ b/grafana/dashboards/metrics/standalone/dashboard.json
@@ -8863,7 +8863,7 @@
        "type": "prometheus",
        "uid": "${metrics}"
      },
-      "description": "Elapsed of Reconciliation steps",
+      "description": "Elapsed of Reconciliation steps ",
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -9366,7 +9366,7 @@
              "editorMode": "code",
              "expr": "greptime_flow_input_buf_size",
              "instant": false,
-              "legendFormat": "[{{instance}}]-[{{pod}}]",
+              "legendFormat": "[{{instance}}]-[{{pod}]",
              "range": true,
              "refId": "A"
            }
@@ -9472,755 +9472,6 @@
      ],
      "title": "Flownode",
      "type": "row"
-    },
-    {
-      "collapsed": true,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 187
-      },
-      "id": 357,
-      "panels": [],
-      "title": "Trigger",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "bf9fzta69bhtsa"
-      },
-      "description": "Total number of triggers currently defined.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 188
-      },
-      "id": 358,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "greptime_trigger_count{}",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Trigger Count",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Elapsed time for trigger evaluation, including query execution and condition evaluation.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 196
-      },
-      "id": 359,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, \n  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-p99",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.75, \n  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-p75",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Trigger Eval Elapsed",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Rate of failed trigger evaluations.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 196
-      },
-      "id": 360,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "rate(greptime_trigger_evaluate_failure_count[$__rate_interval])",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Trigger Eval Failure Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Elapsed time to send trigger alerts to notification channels.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 204
-      },
-      "id": 361,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, \n  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-[{{channel_type}}]-p99",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.75, \n  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-[{{channel_type}}]-p75",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Send Alert Elapsed",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Rate of failures when sending trigger alerts.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 204
-      },
-      "id": 364,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "rate(greptime_trigger_send_alert_failure_count[$__rate_interval])",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Send Alert Failure Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Elapsed time to persist trigger alert records.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 212
-      },
-      "id": 363,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, \n  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-[{{storage_type}}]-p99",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.75, \n  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])\n)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "[{{instance}}]-[{{pod}}]-[{{storage_type}}]-p75",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Save Alert Elapsed",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${metrics}"
-      },
-      "description": "Rate of failures when persisting trigger alert records.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 212
-      },
-      "id": 362,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "hideZeros": false,
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.6.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${metrics}"
-          },
-          "editorMode": "code",
-          "expr": "rate(greptime_trigger_save_alert_record_failure_count[$__rate_interval])",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Save Alert Failure Rate",
-      "type": "timeseries"
    }
  ],
  "preload": false,
@@ -10362,4 +9613,4 @@
  "title": "GreptimeDB",
  "uid": "dejf3k5e7g2kgb",
  "version": 15
-}
+}
--- a/grafana/dashboards/metrics/standalone/dashboard.md
+++ b/grafana/dashboards/metrics/standalone/dashboard.md
@@ -111,34 +111,12 @@
 | Rate of meta KV Ops | `rate(greptime_meta_kv_request_elapsed_count[$__rate_interval])` | `timeseries` | Gauge of load information of each datanode, collected via heartbeat between datanode and metasrv. This information is for metasrv to schedule workloads. | `prometheus` | `none` | `{{pod}}-{{op}} p99` |
 | DDL Latency | `histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_create_tables_bucket))`<br/>`histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_create_table))`<br/>`histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_create_view))`<br/>`histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_create_flow))`<br/>`histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_drop_table))`<br/>`histogram_quantile(0.9, sum by(le, pod, step) (greptime_meta_procedure_alter_table))` | `timeseries` | Gauge of load information of each datanode, collected via heartbeat between datanode and metasrv. This information is for metasrv to schedule workloads. | `prometheus` | `s` | `CreateLogicalTables-{{step}} p90` |
 | Reconciliation stats | `greptime_meta_reconciliation_stats` | `timeseries` | Reconciliation stats | `prometheus` | `s` | `{{pod}}-{{table_type}}-{{type}}` |
-| Reconciliation steps | `histogram_quantile(0.9, greptime_meta_reconciliation_procedure_bucket)` | `timeseries` | Elapsed of Reconciliation steps | `prometheus` | `s` | `{{procedure_name}}-{{step}}-P90` |
+| Reconciliation steps | `histogram_quantile(0.9, greptime_meta_reconciliation_procedure_bucket)` | `timeseries` | Elapsed of Reconciliation steps  | `prometheus` | `s` | `{{procedure_name}}-{{step}}-P90` |
 # Flownode
 | Title | Query | Type | Description | Datasource | Unit | Legend Format |
 | --- | --- | --- | --- | --- | --- | --- |
 | Flow Ingest / Output Rate | `sum by(instance, pod, direction) (rate(greptime_flow_processed_rows[$__rate_interval]))` | `timeseries` | Flow Ingest / Output Rate. | `prometheus` | -- | `[{{pod}}]-[{{instance}}]-[{{direction}}]` |
 | Flow Ingest Latency | `histogram_quantile(0.95, sum(rate(greptime_flow_insert_elapsed_bucket[$__rate_interval])) by (le, instance, pod))`<br/>`histogram_quantile(0.99, sum(rate(greptime_flow_insert_elapsed_bucket[$__rate_interval])) by (le, instance, pod))` | `timeseries` | Flow Ingest Latency. | `prometheus` | -- | `[{{instance}}]-[{{pod}}]-p95` |
 | Flow Operation Latency | `histogram_quantile(0.95, sum(rate(greptime_flow_processing_time_bucket[$__rate_interval])) by (le,instance,pod,type))`<br/>`histogram_quantile(0.99, sum(rate(greptime_flow_processing_time_bucket[$__rate_interval])) by (le,instance,pod,type))` | `timeseries` | Flow Operation Latency. | `prometheus` | -- | `[{{instance}}]-[{{pod}}]-[{{type}}]-p95` |
-| Flow Buffer Size per Instance | `greptime_flow_input_buf_size` | `timeseries` | Flow Buffer Size per Instance. | `prometheus` | -- | `[{{instance}}]-[{{pod}}]` |
+| Flow Buffer Size per Instance | `greptime_flow_input_buf_size` | `timeseries` | Flow Buffer Size per Instance. | `prometheus` | -- | `[{{instance}}]-[{{pod}]` |
 | Flow Processing Error per Instance | `sum by(instance,pod,code) (rate(greptime_flow_errors[$__rate_interval]))` | `timeseries` | Flow Processing Error per Instance. | `prometheus` | -- | `[{{instance}}]-[{{pod}}]-[{{code}}]` |
-# Trigger
-| Title | Query | Type | Description | Datasource | Unit | Legend Format |
-| --- | --- | --- | --- | --- | --- | --- |
-| Trigger Count | `greptime_trigger_count{}` | `timeseries` | Total number of triggers currently defined. | `prometheus` | -- | `__auto` |
-| Trigger Eval Elapsed | `histogram_quantile(0.99, 
-  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])
-)`<br/>`histogram_quantile(0.75, 
-  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])
-)` | `timeseries` | Elapsed time for trigger evaluation, including query execution and condition evaluation. | `prometheus` | `s` | `[{{instance}}]-[{{pod}}]-p99` |
-| Trigger Eval Failure Rate | `rate(greptime_trigger_evaluate_failure_count[$__rate_interval])` | `timeseries` | Rate of failed trigger evaluations. | `prometheus` | `none` | `__auto` |
-| Send Alert Elapsed | `histogram_quantile(0.99, 
-  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])
-)`<br/>`histogram_quantile(0.75, 
-  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])
-)` | `timeseries` | Elapsed time to send trigger alerts to notification channels. | `prometheus` | `s` | `[{{instance}}]-[{{pod}}]-[{{channel_type}}]-p99` |
-| Send Alert Failure Rate | `rate(greptime_trigger_send_alert_failure_count[$__rate_interval])` | `timeseries` | Rate of failures when sending trigger alerts. | `prometheus` | `none` | `__auto` |
-| Save Alert Elapsed | `histogram_quantile(0.99, 
-  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])
-)`<br/>`histogram_quantile(0.75, 
-  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])
-)` | `timeseries` | Elapsed time to persist trigger alert records. | `prometheus` | `s` | `[{{instance}}]-[{{pod}}]-[{{storage_type}}]-p99` |
-| Save Alert Failure Rate | `rate(greptime_trigger_save_alert_record_failure_count[$__rate_interval])` | `timeseries` | Rate of failures when persisting trigger alert records. | `prometheus` | `none` | `__auto` |
--- a/grafana/dashboards/metrics/standalone/dashboard.yaml
+++ b/grafana/dashboards/metrics/standalone/dashboard.yaml
@@ -1002,7 +1002,7 @@ groups:
              legendFormat: '{{pod}}-{{table_type}}-{{type}}'
        - title: Reconciliation steps
          type: timeseries
-          description: Elapsed of Reconciliation steps
+          description: 'Elapsed of Reconciliation steps '
          unit: s
          queries:
            - expr: histogram_quantile(0.9, greptime_meta_reconciliation_procedure_bucket)
@@ -1057,7 +1057,7 @@ groups:
              datasource:
                type: prometheus
                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]'
+              legendFormat: '[{{instance}}]-[{{pod}]'
        - title: Flow Processing Error per Instance
          type: timeseries
          description: Flow Processing Error per Instance.
@@ -1067,89 +1067,3 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{instance}}]-[{{pod}}]-[{{code}}]'
-    - title: Trigger
-      panels:
-        - title: Trigger Count
-          type: timeseries
-          description: Total number of triggers currently defined.
-          queries:
-            - expr: greptime_trigger_count{}
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: __auto
-        - title: Trigger Eval Elapsed
-          type: timeseries
-          description: Elapsed time for trigger evaluation, including query execution and condition evaluation.
-          unit: s
-          queries:
-            - expr: "histogram_quantile(0.99, \n  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-p99'
-            - expr: "histogram_quantile(0.75, \n  rate(greptime_trigger_evaluate_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-p75'
-        - title: Trigger Eval Failure Rate
-          type: timeseries
-          description: Rate of failed trigger evaluations.
-          unit: none
-          queries:
-            - expr: rate(greptime_trigger_evaluate_failure_count[$__rate_interval])
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: __auto
-        - title: Send Alert Elapsed
-          type: timeseries
-          description: Elapsed time to send trigger alerts to notification channels.
-          unit: s
-          queries:
-            - expr: "histogram_quantile(0.99, \n  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-[{{channel_type}}]-p99'
-            - expr: "histogram_quantile(0.75, \n  rate(greptime_trigger_send_alert_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-[{{channel_type}}]-p75'
-        - title: Send Alert Failure Rate
-          type: timeseries
-          description: Rate of failures when sending trigger alerts.
-          unit: none
-          queries:
-            - expr: rate(greptime_trigger_send_alert_failure_count[$__rate_interval])
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: __auto
-        - title: Save Alert Elapsed
-          type: timeseries
-          description: Elapsed time to persist trigger alert records.
-          unit: s
-          queries:
-            - expr: "histogram_quantile(0.99, \n  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-[{{storage_type}}]-p99'
-            - expr: "histogram_quantile(0.75, \n  rate(greptime_trigger_save_alert_record_elapsed_bucket[$__rate_interval])\n)"
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: '[{{instance}}]-[{{pod}}]-[{{storage_type}}]-p75'
-        - title: Save Alert Failure Rate
-          type: timeseries
-          description: Rate of failures when persisting trigger alert records.
-          unit: none
-          queries:
-            - expr: rate(greptime_trigger_save_alert_record_failure_count[$__rate_interval])
-              datasource:
-                type: prometheus
-                uid: ${metrics}
-              legendFormat: __auto
--- a/src/api/src/helper.rs
+++ b/src/api/src/helper.rs
@@ -895,7 +895,7 @@ pub fn is_column_type_value_eq(
        .unwrap_or(false)
 }

-pub fn encode_json_value(value: JsonValue) -> v1::JsonValue {
+fn encode_json_value(value: JsonValue) -> v1::JsonValue {
    fn helper(json: JsonVariant) -> v1::JsonValue {
        let value = match json {
            JsonVariant::Null => None,
--- a/src/api/src/v1/column_def.rs
+++ b/src/api/src/v1/column_def.rs
@@ -17,8 +17,8 @@ use std::collections::HashMap;
 use arrow_schema::extension::{EXTENSION_TYPE_METADATA_KEY, EXTENSION_TYPE_NAME_KEY};
 use datatypes::schema::{
    COMMENT_KEY, ColumnDefaultConstraint, ColumnSchema, FULLTEXT_KEY, FulltextAnalyzer,
-    FulltextBackend, FulltextOptions, INVERTED_INDEX_KEY, Metadata, SKIPPING_INDEX_KEY,
-    SkippingIndexOptions, SkippingIndexType,
+    FulltextBackend, FulltextOptions, INVERTED_INDEX_KEY, SKIPPING_INDEX_KEY, SkippingIndexOptions,
+    SkippingIndexType,
 };
 use greptime_proto::v1::{
    Analyzer, FulltextBackend as PbFulltextBackend, SkippingIndexType as PbSkippingIndexType,
@@ -36,14 +36,6 @@ const INVERTED_INDEX_GRPC_KEY: &str = "inverted_index";
 /// Key used to store skip index options in gRPC column options.
 const SKIPPING_INDEX_GRPC_KEY: &str = "skipping_index";

-const COLUMN_OPTION_MAPPINGS: [(&str, &str); 5] = [
-    (FULLTEXT_GRPC_KEY, FULLTEXT_KEY),
-    (INVERTED_INDEX_GRPC_KEY, INVERTED_INDEX_KEY),
-    (SKIPPING_INDEX_GRPC_KEY, SKIPPING_INDEX_KEY),
-    (EXTENSION_TYPE_NAME_KEY, EXTENSION_TYPE_NAME_KEY),
-    (EXTENSION_TYPE_METADATA_KEY, EXTENSION_TYPE_METADATA_KEY),
-];
-
 /// Tries to construct a `ColumnSchema` from the given  `ColumnDef`.
 pub fn try_as_column_schema(column_def: &ColumnDef) -> Result<ColumnSchema> {
    let data_type = ColumnDataTypeWrapper::try_new(
@@ -139,21 +131,6 @@ pub fn try_as_column_def(column_schema: &ColumnSchema, is_primary_key: bool) ->
    })
 }

-/// Collect the [ColumnOptions] into the [Metadata] that can be used in, for example, [ColumnSchema].
-pub fn collect_column_options(column_options: Option<&ColumnOptions>) -> Metadata {
-    let Some(ColumnOptions { options }) = column_options else {
-        return Metadata::default();
-    };
-
-    let mut metadata = Metadata::with_capacity(options.len());
-    for (x, y) in COLUMN_OPTION_MAPPINGS {
-        if let Some(v) = options.get(x) {
-            metadata.insert(y.to_string(), v.clone());
-        }
-    }
-    metadata
-}
-
 /// Constructs a `ColumnOptions` from the given `ColumnSchema`.
 pub fn options_from_column_schema(column_schema: &ColumnSchema) -> Option<ColumnOptions> {
    let mut options = ColumnOptions::default();
--- a/src/catalog/src/lib.rs
+++ b/src/catalog/src/lib.rs
@@ -32,7 +32,6 @@ use crate::error::Result;
 pub mod error;
 pub mod information_extension;
 pub mod kvbackend;
-#[cfg(any(test, feature = "testing"))]
 pub mod memory;
 mod metrics;
 pub mod system_schema;
--- a/src/catalog/src/metrics.rs
+++ b/src/catalog/src/metrics.rs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+pub(crate) const METRIC_DB_LABEL: &str = "db";
+
 use lazy_static::lazy_static;
 use prometheus::*;

@@ -23,7 +25,7 @@ lazy_static! {
    pub static ref METRIC_CATALOG_MANAGER_TABLE_COUNT: IntGaugeVec = register_int_gauge_vec!(
        "greptime_catalog_table_count",
        "catalog table count",
-        &["db"]
+        &[METRIC_DB_LABEL]
    )
    .unwrap();
    pub static ref METRIC_CATALOG_KV_REMOTE_GET: Histogram =
--- a/src/catalog/src/system_schema.rs
+++ b/src/catalog/src/system_schema.rs
@@ -24,7 +24,6 @@ use std::sync::Arc;

 use common_error::ext::BoxedError;
 use common_recordbatch::{RecordBatchStreamWrapper, SendableRecordBatchStream};
-use common_telemetry::tracing::Span;
 use datatypes::schema::SchemaRef;
 use futures_util::StreamExt;
 use snafu::ResultExt;
@@ -164,7 +163,6 @@ impl DataSource for SystemTableDataSource {
            stream: Box::pin(stream),
            output_ordering: None,
            metrics: Default::default(),
-            span: Span::current(),
        };

        Ok(Box::pin(stream))
--- a/src/catalog/src/system_schema/information_schema/columns.rs
+++ b/src/catalog/src/system_schema/information_schema/columns.rs
@@ -399,8 +399,8 @@ impl InformationSchemaColumnsBuilder {
            self.is_nullables.push(Some("No"));
        }
        self.column_types.push(Some(&data_type));
-        let column_comment = column_schema.column_comment().map(|x| x.as_ref());
-        self.column_comments.push(column_comment);
+        self.column_comments
+            .push(column_schema.column_comment().map(|x| x.as_ref()));
    }

    fn finish(&mut self) -> Result<RecordBatch> {
--- a/src/catalog/src/system_schema/information_schema/tables.rs
+++ b/src/catalog/src/system_schema/information_schema/tables.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use core::pin::pin;
 use std::sync::{Arc, Weak};

 use arrow_schema::SchemaRef as ArrowSchemaRef;
@@ -32,17 +31,15 @@ use datatypes::value::Value;
 use datatypes::vectors::{
    StringVectorBuilder, TimestampSecondVectorBuilder, UInt32VectorBuilder, UInt64VectorBuilder,
 };
-use futures::StreamExt;
+use futures::TryStreamExt;
 use snafu::{OptionExt, ResultExt};
-use store_api::storage::{ScanRequest, TableId};
+use store_api::storage::{RegionId, ScanRequest, TableId};
 use table::metadata::{TableInfo, TableType};

 use crate::CatalogManager;
 use crate::error::{
-    CreateRecordBatchSnafu, FindRegionRoutesSnafu, InternalSnafu, Result,
-    UpgradeWeakCatalogManagerRefSnafu,
+    CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu,
 };
-use crate::kvbackend::KvBackendCatalogManager;
 use crate::system_schema::information_schema::{InformationTable, Predicates, TABLES};
 use crate::system_schema::utils;

@@ -250,10 +247,6 @@ impl InformationSchemaTablesBuilder {
            .catalog_manager
            .upgrade()
            .context(UpgradeWeakCatalogManagerRefSnafu)?;
-        let partition_manager = catalog_manager
-            .as_any()
-            .downcast_ref::<KvBackendCatalogManager>()
-            .map(|catalog_manager| catalog_manager.partition_manager());
        let predicates = Predicates::from_scan_request(&request);

        let information_extension = utils::information_extension(&self.catalog_manager)?;
@@ -274,59 +267,37 @@ impl InformationSchemaTablesBuilder {
        };

        for schema_name in catalog_manager.schema_names(&catalog_name, None).await? {
-            let table_stream = catalog_manager.tables(&catalog_name, &schema_name, None);
+            let mut stream = catalog_manager.tables(&catalog_name, &schema_name, None);

-            const BATCH_SIZE: usize = 128;
-            // Split tables into chunks
-            let mut table_chunks = pin!(table_stream.ready_chunks(BATCH_SIZE));
+            while let Some(table) = stream.try_next().await? {
+                let table_info = table.table_info();

-            while let Some(tables) = table_chunks.next().await {
-                let tables = tables.into_iter().collect::<Result<Vec<_>>>()?;
-                let mito_or_physical_table_ids = tables
-                    .iter()
-                    .filter(|table| {
-                        table.table_info().meta.engine == MITO_ENGINE
-                            || table.table_info().is_physical_table()
-                    })
-                    .map(|table| table.table_info().ident.table_id)
-                    .collect::<Vec<_>>();
+                // TODO(dennis): make it working for metric engine
+                let table_region_stats =
+                    if table_info.meta.engine == MITO_ENGINE || table_info.is_physical_table() {
+                        table_info
+                            .meta
+                            .region_numbers
+                            .iter()
+                            .map(|n| RegionId::new(table_info.ident.table_id, *n))
+                            .flat_map(|region_id| {
+                                region_stats
+                                    .binary_search_by_key(&region_id, |x| x.id)
+                                    .map(|i| &region_stats[i])
+                            })
+                            .collect::<Vec<_>>()
+                    } else {
+                        vec![]
+                    };

-                let table_routes = if let Some(partition_manager) = &partition_manager {
-                    partition_manager
-                        .batch_find_region_routes(&mito_or_physical_table_ids)
-                        .await
-                        .context(FindRegionRoutesSnafu)?
-                } else {
-                    mito_or_physical_table_ids
-                        .into_iter()
-                        .map(|id| (id, vec![]))
-                        .collect()
-                };
-
-                for table in tables {
-                    let table_region_stats =
-                        match table_routes.get(&table.table_info().ident.table_id) {
-                            Some(routes) => routes
-                                .iter()
-                                .flat_map(|route| {
-                                    let region_id = route.region.id;
-                                    region_stats
-                                        .binary_search_by_key(&region_id, |x| x.id)
-                                        .map(|i| &region_stats[i])
-                                })
-                                .collect::<Vec<_>>(),
-                            None => vec![],
-                        };
-
-                    self.add_table(
-                        &predicates,
-                        &catalog_name,
-                        &schema_name,
-                        table.table_info(),
-                        table.table_type(),
-                        &table_region_stats,
-                    );
-                }
+                self.add_table(
+                    &predicates,
+                    &catalog_name,
+                    &schema_name,
+                    table_info,
+                    table.table_type(),
+                    &table_region_stats,
+                );
            }
        }

--- a/src/catalog/src/table_source.rs
+++ b/src/catalog/src/table_source.rs
@@ -337,7 +337,7 @@ mod tests {
        .build();

        let table_metadata_manager = TableMetadataManager::new(backend);
-        let mut view_info = common_meta::key::test_utils::new_test_table_info(1024);
+        let mut view_info = common_meta::key::test_utils::new_test_table_info(1024, vec![]);
        view_info.table_type = TableType::View;
        let logical_plan = vec![1, 2, 3];
        // Create view metadata
--- a/src/cli/src/bench.rs
+++ b/src/cli/src/bench.rs
@@ -162,6 +162,7 @@ fn create_table_info(table_id: TableId, table_name: TableName) -> RawTableInfo {
        next_column_id: columns as u32 + 1,
        value_indices: vec![],
        options: Default::default(),
+        region_numbers: (1..=100).collect(),
        partition_key_indices: vec![],
        column_ids: vec![],
    };
--- a/src/cli/src/common/store.rs
+++ b/src/cli/src/common/store.rs
@@ -61,12 +61,6 @@ pub struct StoreConfig {
    #[cfg(feature = "pg_kvbackend")]
    #[clap(long)]
    pub meta_schema_name: Option<String>,
-
-    /// Automatically create PostgreSQL schema if it doesn't exist (default: true).
-    #[cfg(feature = "pg_kvbackend")]
-    #[clap(long, default_value_t = true)]
-    pub auto_create_schema: bool,
-
    /// TLS mode for backend store connections (etcd, PostgreSQL, MySQL)
    #[clap(long = "backend-tls-mode", value_enum, default_value = "disable")]
    pub backend_tls_mode: TlsMode,
@@ -92,7 +86,7 @@ impl StoreConfig {
    pub fn tls_config(&self) -> Option<TlsOption> {
        if self.backend_tls_mode != TlsMode::Disable {
            Some(TlsOption {
-                mode: self.backend_tls_mode,
+                mode: self.backend_tls_mode.clone(),
                cert_path: self.backend_tls_cert_path.clone(),
                key_path: self.backend_tls_key_path.clone(),
                ca_cert_path: self.backend_tls_ca_cert_path.clone(),
@@ -144,7 +138,6 @@ impl StoreConfig {
                        schema_name,
                        table_name,
                        max_txn_ops,
-                        self.auto_create_schema,
                    )
                    .await
                    .map_err(BoxedError::new)?)
--- a/src/cli/src/error.rs
+++ b/src/cli/src/error.rs
@@ -68,8 +68,8 @@ pub enum Error {
        source: common_procedure::error::Error,
    },

-    #[snafu(display("Failed to start wal provider"))]
-    StartWalProvider {
+    #[snafu(display("Failed to start wal options allocator"))]
+    StartWalOptionsAllocator {
        #[snafu(implicit)]
        location: Location,
        source: common_meta::error::Error,
@@ -343,7 +343,7 @@ impl ErrorExt for Error {

            Error::StartProcedureManager { source, .. }
            | Error::StopProcedureManager { source, .. } => source.status_code(),
-            Error::StartWalProvider { source, .. } => source.status_code(),
+            Error::StartWalOptionsAllocator { source, .. } => source.status_code(),
            Error::HttpQuerySql { .. } => StatusCode::Internal,
            Error::ParseSql { source, .. } | Error::PlanStatement { source, .. } => {
                source.status_code()
--- a/src/client/src/database.rs
+++ b/src/client/src/database.rs
@@ -37,7 +37,6 @@ use common_grpc::flight::{FlightDecoder, FlightMessage};
 use common_query::Output;
 use common_recordbatch::error::ExternalSnafu;
 use common_recordbatch::{RecordBatch, RecordBatchStreamWrapper};
-use common_telemetry::tracing::Span;
 use common_telemetry::tracing_context::W3cTrace;
 use common_telemetry::{error, warn};
 use futures::future;
@@ -457,7 +456,6 @@ impl Database {
                    stream,
                    output_ordering: None,
                    metrics: Default::default(),
-                    span: Span::current(),
                };
                Ok(Output::new_with_stream(Box::pin(record_batch_stream)))
            }
--- a/src/client/src/region.rs
+++ b/src/client/src/region.rs
@@ -30,7 +30,6 @@ use common_query::request::QueryRequest;
 use common_recordbatch::error::ExternalSnafu;
 use common_recordbatch::{RecordBatch, RecordBatchStreamWrapper, SendableRecordBatchStream};
 use common_telemetry::error;
-use common_telemetry::tracing::Span;
 use common_telemetry::tracing_context::TracingContext;
 use prost::Message;
 use query::query_engine::DefaultSerializer;
@@ -243,7 +242,6 @@ impl RegionRequester {
            stream,
            output_ordering: None,
            metrics,
-            span: Span::current(),
        };
        Ok(Box::pin(record_batch_stream))
    }
--- a/src/cmd/Cargo.toml
+++ b/src/cmd/Cargo.toml
@@ -18,7 +18,6 @@ default = [
 ]
 enterprise = ["common-meta/enterprise", "frontend/enterprise", "meta-srv/enterprise"]
 tokio-console = ["common-telemetry/tokio-console"]
-vector_index = ["mito2/vector_index"]

 [lints]
 workspace = true
--- a/src/cmd/src/datanode.rs
+++ b/src/cmd/src/datanode.rs
@@ -330,6 +330,7 @@ mod tests {
    use common_config::ENV_VAR_SEP;
    use common_test_util::temp_dir::create_named_temp_file;
    use object_store::config::{FileConfig, GcsConfig, ObjectStoreConfig, S3Config};
+    use servers::heartbeat_options::HeartbeatOptions;

    use super::*;
    use crate::options::GlobalOptions;
@@ -373,6 +374,9 @@ mod tests {
            hostname = "127.0.0.1"
            runtime_size = 8

+            [heartbeat]
+            interval = "300ms"
+
            [meta_client]
            metasrv_addrs = ["127.0.0.1:3002"]
            timeout = "3s"
@@ -430,6 +434,13 @@ mod tests {
        );
        assert!(!raft_engine_config.sync_write);

+        let HeartbeatOptions {
+            interval: heart_beat_interval,
+            ..
+        } = options.heartbeat;
+
+        assert_eq!(300, heart_beat_interval.as_millis());
+
        let MetaClientOptions {
            metasrv_addrs: metasrv_addr,
            timeout,
--- a/src/cmd/src/datanode/objbench.rs
+++ b/src/cmd/src/datanode/objbench.rs
@@ -233,8 +233,6 @@ impl ObjbenchCommand {
            inverted_index_config: MitoConfig::default().inverted_index,
            fulltext_index_config,
            bloom_filter_index_config: MitoConfig::default().bloom_filter_index,
-            #[cfg(feature = "vector_index")]
-            vector_index_config: Default::default(),
        };

        // Write SST
--- a/src/cmd/src/error.rs
+++ b/src/cmd/src/error.rs
@@ -64,8 +64,8 @@ pub enum Error {
        source: common_procedure::error::Error,
    },

-    #[snafu(display("Failed to start wal provider"))]
-    StartWalProvider {
+    #[snafu(display("Failed to start wal options allocator"))]
+    StartWalOptionsAllocator {
        #[snafu(implicit)]
        location: Location,
        source: common_meta::error::Error,
@@ -289,8 +289,8 @@ pub enum Error {
        location: Location,
    },

-    #[snafu(display("Failed to build wal provider"))]
-    BuildWalProvider {
+    #[snafu(display("Failed to build wal options allocator"))]
+    BuildWalOptionsAllocator {
        #[snafu(implicit)]
        location: Location,
        source: common_meta::error::Error,
@@ -350,9 +350,8 @@ impl ErrorExt for Error {

            Error::StartProcedureManager { source, .. }
            | Error::StopProcedureManager { source, .. } => source.status_code(),
-            Error::BuildWalProvider { source, .. } | Error::StartWalProvider { source, .. } => {
-                source.status_code()
-            }
+            Error::BuildWalOptionsAllocator { source, .. }
+            | Error::StartWalOptionsAllocator { source, .. } => source.status_code(),
            Error::HttpQuerySql { .. } => StatusCode::Internal,
            Error::ParseSql { source, .. } | Error::PlanStatement { source, .. } => {
                source.status_code()
--- a/src/cmd/src/flownode.rs
+++ b/src/cmd/src/flownode.rs
@@ -358,6 +358,7 @@ impl StartCommand {
        let heartbeat_task = flow::heartbeat::HeartbeatTask::new(
            &opts,
            meta_client.clone(),
+            opts.heartbeat.clone(),
            Arc::new(executor),
            Arc::new(resource_stat),
        );
--- a/src/cmd/src/frontend.rs
+++ b/src/cmd/src/frontend.rs
@@ -20,7 +20,6 @@ use std::time::Duration;
 use async_trait::async_trait;
 use cache::{build_fundamental_cache_registry, with_default_composite_cache_registry};
 use catalog::information_extension::DistributedInformationExtension;
-use catalog::information_schema::InformationExtensionRef;
 use catalog::kvbackend::{
    CachedKvBackendBuilder, CatalogManagerConfiguratorRef, KvBackendCatalogManagerBuilder,
    MetaKvBackend,
@@ -237,7 +236,7 @@ impl StartCommand {
        };

        let tls_opts = TlsOption::new(
-            self.tls_mode,
+            self.tls_mode.clone(),
            self.tls_cert_path.clone(),
            self.tls_key_path.clone(),
            self.tls_watch,
@@ -413,7 +412,6 @@ impl StartCommand {
            meta_client.clone(),
            client.clone(),
        ));
-        plugins.insert::<InformationExtensionRef>(information_extension.clone());

        let process_manager = Arc::new(ProcessManager::new(
            addrs::resolve_addr(&opts.grpc.bind_addr, Some(&opts.grpc.server_addr)),
--- a/src/cmd/src/lib.rs
+++ b/src/cmd/src/lib.rs
@@ -108,7 +108,7 @@ pub trait App: Send {
    }
 }

-/// Log the versions of the application.
+/// Log the versions of the application, and the arguments passed to the cli.
 ///
 /// `version` should be the same as the output of cli "--version";
 /// and the `short_version` is the short version of the codes, often consist of git branch and commit.
@@ -118,7 +118,10 @@ pub fn log_versions(version: &str, short_version: &str, app: &str) {
        .with_label_values(&[common_version::version(), short_version, app])
        .inc();

+    // Log version and argument flags.
    info!("GreptimeDB version: {}", version);
+
+    log_env_flags();
 }

 pub fn create_resource_limit_metrics(app: &str) {
@@ -141,6 +144,13 @@ pub fn create_resource_limit_metrics(app: &str) {
    }
 }

+fn log_env_flags() {
+    info!("command line arguments");
+    for argument in std::env::args() {
+        info!("argument: {}", argument);
+    }
+}
+
 pub fn maybe_activate_heap_profile(memory_options: &common_options::memory::MemoryOptions) {
    if memory_options.enable_heap_profiling {
        match activate_heap_profile() {
--- a/src/cmd/src/metasrv.rs
+++ b/src/cmd/src/metasrv.rs
@@ -155,6 +155,8 @@ pub struct StartCommand {
    #[clap(short, long)]
    selector: Option<String>,
    #[clap(long)]
+    use_memory_store: Option<bool>,
+    #[clap(long)]
    enable_region_failover: Option<bool>,
    #[clap(long)]
    http_addr: Option<String>,
@@ -184,6 +186,7 @@ impl Debug for StartCommand {
            .field("store_addrs", &self.sanitize_store_addrs())
            .field("config_file", &self.config_file)
            .field("selector", &self.selector)
+            .field("use_memory_store", &self.use_memory_store)
            .field("enable_region_failover", &self.enable_region_failover)
            .field("http_addr", &self.http_addr)
            .field("http_timeout", &self.http_timeout)
@@ -265,6 +268,10 @@ impl StartCommand {
                .context(error::UnsupportedSelectorTypeSnafu { selector_type })?;
        }

+        if let Some(use_memory_store) = self.use_memory_store {
+            opts.use_memory_store = use_memory_store;
+        }
+
        if let Some(enable_region_failover) = self.enable_region_failover {
            opts.enable_region_failover = enable_region_failover;
        }
@@ -384,6 +391,7 @@ mod tests {
            server_addr = "127.0.0.1:3002"
            store_addr = "127.0.0.1:2379"
            selector = "LeaseBased"
+            use_memory_store = false

            [logging]
            level = "debug"
@@ -462,6 +470,7 @@ mod tests {
            server_addr = "127.0.0.1:3002"
            datanode_lease_secs = 15
            selector = "LeaseBased"
+            use_memory_store = false

            [http]
            addr = "127.0.0.1:4000"
--- a/src/cmd/src/standalone.rs
+++ b/src/cmd/src/standalone.rs
@@ -40,7 +40,7 @@ use common_meta::procedure_executor::LocalProcedureExecutor;
 use common_meta::region_keeper::MemoryRegionKeeper;
 use common_meta::region_registry::LeaderRegionRegistry;
 use common_meta::sequence::SequenceBuilder;
-use common_meta::wal_provider::{WalProviderRef, build_wal_provider};
+use common_meta::wal_options_allocator::{WalOptionsAllocatorRef, build_wal_options_allocator};
 use common_procedure::ProcedureManagerRef;
 use common_query::prelude::set_default_prefix;
 use common_telemetry::info;
@@ -120,7 +120,7 @@ pub struct Instance {
    frontend: Frontend,
    flownode: FlownodeInstance,
    procedure_manager: ProcedureManagerRef,
-    wal_provider: WalProviderRef,
+    wal_options_allocator: WalOptionsAllocatorRef,
    // Keep the logging guard to prevent the worker from being dropped.
    _guard: Vec<WorkerGuard>,
 }
@@ -146,10 +146,10 @@ impl App for Instance {
            .await
            .context(error::StartProcedureManagerSnafu)?;

-        self.wal_provider
+        self.wal_options_allocator
            .start()
            .await
-            .context(error::StartWalProviderSnafu)?;
+            .context(error::StartWalOptionsAllocatorSnafu)?;

        plugins::start_frontend_plugins(self.frontend.instance.plugins().clone())
            .await
@@ -261,7 +261,7 @@ impl StartCommand {
        };

        let tls_opts = TlsOption::new(
-            self.tls_mode,
+            self.tls_mode.clone(),
            self.tls_cert_path.clone(),
            self.tls_key_path.clone(),
            self.tls_watch,
@@ -468,7 +468,7 @@ impl StartCommand {
            flow_server: flownode.flow_engine(),
        });

-        let table_id_allocator = Arc::new(
+        let table_id_sequence = Arc::new(
            SequenceBuilder::new(TABLE_ID_SEQ, kv_backend.clone())
                .initial(MIN_USER_TABLE_ID as u64)
                .step(10)
@@ -485,13 +485,13 @@ impl StartCommand {
            .clone()
            .try_into()
            .context(error::InvalidWalProviderSnafu)?;
-        let wal_provider = build_wal_provider(&kafka_options, kv_backend.clone())
+        let wal_options_allocator = build_wal_options_allocator(&kafka_options, kv_backend.clone())
            .await
-            .context(error::BuildWalProviderSnafu)?;
-        let wal_provider = Arc::new(wal_provider);
+            .context(error::BuildWalOptionsAllocatorSnafu)?;
+        let wal_options_allocator = Arc::new(wal_options_allocator);
        let table_metadata_allocator = Arc::new(TableMetadataAllocator::new(
-            table_id_allocator,
-            wal_provider.clone(),
+            table_id_sequence,
+            wal_options_allocator.clone(),
        ));
        let flow_metadata_allocator = Arc::new(FlowMetadataAllocator::with_noop_peer_allocator(
            flow_id_sequence,
@@ -585,7 +585,7 @@ impl StartCommand {
            frontend,
            flownode,
            procedure_manager,
-            wal_provider,
+            wal_options_allocator,
            _guard: guard,
        })
    }
--- a/src/cmd/tests/load_config_test.rs
+++ b/src/cmd/tests/load_config_test.rs
@@ -228,6 +228,7 @@ fn test_load_flownode_example_config() {
                ..Default::default()
            },
            tracing: Default::default(),
+            heartbeat: Default::default(),
            // flownode deliberately use a slower query parallelism
            // to avoid overwhelming the frontend with too many queries
            query: QueryOptions {
--- a/src/common/function/Cargo.toml
+++ b/src/common/function/Cargo.toml
@@ -17,7 +17,6 @@ ahash.workspace = true
 api.workspace = true
 arc-swap = "1.0"
 arrow.workspace = true
-arrow-cast.workspace = true
 arrow-schema.workspace = true
 async-trait.workspace = true
 bincode = "=1.3.3"
@@ -47,7 +46,6 @@ geohash = { version = "0.13", optional = true }
 h3o = { version = "0.6", optional = true }
 hyperloglogplus = "0.4"
 jsonb.workspace = true
-jsonpath-rust = "0.7.5"
 memchr = "2.7"
 mito-codec.workspace = true
 nalgebra.workspace = true
--- a/src/common/function/src/scalars/json/json_get.rs
+++ b/src/common/function/src/scalars/json/json_get.rs
@@ -13,24 +13,17 @@
 // limitations under the License.

 use std::fmt::{self, Display};
-use std::str::FromStr;
 use std::sync::Arc;

-use arrow::array::{ArrayRef, BinaryViewArray, StringViewArray, StructArray};
 use arrow::compute;
-use arrow::datatypes::{Float64Type, Int64Type, UInt64Type};
+use datafusion_common::DataFusionError;
 use datafusion_common::arrow::array::{
    Array, AsArray, BinaryViewBuilder, BooleanBuilder, Float64Builder, Int64Builder,
    StringViewBuilder,
 };
 use datafusion_common::arrow::datatypes::DataType;
-use datafusion_common::{DataFusionError, Result};
 use datafusion_expr::type_coercion::aggregates::STRINGS;
-use datafusion_expr::{ColumnarValue, ScalarFunctionArgs, Signature, Volatility};
-use datatypes::arrow_array::{int_array_value_at_index, string_array_value_at_index};
-use datatypes::json::JsonStructureSettings;
-use jsonpath_rust::JsonPath;
-use serde_json::Value;
+use datafusion_expr::{ColumnarValue, ScalarFunctionArgs, Signature};

 use crate::function::{Function, extract_args};
 use crate::helper;
@@ -131,6 +124,13 @@ macro_rules! json_get {
    };
 }

+json_get!(
+    JsonGetInt,
+    Int64,
+    i64,
+    "Get the value from the JSONB by the given path and return it as an integer."
+);
+
 json_get!(
    JsonGetFloat,
    Float64,
@@ -145,354 +145,68 @@ json_get!(
    "Get the value from the JSONB by the given path and return it as a boolean."
 );

-enum JsonResultValue<'a> {
-    Jsonb(Vec<u8>),
-    JsonStructByColumn(&'a ArrayRef, usize),
-    JsonStructByValue(&'a Value),
-}
-
-trait JsonGetResultBuilder {
-    fn append_value(&mut self, value: JsonResultValue<'_>) -> Result<()>;
-
-    fn append_null(&mut self);
-
-    fn build(&mut self) -> ArrayRef;
-}
-
-/// Common implementation for JSON get scalar functions.
-///
-/// `JsonGet` encapsulates the logic for extracting values from JSON inputs
-/// based on a path expression. Different JSON get functions reuse this
-/// implementation by supplying their own `JsonGetResultBuilder` to control
-/// how the resulting values are materialized into an Arrow array.
-struct JsonGet {
+/// Get the value from the JSONB by the given path and return it as a string.
+#[derive(Clone, Debug)]
+pub struct JsonGetString {
    signature: Signature,
 }

-impl JsonGet {
-    fn invoke<F, B>(&self, args: ScalarFunctionArgs, builder_factory: F) -> Result<ColumnarValue>
-    where
-        F: Fn(usize) -> B,
-        B: JsonGetResultBuilder,
-    {
-        let [arg0, arg1] = extract_args("JSON_GET", &args)?;
-
-        let arg1 = compute::cast(&arg1, &DataType::Utf8View)?;
-        let paths = arg1.as_string_view();
-
-        let mut builder = (builder_factory)(arg0.len());
-        match arg0.data_type() {
-            DataType::Binary | DataType::LargeBinary | DataType::BinaryView => {
-                let arg0 = compute::cast(&arg0, &DataType::BinaryView)?;
-                let jsons = arg0.as_binary_view();
-                jsonb_get(jsons, paths, &mut builder)?;
-            }
-            DataType::Struct(_) => {
-                let jsons = arg0.as_struct();
-                json_struct_get(jsons, paths, &mut builder)?
-            }
-            _ => {
-                return Err(DataFusionError::Execution(format!(
-                    "JSON_GET not supported argument type {}",
-                    arg0.data_type(),
-                )));
-            }
-        };
-
-        Ok(ColumnarValue::Array(builder.build()))
-    }
-}
-
-impl Default for JsonGet {
-    fn default() -> Self {
-        Self {
-            signature: Signature::any(2, Volatility::Immutable),
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct JsonGetString(JsonGet);
-
 impl JsonGetString {
    pub const NAME: &'static str = "json_get_string";
 }

+impl Default for JsonGetString {
+    fn default() -> Self {
+        Self {
+            // TODO(LFC): Use a more clear type here instead of "Binary" for Json input, once we have a "Json" type.
+            signature: helper::one_of_sigs2(
+                vec![DataType::Binary, DataType::BinaryView],
+                vec![DataType::Utf8, DataType::Utf8View],
+            ),
+        }
+    }
+}
+
 impl Function for JsonGetString {
    fn name(&self) -> &str {
        Self::NAME
    }

-    fn return_type(&self, _: &[DataType]) -> Result<DataType> {
+    fn return_type(&self, _: &[DataType]) -> datafusion_common::Result<DataType> {
        Ok(DataType::Utf8View)
    }

    fn signature(&self) -> &Signature {
-        &self.0.signature
+        &self.signature
    }

-    fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
-        struct StringResultBuilder(StringViewBuilder);
+    fn invoke_with_args(
+        &self,
+        args: ScalarFunctionArgs,
+    ) -> datafusion_common::Result<ColumnarValue> {
+        let [arg0, arg1] = extract_args(self.name(), &args)?;
+        let arg0 = compute::cast(&arg0, &DataType::BinaryView)?;
+        let jsons = arg0.as_binary_view();
+        let arg1 = compute::cast(&arg1, &DataType::Utf8View)?;
+        let paths = arg1.as_string_view();

-        impl JsonGetResultBuilder for StringResultBuilder {
-            fn append_value(&mut self, value: JsonResultValue<'_>) -> Result<()> {
-                match value {
-                    JsonResultValue::Jsonb(value) => {
-                        self.0.append_option(jsonb::to_str(&value).ok())
-                    }
-                    JsonResultValue::JsonStructByColumn(column, i) => {
-                        if let Some(v) = string_array_value_at_index(column, i) {
-                            self.0.append_value(v);
-                        } else {
-                            self.0
-                                .append_value(arrow_cast::display::array_value_to_string(
-                                    column, i,
-                                )?);
-                        }
-                    }
-                    JsonResultValue::JsonStructByValue(value) => {
-                        if let Some(s) = value.as_str() {
-                            self.0.append_value(s)
-                        } else {
-                            self.0.append_value(value.to_string())
-                        }
-                    }
+        let size = jsons.len();
+        let mut builder = StringViewBuilder::with_capacity(size);
+
+        for i in 0..size {
+            let json = jsons.is_valid(i).then(|| jsons.value(i));
+            let path = paths.is_valid(i).then(|| paths.value(i));
+            let result = match (json, path) {
+                (Some(json), Some(path)) => {
+                    get_json_by_path(json, path).and_then(|json| jsonb::to_str(&json).ok())
                }
-                Ok(())
-            }
-
-            fn append_null(&mut self) {
-                self.0.append_null();
-            }
-
-            fn build(&mut self) -> ArrayRef {
-                Arc::new(self.0.finish())
-            }
-        }
-
-        self.0.invoke(args, |len: usize| {
-            StringResultBuilder(StringViewBuilder::with_capacity(len))
-        })
-    }
-}
-
-#[derive(Default)]
-pub struct JsonGetInt(JsonGet);
-
-impl JsonGetInt {
-    pub const NAME: &'static str = "json_get_int";
-}
-
-impl Function for JsonGetInt {
-    fn name(&self) -> &str {
-        Self::NAME
-    }
-
-    fn return_type(&self, _: &[DataType]) -> Result<DataType> {
-        Ok(DataType::Int64)
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.0.signature
-    }
-
-    fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
-        struct IntResultBuilder(Int64Builder);
-
-        impl JsonGetResultBuilder for IntResultBuilder {
-            fn append_value(&mut self, value: JsonResultValue<'_>) -> Result<()> {
-                match value {
-                    JsonResultValue::Jsonb(value) => {
-                        self.0.append_option(jsonb::to_i64(&value).ok())
-                    }
-                    JsonResultValue::JsonStructByColumn(column, i) => {
-                        self.0.append_option(int_array_value_at_index(column, i))
-                    }
-                    JsonResultValue::JsonStructByValue(value) => {
-                        self.0.append_option(value.as_i64())
-                    }
-                }
-                Ok(())
-            }
-
-            fn append_null(&mut self) {
-                self.0.append_null();
-            }
-
-            fn build(&mut self) -> ArrayRef {
-                Arc::new(self.0.finish())
-            }
-        }
-
-        self.0.invoke(args, |len: usize| {
-            IntResultBuilder(Int64Builder::with_capacity(len))
-        })
-    }
-}
-
-impl Display for JsonGetInt {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", Self::NAME.to_ascii_uppercase())
-    }
-}
-
-fn jsonb_get(
-    jsons: &BinaryViewArray,
-    paths: &StringViewArray,
-    builder: &mut impl JsonGetResultBuilder,
-) -> Result<()> {
-    let size = jsons.len();
-    for i in 0..size {
-        let json = jsons.is_valid(i).then(|| jsons.value(i));
-        let path = paths.is_valid(i).then(|| paths.value(i));
-        let result = match (json, path) {
-            (Some(json), Some(path)) => get_json_by_path(json, path),
-            _ => None,
-        };
-        if let Some(v) = result {
-            builder.append_value(JsonResultValue::Jsonb(v))?;
-        } else {
-            builder.append_null();
-        }
-    }
-    Ok(())
-}
-
-fn json_struct_get(
-    jsons: &StructArray,
-    paths: &StringViewArray,
-    builder: &mut impl JsonGetResultBuilder,
-) -> Result<()> {
-    let size = jsons.len();
-    for i in 0..size {
-        if jsons.is_null(i) || paths.is_null(i) {
-            builder.append_null();
-            continue;
-        }
-        let path = paths.value(i);
-
-        // naively assume the JSON path is our kind of indexing to the field, by removing its "root"
-        let field_path = path.trim().replace("$.", "");
-        let column = jsons.column_by_name(&field_path);
-
-        if let Some(column) = column {
-            builder.append_value(JsonResultValue::JsonStructByColumn(column, i))?;
-        } else {
-            let Some(raw) = jsons
-                .column_by_name(JsonStructureSettings::RAW_FIELD)
-                .and_then(|x| string_array_value_at_index(x, i))
-            else {
-                builder.append_null();
-                continue;
+                _ => None,
            };
-
-            let path: JsonPath<Value> = JsonPath::try_from(path).map_err(|e| {
-                DataFusionError::Execution(format!("{path} is not a valid JSON path: {e}"))
-            })?;
-            // the wanted field is not retrievable from the JSON struct columns directly, we have
-            // to combine everything (columns and the "_raw") into a complete JSON value to find it
-            let value = json_struct_to_value(raw, jsons, i)?;
-
-            match path.find(&value) {
-                Value::Null => builder.append_null(),
-                Value::Array(values) => match values.as_slice() {
-                    [] => builder.append_null(),
-                    [x] => builder.append_value(JsonResultValue::JsonStructByValue(x))?,
-                    _ => builder.append_value(JsonResultValue::JsonStructByValue(&value))?,
-                },
-                value => builder.append_value(JsonResultValue::JsonStructByValue(&value))?,
-            }
+            builder.append_option(result);
        }
+
+        Ok(ColumnarValue::Array(Arc::new(builder.finish())))
    }
-
-    Ok(())
-}
-
-fn json_struct_to_value(raw: &str, jsons: &StructArray, i: usize) -> Result<Value> {
-    let Ok(mut json) = Value::from_str(raw) else {
-        return Err(DataFusionError::Internal(format!(
-            "inner field '{}' is not a valid JSON string",
-            JsonStructureSettings::RAW_FIELD
-        )));
-    };
-
-    for (column_name, column) in jsons.column_names().into_iter().zip(jsons.columns()) {
-        if column_name == JsonStructureSettings::RAW_FIELD {
-            continue;
-        }
-
-        let (json_pointer, field) = if let Some((json_object, field)) = column_name.rsplit_once(".")
-        {
-            let json_pointer = format!("/{}", json_object.replace(".", "/"));
-            (json_pointer, field)
-        } else {
-            ("".to_string(), column_name)
-        };
-        let Some(json_object) = json
-            .pointer_mut(&json_pointer)
-            .and_then(|x| x.as_object_mut())
-        else {
-            return Err(DataFusionError::Internal(format!(
-                "value at JSON pointer '{}' is not an object",
-                json_pointer
-            )));
-        };
-
-        macro_rules! insert {
-            ($column: ident, $i: ident, $json_object: ident, $field: ident) => {{
-                if let Some(value) = $column
-                    .is_valid($i)
-                    .then(|| serde_json::Value::from($column.value($i)))
-                {
-                    $json_object.insert($field.to_string(), value);
-                }
-            }};
-        }
-
-        match column.data_type() {
-            // boolean => Value::Bool
-            DataType::Boolean => {
-                let column = column.as_boolean();
-                insert!(column, i, json_object, field);
-            }
-            // int => Value::Number
-            DataType::Int64 => {
-                let column = column.as_primitive::<Int64Type>();
-                insert!(column, i, json_object, field);
-            }
-            DataType::UInt64 => {
-                let column = column.as_primitive::<UInt64Type>();
-                insert!(column, i, json_object, field);
-            }
-            DataType::Float64 => {
-                let column = column.as_primitive::<Float64Type>();
-                insert!(column, i, json_object, field);
-            }
-            // string => Value::String
-            DataType::Utf8 => {
-                let column = column.as_string::<i32>();
-                insert!(column, i, json_object, field);
-            }
-            DataType::LargeUtf8 => {
-                let column = column.as_string::<i64>();
-                insert!(column, i, json_object, field);
-            }
-            DataType::Utf8View => {
-                let column = column.as_string_view();
-                insert!(column, i, json_object, field);
-            }
-            // other => Value::Array and Value::Object
-            _ => {
-                return Err(DataFusionError::NotImplemented(format!(
-                    "{} is not yet supported to be executed with field {} of datatype {}",
-                    JsonGetString::NAME,
-                    column_name,
-                    column.data_type()
-                )));
-            }
-        }
-    }
-    Ok(json)
 }

 impl Display for JsonGetString {
@@ -582,60 +296,14 @@ impl Display for JsonGetObject {
 mod tests {
    use std::sync::Arc;

-    use arrow::array::{Float64Array, Int64Array, StructArray};
    use arrow_schema::Field;
    use datafusion_common::ScalarValue;
    use datafusion_common::arrow::array::{BinaryArray, BinaryViewArray, StringArray};
    use datafusion_common::arrow::datatypes::{Float64Type, Int64Type};
    use datatypes::types::parse_string_to_jsonb;
-    use serde_json::json;

    use super::*;

-    /// Create a JSON object like this (as a one element struct array for testing):
-    ///
-    /// ```JSON
-    /// {
-    ///     "kind": "foo",
-    ///     "payload": {
-    ///         "code": 404,
-    ///         "success": false,
-    ///         "result": {
-    ///             "error": "not found",
-    ///             "time_cost": 1.234
-    ///         }
-    ///     }
-    /// }
-    /// ```
-    fn test_json_struct() -> ArrayRef {
-        Arc::new(StructArray::new(
-            vec![
-                Field::new("kind", DataType::Utf8, true),
-                Field::new("payload.code", DataType::Int64, true),
-                Field::new("payload.result.time_cost", DataType::Float64, true),
-                Field::new(JsonStructureSettings::RAW_FIELD, DataType::Utf8View, true),
-            ]
-            .into(),
-            vec![
-                Arc::new(StringArray::from_iter([Some("foo")])) as ArrayRef,
-                Arc::new(Int64Array::from_iter([Some(404)])),
-                Arc::new(Float64Array::from_iter([Some(1.234)])),
-                Arc::new(StringViewArray::from_iter([Some(
-                    json! ({
-                        "payload": {
-                            "success": false,
-                            "result": {
-                                "error": "not found"
-                            }
-                        }
-                    })
-                    .to_string(),
-                )])),
-            ],
-            None,
-        ))
-    }
-
    #[test]
    fn test_json_get_int() {
        let json_get_int = JsonGetInt::default();
@@ -653,55 +321,37 @@ mod tests {
            r#"{"a": 4, "b": {"c": 6}, "c": 6}"#,
            r#"{"a": 7, "b": 8, "c": {"a": 7}}"#,
        ];
-        let json_struct = test_json_struct();
+        let paths = vec!["$.a.b", "$.a", "$.c"];
+        let results = [Some(2), Some(4), None];

-        let path_expects = vec![
-            ("$.a.b", Some(2)),
-            ("$.a", Some(4)),
-            ("$.c", None),
-            ("$.kind", None),
-            ("$.payload.code", Some(404)),
-            ("$.payload.success", None),
-            ("$.payload.result.time_cost", None),
-            ("$.payload.not-exists", None),
-            ("$.not-exists", None),
-            ("$", None),
-        ];
-
-        let mut jsons = json_strings
+        let jsonbs = json_strings
            .iter()
            .map(|s| {
                let value = jsonb::parse_value(s.as_bytes()).unwrap();
-                Arc::new(BinaryArray::from_iter_values([value.to_vec()])) as ArrayRef
+                value.to_vec()
            })
            .collect::<Vec<_>>();
-        let json_struct_arrays =
-            std::iter::repeat_n(json_struct, path_expects.len() - jsons.len()).collect::<Vec<_>>();
-        jsons.extend(json_struct_arrays);

-        for i in 0..jsons.len() {
-            let json = &jsons[i];
-            let (path, expect) = path_expects[i];
+        let args = ScalarFunctionArgs {
+            args: vec![
+                ColumnarValue::Array(Arc::new(BinaryArray::from_iter_values(jsonbs))),
+                ColumnarValue::Array(Arc::new(StringArray::from_iter_values(paths))),
+            ],
+            arg_fields: vec![],
+            number_rows: 3,
+            return_field: Arc::new(Field::new("x", DataType::Int64, false)),
+            config_options: Arc::new(Default::default()),
+        };
+        let result = json_get_int
+            .invoke_with_args(args)
+            .and_then(|x| x.to_array(3))
+            .unwrap();
+        let vector = result.as_primitive::<Int64Type>();

-            let args = ScalarFunctionArgs {
-                args: vec![
-                    ColumnarValue::Array(json.clone()),
-                    ColumnarValue::Scalar(path.into()),
-                ],
-                arg_fields: vec![],
-                number_rows: 1,
-                return_field: Arc::new(Field::new("x", DataType::Int64, false)),
-                config_options: Arc::new(Default::default()),
-            };
-            let result = json_get_int
-                .invoke_with_args(args)
-                .and_then(|x| x.to_array(1))
-                .unwrap();
-
-            let result = result.as_primitive::<Int64Type>();
-            assert_eq!(1, result.len());
-            let actual = result.is_valid(0).then(|| result.value(0));
-            assert_eq!(actual, expect);
+        assert_eq!(3, vector.len());
+        for (i, gt) in results.iter().enumerate() {
+            let result = vector.is_valid(i).then(|| vector.value(i));
+            assert_eq!(*gt, result);
        }
    }

@@ -824,85 +474,42 @@ mod tests {
            r#"{"a": "d", "b": {"c": "e"}, "c": "f"}"#,
            r#"{"a": "g", "b": "h", "c": {"a": "g"}}"#,
        ];
-        let json_struct = test_json_struct();
+        let paths = vec!["$.a.b", "$.a", ""];
+        let results = [Some("a"), Some("d"), None];

-        let paths = vec![
-            "$.a.b",
-            "$.a",
-            "",
-            "$.kind",
-            "$.payload.code",
-            "$.payload.result.time_cost",
-            "$.payload",
-            "$.payload.success",
-            "$.payload.result",
-            "$.payload.result.error",
-            "$.payload.result.not-exists",
-            "$.payload.not-exists",
-            "$.not-exists",
-            "$",
-        ];
-        let expects = [
-            Some("a"),
-            Some("d"),
-            None,
-            Some("foo"),
-            Some("404"),
-            Some("1.234"),
-            Some(
-                r#"{"code":404,"result":{"error":"not found","time_cost":1.234},"success":false}"#,
-            ),
-            Some("false"),
-            Some(r#"{"error":"not found","time_cost":1.234}"#),
-            Some("not found"),
-            None,
-            None,
-            None,
-            Some(
-                r#"{"kind":"foo","payload":{"code":404,"result":{"error":"not found","time_cost":1.234},"success":false}}"#,
-            ),
-        ];
-
-        let mut jsons = json_strings
+        let jsonbs = json_strings
            .iter()
            .map(|s| {
                let value = jsonb::parse_value(s.as_bytes()).unwrap();
-                Arc::new(BinaryArray::from_iter_values([value.to_vec()])) as ArrayRef
+                value.to_vec()
            })
            .collect::<Vec<_>>();
-        let json_struct_arrays =
-            std::iter::repeat_n(json_struct, expects.len() - jsons.len()).collect::<Vec<_>>();
-        jsons.extend(json_struct_arrays);

-        for i in 0..jsons.len() {
-            let json = &jsons[i];
-            let path = paths[i];
-            let expect = expects[i];
+        let args = ScalarFunctionArgs {
+            args: vec![
+                ColumnarValue::Array(Arc::new(BinaryArray::from_iter_values(jsonbs))),
+                ColumnarValue::Array(Arc::new(StringArray::from_iter_values(paths))),
+            ],
+            arg_fields: vec![],
+            number_rows: 3,
+            return_field: Arc::new(Field::new("x", DataType::Utf8View, false)),
+            config_options: Arc::new(Default::default()),
+        };
+        let result = json_get_string
+            .invoke_with_args(args)
+            .and_then(|x| x.to_array(3))
+            .unwrap();
+        let vector = result.as_string_view();

-            let args = ScalarFunctionArgs {
-                args: vec![
-                    ColumnarValue::Array(json.clone()),
-                    ColumnarValue::Scalar(path.into()),
-                ],
-                arg_fields: vec![],
-                number_rows: 1,
-                return_field: Arc::new(Field::new("x", DataType::Utf8View, false)),
-                config_options: Arc::new(Default::default()),
-            };
-            let result = json_get_string
-                .invoke_with_args(args)
-                .and_then(|x| x.to_array(1))
-                .unwrap();
-
-            let result = result.as_string_view();
-            assert_eq!(1, result.len());
-            let actual = result.is_valid(0).then(|| result.value(0));
-            assert_eq!(actual, expect);
+        assert_eq!(3, vector.len());
+        for (i, gt) in results.iter().enumerate() {
+            let result = vector.is_valid(i).then(|| vector.value(i));
+            assert_eq!(*gt, result);
        }
    }

    #[test]
-    fn test_json_get_object() -> Result<()> {
+    fn test_json_get_object() -> datafusion_common::Result<()> {
        let udf = JsonGetObject::default();
        assert_eq!("json_get_object", udf.name());
        assert_eq!(
--- a/src/common/function/src/scalars/string.rs
+++ b/src/common/function/src/scalars/string.rs
@@ -14,31 +14,13 @@

 //! String scalar functions

-mod elt;
-mod field;
-mod format;
-mod insert;
-mod locate;
 mod regexp_extract;
-mod space;

-pub(crate) use elt::EltFunction;
-pub(crate) use field::FieldFunction;
-pub(crate) use format::FormatFunction;
-pub(crate) use insert::InsertFunction;
-pub(crate) use locate::LocateFunction;
 pub(crate) use regexp_extract::RegexpExtractFunction;
-pub(crate) use space::SpaceFunction;

 use crate::function_registry::FunctionRegistry;

 /// Register all string functions
 pub fn register_string_functions(registry: &FunctionRegistry) {
-    EltFunction::register(registry);
-    FieldFunction::register(registry);
-    FormatFunction::register(registry);
-    InsertFunction::register(registry);
-    LocateFunction::register(registry);
    RegexpExtractFunction::register(registry);
-    SpaceFunction::register(registry);
 }
--- a/src/common/function/src/scalars/string/elt.rs
+++ b/src/common/function/src/scalars/string/elt.rs
@@ -1,252 +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.
-
-//! MySQL-compatible ELT function implementation.
-//!
-//! ELT(N, str1, str2, str3, ...) - Returns the Nth string from the list.
-//! Returns NULL if N < 1 or N > number of strings.
-
-use std::fmt;
-use std::sync::Arc;
-
-use datafusion_common::DataFusionError;
-use datafusion_common::arrow::array::{Array, ArrayRef, AsArray, LargeStringBuilder};
-use datafusion_common::arrow::compute::cast;
-use datafusion_common::arrow::datatypes::DataType;
-use datafusion_expr::{ColumnarValue, ScalarFunctionArgs, Signature, Volatility};
-
-use crate::function::Function;
-use crate::function_registry::FunctionRegistry;
-
-const NAME: &str = "elt";
-
-/// MySQL-compatible ELT function.
-///
-/// Syntax: ELT(N, str1, str2, str3, ...)
-/// Returns the Nth string argument. N is 1-based.
-/// Returns NULL if N is NULL, N < 1, or N > number of string arguments.
-#[derive(Debug)]
-pub struct EltFunction {
-    signature: Signature,
-}
-
-impl EltFunction {
-    pub fn register(registry: &FunctionRegistry) {
-        registry.register_scalar(EltFunction::default());
-    }
-}
-
-impl Default for EltFunction {
-    fn default() -> Self {
-        Self {
-            // ELT takes a variable number of arguments: (Int64, String, String, ...)
-            signature: Signature::variadic_any(Volatility::Immutable),
-        }
-    }
-}
-
-impl fmt::Display for EltFunction {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-impl Function for EltFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _: &[DataType]) -> datafusion_common::Result<DataType> {
-        Ok(DataType::LargeUtf8)
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn invoke_with_args(
-        &self,
-        args: ScalarFunctionArgs,
-    ) -> datafusion_common::Result<ColumnarValue> {
-        if args.args.len() < 2 {
-            return Err(DataFusionError::Execution(
-                "ELT requires at least 2 arguments: ELT(N, str1, ...)".to_string(),
-            ));
-        }
-
-        let arrays = ColumnarValue::values_to_arrays(&args.args)?;
-        let len = arrays[0].len();
-        let num_strings = arrays.len() - 1;
-
-        // First argument is the index (N) - try to cast to Int64
-        let index_array = if arrays[0].data_type() == &DataType::Null {
-            // All NULLs - return all NULLs
-            let mut builder = LargeStringBuilder::with_capacity(len, 0);
-            for _ in 0..len {
-                builder.append_null();
-            }
-            return Ok(ColumnarValue::Array(Arc::new(builder.finish())));
-        } else {
-            cast(arrays[0].as_ref(), &DataType::Int64).map_err(|e| {
-                DataFusionError::Execution(format!("ELT: index argument cast failed: {}", e))
-            })?
-        };
-
-        // Cast string arguments to LargeUtf8
-        let string_arrays: Vec<ArrayRef> = arrays[1..]
-            .iter()
-            .enumerate()
-            .map(|(i, arr)| {
-                cast(arr.as_ref(), &DataType::LargeUtf8).map_err(|e| {
-                    DataFusionError::Execution(format!(
-                        "ELT: string argument {} cast failed: {}",
-                        i + 1,
-                        e
-                    ))
-                })
-            })
-            .collect::<datafusion_common::Result<Vec<_>>>()?;
-
-        let mut builder = LargeStringBuilder::with_capacity(len, len * 32);
-
-        for i in 0..len {
-            if index_array.is_null(i) {
-                builder.append_null();
-                continue;
-            }
-
-            let n = index_array
-                .as_primitive::<datafusion_common::arrow::datatypes::Int64Type>()
-                .value(i);
-
-            // N is 1-based, check bounds
-            if n < 1 || n as usize > num_strings {
-                builder.append_null();
-                continue;
-            }
-
-            let str_idx = (n - 1) as usize;
-            let str_array = string_arrays[str_idx].as_string::<i64>();
-
-            if str_array.is_null(i) {
-                builder.append_null();
-            } else {
-                builder.append_value(str_array.value(i));
-            }
-        }
-
-        Ok(ColumnarValue::Array(Arc::new(builder.finish())))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datafusion_common::arrow::array::{Int64Array, StringArray};
-    use datafusion_common::arrow::datatypes::Field;
-    use datafusion_expr::ScalarFunctionArgs;
-
-    use super::*;
-
-    fn create_args(arrays: Vec<ArrayRef>) -> ScalarFunctionArgs {
-        let arg_fields: Vec<_> = arrays
-            .iter()
-            .enumerate()
-            .map(|(i, arr)| {
-                Arc::new(Field::new(
-                    format!("arg_{}", i),
-                    arr.data_type().clone(),
-                    true,
-                ))
-            })
-            .collect();
-
-        ScalarFunctionArgs {
-            args: arrays.iter().cloned().map(ColumnarValue::Array).collect(),
-            arg_fields,
-            return_field: Arc::new(Field::new("result", DataType::LargeUtf8, true)),
-            number_rows: arrays[0].len(),
-            config_options: Arc::new(datafusion_common::config::ConfigOptions::default()),
-        }
-    }
-
-    #[test]
-    fn test_elt_basic() {
-        let function = EltFunction::default();
-
-        let n = Arc::new(Int64Array::from(vec![1, 2, 3]));
-        let s1 = Arc::new(StringArray::from(vec!["a", "a", "a"]));
-        let s2 = Arc::new(StringArray::from(vec!["b", "b", "b"]));
-        let s3 = Arc::new(StringArray::from(vec!["c", "c", "c"]));
-
-        let args = create_args(vec![n, s1, s2, s3]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "a");
-            assert_eq!(str_array.value(1), "b");
-            assert_eq!(str_array.value(2), "c");
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_elt_out_of_bounds() {
-        let function = EltFunction::default();
-
-        let n = Arc::new(Int64Array::from(vec![0, 4, -1]));
-        let s1 = Arc::new(StringArray::from(vec!["a", "a", "a"]));
-        let s2 = Arc::new(StringArray::from(vec!["b", "b", "b"]));
-        let s3 = Arc::new(StringArray::from(vec!["c", "c", "c"]));
-
-        let args = create_args(vec![n, s1, s2, s3]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert!(str_array.is_null(0)); // 0 is out of bounds
-            assert!(str_array.is_null(1)); // 4 is out of bounds
-            assert!(str_array.is_null(2)); // -1 is out of bounds
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_elt_with_nulls() {
-        let function = EltFunction::default();
-
-        // Row 0: n=1, select s1="a" -> "a"
-        // Row 1: n=NULL -> NULL
-        // Row 2: n=1, select s1=NULL -> NULL
-        let n = Arc::new(Int64Array::from(vec![Some(1), None, Some(1)]));
-        let s1 = Arc::new(StringArray::from(vec![Some("a"), Some("a"), None]));
-        let s2 = Arc::new(StringArray::from(vec![Some("b"), Some("b"), Some("b")]));
-
-        let args = create_args(vec![n, s1, s2]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "a");
-            assert!(str_array.is_null(1)); // N is NULL
-            assert!(str_array.is_null(2)); // Selected string is NULL
-        } else {
-            panic!("Expected array result");
-        }
-    }
-}
--- a/src/common/function/src/scalars/string/field.rs
+++ b/src/common/function/src/scalars/string/field.rs
@@ -1,224 +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.
-
-//! MySQL-compatible FIELD function implementation.
-//!
-//! FIELD(str, str1, str2, str3, ...) - Returns the 1-based index of str in the list.
-//! Returns 0 if str is not found or is NULL.
-
-use std::fmt;
-use std::sync::Arc;
-
-use datafusion_common::DataFusionError;
-use datafusion_common::arrow::array::{Array, ArrayRef, AsArray, Int64Builder};
-use datafusion_common::arrow::compute::cast;
-use datafusion_common::arrow::datatypes::DataType;
-use datafusion_expr::{ColumnarValue, ScalarFunctionArgs, Signature, Volatility};
-
-use crate::function::Function;
-use crate::function_registry::FunctionRegistry;
-
-const NAME: &str = "field";
-
-/// MySQL-compatible FIELD function.
-///
-/// Syntax: FIELD(str, str1, str2, str3, ...)
-/// Returns the 1-based index of str in the argument list (str1, str2, str3, ...).
-/// Returns 0 if str is not found or is NULL.
-#[derive(Debug)]
-pub struct FieldFunction {
-    signature: Signature,
-}
-
-impl FieldFunction {
-    pub fn register(registry: &FunctionRegistry) {
-        registry.register_scalar(FieldFunction::default());
-    }
-}
-
-impl Default for FieldFunction {
-    fn default() -> Self {
-        Self {
-            // FIELD takes a variable number of arguments: (String, String, String, ...)
-            signature: Signature::variadic_any(Volatility::Immutable),
-        }
-    }
-}
-
-impl fmt::Display for FieldFunction {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-impl Function for FieldFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _: &[DataType]) -> datafusion_common::Result<DataType> {
-        Ok(DataType::Int64)
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn invoke_with_args(
-        &self,
-        args: ScalarFunctionArgs,
-    ) -> datafusion_common::Result<ColumnarValue> {
-        if args.args.len() < 2 {
-            return Err(DataFusionError::Execution(
-                "FIELD requires at least 2 arguments: FIELD(str, str1, ...)".to_string(),
-            ));
-        }
-
-        let arrays = ColumnarValue::values_to_arrays(&args.args)?;
-        let len = arrays[0].len();
-
-        // Cast all arguments to LargeUtf8
-        let string_arrays: Vec<ArrayRef> = arrays
-            .iter()
-            .enumerate()
-            .map(|(i, arr)| {
-                cast(arr.as_ref(), &DataType::LargeUtf8).map_err(|e| {
-                    DataFusionError::Execution(format!("FIELD: argument {} cast failed: {}", i, e))
-                })
-            })
-            .collect::<datafusion_common::Result<Vec<_>>>()?;
-
-        let search_str = string_arrays[0].as_string::<i64>();
-        let mut builder = Int64Builder::with_capacity(len);
-
-        for i in 0..len {
-            // If search string is NULL, return 0
-            if search_str.is_null(i) {
-                builder.append_value(0);
-                continue;
-            }
-
-            let needle = search_str.value(i);
-            let mut found_idx = 0i64;
-
-            // Search through the list (starting from index 1 in string_arrays)
-            for (j, str_arr) in string_arrays[1..].iter().enumerate() {
-                let str_array = str_arr.as_string::<i64>();
-                if !str_array.is_null(i) && str_array.value(i) == needle {
-                    found_idx = (j + 1) as i64; // 1-based index
-                    break;
-                }
-            }
-
-            builder.append_value(found_idx);
-        }
-
-        Ok(ColumnarValue::Array(Arc::new(builder.finish())))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datafusion_common::arrow::array::StringArray;
-    use datafusion_common::arrow::datatypes::Field;
-    use datafusion_expr::ScalarFunctionArgs;
-
-    use super::*;
-
-    fn create_args(arrays: Vec<ArrayRef>) -> ScalarFunctionArgs {
-        let arg_fields: Vec<_> = arrays
-            .iter()
-            .enumerate()
-            .map(|(i, arr)| {
-                Arc::new(Field::new(
-                    format!("arg_{}", i),
-                    arr.data_type().clone(),
-                    true,
-                ))
-            })
-            .collect();
-
-        ScalarFunctionArgs {
-            args: arrays.iter().cloned().map(ColumnarValue::Array).collect(),
-            arg_fields,
-            return_field: Arc::new(Field::new("result", DataType::Int64, true)),
-            number_rows: arrays[0].len(),
-            config_options: Arc::new(datafusion_common::config::ConfigOptions::default()),
-        }
-    }
-
-    #[test]
-    fn test_field_basic() {
-        let function = FieldFunction::default();
-
-        let search = Arc::new(StringArray::from(vec!["b", "d", "a"]));
-        let s1 = Arc::new(StringArray::from(vec!["a", "a", "a"]));
-        let s2 = Arc::new(StringArray::from(vec!["b", "b", "b"]));
-        let s3 = Arc::new(StringArray::from(vec!["c", "c", "c"]));
-
-        let args = create_args(vec![search, s1, s2, s3]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let int_array = array.as_primitive::<datafusion_common::arrow::datatypes::Int64Type>();
-            assert_eq!(int_array.value(0), 2); // "b" is at index 2
-            assert_eq!(int_array.value(1), 0); // "d" not found
-            assert_eq!(int_array.value(2), 1); // "a" is at index 1
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_field_with_null_search() {
-        let function = FieldFunction::default();
-
-        let search = Arc::new(StringArray::from(vec![Some("a"), None]));
-        let s1 = Arc::new(StringArray::from(vec!["a", "a"]));
-        let s2 = Arc::new(StringArray::from(vec!["b", "b"]));
-
-        let args = create_args(vec![search, s1, s2]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let int_array = array.as_primitive::<datafusion_common::arrow::datatypes::Int64Type>();
-            assert_eq!(int_array.value(0), 1); // "a" found at index 1
-            assert_eq!(int_array.value(1), 0); // NULL search returns 0
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_field_case_sensitive() {
-        let function = FieldFunction::default();
-
-        let search = Arc::new(StringArray::from(vec!["A", "a"]));
-        let s1 = Arc::new(StringArray::from(vec!["a", "a"]));
-        let s2 = Arc::new(StringArray::from(vec!["A", "A"]));
-
-        let args = create_args(vec![search, s1, s2]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let int_array = array.as_primitive::<datafusion_common::arrow::datatypes::Int64Type>();
-            assert_eq!(int_array.value(0), 2); // "A" matches at index 2
-            assert_eq!(int_array.value(1), 1); // "a" matches at index 1
-        } else {
-            panic!("Expected array result");
-        }
-    }
-}
--- a/src/common/function/src/scalars/string/format.rs
+++ b/src/common/function/src/scalars/string/format.rs
@@ -1,512 +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.
-
-//! MySQL-compatible FORMAT function implementation.
-//!
-//! FORMAT(X, D) - Formats the number X with D decimal places using thousand separators.
-
-use std::fmt;
-use std::sync::Arc;
-
-use datafusion_common::DataFusionError;
-use datafusion_common::arrow::array::{Array, AsArray, LargeStringBuilder};
-use datafusion_common::arrow::datatypes as arrow_types;
-use datafusion_common::arrow::datatypes::DataType;
-use datafusion_expr::{ColumnarValue, ScalarFunctionArgs, Signature, TypeSignature, Volatility};
-
-use crate::function::Function;
-use crate::function_registry::FunctionRegistry;
-
-const NAME: &str = "format";
-
-/// MySQL-compatible FORMAT function.
-///
-/// Syntax: FORMAT(X, D)
-/// Formats the number X to a format like '#,###,###.##', rounded to D decimal places.
-/// D can be 0 to 30.
-///
-/// Note: This implementation uses the en_US locale (comma as thousand separator,
-/// period as decimal separator).
-#[derive(Debug)]
-pub struct FormatFunction {
-    signature: Signature,
-}
-
-impl FormatFunction {
-    pub fn register(registry: &FunctionRegistry) {
-        registry.register_scalar(FormatFunction::default());
-    }
-}
-
-impl Default for FormatFunction {
-    fn default() -> Self {
-        let mut signatures = Vec::new();
-
-        // Support various numeric types for X
-        let numeric_types = [
-            DataType::Float64,
-            DataType::Float32,
-            DataType::Int64,
-            DataType::Int32,
-            DataType::Int16,
-            DataType::Int8,
-            DataType::UInt64,
-            DataType::UInt32,
-            DataType::UInt16,
-            DataType::UInt8,
-        ];
-
-        // D can be various integer types
-        let int_types = [
-            DataType::Int64,
-            DataType::Int32,
-            DataType::Int16,
-            DataType::Int8,
-            DataType::UInt64,
-            DataType::UInt32,
-            DataType::UInt16,
-            DataType::UInt8,
-        ];
-
-        for x_type in &numeric_types {
-            for d_type in &int_types {
-                signatures.push(TypeSignature::Exact(vec![x_type.clone(), d_type.clone()]));
-            }
-        }
-
-        Self {
-            signature: Signature::one_of(signatures, Volatility::Immutable),
-        }
-    }
-}
-
-impl fmt::Display for FormatFunction {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-impl Function for FormatFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _: &[DataType]) -> datafusion_common::Result<DataType> {
-        Ok(DataType::LargeUtf8)
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn invoke_with_args(
-        &self,
-        args: ScalarFunctionArgs,
-    ) -> datafusion_common::Result<ColumnarValue> {
-        if args.args.len() != 2 {
-            return Err(DataFusionError::Execution(
-                "FORMAT requires exactly 2 arguments: FORMAT(X, D)".to_string(),
-            ));
-        }
-
-        let arrays = ColumnarValue::values_to_arrays(&args.args)?;
-        let len = arrays[0].len();
-
-        let x_array = &arrays[0];
-        let d_array = &arrays[1];
-
-        let mut builder = LargeStringBuilder::with_capacity(len, len * 20);
-
-        for i in 0..len {
-            if x_array.is_null(i) || d_array.is_null(i) {
-                builder.append_null();
-                continue;
-            }
-
-            let decimal_places = get_decimal_places(d_array, i)?.clamp(0, 30) as usize;
-
-            let formatted = match x_array.data_type() {
-                DataType::Float64 | DataType::Float32 => {
-                    format_number_float(get_float_value(x_array, i)?, decimal_places)
-                }
-                DataType::Int64
-                | DataType::Int32
-                | DataType::Int16
-                | DataType::Int8
-                | DataType::UInt64
-                | DataType::UInt32
-                | DataType::UInt16
-                | DataType::UInt8 => format_number_integer(x_array, i, decimal_places)?,
-                _ => {
-                    return Err(DataFusionError::Execution(format!(
-                        "FORMAT: unsupported type {:?}",
-                        x_array.data_type()
-                    )));
-                }
-            };
-            builder.append_value(&formatted);
-        }
-
-        Ok(ColumnarValue::Array(Arc::new(builder.finish())))
-    }
-}
-
-/// Get float value from various numeric types.
-fn get_float_value(
-    array: &datafusion_common::arrow::array::ArrayRef,
-    index: usize,
-) -> datafusion_common::Result<f64> {
-    match array.data_type() {
-        DataType::Float64 => Ok(array
-            .as_primitive::<arrow_types::Float64Type>()
-            .value(index)),
-        DataType::Float32 => Ok(array
-            .as_primitive::<arrow_types::Float32Type>()
-            .value(index) as f64),
-        _ => Err(DataFusionError::Execution(format!(
-            "FORMAT: unsupported type {:?}",
-            array.data_type()
-        ))),
-    }
-}
-
-/// Get decimal places from various integer types.
-///
-/// MySQL clamps decimal places to `0..=30`. This function returns an `i64` so the caller can clamp.
-fn get_decimal_places(
-    array: &datafusion_common::arrow::array::ArrayRef,
-    index: usize,
-) -> datafusion_common::Result<i64> {
-    match array.data_type() {
-        DataType::Int64 => Ok(array.as_primitive::<arrow_types::Int64Type>().value(index)),
-        DataType::Int32 => Ok(array.as_primitive::<arrow_types::Int32Type>().value(index) as i64),
-        DataType::Int16 => Ok(array.as_primitive::<arrow_types::Int16Type>().value(index) as i64),
-        DataType::Int8 => Ok(array.as_primitive::<arrow_types::Int8Type>().value(index) as i64),
-        DataType::UInt64 => {
-            let v = array.as_primitive::<arrow_types::UInt64Type>().value(index);
-            Ok(if v > i64::MAX as u64 {
-                i64::MAX
-            } else {
-                v as i64
-            })
-        }
-        DataType::UInt32 => Ok(array.as_primitive::<arrow_types::UInt32Type>().value(index) as i64),
-        DataType::UInt16 => Ok(array.as_primitive::<arrow_types::UInt16Type>().value(index) as i64),
-        DataType::UInt8 => Ok(array.as_primitive::<arrow_types::UInt8Type>().value(index) as i64),
-        _ => Err(DataFusionError::Execution(format!(
-            "FORMAT: unsupported type {:?}",
-            array.data_type()
-        ))),
-    }
-}
-
-fn format_number_integer(
-    array: &datafusion_common::arrow::array::ArrayRef,
-    index: usize,
-    decimal_places: usize,
-) -> datafusion_common::Result<String> {
-    let (is_negative, abs_digits) = match array.data_type() {
-        DataType::Int64 => {
-            let v = array.as_primitive::<arrow_types::Int64Type>().value(index) as i128;
-            (v.is_negative(), v.unsigned_abs().to_string())
-        }
-        DataType::Int32 => {
-            let v = array.as_primitive::<arrow_types::Int32Type>().value(index) as i128;
-            (v.is_negative(), v.unsigned_abs().to_string())
-        }
-        DataType::Int16 => {
-            let v = array.as_primitive::<arrow_types::Int16Type>().value(index) as i128;
-            (v.is_negative(), v.unsigned_abs().to_string())
-        }
-        DataType::Int8 => {
-            let v = array.as_primitive::<arrow_types::Int8Type>().value(index) as i128;
-            (v.is_negative(), v.unsigned_abs().to_string())
-        }
-        DataType::UInt64 => {
-            let v = array.as_primitive::<arrow_types::UInt64Type>().value(index) as u128;
-            (false, v.to_string())
-        }
-        DataType::UInt32 => {
-            let v = array.as_primitive::<arrow_types::UInt32Type>().value(index) as u128;
-            (false, v.to_string())
-        }
-        DataType::UInt16 => {
-            let v = array.as_primitive::<arrow_types::UInt16Type>().value(index) as u128;
-            (false, v.to_string())
-        }
-        DataType::UInt8 => {
-            let v = array.as_primitive::<arrow_types::UInt8Type>().value(index) as u128;
-            (false, v.to_string())
-        }
-        _ => {
-            return Err(DataFusionError::Execution(format!(
-                "FORMAT: unsupported type {:?}",
-                array.data_type()
-            )));
-        }
-    };
-
-    let mut result = String::new();
-    if is_negative {
-        result.push('-');
-    }
-    result.push_str(&add_thousand_separators(&abs_digits));
-
-    if decimal_places > 0 {
-        result.push('.');
-        result.push_str(&"0".repeat(decimal_places));
-    }
-
-    Ok(result)
-}
-
-/// Format a float with thousand separators and `decimal_places` digits after decimal point.
-fn format_number_float(x: f64, decimal_places: usize) -> String {
-    // Handle special cases
-    if x.is_nan() {
-        return "NaN".to_string();
-    }
-    if x.is_infinite() {
-        return if x.is_sign_positive() {
-            "Infinity".to_string()
-        } else {
-            "-Infinity".to_string()
-        };
-    }
-
-    // Round to decimal_places
-    let multiplier = 10f64.powi(decimal_places as i32);
-    let rounded = (x * multiplier).round() / multiplier;
-
-    // Split into integer and fractional parts
-    let is_negative = rounded < 0.0;
-    let abs_value = rounded.abs();
-
-    // Format with the specified decimal places
-    let formatted = if decimal_places == 0 {
-        format!("{:.0}", abs_value)
-    } else {
-        format!("{:.prec$}", abs_value, prec = decimal_places)
-    };
-
-    // Split at decimal point
-    let parts: Vec<&str> = formatted.split('.').collect();
-    let int_part = parts[0];
-    let dec_part = parts.get(1).copied();
-
-    // Add thousand separators to integer part
-    let int_with_sep = add_thousand_separators(int_part);
-
-    // Build result
-    let mut result = String::new();
-    if is_negative {
-        result.push('-');
-    }
-    result.push_str(&int_with_sep);
-    if let Some(dec) = dec_part {
-        result.push('.');
-        result.push_str(dec);
-    }
-
-    result
-}
-
-/// Add thousand separators (commas) to an integer string.
-fn add_thousand_separators(s: &str) -> String {
-    let chars: Vec<char> = s.chars().collect();
-    let len = chars.len();
-
-    if len <= 3 {
-        return s.to_string();
-    }
-
-    let mut result = String::with_capacity(len + len / 3);
-    let first_group_len = len % 3;
-    let first_group_len = if first_group_len == 0 {
-        3
-    } else {
-        first_group_len
-    };
-
-    for (i, ch) in chars.iter().enumerate() {
-        if i > 0 && i >= first_group_len && (i - first_group_len) % 3 == 0 {
-            result.push(',');
-        }
-        result.push(*ch);
-    }
-
-    result
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datafusion_common::arrow::array::{Float64Array, Int64Array};
-    use datafusion_common::arrow::datatypes::Field;
-    use datafusion_expr::ScalarFunctionArgs;
-
-    use super::*;
-
-    fn create_args(arrays: Vec<datafusion_common::arrow::array::ArrayRef>) -> ScalarFunctionArgs {
-        let arg_fields: Vec<_> = arrays
-            .iter()
-            .enumerate()
-            .map(|(i, arr)| {
-                Arc::new(Field::new(
-                    format!("arg_{}", i),
-                    arr.data_type().clone(),
-                    true,
-                ))
-            })
-            .collect();
-
-        ScalarFunctionArgs {
-            args: arrays.iter().cloned().map(ColumnarValue::Array).collect(),
-            arg_fields,
-            return_field: Arc::new(Field::new("result", DataType::LargeUtf8, true)),
-            number_rows: arrays[0].len(),
-            config_options: Arc::new(datafusion_common::config::ConfigOptions::default()),
-        }
-    }
-
-    #[test]
-    fn test_format_basic() {
-        let function = FormatFunction::default();
-
-        let x = Arc::new(Float64Array::from(vec![1234567.891, 1234.5, 1234567.0]));
-        let d = Arc::new(Int64Array::from(vec![2, 0, 3]));
-
-        let args = create_args(vec![x, d]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "1,234,567.89");
-            assert_eq!(str_array.value(1), "1,235"); // rounded
-            assert_eq!(str_array.value(2), "1,234,567.000");
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_format_negative() {
-        let function = FormatFunction::default();
-
-        let x = Arc::new(Float64Array::from(vec![-1234567.891]));
-        let d = Arc::new(Int64Array::from(vec![2]));
-
-        let args = create_args(vec![x, d]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "-1,234,567.89");
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_format_small_numbers() {
-        let function = FormatFunction::default();
-
-        let x = Arc::new(Float64Array::from(vec![0.5, 12.345, 123.0]));
-        let d = Arc::new(Int64Array::from(vec![2, 2, 0]));
-
-        let args = create_args(vec![x, d]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "0.50");
-            assert_eq!(str_array.value(1), "12.35"); // rounded
-            assert_eq!(str_array.value(2), "123");
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_format_with_nulls() {
-        let function = FormatFunction::default();
-
-        let x = Arc::new(Float64Array::from(vec![Some(1234.5), None]));
-        let d = Arc::new(Int64Array::from(vec![2, 2]));
-
-        let args = create_args(vec![x, d]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "1,234.50");
-            assert!(str_array.is_null(1));
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_add_thousand_separators() {
-        assert_eq!(add_thousand_separators("1"), "1");
-        assert_eq!(add_thousand_separators("12"), "12");
-        assert_eq!(add_thousand_separators("123"), "123");
-        assert_eq!(add_thousand_separators("1234"), "1,234");
-        assert_eq!(add_thousand_separators("12345"), "12,345");
-        assert_eq!(add_thousand_separators("123456"), "123,456");
-        assert_eq!(add_thousand_separators("1234567"), "1,234,567");
-        assert_eq!(add_thousand_separators("12345678"), "12,345,678");
-        assert_eq!(add_thousand_separators("123456789"), "123,456,789");
-    }
-
-    #[test]
-    fn test_format_large_int_no_float_precision_loss() {
-        let function = FormatFunction::default();
-
-        // 2^53 + 1 cannot be represented exactly as f64.
-        let x = Arc::new(Int64Array::from(vec![9_007_199_254_740_993i64]));
-        let d = Arc::new(Int64Array::from(vec![0]));
-
-        let args = create_args(vec![x, d]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "9,007,199,254,740,993");
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_format_decimal_places_u64_overflow_clamps() {
-        use datafusion_common::arrow::array::UInt64Array;
-
-        let function = FormatFunction::default();
-
-        let x = Arc::new(Int64Array::from(vec![1]));
-        let d = Arc::new(UInt64Array::from(vec![u64::MAX]));
-
-        let args = create_args(vec![x, d]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), format!("1.{}", "0".repeat(30)));
-        } else {
-            panic!("Expected array result");
-        }
-    }
-}
--- a/src/common/function/src/scalars/string/insert.rs
+++ b/src/common/function/src/scalars/string/insert.rs
@@ -1,345 +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.
-
-//! MySQL-compatible INSERT function implementation.
-//!
-//! INSERT(str, pos, len, newstr) - Inserts newstr into str at position pos,
-//! replacing len characters.
-
-use std::fmt;
-use std::sync::Arc;
-
-use datafusion_common::DataFusionError;
-use datafusion_common::arrow::array::{Array, ArrayRef, AsArray, LargeStringBuilder};
-use datafusion_common::arrow::compute::cast;
-use datafusion_common::arrow::datatypes::DataType;
-use datafusion_expr::{ColumnarValue, ScalarFunctionArgs, Signature, TypeSignature, Volatility};
-
-use crate::function::Function;
-use crate::function_registry::FunctionRegistry;
-
-const NAME: &str = "insert";
-
-/// MySQL-compatible INSERT function.
-///
-/// Syntax: INSERT(str, pos, len, newstr)
-/// Returns str with the substring beginning at position pos and len characters long
-/// replaced by newstr.
-///
-/// - pos is 1-based
-/// - If pos is out of range, returns the original string
-/// - If len is out of range, replaces from pos to end of string
-#[derive(Debug)]
-pub struct InsertFunction {
-    signature: Signature,
-}
-
-impl InsertFunction {
-    pub fn register(registry: &FunctionRegistry) {
-        registry.register_scalar(InsertFunction::default());
-    }
-}
-
-impl Default for InsertFunction {
-    fn default() -> Self {
-        let mut signatures = Vec::new();
-        let string_types = [DataType::Utf8, DataType::LargeUtf8, DataType::Utf8View];
-        let int_types = [
-            DataType::Int64,
-            DataType::Int32,
-            DataType::Int16,
-            DataType::Int8,
-            DataType::UInt64,
-            DataType::UInt32,
-            DataType::UInt16,
-            DataType::UInt8,
-        ];
-
-        for str_type in &string_types {
-            for newstr_type in &string_types {
-                for pos_type in &int_types {
-                    for len_type in &int_types {
-                        signatures.push(TypeSignature::Exact(vec![
-                            str_type.clone(),
-                            pos_type.clone(),
-                            len_type.clone(),
-                            newstr_type.clone(),
-                        ]));
-                    }
-                }
-            }
-        }
-
-        Self {
-            signature: Signature::one_of(signatures, Volatility::Immutable),
-        }
-    }
-}
-
-impl fmt::Display for InsertFunction {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-impl Function for InsertFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _: &[DataType]) -> datafusion_common::Result<DataType> {
-        Ok(DataType::LargeUtf8)
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn invoke_with_args(
-        &self,
-        args: ScalarFunctionArgs,
-    ) -> datafusion_common::Result<ColumnarValue> {
-        if args.args.len() != 4 {
-            return Err(DataFusionError::Execution(
-                "INSERT requires exactly 4 arguments: INSERT(str, pos, len, newstr)".to_string(),
-            ));
-        }
-
-        let arrays = ColumnarValue::values_to_arrays(&args.args)?;
-        let len = arrays[0].len();
-
-        // Cast string arguments to LargeUtf8
-        let str_array = cast_to_large_utf8(&arrays[0], "str")?;
-        let newstr_array = cast_to_large_utf8(&arrays[3], "newstr")?;
-        let pos_array = cast_to_int64(&arrays[1], "pos")?;
-        let replace_len_array = cast_to_int64(&arrays[2], "len")?;
-
-        let str_arr = str_array.as_string::<i64>();
-        let pos_arr = pos_array.as_primitive::<datafusion_common::arrow::datatypes::Int64Type>();
-        let len_arr =
-            replace_len_array.as_primitive::<datafusion_common::arrow::datatypes::Int64Type>();
-        let newstr_arr = newstr_array.as_string::<i64>();
-
-        let mut builder = LargeStringBuilder::with_capacity(len, len * 32);
-
-        for i in 0..len {
-            // Check for NULLs
-            if str_arr.is_null(i)
-                || pos_array.is_null(i)
-                || replace_len_array.is_null(i)
-                || newstr_arr.is_null(i)
-            {
-                builder.append_null();
-                continue;
-            }
-
-            let original = str_arr.value(i);
-            let pos = pos_arr.value(i);
-            let replace_len = len_arr.value(i);
-            let new_str = newstr_arr.value(i);
-
-            let result = insert_string(original, pos, replace_len, new_str);
-            builder.append_value(&result);
-        }
-
-        Ok(ColumnarValue::Array(Arc::new(builder.finish())))
-    }
-}
-
-/// Cast array to LargeUtf8 for uniform string access.
-fn cast_to_large_utf8(array: &ArrayRef, name: &str) -> datafusion_common::Result<ArrayRef> {
-    cast(array.as_ref(), &DataType::LargeUtf8)
-        .map_err(|e| DataFusionError::Execution(format!("INSERT: {} cast failed: {}", name, e)))
-}
-
-fn cast_to_int64(array: &ArrayRef, name: &str) -> datafusion_common::Result<ArrayRef> {
-    cast(array.as_ref(), &DataType::Int64)
-        .map_err(|e| DataFusionError::Execution(format!("INSERT: {} cast failed: {}", name, e)))
-}
-
-/// Perform the INSERT string operation.
-/// pos is 1-based. If pos < 1 or pos > len(str) + 1, returns original string.
-fn insert_string(original: &str, pos: i64, replace_len: i64, new_str: &str) -> String {
-    let char_count = original.chars().count();
-
-    // MySQL behavior: if pos < 1 or pos > string length + 1, return original
-    if pos < 1 || pos as usize > char_count + 1 {
-        return original.to_string();
-    }
-
-    let start_idx = (pos - 1) as usize; // Convert to 0-based
-
-    // Calculate end index for replacement
-    let replace_len = if replace_len < 0 {
-        0
-    } else {
-        replace_len as usize
-    };
-    let end_idx = (start_idx + replace_len).min(char_count);
-
-    let start_byte = char_to_byte_idx(original, start_idx);
-    let end_byte = char_to_byte_idx(original, end_idx);
-
-    let mut result = String::with_capacity(original.len() + new_str.len());
-    result.push_str(&original[..start_byte]);
-    result.push_str(new_str);
-    result.push_str(&original[end_byte..]);
-    result
-}
-
-fn char_to_byte_idx(s: &str, char_idx: usize) -> usize {
-    s.char_indices()
-        .nth(char_idx)
-        .map(|(idx, _)| idx)
-        .unwrap_or(s.len())
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datafusion_common::arrow::array::{Int64Array, StringArray};
-    use datafusion_common::arrow::datatypes::Field;
-    use datafusion_expr::ScalarFunctionArgs;
-
-    use super::*;
-
-    fn create_args(arrays: Vec<ArrayRef>) -> ScalarFunctionArgs {
-        let arg_fields: Vec<_> = arrays
-            .iter()
-            .enumerate()
-            .map(|(i, arr)| {
-                Arc::new(Field::new(
-                    format!("arg_{}", i),
-                    arr.data_type().clone(),
-                    true,
-                ))
-            })
-            .collect();
-
-        ScalarFunctionArgs {
-            args: arrays.iter().cloned().map(ColumnarValue::Array).collect(),
-            arg_fields,
-            return_field: Arc::new(Field::new("result", DataType::LargeUtf8, true)),
-            number_rows: arrays[0].len(),
-            config_options: Arc::new(datafusion_common::config::ConfigOptions::default()),
-        }
-    }
-
-    #[test]
-    fn test_insert_basic() {
-        let function = InsertFunction::default();
-
-        // INSERT('Quadratic', 3, 4, 'What') => 'QuWhattic'
-        let str_arr = Arc::new(StringArray::from(vec!["Quadratic"]));
-        let pos = Arc::new(Int64Array::from(vec![3]));
-        let len = Arc::new(Int64Array::from(vec![4]));
-        let newstr = Arc::new(StringArray::from(vec!["What"]));
-
-        let args = create_args(vec![str_arr, pos, len, newstr]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "QuWhattic");
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_insert_out_of_range_pos() {
-        let function = InsertFunction::default();
-
-        // INSERT('Quadratic', 0, 4, 'What') => 'Quadratic' (pos < 1)
-        let str_arr = Arc::new(StringArray::from(vec!["Quadratic", "Quadratic"]));
-        let pos = Arc::new(Int64Array::from(vec![0, 100]));
-        let len = Arc::new(Int64Array::from(vec![4, 4]));
-        let newstr = Arc::new(StringArray::from(vec!["What", "What"]));
-
-        let args = create_args(vec![str_arr, pos, len, newstr]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "Quadratic"); // pos < 1
-            assert_eq!(str_array.value(1), "Quadratic"); // pos > length
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_insert_replace_to_end() {
-        let function = InsertFunction::default();
-
-        // INSERT('Quadratic', 3, 100, 'What') => 'QuWhat' (len exceeds remaining)
-        let str_arr = Arc::new(StringArray::from(vec!["Quadratic"]));
-        let pos = Arc::new(Int64Array::from(vec![3]));
-        let len = Arc::new(Int64Array::from(vec![100]));
-        let newstr = Arc::new(StringArray::from(vec!["What"]));
-
-        let args = create_args(vec![str_arr, pos, len, newstr]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "QuWhat");
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_insert_unicode() {
-        let function = InsertFunction::default();
-
-        // INSERT('hello世界', 6, 1, 'の') => 'helloの界'
-        let str_arr = Arc::new(StringArray::from(vec!["hello世界"]));
-        let pos = Arc::new(Int64Array::from(vec![6]));
-        let len = Arc::new(Int64Array::from(vec![1]));
-        let newstr = Arc::new(StringArray::from(vec!["の"]));
-
-        let args = create_args(vec![str_arr, pos, len, newstr]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "helloの界");
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_insert_with_nulls() {
-        let function = InsertFunction::default();
-
-        let str_arr = Arc::new(StringArray::from(vec![Some("hello"), None]));
-        let pos = Arc::new(Int64Array::from(vec![1, 1]));
-        let len = Arc::new(Int64Array::from(vec![1, 1]));
-        let newstr = Arc::new(StringArray::from(vec!["X", "X"]));
-
-        let args = create_args(vec![str_arr, pos, len, newstr]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "Xello");
-            assert!(str_array.is_null(1));
-        } else {
-            panic!("Expected array result");
-        }
-    }
-}
--- a/src/common/function/src/scalars/string/locate.rs
+++ b/src/common/function/src/scalars/string/locate.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.
-
-//! MySQL-compatible LOCATE function implementation.
-//!
-//! LOCATE(substr, str) - Returns the position of the first occurrence of substr in str (1-based).
-//! LOCATE(substr, str, pos) - Returns the position of the first occurrence of substr in str,
-//!                            starting from position pos.
-//! Returns 0 if substr is not found.
-
-use std::fmt;
-use std::sync::Arc;
-
-use datafusion_common::DataFusionError;
-use datafusion_common::arrow::array::{Array, ArrayRef, AsArray, Int64Builder};
-use datafusion_common::arrow::compute::cast;
-use datafusion_common::arrow::datatypes::DataType;
-use datafusion_expr::{ColumnarValue, ScalarFunctionArgs, Signature, TypeSignature, Volatility};
-
-use crate::function::Function;
-use crate::function_registry::FunctionRegistry;
-
-const NAME: &str = "locate";
-
-/// MySQL-compatible LOCATE function.
-///
-/// Syntax:
-/// - LOCATE(substr, str) - Returns 1-based position of substr in str, or 0 if not found.
-/// - LOCATE(substr, str, pos) - Same, but starts searching from position pos.
-#[derive(Debug)]
-pub struct LocateFunction {
-    signature: Signature,
-}
-
-impl LocateFunction {
-    pub fn register(registry: &FunctionRegistry) {
-        registry.register_scalar(LocateFunction::default());
-    }
-}
-
-impl Default for LocateFunction {
-    fn default() -> Self {
-        // Support 2 or 3 arguments with various string types
-        let mut signatures = Vec::new();
-        let string_types = [DataType::Utf8, DataType::LargeUtf8, DataType::Utf8View];
-        let int_types = [
-            DataType::Int64,
-            DataType::Int32,
-            DataType::Int16,
-            DataType::Int8,
-            DataType::UInt64,
-            DataType::UInt32,
-            DataType::UInt16,
-            DataType::UInt8,
-        ];
-
-        // 2-argument form: LOCATE(substr, str)
-        for substr_type in &string_types {
-            for str_type in &string_types {
-                signatures.push(TypeSignature::Exact(vec![
-                    substr_type.clone(),
-                    str_type.clone(),
-                ]));
-            }
-        }
-
-        // 3-argument form: LOCATE(substr, str, pos)
-        for substr_type in &string_types {
-            for str_type in &string_types {
-                for pos_type in &int_types {
-                    signatures.push(TypeSignature::Exact(vec![
-                        substr_type.clone(),
-                        str_type.clone(),
-                        pos_type.clone(),
-                    ]));
-                }
-            }
-        }
-
-        Self {
-            signature: Signature::one_of(signatures, Volatility::Immutable),
-        }
-    }
-}
-
-impl fmt::Display for LocateFunction {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-impl Function for LocateFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _: &[DataType]) -> datafusion_common::Result<DataType> {
-        Ok(DataType::Int64)
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn invoke_with_args(
-        &self,
-        args: ScalarFunctionArgs,
-    ) -> datafusion_common::Result<ColumnarValue> {
-        let arg_count = args.args.len();
-        if !(2..=3).contains(&arg_count) {
-            return Err(DataFusionError::Execution(
-                "LOCATE requires 2 or 3 arguments: LOCATE(substr, str) or LOCATE(substr, str, pos)"
-                    .to_string(),
-            ));
-        }
-
-        let arrays = ColumnarValue::values_to_arrays(&args.args)?;
-
-        // Cast string arguments to LargeUtf8 for uniform access
-        let substr_array = cast_to_large_utf8(&arrays[0], "substr")?;
-        let str_array = cast_to_large_utf8(&arrays[1], "str")?;
-
-        let substr = substr_array.as_string::<i64>();
-        let str_arr = str_array.as_string::<i64>();
-        let len = substr.len();
-
-        // Handle optional pos argument
-        let pos_array: Option<ArrayRef> = if arg_count == 3 {
-            Some(cast_to_int64(&arrays[2], "pos")?)
-        } else {
-            None
-        };
-
-        let mut builder = Int64Builder::with_capacity(len);
-
-        for i in 0..len {
-            if substr.is_null(i) || str_arr.is_null(i) {
-                builder.append_null();
-                continue;
-            }
-
-            let needle = substr.value(i);
-            let haystack = str_arr.value(i);
-
-            // Get starting position (1-based in MySQL, convert to 0-based)
-            let start_pos = if let Some(ref pos_arr) = pos_array {
-                if pos_arr.is_null(i) {
-                    builder.append_null();
-                    continue;
-                }
-                let pos = pos_arr
-                    .as_primitive::<datafusion_common::arrow::datatypes::Int64Type>()
-                    .value(i);
-                if pos < 1 {
-                    // MySQL returns 0 for pos < 1
-                    builder.append_value(0);
-                    continue;
-                }
-                (pos - 1) as usize
-            } else {
-                0
-            };
-
-            // Find position using character-based indexing (for Unicode support)
-            let result = locate_substr(haystack, needle, start_pos);
-            builder.append_value(result);
-        }
-
-        Ok(ColumnarValue::Array(Arc::new(builder.finish())))
-    }
-}
-
-/// Cast array to LargeUtf8 for uniform string access.
-fn cast_to_large_utf8(array: &ArrayRef, name: &str) -> datafusion_common::Result<ArrayRef> {
-    cast(array.as_ref(), &DataType::LargeUtf8)
-        .map_err(|e| DataFusionError::Execution(format!("LOCATE: {} cast failed: {}", name, e)))
-}
-
-fn cast_to_int64(array: &ArrayRef, name: &str) -> datafusion_common::Result<ArrayRef> {
-    cast(array.as_ref(), &DataType::Int64)
-        .map_err(|e| DataFusionError::Execution(format!("LOCATE: {} cast failed: {}", name, e)))
-}
-
-/// Find the 1-based position of needle in haystack, starting from start_pos (0-based character index).
-/// Returns 0 if not found.
-fn locate_substr(haystack: &str, needle: &str, start_pos: usize) -> i64 {
-    // Handle empty needle - MySQL returns start_pos + 1
-    if needle.is_empty() {
-        let char_count = haystack.chars().count();
-        return if start_pos <= char_count {
-            (start_pos + 1) as i64
-        } else {
-            0
-        };
-    }
-
-    // Convert start_pos (character index) to byte index
-    let byte_start = haystack
-        .char_indices()
-        .nth(start_pos)
-        .map(|(idx, _)| idx)
-        .unwrap_or(haystack.len());
-
-    if byte_start >= haystack.len() {
-        return 0;
-    }
-
-    // Search in the substring
-    let search_str = &haystack[byte_start..];
-    if let Some(byte_pos) = search_str.find(needle) {
-        // Convert byte position back to character position
-        let char_pos = search_str[..byte_pos].chars().count();
-        // Return 1-based position relative to original string
-        (start_pos + char_pos + 1) as i64
-    } else {
-        0
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datafusion_common::arrow::array::StringArray;
-    use datafusion_common::arrow::datatypes::Field;
-    use datafusion_expr::ScalarFunctionArgs;
-
-    use super::*;
-
-    fn create_args(arrays: Vec<ArrayRef>) -> ScalarFunctionArgs {
-        let arg_fields: Vec<_> = arrays
-            .iter()
-            .enumerate()
-            .map(|(i, arr)| {
-                Arc::new(Field::new(
-                    format!("arg_{}", i),
-                    arr.data_type().clone(),
-                    true,
-                ))
-            })
-            .collect();
-
-        ScalarFunctionArgs {
-            args: arrays.iter().cloned().map(ColumnarValue::Array).collect(),
-            arg_fields,
-            return_field: Arc::new(Field::new("result", DataType::Int64, true)),
-            number_rows: arrays[0].len(),
-            config_options: Arc::new(datafusion_common::config::ConfigOptions::default()),
-        }
-    }
-
-    #[test]
-    fn test_locate_basic() {
-        let function = LocateFunction::default();
-
-        let substr = Arc::new(StringArray::from(vec!["world", "xyz", "hello"]));
-        let str_arr = Arc::new(StringArray::from(vec![
-            "hello world",
-            "hello world",
-            "hello world",
-        ]));
-
-        let args = create_args(vec![substr, str_arr]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let int_array = array.as_primitive::<datafusion_common::arrow::datatypes::Int64Type>();
-            assert_eq!(int_array.value(0), 7); // "world" at position 7
-            assert_eq!(int_array.value(1), 0); // "xyz" not found
-            assert_eq!(int_array.value(2), 1); // "hello" at position 1
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_locate_with_position() {
-        let function = LocateFunction::default();
-
-        let substr = Arc::new(StringArray::from(vec!["o", "o", "o"]));
-        let str_arr = Arc::new(StringArray::from(vec![
-            "hello world",
-            "hello world",
-            "hello world",
-        ]));
-        let pos = Arc::new(datafusion_common::arrow::array::Int64Array::from(vec![
-            1, 5, 8,
-        ]));
-
-        let args = create_args(vec![substr, str_arr, pos]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let int_array = array.as_primitive::<datafusion_common::arrow::datatypes::Int64Type>();
-            assert_eq!(int_array.value(0), 5); // first 'o' at position 5
-            assert_eq!(int_array.value(1), 5); // 'o' at position 5 (start from 5)
-            assert_eq!(int_array.value(2), 8); // 'o' in "world" at position 8
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_locate_unicode() {
-        let function = LocateFunction::default();
-
-        let substr = Arc::new(StringArray::from(vec!["世", "界"]));
-        let str_arr = Arc::new(StringArray::from(vec!["hello世界", "hello世界"]));
-
-        let args = create_args(vec![substr, str_arr]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let int_array = array.as_primitive::<datafusion_common::arrow::datatypes::Int64Type>();
-            assert_eq!(int_array.value(0), 6); // "世" at position 6
-            assert_eq!(int_array.value(1), 7); // "界" at position 7
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_locate_empty_needle() {
-        let function = LocateFunction::default();
-
-        let substr = Arc::new(StringArray::from(vec!["", ""]));
-        let str_arr = Arc::new(StringArray::from(vec!["hello", "hello"]));
-        let pos = Arc::new(datafusion_common::arrow::array::Int64Array::from(vec![
-            1, 3,
-        ]));
-
-        let args = create_args(vec![substr, str_arr, pos]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let int_array = array.as_primitive::<datafusion_common::arrow::datatypes::Int64Type>();
-            assert_eq!(int_array.value(0), 1); // empty string at pos 1
-            assert_eq!(int_array.value(1), 3); // empty string at pos 3
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_locate_with_nulls() {
-        let function = LocateFunction::default();
-
-        let substr = Arc::new(StringArray::from(vec![Some("o"), None]));
-        let str_arr = Arc::new(StringArray::from(vec![Some("hello"), Some("hello")]));
-
-        let args = create_args(vec![substr, str_arr]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let int_array = array.as_primitive::<datafusion_common::arrow::datatypes::Int64Type>();
-            assert_eq!(int_array.value(0), 5);
-            assert!(int_array.is_null(1));
-        } else {
-            panic!("Expected array result");
-        }
-    }
-}
--- a/src/common/function/src/scalars/string/space.rs
+++ b/src/common/function/src/scalars/string/space.rs
@@ -1,252 +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.
-
-//! MySQL-compatible SPACE function implementation.
-//!
-//! SPACE(N) - Returns a string consisting of N space characters.
-
-use std::fmt;
-use std::sync::Arc;
-
-use datafusion_common::DataFusionError;
-use datafusion_common::arrow::array::{Array, AsArray, LargeStringBuilder};
-use datafusion_common::arrow::datatypes::DataType;
-use datafusion_expr::{ColumnarValue, ScalarFunctionArgs, Signature, TypeSignature, Volatility};
-
-use crate::function::Function;
-use crate::function_registry::FunctionRegistry;
-
-const NAME: &str = "space";
-
-// Safety limit for maximum number of spaces
-const MAX_SPACE_COUNT: i64 = 1024 * 1024; // 1MB of spaces
-
-/// MySQL-compatible SPACE function.
-///
-/// Syntax: SPACE(N)
-/// Returns a string consisting of N space characters.
-/// Returns NULL if N is NULL.
-/// Returns empty string if N < 0.
-#[derive(Debug)]
-pub struct SpaceFunction {
-    signature: Signature,
-}
-
-impl SpaceFunction {
-    pub fn register(registry: &FunctionRegistry) {
-        registry.register_scalar(SpaceFunction::default());
-    }
-}
-
-impl Default for SpaceFunction {
-    fn default() -> Self {
-        Self {
-            signature: Signature::one_of(
-                vec![
-                    TypeSignature::Exact(vec![DataType::Int64]),
-                    TypeSignature::Exact(vec![DataType::Int32]),
-                    TypeSignature::Exact(vec![DataType::Int16]),
-                    TypeSignature::Exact(vec![DataType::Int8]),
-                    TypeSignature::Exact(vec![DataType::UInt64]),
-                    TypeSignature::Exact(vec![DataType::UInt32]),
-                    TypeSignature::Exact(vec![DataType::UInt16]),
-                    TypeSignature::Exact(vec![DataType::UInt8]),
-                ],
-                Volatility::Immutable,
-            ),
-        }
-    }
-}
-
-impl fmt::Display for SpaceFunction {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-impl Function for SpaceFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _: &[DataType]) -> datafusion_common::Result<DataType> {
-        Ok(DataType::LargeUtf8)
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn invoke_with_args(
-        &self,
-        args: ScalarFunctionArgs,
-    ) -> datafusion_common::Result<ColumnarValue> {
-        if args.args.len() != 1 {
-            return Err(DataFusionError::Execution(
-                "SPACE requires exactly 1 argument: SPACE(N)".to_string(),
-            ));
-        }
-
-        let arrays = ColumnarValue::values_to_arrays(&args.args)?;
-        let len = arrays[0].len();
-        let n_array = &arrays[0];
-
-        let mut builder = LargeStringBuilder::with_capacity(len, len * 10);
-
-        for i in 0..len {
-            if n_array.is_null(i) {
-                builder.append_null();
-                continue;
-            }
-
-            let n = get_int_value(n_array, i)?;
-
-            if n < 0 {
-                // MySQL returns empty string for negative values
-                builder.append_value("");
-            } else if n > MAX_SPACE_COUNT {
-                return Err(DataFusionError::Execution(format!(
-                    "SPACE: requested {} spaces exceeds maximum allowed ({})",
-                    n, MAX_SPACE_COUNT
-                )));
-            } else {
-                let spaces = " ".repeat(n as usize);
-                builder.append_value(&spaces);
-            }
-        }
-
-        Ok(ColumnarValue::Array(Arc::new(builder.finish())))
-    }
-}
-
-/// Extract integer value from various integer types.
-fn get_int_value(
-    array: &datafusion_common::arrow::array::ArrayRef,
-    index: usize,
-) -> datafusion_common::Result<i64> {
-    use datafusion_common::arrow::datatypes as arrow_types;
-
-    match array.data_type() {
-        DataType::Int64 => Ok(array.as_primitive::<arrow_types::Int64Type>().value(index)),
-        DataType::Int32 => Ok(array.as_primitive::<arrow_types::Int32Type>().value(index) as i64),
-        DataType::Int16 => Ok(array.as_primitive::<arrow_types::Int16Type>().value(index) as i64),
-        DataType::Int8 => Ok(array.as_primitive::<arrow_types::Int8Type>().value(index) as i64),
-        DataType::UInt64 => {
-            let v = array.as_primitive::<arrow_types::UInt64Type>().value(index);
-            if v > i64::MAX as u64 {
-                Err(DataFusionError::Execution(format!(
-                    "SPACE: value {} exceeds maximum",
-                    v
-                )))
-            } else {
-                Ok(v as i64)
-            }
-        }
-        DataType::UInt32 => Ok(array.as_primitive::<arrow_types::UInt32Type>().value(index) as i64),
-        DataType::UInt16 => Ok(array.as_primitive::<arrow_types::UInt16Type>().value(index) as i64),
-        DataType::UInt8 => Ok(array.as_primitive::<arrow_types::UInt8Type>().value(index) as i64),
-        _ => Err(DataFusionError::Execution(format!(
-            "SPACE: unsupported type {:?}",
-            array.data_type()
-        ))),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datafusion_common::arrow::array::Int64Array;
-    use datafusion_common::arrow::datatypes::Field;
-    use datafusion_expr::ScalarFunctionArgs;
-
-    use super::*;
-
-    fn create_args(arrays: Vec<datafusion_common::arrow::array::ArrayRef>) -> ScalarFunctionArgs {
-        let arg_fields: Vec<_> = arrays
-            .iter()
-            .enumerate()
-            .map(|(i, arr)| {
-                Arc::new(Field::new(
-                    format!("arg_{}", i),
-                    arr.data_type().clone(),
-                    true,
-                ))
-            })
-            .collect();
-
-        ScalarFunctionArgs {
-            args: arrays.iter().cloned().map(ColumnarValue::Array).collect(),
-            arg_fields,
-            return_field: Arc::new(Field::new("result", DataType::LargeUtf8, true)),
-            number_rows: arrays[0].len(),
-            config_options: Arc::new(datafusion_common::config::ConfigOptions::default()),
-        }
-    }
-
-    #[test]
-    fn test_space_basic() {
-        let function = SpaceFunction::default();
-
-        let n = Arc::new(Int64Array::from(vec![0, 1, 5]));
-
-        let args = create_args(vec![n]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "");
-            assert_eq!(str_array.value(1), " ");
-            assert_eq!(str_array.value(2), "     ");
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_space_negative() {
-        let function = SpaceFunction::default();
-
-        let n = Arc::new(Int64Array::from(vec![-1, -100]));
-
-        let args = create_args(vec![n]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "");
-            assert_eq!(str_array.value(1), "");
-        } else {
-            panic!("Expected array result");
-        }
-    }
-
-    #[test]
-    fn test_space_with_nulls() {
-        let function = SpaceFunction::default();
-
-        let n = Arc::new(Int64Array::from(vec![Some(3), None]));
-
-        let args = create_args(vec![n]);
-        let result = function.invoke_with_args(args).unwrap();
-
-        if let ColumnarValue::Array(array) = result {
-            let str_array = array.as_string::<i64>();
-            assert_eq!(str_array.value(0), "   ");
-            assert!(str_array.is_null(1));
-        } else {
-            panic!("Expected array result");
-        }
-    }
-}
--- a/src/common/memory-manager/src/guard.rs
+++ b/src/common/memory-manager/src/guard.rs
@@ -15,14 +15,9 @@
 use std::{fmt, mem};

 use common_telemetry::debug;
-use snafu::ensure;
 use tokio::sync::{OwnedSemaphorePermit, TryAcquireError};

-use crate::error::{
-    MemoryAcquireTimeoutSnafu, MemoryLimitExceededSnafu, MemorySemaphoreClosedSnafu, Result,
-};
 use crate::manager::{MemoryMetrics, MemoryQuota};
-use crate::policy::OnExhaustedPolicy;

 /// Guard representing a slice of reserved memory.
 pub struct MemoryGuard<M: MemoryMetrics> {
@@ -60,52 +55,11 @@ impl<M: MemoryMetrics> MemoryGuard<M> {
        }
    }

-    /// Acquires additional memory, waiting if necessary until enough is available.
-    ///
-    /// On success, merges the new memory into this guard.
-    ///
-    /// # Errors
-    /// - Returns error if requested bytes would exceed the manager's total limit
-    /// - Returns error if the semaphore is unexpectedly closed
-    pub async fn acquire_additional(&mut self, bytes: u64) -> Result<()> {
-        match &mut self.state {
-            GuardState::Unlimited => Ok(()),
-            GuardState::Limited { permit, quota } => {
-                if bytes == 0 {
-                    return Ok(());
-                }
-
-                let additional_permits = quota.bytes_to_permits(bytes);
-                let current_permits = permit.num_permits() as u32;
-
-                ensure!(
-                    current_permits.saturating_add(additional_permits) <= quota.limit_permits,
-                    MemoryLimitExceededSnafu {
-                        requested_bytes: bytes,
-                        limit_bytes: quota.permits_to_bytes(quota.limit_permits)
-                    }
-                );
-
-                let additional_permit = quota
-                    .semaphore
-                    .clone()
-                    .acquire_many_owned(additional_permits)
-                    .await
-                    .map_err(|_| MemorySemaphoreClosedSnafu.build())?;
-
-                permit.merge(additional_permit);
-                quota.update_in_use_metric();
-                debug!("Acquired additional {} bytes", bytes);
-                Ok(())
-            }
-        }
-    }
-
-    /// Tries to acquire additional memory without waiting.
+    /// 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 try_acquire_additional(&mut self, bytes: u64) -> bool {
+    pub fn request_additional(&mut self, bytes: u64) -> bool {
        match &mut self.state {
            GuardState::Unlimited => true,
            GuardState::Limited { permit, quota } => {
@@ -123,11 +77,11 @@ impl<M: MemoryMetrics> MemoryGuard<M> {
                    Ok(additional_permit) => {
                        permit.merge(additional_permit);
                        quota.update_in_use_metric();
-                        debug!("Acquired additional {} bytes", bytes);
+                        debug!("Allocated additional {} bytes", bytes);
                        true
                    }
                    Err(TryAcquireError::NoPermits) | Err(TryAcquireError::Closed) => {
-                        quota.metrics.inc_rejected("try_acquire_additional");
+                        quota.metrics.inc_rejected("request_additional");
                        false
                    }
                }
@@ -135,55 +89,11 @@ impl<M: MemoryMetrics> MemoryGuard<M> {
        }
    }

-    /// Acquires additional 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 would 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_additional_with_policy(
-        &mut self,
-        bytes: u64,
-        policy: OnExhaustedPolicy,
-    ) -> Result<()> {
-        match policy {
-            OnExhaustedPolicy::Wait { timeout } => {
-                match tokio::time::timeout(timeout, self.acquire_additional(bytes)).await {
-                    Ok(Ok(())) => Ok(()),
-                    Ok(Err(e)) => Err(e),
-                    Err(_elapsed) => MemoryAcquireTimeoutSnafu {
-                        requested_bytes: bytes,
-                        waited: timeout,
-                    }
-                    .fail(),
-                }
-            }
-            OnExhaustedPolicy::Fail => {
-                if self.try_acquire_additional(bytes) {
-                    Ok(())
-                } else {
-                    MemoryLimitExceededSnafu {
-                        requested_bytes: bytes,
-                        limit_bytes: match &self.state {
-                            GuardState::Unlimited => 0, // unreachable: unlimited mode always succeeds
-                            GuardState::Limited { quota, .. } => {
-                                quota.permits_to_bytes(quota.limit_permits)
-                            }
-                        },
-                    }
-                    .fail()
-                }
-            }
-        }
-    }
-
-    /// Releases a portion of granted memory back to the pool before the guard is dropped.
+    /// 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 release_partial(&mut self, bytes: u64) -> bool {
+    pub fn early_release_partial(&mut self, bytes: u64) -> bool {
        match &mut self.state {
            GuardState::Unlimited => true,
            GuardState::Limited { permit, quota } => {
@@ -199,7 +109,7 @@ impl<M: MemoryMetrics> MemoryGuard<M> {
                            quota.permits_to_bytes(released_permit.num_permits() as u32);
                        drop(released_permit);
                        quota.update_in_use_metric();
-                        debug!("Released {} bytes from memory guard", released_bytes);
+                        debug!("Early released {} bytes from memory guard", released_bytes);
                        true
                    }
                    None => false,
--- a/src/common/memory-manager/src/manager.rs
+++ b/src/common/memory-manager/src/manager.rs
@@ -37,12 +37,6 @@ pub struct MemoryManager<M: MemoryMetrics> {
    quota: Option<MemoryQuota<M>>,
 }

-impl<M: MemoryMetrics + Default> Default for MemoryManager<M> {
-    fn default() -> Self {
-        Self::new(0, M::default())
-    }
-}
-
 #[derive(Clone)]
 pub(crate) struct MemoryQuota<M: MemoryMetrics> {
    pub(crate) semaphore: Arc<Semaphore>,
--- a/src/common/memory-manager/src/tests.rs
+++ b/src/common/memory-manager/src/tests.rs
@@ -83,7 +83,7 @@ fn test_request_additional_success() {
    assert_eq!(manager.used_bytes(), base);

    // Request additional memory (3MB) - should succeed and merge
-    assert!(guard.try_acquire_additional(3 * PERMIT_GRANULARITY_BYTES));
+    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);
 }
@@ -98,11 +98,11 @@ fn test_request_additional_exceeds_limit() {
    let mut guard = manager.try_acquire(base).unwrap();

    // Request additional memory (3MB) - should succeed
-    assert!(guard.try_acquire_additional(3 * PERMIT_GRANULARITY_BYTES));
+    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.try_acquire_additional(3 * PERMIT_GRANULARITY_BYTES);
+    let result = guard.request_additional(3 * PERMIT_GRANULARITY_BYTES);
    assert!(!result);

    // Still at 8MB
@@ -119,7 +119,7 @@ fn test_request_additional_auto_release_on_guard_drop() {
        let mut guard = manager.try_acquire(5 * PERMIT_GRANULARITY_BYTES).unwrap();

        // Request additional - memory is merged into guard
-        assert!(guard.try_acquire_additional(3 * PERMIT_GRANULARITY_BYTES));
+        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
@@ -135,7 +135,7 @@ fn test_request_additional_unlimited() {
    let mut guard = manager.try_acquire(5 * PERMIT_GRANULARITY_BYTES).unwrap();

    // Should always succeed with unlimited manager
-    assert!(guard.try_acquire_additional(100 * PERMIT_GRANULARITY_BYTES));
+    assert!(guard.request_additional(100 * PERMIT_GRANULARITY_BYTES));
    assert_eq!(guard.granted_bytes(), 0);
    assert_eq!(manager.used_bytes(), 0);
 }
@@ -148,7 +148,7 @@ fn test_request_additional_zero_bytes() {
    let mut guard = manager.try_acquire(5 * PERMIT_GRANULARITY_BYTES).unwrap();

    // Request 0 bytes should succeed without affecting anything
-    assert!(guard.try_acquire_additional(0));
+    assert!(guard.request_additional(0));
    assert_eq!(guard.granted_bytes(), 5 * PERMIT_GRANULARITY_BYTES);
    assert_eq!(manager.used_bytes(), 5 * PERMIT_GRANULARITY_BYTES);
 }
@@ -162,7 +162,7 @@ fn test_early_release_partial_success() {
    assert_eq!(manager.used_bytes(), 8 * PERMIT_GRANULARITY_BYTES);

    // Release half
-    assert!(guard.release_partial(4 * PERMIT_GRANULARITY_BYTES));
+    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);

@@ -177,7 +177,7 @@ fn test_early_release_partial_exceeds_granted() {
    let mut guard = manager.try_acquire(5 * PERMIT_GRANULARITY_BYTES).unwrap();

    // Try to release more than granted - should fail
-    assert!(!guard.release_partial(10 * PERMIT_GRANULARITY_BYTES));
+    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);
 }
@@ -188,7 +188,7 @@ fn test_early_release_partial_unlimited() {
    let mut guard = manager.try_acquire(100 * PERMIT_GRANULARITY_BYTES).unwrap();

    // Unlimited guard - release should succeed (no-op)
-    assert!(guard.release_partial(50 * PERMIT_GRANULARITY_BYTES));
+    assert!(guard.early_release_partial(50 * PERMIT_GRANULARITY_BYTES));
    assert_eq!(guard.granted_bytes(), 0);
 }

@@ -200,22 +200,22 @@ fn test_request_and_early_release_symmetry() {
    let mut guard = manager.try_acquire(5 * PERMIT_GRANULARITY_BYTES).unwrap();

    // Request additional
-    assert!(guard.try_acquire_additional(5 * PERMIT_GRANULARITY_BYTES));
+    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.release_partial(3 * PERMIT_GRANULARITY_BYTES));
+    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.try_acquire_additional(2 * PERMIT_GRANULARITY_BYTES));
+    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.release_partial(4 * PERMIT_GRANULARITY_BYTES));
+    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);

@@ -226,186 +226,25 @@ fn test_request_and_early_release_symmetry() {
 #[test]
 fn test_small_allocation_rounds_up() {
    // Test that allocations smaller than PERMIT_GRANULARITY_BYTES
-    // round up to 1 permit and can use try_acquire_additional()
+    // 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.try_acquire_additional(2 * PERMIT_GRANULARITY_BYTES)); // Can request more
+    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 try_acquire_additional() later
+    // 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.try_acquire_additional(3 * PERMIT_GRANULARITY_BYTES)); // Lazy allocation
+    assert!(guard.request_additional(3 * PERMIT_GRANULARITY_BYTES)); // Lazy allocation
    assert_eq!(guard.granted_bytes(), 3 * PERMIT_GRANULARITY_BYTES);
 }
-
-#[tokio::test(flavor = "current_thread")]
-async fn test_acquire_additional_blocks_and_unblocks() {
-    let limit = 10 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    // First guard takes 9MB, leaving only 1MB available
-    let mut guard1 = manager.try_acquire(9 * PERMIT_GRANULARITY_BYTES).unwrap();
-    assert_eq!(manager.used_bytes(), 9 * PERMIT_GRANULARITY_BYTES);
-
-    // Spawn a task that will block trying to acquire additional 5MB (needs total 10MB available)
-    let manager_clone = manager.clone();
-    let waiter = tokio::spawn(async move {
-        let mut guard2 = manager_clone.try_acquire(0).unwrap();
-        // This will block until enough memory is available
-        guard2
-            .acquire_additional(5 * PERMIT_GRANULARITY_BYTES)
-            .await
-            .unwrap();
-        guard2
-    });
-
-    sleep(Duration::from_millis(10)).await;
-
-    // Release 5MB from guard1 - this should unblock the waiter
-    assert!(guard1.release_partial(5 * PERMIT_GRANULARITY_BYTES));
-
-    // Waiter should complete now
-    let guard2 = waiter.await.unwrap();
-    assert_eq!(guard2.granted_bytes(), 5 * PERMIT_GRANULARITY_BYTES);
-
-    // Total: guard1 has 4MB, guard2 has 5MB = 9MB
-    assert_eq!(manager.used_bytes(), 9 * PERMIT_GRANULARITY_BYTES);
-}
-
-#[tokio::test(flavor = "current_thread")]
-async fn test_acquire_additional_exceeds_total_limit() {
-    let limit = 10 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    let mut guard = manager.try_acquire(8 * PERMIT_GRANULARITY_BYTES).unwrap();
-
-    // Try to acquire additional 5MB - would exceed total limit of 10MB
-    let result = guard.acquire_additional(5 * PERMIT_GRANULARITY_BYTES).await;
-    assert!(result.is_err());
-
-    // Guard should remain unchanged
-    assert_eq!(guard.granted_bytes(), 8 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(manager.used_bytes(), 8 * PERMIT_GRANULARITY_BYTES);
-}
-
-#[tokio::test(flavor = "current_thread")]
-async fn test_acquire_additional_success() {
-    let limit = 10 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    let mut guard = manager.try_acquire(3 * PERMIT_GRANULARITY_BYTES).unwrap();
-    assert_eq!(manager.used_bytes(), 3 * PERMIT_GRANULARITY_BYTES);
-
-    // Acquire additional 4MB - should succeed
-    guard
-        .acquire_additional(4 * PERMIT_GRANULARITY_BYTES)
-        .await
-        .unwrap();
-    assert_eq!(guard.granted_bytes(), 7 * PERMIT_GRANULARITY_BYTES);
-    assert_eq!(manager.used_bytes(), 7 * PERMIT_GRANULARITY_BYTES);
-}
-
-#[tokio::test(flavor = "current_thread")]
-async fn test_acquire_additional_with_policy_wait_success() {
-    use crate::policy::OnExhaustedPolicy;
-
-    let limit = 10 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    let mut guard1 = manager.try_acquire(8 * PERMIT_GRANULARITY_BYTES).unwrap();
-
-    let manager_clone = manager.clone();
-    let waiter = tokio::spawn(async move {
-        let mut guard2 = manager_clone.try_acquire(0).unwrap();
-        // Wait policy with 1 second timeout
-        guard2
-            .acquire_additional_with_policy(
-                5 * PERMIT_GRANULARITY_BYTES,
-                OnExhaustedPolicy::Wait {
-                    timeout: Duration::from_secs(1),
-                },
-            )
-            .await
-            .unwrap();
-        guard2
-    });
-
-    sleep(Duration::from_millis(10)).await;
-
-    // Release memory to unblock waiter
-    assert!(guard1.release_partial(5 * PERMIT_GRANULARITY_BYTES));
-
-    let guard2 = waiter.await.unwrap();
-    assert_eq!(guard2.granted_bytes(), 5 * PERMIT_GRANULARITY_BYTES);
-}
-
-#[tokio::test(flavor = "current_thread")]
-async fn test_acquire_additional_with_policy_wait_timeout() {
-    use crate::policy::OnExhaustedPolicy;
-
-    let limit = 10 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    // Take all memory
-    let _guard1 = manager.try_acquire(10 * PERMIT_GRANULARITY_BYTES).unwrap();
-
-    let mut guard2 = manager.try_acquire(0).unwrap();
-
-    // Try to acquire with short timeout - should timeout
-    let result = guard2
-        .acquire_additional_with_policy(
-            5 * PERMIT_GRANULARITY_BYTES,
-            OnExhaustedPolicy::Wait {
-                timeout: Duration::from_millis(50),
-            },
-        )
-        .await;
-
-    assert!(result.is_err());
-    assert_eq!(guard2.granted_bytes(), 0);
-}
-
-#[tokio::test(flavor = "current_thread")]
-async fn test_acquire_additional_with_policy_fail() {
-    use crate::policy::OnExhaustedPolicy;
-
-    let limit = 10 * PERMIT_GRANULARITY_BYTES;
-    let manager = MemoryManager::new(limit, NoOpMetrics);
-
-    let _guard1 = manager.try_acquire(8 * PERMIT_GRANULARITY_BYTES).unwrap();
-
-    let mut guard2 = manager.try_acquire(0).unwrap();
-
-    // Fail policy - should return error immediately
-    let result = guard2
-        .acquire_additional_with_policy(5 * PERMIT_GRANULARITY_BYTES, OnExhaustedPolicy::Fail)
-        .await;
-
-    assert!(result.is_err());
-    assert_eq!(guard2.granted_bytes(), 0);
-}
-
-#[tokio::test(flavor = "current_thread")]
-async fn test_acquire_additional_unlimited() {
-    let manager = MemoryManager::new(0, NoOpMetrics); // Unlimited
-    let mut guard = manager.try_acquire(0).unwrap();
-
-    // Should always succeed with unlimited manager
-    guard
-        .acquire_additional(1000 * PERMIT_GRANULARITY_BYTES)
-        .await
-        .unwrap();
-    assert_eq!(guard.granted_bytes(), 0);
-    assert_eq!(manager.used_bytes(), 0);
-}
--- a/src/common/meta/src/ddl.rs
+++ b/src/common/meta/src/ddl.rs
@@ -28,7 +28,6 @@ use crate::node_manager::NodeManagerRef;
 use crate::region_keeper::MemoryRegionKeeperRef;
 use crate::region_registry::LeaderRegionRegistryRef;

-pub mod allocator;
 pub mod alter_database;
 pub mod alter_logical_tables;
 pub mod alter_table;
@@ -37,7 +36,8 @@ pub mod create_database;
 pub mod create_flow;
 pub mod create_logical_tables;
 pub mod create_table;
-pub(crate) use create_table::{CreateRequestBuilder, build_template_from_raw_table_info};
+mod create_table_template;
+pub(crate) use create_table_template::{CreateRequestBuilder, build_template_from_raw_table_info};
 pub mod create_view;
 pub mod drop_database;
 pub mod drop_flow;
--- a/src/common/meta/src/ddl/allocator.rs
+++ b/src/common/meta/src/ddl/allocator.rs
@@ -1,17 +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.
-
-pub mod region_routes;
-pub mod resource_id;
-pub mod wal_options;
--- a/src/common/meta/src/ddl/allocator/region_routes.rs
+++ b/src/common/meta/src/ddl/allocator/region_routes.rs
@@ -1,80 +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 common_telemetry::debug;
-use store_api::storage::{RegionId, RegionNumber, TableId};
-
-use crate::error::Result;
-use crate::peer::PeerAllocator;
-use crate::rpc::router::{Region, RegionRoute};
-
-pub type RegionRoutesAllocatorRef = Arc<dyn RegionRoutesAllocator>;
-
-#[async_trait::async_trait]
-pub trait RegionRoutesAllocator: Send + Sync {
-    async fn allocate(
-        &self,
-        table_id: TableId,
-        regions_and_partitions: &[(RegionNumber, &str)],
-    ) -> Result<Vec<RegionRoute>>;
-}
-
-#[async_trait::async_trait]
-impl<T: PeerAllocator> RegionRoutesAllocator for T {
-    async fn allocate(
-        &self,
-        table_id: TableId,
-        regions_and_partitions: &[(RegionNumber, &str)],
-    ) -> Result<Vec<RegionRoute>> {
-        let regions = regions_and_partitions.len().max(1);
-        let peers = self.alloc(regions).await?;
-        debug!("Allocated peers {:?} for table {}", peers, table_id,);
-
-        let mut region_routes = regions_and_partitions
-            .iter()
-            .enumerate()
-            .map(|(i, (region_number, partition))| {
-                let region = Region {
-                    id: RegionId::new(table_id, *region_number),
-                    partition_expr: partition.to_string(),
-                    ..Default::default()
-                };
-
-                let peer = peers[i % peers.len()].clone();
-
-                RegionRoute {
-                    region,
-                    leader_peer: Some(peer),
-                    ..Default::default()
-                }
-            })
-            .collect::<Vec<_>>();
-
-        // If the table has no partitions, we need to create a default region.
-        if region_routes.is_empty() {
-            region_routes.push(RegionRoute {
-                region: Region {
-                    id: RegionId::new(table_id, 0),
-                    ..Default::default()
-                },
-                leader_peer: Some(peers[0].clone()),
-                ..Default::default()
-            });
-        }
-
-        Ok(region_routes)
-    }
-}
--- a/src/common/meta/src/ddl/allocator/resource_id.rs
+++ b/src/common/meta/src/ddl/allocator/resource_id.rs
@@ -1,35 +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::ops::Range;
-use std::sync::Arc;
-
-use crate::error::Result;
-
-pub type ResourceIdAllocatorRef = Arc<dyn ResourceIdAllocator>;
-
-#[async_trait::async_trait]
-pub trait ResourceIdAllocator: Send + Sync {
-    /// Returns the next value and increments the sequence.
-    async fn next(&self) -> Result<u64>;
-
-    /// Returns the current value stored in the remote storage without incrementing the sequence.
-    async fn peek(&self) -> Result<u64>;
-
-    /// Jumps to the given value.
-    async fn jump_to(&self, next: u64) -> Result<()>;
-
-    /// Returns the range of available sequences.
-    async fn min_max(&self) -> Range<u64>;
-}
--- a/src/common/meta/src/ddl/allocator/wal_options.rs
+++ b/src/common/meta/src/ddl/allocator/wal_options.rs
@@ -1,31 +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::collections::HashMap;
-use std::sync::Arc;
-
-use store_api::storage::RegionNumber;
-
-use crate::error::Result;
-
-pub type WalOptionsAllocatorRef = Arc<dyn WalOptionsAllocator>;
-
-#[async_trait::async_trait]
-pub trait WalOptionsAllocator: Send + Sync {
-    async fn allocate(
-        &self,
-        region_numbers: &[RegionNumber],
-        skip_wal: bool,
-    ) -> Result<HashMap<RegionNumber, String>>;
-}
--- a/src/common/meta/src/ddl/create_logical_tables.rs
+++ b/src/common/meta/src/ddl/create_logical_tables.rs
@@ -30,7 +30,7 @@ use serde::{Deserialize, Serialize};
 use snafu::ResultExt;
 use store_api::metadata::ColumnMetadata;
 use store_api::metric_engine_consts::ALTER_PHYSICAL_EXTENSION_KEY;
-use store_api::storage::RegionNumber;
+use store_api::storage::{RegionId, RegionNumber};
 use strum::AsRefStr;
 use table::metadata::{RawTableInfo, TableId};

@@ -286,7 +286,14 @@ impl CreateTablesData {
            .flat_map(|(task, table_id)| {
                if table_id.is_none() {
                    let table_info = task.table_info.clone();
-                    let table_route = TableRouteValue::logical(self.physical_table_id);
+                    let region_ids = self
+                        .physical_region_numbers
+                        .iter()
+                        .map(|region_number| {
+                            RegionId::new(table_info.ident.table_id, *region_number)
+                        })
+                        .collect();
+                    let table_route = TableRouteValue::logical(self.physical_table_id, region_ids);
                    Some((table_info, table_route))
                } else {
                    None
--- a/src/common/meta/src/ddl/create_logical_tables/region_request.rs
+++ b/src/common/meta/src/ddl/create_logical_tables/region_request.rs
@@ -22,7 +22,7 @@ use store_api::storage::{RegionId, TableId};
 use table::metadata::RawTableInfo;

 use crate::ddl::create_logical_tables::CreateLogicalTablesProcedure;
-use crate::ddl::create_table::template::{
+use crate::ddl::create_table_template::{
    CreateRequestBuilder, build_template, build_template_from_raw_table_info,
 };
 use crate::ddl::utils::region_storage_path;
@@ -97,7 +97,7 @@ pub fn create_region_request_builder(

 /// Builds a [CreateRequestBuilder] from a [RawTableInfo].
 ///
-/// Note: This function is primarily intended for creating logical tables or allocating placeholder regions.
+/// Note: **This method is only used for creating logical tables.**
 pub fn create_region_request_builder_from_raw_table_info(
    raw_table_info: &RawTableInfo,
    physical_table_id: TableId,
--- a/src/common/meta/src/ddl/create_table.rs
+++ b/src/common/meta/src/ddl/create_table.rs
@@ -12,99 +12,74 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-pub mod executor;
-pub mod template;
-
 use std::collections::HashMap;

-use api::v1::CreateTableExpr;
+use api::v1::region::region_request::Body as PbRegionRequest;
+use api::v1::region::{RegionRequest, RegionRequestHeader};
 use async_trait::async_trait;
 use common_error::ext::BoxedError;
 use common_procedure::error::{
    ExternalSnafu, FromJsonSnafu, Result as ProcedureResult, ToJsonSnafu,
 };
 use common_procedure::{Context as ProcedureContext, LockKey, Procedure, ProcedureId, Status};
-use common_telemetry::info;
+use common_telemetry::tracing_context::TracingContext;
+use common_telemetry::{info, warn};
+use futures::future::join_all;
 use serde::{Deserialize, Serialize};
-use snafu::{OptionExt, ResultExt};
+use snafu::{OptionExt, ResultExt, ensure};
 use store_api::metadata::ColumnMetadata;
-use store_api::storage::RegionNumber;
+use store_api::metric_engine_consts::TABLE_COLUMN_METADATA_EXTENSION_KEY;
+use store_api::storage::{RegionId, RegionNumber};
 use strum::AsRefStr;
 use table::metadata::{RawTableInfo, TableId};
-use table::table_name::TableName;
 use table::table_reference::TableReference;
-pub(crate) use template::{CreateRequestBuilder, build_template_from_raw_table_info};

-use crate::ddl::create_table::executor::CreateTableExecutor;
-use crate::ddl::create_table::template::build_template;
-use crate::ddl::utils::map_to_procedure_error;
+use crate::ddl::create_table_template::{CreateRequestBuilder, build_template};
+use crate::ddl::utils::raw_table_info::update_table_info_column_ids;
+use crate::ddl::utils::{
+    add_peer_context_if_needed, convert_region_routes_to_detecting_regions,
+    extract_column_metadatas, map_to_procedure_error, region_storage_path,
+};
 use crate::ddl::{DdlContext, TableMetadata};
 use crate::error::{self, Result};
-use crate::key::table_route::PhysicalTableRouteValue;
+use crate::key::table_name::TableNameKey;
+use crate::key::table_route::{PhysicalTableRouteValue, TableRouteValue};
 use crate::lock_key::{CatalogLock, SchemaLock, TableNameLock};
 use crate::metrics;
 use crate::region_keeper::OperatingRegionGuard;
 use crate::rpc::ddl::CreateTableTask;
-use crate::rpc::router::{RegionRoute, operating_leader_regions};
-
+use crate::rpc::router::{
+    RegionRoute, find_leader_regions, find_leaders, operating_leader_regions,
+};
 pub struct CreateTableProcedure {
    pub context: DdlContext,
-    /// The serializable data.
-    pub data: CreateTableData,
-    /// The guards of opening.
-    pub opening_regions: Vec<OperatingRegionGuard>,
-    /// The executor of the procedure.
-    pub executor: CreateTableExecutor,
-}
-
-fn build_executor_from_create_table_data(
-    create_table_expr: &CreateTableExpr,
-) -> Result<CreateTableExecutor> {
-    let template = build_template(create_table_expr)?;
-    let builder = CreateRequestBuilder::new(template, None);
-    let table_name = TableName::new(
-        create_table_expr.catalog_name.clone(),
-        create_table_expr.schema_name.clone(),
-        create_table_expr.table_name.clone(),
-    );
-    let executor =
-        CreateTableExecutor::new(table_name, create_table_expr.create_if_not_exists, builder);
-    Ok(executor)
+    pub creator: TableCreator,
 }

 impl CreateTableProcedure {
    pub const TYPE_NAME: &'static str = "metasrv-procedure::CreateTable";

-    pub fn new(task: CreateTableTask, context: DdlContext) -> Result<Self> {
-        let executor = build_executor_from_create_table_data(&task.create_table)?;
-
-        Ok(Self {
+    pub fn new(task: CreateTableTask, context: DdlContext) -> Self {
+        Self {
            context,
-            data: CreateTableData::new(task),
-            opening_regions: vec![],
-            executor,
-        })
+            creator: TableCreator::new(task),
+        }
    }

    pub fn from_json(json: &str, context: DdlContext) -> ProcedureResult<Self> {
-        let data: CreateTableData = serde_json::from_str(json).context(FromJsonSnafu)?;
-        let create_table_expr = &data.task.create_table;
-        let executor = build_executor_from_create_table_data(create_table_expr)
-            .map_err(BoxedError::new)
-            .context(ExternalSnafu {
-                clean_poisons: false,
-            })?;
+        let data = serde_json::from_str(json).context(FromJsonSnafu)?;

        Ok(CreateTableProcedure {
            context,
-            data,
-            opening_regions: vec![],
-            executor,
+            creator: TableCreator {
+                data,
+                opening_regions: vec![],
+            },
        })
    }

    fn table_info(&self) -> &RawTableInfo {
-        &self.data.task.table_info
+        &self.creator.data.task.table_info
    }

    pub(crate) fn table_id(&self) -> TableId {
@@ -112,7 +87,8 @@ impl CreateTableProcedure {
    }

    fn region_wal_options(&self) -> Result<&HashMap<RegionNumber, String>> {
-        self.data
+        self.creator
+            .data
            .region_wal_options
            .as_ref()
            .context(error::UnexpectedSnafu {
@@ -121,7 +97,8 @@ impl CreateTableProcedure {
    }

    fn table_route(&self) -> Result<&PhysicalTableRouteValue> {
-        self.data
+        self.creator
+            .data
            .table_route
            .as_ref()
            .context(error::UnexpectedSnafu {
@@ -129,6 +106,17 @@ impl CreateTableProcedure {
            })
    }

+    #[cfg(any(test, feature = "testing"))]
+    pub fn set_allocated_metadata(
+        &mut self,
+        table_id: TableId,
+        table_route: PhysicalTableRouteValue,
+        region_wal_options: HashMap<RegionNumber, String>,
+    ) {
+        self.creator
+            .set_allocated_metadata(table_id, table_route, region_wal_options)
+    }
+
    /// On the prepare step, it performs:
    /// - Checks whether the table exists.
    /// - Allocates the table id.
@@ -137,16 +125,31 @@ impl CreateTableProcedure {
    /// - TableName exists and `create_if_not_exists` is false.
    /// - Failed to allocate [TableMetadata].
    pub(crate) async fn on_prepare(&mut self) -> Result<Status> {
-        let table_id = self
-            .executor
-            .on_prepare(&self.context.table_metadata_manager)
+        let expr = &self.creator.data.task.create_table;
+        let table_name_value = self
+            .context
+            .table_metadata_manager
+            .table_name_manager()
+            .get(TableNameKey::new(
+                &expr.catalog_name,
+                &expr.schema_name,
+                &expr.table_name,
+            ))
            .await?;
-        // Return the table id if the table already exists.
-        if let Some(table_id) = table_id {
+
+        if let Some(value) = table_name_value {
+            ensure!(
+                expr.create_if_not_exists,
+                error::TableAlreadyExistsSnafu {
+                    table_name: self.creator.data.table_ref().to_string(),
+                }
+            );
+
+            let table_id = value.table_id();
            return Ok(Status::done_with_output(table_id));
        }

-        self.data.state = CreateTableState::DatanodeCreateRegions;
+        self.creator.data.state = CreateTableState::DatanodeCreateRegions;
        let TableMetadata {
            table_id,
            table_route,
@@ -154,13 +157,23 @@ impl CreateTableProcedure {
        } = self
            .context
            .table_metadata_allocator
-            .create(&self.data.task)
+            .create(&self.creator.data.task)
            .await?;
-        self.set_allocated_metadata(table_id, table_route, region_wal_options);
+        self.creator
+            .set_allocated_metadata(table_id, table_route, region_wal_options);

        Ok(Status::executing(true))
    }

+    pub fn new_region_request_builder(
+        &self,
+        physical_table_id: Option<TableId>,
+    ) -> Result<CreateRequestBuilder> {
+        let create_table_expr = &self.creator.data.task.create_table;
+        let template = build_template(create_table_expr)?;
+        Ok(CreateRequestBuilder::new(template, physical_table_id))
+    }
+
    /// Creates regions on datanodes
    ///
    /// Abort(non-retry):
@@ -174,29 +187,90 @@ impl CreateTableProcedure {
    ///   - [Code::Unavailable](tonic::status::Code::Unavailable)
    pub async fn on_datanode_create_regions(&mut self) -> Result<Status> {
        let table_route = self.table_route()?.clone();
+        let request_builder = self.new_region_request_builder(None)?;
        // Registers opening regions
-        let guards = self.register_opening_regions(&self.context, &table_route.region_routes)?;
+        let guards = self
+            .creator
+            .register_opening_regions(&self.context, &table_route.region_routes)?;
        if !guards.is_empty() {
-            self.opening_regions = guards;
+            self.creator.opening_regions = guards;
        }
-        self.create_regions(&table_route.region_routes).await
+        self.create_regions(&table_route.region_routes, request_builder)
+            .await
    }

-    async fn create_regions(&mut self, region_routes: &[RegionRoute]) -> Result<Status> {
-        let table_id = self.table_id();
+    async fn create_regions(
+        &mut self,
+        region_routes: &[RegionRoute],
+        request_builder: CreateRequestBuilder,
+    ) -> Result<Status> {
+        let create_table_data = &self.creator.data;
+        // Safety: the region_wal_options must be allocated
        let region_wal_options = self.region_wal_options()?;
-        let column_metadatas = self
-            .executor
-            .on_create_regions(
-                &self.context.node_manager,
-                table_id,
-                region_routes,
-                region_wal_options,
-            )
-            .await?;
+        let create_table_expr = &create_table_data.task.create_table;
+        let catalog = &create_table_expr.catalog_name;
+        let schema = &create_table_expr.schema_name;
+        let storage_path = region_storage_path(catalog, schema);
+        let leaders = find_leaders(region_routes);
+        let mut create_region_tasks = Vec::with_capacity(leaders.len());

-        self.data.column_metadatas = column_metadatas;
-        self.data.state = CreateTableState::CreateMetadata;
+        let partition_exprs = region_routes
+            .iter()
+            .map(|r| (r.region.id.region_number(), r.region.partition_expr()))
+            .collect();
+
+        for datanode in leaders {
+            let requester = self.context.node_manager.datanode(&datanode).await;
+
+            let regions = find_leader_regions(region_routes, &datanode);
+            let mut requests = Vec::with_capacity(regions.len());
+            for region_number in regions {
+                let region_id = RegionId::new(self.table_id(), region_number);
+                let create_region_request = request_builder.build_one(
+                    region_id,
+                    storage_path.clone(),
+                    region_wal_options,
+                    &partition_exprs,
+                );
+                requests.push(PbRegionRequest::Create(create_region_request));
+            }
+
+            for request in requests {
+                let request = RegionRequest {
+                    header: Some(RegionRequestHeader {
+                        tracing_context: TracingContext::from_current_span().to_w3c(),
+                        ..Default::default()
+                    }),
+                    body: Some(request),
+                };
+
+                let datanode = datanode.clone();
+                let requester = requester.clone();
+                create_region_tasks.push(async move {
+                    requester
+                        .handle(request)
+                        .await
+                        .map_err(add_peer_context_if_needed(datanode))
+                });
+            }
+        }
+
+        let mut results = join_all(create_region_tasks)
+            .await
+            .into_iter()
+            .collect::<Result<Vec<_>>>()?;
+
+        if let Some(column_metadatas) =
+            extract_column_metadatas(&mut results, TABLE_COLUMN_METADATA_EXTENSION_KEY)?
+        {
+            self.creator.data.column_metadatas = column_metadatas;
+        } else {
+            warn!(
+                "creating table result doesn't contains extension key `{TABLE_COLUMN_METADATA_EXTENSION_KEY}`,leaving the table's column metadata unchanged"
+            );
+        }
+
+        self.creator.data.state = CreateTableState::CreateMetadata;
        Ok(Status::executing(true))
    }

@@ -206,33 +280,107 @@ impl CreateTableProcedure {
    /// - Failed to create table metadata.
    async fn on_create_metadata(&mut self, pid: ProcedureId) -> Result<Status> {
        let table_id = self.table_id();
-        let table_ref = self.data.table_ref();
+        let table_ref = self.creator.data.table_ref();
        let manager = &self.context.table_metadata_manager;

-        let raw_table_info = self.table_info().clone();
+        let mut raw_table_info = self.table_info().clone();
+        if !self.creator.data.column_metadatas.is_empty() {
+            update_table_info_column_ids(&mut raw_table_info, &self.creator.data.column_metadatas);
+        }
        // Safety: the region_wal_options must be allocated.
        let region_wal_options = self.region_wal_options()?.clone();
        // Safety: the table_route must be allocated.
        let physical_table_route = self.table_route()?.clone();
-        self.executor
-            .on_create_metadata(
-                manager,
-                &self.context.region_failure_detector_controller,
-                raw_table_info,
-                &self.data.column_metadatas,
-                physical_table_route,
-                region_wal_options,
-            )
+        let detecting_regions =
+            convert_region_routes_to_detecting_regions(&physical_table_route.region_routes);
+        let table_route = TableRouteValue::Physical(physical_table_route);
+        manager
+            .create_table_metadata(raw_table_info, table_route, region_wal_options)
            .await?;
-
+        self.context
+            .register_failure_detectors(detecting_regions)
+            .await;
        info!(
            "Successfully created table: {}, table_id: {}, procedure_id: {}",
            table_ref, table_id, pid
        );

-        self.opening_regions.clear();
+        self.creator.opening_regions.clear();
        Ok(Status::done_with_output(table_id))
    }
+}
+
+#[async_trait]
+impl Procedure for CreateTableProcedure {
+    fn type_name(&self) -> &str {
+        Self::TYPE_NAME
+    }
+
+    fn recover(&mut self) -> ProcedureResult<()> {
+        // Only registers regions if the table route is allocated.
+        if let Some(x) = &self.creator.data.table_route {
+            self.creator.opening_regions = self
+                .creator
+                .register_opening_regions(&self.context, &x.region_routes)
+                .map_err(BoxedError::new)
+                .context(ExternalSnafu {
+                    clean_poisons: false,
+                })?;
+        }
+
+        Ok(())
+    }
+
+    async fn execute(&mut self, ctx: &ProcedureContext) -> ProcedureResult<Status> {
+        let state = &self.creator.data.state;
+
+        let _timer = metrics::METRIC_META_PROCEDURE_CREATE_TABLE
+            .with_label_values(&[state.as_ref()])
+            .start_timer();
+
+        match state {
+            CreateTableState::Prepare => self.on_prepare().await,
+            CreateTableState::DatanodeCreateRegions => self.on_datanode_create_regions().await,
+            CreateTableState::CreateMetadata => self.on_create_metadata(ctx.procedure_id).await,
+        }
+        .map_err(map_to_procedure_error)
+    }
+
+    fn dump(&self) -> ProcedureResult<String> {
+        serde_json::to_string(&self.creator.data).context(ToJsonSnafu)
+    }
+
+    fn lock_key(&self) -> LockKey {
+        let table_ref = &self.creator.data.table_ref();
+
+        LockKey::new(vec![
+            CatalogLock::Read(table_ref.catalog).into(),
+            SchemaLock::read(table_ref.catalog, table_ref.schema).into(),
+            TableNameLock::new(table_ref.catalog, table_ref.schema, table_ref.table).into(),
+        ])
+    }
+}
+
+pub struct TableCreator {
+    /// The serializable data.
+    pub data: CreateTableData,
+    /// The guards of opening.
+    pub opening_regions: Vec<OperatingRegionGuard>,
+}
+
+impl TableCreator {
+    pub fn new(task: CreateTableTask) -> Self {
+        Self {
+            data: CreateTableData {
+                state: CreateTableState::Prepare,
+                column_metadatas: vec![],
+                task,
+                table_route: None,
+                region_wal_options: None,
+            },
+            opening_regions: vec![],
+        }
+    }

    /// Registers and returns the guards of the opening region if they don't exist.
    fn register_opening_regions(
@@ -241,6 +389,7 @@ impl CreateTableProcedure {
        region_routes: &[RegionRoute],
    ) -> Result<Vec<OperatingRegionGuard>> {
        let opening_regions = operating_leader_regions(region_routes);
+
        if self.opening_regions.len() == opening_regions.len() {
            return Ok(vec![]);
        }
@@ -260,7 +409,7 @@ impl CreateTableProcedure {
        Ok(opening_region_guards)
    }

-    pub fn set_allocated_metadata(
+    fn set_allocated_metadata(
        &mut self,
        table_id: TableId,
        table_route: PhysicalTableRouteValue,
@@ -272,56 +421,6 @@ impl CreateTableProcedure {
    }
 }

-#[async_trait]
-impl Procedure for CreateTableProcedure {
-    fn type_name(&self) -> &str {
-        Self::TYPE_NAME
-    }
-
-    fn recover(&mut self) -> ProcedureResult<()> {
-        // Only registers regions if the table route is allocated.
-        if let Some(x) = &self.data.table_route {
-            self.opening_regions = self
-                .register_opening_regions(&self.context, &x.region_routes)
-                .map_err(BoxedError::new)
-                .context(ExternalSnafu {
-                    clean_poisons: false,
-                })?;
-        }
-
-        Ok(())
-    }
-
-    async fn execute(&mut self, ctx: &ProcedureContext) -> ProcedureResult<Status> {
-        let state = &self.data.state;
-
-        let _timer = metrics::METRIC_META_PROCEDURE_CREATE_TABLE
-            .with_label_values(&[state.as_ref()])
-            .start_timer();
-
-        match state {
-            CreateTableState::Prepare => self.on_prepare().await,
-            CreateTableState::DatanodeCreateRegions => self.on_datanode_create_regions().await,
-            CreateTableState::CreateMetadata => self.on_create_metadata(ctx.procedure_id).await,
-        }
-        .map_err(map_to_procedure_error)
-    }
-
-    fn dump(&self) -> ProcedureResult<String> {
-        serde_json::to_string(&self.data).context(ToJsonSnafu)
-    }
-
-    fn lock_key(&self) -> LockKey {
-        let table_ref = &self.data.table_ref();
-
-        LockKey::new(vec![
-            CatalogLock::Read(table_ref.catalog).into(),
-            SchemaLock::read(table_ref.catalog, table_ref.schema).into(),
-            TableNameLock::new(table_ref.catalog, table_ref.schema, table_ref.table).into(),
-        ])
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, AsRefStr, PartialEq)]
 pub enum CreateTableState {
    /// Prepares to create the table
@@ -345,16 +444,6 @@ pub struct CreateTableData {
 }

 impl CreateTableData {
-    pub fn new(task: CreateTableTask) -> Self {
-        CreateTableData {
-            state: CreateTableState::Prepare,
-            column_metadatas: vec![],
-            task,
-            table_route: None,
-            region_wal_options: None,
-        }
-    }
-
    fn table_ref(&self) -> TableReference<'_> {
        self.task.table_ref()
    }
--- a/src/common/meta/src/ddl/create_table/executor.rs
+++ b/src/common/meta/src/ddl/create_table/executor.rs
@@ -1,203 +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::collections::HashMap;
-
-use api::v1::region::region_request::Body as PbRegionRequest;
-use api::v1::region::{RegionRequest, RegionRequestHeader};
-use common_telemetry::tracing_context::TracingContext;
-use common_telemetry::warn;
-use futures::future::join_all;
-use snafu::ensure;
-use store_api::metadata::ColumnMetadata;
-use store_api::metric_engine_consts::TABLE_COLUMN_METADATA_EXTENSION_KEY;
-use store_api::storage::{RegionId, RegionNumber};
-use table::metadata::{RawTableInfo, TableId};
-use table::table_name::TableName;
-
-use crate::ddl::utils::raw_table_info::update_table_info_column_ids;
-use crate::ddl::utils::{
-    add_peer_context_if_needed, convert_region_routes_to_detecting_regions,
-    extract_column_metadatas, region_storage_path,
-};
-use crate::ddl::{CreateRequestBuilder, RegionFailureDetectorControllerRef};
-use crate::error::{self, Result};
-use crate::key::TableMetadataManagerRef;
-use crate::key::table_name::TableNameKey;
-use crate::key::table_route::{PhysicalTableRouteValue, TableRouteValue};
-use crate::node_manager::NodeManagerRef;
-use crate::rpc::router::{RegionRoute, find_leader_regions, find_leaders};
-
-/// [CreateTableExecutor] performs:
-/// - Creates the metadata of the table.
-/// - Creates the regions on the Datanode nodes.
-pub struct CreateTableExecutor {
-    create_if_not_exists: bool,
-    table_name: TableName,
-    builder: CreateRequestBuilder,
-}
-
-impl CreateTableExecutor {
-    /// Creates a new [`CreateTableExecutor`].
-    pub fn new(
-        table_name: TableName,
-        create_if_not_exists: bool,
-        builder: CreateRequestBuilder,
-    ) -> Self {
-        Self {
-            create_if_not_exists,
-            table_name,
-            builder,
-        }
-    }
-
-    /// On the prepare step, it performs:
-    /// - Checks whether the table exists.
-    /// - Returns the table id if the table exists.
-    ///
-    /// Abort(non-retry):
-    /// - Table exists and `create_if_not_exists` is `false`.
-    /// - Failed to get the table name value.
-    pub async fn on_prepare(
-        &self,
-        table_metadata_manager: &TableMetadataManagerRef,
-    ) -> Result<Option<TableId>> {
-        let table_name_value = table_metadata_manager
-            .table_name_manager()
-            .get(TableNameKey::new(
-                &self.table_name.catalog_name,
-                &self.table_name.schema_name,
-                &self.table_name.table_name,
-            ))
-            .await?;
-
-        if let Some(value) = table_name_value {
-            ensure!(
-                self.create_if_not_exists,
-                error::TableAlreadyExistsSnafu {
-                    table_name: self.table_name.to_string(),
-                }
-            );
-
-            return Ok(Some(value.table_id()));
-        }
-
-        Ok(None)
-    }
-
-    pub async fn on_create_regions(
-        &self,
-        node_manager: &NodeManagerRef,
-        table_id: TableId,
-        region_routes: &[RegionRoute],
-        region_wal_options: &HashMap<RegionNumber, String>,
-    ) -> Result<Vec<ColumnMetadata>> {
-        let storage_path =
-            region_storage_path(&self.table_name.catalog_name, &self.table_name.schema_name);
-        let leaders = find_leaders(region_routes);
-        let mut create_region_tasks = Vec::with_capacity(leaders.len());
-        let partition_exprs = region_routes
-            .iter()
-            .map(|r| (r.region.id.region_number(), r.region.partition_expr()))
-            .collect::<HashMap<_, _>>();
-
-        for datanode in leaders {
-            let requester = node_manager.datanode(&datanode).await;
-
-            let regions = find_leader_regions(region_routes, &datanode);
-            let mut requests = Vec::with_capacity(regions.len());
-            for region_number in regions {
-                let region_id = RegionId::new(table_id, region_number);
-                let create_region_request = self.builder.build_one(
-                    region_id,
-                    storage_path.clone(),
-                    region_wal_options,
-                    &partition_exprs,
-                );
-                requests.push(PbRegionRequest::Create(create_region_request));
-            }
-
-            for request in requests {
-                let request = RegionRequest {
-                    header: Some(RegionRequestHeader {
-                        tracing_context: TracingContext::from_current_span().to_w3c(),
-                        ..Default::default()
-                    }),
-                    body: Some(request),
-                };
-
-                let datanode = datanode.clone();
-                let requester = requester.clone();
-                create_region_tasks.push(async move {
-                    requester
-                        .handle(request)
-                        .await
-                        .map_err(add_peer_context_if_needed(datanode))
-                });
-            }
-        }
-
-        let mut results = join_all(create_region_tasks)
-            .await
-            .into_iter()
-            .collect::<Result<Vec<_>>>()?;
-
-        let column_metadatas = if let Some(column_metadatas) =
-            extract_column_metadatas(&mut results, TABLE_COLUMN_METADATA_EXTENSION_KEY)?
-        {
-            column_metadatas
-        } else {
-            warn!(
-                "creating table result doesn't contains extension key `{TABLE_COLUMN_METADATA_EXTENSION_KEY}`,leaving the table's column metadata unchanged"
-            );
-            vec![]
-        };
-
-        Ok(column_metadatas)
-    }
-
-    /// Creates table metadata
-    ///
-    /// Abort(non-retry):
-    /// - Failed to create table metadata.
-    pub async fn on_create_metadata(
-        &self,
-        table_metadata_manager: &TableMetadataManagerRef,
-        region_failure_detector_controller: &RegionFailureDetectorControllerRef,
-        mut raw_table_info: RawTableInfo,
-        column_metadatas: &[ColumnMetadata],
-        table_route: PhysicalTableRouteValue,
-        region_wal_options: HashMap<RegionNumber, String>,
-    ) -> Result<()> {
-        if !column_metadatas.is_empty() {
-            update_table_info_column_ids(&mut raw_table_info, column_metadatas);
-        }
-        let detecting_regions =
-            convert_region_routes_to_detecting_regions(&table_route.region_routes);
-        let table_route = TableRouteValue::Physical(table_route);
-        table_metadata_manager
-            .create_table_metadata(raw_table_info, table_route, region_wal_options)
-            .await?;
-        region_failure_detector_controller
-            .register_failure_detectors(detecting_regions)
-            .await;
-
-        Ok(())
-    }
-
-    /// Returns the builder of the executor.
-    pub fn builder(&self) -> &CreateRequestBuilder {
-        &self.builder
-    }
-}
--- a/src/common/meta/src/ddl/create_table_template.rs
+++ b/src/common/meta/src/ddl/create_table_template.rs
@@ -20,17 +20,19 @@ use api::v1::region::{CreateRequest, RegionColumnDef};
 use api::v1::{ColumnDef, CreateTableExpr, SemanticType};
 use common_telemetry::warn;
 use snafu::{OptionExt, ResultExt};
-use store_api::metric_engine_consts::LOGICAL_TABLE_METADATA_KEY;
+use store_api::metric_engine_consts::{LOGICAL_TABLE_METADATA_KEY, METRIC_ENGINE_NAME};
 use store_api::storage::{RegionId, RegionNumber};
 use table::metadata::{RawTableInfo, TableId};

 use crate::error::{self, Result};
-use crate::wal_provider::prepare_wal_options;
+use crate::wal_options_allocator::prepare_wal_options;

-/// Constructs a [CreateRequest] based on the provided [RawTableInfo].
+/// Builds a [CreateRequest] from a [RawTableInfo].
 ///
-/// Note: This function is primarily intended for creating logical tables or allocating placeholder regions.
-pub fn build_template_from_raw_table_info(raw_table_info: &RawTableInfo) -> Result<CreateRequest> {
+/// Note: **This method is only used for creating logical tables.**
+pub(crate) fn build_template_from_raw_table_info(
+    raw_table_info: &RawTableInfo,
+) -> Result<CreateRequest> {
    let primary_key_indices = &raw_table_info.meta.primary_key_indices;
    let column_defs = raw_table_info
        .meta
@@ -55,7 +57,7 @@ pub fn build_template_from_raw_table_info(raw_table_info: &RawTableInfo) -> Resu
    let options = HashMap::from(&raw_table_info.meta.options);
    let template = CreateRequest {
        region_id: 0,
-        engine: raw_table_info.meta.engine.clone(),
+        engine: METRIC_ENGINE_NAME.to_string(),
        column_defs,
        primary_key: primary_key_indices.iter().map(|i| *i as u32).collect(),
        path: String::new(),
@@ -136,7 +138,7 @@ pub struct CreateRequestBuilder {
 }

 impl CreateRequestBuilder {
-    pub fn new(template: CreateRequest, physical_table_id: Option<TableId>) -> Self {
+    pub(crate) fn new(template: CreateRequest, physical_table_id: Option<TableId>) -> Self {
        Self {
            template,
            physical_table_id,
--- a/src/common/meta/src/ddl/drop_database/executor.rs
+++ b/src/common/meta/src/ddl/drop_database/executor.rs
@@ -120,13 +120,7 @@ impl State for DropDatabaseExecutor {
            .await?;
        executor.invalidate_table_cache(ddl_ctx).await?;
        executor
-            .on_drop_regions(
-                &ddl_ctx.node_manager,
-                &ddl_ctx.leader_region_registry,
-                &self.physical_region_routes,
-                true,
-                false,
-            )
+            .on_drop_regions(ddl_ctx, &self.physical_region_routes, true)
            .await?;
        info!("Table: {}({}) is dropped", self.table_name, self.table_id);

--- a/src/common/meta/src/ddl/drop_table.rs
+++ b/src/common/meta/src/ddl/drop_table.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-pub mod executor;
+pub(crate) mod executor;
 mod metadata;

 use std::collections::HashMap;
@@ -156,13 +156,7 @@ impl DropTableProcedure {

    pub async fn on_datanode_drop_regions(&mut self) -> Result<Status> {
        self.executor
-            .on_drop_regions(
-                &self.context.node_manager,
-                &self.context.leader_region_registry,
-                &self.data.physical_region_routes,
-                false,
-                false,
-            )
+            .on_drop_regions(&self.context, &self.data.physical_region_routes, false)
            .await?;
        self.data.state = DropTableState::DeleteTombstone;
        Ok(Status::executing(true))
--- a/src/common/meta/src/ddl/drop_table/executor.rs
+++ b/src/common/meta/src/ddl/drop_table/executor.rs
@@ -36,8 +36,6 @@ use crate::error::{self, Result};
 use crate::instruction::CacheIdent;
 use crate::key::table_name::TableNameKey;
 use crate::key::table_route::TableRouteValue;
-use crate::node_manager::NodeManagerRef;
-use crate::region_registry::LeaderRegionRegistryRef;
 use crate::rpc::router::{
    RegionRoute, find_follower_regions, find_followers, find_leader_regions, find_leaders,
    operating_leader_regions,
@@ -214,18 +212,16 @@ impl DropTableExecutor {
    /// Drops region on datanode.
    pub async fn on_drop_regions(
        &self,
-        node_manager: &NodeManagerRef,
-        leader_region_registry: &LeaderRegionRegistryRef,
+        ctx: &DdlContext,
        region_routes: &[RegionRoute],
        fast_path: bool,
-        force: bool,
    ) -> Result<()> {
        // Drops leader regions on datanodes.
        let leaders = find_leaders(region_routes);
        let mut drop_region_tasks = Vec::with_capacity(leaders.len());
        let table_id = self.table_id;
        for datanode in leaders {
-            let requester = node_manager.datanode(&datanode).await;
+            let requester = ctx.node_manager.datanode(&datanode).await;
            let regions = find_leader_regions(region_routes, &datanode);
            let region_ids = regions
                .iter()
@@ -242,7 +238,6 @@ impl DropTableExecutor {
                    body: Some(region_request::Body::Drop(PbDropRegionRequest {
                        region_id: region_id.as_u64(),
                        fast_path,
-                        force,
                    })),
                };
                let datanode = datanode.clone();
@@ -267,7 +262,7 @@ impl DropTableExecutor {
        let followers = find_followers(region_routes);
        let mut close_region_tasks = Vec::with_capacity(followers.len());
        for datanode in followers {
-            let requester = node_manager.datanode(&datanode).await;
+            let requester = ctx.node_manager.datanode(&datanode).await;
            let regions = find_follower_regions(region_routes, &datanode);
            let region_ids = regions
                .iter()
@@ -312,7 +307,8 @@ impl DropTableExecutor {

        // Deletes the leader region from registry.
        let region_ids = operating_leader_regions(region_routes);
-        leader_region_registry.batch_delete(region_ids.into_iter().map(|(region_id, _)| region_id));
+        ctx.leader_region_registry
+            .batch_delete(region_ids.into_iter().map(|(region_id, _)| region_id));

        Ok(())
    }
--- a/src/common/meta/src/ddl/table_meta.rs
+++ b/src/common/meta/src/ddl/table_meta.rs
@@ -17,47 +17,47 @@ use std::sync::Arc;

 use common_telemetry::{debug, info};
 use snafu::ensure;
-use store_api::storage::{RegionNumber, TableId};
+use store_api::storage::{RegionId, RegionNumber, TableId};

 use crate::ddl::TableMetadata;
-use crate::ddl::allocator::region_routes::RegionRoutesAllocatorRef;
-use crate::ddl::allocator::resource_id::ResourceIdAllocatorRef;
-use crate::ddl::allocator::wal_options::WalOptionsAllocatorRef;
 use crate::error::{Result, UnsupportedSnafu};
 use crate::key::table_route::PhysicalTableRouteValue;
 use crate::peer::{NoopPeerAllocator, PeerAllocatorRef};
 use crate::rpc::ddl::CreateTableTask;
+use crate::rpc::router::{Region, RegionRoute};
+use crate::sequence::SequenceRef;
+use crate::wal_options_allocator::{WalOptionsAllocatorRef, allocate_region_wal_options};

 pub type TableMetadataAllocatorRef = Arc<TableMetadataAllocator>;

 #[derive(Clone)]
 pub struct TableMetadataAllocator {
-    table_id_allocator: ResourceIdAllocatorRef,
+    table_id_sequence: SequenceRef,
    wal_options_allocator: WalOptionsAllocatorRef,
-    region_routes_allocator: RegionRoutesAllocatorRef,
+    peer_allocator: PeerAllocatorRef,
 }

 impl TableMetadataAllocator {
    pub fn new(
-        table_id_allocator: ResourceIdAllocatorRef,
+        table_id_sequence: SequenceRef,
        wal_options_allocator: WalOptionsAllocatorRef,
    ) -> Self {
        Self::with_peer_allocator(
-            table_id_allocator,
+            table_id_sequence,
            wal_options_allocator,
            Arc::new(NoopPeerAllocator),
        )
    }

    pub fn with_peer_allocator(
-        table_id_allocator: ResourceIdAllocatorRef,
+        table_id_sequence: SequenceRef,
        wal_options_allocator: WalOptionsAllocatorRef,
        peer_allocator: PeerAllocatorRef,
    ) -> Self {
        Self {
-            table_id_allocator,
+            table_id_sequence,
            wal_options_allocator,
-            region_routes_allocator: Arc::new(peer_allocator) as _,
+            peer_allocator,
        }
    }

@@ -70,7 +70,7 @@ impl TableMetadataAllocator {

            ensure!(
                !self
-                    .table_id_allocator
+                    .table_id_sequence
                    .min_max()
                    .await
                    .contains(&(table_id as u64)),
@@ -89,35 +89,65 @@ impl TableMetadataAllocator {

            table_id
        } else {
-            self.table_id_allocator.next().await? as TableId
+            self.table_id_sequence.next().await? as TableId
        };
        Ok(table_id)
    }

-    async fn create_wal_options(
+    fn create_wal_options(
        &self,
-        region_numbers: &[RegionNumber],
+        table_route: &PhysicalTableRouteValue,
        skip_wal: bool,
    ) -> Result<HashMap<RegionNumber, String>> {
-        self.wal_options_allocator
-            .allocate(region_numbers, skip_wal)
-            .await
+        let region_numbers = table_route
+            .region_routes
+            .iter()
+            .map(|route| route.region.id.region_number())
+            .collect();
+        allocate_region_wal_options(region_numbers, &self.wal_options_allocator, skip_wal)
    }

    async fn create_table_route(
        &self,
        table_id: TableId,
-        partition_exprs: &[&str],
+        task: &CreateTableTask,
    ) -> Result<PhysicalTableRouteValue> {
-        let region_number_and_partition_exprs = partition_exprs
+        let regions = task.partitions.len().max(1);
+        let peers = self.peer_allocator.alloc(regions).await?;
+        debug!("Allocated peers {:?} for table {}", peers, table_id);
+
+        let mut region_routes = task
+            .partitions
            .iter()
            .enumerate()
-            .map(|(i, partition)| (i as u32, *partition))
+            .map(|(i, partition)| {
+                let region = Region {
+                    id: RegionId::new(table_id, i as u32),
+                    partition_expr: partition.expression.clone(),
+                    ..Default::default()
+                };
+
+                let peer = peers[i % peers.len()].clone();
+
+                RegionRoute {
+                    region,
+                    leader_peer: Some(peer),
+                    ..Default::default()
+                }
+            })
            .collect::<Vec<_>>();
-        let region_routes = self
-            .region_routes_allocator
-            .allocate(table_id, &region_number_and_partition_exprs)
-            .await?;
+
+        // If the table has no partitions, we need to create a default region.
+        if region_routes.is_empty() {
+            region_routes.push(RegionRoute {
+                region: Region {
+                    id: RegionId::new(table_id, 0),
+                    ..Default::default()
+                },
+                leader_peer: Some(peers[0].clone()),
+                ..Default::default()
+            });
+        }

        Ok(PhysicalTableRouteValue::new(region_routes))
    }
@@ -134,20 +164,10 @@ impl TableMetadataAllocator {

    pub async fn create(&self, task: &CreateTableTask) -> Result<TableMetadata> {
        let table_id = self.allocate_table_id(&task.create_table.table_id).await?;
-        let partition_exprs = task
-            .partitions
-            .iter()
-            .map(|p| p.expression.as_str())
-            .collect::<Vec<_>>();
-        let table_route = self.create_table_route(table_id, &partition_exprs).await?;
-        let region_numbers = table_route
-            .region_routes
-            .iter()
-            .map(|route| route.region.id.region_number())
-            .collect::<Vec<_>>();
-        let region_wal_options = self
-            .create_wal_options(&region_numbers, task.table_info.meta.options.skip_wal)
-            .await?;
+        let table_route = self.create_table_route(table_id, task).await?;
+
+        let region_wal_options =
+            self.create_wal_options(&table_route, task.table_info.meta.options.skip_wal)?;

        debug!(
            "Allocated region wal options {:?} for table {}",
@@ -161,7 +181,7 @@ impl TableMetadataAllocator {
        })
    }

-    pub fn table_id_allocator(&self) -> ResourceIdAllocatorRef {
-        self.table_id_allocator.clone()
+    pub fn table_id_sequence(&self) -> SequenceRef {
+        self.table_id_sequence.clone()
    }
 }
--- a/src/common/meta/src/ddl/test_util/create_table.rs
+++ b/src/common/meta/src/ddl/test_util/create_table.rs
@@ -128,6 +128,7 @@ pub fn build_raw_table_info_from_expr(expr: &CreateTableExpr) -> RawTableInfo {
            value_indices: vec![],
            engine: expr.engine.clone(),
            next_column_id: expr.column_defs.len() as u32,
+            region_numbers: vec![],
            options: TableOptions::try_from_iter(&expr.table_options).unwrap(),
            created_on: DateTime::default(),
            updated_on: DateTime::default(),
--- a/src/common/meta/src/ddl/tests/create_logical_tables.rs
+++ b/src/common/meta/src/ddl/tests/create_logical_tables.rs
@@ -166,7 +166,7 @@ async fn test_on_prepare_logical_table_exists_err() {
        .table_metadata_manager
        .create_logical_tables_metadata(vec![(
            task.table_info.clone(),
-            TableRouteValue::logical(1024),
+            TableRouteValue::logical(1024, vec![RegionId::new(1025, 1)]),
        )])
        .await
        .unwrap();
@@ -208,7 +208,7 @@ async fn test_on_prepare_with_create_if_table_exists() {
        .table_metadata_manager
        .create_logical_tables_metadata(vec![(
            task.table_info.clone(),
-            TableRouteValue::logical(1024),
+            TableRouteValue::logical(1024, vec![RegionId::new(8192, 1)]),
        )])
        .await
        .unwrap();
@@ -252,7 +252,7 @@ async fn test_on_prepare_part_logical_tables_exist() {
        .table_metadata_manager
        .create_logical_tables_metadata(vec![(
            task.table_info.clone(),
-            TableRouteValue::logical(1024),
+            TableRouteValue::logical(1024, vec![RegionId::new(8192, 1)]),
        )])
        .await
        .unwrap();
@@ -392,7 +392,7 @@ async fn test_on_create_metadata_part_logical_tables_exist() {
        .table_metadata_manager
        .create_logical_tables_metadata(vec![(
            task.table_info.clone(),
-            TableRouteValue::logical(1024),
+            TableRouteValue::logical(1024, vec![RegionId::new(8192, 1)]),
        )])
        .await
        .unwrap();
@@ -496,7 +496,10 @@ async fn test_on_create_metadata_err() {
    task.table_info.ident.table_id = 1025;
    ddl_context
        .table_metadata_manager
-        .create_logical_tables_metadata(vec![(task.table_info, TableRouteValue::logical(512))])
+        .create_logical_tables_metadata(vec![(
+            task.table_info,
+            TableRouteValue::logical(512, vec![RegionId::new(1026, 1)]),
+        )])
        .await
        .unwrap();
    // Triggers procedure to create table metadata
--- a/src/common/meta/src/ddl/tests/create_table.rs
+++ b/src/common/meta/src/ddl/tests/create_table.rs
@@ -162,7 +162,7 @@ async fn test_on_prepare_table_exists_err() {
        )
        .await
        .unwrap();
-    let mut procedure = CreateTableProcedure::new(task, ddl_context).unwrap();
+    let mut procedure = CreateTableProcedure::new(task, ddl_context);
    let err = procedure.on_prepare().await.unwrap_err();
    assert_matches!(err, Error::TableAlreadyExists { .. });
    assert_eq!(err.status_code(), StatusCode::TableAlreadyExists);
@@ -185,7 +185,7 @@ async fn test_on_prepare_with_create_if_table_exists() {
        )
        .await
        .unwrap();
-    let mut procedure = CreateTableProcedure::new(task, ddl_context).unwrap();
+    let mut procedure = CreateTableProcedure::new(task, ddl_context);
    let status = procedure.on_prepare().await.unwrap();
    assert_matches!(status, Status::Done { output: Some(..) });
    let table_id = *status.downcast_output_ref::<u32>().unwrap();
@@ -198,7 +198,7 @@ async fn test_on_prepare_without_create_if_table_exists() {
    let ddl_context = new_ddl_context(node_manager);
    let mut task = test_create_table_task("foo");
    task.create_table.create_if_not_exists = true;
-    let mut procedure = CreateTableProcedure::new(task, ddl_context).unwrap();
+    let mut procedure = CreateTableProcedure::new(task, ddl_context);
    let status = procedure.on_prepare().await.unwrap();
    assert_matches!(
        status,
@@ -217,7 +217,7 @@ async fn test_on_datanode_create_regions_should_retry() {
    let ddl_context = new_ddl_context(node_manager);
    let task = test_create_table_task("foo");
    assert!(!task.create_table.create_if_not_exists);
-    let mut procedure = CreateTableProcedure::new(task, ddl_context).unwrap();
+    let mut procedure = CreateTableProcedure::new(task, ddl_context);
    procedure.on_prepare().await.unwrap();
    let ctx = ProcedureContext {
        procedure_id: ProcedureId::random(),
@@ -234,7 +234,7 @@ async fn test_on_datanode_create_regions_should_not_retry() {
    let ddl_context = new_ddl_context(node_manager);
    let task = test_create_table_task("foo");
    assert!(!task.create_table.create_if_not_exists);
-    let mut procedure = CreateTableProcedure::new(task, ddl_context).unwrap();
+    let mut procedure = CreateTableProcedure::new(task, ddl_context);
    procedure.on_prepare().await.unwrap();
    let ctx = ProcedureContext {
        procedure_id: ProcedureId::random(),
@@ -251,7 +251,7 @@ async fn test_on_create_metadata_error() {
    let ddl_context = new_ddl_context(node_manager);
    let task = test_create_table_task("foo");
    assert!(!task.create_table.create_if_not_exists);
-    let mut procedure = CreateTableProcedure::new(task.clone(), ddl_context.clone()).unwrap();
+    let mut procedure = CreateTableProcedure::new(task.clone(), ddl_context.clone());
    procedure.on_prepare().await.unwrap();
    let ctx = ProcedureContext {
        procedure_id: ProcedureId::random(),
@@ -284,7 +284,7 @@ async fn test_on_create_metadata() {
    let ddl_context = new_ddl_context(node_manager);
    let task = test_create_table_task("foo");
    assert!(!task.create_table.create_if_not_exists);
-    let mut procedure = CreateTableProcedure::new(task, ddl_context.clone()).unwrap();
+    let mut procedure = CreateTableProcedure::new(task, ddl_context.clone());
    procedure.on_prepare().await.unwrap();
    let ctx = ProcedureContext {
        procedure_id: ProcedureId::random(),
@@ -312,16 +312,16 @@ async fn test_memory_region_keeper_guard_dropped_on_procedure_done() {
    let ddl_context = new_ddl_context_with_kv_backend(node_manager, kv_backend);

    let task = test_create_table_task("foo");
-    let mut procedure = CreateTableProcedure::new(task, ddl_context.clone()).unwrap();
+    let mut procedure = CreateTableProcedure::new(task, ddl_context.clone());

    execute_procedure_until(&mut procedure, |p| {
-        p.data.state == CreateTableState::CreateMetadata
+        p.creator.data.state == CreateTableState::CreateMetadata
    })
    .await;

    // Ensure that after running to the state `CreateMetadata`(just past `DatanodeCreateRegions`),
    // the opening regions should be recorded:
-    let guards = &procedure.opening_regions;
+    let guards = &procedure.creator.opening_regions;
    assert_eq!(guards.len(), 1);
    let (datanode_id, region_id) = (0, RegionId::new(procedure.table_id(), 0));
    assert_eq!(guards[0].info(), (datanode_id, region_id));
@@ -334,7 +334,7 @@ async fn test_memory_region_keeper_guard_dropped_on_procedure_done() {
    execute_procedure_until_done(&mut procedure).await;

    // Ensure that when run to the end, the opening regions should be cleared:
-    let guards = &procedure.opening_regions;
+    let guards = &procedure.creator.opening_regions;
    assert!(guards.is_empty());
    assert!(
        !ddl_context
--- a/src/common/meta/src/ddl/tests/create_view.rs
+++ b/src/common/meta/src/ddl/tests/create_view.rs
@@ -259,7 +259,7 @@ async fn test_replace_table() {
    {
        // Create a `foo` table.
        let task = test_create_table_task("foo");
-        let mut procedure = CreateTableProcedure::new(task, ddl_context.clone()).unwrap();
+        let mut procedure = CreateTableProcedure::new(task, ddl_context.clone());
        procedure.on_prepare().await.unwrap();
        let ctx = ProcedureContext {
            procedure_id: ProcedureId::random(),
--- a/src/common/meta/src/ddl_manager.rs
+++ b/src/common/meta/src/ddl_manager.rs
@@ -231,7 +231,7 @@ impl DdlManager {
    ) -> Result<(ProcedureId, Option<Output>)> {
        let context = self.create_context();

-        let procedure = CreateTableProcedure::new(create_table_task, context)?;
+        let procedure = CreateTableProcedure::new(create_table_task, context);

        let procedure_with_id = ProcedureWithId::with_random_id(Box::new(procedure));

@@ -968,7 +968,7 @@ mod tests {
    use crate::region_registry::LeaderRegionRegistry;
    use crate::sequence::SequenceBuilder;
    use crate::state_store::KvStateStore;
-    use crate::wal_provider::WalProvider;
+    use crate::wal_options_allocator::WalOptionsAllocator;

    /// A dummy implemented [NodeManager].
    pub struct DummyDatanodeManager;
@@ -993,7 +993,7 @@ mod tests {
        let table_metadata_manager = Arc::new(TableMetadataManager::new(kv_backend.clone()));
        let table_metadata_allocator = Arc::new(TableMetadataAllocator::new(
            Arc::new(SequenceBuilder::new("test", kv_backend.clone()).build()),
-            Arc::new(WalProvider::default()),
+            Arc::new(WalOptionsAllocator::default()),
        ));
        let flow_metadata_manager = Arc::new(FlowMetadataManager::new(kv_backend.clone()));
        let flow_metadata_allocator = Arc::new(FlowMetadataAllocator::with_noop_peer_allocator(
--- a/src/common/meta/src/error.rs
+++ b/src/common/meta/src/error.rs
@@ -224,13 +224,6 @@ pub enum Error {
        location: Location,
    },

-    #[snafu(display("Failed to find table repartition metadata for table id {}", table_id))]
-    TableRepartNotFound {
-        table_id: TableId,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
    #[snafu(display("Failed to decode protobuf"))]
    DecodeProto {
        #[snafu(implicit)]
@@ -1098,7 +1091,6 @@ impl ErrorExt for Error {
            | DecodeProto { .. }
            | BuildTableMeta { .. }
            | TableRouteNotFound { .. }
-            | TableRepartNotFound { .. }
            | ConvertRawTableInfo { .. }
            | RegionOperatingRace { .. }
            | EncodeWalOptions { .. }
--- a/src/common/meta/src/instruction.rs
+++ b/src/common/meta/src/instruction.rs
@@ -514,65 +514,6 @@ impl Display for GcRegionsReply {
    }
 }

-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct EnterStagingRegion {
-    pub region_id: RegionId,
-    pub partition_expr: String,
-}
-
-impl Display for EnterStagingRegion {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "EnterStagingRegion(region_id={}, partition_expr={})",
-            self.region_id, self.partition_expr
-        )
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct RemapManifest {
-    pub region_id: RegionId,
-    /// Regions to remap manifests from.
-    pub input_regions: Vec<RegionId>,
-    /// For each old region, which new regions should receive its files
-    pub region_mapping: HashMap<RegionId, Vec<RegionId>>,
-    /// New partition expressions for the new regions.
-    pub new_partition_exprs: HashMap<RegionId, String>,
-}
-
-impl Display for RemapManifest {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "RemapManifest(region_id={}, input_regions={:?}, region_mapping={:?}, new_partition_exprs={:?})",
-            self.region_id, self.input_regions, self.region_mapping, self.new_partition_exprs
-        )
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct ApplyStagingManifest {
-    /// The region ID to apply the staging manifest to.
-    pub region_id: RegionId,
-    /// The partition expression of the staging region.
-    pub partition_expr: String,
-    /// The region that stores the staging manifests in its staging blob storage.
-    pub central_region_id: RegionId,
-    /// The relative path to the staging manifest within the central region's staging blob storage.
-    pub manifest_path: String,
-}
-
-impl Display for ApplyStagingManifest {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "ApplyStagingManifest(region_id={}, partition_expr={}, central_region_id={}, manifest_path={})",
-            self.region_id, self.partition_expr, self.central_region_id, self.manifest_path
-        )
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, Display, PartialEq)]
 pub enum Instruction {
    /// Opens regions.
@@ -600,12 +541,6 @@ pub enum Instruction {
    GcRegions(GcRegions),
    /// Temporary suspend serving reads or writes
    Suspend,
-    /// Makes regions enter staging state.
-    EnterStagingRegions(Vec<EnterStagingRegion>),
-    /// Remaps manifests for a region.
-    RemapManifest(RemapManifest),
-    /// Applies staging manifests for a region.
-    ApplyStagingManifests(Vec<ApplyStagingManifest>),
 }

 impl Instruction {
@@ -662,13 +597,6 @@ impl Instruction {
            _ => None,
        }
    }
-
-    pub fn into_enter_staging_regions(self) -> Option<Vec<EnterStagingRegion>> {
-        match self {
-            Self::EnterStagingRegions(enter_staging) => Some(enter_staging),
-            _ => None,
-        }
-    }
 }

 /// The reply of [UpgradeRegion].
@@ -762,70 +690,6 @@ where
    })
 }

-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
-pub struct EnterStagingRegionReply {
-    pub region_id: RegionId,
-    /// Returns true if the region is under the new region rule.
-    pub ready: bool,
-    /// Indicates whether the region exists.
-    pub exists: bool,
-    /// Return error if any during the operation.
-    pub error: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
-pub struct EnterStagingRegionsReply {
-    pub replies: Vec<EnterStagingRegionReply>,
-}
-
-impl EnterStagingRegionsReply {
-    pub fn new(replies: Vec<EnterStagingRegionReply>) -> Self {
-        Self { replies }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
-pub struct RemapManifestReply {
-    /// Returns false if the region does not exist.
-    pub exists: bool,
-    /// A map from region IDs to their corresponding remapped manifest paths.
-    pub manifest_paths: HashMap<RegionId, String>,
-    /// Return error if any during the operation.
-    pub error: Option<String>,
-}
-
-impl Display for RemapManifestReply {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "RemapManifestReply(manifest_paths={:?}, error={:?})",
-            self.manifest_paths, self.error
-        )
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
-pub struct ApplyStagingManifestsReply {
-    pub replies: Vec<ApplyStagingManifestReply>,
-}
-
-impl ApplyStagingManifestsReply {
-    pub fn new(replies: Vec<ApplyStagingManifestReply>) -> Self {
-        Self { replies }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
-pub struct ApplyStagingManifestReply {
-    pub region_id: RegionId,
-    /// Returns true if the region is ready to serve reads and writes.
-    pub ready: bool,
-    /// Indicates whether the region exists.
-    pub exists: bool,
-    /// Return error if any during the operation.
-    pub error: Option<String>,
-}
-
 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum InstructionReply {
@@ -846,9 +710,6 @@ pub enum InstructionReply {
    FlushRegions(FlushRegionReply),
    GetFileRefs(GetFileRefsReply),
    GcRegions(GcRegionsReply),
-    EnterStagingRegions(EnterStagingRegionsReply),
-    RemapManifest(RemapManifestReply),
-    ApplyStagingManifests(ApplyStagingManifestsReply),
 }

 impl Display for InstructionReply {
@@ -865,19 +726,6 @@ impl Display for InstructionReply {
            Self::FlushRegions(reply) => write!(f, "InstructionReply::FlushRegions({})", reply),
            Self::GetFileRefs(reply) => write!(f, "InstructionReply::GetFileRefs({})", reply),
            Self::GcRegions(reply) => write!(f, "InstructionReply::GcRegion({})", reply),
-            Self::EnterStagingRegions(reply) => {
-                write!(
-                    f,
-                    "InstructionReply::EnterStagingRegions({:?})",
-                    reply.replies
-                )
-            }
-            Self::RemapManifest(reply) => write!(f, "InstructionReply::RemapManifest({})", reply),
-            Self::ApplyStagingManifests(reply) => write!(
-                f,
-                "InstructionReply::ApplyStagingManifests({:?})",
-                reply.replies
-            ),
        }
    }
 }
@@ -918,34 +766,13 @@ impl InstructionReply {
            _ => panic!("Expected FlushRegions reply"),
        }
    }
-
-    pub fn expect_enter_staging_regions_reply(self) -> Vec<EnterStagingRegionReply> {
-        match self {
-            Self::EnterStagingRegions(reply) => reply.replies,
-            _ => panic!("Expected EnterStagingRegion reply"),
-        }
-    }
-
-    pub fn expect_remap_manifest_reply(self) -> RemapManifestReply {
-        match self {
-            Self::RemapManifest(reply) => reply,
-            _ => panic!("Expected RemapManifest reply"),
-        }
-    }
-
-    pub fn expect_apply_staging_manifests_reply(self) -> Vec<ApplyStagingManifestReply> {
-        match self {
-            Self::ApplyStagingManifests(reply) => reply.replies,
-            _ => panic!("Expected ApplyStagingManifest reply"),
-        }
-    }
 }

 #[cfg(test)]
 mod tests {
    use std::collections::HashSet;

-    use store_api::storage::{FileId, FileRef};
+    use store_api::storage::FileId;

    use super::*;

@@ -1320,14 +1147,12 @@ mod tests {
        let mut manifest = FileRefsManifest::default();
        let r0 = RegionId::new(1024, 1);
        let r1 = RegionId::new(1024, 2);
-        manifest.file_refs.insert(
-            r0,
-            HashSet::from([FileRef::new(r0, FileId::random(), None)]),
-        );
-        manifest.file_refs.insert(
-            r1,
-            HashSet::from([FileRef::new(r1, FileId::random(), None)]),
-        );
+        manifest
+            .file_refs
+            .insert(r0, HashSet::from([FileId::random()]));
+        manifest
+            .file_refs
+            .insert(r1, HashSet::from([FileId::random()]));
        manifest.manifest_version.insert(r0, 10);
        manifest.manifest_version.insert(r1, 20);

--- a/src/common/meta/src/key.rs
+++ b/src/common/meta/src/key.rs
@@ -106,7 +106,6 @@ mod schema_metadata_manager;
 pub mod schema_name;
 pub mod table_info;
 pub mod table_name;
-pub mod table_repart;
 pub mod table_route;
 #[cfg(any(test, feature = "testing"))]
 pub mod test_utils;
@@ -157,7 +156,6 @@ use crate::DatanodeId;
 use crate::error::{self, Result, SerdeJsonSnafu};
 use crate::key::flow::flow_state::FlowStateValue;
 use crate::key::node_address::NodeAddressValue;
-use crate::key::table_repart::{TableRepartKey, TableRepartManager};
 use crate::key::table_route::TableRouteKey;
 use crate::key::topic_region::TopicRegionValue;
 use crate::key::txn_helper::TxnOpGetResponseSet;
@@ -180,7 +178,6 @@ pub const TABLE_NAME_KEY_PREFIX: &str = "__table_name";
 pub const CATALOG_NAME_KEY_PREFIX: &str = "__catalog_name";
 pub const SCHEMA_NAME_KEY_PREFIX: &str = "__schema_name";
 pub const TABLE_ROUTE_PREFIX: &str = "__table_route";
-pub const TABLE_REPART_PREFIX: &str = "__table_repart";
 pub const NODE_ADDRESS_PREFIX: &str = "__node_address";
 pub const KAFKA_TOPIC_KEY_PREFIX: &str = "__topic_name/kafka";
 // The legacy topic key prefix is used to store the topic name in previous versions.
@@ -291,11 +288,6 @@ lazy_static! {
        Regex::new(&format!("^{TABLE_ROUTE_PREFIX}/([0-9]+)$")).unwrap();
 }

-lazy_static! {
-    pub(crate) static ref TABLE_REPART_KEY_PATTERN: Regex =
-        Regex::new(&format!("^{TABLE_REPART_PREFIX}/([0-9]+)$")).unwrap();
-}
-
 lazy_static! {
    static ref DATANODE_TABLE_KEY_PATTERN: Regex =
        Regex::new(&format!("^{DATANODE_TABLE_KEY_PREFIX}/([0-9]+)/([0-9]+)$")).unwrap();
@@ -394,7 +386,6 @@ pub struct TableMetadataManager {
    catalog_manager: CatalogManager,
    schema_manager: SchemaManager,
    table_route_manager: TableRouteManager,
-    table_repart_manager: TableRepartManager,
    tombstone_manager: TombstoneManager,
    topic_name_manager: TopicNameManager,
    topic_region_manager: TopicRegionManager,
@@ -547,7 +538,6 @@ impl TableMetadataManager {
            catalog_manager: CatalogManager::new(kv_backend.clone()),
            schema_manager: SchemaManager::new(kv_backend.clone()),
            table_route_manager: TableRouteManager::new(kv_backend.clone()),
-            table_repart_manager: TableRepartManager::new(kv_backend.clone()),
            tombstone_manager: TombstoneManager::new(kv_backend.clone()),
            topic_name_manager: TopicNameManager::new(kv_backend.clone()),
            topic_region_manager: TopicRegionManager::new(kv_backend.clone()),
@@ -568,7 +558,6 @@ impl TableMetadataManager {
            catalog_manager: CatalogManager::new(kv_backend.clone()),
            schema_manager: SchemaManager::new(kv_backend.clone()),
            table_route_manager: TableRouteManager::new(kv_backend.clone()),
-            table_repart_manager: TableRepartManager::new(kv_backend.clone()),
            tombstone_manager: TombstoneManager::new_with_prefix(
                kv_backend.clone(),
                tombstone_prefix,
@@ -627,10 +616,6 @@ impl TableMetadataManager {
        &self.table_route_manager
    }

-    pub fn table_repart_manager(&self) -> &TableRepartManager {
-        &self.table_repart_manager
-    }
-
    pub fn topic_name_manager(&self) -> &TopicNameManager {
        &self.topic_name_manager
    }
@@ -747,10 +732,12 @@ impl TableMetadataManager {
    /// The caller MUST ensure it has the exclusive access to `TableNameKey`.
    pub async fn create_table_metadata(
        &self,
-        table_info: RawTableInfo,
+        mut table_info: RawTableInfo,
        table_route_value: TableRouteValue,
        region_wal_options: HashMap<RegionNumber, String>,
    ) -> Result<()> {
+        let region_numbers = table_route_value.region_numbers();
+        table_info.meta.region_numbers = region_numbers;
        let table_id = table_info.ident.table_id;
        let engine = table_info.meta.engine.clone();

@@ -849,7 +836,8 @@ impl TableMetadataManager {
            on_create_table_route_failure: F2,
        }
        let mut on_failures = Vec::with_capacity(len);
-        for (table_info, table_route_value) in tables_data {
+        for (mut table_info, table_route_value) in tables_data {
+            table_info.meta.region_numbers = table_route_value.region_numbers();
            let table_id = table_info.ident.table_id;

            // Creates table name.
@@ -935,7 +923,6 @@ impl TableMetadataManager {
        );
        let table_info_key = TableInfoKey::new(table_id);
        let table_route_key = TableRouteKey::new(table_id);
-        let table_repart_key = TableRepartKey::new(table_id);
        let datanode_table_keys = datanode_ids
            .into_iter()
            .map(|datanode_id| DatanodeTableKey::new(datanode_id, table_id))
@@ -950,7 +937,6 @@ impl TableMetadataManager {
        keys.push(table_name.to_bytes());
        keys.push(table_info_key.to_bytes());
        keys.push(table_route_key.to_bytes());
-        keys.push(table_repart_key.to_bytes());
        for key in &datanode_table_keys {
            keys.push(key.to_bytes());
        }
@@ -1474,7 +1460,6 @@ mod tests {

    use super::datanode_table::DatanodeTableKey;
    use super::test_utils;
-    use crate::ddl::allocator::wal_options::WalOptionsAllocator;
    use crate::ddl::test_util::create_table::test_create_table_task;
    use crate::ddl::utils::region_storage_path;
    use crate::error::Result;
@@ -1491,7 +1476,7 @@ mod tests {
    use crate::peer::Peer;
    use crate::rpc::router::{LeaderState, Region, RegionRoute, region_distribution};
    use crate::rpc::store::RangeRequest;
-    use crate::wal_provider::WalProvider;
+    use crate::wal_options_allocator::{WalOptionsAllocator, allocate_region_wal_options};

    #[test]
    fn test_deserialized_value_with_bytes() {
@@ -1541,8 +1526,8 @@ mod tests {
        }
    }

-    fn new_test_table_info() -> TableInfo {
-        test_utils::new_test_table_info(10)
+    fn new_test_table_info(region_numbers: impl Iterator<Item = u32>) -> TableInfo {
+        test_utils::new_test_table_info(10, region_numbers)
    }

    fn new_test_table_names() -> HashSet<TableName> {
@@ -1600,10 +1585,12 @@ mod tests {
        let table_metadata_manager = TableMetadataManager::new(mem_kv.clone());
        let region_route = new_test_region_route();
        let region_routes = &vec![region_route.clone()];
-        let table_info: RawTableInfo = new_test_table_info().into();
-        let wal_provider = WalProvider::RaftEngine;
-        let regions: Vec<_> = (0..16).collect();
-        let region_wal_options = wal_provider.allocate(&regions, false).await.unwrap();
+        let table_info: RawTableInfo =
+            new_test_table_info(region_routes.iter().map(|r| r.region.id.region_number())).into();
+        let wal_allocator = WalOptionsAllocator::RaftEngine;
+        let regions = (0..16).collect();
+        let region_wal_options =
+            allocate_region_wal_options(regions, &wal_allocator, false).unwrap();
        create_physical_table_metadata(
            &table_metadata_manager,
            table_info.clone(),
@@ -1626,7 +1613,8 @@ mod tests {
        let table_metadata_manager = TableMetadataManager::new(mem_kv);
        let region_route = new_test_region_route();
        let region_routes = &vec![region_route.clone()];
-        let table_info: RawTableInfo = new_test_table_info().into();
+        let table_info: RawTableInfo =
+            new_test_table_info(region_routes.iter().map(|r| r.region.id.region_number())).into();
        let region_wal_options = create_mock_region_wal_options()
            .into_iter()
            .map(|(k, v)| (k, serde_json::to_string(&v).unwrap()))
@@ -1708,7 +1696,8 @@ mod tests {
        let table_metadata_manager = TableMetadataManager::new(mem_kv);
        let region_route = new_test_region_route();
        let region_routes = vec![region_route.clone()];
-        let table_info: RawTableInfo = new_test_table_info().into();
+        let table_info: RawTableInfo =
+            new_test_table_info(region_routes.iter().map(|r| r.region.id.region_number())).into();
        let table_id = table_info.ident.table_id;
        let table_route_value = TableRouteValue::physical(region_routes.clone());

@@ -1773,6 +1762,7 @@ mod tests {
            let table_info: RawTableInfo = test_utils::new_test_table_info_with_name(
                table_id,
                &format!("my_table_{}", table_id),
+                region_routes.iter().map(|r| r.region.id.region_number()),
            )
            .into();
            let table_route_value = TableRouteValue::physical(region_routes.clone());
@@ -1793,7 +1783,8 @@ mod tests {
        let table_metadata_manager = TableMetadataManager::new(mem_kv);
        let region_route = new_test_region_route();
        let region_routes = &vec![region_route.clone()];
-        let table_info: RawTableInfo = new_test_table_info().into();
+        let table_info: RawTableInfo =
+            new_test_table_info(region_routes.iter().map(|r| r.region.id.region_number())).into();
        let table_id = table_info.ident.table_id;
        let datanode_id = 2;
        let region_wal_options = create_mock_region_wal_options();
@@ -1899,7 +1890,8 @@ mod tests {
        let table_metadata_manager = TableMetadataManager::new(mem_kv);
        let region_route = new_test_region_route();
        let region_routes = vec![region_route.clone()];
-        let table_info: RawTableInfo = new_test_table_info().into();
+        let table_info: RawTableInfo =
+            new_test_table_info(region_routes.iter().map(|r| r.region.id.region_number())).into();
        let table_id = table_info.ident.table_id;
        // creates metadata.
        create_physical_table_metadata(
@@ -1975,7 +1967,8 @@ mod tests {
        let table_metadata_manager = TableMetadataManager::new(mem_kv);
        let region_route = new_test_region_route();
        let region_routes = vec![region_route.clone()];
-        let table_info: RawTableInfo = new_test_table_info().into();
+        let table_info: RawTableInfo =
+            new_test_table_info(region_routes.iter().map(|r| r.region.id.region_number())).into();
        let table_id = table_info.ident.table_id;
        // creates metadata.
        create_physical_table_metadata(
@@ -2060,7 +2053,8 @@ mod tests {
                leader_down_since: None,
            },
        ];
-        let table_info: RawTableInfo = new_test_table_info().into();
+        let table_info: RawTableInfo =
+            new_test_table_info(region_routes.iter().map(|r| r.region.id.region_number())).into();
        let table_id = table_info.ident.table_id;
        let current_table_route_value = DeserializedValueWithBytes::from_inner(
            TableRouteValue::physical(region_routes.clone()),
@@ -2142,7 +2136,8 @@ mod tests {
        let table_metadata_manager = TableMetadataManager::new(mem_kv);
        let region_route = new_test_region_route();
        let region_routes = vec![region_route.clone()];
-        let table_info: RawTableInfo = new_test_table_info().into();
+        let table_info: RawTableInfo =
+            new_test_table_info(region_routes.iter().map(|r| r.region.id.region_number())).into();
        let table_id = table_info.ident.table_id;
        let engine = table_info.meta.engine.as_str();
        let region_storage_path =
@@ -2396,7 +2391,7 @@ mod tests {
        let mem_kv = Arc::new(MemoryKvBackend::default());
        let table_metadata_manager = TableMetadataManager::new(mem_kv);

-        let view_info: RawTableInfo = new_test_table_info().into();
+        let view_info: RawTableInfo = new_test_table_info(Vec::<u32>::new().into_iter()).into();

        let view_id = view_info.ident.table_id;

--- a/src/common/meta/src/key/table_info.rs
+++ b/src/common/meta/src/key/table_info.rs
@@ -338,6 +338,7 @@ mod tests {
            next_column_id: 3,
            value_indices: vec![2, 3],
            options: Default::default(),
+            region_numbers: vec![1],
            partition_key_indices: vec![],
            column_ids: vec![],
        };
--- a/src/common/meta/src/key/table_repart.rs
+++ b/src/common/meta/src/key/table_repart.rs
@@ -1,856 +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::collections::{BTreeMap, BTreeSet, HashMap};
-use std::fmt::Display;
-
-use serde::{Deserialize, Serialize};
-use snafu::{OptionExt as _, ResultExt, ensure};
-use store_api::storage::RegionId;
-use table::metadata::TableId;
-
-use crate::error::{InvalidMetadataSnafu, Result, SerdeJsonSnafu};
-use crate::key::txn_helper::TxnOpGetResponseSet;
-use crate::key::{
-    DeserializedValueWithBytes, MetadataKey, MetadataValue, TABLE_REPART_KEY_PATTERN,
-    TABLE_REPART_PREFIX,
-};
-use crate::kv_backend::KvBackendRef;
-use crate::kv_backend::txn::Txn;
-use crate::rpc::store::BatchGetRequest;
-
-/// The key stores table repartition metadata.
-/// Specifically, it records the relation between source and destination regions after a repartition operation is completed.
-/// This is distinct from the initial partitioning scheme of the table.
-/// For example, after repartition, a destination region may still hold files from a source region; this mapping should be updated once repartition is done.
-/// The GC scheduler uses this information to clean up those files (and removes this mapping if all files from the source region are cleaned).
-///
-/// The layout: `__table_repart/{table_id}`.
-#[derive(Debug, PartialEq)]
-pub struct TableRepartKey {
-    /// The unique identifier of the table whose re-partition information is stored in this key.
-    pub table_id: TableId,
-}
-
-impl TableRepartKey {
-    pub fn new(table_id: TableId) -> Self {
-        Self { table_id }
-    }
-
-    /// Returns the range prefix of the table repartition key.
-    pub fn range_prefix() -> Vec<u8> {
-        format!("{}/", TABLE_REPART_PREFIX).into_bytes()
-    }
-}
-
-impl MetadataKey<'_, TableRepartKey> for TableRepartKey {
-    fn to_bytes(&self) -> Vec<u8> {
-        self.to_string().into_bytes()
-    }
-
-    fn from_bytes(bytes: &[u8]) -> Result<TableRepartKey> {
-        let key = std::str::from_utf8(bytes).map_err(|e| {
-            InvalidMetadataSnafu {
-                err_msg: format!(
-                    "TableRepartKey '{}' is not a valid UTF8 string: {e}",
-                    String::from_utf8_lossy(bytes)
-                ),
-            }
-            .build()
-        })?;
-        let captures = TABLE_REPART_KEY_PATTERN
-            .captures(key)
-            .context(InvalidMetadataSnafu {
-                err_msg: format!("Invalid TableRepartKey '{key}'"),
-            })?;
-        // Safety: pass the regex check above
-        let table_id = captures[1].parse::<TableId>().unwrap();
-        Ok(TableRepartKey { table_id })
-    }
-}
-
-impl Display for TableRepartKey {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}/{}", TABLE_REPART_PREFIX, self.table_id)
-    }
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize, Clone, Default)]
-pub struct TableRepartValue {
-    /// A mapping from source region IDs to sets of destination region IDs after repartition.
-    ///
-    /// Each key in the map is a `RegionId` representing a source region that has been repartitioned.
-    /// The corresponding value is a `BTreeSet<RegionId>` containing the IDs of destination regions
-    /// that currently hold files originally from the source region. This mapping is updated after
-    /// repartition and is used by the GC scheduler to track and clean up files that have been moved.
-    pub src_to_dst: BTreeMap<RegionId, BTreeSet<RegionId>>,
-}
-
-impl TableRepartValue {
-    /// Creates a new TableRepartValue with an empty src_to_dst map.
-    pub fn new() -> Self {
-        Default::default()
-    }
-    /// Update mapping from src region to dst regions. Should be called once repartition is done.
-    ///
-    /// If `dst` is empty, this method does nothing.
-    pub fn update_mappings(&mut self, src: RegionId, dst: &[RegionId]) {
-        if dst.is_empty() {
-            return;
-        }
-        self.src_to_dst.entry(src).or_default().extend(dst);
-    }
-
-    /// Remove mappings from src region to dst regions. Should be called once files from src region are cleaned up in dst regions.
-    pub fn remove_mappings(&mut self, src: RegionId, dsts: &[RegionId]) {
-        if let Some(dst_set) = self.src_to_dst.get_mut(&src) {
-            for dst in dsts {
-                dst_set.remove(dst);
-            }
-            if dst_set.is_empty() {
-                self.src_to_dst.remove(&src);
-            }
-        }
-    }
-}
-
-impl MetadataValue for TableRepartValue {
-    fn try_from_raw_value(raw_value: &[u8]) -> Result<Self> {
-        serde_json::from_slice::<TableRepartValue>(raw_value).context(SerdeJsonSnafu)
-    }
-
-    fn try_as_raw_value(&self) -> Result<Vec<u8>> {
-        serde_json::to_vec(self).context(SerdeJsonSnafu)
-    }
-}
-
-pub type TableRepartValueDecodeResult =
-    Result<Option<DeserializedValueWithBytes<TableRepartValue>>>;
-
-pub struct TableRepartManager {
-    kv_backend: KvBackendRef,
-}
-
-impl TableRepartManager {
-    pub fn new(kv_backend: KvBackendRef) -> Self {
-        Self { kv_backend }
-    }
-
-    /// Builds a create table repart transaction,
-    /// it expected the `__table_repart/{table_id}` wasn't occupied.
-    pub fn build_create_txn(
-        &self,
-        table_id: TableId,
-        table_repart_value: &TableRepartValue,
-    ) -> Result<(
-        Txn,
-        impl FnOnce(&mut TxnOpGetResponseSet) -> TableRepartValueDecodeResult + use<>,
-    )> {
-        let key = TableRepartKey::new(table_id);
-        let raw_key = key.to_bytes();
-
-        let txn = Txn::put_if_not_exists(raw_key.clone(), table_repart_value.try_as_raw_value()?);
-
-        Ok((
-            txn,
-            TxnOpGetResponseSet::decode_with(TxnOpGetResponseSet::filter(raw_key)),
-        ))
-    }
-
-    /// Builds a update table repart transaction,
-    /// it expected the remote value equals the `current_table_repart_value`.
-    /// It retrieves the latest value if the comparing failed.
-    pub fn build_update_txn(
-        &self,
-        table_id: TableId,
-        current_table_repart_value: &DeserializedValueWithBytes<TableRepartValue>,
-        new_table_repart_value: &TableRepartValue,
-    ) -> Result<(
-        Txn,
-        impl FnOnce(&mut TxnOpGetResponseSet) -> TableRepartValueDecodeResult + use<>,
-    )> {
-        let key = TableRepartKey::new(table_id);
-        let raw_key = key.to_bytes();
-        let raw_value = current_table_repart_value.get_raw_bytes();
-        let new_raw_value: Vec<u8> = new_table_repart_value.try_as_raw_value()?;
-
-        let txn = Txn::compare_and_put(raw_key.clone(), raw_value, new_raw_value);
-
-        Ok((
-            txn,
-            TxnOpGetResponseSet::decode_with(TxnOpGetResponseSet::filter(raw_key)),
-        ))
-    }
-
-    /// Returns the [`TableRepartValue`].
-    pub async fn get(&self, table_id: TableId) -> Result<Option<TableRepartValue>> {
-        self.get_inner(table_id).await
-    }
-
-    async fn get_inner(&self, table_id: TableId) -> Result<Option<TableRepartValue>> {
-        let key = TableRepartKey::new(table_id);
-        self.kv_backend
-            .get(&key.to_bytes())
-            .await?
-            .map(|kv| TableRepartValue::try_from_raw_value(&kv.value))
-            .transpose()
-    }
-
-    /// Returns the [`TableRepartValue`] wrapped with [`DeserializedValueWithBytes`].
-    pub async fn get_with_raw_bytes(
-        &self,
-        table_id: TableId,
-    ) -> Result<Option<DeserializedValueWithBytes<TableRepartValue>>> {
-        self.get_with_raw_bytes_inner(table_id).await
-    }
-
-    async fn get_with_raw_bytes_inner(
-        &self,
-        table_id: TableId,
-    ) -> Result<Option<DeserializedValueWithBytes<TableRepartValue>>> {
-        let key = TableRepartKey::new(table_id);
-        self.kv_backend
-            .get(&key.to_bytes())
-            .await?
-            .map(|kv| DeserializedValueWithBytes::from_inner_slice(&kv.value))
-            .transpose()
-    }
-
-    /// Returns batch of [`TableRepartValue`] that respects the order of `table_ids`.
-    pub async fn batch_get(&self, table_ids: &[TableId]) -> Result<Vec<Option<TableRepartValue>>> {
-        let raw_table_reparts = self.batch_get_inner(table_ids).await?;
-
-        Ok(raw_table_reparts
-            .into_iter()
-            .map(|v| v.map(|x| x.inner))
-            .collect())
-    }
-
-    /// Returns batch of [`TableRepartValue`] wrapped with [`DeserializedValueWithBytes`].
-    pub async fn batch_get_with_raw_bytes(
-        &self,
-        table_ids: &[TableId],
-    ) -> Result<Vec<Option<DeserializedValueWithBytes<TableRepartValue>>>> {
-        self.batch_get_inner(table_ids).await
-    }
-
-    async fn batch_get_inner(
-        &self,
-        table_ids: &[TableId],
-    ) -> Result<Vec<Option<DeserializedValueWithBytes<TableRepartValue>>>> {
-        let keys = table_ids
-            .iter()
-            .map(|id| TableRepartKey::new(*id).to_bytes())
-            .collect::<Vec<_>>();
-        let resp = self
-            .kv_backend
-            .batch_get(BatchGetRequest { keys: keys.clone() })
-            .await?;
-
-        let kvs = resp
-            .kvs
-            .into_iter()
-            .map(|kv| (kv.key, kv.value))
-            .collect::<HashMap<_, _>>();
-        keys.into_iter()
-            .map(|key| {
-                if let Some(value) = kvs.get(&key) {
-                    Ok(Some(DeserializedValueWithBytes::from_inner_slice(value)?))
-                } else {
-                    Ok(None)
-                }
-            })
-            .collect()
-    }
-
-    /// Updates mappings from src region to dst regions.
-    /// Should be called once repartition is done.
-    pub async fn update_mappings(&self, src: RegionId, dst: &[RegionId]) -> Result<()> {
-        let table_id = src.table_id();
-
-        // Get current table repart with raw bytes for CAS operation
-        let current_table_repart = self
-            .get_with_raw_bytes(table_id)
-            .await?
-            .context(crate::error::TableRepartNotFoundSnafu { table_id })?;
-
-        // Clone the current repart value and update mappings
-        let mut new_table_repart_value = current_table_repart.inner.clone();
-        new_table_repart_value.update_mappings(src, dst);
-
-        // Execute atomic update
-        let (txn, _) =
-            self.build_update_txn(table_id, &current_table_repart, &new_table_repart_value)?;
-
-        let result = self.kv_backend.txn(txn).await?;
-
-        ensure!(
-            result.succeeded,
-            crate::error::MetadataCorruptionSnafu {
-                err_msg: format!(
-                    "Failed to update mappings for table {}: CAS operation failed",
-                    table_id
-                ),
-            }
-        );
-
-        Ok(())
-    }
-
-    /// Removes mappings from src region to dst regions.
-    /// Should be called once files from src region are cleaned up in dst regions.
-    pub async fn remove_mappings(&self, src: RegionId, dsts: &[RegionId]) -> Result<()> {
-        let table_id = src.table_id();
-
-        // Get current table repart with raw bytes for CAS operation
-        let current_table_repart = self
-            .get_with_raw_bytes(table_id)
-            .await?
-            .context(crate::error::TableRepartNotFoundSnafu { table_id })?;
-
-        // Clone the current repart value and remove mappings
-        let mut new_table_repart_value = current_table_repart.inner.clone();
-        new_table_repart_value.remove_mappings(src, dsts);
-
-        // Execute atomic update
-        let (txn, _) =
-            self.build_update_txn(table_id, &current_table_repart, &new_table_repart_value)?;
-
-        let result = self.kv_backend.txn(txn).await?;
-
-        ensure!(
-            result.succeeded,
-            crate::error::MetadataCorruptionSnafu {
-                err_msg: format!(
-                    "Failed to remove mappings for table {}: CAS operation failed",
-                    table_id
-                ),
-            }
-        );
-
-        Ok(())
-    }
-
-    /// Returns the destination regions for a given source region.
-    pub async fn get_dst_regions(
-        &self,
-        src_region: RegionId,
-    ) -> Result<Option<BTreeSet<RegionId>>> {
-        let table_id = src_region.table_id();
-        let table_repart = self.get(table_id).await?;
-        Ok(table_repart.and_then(|repart| repart.src_to_dst.get(&src_region).cloned()))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeMap;
-    use std::sync::Arc;
-
-    use super::*;
-    use crate::kv_backend::TxnService;
-    use crate::kv_backend::memory::MemoryKvBackend;
-
-    #[test]
-    fn test_table_repart_key_serialization() {
-        let key = TableRepartKey::new(42);
-        let raw_key = key.to_bytes();
-        assert_eq!(raw_key, b"__table_repart/42");
-    }
-
-    #[test]
-    fn test_table_repart_key_deserialization() {
-        let expected = TableRepartKey::new(42);
-        let key = TableRepartKey::from_bytes(b"__table_repart/42").unwrap();
-        assert_eq!(key, expected);
-    }
-
-    #[test]
-    fn test_table_repart_key_deserialization_invalid_utf8() {
-        let result = TableRepartKey::from_bytes(b"__table_repart/\xff");
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("not a valid UTF8 string")
-        );
-    }
-
-    #[test]
-    fn test_table_repart_key_deserialization_invalid_format() {
-        let result = TableRepartKey::from_bytes(b"invalid_key_format");
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("Invalid TableRepartKey")
-        );
-    }
-
-    #[test]
-    fn test_table_repart_value_serialization_deserialization() {
-        let mut src_to_dst = BTreeMap::new();
-        let src_region = RegionId::new(1, 1);
-        let dst_regions = vec![RegionId::new(1, 2), RegionId::new(1, 3)];
-        src_to_dst.insert(src_region, dst_regions.into_iter().collect());
-
-        let value = TableRepartValue { src_to_dst };
-        let serialized = value.try_as_raw_value().unwrap();
-        let deserialized = TableRepartValue::try_from_raw_value(&serialized).unwrap();
-
-        assert_eq!(value, deserialized);
-    }
-
-    #[test]
-    fn test_table_repart_value_update_mappings_new_src() {
-        let mut value = TableRepartValue {
-            src_to_dst: BTreeMap::new(),
-        };
-
-        let src = RegionId::new(1, 1);
-        let dst = vec![RegionId::new(1, 2), RegionId::new(1, 3)];
-
-        value.update_mappings(src, &dst);
-
-        assert_eq!(value.src_to_dst.len(), 1);
-        assert!(value.src_to_dst.contains_key(&src));
-        assert_eq!(value.src_to_dst.get(&src).unwrap().len(), 2);
-        assert!(
-            value
-                .src_to_dst
-                .get(&src)
-                .unwrap()
-                .contains(&RegionId::new(1, 2))
-        );
-        assert!(
-            value
-                .src_to_dst
-                .get(&src)
-                .unwrap()
-                .contains(&RegionId::new(1, 3))
-        );
-    }
-
-    #[test]
-    fn test_table_repart_value_update_mappings_existing_src() {
-        let mut value = TableRepartValue {
-            src_to_dst: BTreeMap::new(),
-        };
-
-        let src = RegionId::new(1, 1);
-        let initial_dst = vec![RegionId::new(1, 2)];
-        let additional_dst = vec![RegionId::new(1, 3), RegionId::new(1, 4)];
-
-        // Initial mapping
-        value.update_mappings(src, &initial_dst);
-        // Update with additional destinations
-        value.update_mappings(src, &additional_dst);
-
-        assert_eq!(value.src_to_dst.len(), 1);
-        assert_eq!(value.src_to_dst.get(&src).unwrap().len(), 3);
-        assert!(
-            value
-                .src_to_dst
-                .get(&src)
-                .unwrap()
-                .contains(&RegionId::new(1, 2))
-        );
-        assert!(
-            value
-                .src_to_dst
-                .get(&src)
-                .unwrap()
-                .contains(&RegionId::new(1, 3))
-        );
-        assert!(
-            value
-                .src_to_dst
-                .get(&src)
-                .unwrap()
-                .contains(&RegionId::new(1, 4))
-        );
-    }
-
-    #[test]
-    fn test_table_repart_value_remove_mappings_existing() {
-        let mut value = TableRepartValue {
-            src_to_dst: BTreeMap::new(),
-        };
-
-        let src = RegionId::new(1, 1);
-        let dst_regions = vec![
-            RegionId::new(1, 2),
-            RegionId::new(1, 3),
-            RegionId::new(1, 4),
-        ];
-        value.update_mappings(src, &dst_regions);
-
-        // Remove some mappings
-        let to_remove = vec![RegionId::new(1, 2), RegionId::new(1, 3)];
-        value.remove_mappings(src, &to_remove);
-
-        assert_eq!(value.src_to_dst.len(), 1);
-        assert_eq!(value.src_to_dst.get(&src).unwrap().len(), 1);
-        assert!(
-            value
-                .src_to_dst
-                .get(&src)
-                .unwrap()
-                .contains(&RegionId::new(1, 4))
-        );
-    }
-
-    #[test]
-    fn test_table_repart_value_remove_mappings_all() {
-        let mut value = TableRepartValue {
-            src_to_dst: BTreeMap::new(),
-        };
-
-        let src = RegionId::new(1, 1);
-        let dst_regions = vec![RegionId::new(1, 2), RegionId::new(1, 3)];
-        value.update_mappings(src, &dst_regions);
-
-        // Remove all mappings
-        value.remove_mappings(src, &dst_regions);
-
-        assert_eq!(value.src_to_dst.len(), 0);
-    }
-
-    #[test]
-    fn test_table_repart_value_remove_mappings_nonexistent() {
-        let mut value = TableRepartValue {
-            src_to_dst: BTreeMap::new(),
-        };
-
-        let src = RegionId::new(1, 1);
-        let dst_regions = vec![RegionId::new(1, 2)];
-        value.update_mappings(src, &dst_regions);
-
-        // Try to remove non-existent mappings
-        let nonexistent_dst = vec![RegionId::new(1, 3), RegionId::new(1, 4)];
-        value.remove_mappings(src, &nonexistent_dst);
-
-        // Should remain unchanged
-        assert_eq!(value.src_to_dst.len(), 1);
-        assert_eq!(value.src_to_dst.get(&src).unwrap().len(), 1);
-        assert!(
-            value
-                .src_to_dst
-                .get(&src)
-                .unwrap()
-                .contains(&RegionId::new(1, 2))
-        );
-    }
-
-    #[test]
-    fn test_table_repart_value_remove_mappings_nonexistent_src() {
-        let mut value = TableRepartValue {
-            src_to_dst: BTreeMap::new(),
-        };
-
-        let src = RegionId::new(1, 1);
-        let dst_regions = vec![RegionId::new(1, 2)];
-
-        // Try to remove mappings for non-existent source
-        value.remove_mappings(src, &dst_regions);
-
-        // Should remain empty
-        assert_eq!(value.src_to_dst.len(), 0);
-    }
-
-    #[tokio::test]
-    async fn test_table_repart_manager_get_empty() {
-        let kv = Arc::new(MemoryKvBackend::default());
-        let manager = TableRepartManager::new(kv);
-        let result = manager.get(1024).await.unwrap();
-        assert!(result.is_none());
-    }
-
-    #[tokio::test]
-    async fn test_table_repart_manager_get_with_raw_bytes_empty() {
-        let kv = Arc::new(MemoryKvBackend::default());
-        let manager = TableRepartManager::new(kv);
-        let result = manager.get_with_raw_bytes(1024).await.unwrap();
-        assert!(result.is_none());
-    }
-
-    #[tokio::test]
-    async fn test_table_repart_manager_create_and_get() {
-        let kv = Arc::new(MemoryKvBackend::default());
-        let manager = TableRepartManager::new(kv.clone());
-
-        let mut src_to_dst = BTreeMap::new();
-        let src_region = RegionId::new(1, 1);
-        let dst_regions = vec![RegionId::new(1, 2), RegionId::new(1, 3)];
-        src_to_dst.insert(src_region, dst_regions.into_iter().collect());
-
-        let value = TableRepartValue { src_to_dst };
-
-        // Create the table repart
-        let (txn, _) = manager.build_create_txn(1024, &value).unwrap();
-        let result = kv.txn(txn).await.unwrap();
-        assert!(result.succeeded);
-
-        // Get the table repart
-        let retrieved = manager.get(1024).await.unwrap().unwrap();
-        assert_eq!(retrieved, value);
-    }
-
-    #[tokio::test]
-    async fn test_table_repart_manager_update_txn() {
-        let kv = Arc::new(MemoryKvBackend::default());
-        let manager = TableRepartManager::new(kv.clone());
-
-        let initial_value = TableRepartValue {
-            src_to_dst: BTreeMap::new(),
-        };
-
-        // Create initial table repart
-        let (create_txn, _) = manager.build_create_txn(1024, &initial_value).unwrap();
-        let result = kv.txn(create_txn).await.unwrap();
-        assert!(result.succeeded);
-
-        // Get current value with raw bytes
-        let current_value = manager.get_with_raw_bytes(1024).await.unwrap().unwrap();
-
-        // Create updated value
-        let mut updated_src_to_dst = BTreeMap::new();
-        let src_region = RegionId::new(1, 1);
-        let dst_regions = vec![RegionId::new(1, 2)];
-        updated_src_to_dst.insert(src_region, dst_regions.into_iter().collect());
-        let updated_value = TableRepartValue {
-            src_to_dst: updated_src_to_dst,
-        };
-
-        // Build update transaction
-        let (update_txn, _) = manager
-            .build_update_txn(1024, &current_value, &updated_value)
-            .unwrap();
-        let result = kv.txn(update_txn).await.unwrap();
-        assert!(result.succeeded);
-
-        // Verify update
-        let retrieved = manager.get(1024).await.unwrap().unwrap();
-        assert_eq!(retrieved, updated_value);
-    }
-
-    #[tokio::test]
-    async fn test_table_repart_manager_batch_get() {
-        let kv = Arc::new(MemoryKvBackend::default());
-        let manager = TableRepartManager::new(kv.clone());
-
-        // Create multiple table reparts
-        let table_reparts = vec![
-            (
-                1024,
-                TableRepartValue {
-                    src_to_dst: {
-                        let mut map = BTreeMap::new();
-                        map.insert(
-                            RegionId::new(1, 1),
-                            vec![RegionId::new(1, 2)].into_iter().collect(),
-                        );
-                        map
-                    },
-                },
-            ),
-            (
-                1025,
-                TableRepartValue {
-                    src_to_dst: {
-                        let mut map = BTreeMap::new();
-                        map.insert(
-                            RegionId::new(2, 1),
-                            vec![RegionId::new(2, 2), RegionId::new(2, 3)]
-                                .into_iter()
-                                .collect(),
-                        );
-                        map
-                    },
-                },
-            ),
-        ];
-
-        for (table_id, value) in &table_reparts {
-            let (txn, _) = manager.build_create_txn(*table_id, value).unwrap();
-            let result = kv.txn(txn).await.unwrap();
-            assert!(result.succeeded);
-        }
-
-        // Batch get
-        let results = manager.batch_get(&[1024, 1025, 1026]).await.unwrap();
-        assert_eq!(results.len(), 3);
-        assert_eq!(results[0].as_ref().unwrap(), &table_reparts[0].1);
-        assert_eq!(results[1].as_ref().unwrap(), &table_reparts[1].1);
-        assert!(results[2].is_none());
-    }
-
-    #[tokio::test]
-    async fn test_table_repart_manager_update_mappings() {
-        let kv = Arc::new(MemoryKvBackend::default());
-        let manager = TableRepartManager::new(kv.clone());
-
-        // Create initial table repart
-        let initial_value = TableRepartValue {
-            src_to_dst: BTreeMap::new(),
-        };
-        let (txn, _) = manager.build_create_txn(1024, &initial_value).unwrap();
-        let result = kv.txn(txn).await.unwrap();
-        assert!(result.succeeded);
-
-        // Update mappings
-        let src = RegionId::new(1024, 1);
-        let dst = vec![RegionId::new(1024, 2), RegionId::new(1024, 3)];
-        manager.update_mappings(src, &dst).await.unwrap();
-
-        // Verify update
-        let retrieved = manager.get(1024).await.unwrap().unwrap();
-        assert_eq!(retrieved.src_to_dst.len(), 1);
-        assert!(retrieved.src_to_dst.contains_key(&src));
-        assert_eq!(retrieved.src_to_dst.get(&src).unwrap().len(), 2);
-    }
-
-    #[tokio::test]
-    async fn test_table_repart_manager_remove_mappings() {
-        let kv = Arc::new(MemoryKvBackend::default());
-        let manager = TableRepartManager::new(kv.clone());
-
-        // Create initial table repart with mappings
-        let mut initial_src_to_dst = BTreeMap::new();
-        let src = RegionId::new(1024, 1);
-        let dst_regions = vec![
-            RegionId::new(1024, 2),
-            RegionId::new(1024, 3),
-            RegionId::new(1024, 4),
-        ];
-        initial_src_to_dst.insert(src, dst_regions.into_iter().collect());
-
-        let initial_value = TableRepartValue {
-            src_to_dst: initial_src_to_dst,
-        };
-        let (txn, _) = manager.build_create_txn(1024, &initial_value).unwrap();
-        let result = kv.txn(txn).await.unwrap();
-        assert!(result.succeeded);
-
-        // Remove some mappings
-        let to_remove = vec![RegionId::new(1024, 2), RegionId::new(1024, 3)];
-        manager.remove_mappings(src, &to_remove).await.unwrap();
-
-        // Verify removal
-        let retrieved = manager.get(1024).await.unwrap().unwrap();
-        assert_eq!(retrieved.src_to_dst.len(), 1);
-        assert_eq!(retrieved.src_to_dst.get(&src).unwrap().len(), 1);
-        assert!(
-            retrieved
-                .src_to_dst
-                .get(&src)
-                .unwrap()
-                .contains(&RegionId::new(1024, 4))
-        );
-    }
-
-    #[tokio::test]
-    async fn test_table_repart_manager_get_dst_regions() {
-        let kv = Arc::new(MemoryKvBackend::default());
-        let manager = TableRepartManager::new(kv.clone());
-
-        // Create initial table repart with mappings
-        let mut initial_src_to_dst = BTreeMap::new();
-        let src = RegionId::new(1024, 1);
-        let dst_regions = vec![RegionId::new(1024, 2), RegionId::new(1024, 3)];
-        initial_src_to_dst.insert(src, dst_regions.into_iter().collect());
-
-        let initial_value = TableRepartValue {
-            src_to_dst: initial_src_to_dst,
-        };
-        let (txn, _) = manager.build_create_txn(1024, &initial_value).unwrap();
-        let result = kv.txn(txn).await.unwrap();
-        assert!(result.succeeded);
-
-        // Get destination regions
-        let dst_regions = manager.get_dst_regions(src).await.unwrap();
-        assert!(dst_regions.is_some());
-        let dst_set = dst_regions.unwrap();
-        assert_eq!(dst_set.len(), 2);
-        assert!(dst_set.contains(&RegionId::new(1024, 2)));
-        assert!(dst_set.contains(&RegionId::new(1024, 3)));
-
-        // Test non-existent source region
-        let nonexistent_src = RegionId::new(1024, 99);
-        let result = manager.get_dst_regions(nonexistent_src).await.unwrap();
-        assert!(result.is_none());
-    }
-
-    #[tokio::test]
-    async fn test_table_repart_manager_operations_on_nonexistent_table() {
-        let kv = Arc::new(MemoryKvBackend::default());
-        let manager = TableRepartManager::new(kv);
-
-        let src = RegionId::new(1024, 1);
-        let dst = vec![RegionId::new(1024, 2)];
-
-        // Try to update mappings on non-existent table
-        let result = manager.update_mappings(src, &dst).await;
-        assert!(result.is_err());
-        let err_msg = result.unwrap_err().to_string();
-        assert!(
-            err_msg.contains("Failed to find table repartition metadata for table id 1024"),
-            "{err_msg}"
-        );
-
-        // Try to remove mappings on non-existent table
-        let result = manager.remove_mappings(src, &dst).await;
-        assert!(result.is_err());
-        let err_msg = result.unwrap_err().to_string();
-        assert!(
-            err_msg.contains("Failed to find table repartition metadata for table id 1024"),
-            "{err_msg}"
-        );
-    }
-
-    #[tokio::test]
-    async fn test_table_repart_manager_batch_get_with_raw_bytes() {
-        let kv = Arc::new(MemoryKvBackend::default());
-        let manager = TableRepartManager::new(kv.clone());
-
-        // Create table repart
-        let value = TableRepartValue {
-            src_to_dst: {
-                let mut map = BTreeMap::new();
-                map.insert(
-                    RegionId::new(1, 1),
-                    vec![RegionId::new(1, 2)].into_iter().collect(),
-                );
-                map
-            },
-        };
-        let (txn, _) = manager.build_create_txn(1024, &value).unwrap();
-        let result = kv.txn(txn).await.unwrap();
-        assert!(result.succeeded);
-
-        // Batch get with raw bytes
-        let results = manager
-            .batch_get_with_raw_bytes(&[1024, 1025])
-            .await
-            .unwrap();
-        assert_eq!(results.len(), 2);
-        assert!(results[0].is_some());
-        assert!(results[1].is_none());
-
-        let retrieved = &results[0].as_ref().unwrap().inner;
-        assert_eq!(retrieved, &value);
-    }
-}
--- a/src/common/meta/src/key/table_route.rs
+++ b/src/common/meta/src/key/table_route.rs
@@ -16,7 +16,7 @@ use std::collections::{HashMap, HashSet};
 use std::fmt::Display;
 use std::sync::Arc;

-use serde::{Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt, ensure};
 use store_api::storage::{RegionId, RegionNumber};
 use table::metadata::TableId;
@@ -62,54 +62,16 @@ pub enum TableRouteValue {
    Logical(LogicalTableRouteValue),
 }

-#[derive(Debug, PartialEq, Serialize, Clone, Default)]
+#[derive(Debug, PartialEq, Serialize, Deserialize, Clone, Default)]
 pub struct PhysicalTableRouteValue {
-    // The region routes of the table.
    pub region_routes: Vec<RegionRoute>,
-    // Tracks the highest region number ever allocated for the table.
-    // This value only increases: adding a region updates it if needed,
-    // and dropping regions does not decrease it.
-    pub max_region_number: RegionNumber,
-    // The version of the table route.
    version: u64,
 }

-impl<'de> Deserialize<'de> for PhysicalTableRouteValue {
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        struct Helper {
-            region_routes: Vec<RegionRoute>,
-            #[serde(default)]
-            max_region_number: Option<RegionNumber>,
-            version: u64,
-        }
-
-        let mut helper = Helper::deserialize(deserializer)?;
-        // If the max region number is not provided, we will calculate it from the region routes.
-        if helper.max_region_number.is_none() {
-            let max_region = helper
-                .region_routes
-                .iter()
-                .map(|r| r.region.id.region_number())
-                .max()
-                .unwrap_or_default();
-            helper.max_region_number = Some(max_region);
-        }
-
-        Ok(PhysicalTableRouteValue {
-            region_routes: helper.region_routes,
-            max_region_number: helper.max_region_number.unwrap_or_default(),
-            version: helper.version,
-        })
-    }
-}
-
 #[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
 pub struct LogicalTableRouteValue {
    physical_table_id: TableId,
+    region_ids: Vec<RegionId>,
 }

 impl TableRouteValue {
@@ -123,7 +85,14 @@ impl TableRouteValue {
        if table_id == physical_table_id {
            TableRouteValue::physical(region_routes)
        } else {
-            TableRouteValue::logical(physical_table_id)
+            let region_routes = region_routes
+                .into_iter()
+                .map(|region| {
+                    debug_assert_eq!(region.region.id.table_id(), physical_table_id);
+                    RegionId::new(table_id, region.region.id.region_number())
+                })
+                .collect();
+            TableRouteValue::logical(physical_table_id, region_routes)
        }
    }

@@ -131,8 +100,8 @@ impl TableRouteValue {
        Self::Physical(PhysicalTableRouteValue::new(region_routes))
    }

-    pub fn logical(physical_table_id: TableId) -> Self {
-        Self::Logical(LogicalTableRouteValue::new(physical_table_id))
+    pub fn logical(physical_table_id: TableId, region_ids: Vec<RegionId>) -> Self {
+        Self::Logical(LogicalTableRouteValue::new(physical_table_id, region_ids))
    }

    /// Returns a new version [TableRouteValue] with `region_routes`.
@@ -143,19 +112,9 @@ impl TableRouteValue {
                err_msg: format!("{self:?} is a non-physical TableRouteValue."),
            }
        );
-        let physical_table_route = self.as_physical_table_route_ref();
-        let original_max_region_number = physical_table_route.max_region_number;
-        let new_max_region_number = region_routes
-            .iter()
-            .map(|r| r.region.id.region_number())
-            .max()
-            .unwrap_or_default();
-        let version = physical_table_route.version;
+        let version = self.as_physical_table_route_ref().version;
        Ok(Self::Physical(PhysicalTableRouteValue {
            region_routes,
-            // If region routes are added, we will update the max region number.
-            // If region routes are removed, we will keep the original max region number.
-            max_region_number: original_max_region_number.max(new_max_region_number),
            version: version + 1,
        }))
    }
@@ -208,20 +167,6 @@ impl TableRouteValue {
        Ok(&self.as_physical_table_route_ref().region_routes)
    }

-    /// Returns the max region number of this [TableRouteValue::Physical].
-    ///
-    /// # Panic
-    /// If it is not the [`PhysicalTableRouteValue`].
-    pub fn max_region_number(&self) -> Result<RegionNumber> {
-        ensure!(
-            self.is_physical(),
-            UnexpectedLogicalRouteTableSnafu {
-                err_msg: format!("{self:?} is a non-physical TableRouteValue."),
-            }
-        );
-        Ok(self.as_physical_table_route_ref().max_region_number)
-    }
-
    /// Returns the reference of [`PhysicalTableRouteValue`].
    ///
    /// # Panic
@@ -262,9 +207,11 @@ impl TableRouteValue {
                .iter()
                .map(|region_route| region_route.region.id.region_number())
                .collect(),
-            TableRouteValue::Logical(_) => {
-                vec![]
-            }
+            TableRouteValue::Logical(x) => x
+                .region_ids()
+                .iter()
+                .map(|region_id| region_id.region_number())
+                .collect(),
        }
    }
 }
@@ -290,27 +237,28 @@ impl MetadataValue for TableRouteValue {

 impl PhysicalTableRouteValue {
    pub fn new(region_routes: Vec<RegionRoute>) -> Self {
-        let max_region_number = region_routes
-            .iter()
-            .map(|r| r.region.id.region_number())
-            .max()
-            .unwrap_or_default();
        Self {
            region_routes,
-            max_region_number,
            version: 0,
        }
    }
 }

 impl LogicalTableRouteValue {
-    pub fn new(physical_table_id: TableId) -> Self {
-        Self { physical_table_id }
+    pub fn new(physical_table_id: TableId, region_ids: Vec<RegionId>) -> Self {
+        Self {
+            physical_table_id,
+            region_ids,
+        }
    }

    pub fn physical_table_id(&self) -> TableId {
        self.physical_table_id
    }
+
+    pub fn region_ids(&self) -> &Vec<RegionId> {
+        &self.region_ids
+    }
 }

 impl MetadataKey<'_, TableRouteKey> for TableRouteKey {
@@ -875,57 +823,6 @@ mod tests {
    use crate::rpc::router::Region;
    use crate::rpc::store::PutRequest;

-    #[test]
-    fn test_update_table_route_max_region_number() {
-        let table_route = PhysicalTableRouteValue::new(vec![
-            RegionRoute {
-                region: Region {
-                    id: RegionId::new(0, 1),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            RegionRoute {
-                region: Region {
-                    id: RegionId::new(0, 2),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-        ]);
-        assert_eq!(table_route.max_region_number, 2);
-
-        // Shouldn't change the max region number.
-        let new_table_route = TableRouteValue::Physical(table_route)
-            .update(vec![RegionRoute {
-                region: Region {
-                    id: RegionId::new(0, 1),
-                    ..Default::default()
-                },
-                ..Default::default()
-            }])
-            .unwrap();
-        assert_eq!(
-            new_table_route
-                .as_physical_table_route_ref()
-                .max_region_number,
-            2
-        );
-
-        // Should increase the max region number.
-        let new_table_route = new_table_route
-            .update(vec![RegionRoute {
-                region: Region {
-                    id: RegionId::new(0, 3),
-                    ..Default::default()
-                },
-                ..Default::default()
-            }])
-            .unwrap()
-            .into_physical_table_route();
-        assert_eq!(new_table_route.max_region_number, 3);
-    }
-
    #[test]
    fn test_table_route_compatibility() {
        let old_raw_v = r#"{"region_routes":[{"region":{"id":1,"name":"r1","partition":null,"attrs":{}},"leader_peer":{"id":2,"addr":"a2"},"follower_peers":[]},{"region":{"id":1,"name":"r1","partition":null,"attrs":{}},"leader_peer":{"id":2,"addr":"a2"},"follower_peers":[]}],"version":0}"#;
@@ -966,7 +863,6 @@ mod tests {
                    leader_down_since: None,
                },
            ],
-            max_region_number: 1,
            version: 0,
        });

@@ -1004,6 +900,7 @@ mod tests {
        let table_route_manager = TableRouteManager::new(kv.clone());
        let table_route_value = TableRouteValue::Logical(LogicalTableRouteValue {
            physical_table_id: 1023,
+            region_ids: vec![RegionId::new(1023, 1)],
        });
        let (txn, _) = table_route_manager
            .table_route_storage()
@@ -1033,12 +930,14 @@ mod tests {
                1024,
                TableRouteValue::Logical(LogicalTableRouteValue {
                    physical_table_id: 1023,
+                    region_ids: vec![RegionId::new(1023, 1)],
                }),
            ),
            (
                1025,
                TableRouteValue::Logical(LogicalTableRouteValue {
                    physical_table_id: 1023,
+                    region_ids: vec![RegionId::new(1023, 2)],
                }),
            ),
        ];
@@ -1077,7 +976,6 @@ mod tests {
                }],
                ..Default::default()
            }],
-            max_region_number: 0,
            version: 0,
        });

--- a/src/common/meta/src/key/test_utils.rs
+++ b/src/common/meta/src/key/test_utils.rs
@@ -19,7 +19,11 @@ use datatypes::schema::{ColumnSchema, SchemaBuilder};
 use store_api::storage::TableId;
 use table::metadata::{TableInfo, TableInfoBuilder, TableMetaBuilder};

-pub fn new_test_table_info_with_name(table_id: TableId, table_name: &str) -> TableInfo {
+pub fn new_test_table_info_with_name<I: IntoIterator<Item = u32>>(
+    table_id: TableId,
+    table_name: &str,
+    region_numbers: I,
+) -> TableInfo {
    let column_schemas = vec![
        ColumnSchema::new("col1", ConcreteDataType::int32_datatype(), true),
        ColumnSchema::new(
@@ -41,6 +45,7 @@ pub fn new_test_table_info_with_name(table_id: TableId, table_name: &str) -> Tab
        .primary_key_indices(vec![0])
        .engine("engine")
        .next_column_id(3)
+        .region_numbers(region_numbers.into_iter().collect::<Vec<_>>())
        .build()
        .unwrap();
    TableInfoBuilder::default()
@@ -51,6 +56,9 @@ pub fn new_test_table_info_with_name(table_id: TableId, table_name: &str) -> Tab
        .build()
        .unwrap()
 }
-pub fn new_test_table_info(table_id: TableId) -> TableInfo {
-    new_test_table_info_with_name(table_id, "mytable")
+pub fn new_test_table_info<I: IntoIterator<Item = u32>>(
+    table_id: TableId,
+    region_numbers: I,
+) -> TableInfo {
+    new_test_table_info_with_name(table_id, "mytable", region_numbers)
 }
--- a/src/common/meta/src/kv_backend/rds/mysql.rs
+++ b/src/common/meta/src/kv_backend/rds/mysql.rs
@@ -613,7 +613,7 @@ mod tests {
    #[tokio::test]
    async fn test_mysql_put() {
        maybe_skip_mysql_integration_test!();
-        let kv_backend = build_mysql_kv_backend("put-test").await.unwrap();
+        let kv_backend = build_mysql_kv_backend("put_test").await.unwrap();
        let prefix = b"put/";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_kv_put_with_prefix(&kv_backend, prefix.to_vec()).await;
@@ -623,7 +623,7 @@ mod tests {
    #[tokio::test]
    async fn test_mysql_range() {
        maybe_skip_mysql_integration_test!();
-        let kv_backend = build_mysql_kv_backend("range-test").await.unwrap();
+        let kv_backend = build_mysql_kv_backend("range_test").await.unwrap();
        let prefix = b"range/";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_kv_range_with_prefix(&kv_backend, prefix.to_vec()).await;
@@ -633,7 +633,7 @@ mod tests {
    #[tokio::test]
    async fn test_mysql_range_2() {
        maybe_skip_mysql_integration_test!();
-        let kv_backend = build_mysql_kv_backend("range2-test").await.unwrap();
+        let kv_backend = build_mysql_kv_backend("range2_test").await.unwrap();
        let prefix = b"range2/";
        test_kv_range_2_with_prefix(&kv_backend, prefix.to_vec()).await;
        unprepare_kv(&kv_backend, prefix).await;
@@ -642,7 +642,7 @@ mod tests {
    #[tokio::test]
    async fn test_mysql_all_range() {
        maybe_skip_mysql_integration_test!();
-        let kv_backend = build_mysql_kv_backend("simple_range-test").await.unwrap();
+        let kv_backend = build_mysql_kv_backend("simple_range_test").await.unwrap();
        let prefix = b"";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_simple_kv_range(&kv_backend).await;
@@ -652,7 +652,7 @@ mod tests {
    #[tokio::test]
    async fn test_mysql_batch_get() {
        maybe_skip_mysql_integration_test!();
-        let kv_backend = build_mysql_kv_backend("batch_get-test").await.unwrap();
+        let kv_backend = build_mysql_kv_backend("batch_get_test").await.unwrap();
        let prefix = b"batch_get/";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_kv_batch_get_with_prefix(&kv_backend, prefix.to_vec()).await;
@@ -662,7 +662,7 @@ mod tests {
    #[tokio::test]
    async fn test_mysql_batch_delete() {
        maybe_skip_mysql_integration_test!();
-        let kv_backend = build_mysql_kv_backend("batch_delete-test").await.unwrap();
+        let kv_backend = build_mysql_kv_backend("batch_delete_test").await.unwrap();
        let prefix = b"batch_delete/";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_kv_delete_range_with_prefix(&kv_backend, prefix.to_vec()).await;
@@ -672,7 +672,7 @@ mod tests {
    #[tokio::test]
    async fn test_mysql_batch_delete_with_prefix() {
        maybe_skip_mysql_integration_test!();
-        let kv_backend = build_mysql_kv_backend("batch_delete_with_prefix-test")
+        let kv_backend = build_mysql_kv_backend("batch_delete_with_prefix_test")
            .await
            .unwrap();
        let prefix = b"batch_delete/";
@@ -684,7 +684,7 @@ mod tests {
    #[tokio::test]
    async fn test_mysql_delete_range() {
        maybe_skip_mysql_integration_test!();
-        let kv_backend = build_mysql_kv_backend("delete_range-test").await.unwrap();
+        let kv_backend = build_mysql_kv_backend("delete_range_test").await.unwrap();
        let prefix = b"delete_range/";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_kv_delete_range_with_prefix(&kv_backend, prefix.to_vec()).await;
@@ -694,7 +694,7 @@ mod tests {
    #[tokio::test]
    async fn test_mysql_compare_and_put() {
        maybe_skip_mysql_integration_test!();
-        let kv_backend = build_mysql_kv_backend("compare_and_put-test")
+        let kv_backend = build_mysql_kv_backend("compare_and_put_test")
            .await
            .unwrap();
        let prefix = b"compare_and_put/";
@@ -705,7 +705,7 @@ mod tests {
    #[tokio::test]
    async fn test_mysql_txn() {
        maybe_skip_mysql_integration_test!();
-        let kv_backend = build_mysql_kv_backend("txn-test").await.unwrap();
+        let kv_backend = build_mysql_kv_backend("txn_test").await.unwrap();
        test_txn_one_compare_op(&kv_backend).await;
        text_txn_multi_compare_op(&kv_backend).await;
        test_txn_compare_equal(&kv_backend).await;
--- a/src/common/meta/src/kv_backend/rds/postgres.rs
+++ b/src/common/meta/src/kv_backend/rds/postgres.rs
@@ -848,7 +848,7 @@ impl PgStore {
                .context(CreatePostgresPoolSnafu)?,
        };

-        Self::with_pg_pool(pool, None, table_name, max_txn_ops, false).await
+        Self::with_pg_pool(pool, None, table_name, max_txn_ops).await
    }

    /// Create [PgStore] impl of [KvBackendRef] from url (backward compatibility).
@@ -862,37 +862,20 @@ impl PgStore {
        schema_name: Option<&str>,
        table_name: &str,
        max_txn_ops: usize,
-        auto_create_schema: bool,
    ) -> Result<KvBackendRef> {
        // Ensure the postgres metadata backend is ready to use.
        let client = match pool.get().await {
            Ok(client) => client,
            Err(e) => {
-                // We need to log the debug for the error to help diagnose the issue.
-                common_telemetry::error!(e; "Failed to get Postgres connection.");
                return GetPostgresConnectionSnafu {
                    reason: e.to_string(),
                }
                .fail();
            }
        };
-
-        // Automatically create schema if enabled and schema_name is provided.
-        if auto_create_schema
-            && let Some(schema) = schema_name
-            && !schema.is_empty()
-        {
-            let create_schema_sql = format!("CREATE SCHEMA IF NOT EXISTS \"{}\"", schema);
-            client
-                .execute(&create_schema_sql, &[])
-                .await
-                .with_context(|_| PostgresExecutionSnafu {
-                    sql: create_schema_sql.clone(),
-                })?;
-        }
-
        let template_factory = PgSqlTemplateFactory::new(schema_name, table_name);
        let sql_template_set = template_factory.build();
+        // Do not attempt to create schema implicitly.
        client
            .execute(&sql_template_set.create_table_statement, &[])
            .await
@@ -976,7 +959,7 @@ mod tests {
        let Some(pool) = build_pg15_pool().await else {
            return;
        };
-        let res = PgStore::with_pg_pool(pool, None, "pg15_public_should_fail", 128, false).await;
+        let res = PgStore::with_pg_pool(pool, None, "pg15_public_should_fail", 128).await;
        assert!(
            res.is_err(),
            "creating table in public should fail for test_user"
@@ -1105,7 +1088,7 @@ mod tests {
    #[tokio::test]
    async fn test_pg_put() {
        maybe_skip_postgres_integration_test!();
-        let kv_backend = build_pg_kv_backend("put-test").await.unwrap();
+        let kv_backend = build_pg_kv_backend("put_test").await.unwrap();
        let prefix = b"put/";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_kv_put_with_prefix(&kv_backend, prefix.to_vec()).await;
@@ -1115,7 +1098,7 @@ mod tests {
    #[tokio::test]
    async fn test_pg_range() {
        maybe_skip_postgres_integration_test!();
-        let kv_backend = build_pg_kv_backend("range-test").await.unwrap();
+        let kv_backend = build_pg_kv_backend("range_test").await.unwrap();
        let prefix = b"range/";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_kv_range_with_prefix(&kv_backend, prefix.to_vec()).await;
@@ -1125,7 +1108,7 @@ mod tests {
    #[tokio::test]
    async fn test_pg_range_2() {
        maybe_skip_postgres_integration_test!();
-        let kv_backend = build_pg_kv_backend("range2-test").await.unwrap();
+        let kv_backend = build_pg_kv_backend("range2_test").await.unwrap();
        let prefix = b"range2/";
        test_kv_range_2_with_prefix(&kv_backend, prefix.to_vec()).await;
        unprepare_kv(&kv_backend, prefix).await;
@@ -1134,7 +1117,7 @@ mod tests {
    #[tokio::test]
    async fn test_pg_all_range() {
        maybe_skip_postgres_integration_test!();
-        let kv_backend = build_pg_kv_backend("simple_range-test").await.unwrap();
+        let kv_backend = build_pg_kv_backend("simple_range_test").await.unwrap();
        let prefix = b"";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_simple_kv_range(&kv_backend).await;
@@ -1144,7 +1127,7 @@ mod tests {
    #[tokio::test]
    async fn test_pg_batch_get() {
        maybe_skip_postgres_integration_test!();
-        let kv_backend = build_pg_kv_backend("batch_get-test").await.unwrap();
+        let kv_backend = build_pg_kv_backend("batch_get_test").await.unwrap();
        let prefix = b"batch_get/";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_kv_batch_get_with_prefix(&kv_backend, prefix.to_vec()).await;
@@ -1154,7 +1137,7 @@ mod tests {
    #[tokio::test]
    async fn test_pg_batch_delete() {
        maybe_skip_postgres_integration_test!();
-        let kv_backend = build_pg_kv_backend("batch_delete-test").await.unwrap();
+        let kv_backend = build_pg_kv_backend("batch_delete_test").await.unwrap();
        let prefix = b"batch_delete/";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_kv_delete_range_with_prefix(&kv_backend, prefix.to_vec()).await;
@@ -1164,7 +1147,7 @@ mod tests {
    #[tokio::test]
    async fn test_pg_batch_delete_with_prefix() {
        maybe_skip_postgres_integration_test!();
-        let kv_backend = build_pg_kv_backend("batch_delete_with_prefix-test")
+        let kv_backend = build_pg_kv_backend("batch_delete_with_prefix_test")
            .await
            .unwrap();
        let prefix = b"batch_delete/";
@@ -1176,7 +1159,7 @@ mod tests {
    #[tokio::test]
    async fn test_pg_delete_range() {
        maybe_skip_postgres_integration_test!();
-        let kv_backend = build_pg_kv_backend("delete_range-test").await.unwrap();
+        let kv_backend = build_pg_kv_backend("delete_range_test").await.unwrap();
        let prefix = b"delete_range/";
        prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
        test_kv_delete_range_with_prefix(&kv_backend, prefix.to_vec()).await;
@@ -1186,7 +1169,7 @@ mod tests {
    #[tokio::test]
    async fn test_pg_compare_and_put() {
        maybe_skip_postgres_integration_test!();
-        let kv_backend = build_pg_kv_backend("compare_and_put-test").await.unwrap();
+        let kv_backend = build_pg_kv_backend("compare_and_put_test").await.unwrap();
        let prefix = b"compare_and_put/";
        let kv_backend = Arc::new(kv_backend);
        test_kv_compare_and_put_with_prefix(kv_backend.clone(), prefix.to_vec()).await;
@@ -1195,7 +1178,7 @@ mod tests {
    #[tokio::test]
    async fn test_pg_txn() {
        maybe_skip_postgres_integration_test!();
-        let kv_backend = build_pg_kv_backend("txn-test").await.unwrap();
+        let kv_backend = build_pg_kv_backend("txn_test").await.unwrap();
        test_txn_one_compare_op(&kv_backend).await;
        text_txn_multi_compare_op(&kv_backend).await;
        test_txn_compare_equal(&kv_backend).await;
@@ -1231,249 +1214,4 @@ mod tests {
        let t = PgSqlTemplateFactory::format_table_ident(Some(""), "test_table");
        assert_eq!(t, "\"test_table\"");
    }
-
-    #[tokio::test]
-    async fn test_auto_create_schema_enabled() {
-        common_telemetry::init_default_ut_logging();
-        maybe_skip_postgres_integration_test!();
-        let endpoints = std::env::var("GT_POSTGRES_ENDPOINTS").unwrap();
-        let mut cfg = Config::new();
-        cfg.url = Some(endpoints);
-        let pool = cfg
-            .create_pool(Some(Runtime::Tokio1), NoTls)
-            .context(CreatePostgresPoolSnafu)
-            .unwrap();
-
-        let schema_name = "test_auto_create_enabled";
-        let table_name = "test_table";
-
-        // Drop the schema if it exists to start clean
-        let client = pool.get().await.unwrap();
-        let _ = client
-            .execute(
-                &format!("DROP SCHEMA IF EXISTS \"{}\" CASCADE", schema_name),
-                &[],
-            )
-            .await;
-
-        // Create store with auto_create_schema enabled
-        let _ = PgStore::with_pg_pool(pool.clone(), Some(schema_name), table_name, 128, true)
-            .await
-            .unwrap();
-
-        // Verify schema was created
-        let row = client
-            .query_one(
-                "SELECT schema_name FROM information_schema.schemata WHERE schema_name = $1",
-                &[&schema_name],
-            )
-            .await
-            .unwrap();
-        let created_schema: String = row.get(0);
-        assert_eq!(created_schema, schema_name);
-
-        // Verify table was created in the schema
-        let row = client
-            .query_one(
-                "SELECT table_schema, table_name FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2",
-                &[&schema_name, &table_name],
-            )
-            .await
-            .unwrap();
-        let created_table_schema: String = row.get(0);
-        let created_table_name: String = row.get(1);
-        assert_eq!(created_table_schema, schema_name);
-        assert_eq!(created_table_name, table_name);
-
-        // Cleanup
-        let _ = client
-            .execute(
-                &format!("DROP SCHEMA IF EXISTS \"{}\" CASCADE", schema_name),
-                &[],
-            )
-            .await;
-    }
-
-    #[tokio::test]
-    async fn test_auto_create_schema_disabled() {
-        common_telemetry::init_default_ut_logging();
-        maybe_skip_postgres_integration_test!();
-        let endpoints = std::env::var("GT_POSTGRES_ENDPOINTS").unwrap();
-        let mut cfg = Config::new();
-        cfg.url = Some(endpoints);
-        let pool = cfg
-            .create_pool(Some(Runtime::Tokio1), NoTls)
-            .context(CreatePostgresPoolSnafu)
-            .unwrap();
-
-        let schema_name = "test_auto_create_disabled";
-        let table_name = "test_table";
-
-        // Drop the schema if it exists to start clean
-        let client = pool.get().await.unwrap();
-        let _ = client
-            .execute(
-                &format!("DROP SCHEMA IF EXISTS \"{}\" CASCADE", schema_name),
-                &[],
-            )
-            .await;
-
-        // Try to create store with auto_create_schema disabled (should fail)
-        let result =
-            PgStore::with_pg_pool(pool.clone(), Some(schema_name), table_name, 128, false).await;
-
-        // Verify it failed because schema doesn't exist
-        assert!(
-            result.is_err(),
-            "Expected error when schema doesn't exist and auto_create_schema is disabled"
-        );
-    }
-
-    #[tokio::test]
-    async fn test_auto_create_schema_already_exists() {
-        common_telemetry::init_default_ut_logging();
-        maybe_skip_postgres_integration_test!();
-        let endpoints = std::env::var("GT_POSTGRES_ENDPOINTS").unwrap();
-        let mut cfg = Config::new();
-        cfg.url = Some(endpoints);
-        let pool = cfg
-            .create_pool(Some(Runtime::Tokio1), NoTls)
-            .context(CreatePostgresPoolSnafu)
-            .unwrap();
-
-        let schema_name = "test_auto_create_existing";
-        let table_name = "test_table";
-
-        // Manually create the schema first
-        let client = pool.get().await.unwrap();
-        let _ = client
-            .execute(
-                &format!("DROP SCHEMA IF EXISTS \"{}\" CASCADE", schema_name),
-                &[],
-            )
-            .await;
-        client
-            .execute(&format!("CREATE SCHEMA \"{}\"", schema_name), &[])
-            .await
-            .unwrap();
-
-        // Create store with auto_create_schema enabled (should succeed idempotently)
-        let _ = PgStore::with_pg_pool(pool.clone(), Some(schema_name), table_name, 128, true)
-            .await
-            .unwrap();
-
-        // Verify schema still exists
-        let row = client
-            .query_one(
-                "SELECT schema_name FROM information_schema.schemata WHERE schema_name = $1",
-                &[&schema_name],
-            )
-            .await
-            .unwrap();
-        let created_schema: String = row.get(0);
-        assert_eq!(created_schema, schema_name);
-
-        // Verify table was created in the schema
-        let row = client
-            .query_one(
-                "SELECT table_schema, table_name FROM information_schema.tables WHERE table_schema = $1 AND table_name = $2",
-                &[&schema_name, &table_name],
-            )
-            .await
-            .unwrap();
-        let created_table_schema: String = row.get(0);
-        let created_table_name: String = row.get(1);
-        assert_eq!(created_table_schema, schema_name);
-        assert_eq!(created_table_name, table_name);
-
-        // Cleanup
-        let _ = client
-            .execute(
-                &format!("DROP SCHEMA IF EXISTS \"{}\" CASCADE", schema_name),
-                &[],
-            )
-            .await;
-    }
-
-    #[tokio::test]
-    async fn test_auto_create_schema_no_schema_name() {
-        common_telemetry::init_default_ut_logging();
-        maybe_skip_postgres_integration_test!();
-        let endpoints = std::env::var("GT_POSTGRES_ENDPOINTS").unwrap();
-        let mut cfg = Config::new();
-        cfg.url = Some(endpoints);
-        let pool = cfg
-            .create_pool(Some(Runtime::Tokio1), NoTls)
-            .context(CreatePostgresPoolSnafu)
-            .unwrap();
-
-        let table_name = "test_table_no_schema";
-
-        // Create store with auto_create_schema enabled but no schema name (should succeed)
-        // This should create the table in the default schema (public)
-        let _ = PgStore::with_pg_pool(pool.clone(), None, table_name, 128, true)
-            .await
-            .unwrap();
-
-        // Verify table was created in public schema
-        let client = pool.get().await.unwrap();
-        let row = client
-            .query_one(
-                "SELECT table_schema, table_name FROM information_schema.tables WHERE table_name = $1",
-                &[&table_name],
-            )
-            .await
-            .unwrap();
-        let created_table_schema: String = row.get(0);
-        let created_table_name: String = row.get(1);
-        assert_eq!(created_table_name, table_name);
-        // Verify it's in public schema (or whichever is the default)
-        assert!(created_table_schema == "public" || !created_table_schema.is_empty());
-
-        // Cleanup
-        let _ = client
-            .execute(&format!("DROP TABLE IF EXISTS \"{}\"", table_name), &[])
-            .await;
-    }
-
-    #[tokio::test]
-    async fn test_auto_create_schema_with_empty_schema_name() {
-        common_telemetry::init_default_ut_logging();
-        maybe_skip_postgres_integration_test!();
-        let endpoints = std::env::var("GT_POSTGRES_ENDPOINTS").unwrap();
-        let mut cfg = Config::new();
-        cfg.url = Some(endpoints);
-        let pool = cfg
-            .create_pool(Some(Runtime::Tokio1), NoTls)
-            .context(CreatePostgresPoolSnafu)
-            .unwrap();
-
-        let table_name = "test_table_empty_schema";
-
-        // Create store with auto_create_schema enabled but empty schema name (should succeed)
-        // This should create the table in the default schema (public)
-        let _ = PgStore::with_pg_pool(pool.clone(), Some(""), table_name, 128, true)
-            .await
-            .unwrap();
-
-        // Verify table was created in public schema
-        let client = pool.get().await.unwrap();
-        let row = client
-            .query_one(
-                "SELECT table_schema, table_name FROM information_schema.tables WHERE table_name = $1",
-                &[&table_name],
-            )
-            .await
-            .unwrap();
-        let created_table_schema: String = row.get(0);
-        let created_table_name: String = row.get(1);
-        assert_eq!(created_table_name, table_name);
-        // Verify it's in public schema (or whichever is the default)
-        assert!(created_table_schema == "public" || !created_table_schema.is_empty());
-
-        // Cleanup
-        let _ = client
-            .execute(&format!("DROP TABLE IF EXISTS \"{}\"", table_name), &[])
-            .await;
-    }
 }
--- a/src/common/meta/src/lib.rs
+++ b/src/common/meta/src/lib.rs
@@ -48,7 +48,7 @@ pub mod stats;
 #[cfg(any(test, feature = "testing"))]
 pub mod test_util;
 pub mod util;
-pub mod wal_provider;
+pub mod wal_options_allocator;

 // The id of the datanode.
 pub type DatanodeId = u64;
--- a/src/common/meta/src/peer.rs
+++ b/src/common/meta/src/peer.rs
@@ -81,13 +81,6 @@ pub trait PeerAllocator: Send + Sync {

 pub type PeerAllocatorRef = Arc<dyn PeerAllocator>;

-#[async_trait::async_trait]
-impl<T: PeerAllocator + ?Sized> PeerAllocator for Arc<T> {
-    async fn alloc(&self, num: usize) -> Result<Vec<Peer>, Error> {
-        T::alloc(self, num).await
-    }
-}
-
 pub struct NoopPeerAllocator;

 #[async_trait::async_trait]
--- a/src/common/meta/src/reconciliation/reconcile_logical_tables/reconcile_regions.rs
+++ b/src/common/meta/src/reconciliation/reconcile_logical_tables/reconcile_regions.rs
@@ -144,8 +144,6 @@ impl ReconcileRegions {
 }

 /// Creates a region request builder from a raw table info.
-///
-/// Note: This function is primarily intended for creating logical tables or allocating placeholder regions.
 fn create_region_request_from_raw_table_info(
    raw_table_info: &RawTableInfo,
    physical_table_id: TableId,
--- a/src/common/meta/src/rpc/ddl.rs
+++ b/src/common/meta/src/rpc/ddl.rs
@@ -1639,6 +1639,7 @@ mod tests {
            value_indices: vec![2],
            engine: METRIC_ENGINE_NAME.to_string(),
            next_column_id: 0,
+            region_numbers: vec![0],
            options: Default::default(),
            created_on: Default::default(),
            updated_on: Default::default(),
--- a/src/common/meta/src/sequence.rs
+++ b/src/common/meta/src/sequence.rs
@@ -19,7 +19,6 @@ use common_telemetry::{debug, warn};
 use snafu::ensure;
 use tokio::sync::Mutex;

-use crate::ddl::allocator::resource_id::ResourceIdAllocator;
 use crate::error::{self, Result};
 use crate::kv_backend::KvBackendRef;
 use crate::rpc::store::CompareAndPutRequest;
@@ -83,25 +82,6 @@ pub struct Sequence {
    inner: Mutex<Inner>,
 }

-#[async_trait::async_trait]
-impl ResourceIdAllocator for Sequence {
-    async fn next(&self) -> Result<u64> {
-        self.next().await
-    }
-
-    async fn peek(&self) -> Result<u64> {
-        self.peek().await
-    }
-
-    async fn jump_to(&self, next: u64) -> Result<()> {
-        self.jump_to(next).await
-    }
-
-    async fn min_max(&self) -> Range<u64> {
-        self.min_max().await
-    }
-}
-
 impl Sequence {
    /// Returns the next value and increments the sequence.
    pub async fn next(&self) -> Result<u64> {
--- a/src/common/meta/src/test_util.rs
+++ b/src/common/meta/src/test_util.rs
@@ -40,8 +40,8 @@ use crate::peer::{Peer, PeerResolver};
 use crate::region_keeper::MemoryRegionKeeper;
 use crate::region_registry::LeaderRegionRegistry;
 use crate::sequence::SequenceBuilder;
-use crate::wal_provider::topic_pool::KafkaTopicPool;
-use crate::wal_provider::{WalProvider, build_kafka_topic_creator};
+use crate::wal_options_allocator::topic_pool::KafkaTopicPool;
+use crate::wal_options_allocator::{WalOptionsAllocator, build_kafka_topic_creator};
 use crate::{DatanodeId, FlownodeId};

 #[async_trait::async_trait]
@@ -187,7 +187,7 @@ pub fn new_ddl_context_with_kv_backend(
                .initial(1024)
                .build(),
        ),
-        Arc::new(WalProvider::default()),
+        Arc::new(WalOptionsAllocator::default()),
    ));
    let flow_metadata_manager = Arc::new(FlowMetadataManager::new(kv_backend.clone()));
    let flow_metadata_allocator =
--- a/src/common/meta/src/wal_options_allocator.rs
+++ b/src/common/meta/src/wal_options_allocator.rs
@@ -26,46 +26,28 @@ use common_wal::options::{KafkaWalOptions, WAL_OPTIONS_KEY, WalOptions};
 use snafu::{ResultExt, ensure};
 use store_api::storage::{RegionId, RegionNumber};

-use crate::ddl::allocator::wal_options::WalOptionsAllocator;
 use crate::error::{EncodeWalOptionsSnafu, InvalidTopicNamePrefixSnafu, Result};
 use crate::key::TOPIC_NAME_PATTERN_REGEX;
 use crate::kv_backend::KvBackendRef;
 use crate::leadership_notifier::LeadershipChangeListener;
-pub use crate::wal_provider::topic_creator::{build_kafka_client, build_kafka_topic_creator};
-use crate::wal_provider::topic_pool::KafkaTopicPool;
+pub use crate::wal_options_allocator::topic_creator::{
+    build_kafka_client, build_kafka_topic_creator,
+};
+use crate::wal_options_allocator::topic_pool::KafkaTopicPool;

-/// Provides wal options in region granularity.
+/// Allocates wal options in region granularity.
 #[derive(Default, Debug)]
-pub enum WalProvider {
+pub enum WalOptionsAllocator {
    #[default]
    RaftEngine,
    Kafka(KafkaTopicPool),
 }

-/// Arc wrapper of WalProvider.
-pub type WalProviderRef = Arc<WalProvider>;
+/// Arc wrapper of WalOptionsAllocator.
+pub type WalOptionsAllocatorRef = Arc<WalOptionsAllocator>;

-#[async_trait::async_trait]
-impl WalOptionsAllocator for WalProvider {
-    async fn allocate(
-        &self,
-        region_numbers: &[RegionNumber],
-        skip_wal: bool,
-    ) -> Result<HashMap<RegionNumber, String>> {
-        let wal_options = self
-            .alloc_batch(region_numbers.len(), skip_wal)?
-            .into_iter()
-            .map(|wal_options| {
-                serde_json::to_string(&wal_options).context(EncodeWalOptionsSnafu { wal_options })
-            })
-            .collect::<Result<Vec<_>>>()?;
-
-        Ok(region_numbers.iter().copied().zip(wal_options).collect())
-    }
-}
-
-impl WalProvider {
-    /// Tries to start the provider.
+impl WalOptionsAllocator {
+    /// Tries to start the allocator.
    pub async fn start(&self) -> Result<()> {
        match self {
            Self::RaftEngine => Ok(()),
@@ -74,14 +56,14 @@ impl WalProvider {
    }

    /// Allocates a batch of wal options where each wal options goes to a region.
-    /// If skip_wal is true, the wal options will be set to Noop regardless of the provider type.
+    /// If skip_wal is true, the wal options will be set to Noop regardless of the allocator type.
    pub fn alloc_batch(&self, num_regions: usize, skip_wal: bool) -> Result<Vec<WalOptions>> {
        if skip_wal {
            return Ok(vec![WalOptions::Noop; num_regions]);
        }
        match self {
-            WalProvider::RaftEngine => Ok(vec![WalOptions::RaftEngine; num_regions]),
-            WalProvider::Kafka(topic_manager) => {
+            WalOptionsAllocator::RaftEngine => Ok(vec![WalOptions::RaftEngine; num_regions]),
+            WalOptionsAllocator::Kafka(topic_manager) => {
                let options_batch = topic_manager
                    .select_batch(num_regions)?
                    .into_iter()
@@ -98,14 +80,14 @@ impl WalProvider {

    /// Returns true if it's the remote WAL.
    pub fn is_remote_wal(&self) -> bool {
-        matches!(&self, WalProvider::Kafka(_))
+        matches!(&self, WalOptionsAllocator::Kafka(_))
    }
 }

 #[async_trait]
-impl LeadershipChangeListener for WalProvider {
+impl LeadershipChangeListener for WalOptionsAllocator {
    fn name(&self) -> &str {
-        "WalProvider"
+        "WalOptionsAllocator"
    }

    async fn on_leader_start(&self) -> Result<()> {
@@ -117,13 +99,13 @@ impl LeadershipChangeListener for WalProvider {
    }
 }

-/// Builds a wal provider based on the given configuration.
-pub async fn build_wal_provider(
+/// Builds a wal options allocator based on the given configuration.
+pub async fn build_wal_options_allocator(
    config: &MetasrvWalConfig,
    kv_backend: KvBackendRef,
-) -> Result<WalProvider> {
+) -> Result<WalOptionsAllocator> {
    match config {
-        MetasrvWalConfig::RaftEngine => Ok(WalProvider::RaftEngine),
+        MetasrvWalConfig::RaftEngine => Ok(WalOptionsAllocator::RaftEngine),
        MetasrvWalConfig::Kafka(kafka_config) => {
            let prefix = &kafka_config.kafka_topic.topic_name_prefix;
            ensure!(
@@ -134,11 +116,28 @@ pub async fn build_wal_provider(
                build_kafka_topic_creator(&kafka_config.connection, &kafka_config.kafka_topic)
                    .await?;
            let topic_pool = KafkaTopicPool::new(kafka_config, kv_backend, topic_creator);
-            Ok(WalProvider::Kafka(topic_pool))
+            Ok(WalOptionsAllocator::Kafka(topic_pool))
        }
    }
 }

+/// Allocates a wal options for each region. The allocated wal options is encoded immediately.
+pub fn allocate_region_wal_options(
+    regions: Vec<RegionNumber>,
+    wal_options_allocator: &WalOptionsAllocator,
+    skip_wal: bool,
+) -> Result<HashMap<RegionNumber, String>> {
+    let wal_options = wal_options_allocator
+        .alloc_batch(regions.len(), skip_wal)?
+        .into_iter()
+        .map(|wal_options| {
+            serde_json::to_string(&wal_options).context(EncodeWalOptionsSnafu { wal_options })
+        })
+        .collect::<Result<Vec<_>>>()?;
+
+    Ok(regions.into_iter().zip(wal_options).collect())
+}
+
 /// Inserts wal options into options.
 pub fn prepare_wal_options(
    options: &mut HashMap<String, String>,
@@ -183,19 +182,21 @@ mod tests {
    use crate::error::Error;
    use crate::kv_backend::memory::MemoryKvBackend;
    use crate::test_util::test_kafka_topic_pool;
-    use crate::wal_provider::selector::RoundRobinTopicSelector;
+    use crate::wal_options_allocator::selector::RoundRobinTopicSelector;

-    // Tests that the wal provider could successfully allocate raft-engine wal options.
+    // Tests that the wal options allocator could successfully allocate raft-engine wal options.
    #[tokio::test]
-    async fn test_provider_with_raft_engine() {
+    async fn test_allocator_with_raft_engine() {
        let kv_backend = Arc::new(MemoryKvBackend::new()) as KvBackendRef;
        let wal_config = MetasrvWalConfig::RaftEngine;
-        let provider = build_wal_provider(&wal_config, kv_backend).await.unwrap();
-        provider.start().await.unwrap();
+        let allocator = build_wal_options_allocator(&wal_config, kv_backend)
+            .await
+            .unwrap();
+        allocator.start().await.unwrap();

        let num_regions = 32;
        let regions = (0..num_regions).collect::<Vec<_>>();
-        let got = provider.allocate(&regions, false).await.unwrap();
+        let got = allocate_region_wal_options(regions.clone(), &allocator, false).unwrap();

        let encoded_wal_options = serde_json::to_string(&WalOptions::RaftEngine).unwrap();
        let expected = regions
@@ -215,14 +216,14 @@ mod tests {
            },
            ..Default::default()
        });
-        let got = build_wal_provider(&wal_config, kv_backend)
+        let got = build_wal_options_allocator(&wal_config, kv_backend)
            .await
            .unwrap_err();
        assert_matches!(got, Error::InvalidTopicNamePrefix { .. });
    }

    #[tokio::test]
-    async fn test_provider_with_kafka_allocate_wal_options() {
+    async fn test_allocator_with_kafka_allocate_wal_options() {
        common_telemetry::init_default_ut_logging();
        maybe_skip_kafka_integration_test!();
        let num_topics = 5;
@@ -239,13 +240,13 @@ mod tests {
        let topic_creator = topic_pool.topic_creator();
        topic_creator.delete_topics(&topics).await.unwrap();

-        // Creates an options provider.
-        let provider = WalProvider::Kafka(topic_pool);
-        provider.start().await.unwrap();
+        // Creates an options allocator.
+        let allocator = WalOptionsAllocator::Kafka(topic_pool);
+        allocator.start().await.unwrap();

        let num_regions = 3;
        let regions = (0..num_regions).collect::<Vec<_>>();
-        let got = provider.allocate(&regions, false).await.unwrap();
+        let got = allocate_region_wal_options(regions.clone(), &allocator, false).unwrap();

        // Check the allocated wal options contain the expected topics.
        let expected = (0..num_regions)
@@ -260,13 +261,13 @@ mod tests {
    }

    #[tokio::test]
-    async fn test_provider_with_skip_wal() {
-        let provider = WalProvider::RaftEngine;
-        provider.start().await.unwrap();
+    async fn test_allocator_with_skip_wal() {
+        let allocator = WalOptionsAllocator::RaftEngine;
+        allocator.start().await.unwrap();

        let num_regions = 32;
        let regions = (0..num_regions).collect::<Vec<_>>();
-        let got = provider.allocate(&regions, true).await.unwrap();
+        let got = allocate_region_wal_options(regions.clone(), &allocator, true).unwrap();
        assert_eq!(got.len(), num_regions as usize);
        for wal_options in got.values() {
            assert_eq!(wal_options, &"{\"wal.provider\":\"noop\"}");
--- a/src/common/meta/src/wal_options_allocator/selector.rs
+++ b/src/common/meta/src/wal_options_allocator/selector.rs
--- a/src/common/meta/src/wal_options_allocator/topic_creator.rs
+++ b/src/common/meta/src/wal_options_allocator/topic_creator.rs
--- a/src/common/meta/src/wal_options_allocator/topic_manager.rs
+++ b/src/common/meta/src/wal_options_allocator/topic_manager.rs
--- a/src/common/meta/src/wal_options_allocator/topic_pool.rs
+++ b/src/common/meta/src/wal_options_allocator/topic_pool.rs
@@ -22,9 +22,9 @@ use snafu::ensure;

 use crate::error::{InvalidNumTopicsSnafu, Result};
 use crate::kv_backend::KvBackendRef;
-use crate::wal_provider::selector::{RoundRobinTopicSelector, TopicSelectorRef};
-use crate::wal_provider::topic_creator::KafkaTopicCreator;
-use crate::wal_provider::topic_manager::KafkaTopicManager;
+use crate::wal_options_allocator::selector::{RoundRobinTopicSelector, TopicSelectorRef};
+use crate::wal_options_allocator::topic_creator::KafkaTopicCreator;
+use crate::wal_options_allocator::topic_manager::KafkaTopicManager;

 /// Topic pool for kafka remote wal.
 /// Responsible for:
@@ -144,7 +144,7 @@ mod tests {
    use super::*;
    use crate::error::Error;
    use crate::test_util::test_kafka_topic_pool;
-    use crate::wal_provider::selector::RoundRobinTopicSelector;
+    use crate::wal_options_allocator::selector::RoundRobinTopicSelector;

    #[tokio::test]
    async fn test_pool_invalid_number_topics_err() {
--- a/src/common/recordbatch/src/adapter.rs
+++ b/src/common/recordbatch/src/adapter.rs
@@ -21,7 +21,6 @@ use std::sync::Arc;
 use std::task::{Context, Poll};

 use common_base::readable_size::ReadableSize;
-use common_telemetry::tracing::{Span, info_span};
 use common_time::util::format_nanoseconds_human_readable;
 use datafusion::arrow::compute::cast;
 use datafusion::arrow::datatypes::SchemaRef as DfSchemaRef;
@@ -219,7 +218,6 @@ pub struct RecordBatchStreamAdapter {
    metrics_2: Metrics,
    /// Display plan and metrics in verbose mode.
    explain_verbose: bool,
-    span: Span,
 }

 /// Json encoded metrics. Contains metric from a whole plan tree.
@@ -240,21 +238,22 @@ impl RecordBatchStreamAdapter {
            metrics: None,
            metrics_2: Metrics::Unavailable,
            explain_verbose: false,
-            span: Span::current(),
        })
    }

-    pub fn try_new_with_span(stream: DfSendableRecordBatchStream, span: Span) -> Result<Self> {
+    pub fn try_new_with_metrics_and_df_plan(
+        stream: DfSendableRecordBatchStream,
+        metrics: BaselineMetrics,
+        df_plan: Arc<dyn ExecutionPlan>,
+    ) -> Result<Self> {
        let schema =
            Arc::new(Schema::try_from(stream.schema()).context(error::SchemaConversionSnafu)?);
-        let subspan = info_span!(parent: &span, "RecordBatchStreamAdapter");
        Ok(Self {
            schema,
            stream,
-            metrics: None,
-            metrics_2: Metrics::Unavailable,
+            metrics: Some(metrics),
+            metrics_2: Metrics::Unresolved(df_plan),
            explain_verbose: false,
-            span: subspan,
        })
    }

@@ -301,8 +300,6 @@ impl Stream for RecordBatchStreamAdapter {
            .map(|m| m.elapsed_compute().clone())
            .unwrap_or_default();
        let _guard = timer.timer();
-        let poll_span = info_span!(parent: &self.span, "poll_next");
-        let _entered = poll_span.enter();
        match Pin::new(&mut self.stream).poll_next(cx) {
            Poll::Pending => Poll::Pending,
            Poll::Ready(Some(df_record_batch)) => {
--- a/src/common/recordbatch/src/lib.rs
+++ b/src/common/recordbatch/src/lib.rs
@@ -29,7 +29,6 @@ use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use adapter::RecordBatchMetrics;
 use arc_swap::ArcSwapOption;
 use common_base::readable_size::ReadableSize;
-use common_telemetry::tracing::Span;
 pub use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::arrow::array::{ArrayRef, AsArray, StringBuilder};
 use datatypes::arrow::compute::SortOptions;
@@ -371,7 +370,6 @@ pub struct RecordBatchStreamWrapper<S> {
    pub stream: S,
    pub output_ordering: Option<Vec<OrderOption>>,
    pub metrics: Arc<ArcSwapOption<RecordBatchMetrics>>,
-    pub span: Span,
 }

 impl<S> RecordBatchStreamWrapper<S> {
@@ -382,7 +380,6 @@ impl<S> RecordBatchStreamWrapper<S> {
            stream,
            output_ordering: None,
            metrics: Default::default(),
-            span: Span::current(),
        }
    }
 }
@@ -411,7 +408,6 @@ impl<S: Stream<Item = Result<RecordBatch>> + Unpin> Stream for RecordBatchStream
    type Item = Result<RecordBatch>;

    fn poll_next(mut self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let _entered = self.span.clone().entered();
        Pin::new(&mut self.stream).poll_next(ctx)
    }
 }
--- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
discord9	ec77a5d53a	sanity check Signed-off-by: discord9 <discord9@163.com>	2025-12-22 13:54:19 +08:00
discord9	dbad96eb80	more test Signed-off-by: discord9 <discord9@163.com>	2025-12-22 13:44:00 +08:00