poc/create-alter-for-metrics:

### Commit Message Enhance Prometheus Bulk Write Handling - **`server.rs`**: Introduced `start_background_task` in `PromBulkState` to handle asynchronous batch processing and SST file writing. Added a new `tx` field to manage task communication. - **`access_layer.rs`**: Added `file_id` method to `ParquetWriter` for file identification. - **`batch_builder.rs`**: Modified `MetricsBatchBuilder` to utilize session catalog and schema, and updated batch processing logic to handle column metadata. - **`prom_store.rs`**: Updated `remote_write` to use `decode_remote_write_request_to_batch` for batch processing and send data to the background task. - **`prom_row_builder.rs`**: Made `TableBuilder` and `TablesBuilder` fields public for external access. - **`proto.rs`**: Exposed `table_data` in `PromWriteRequest` for batch processing. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>
2026-01-09 14:52:58 +00:00 · 2025-06-30 08:27:26 +00:00 · 2025-06-29 14:07:57 +00:00 · 2025-06-28 09:58:33 +00:00 · 2025-06-27 08:50:25 +00:00 · 2025-06-26 13:00:54 +00:00
405 changed files with 10495 additions and 15789 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -12,6 +12,3 @@ fetch = true
 checkout = true
 list_files = true
 internal_use_git2 = false
-
-[env]
-CARGO_WORKSPACE_DIR = { value = "", relative = true }
--- a/.github/scripts/check-version.sh
+++ b/.github/scripts/check-version.sh
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# Get current version
-CURRENT_VERSION=$1
-if [ -z "$CURRENT_VERSION" ]; then
-  echo "Error: Failed to get current version"
-  exit 1
-fi
-
-# Get the latest version from GitHub Releases
-API_RESPONSE=$(curl -s "https://api.github.com/repos/GreptimeTeam/greptimedb/releases/latest")
-
-if [ -z "$API_RESPONSE" ] || [ "$(echo "$API_RESPONSE" | jq -r '.message')" = "Not Found" ]; then
-  echo "Error: Failed to fetch latest version from GitHub"
-  exit 1
-fi
-
-# Get the latest version
-LATEST_VERSION=$(echo "$API_RESPONSE" | jq -r '.tag_name')
-
-if [ -z "$LATEST_VERSION" ] || [ "$LATEST_VERSION" = "null" ]; then
-  echo "Error: No valid version found in GitHub releases"
-  exit 1
-fi
-
-# Cleaned up version number format (removed possible 'v' prefix and -nightly suffix)
-CLEAN_CURRENT=$(echo "$CURRENT_VERSION" | sed 's/^v//' | sed 's/-nightly-.*//')
-CLEAN_LATEST=$(echo "$LATEST_VERSION" | sed 's/^v//' | sed 's/-nightly-.*//')
-
-echo "Current version: $CLEAN_CURRENT"
-echo "Latest release version: $CLEAN_LATEST"
-
-# Use sort -V to compare versions
-HIGHER_VERSION=$(printf "%s\n%s" "$CLEAN_CURRENT" "$CLEAN_LATEST" | sort -V | tail -n1)
-
-if [ "$HIGHER_VERSION" = "$CLEAN_CURRENT" ]; then
-  echo "Current version ($CLEAN_CURRENT) is NEWER than or EQUAL to latest ($CLEAN_LATEST)"
-  echo "should-push-latest-tag=true" >> $GITHUB_OUTPUT
-else
-  echo "Current version ($CLEAN_CURRENT) is OLDER than latest ($CLEAN_LATEST)"
-  echo "should-push-latest-tag=false" >> $GITHUB_OUTPUT
-fi
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -110,8 +110,6 @@ jobs:

      # The 'version' use as the global tag name of the release workflow.
      version: ${{ steps.create-version.outputs.version }}
-
-      should-push-latest-tag: ${{ steps.check-version.outputs.should-push-latest-tag }}
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -137,11 +135,6 @@ jobs:
          GITHUB_REF_NAME: ${{ github.ref_name }}
          NIGHTLY_RELEASE_PREFIX: ${{ env.NIGHTLY_RELEASE_PREFIX }}

-      - name: Check version
-        id: check-version
-        run: |
-          ./.github/scripts/check-version.sh "${{ steps.create-version.outputs.version }}"
-
      - name: Allocate linux-amd64 runner
        if: ${{ inputs.build_linux_amd64_artifacts || github.event_name == 'push' || github.event_name == 'schedule' }}
        uses: ./.github/actions/start-runner
@@ -321,7 +314,7 @@ jobs:
          image-registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
          image-registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
          version: ${{ needs.allocate-runners.outputs.version }}
-          push-latest-tag: ${{ needs.allocate-runners.outputs.should-push-latest-tag == 'true' && github.ref_type == 'tag' && !contains(github.ref_name, 'nightly') && github.event_name != 'schedule' }}
+          push-latest-tag: ${{ github.ref_type == 'tag' && !contains(github.ref_name, 'nightly') && github.event_name != 'schedule' }}

      - name: Set build image result
        id: set-build-image-result
@@ -339,7 +332,7 @@ jobs:
      build-windows-artifacts,
      release-images-to-dockerhub,
    ]
-    runs-on: ubuntu-latest-16-cores
+    runs-on: ubuntu-latest
    # When we push to ACR, it's easy to fail due to some unknown network issues.
    # However, we don't want to fail the whole workflow because of this.
    # The ACR have daily sync with DockerHub, so don't worry about the image not being updated.
@@ -368,7 +361,7 @@ jobs:
          dev-mode: false
          upload-to-s3: true
          update-version-info: true
-          push-latest-tag: ${{ needs.allocate-runners.outputs.should-push-latest-tag == 'true' && github.ref_type == 'tag' && !contains(github.ref_name, 'nightly') && github.event_name != 'schedule' }}
+          push-latest-tag: ${{ github.ref_type == 'tag' && !contains(github.ref_name, 'nightly') && github.event_name != 'schedule' }}

  publish-github-release:
    name: Create GitHub release and upload artifacts
--- a/.github/workflows/semantic-pull-request.yml
+++ b/.github/workflows/semantic-pull-request.yml
@@ -11,17 +11,17 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true

-permissions:
-  issues: write
-  contents: write
-  pull-requests: write
-
 jobs:
  check:
    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write  # Add permissions to modify PRs
+      issues: write
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - uses: ./.github/actions/setup-cyborg
      - name: Check Pull Request
        working-directory: cyborg
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -211,7 +211,7 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"

 [[package]]
 name = "api"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "common-base",
 "common-decimal",
@@ -944,7 +944,7 @@ dependencies = [

 [[package]]
 name = "auth"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "async-trait",
@@ -1586,7 +1586,7 @@ dependencies = [

 [[package]]
 name = "cache"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "catalog",
 "common-error",
@@ -1602,17 +1602,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbc26382d871df4b7442e3df10a9402bf3cf5e55cbd66f12be38861425f0564"

-[[package]]
-name = "cargo-manifest"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d8af896b707212cd0e99c112a78c9497dd32994192a463ed2f7419d29bd8c6"
-dependencies = [
- "serde",
- "thiserror 2.0.12",
- "toml 0.8.19",
-]
-
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -1621,7 +1610,7 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "catalog"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arrow 54.2.1",
@@ -1959,7 +1948,7 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"

 [[package]]
 name = "cli"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -1986,6 +1975,7 @@ dependencies = [
 "common-version",
 "common-wal",
 "datatypes",
+ "either",
 "etcd-client",
 "futures",
 "humantime",
@@ -2003,7 +1993,7 @@ dependencies = [
 "session",
 "snafu 0.8.5",
 "store-api",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tempfile",
 "tokio",
@@ -2012,7 +2002,7 @@ dependencies = [

 [[package]]
 name = "client"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arc-swap",
@@ -2042,7 +2032,7 @@ dependencies = [
 "rand 0.9.0",
 "serde_json",
 "snafu 0.8.5",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "substrait 0.37.3",
 "tokio",
 "tokio-stream",
@@ -2083,7 +2073,7 @@ dependencies = [

 [[package]]
 name = "cmd"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "auth",
@@ -2113,6 +2103,7 @@ dependencies = [
 "common-wal",
 "datanode",
 "datatypes",
+ "either",
 "etcd-client",
 "file-engine",
 "flow",
@@ -2144,7 +2135,7 @@ dependencies = [
 "snafu 0.8.5",
 "stat",
 "store-api",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "temp-env",
 "tempfile",
@@ -2191,7 +2182,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"

 [[package]]
 name = "common-base"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "anymap2",
 "async-trait",
@@ -2213,11 +2204,11 @@ dependencies = [

 [[package]]
 name = "common-catalog"
-version = "0.16.0"
+version = "0.15.0"

 [[package]]
 name = "common-config"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "common-base",
 "common-error",
@@ -2243,7 +2234,7 @@ dependencies = [

 [[package]]
 name = "common-datasource"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "arrow 54.2.1",
 "arrow-schema 54.3.1",
@@ -2280,7 +2271,7 @@ dependencies = [

 [[package]]
 name = "common-decimal"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "bigdecimal 0.4.8",
 "common-error",
@@ -2293,7 +2284,7 @@ dependencies = [

 [[package]]
 name = "common-error"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "common-macro",
 "http 1.1.0",
@@ -2304,7 +2295,7 @@ dependencies = [

 [[package]]
 name = "common-frontend"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "common-error",
@@ -2320,7 +2311,7 @@ dependencies = [

 [[package]]
 name = "common-function"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -2374,7 +2365,7 @@ dependencies = [

 [[package]]
 name = "common-greptimedb-telemetry"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "common-runtime",
@@ -2391,7 +2382,7 @@ dependencies = [

 [[package]]
 name = "common-grpc"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arrow-flight",
@@ -2423,7 +2414,7 @@ dependencies = [

 [[package]]
 name = "common-grpc-expr"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "common-base",
@@ -2442,7 +2433,7 @@ dependencies = [

 [[package]]
 name = "common-macro"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "arc-swap",
 "common-query",
@@ -2456,7 +2447,7 @@ dependencies = [

 [[package]]
 name = "common-mem-prof"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "anyhow",
 "common-error",
@@ -2472,7 +2463,7 @@ dependencies = [

 [[package]]
 name = "common-meta"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "anymap2",
 "api",
@@ -2531,14 +2522,13 @@ dependencies = [
 "tokio",
 "tokio-postgres",
 "tonic 0.12.3",
- "tracing",
 "typetag",
 "uuid",
 ]

 [[package]]
 name = "common-options"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "common-grpc",
 "humantime-serde",
@@ -2547,11 +2537,11 @@ dependencies = [

 [[package]]
 name = "common-plugins"
-version = "0.16.0"
+version = "0.15.0"

 [[package]]
 name = "common-pprof"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "common-error",
 "common-macro",
@@ -2563,7 +2553,7 @@ dependencies = [

 [[package]]
 name = "common-procedure"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -2590,7 +2580,7 @@ dependencies = [

 [[package]]
 name = "common-procedure-test"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "common-procedure",
@@ -2599,7 +2589,7 @@ dependencies = [

 [[package]]
 name = "common-query"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "async-trait",
@@ -2625,7 +2615,7 @@ dependencies = [

 [[package]]
 name = "common-recordbatch"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "arc-swap",
 "common-error",
@@ -2645,7 +2635,7 @@ dependencies = [

 [[package]]
 name = "common-runtime"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "clap 4.5.19",
@@ -2675,36 +2665,17 @@ dependencies = [

 [[package]]
 name = "common-session"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "strum 0.27.1",
 ]

-[[package]]
-name = "common-sql"
-version = "0.16.0"
-dependencies = [
- "common-base",
- "common-datasource",
- "common-decimal",
- "common-error",
- "common-macro",
- "common-time",
- "datafusion-sql",
- "datatypes",
- "hex",
- "jsonb",
- "snafu 0.8.5",
- "sqlparser 0.54.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=0cf6c04490d59435ee965edd2078e8855bd8471e)",
-]
-
 [[package]]
 name = "common-telemetry"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "backtrace",
 "common-error",
- "common-version",
 "console-subscriber",
 "greptime-proto",
 "humantime-serde",
@@ -2728,7 +2699,7 @@ dependencies = [

 [[package]]
 name = "common-test-util"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "client",
 "common-grpc",
@@ -2741,7 +2712,7 @@ dependencies = [

 [[package]]
 name = "common-time"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "arrow 54.2.1",
 "chrono",
@@ -2759,10 +2730,9 @@ dependencies = [

 [[package]]
 name = "common-version"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "build-data",
- "cargo-manifest",
 "const_format",
 "serde",
 "shadow-rs",
@@ -2770,7 +2740,7 @@ dependencies = [

 [[package]]
 name = "common-wal"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "common-base",
 "common-error",
@@ -2793,7 +2763,7 @@ dependencies = [

 [[package]]
 name = "common-workload"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "common-telemetry",
@@ -2996,9 +2966,9 @@ dependencies = [

 [[package]]
 name = "crc"
-version = "3.3.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
 dependencies = [
 "crc-catalog",
 ]
@@ -3749,7 +3719,7 @@ dependencies = [

 [[package]]
 name = "datanode"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arrow-flight",
@@ -3802,17 +3772,16 @@ dependencies = [
 "session",
 "snafu 0.8.5",
 "store-api",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tokio",
 "toml 0.8.19",
 "tonic 0.12.3",
- "tracing",
 ]

 [[package]]
 name = "datatypes"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "arrow 54.2.1",
 "arrow-array 54.2.1",
@@ -3830,7 +3799,7 @@ dependencies = [
 "jsonb",
 "num",
 "num-traits",
- "ordered-float 4.3.0",
+ "ordered-float 3.9.2",
 "paste",
 "serde",
 "serde_json",
@@ -4151,16 +4120,12 @@ dependencies = [

 [[package]]
 name = "domain"
-version = "0.11.0"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a11dd7f04a6a6d2aea0153c6e31f5ea7af8b2efdf52cdaeea7a9a592c7fefef9"
+checksum = "4c84070523f8ba0f9127ff156920f27eb27b302b425efe60bf5f41ec244d1c60"
 dependencies = [
- "bumpalo",
 "bytes",
- "domain-macros",
 "futures-util",
- "hashbrown 0.14.5",
- "log",
 "moka",
 "octseq",
 "rand 0.8.5",
@@ -4171,17 +4136,6 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "domain-macros"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e197fdfd2cdb5fdeb7f8ddcf3aed5d5d04ecde2890d448b14ffb716f7376b70"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
-]
-
 [[package]]
 name = "dotenv"
 version = "0.15.0"
@@ -4247,9 +4201,9 @@ dependencies = [

 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 dependencies = [
 "serde",
 ]
@@ -4487,7 +4441,7 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"

 [[package]]
 name = "file-engine"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "async-trait",
@@ -4624,7 +4578,7 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"

 [[package]]
 name = "flow"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arrow 54.2.1",
@@ -4689,7 +4643,7 @@ dependencies = [
 "sql",
 "store-api",
 "strum 0.27.1",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tokio",
 "tonic 0.12.3",
@@ -4744,11 +4698,10 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"

 [[package]]
 name = "frontend"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arc-swap",
- "async-stream",
 "async-trait",
 "auth",
 "bytes",
@@ -4785,6 +4738,7 @@ dependencies = [
 "log-store",
 "meta-client",
 "num_cpus",
+ "object-store",
 "opentelemetry-proto 0.27.0",
 "operator",
 "otel-arrow-rust",
@@ -4804,14 +4758,13 @@ dependencies = [
 "sqlparser 0.54.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=0cf6c04490d59435ee965edd2078e8855bd8471e)",
 "store-api",
 "strfmt",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tokio",
 "tokio-util",
 "toml 0.8.19",
 "tonic 0.12.3",
 "tower 0.5.2",
- "tracing",
 "uuid",
 ]

@@ -5195,7 +5148,7 @@ dependencies = [
 [[package]]
 name = "greptime-proto"
 version = "0.1.0"
-source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=ceb1af4fa9309ce65bda0367db7b384df2bb4d4f#ceb1af4fa9309ce65bda0367db7b384df2bb4d4f"
+source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=464226cf8a4a22696503536a123d0b9e318582f4#464226cf8a4a22696503536a123d0b9e318582f4"
 dependencies = [
 "prost 0.13.5",
 "serde",
@@ -5966,7 +5919,7 @@ dependencies = [

 [[package]]
 name = "index"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "asynchronous-codec",
@@ -6851,7 +6804,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

 [[package]]
 name = "log-query"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "chrono",
 "common-error",
@@ -6863,7 +6816,7 @@ dependencies = [

 [[package]]
 name = "log-store"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -7161,7 +7114,7 @@ dependencies = [

 [[package]]
 name = "meta-client"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "async-trait",
@@ -7189,7 +7142,7 @@ dependencies = [

 [[package]]
 name = "meta-srv"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "async-trait",
@@ -7219,7 +7172,6 @@ dependencies = [
 "deadpool",
 "deadpool-postgres",
 "derive_builder 0.20.1",
- "either",
 "etcd-client",
 "futures",
 "h2 0.3.26",
@@ -7281,8 +7233,9 @@ dependencies = [

 [[package]]
 name = "metric-engine"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
+ "ahash 0.8.11",
 "api",
 "aquamarine",
 "async-stream",
@@ -7291,7 +7244,6 @@ dependencies = [
 "common-base",
 "common-error",
 "common-macro",
- "common-meta",
 "common-query",
 "common-recordbatch",
 "common-runtime",
@@ -7315,7 +7267,6 @@ dependencies = [
 "snafu 0.8.5",
 "store-api",
 "tokio",
- "tracing",
 ]

 [[package]]
@@ -7373,7 +7324,7 @@ dependencies = [

 [[package]]
 name = "mito-codec"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "bytes",
@@ -7396,7 +7347,7 @@ dependencies = [

 [[package]]
 name = "mito2"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "aquamarine",
@@ -7429,7 +7380,6 @@ dependencies = [
 "datafusion-expr",
 "datatypes",
 "dotenv",
- "either",
 "futures",
 "humantime-serde",
 "index",
@@ -7465,7 +7415,6 @@ dependencies = [
 "tokio-stream",
 "tokio-util",
 "toml 0.8.19",
- "tracing",
 "uuid",
 ]

@@ -8148,7 +8097,7 @@ dependencies = [

 [[package]]
 name = "object-store"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "anyhow",
 "bytes",
@@ -8484,7 +8433,7 @@ dependencies = [

 [[package]]
 name = "operator"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -8509,7 +8458,6 @@ dependencies = [
 "common-query",
 "common-recordbatch",
 "common-runtime",
- "common-sql",
 "common-telemetry",
 "common-test-util",
 "common-time",
@@ -8540,12 +8488,11 @@ dependencies = [
 "sql",
 "sqlparser 0.54.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=0cf6c04490d59435ee965edd2078e8855bd8471e)",
 "store-api",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tokio",
 "tokio-util",
 "tonic 0.12.3",
- "tracing",
 ]

 [[package]]
@@ -8582,6 +8529,17 @@ dependencies = [
 "num-traits",
 ]

+[[package]]
+name = "ordered-float"
+version = "3.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
+dependencies = [
+ "num-traits",
+ "rand 0.8.5",
+ "serde",
+]
+
 [[package]]
 name = "ordered-float"
 version = "4.3.0"
@@ -8589,8 +8547,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537"
 dependencies = [
 "num-traits",
- "rand 0.8.5",
- "serde",
 ]

 [[package]]
@@ -8799,7 +8755,7 @@ dependencies = [

 [[package]]
 name = "partition"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "async-trait",
@@ -9087,7 +9043,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pipeline"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -9127,7 +9083,6 @@ dependencies = [
 "moka",
 "once_cell",
 "operator",
- "ordered-float 4.3.0",
 "paste",
 "prometheus",
 "query",
@@ -9231,7 +9186,7 @@ dependencies = [

 [[package]]
 name = "plugins"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "auth",
 "clap 4.5.19",
@@ -9544,7 +9499,7 @@ dependencies = [

 [[package]]
 name = "promql"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "async-trait",
@@ -9568,9 +9523,8 @@ dependencies = [

 [[package]]
 name = "promql-parser"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "328fe69c2443ec4f8e6c33ea925dde04a1026e6c95928e89ed02343944cac9bf"
+version = "0.5.1"
+source = "git+https://github.com/GreptimeTeam/promql-parser.git?rev=0410e8b459dda7cb222ce9596f8bf3971bd07bd2#0410e8b459dda7cb222ce9596f8bf3971bd07bd2"
 dependencies = [
 "cfgrammar",
 "chrono",
@@ -9827,7 +9781,7 @@ dependencies = [

 [[package]]
 name = "puffin"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-compression 0.4.13",
 "async-trait",
@@ -9869,7 +9823,7 @@ dependencies = [

 [[package]]
 name = "query"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -9935,11 +9889,10 @@ dependencies = [
 "sqlparser 0.54.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=0cf6c04490d59435ee965edd2078e8855bd8471e)",
 "statrs",
 "store-api",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tokio",
 "tokio-stream",
- "tracing",
 "unescaper",
 "uuid",
 ]
@@ -11258,7 +11211,7 @@ dependencies = [

 [[package]]
 name = "servers"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -11279,6 +11232,7 @@ dependencies = [
 "common-base",
 "common-catalog",
 "common-config",
+ "common-datasource",
 "common-error",
 "common-frontend",
 "common-grpc",
@@ -11291,7 +11245,6 @@ dependencies = [
 "common-recordbatch",
 "common-runtime",
 "common-session",
- "common-sql",
 "common-telemetry",
 "common-test-util",
 "common-time",
@@ -11322,16 +11275,23 @@ dependencies = [
 "local-ip-address",
 "log-query",
 "loki-proto",
+ "metric-engine",
 "mime_guess",
+ "mito-codec",
+ "mito2",
 "mysql_async",
 "notify",
 "object-pool",
+ "object-store",
 "once_cell",
 "openmetrics-parser",
 "opensrv-mysql",
 "opentelemetry-proto 0.27.0",
+ "operator",
 "otel-arrow-rust",
 "parking_lot 0.12.3",
+ "parquet",
+ "partition",
 "permutation",
 "pgwire",
 "pin-project",
@@ -11373,16 +11333,14 @@ dependencies = [
 "tonic-reflection",
 "tower 0.5.2",
 "tower-http 0.6.2",
- "tracing",
 "urlencoding",
 "uuid",
- "vrl",
 "zstd 0.13.2",
 ]

 [[package]]
 name = "session"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arc-swap",
@@ -11721,7 +11679,7 @@ dependencies = [

 [[package]]
 name = "sql"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "chrono",
@@ -11732,7 +11690,6 @@ dependencies = [
 "common-error",
 "common-macro",
 "common-query",
- "common-sql",
 "common-time",
 "datafusion",
 "datafusion-common",
@@ -11777,7 +11734,7 @@ dependencies = [

 [[package]]
 name = "sqlness-runner"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "clap 4.5.19",
@@ -12077,7 +12034,7 @@ dependencies = [

 [[package]]
 name = "stat"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "nix 0.30.1",
 ]
@@ -12103,7 +12060,7 @@ dependencies = [

 [[package]]
 name = "store-api"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "aquamarine",
@@ -12264,7 +12221,7 @@ dependencies = [

 [[package]]
 name = "substrait"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "bytes",
@@ -12465,7 +12422,7 @@ dependencies = [

 [[package]]
 name = "table"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "async-trait",
@@ -12726,7 +12683,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"

 [[package]]
 name = "tests-fuzz"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "arbitrary",
 "async-trait",
@@ -12770,7 +12727,7 @@ dependencies = [

 [[package]]
 name = "tests-integration"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arrow-flight",
@@ -12837,7 +12794,7 @@ dependencies = [
 "sql",
 "sqlx",
 "store-api",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tempfile",
 "time",
@@ -13039,9 +12996,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.45.1"
+version = "1.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
 dependencies = [
 "backtrace",
 "bytes",
@@ -13207,7 +13164,6 @@ version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
- "indexmap 2.9.0",
 "serde",
 "serde_spanned",
 "toml_datetime",
@@ -13910,12 +13866,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
- "getrandom 0.2.15",
- "rand 0.8.5",
+ "getrandom 0.3.2",
+ "js-sys",
+ "rand 0.9.0",
 "serde",
 "wasm-bindgen",
 ]
@@ -13997,9 +13954,9 @@ dependencies = [

 [[package]]
 name = "vrl"
-version = "0.25.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f49394b948406ea1564aa00152e011d87a38ad35d277ebddda257a9ee39c419"
+checksum = "f9ceadaa40aef567a26079ff014ca7a567ba85344f1b81090b5ec7d7bb16a219"
 dependencies = [
 "aes",
 "aes-siv",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,6 @@ members = [
    "src/common/recordbatch",
    "src/common/runtime",
    "src/common/session",
-    "src/common/sql",
    "src/common/stat",
    "src/common/substrait",
    "src/common/telemetry",
@@ -72,13 +71,11 @@ members = [
 resolver = "2"

 [workspace.package]
-version = "0.16.0"
+version = "0.15.0"
 edition = "2021"
 license = "Apache-2.0"

 [workspace.lints]
-clippy.print_stdout = "warn"
-clippy.print_stderr = "warn"
 clippy.dbg_macro = "warn"
 clippy.implicit_clone = "warn"
 clippy.result_large_err = "allow"
@@ -134,12 +131,11 @@ deadpool = "0.12"
 deadpool-postgres = "0.14"
 derive_builder = "0.20"
 dotenv = "0.15"
-either = "1.15"
 etcd-client = "0.14"
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "ceb1af4fa9309ce65bda0367db7b384df2bb4d4f" }
+greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "464226cf8a4a22696503536a123d0b9e318582f4" }
 hex = "0.4"
 http = "1"
 humantime = "2.1"
@@ -167,13 +163,14 @@ opentelemetry-proto = { version = "0.27", features = [
    "with-serde",
    "logs",
 ] }
-ordered-float = { version = "4.3", features = ["serde"] }
 parking_lot = "0.12"
 parquet = { version = "54.2", default-features = false, features = ["arrow", "async", "object_store"] }
 paste = "1.0"
 pin-project = "1.0"
 prometheus = { version = "0.13.3", features = ["process"] }
-promql-parser = { version = "0.6", features = ["ser"] }
+promql-parser = { git = "https://github.com/GreptimeTeam/promql-parser.git", rev = "0410e8b459dda7cb222ce9596f8bf3971bd07bd2", features = [
+    "ser",
+] }
 prost = { version = "0.13", features = ["no-recursion-limit"] }
 raft-engine = { version = "0.4.1", default-features = false }
 rand = "0.9"
@@ -224,12 +221,10 @@ tokio-util = { version = "0.7", features = ["io-util", "compat"] }
 toml = "0.8.8"
 tonic = { version = "0.12", features = ["tls", "gzip", "zstd"] }
 tower = "0.5"
-tracing = "0.1"
 tracing-appender = "0.2"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "fmt"] }
 typetag = "0.2"
 uuid = { version = "1.7", features = ["serde", "v4", "fast-rng"] }
-vrl = "0.25"
 zstd = "0.13"
 # DO_NOT_REMOVE_THIS: END_OF_EXTERNAL_DEPENDENCIES

@@ -264,7 +259,6 @@ common-query = { path = "src/common/query" }
 common-recordbatch = { path = "src/common/recordbatch" }
 common-runtime = { path = "src/common/runtime" }
 common-session = { path = "src/common/session" }
-common-sql = { path = "src/common/sql" }
 common-telemetry = { path = "src/common/telemetry" }
 common-test-util = { path = "src/common/test-util" }
 common-time = { path = "src/common/time" }
--- a/README.md
+++ b/README.md
@@ -75,9 +75,9 @@
 | --------- | ----------- |
 | [Unified Observability Data](https://docs.greptime.com/user-guide/concepts/why-greptimedb) | Store metrics, logs, and traces as timestamped, contextual wide events. Query via [SQL](https://docs.greptime.com/user-guide/query-data/sql), [PromQL](https://docs.greptime.com/user-guide/query-data/promql), and [streaming](https://docs.greptime.com/user-guide/flow-computation/overview). |
 | [High Performance & Cost Effective](https://docs.greptime.com/user-guide/manage-data/data-index) | Written in Rust, with a distributed query engine, [rich indexing](https://docs.greptime.com/user-guide/manage-data/data-index), and optimized columnar storage, delivering sub-second responses at PB scale. |
-| [Cloud-Native Architecture](https://docs.greptime.com/user-guide/concepts/architecture) | Designed for [Kubernetes](https://docs.greptime.com/user-guide/deployments-administration/deploy-on-kubernetes/greptimedb-operator-management), with compute/storage separation, native object storage (AWS S3, Azure Blob, etc.) and seamless cross-cloud access. |
+| [Cloud-Native Architecture](https://docs.greptime.com/user-guide/concepts/architecture) | Designed for [Kubernetes](https://docs.greptime.com/user-guide/deployments/deploy-on-kubernetes/greptimedb-operator-management), with compute/storage separation, native object storage (AWS S3, Azure Blob, etc.) and seamless cross-cloud access. |
 | [Developer-Friendly](https://docs.greptime.com/user-guide/protocols/overview) | Access via SQL/PromQL interfaces, REST API, MySQL/PostgreSQL protocols, and popular ingestion [protocols](https://docs.greptime.com/user-guide/protocols/overview). |
-| [Flexible Deployment](https://docs.greptime.com/user-guide/deployments-administration/overview) | Deploy anywhere: edge (including ARM/[Android](https://docs.greptime.com/user-guide/deployments-administration/run-on-android)) or cloud, with unified APIs and efficient data sync. |
+| [Flexible Deployment](https://docs.greptime.com/user-guide/deployments/overview) | Deploy anywhere: edge (including ARM/[Android](https://docs.greptime.com/user-guide/deployments/run-on-android)) or cloud, with unified APIs and efficient data sync. |

 Learn more in [Why GreptimeDB](https://docs.greptime.com/user-guide/concepts/why-greptimedb) and [Observability 2.0 and the Database for It](https://greptime.com/blogs/2025-04-25-greptimedb-observability2-new-database).

--- a/config/config.md
+++ b/config/config.md
@@ -325,7 +325,7 @@
 | `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. |
+| `region_failure_detector_initialization_delay` | String | `10m` | Delay before initializing region failure detectors.<br/>This delay helps prevent premature initialization of region failure detectors in cases where<br/>cluster maintenance mode is enabled right after metasrv starts, especially when the cluster<br/>is not deployed via the recommended GreptimeDB Operator. Without this delay, early detector registration<br/>may trigger unnecessary region failovers during datanode startup. |
 | `allow_region_failover_on_local_wal` | Bool | `false` | Whether to allow region failover on local WAL.<br/>**This option is not recommended to be set to true, because it may lead to data loss during failover.** |
 | `node_max_idle_time` | String | `24hours` | Max allowed idle time before removing node info from metasrv memory. |
 | `enable_telemetry` | Bool | `true` | Whether to enable greptimedb telemetry. Enabled by default. |
@@ -436,8 +436,8 @@
 | `wal.provider` | String | `raft_engine` | The provider of the WAL.<br/>- `raft_engine`: the wal is stored in the local file system by raft-engine.<br/>- `kafka`: it's remote wal that data is stored in Kafka. |
 | `wal.dir` | String | Unset | The directory to store the WAL files.<br/>**It's only used when the provider is `raft_engine`**. |
 | `wal.file_size` | String | `128MB` | The size of the WAL segment file.<br/>**It's only used when the provider is `raft_engine`**. |
-| `wal.purge_threshold` | String | `1GB` | The threshold of the WAL size to trigger a purge.<br/>**It's only used when the provider is `raft_engine`**. |
-| `wal.purge_interval` | String | `1m` | The interval to trigger a purge.<br/>**It's only used when the provider is `raft_engine`**. |
+| `wal.purge_threshold` | String | `1GB` | The threshold of the WAL size to trigger a flush.<br/>**It's only used when the provider is `raft_engine`**. |
+| `wal.purge_interval` | String | `1m` | The interval to trigger a flush.<br/>**It's only used when the provider is `raft_engine`**. |
 | `wal.read_batch_size` | Integer | `128` | The read batch size.<br/>**It's only used when the provider is `raft_engine`**. |
 | `wal.sync_write` | Bool | `false` | Whether to use sync write.<br/>**It's only used when the provider is `raft_engine`**. |
 | `wal.enable_log_recycle` | Bool | `true` | Whether to reuse logically truncated log files.<br/>**It's only used when the provider is `raft_engine`**. |
@@ -598,5 +598,3 @@
 | `logging.tracing_sample_ratio.default_ratio` | Float | `1.0` | -- |
 | `tracing` | -- | -- | The tracing options. Only effect when compiled with `tokio-console` feature. |
 | `tracing.tokio_console_addr` | String | Unset | The tokio console address. |
-| `query` | -- | -- | -- |
-| `query.parallelism` | Integer | `1` | Parallelism of the query engine for query sent by flownode.<br/>Default to 1, so it won't use too much cpu or memory |
--- a/config/datanode.example.toml
+++ b/config/datanode.example.toml
@@ -129,11 +129,11 @@ dir = "./greptimedb_data/wal"
 ## **It's only used when the provider is `raft_engine`**.
 file_size = "128MB"

-## The threshold of the WAL size to trigger a purge.
+## The threshold of the WAL size to trigger a flush.
 ## **It's only used when the provider is `raft_engine`**.
 purge_threshold = "1GB"

-## The interval to trigger a purge.
+## The interval to trigger a flush.
 ## **It's only used when the provider is `raft_engine`**.
 purge_interval = "1m"

--- a/config/flownode.example.toml
+++ b/config/flownode.example.toml
@@ -108,8 +108,3 @@ default_ratio = 1.0
 ## The tokio console address.
 ## @toml2docs:none-default
 #+ tokio_console_addr = "127.0.0.1"
-
-[query]
-## Parallelism of the query engine for query sent by flownode.
-## Default to 1, so it won't use too much cpu or memory
-parallelism = 1
--- a/config/metasrv.example.toml
+++ b/config/metasrv.example.toml
@@ -43,9 +43,11 @@ use_memory_store = false
 ## - Using shared storage (e.g., s3).
 enable_region_failover = false

-## The delay before starting region failure detection.
-## This delay helps prevent Metasrv from triggering unnecessary region failovers before all Datanodes are fully started.
-## Especially useful when the cluster is not deployed with GreptimeDB Operator and maintenance mode is not enabled.
+## Delay before initializing region failure detectors.
+## This delay helps prevent premature initialization of region failure detectors in cases where
+## cluster maintenance mode is enabled right after metasrv starts, especially when the cluster
+## is not deployed via the recommended GreptimeDB Operator. Without this delay, early detector registration
+## may trigger unnecessary region failovers during datanode startup.
 region_failure_detector_initialization_delay = '10m'

 ## Whether to allow region failover on local WAL.
--- a/cyborg/bin/follow-up-docs-issue.ts
+++ b/cyborg/bin/follow-up-docs-issue.ts
@@ -55,25 +55,12 @@ async function main() {
        await client.rest.issues.addLabels({
            owner, repo, issue_number: number, labels: [labelDocsRequired],
        })
-
-        // Get available assignees for the docs repo
-        const assigneesResponse = await docsClient.rest.issues.listAssignees({
-            owner: 'GreptimeTeam',
-            repo: 'docs',
-        })
-        const validAssignees = assigneesResponse.data.map(assignee => assignee.login)
-        core.info(`Available assignees: ${validAssignees.join(', ')}`)
-
-        // Check if the actor is a valid assignee, otherwise fallback to fengjiachun
-        const assignee = validAssignees.includes(actor) ? actor : 'fengjiachun'
-        core.info(`Assigning issue to: ${assignee}`)
-
        await docsClient.rest.issues.create({
            owner: 'GreptimeTeam',
            repo: 'docs',
            title: `Update docs for ${title}`,
            body: `A document change request is generated from ${html_url}`,
-            assignee: assignee,
+            assignee: actor,
        }).then((res) => {
            core.info(`Created issue ${res.data}`)
        })
--- a/docs/benchmarks/log/README.md
+++ b/docs/benchmarks/log/README.md
@@ -48,4 +48,4 @@ Please refer to [SQL query](./query.sql) for GreptimeDB and Clickhouse, and [que

 ## Addition
 - You can tune GreptimeDB's configuration to get better performance.
- You can setup GreptimeDB to use S3 as storage, see [here](https://docs.greptime.com/user-guide/deployments-administration/configuration#storage-options).
+- You can setup GreptimeDB to use S3 as storage, see [here](https://docs.greptime.com/user-guide/deployments/configuration#storage-options).
--- a/grafana/README.md
+++ b/grafana/README.md
@@ -83,7 +83,7 @@ If you use the [Helm Chart](https://github.com/GreptimeTeam/helm-charts) to depl
 - `monitoring.enabled=true`: Deploys a standalone GreptimeDB instance dedicated to monitoring the cluster;
 - `grafana.enabled=true`: Deploys Grafana and automatically imports the monitoring dashboard;

-The standalone GreptimeDB instance will collect metrics from your cluster, and the dashboard will be available in the Grafana UI. For detailed deployment instructions, please refer to our [Kubernetes deployment guide](https://docs.greptime.com/user-guide/deployments-administration-administration/deploy-on-kubernetes/getting-started).
+The standalone GreptimeDB instance will collect metrics from your cluster, and the dashboard will be available in the Grafana UI. For detailed deployment instructions, please refer to our [Kubernetes deployment guide](https://docs.greptime.com/user-guide/deployments-administration/deploy-on-kubernetes/getting-started).

 ### Self-host Prometheus and import dashboards manually

--- a/licenserc.toml
+++ b/licenserc.toml
@@ -34,7 +34,6 @@ excludes = [
    "src/sql/src/statements/drop/trigger.rs",
    "src/sql/src/parsers/create_parser/trigger.rs",
    "src/sql/src/parsers/show_parser/trigger.rs",
-    "src/mito2/src/extension.rs",
 ]

 [properties]
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -53,54 +53,6 @@ get_arch_type() {
  esac
 }

-# Verify SHA256 checksum
-verify_sha256() {
-  file="$1"
-  expected_sha256="$2"
-
-  if command -v sha256sum >/dev/null 2>&1; then
-    actual_sha256=$(sha256sum "$file" | cut -d' ' -f1)
-  elif command -v shasum >/dev/null 2>&1; then
-    actual_sha256=$(shasum -a 256 "$file" | cut -d' ' -f1)
-  else
-    echo "Warning: No SHA256 verification tool found (sha256sum or shasum). Skipping checksum verification."
-    return 0
-  fi
-
-  if [ "$actual_sha256" = "$expected_sha256" ]; then
-    echo "SHA256 checksum verified successfully."
-    return 0
-  else
-    echo "Error: SHA256 checksum verification failed!"
-    echo "Expected: $expected_sha256"
-    echo "Actual: $actual_sha256"
-    return 1
-  fi
-}
-
-# Prompt for user confirmation (compatible with different shells)
-prompt_confirmation() {
-  message="$1"
-  printf "%s (y/N): " "$message"
-
-  # Try to read user input, fallback if read fails
-  answer=""
-  if read answer </dev/tty 2>/dev/null; then
-    case "$answer" in
-      [Yy]|[Yy][Ee][Ss])
-        return 0
-        ;;
-      *)
-        return 1
-        ;;
-    esac
-  else
-    echo ""
-    echo "Cannot read user input. Defaulting to No."
-    return 1
-  fi
-}
-
 download_artifact() {
  if [ -n "${OS_TYPE}" ] && [ -n "${ARCH_TYPE}" ]; then
    # Use the latest stable released version.
@@ -119,104 +71,17 @@ download_artifact() {
    fi

    echo "Downloading ${BIN}, OS: ${OS_TYPE}, Arch: ${ARCH_TYPE}, Version: ${VERSION}"
-    PKG_NAME="${BIN}-${OS_TYPE}-${ARCH_TYPE}-${VERSION}"
-    PACKAGE_NAME="${PKG_NAME}.tar.gz"
-    SHA256_FILE="${PKG_NAME}.sha256sum"
+    PACKAGE_NAME="${BIN}-${OS_TYPE}-${ARCH_TYPE}-${VERSION}.tar.gz"

    if [ -n "${PACKAGE_NAME}" ]; then
-      # Check if files already exist and prompt for override
-      if [ -f "${PACKAGE_NAME}" ]; then
-        echo "File ${PACKAGE_NAME} already exists."
-        if prompt_confirmation "Do you want to override it?"; then
-          echo "Overriding existing file..."
-          rm -f "${PACKAGE_NAME}"
-        else
-          echo "Skipping download. Using existing file."
-        fi
-      fi
-
-      if [ -f "${BIN}" ]; then
-        echo "Binary ${BIN} already exists."
-        if prompt_confirmation "Do you want to override it?"; then
-          echo "Will override existing binary..."
-          rm -f "${BIN}"
-        else
-          echo "Installation cancelled."
-          exit 0
-        fi
-      fi
-
-      # Download package if not exists
-      if [ ! -f "${PACKAGE_NAME}" ]; then
-        echo "Downloading ${PACKAGE_NAME}..."
-        # Use curl instead of wget for better compatibility
-        if command -v curl >/dev/null 2>&1; then
-          if ! curl -L -o "${PACKAGE_NAME}" "https://github.com/${GITHUB_ORG}/${GITHUB_REPO}/releases/download/${VERSION}/${PACKAGE_NAME}"; then
-            echo "Error: Failed to download ${PACKAGE_NAME}"
-            exit 1
-          fi
-        elif command -v wget >/dev/null 2>&1; then
-          if ! wget -O "${PACKAGE_NAME}" "https://github.com/${GITHUB_ORG}/${GITHUB_REPO}/releases/download/${VERSION}/${PACKAGE_NAME}"; then
-            echo "Error: Failed to download ${PACKAGE_NAME}"
-            exit 1
-          fi
-        else
-          echo "Error: Neither curl nor wget is available for downloading."
-          exit 1
-        fi
-      fi
-
-      # Download and verify SHA256 checksum
-      echo "Downloading SHA256 checksum..."
-      sha256_download_success=0
-      if command -v curl >/dev/null 2>&1; then
-        if curl -L -s -o "${SHA256_FILE}" "https://github.com/${GITHUB_ORG}/${GITHUB_REPO}/releases/download/${VERSION}/${SHA256_FILE}" 2>/dev/null; then
-          sha256_download_success=1
-        fi
-      elif command -v wget >/dev/null 2>&1; then
-        if wget -q -O "${SHA256_FILE}" "https://github.com/${GITHUB_ORG}/${GITHUB_REPO}/releases/download/${VERSION}/${SHA256_FILE}" 2>/dev/null; then
-          sha256_download_success=1
-        fi
-      fi
-
-      if [ $sha256_download_success -eq 1 ] && [ -f "${SHA256_FILE}" ]; then
-        expected_sha256=$(cat "${SHA256_FILE}" | cut -d' ' -f1)
-        if [ -n "$expected_sha256" ]; then
-          if ! verify_sha256 "${PACKAGE_NAME}" "${expected_sha256}"; then
-            echo "SHA256 verification failed. Removing downloaded file."
-            rm -f "${PACKAGE_NAME}" "${SHA256_FILE}"
-            exit 1
-          fi
-        else
-          echo "Warning: Could not parse SHA256 checksum from file."
-        fi
-        rm -f "${SHA256_FILE}"
-      else
-        echo "Warning: Could not download SHA256 checksum file. Skipping verification."
-      fi
+      wget "https://github.com/${GITHUB_ORG}/${GITHUB_REPO}/releases/download/${VERSION}/${PACKAGE_NAME}"

      # Extract the binary and clean the rest.
-      echo "Extracting ${PACKAGE_NAME}..."
-      if ! tar xf "${PACKAGE_NAME}"; then
-        echo "Error: Failed to extract ${PACKAGE_NAME}"
-        exit 1
-      fi
-
-      # Find the binary in the extracted directory
-      extracted_dir="${PACKAGE_NAME%.tar.gz}"
-      if [ -f "${extracted_dir}/${BIN}" ]; then
-        mv "${extracted_dir}/${BIN}" "${PWD}/"
-        rm -f "${PACKAGE_NAME}"
-        rm -rf "${extracted_dir}"
-        chmod +x "${BIN}"
-        echo "Installation completed successfully!"
-        echo "Run './${BIN} --help' to get started"
-      else
-        echo "Error: Binary ${BIN} not found in extracted archive"
-        rm -f "${PACKAGE_NAME}"
-        rm -rf "${extracted_dir}"
-        exit 1
-      fi
+      tar xvf "${PACKAGE_NAME}" && \
+      mv "${PACKAGE_NAME%.tar.gz}/${BIN}" "${PWD}" && \
+      rm -r "${PACKAGE_NAME}" && \
+      rm -r "${PACKAGE_NAME%.tar.gz}" && \
+      echo "Run './${BIN} --help' to get started"
    fi
  fi
 }
--- a/src/api/src/v1/column_def.rs
+++ b/src/api/src/v1/column_def.rs
@@ -226,20 +226,18 @@ mod tests {
        assert!(options.is_none());

        let mut schema = ColumnSchema::new("test", ConcreteDataType::string_datatype(), true)
-            .with_fulltext_options(FulltextOptions::new_unchecked(
-                true,
-                FulltextAnalyzer::English,
-                false,
-                FulltextBackend::Bloom,
-                10240,
-                0.01,
-            ))
+            .with_fulltext_options(FulltextOptions {
+                enable: true,
+                analyzer: FulltextAnalyzer::English,
+                case_sensitive: false,
+                backend: FulltextBackend::Bloom,
+            })
            .unwrap();
        schema.set_inverted_index(true);
        let options = options_from_column_schema(&schema).unwrap();
        assert_eq!(
            options.options.get(FULLTEXT_GRPC_KEY).unwrap(),
-            "{\"enable\":true,\"analyzer\":\"English\",\"case-sensitive\":false,\"backend\":\"bloom\",\"granularity\":10240,\"false-positive-rate-in-10000\":100}"
+            "{\"enable\":true,\"analyzer\":\"English\",\"case-sensitive\":false,\"backend\":\"bloom\"}"
        );
        assert_eq!(
            options.options.get(INVERTED_INDEX_GRPC_KEY).unwrap(),
@@ -249,18 +247,16 @@ mod tests {

    #[test]
    fn test_options_with_fulltext() {
-        let fulltext = FulltextOptions::new_unchecked(
-            true,
-            FulltextAnalyzer::English,
-            false,
-            FulltextBackend::Bloom,
-            10240,
-            0.01,
-        );
+        let fulltext = FulltextOptions {
+            enable: true,
+            analyzer: FulltextAnalyzer::English,
+            case_sensitive: false,
+            backend: FulltextBackend::Bloom,
+        };
        let options = options_from_fulltext(&fulltext).unwrap().unwrap();
        assert_eq!(
            options.options.get(FULLTEXT_GRPC_KEY).unwrap(),
-            "{\"enable\":true,\"analyzer\":\"English\",\"case-sensitive\":false,\"backend\":\"bloom\",\"granularity\":10240,\"false-positive-rate-in-10000\":100}"
+            "{\"enable\":true,\"analyzer\":\"English\",\"case-sensitive\":false,\"backend\":\"bloom\"}"
        );
    }

--- a/src/catalog/Cargo.toml
+++ b/src/catalog/Cargo.toml
@@ -5,7 +5,6 @@ edition.workspace = true
 license.workspace = true

 [features]
-enterprise = []
 testing = []

 [lints]
--- a/src/catalog/src/kvbackend.rs
+++ b/src/catalog/src/kvbackend.rs
@@ -14,11 +14,9 @@

 pub use client::{CachedKvBackend, CachedKvBackendBuilder, MetaKvBackend};

-mod builder;
 mod client;
 mod manager;
 mod table_cache;

-pub use builder::KvBackendCatalogManagerBuilder;
 pub use manager::KvBackendCatalogManager;
 pub use table_cache::{new_table_cache, TableCache, TableCacheRef};
--- a/src/catalog/src/kvbackend/builder.rs
+++ b/src/catalog/src/kvbackend/builder.rs
@@ -1,131 +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_catalog::consts::DEFAULT_CATALOG_NAME;
-use common_meta::cache::LayeredCacheRegistryRef;
-use common_meta::key::flow::FlowMetadataManager;
-use common_meta::key::TableMetadataManager;
-use common_meta::kv_backend::KvBackendRef;
-use common_procedure::ProcedureManagerRef;
-use moka::sync::Cache;
-use partition::manager::PartitionRuleManager;
-
-#[cfg(feature = "enterprise")]
-use crate::information_schema::InformationSchemaTableFactoryRef;
-use crate::information_schema::{InformationExtensionRef, InformationSchemaProvider};
-use crate::kvbackend::manager::{SystemCatalog, CATALOG_CACHE_MAX_CAPACITY};
-use crate::kvbackend::KvBackendCatalogManager;
-use crate::process_manager::ProcessManagerRef;
-use crate::system_schema::pg_catalog::PGCatalogProvider;
-
-pub struct KvBackendCatalogManagerBuilder {
-    information_extension: InformationExtensionRef,
-    backend: KvBackendRef,
-    cache_registry: LayeredCacheRegistryRef,
-    procedure_manager: Option<ProcedureManagerRef>,
-    process_manager: Option<ProcessManagerRef>,
-    #[cfg(feature = "enterprise")]
-    extra_information_table_factories:
-        std::collections::HashMap<String, InformationSchemaTableFactoryRef>,
-}
-
-impl KvBackendCatalogManagerBuilder {
-    pub fn new(
-        information_extension: InformationExtensionRef,
-        backend: KvBackendRef,
-        cache_registry: LayeredCacheRegistryRef,
-    ) -> Self {
-        Self {
-            information_extension,
-            backend,
-            cache_registry,
-            procedure_manager: None,
-            process_manager: None,
-            #[cfg(feature = "enterprise")]
-            extra_information_table_factories: std::collections::HashMap::new(),
-        }
-    }
-
-    pub fn with_procedure_manager(mut self, procedure_manager: ProcedureManagerRef) -> Self {
-        self.procedure_manager = Some(procedure_manager);
-        self
-    }
-
-    pub fn with_process_manager(mut self, process_manager: ProcessManagerRef) -> Self {
-        self.process_manager = Some(process_manager);
-        self
-    }
-
-    /// Sets the extra information tables.
-    #[cfg(feature = "enterprise")]
-    pub fn with_extra_information_table_factories(
-        mut self,
-        factories: std::collections::HashMap<String, InformationSchemaTableFactoryRef>,
-    ) -> Self {
-        self.extra_information_table_factories = factories;
-        self
-    }
-
-    pub fn build(self) -> Arc<KvBackendCatalogManager> {
-        let Self {
-            information_extension,
-            backend,
-            cache_registry,
-            procedure_manager,
-            process_manager,
-            #[cfg(feature = "enterprise")]
-            extra_information_table_factories,
-        } = self;
-        Arc::new_cyclic(|me| KvBackendCatalogManager {
-            information_extension,
-            partition_manager: Arc::new(PartitionRuleManager::new(
-                backend.clone(),
-                cache_registry
-                    .get()
-                    .expect("Failed to get table_route_cache"),
-            )),
-            table_metadata_manager: Arc::new(TableMetadataManager::new(backend.clone())),
-            system_catalog: SystemCatalog {
-                catalog_manager: me.clone(),
-                catalog_cache: Cache::new(CATALOG_CACHE_MAX_CAPACITY),
-                pg_catalog_cache: Cache::new(CATALOG_CACHE_MAX_CAPACITY),
-                information_schema_provider: {
-                    let provider = InformationSchemaProvider::new(
-                        DEFAULT_CATALOG_NAME.to_string(),
-                        me.clone(),
-                        Arc::new(FlowMetadataManager::new(backend.clone())),
-                        process_manager.clone(),
-                        backend.clone(),
-                    );
-                    #[cfg(feature = "enterprise")]
-                    let provider = provider
-                        .with_extra_table_factories(extra_information_table_factories.clone());
-                    Arc::new(provider)
-                },
-                pg_catalog_provider: Arc::new(PGCatalogProvider::new(
-                    DEFAULT_CATALOG_NAME.to_string(),
-                    me.clone(),
-                )),
-                backend,
-                process_manager,
-                #[cfg(feature = "enterprise")]
-                extra_information_table_factories,
-            },
-            cache_registry,
-            procedure_manager,
-        })
-    }
-}
--- a/src/catalog/src/kvbackend/manager.rs
+++ b/src/catalog/src/kvbackend/manager.rs
@@ -28,18 +28,17 @@ use common_meta::cache::{
 use common_meta::key::catalog_name::CatalogNameKey;
 use common_meta::key::flow::FlowMetadataManager;
 use common_meta::key::schema_name::SchemaNameKey;
-use common_meta::key::table_info::{TableInfoManager, TableInfoValue};
+use common_meta::key::table_info::TableInfoValue;
 use common_meta::key::table_name::TableNameKey;
-use common_meta::key::TableMetadataManagerRef;
+use common_meta::key::{TableMetadataManager, TableMetadataManagerRef};
 use common_meta::kv_backend::KvBackendRef;
 use common_procedure::ProcedureManagerRef;
 use futures_util::stream::BoxStream;
 use futures_util::{StreamExt, TryStreamExt};
 use moka::sync::Cache;
-use partition::manager::PartitionRuleManagerRef;
+use partition::manager::{PartitionRuleManager, PartitionRuleManagerRef};
 use session::context::{Channel, QueryContext};
 use snafu::prelude::*;
-use store_api::metric_engine_consts::METRIC_ENGINE_NAME;
 use table::dist_table::DistTable;
 use table::metadata::TableId;
 use table::table::numbers::{NumbersTable, NUMBERS_TABLE_NAME};
@@ -52,8 +51,6 @@ use crate::error::{
    CacheNotFoundSnafu, GetTableCacheSnafu, InvalidTableInfoInCatalogSnafu, ListCatalogsSnafu,
    ListSchemasSnafu, ListTablesSnafu, Result, TableMetadataManagerSnafu,
 };
-#[cfg(feature = "enterprise")]
-use crate::information_schema::InformationSchemaTableFactoryRef;
 use crate::information_schema::{InformationExtensionRef, InformationSchemaProvider};
 use crate::kvbackend::TableCacheRef;
 use crate::process_manager::ProcessManagerRef;
@@ -69,22 +66,60 @@ use crate::CatalogManager;
 #[derive(Clone)]
 pub struct KvBackendCatalogManager {
    /// Provides the extension methods for the `information_schema` tables
-    pub(super) information_extension: InformationExtensionRef,
+    information_extension: InformationExtensionRef,
    /// Manages partition rules.
-    pub(super) partition_manager: PartitionRuleManagerRef,
+    partition_manager: PartitionRuleManagerRef,
    /// Manages table metadata.
-    pub(super) table_metadata_manager: TableMetadataManagerRef,
+    table_metadata_manager: TableMetadataManagerRef,
    /// A sub-CatalogManager that handles system tables
-    pub(super) system_catalog: SystemCatalog,
+    system_catalog: SystemCatalog,
    /// Cache registry for all caches.
-    pub(super) cache_registry: LayeredCacheRegistryRef,
+    cache_registry: LayeredCacheRegistryRef,
    /// Only available in `Standalone` mode.
-    pub(super) procedure_manager: Option<ProcedureManagerRef>,
+    procedure_manager: Option<ProcedureManagerRef>,
 }

-pub(super) const CATALOG_CACHE_MAX_CAPACITY: u64 = 128;
+const CATALOG_CACHE_MAX_CAPACITY: u64 = 128;

 impl KvBackendCatalogManager {
+    pub fn new(
+        information_extension: InformationExtensionRef,
+        backend: KvBackendRef,
+        cache_registry: LayeredCacheRegistryRef,
+        procedure_manager: Option<ProcedureManagerRef>,
+        process_manager: Option<ProcessManagerRef>,
+    ) -> Arc<Self> {
+        Arc::new_cyclic(|me| Self {
+            information_extension,
+            partition_manager: Arc::new(PartitionRuleManager::new(
+                backend.clone(),
+                cache_registry
+                    .get()
+                    .expect("Failed to get table_route_cache"),
+            )),
+            table_metadata_manager: Arc::new(TableMetadataManager::new(backend.clone())),
+            system_catalog: SystemCatalog {
+                catalog_manager: me.clone(),
+                catalog_cache: Cache::new(CATALOG_CACHE_MAX_CAPACITY),
+                pg_catalog_cache: Cache::new(CATALOG_CACHE_MAX_CAPACITY),
+                information_schema_provider: Arc::new(InformationSchemaProvider::new(
+                    DEFAULT_CATALOG_NAME.to_string(),
+                    me.clone(),
+                    Arc::new(FlowMetadataManager::new(backend.clone())),
+                    process_manager.clone(),
+                )),
+                pg_catalog_provider: Arc::new(PGCatalogProvider::new(
+                    DEFAULT_CATALOG_NAME.to_string(),
+                    me.clone(),
+                )),
+                backend,
+                process_manager,
+            },
+            cache_registry,
+            procedure_manager,
+        })
+    }
+
    pub fn view_info_cache(&self) -> Result<ViewInfoCacheRef> {
        self.cache_registry.get().context(CacheNotFoundSnafu {
            name: "view_info_cache",
@@ -107,61 +142,6 @@ impl KvBackendCatalogManager {
    pub fn procedure_manager(&self) -> Option<ProcedureManagerRef> {
        self.procedure_manager.clone()
    }
-
-    // Override logical table's partition key indices with physical table's.
-    async fn override_logical_table_partition_key_indices(
-        table_route_cache: &TableRouteCacheRef,
-        table_info_manager: &TableInfoManager,
-        table: TableRef,
-    ) -> Result<TableRef> {
-        // If the table is not a metric table, return the table directly.
-        if table.table_info().meta.engine != METRIC_ENGINE_NAME {
-            return Ok(table);
-        }
-
-        if let Some(table_route_value) = table_route_cache
-            .get(table.table_info().table_id())
-            .await
-            .context(TableMetadataManagerSnafu)?
-            && let TableRoute::Logical(logical_route) = &*table_route_value
-            && let Some(physical_table_info_value) = table_info_manager
-                .get(logical_route.physical_table_id())
-                .await
-                .context(TableMetadataManagerSnafu)?
-        {
-            let mut new_table_info = (*table.table_info()).clone();
-
-            // Remap partition key indices from physical table to logical table
-            new_table_info.meta.partition_key_indices = physical_table_info_value
-                .table_info
-                .meta
-                .partition_key_indices
-                .iter()
-                .filter_map(|&physical_index| {
-                    // Get the column name from the physical table using the physical index
-                    physical_table_info_value
-                        .table_info
-                        .meta
-                        .schema
-                        .column_schemas
-                        .get(physical_index)
-                        .and_then(|physical_column| {
-                            // Find the corresponding index in the logical table schema
-                            new_table_info
-                                .meta
-                                .schema
-                                .column_index_by_name(physical_column.name.as_str())
-                        })
-                })
-                .collect();
-
-            let new_table = DistTable::table(Arc::new(new_table_info));
-
-            return Ok(new_table);
-        }
-
-        Ok(table)
-    }
 }

 #[async_trait::async_trait]
@@ -288,7 +268,10 @@ impl CatalogManager for KvBackendCatalogManager {
        let table_cache: TableCacheRef = self.cache_registry.get().context(CacheNotFoundSnafu {
            name: "table_cache",
        })?;
-
+        let table_route_cache: TableRouteCacheRef =
+            self.cache_registry.get().context(CacheNotFoundSnafu {
+                name: "table_route_cache",
+            })?;
        let table = table_cache
            .get_by_ref(&TableName {
                catalog_name: catalog_name.to_string(),
@@ -298,18 +281,55 @@ impl CatalogManager for KvBackendCatalogManager {
            .await
            .context(GetTableCacheSnafu)?;

-        if let Some(table) = table {
-            let table_route_cache: TableRouteCacheRef =
-                self.cache_registry.get().context(CacheNotFoundSnafu {
-                    name: "table_route_cache",
-                })?;
-            return Self::override_logical_table_partition_key_indices(
-                &table_route_cache,
-                self.table_metadata_manager.table_info_manager(),
-                table,
-            )
-            .await
-            .map(Some);
+        // Override logical table's partition key indices with physical table's.
+        if let Some(table) = &table
+            && let Some(table_route_value) = table_route_cache
+                .get(table.table_info().table_id())
+                .await
+                .context(TableMetadataManagerSnafu)?
+            && let TableRoute::Logical(logical_route) = &*table_route_value
+            && let Some(physical_table_info_value) = self
+                .table_metadata_manager
+                .table_info_manager()
+                .get(logical_route.physical_table_id())
+                .await
+                .context(TableMetadataManagerSnafu)?
+        {
+            let mut new_table_info = (*table.table_info()).clone();
+            // Gather all column names from the logical table
+            let logical_column_names: std::collections::HashSet<_> = new_table_info
+                .meta
+                .schema
+                .column_schemas()
+                .iter()
+                .map(|col| &col.name)
+                .collect();
+
+            // Only preserve partition key indices where the corresponding columns exist in logical table
+            new_table_info.meta.partition_key_indices = physical_table_info_value
+                .table_info
+                .meta
+                .partition_key_indices
+                .iter()
+                .filter(|&&index| {
+                    if let Some(physical_column) = physical_table_info_value
+                        .table_info
+                        .meta
+                        .schema
+                        .column_schemas
+                        .get(index)
+                    {
+                        logical_column_names.contains(&physical_column.name)
+                    } else {
+                        false
+                    }
+                })
+                .cloned()
+                .collect();
+
+            let new_table = DistTable::table(Arc::new(new_table_info));
+
+            return Ok(Some(new_table));
        }

        if channel == Channel::Postgres {
@@ -322,7 +342,7 @@ impl CatalogManager for KvBackendCatalogManager {
            }
        }

-        Ok(None)
+        Ok(table)
    }

    async fn tables_by_ids(
@@ -374,20 +394,8 @@ impl CatalogManager for KvBackendCatalogManager {
        let catalog = catalog.to_string();
        let schema = schema.to_string();
        let semaphore = Arc::new(Semaphore::new(CONCURRENCY));
-        let table_route_cache: Result<TableRouteCacheRef> =
-            self.cache_registry.get().context(CacheNotFoundSnafu {
-                name: "table_route_cache",
-            });

        common_runtime::spawn_global(async move {
-            let table_route_cache = match table_route_cache {
-                Ok(table_route_cache) => table_route_cache,
-                Err(e) => {
-                    let _ = tx.send(Err(e)).await;
-                    return;
-                }
-            };
-
            let table_id_stream = metadata_manager
                .table_name_manager()
                .tables(&catalog, &schema)
@@ -414,7 +422,6 @@ impl CatalogManager for KvBackendCatalogManager {
                let metadata_manager = metadata_manager.clone();
                let tx = tx.clone();
                let semaphore = semaphore.clone();
-                let table_route_cache = table_route_cache.clone();
                common_runtime::spawn_global(async move {
                    // we don't explicitly close the semaphore so just ignore the potential error.
                    let _ = semaphore.acquire().await;
@@ -432,16 +439,6 @@ impl CatalogManager for KvBackendCatalogManager {
                    };

                    for table in table_info_values.into_values().map(build_table) {
-                        let table = if let Ok(table) = table {
-                            Self::override_logical_table_partition_key_indices(
-                                &table_route_cache,
-                                metadata_manager.table_info_manager(),
-                                table,
-                            )
-                            .await
-                        } else {
-                            table
-                        };
                        if tx.send(table).await.is_err() {
                            return;
                        }
@@ -471,19 +468,16 @@ fn build_table(table_info_value: TableInfoValue) -> Result<TableRef> {
 /// - information_schema.{tables}
 /// - pg_catalog.{tables}
 #[derive(Clone)]
-pub(super) struct SystemCatalog {
-    pub(super) catalog_manager: Weak<KvBackendCatalogManager>,
-    pub(super) catalog_cache: Cache<String, Arc<InformationSchemaProvider>>,
-    pub(super) pg_catalog_cache: Cache<String, Arc<PGCatalogProvider>>,
+struct SystemCatalog {
+    catalog_manager: Weak<KvBackendCatalogManager>,
+    catalog_cache: Cache<String, Arc<InformationSchemaProvider>>,
+    pg_catalog_cache: Cache<String, Arc<PGCatalogProvider>>,

    // system_schema_provider for default catalog
-    pub(super) information_schema_provider: Arc<InformationSchemaProvider>,
-    pub(super) pg_catalog_provider: Arc<PGCatalogProvider>,
-    pub(super) backend: KvBackendRef,
-    pub(super) process_manager: Option<ProcessManagerRef>,
-    #[cfg(feature = "enterprise")]
-    pub(super) extra_information_table_factories:
-        std::collections::HashMap<String, InformationSchemaTableFactoryRef>,
+    information_schema_provider: Arc<InformationSchemaProvider>,
+    pg_catalog_provider: Arc<PGCatalogProvider>,
+    backend: KvBackendRef,
+    process_manager: Option<ProcessManagerRef>,
 }

 impl SystemCatalog {
@@ -547,17 +541,12 @@ impl SystemCatalog {
        if schema == INFORMATION_SCHEMA_NAME {
            let information_schema_provider =
                self.catalog_cache.get_with_by_ref(catalog, move || {
-                    let provider = InformationSchemaProvider::new(
+                    Arc::new(InformationSchemaProvider::new(
                        catalog.to_string(),
                        self.catalog_manager.clone(),
                        Arc::new(FlowMetadataManager::new(self.backend.clone())),
                        self.process_manager.clone(),
-                        self.backend.clone(),
-                    );
-                    #[cfg(feature = "enterprise")]
-                    let provider = provider
-                        .with_extra_table_factories(self.extra_information_table_factories.clone());
-                    Arc::new(provider)
+                    ))
                });
            information_schema_provider.table(table_name)
        } else if schema == PG_CATALOG_NAME && channel == Channel::Postgres {
--- a/src/catalog/src/memory/manager.rs
+++ b/src/catalog/src/memory/manager.rs
@@ -352,13 +352,11 @@ impl MemoryCatalogManager {
    }

    fn create_catalog_entry(self: &Arc<Self>, catalog: String) -> SchemaEntries {
-        let backend = Arc::new(MemoryKvBackend::new());
        let information_schema_provider = InformationSchemaProvider::new(
            catalog,
            Arc::downgrade(self) as Weak<dyn CatalogManager>,
-            Arc::new(FlowMetadataManager::new(backend.clone())),
+            Arc::new(FlowMetadataManager::new(Arc::new(MemoryKvBackend::new()))),
            None, // we don't need ProcessManager on regions server.
-            backend,
        );
        let information_schema = information_schema_provider.tables().clone();

--- a/src/catalog/src/process_manager.rs
+++ b/src/catalog/src/process_manager.rs
@@ -21,7 +21,7 @@ use std::sync::{Arc, RwLock};
 use api::v1::frontend::{KillProcessRequest, ListProcessRequest, ProcessInfo};
 use common_base::cancellation::CancellationHandle;
 use common_frontend::selector::{FrontendSelector, MetaClientSelector};
-use common_telemetry::{debug, info, warn};
+use common_telemetry::{debug, info};
 use common_time::util::current_time_millis;
 use meta_client::MetaClientRef;
 use snafu::{ensure, OptionExt, ResultExt};
@@ -141,20 +141,14 @@ impl ProcessManager {
                .await
                .context(error::InvokeFrontendSnafu)?;
            for mut f in frontends {
-                let result = f
-                    .list_process(ListProcessRequest {
+                processes.extend(
+                    f.list_process(ListProcessRequest {
                        catalog: catalog.unwrap_or_default().to_string(),
                    })
                    .await
-                    .context(error::InvokeFrontendSnafu);
-                match result {
-                    Ok(resp) => {
-                        processes.extend(resp.processes);
-                    }
-                    Err(e) => {
-                        warn!(e; "Skipping failing node: {:?}", f)
-                    }
-                }
+                    .context(error::InvokeFrontendSnafu)?
+                    .processes,
+                );
            }
        }
        processes.extend(self.local_processes(catalog)?);
--- a/src/catalog/src/system_schema.rs
+++ b/src/catalog/src/system_schema.rs
@@ -15,7 +15,7 @@
 pub mod information_schema;
 mod memory_table;
 pub mod pg_catalog;
-pub mod predicate;
+mod predicate;
 mod utils;

 use std::collections::HashMap;
@@ -96,7 +96,7 @@ trait SystemSchemaProviderInner {
    }
 }

-pub trait SystemTable {
+pub(crate) trait SystemTable {
    fn table_id(&self) -> TableId;

    fn table_name(&self) -> &'static str;
@@ -110,7 +110,7 @@ pub trait SystemTable {
    }
 }

-pub type SystemTableRef = Arc<dyn SystemTable + Send + Sync>;
+pub(crate) type SystemTableRef = Arc<dyn SystemTable + Send + Sync>;

 struct SystemTableDataSource {
    table: SystemTableRef,
--- a/src/catalog/src/system_schema/information_schema.rs
+++ b/src/catalog/src/system_schema/information_schema.rs
@@ -38,7 +38,6 @@ use common_meta::cluster::NodeInfo;
 use common_meta::datanode::RegionStat;
 use common_meta::key::flow::flow_state::FlowStat;
 use common_meta::key::flow::FlowMetadataManager;
-use common_meta::kv_backend::KvBackendRef;
 use common_procedure::ProcedureInfo;
 use common_recordbatch::SendableRecordBatchStream;
 use datatypes::schema::SchemaRef;
@@ -113,25 +112,6 @@ macro_rules! setup_memory_table {
    };
 }

-#[cfg(feature = "enterprise")]
-pub struct MakeInformationTableRequest {
-    pub catalog_name: String,
-    pub catalog_manager: Weak<dyn CatalogManager>,
-    pub kv_backend: KvBackendRef,
-}
-
-/// A factory trait for making information schema tables.
-///
-/// This trait allows for extensibility of the information schema by providing
-/// a way to dynamically create custom information schema tables.
-#[cfg(feature = "enterprise")]
-pub trait InformationSchemaTableFactory {
-    fn make_information_table(&self, req: MakeInformationTableRequest) -> SystemTableRef;
-}
-
-#[cfg(feature = "enterprise")]
-pub type InformationSchemaTableFactoryRef = Arc<dyn InformationSchemaTableFactory + Send + Sync>;
-
 /// The `information_schema` tables info provider.
 pub struct InformationSchemaProvider {
    catalog_name: String,
@@ -139,10 +119,6 @@ pub struct InformationSchemaProvider {
    process_manager: Option<ProcessManagerRef>,
    flow_metadata_manager: Arc<FlowMetadataManager>,
    tables: HashMap<String, TableRef>,
-    #[allow(dead_code)]
-    kv_backend: KvBackendRef,
-    #[cfg(feature = "enterprise")]
-    extra_table_factories: HashMap<String, InformationSchemaTableFactoryRef>,
 }

 impl SystemSchemaProvider for InformationSchemaProvider {
@@ -152,7 +128,6 @@ impl SystemSchemaProvider for InformationSchemaProvider {
        &self.tables
    }
 }
-
 impl SystemSchemaProviderInner for InformationSchemaProvider {
    fn catalog_name(&self) -> &str {
        &self.catalog_name
@@ -240,22 +215,7 @@ impl SystemSchemaProviderInner for InformationSchemaProvider {
                .process_manager
                .as_ref()
                .map(|p| Arc::new(InformationSchemaProcessList::new(p.clone())) as _),
-            table_name => {
-                #[cfg(feature = "enterprise")]
-                return self.extra_table_factories.get(table_name).map(|factory| {
-                    let req = MakeInformationTableRequest {
-                        catalog_name: self.catalog_name.clone(),
-                        catalog_manager: self.catalog_manager.clone(),
-                        kv_backend: self.kv_backend.clone(),
-                    };
-                    factory.make_information_table(req)
-                });
-                #[cfg(not(feature = "enterprise"))]
-                {
-                    let _ = table_name;
-                    None
-                }
-            }
+            _ => None,
        }
    }
 }
@@ -266,7 +226,6 @@ impl InformationSchemaProvider {
        catalog_manager: Weak<dyn CatalogManager>,
        flow_metadata_manager: Arc<FlowMetadataManager>,
        process_manager: Option<ProcessManagerRef>,
-        kv_backend: KvBackendRef,
    ) -> Self {
        let mut provider = Self {
            catalog_name,
@@ -274,9 +233,6 @@ impl InformationSchemaProvider {
            flow_metadata_manager,
            process_manager,
            tables: HashMap::new(),
-            kv_backend,
-            #[cfg(feature = "enterprise")]
-            extra_table_factories: HashMap::new(),
        };

        provider.build_tables();
@@ -284,16 +240,6 @@ impl InformationSchemaProvider {
        provider
    }

-    #[cfg(feature = "enterprise")]
-    pub(crate) fn with_extra_table_factories(
-        mut self,
-        factories: HashMap<String, InformationSchemaTableFactoryRef>,
-    ) -> Self {
-        self.extra_table_factories = factories;
-        self.build_tables();
-        self
-    }
-
    fn build_tables(&mut self) {
        let mut tables = HashMap::new();

@@ -344,19 +290,16 @@ impl InformationSchemaProvider {
        if let Some(process_list) = self.build_table(PROCESS_LIST) {
            tables.insert(PROCESS_LIST.to_string(), process_list);
        }
-        #[cfg(feature = "enterprise")]
-        for name in self.extra_table_factories.keys() {
-            tables.insert(name.to_string(), self.build_table(name).expect(name));
-        }
        // Add memory tables
        for name in MEMORY_TABLES.iter() {
            tables.insert((*name).to_string(), self.build_table(name).expect(name));
        }
+
        self.tables = tables;
    }
 }

-pub trait InformationTable {
+trait InformationTable {
    fn table_id(&self) -> TableId;

    fn table_name(&self) -> &'static str;
--- a/src/catalog/src/system_schema/information_schema/table_names.rs
+++ b/src/catalog/src/system_schema/information_schema/table_names.rs
@@ -48,4 +48,3 @@ pub const FLOWS: &str = "flows";
 pub const PROCEDURE_INFO: &str = "procedure_info";
 pub const REGION_STATISTICS: &str = "region_statistics";
 pub const PROCESS_LIST: &str = "process_list";
-pub const TRIGGER_LIST: &str = "trigger_list";
--- a/src/catalog/src/system_schema/pg_catalog/pg_class.rs
+++ b/src/catalog/src/system_schema/pg_catalog/pg_class.rs
@@ -169,7 +169,7 @@ impl DfPartitionStream for PGClass {
 }

 /// Builds the `pg_catalog.pg_class` table row by row
-/// TODO(J0HN50N133): `relowner` is always the [`DUMMY_OWNER_ID`] because we don't have users.
+/// TODO(J0HN50N133): `relowner` is always the [`DUMMY_OWNER_ID`] cuz we don't have user.
 /// Once we have user system, make it the actual owner of the table.
 struct PGClassBuilder {
    schema: SchemaRef,
--- a/src/catalog/src/table_source.rs
+++ b/src/catalog/src/table_source.rs
@@ -207,7 +207,6 @@ mod tests {
    use session::context::QueryContext;

    use super::*;
-    use crate::kvbackend::KvBackendCatalogManagerBuilder;
    use crate::memory::MemoryCatalogManager;

    #[test]
@@ -324,13 +323,13 @@ mod tests {
            .build(),
        );

-        let catalog_manager = KvBackendCatalogManagerBuilder::new(
+        let catalog_manager = KvBackendCatalogManager::new(
            Arc::new(NoopInformationExtension),
            backend.clone(),
            layered_cache_registry,
-        )
-        .build();
-
+            None,
+            None,
+        );
        let table_metadata_manager = TableMetadataManager::new(backend);
        let mut view_info = common_meta::key::test_utils::new_test_table_info(1024, vec![]);
        view_info.table_type = TableType::View;
--- a/src/cli/Cargo.toml
+++ b/src/cli/Cargo.toml
@@ -43,6 +43,7 @@ common-time.workspace = true
 common-version.workspace = true
 common-wal.workspace = true
 datatypes.workspace = true
+either = "1.8"
 etcd-client.workspace = true
 futures.workspace = true
 humantime.workspace = true
--- a/src/cli/src/bench.rs
+++ b/src/cli/src/bench.rs
@@ -160,7 +160,6 @@ fn create_table_info(table_id: TableId, table_name: TableName) -> RawTableInfo {
        options: Default::default(),
        region_numbers: (1..=100).collect(),
        partition_key_indices: vec![],
-        column_ids: vec![],
    };

    RawTableInfo {
--- a/src/cli/src/lib.rs
+++ b/src/cli/src/lib.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#![allow(clippy::print_stdout)]
 mod bench;
 mod data;
 mod database;
--- a/src/cli/src/metadata/repair.rs
+++ b/src/cli/src/metadata/repair.rs
@@ -241,6 +241,7 @@ impl RepairTool {
            let alter_table_request = alter_table::make_alter_region_request_for_peer(
                logical_table_id,
                &alter_table_expr,
+                full_table_metadata.table_info.ident.version,
                peer,
                physical_region_routes,
            )?;
--- a/src/cli/src/metadata/repair/alter_table.rs
+++ b/src/cli/src/metadata/repair/alter_table.rs
@@ -66,6 +66,7 @@ pub fn generate_alter_table_expr_for_all_columns(
 pub fn make_alter_region_request_for_peer(
    logical_table_id: TableId,
    alter_table_expr: &AlterTableExpr,
+    schema_version: u64,
    peer: &Peer,
    region_routes: &[RegionRoute],
 ) -> Result<RegionRequest> {
@@ -73,7 +74,7 @@ pub fn make_alter_region_request_for_peer(
    let mut requests = Vec::with_capacity(regions_on_this_peer.len());
    for region_number in &regions_on_this_peer {
        let region_id = RegionId::new(logical_table_id, *region_number);
-        let request = make_alter_region_request(region_id, alter_table_expr);
+        let request = make_alter_region_request(region_id, alter_table_expr, schema_version);
        requests.push(request);
    }

--- a/src/cli/src/metadata/snapshot.rs
+++ b/src/cli/src/metadata/snapshot.rs
@@ -301,6 +301,7 @@ struct MetaInfoTool {

 #[async_trait]
 impl Tool for MetaInfoTool {
+    #[allow(clippy::print_stdout)]
    async fn do_work(&self) -> std::result::Result<(), BoxedError> {
        let result = MetadataSnapshotManager::info(
            &self.inner,
--- a/src/client/src/database.rs
+++ b/src/client/src/database.rs
@@ -23,7 +23,7 @@ use api::v1::greptime_request::Request;
 use api::v1::query_request::Query;
 use api::v1::{
    AlterTableExpr, AuthHeader, Basic, CreateTableExpr, DdlRequest, GreptimeRequest,
-    InsertRequests, QueryRequest, RequestHeader, RowInsertRequests,
+    InsertRequests, QueryRequest, RequestHeader,
 };
 use arrow_flight::{FlightData, Ticket};
 use async_stream::stream;
@@ -31,7 +31,7 @@ use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use common_catalog::build_db_string;
 use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
-use common_error::ext::BoxedError;
+use common_error::ext::{BoxedError, ErrorExt};
 use common_grpc::flight::do_put::DoPutResponse;
 use common_grpc::flight::{FlightDecoder, FlightMessage};
 use common_query::Output;
@@ -48,7 +48,7 @@ use tonic::transport::Channel;

 use crate::error::{
    ConvertFlightDataSnafu, Error, FlightGetSnafu, IllegalFlightMessagesSnafu,
-    InvalidTonicMetadataValueSnafu,
+    InvalidTonicMetadataValueSnafu, ServerSnafu,
 };
 use crate::{error, from_grpc_response, Client, Result};

@@ -118,7 +118,6 @@ impl Database {
        }
    }

-    /// Set the catalog for the database client.
    pub fn set_catalog(&mut self, catalog: impl Into<String>) {
        self.catalog = catalog.into();
    }
@@ -131,7 +130,6 @@ impl Database {
        }
    }

-    /// Set the schema for the database client.
    pub fn set_schema(&mut self, schema: impl Into<String>) {
        self.schema = schema.into();
    }
@@ -144,24 +142,20 @@ impl Database {
        }
    }

-    /// Set the timezone for the database client.
    pub fn set_timezone(&mut self, timezone: impl Into<String>) {
        self.timezone = timezone.into();
    }

-    /// Set the auth scheme for the database client.
    pub fn set_auth(&mut self, auth: AuthScheme) {
        self.ctx.auth_header = Some(AuthHeader {
            auth_scheme: Some(auth),
        });
    }

-    /// Make an InsertRequests request to the database.
    pub async fn insert(&self, requests: InsertRequests) -> Result<u32> {
        self.handle(Request::Inserts(requests)).await
    }

-    /// Make an InsertRequests request to the database with hints.
    pub async fn insert_with_hints(
        &self,
        requests: InsertRequests,
@@ -178,28 +172,6 @@ impl Database {
        from_grpc_response(response)
    }

-    /// Make a RowInsertRequests request to the database.
-    pub async fn row_inserts(&self, requests: RowInsertRequests) -> Result<u32> {
-        self.handle(Request::RowInserts(requests)).await
-    }
-
-    /// Make a RowInsertRequests request to the database with hints.
-    pub async fn row_inserts_with_hints(
-        &self,
-        requests: RowInsertRequests,
-        hints: &[(&str, &str)],
-    ) -> Result<u32> {
-        let mut client = make_database_client(&self.client)?.inner;
-        let request = self.to_rpc_request(Request::RowInserts(requests));
-
-        let mut request = tonic::Request::new(request);
-        let metadata = request.metadata_mut();
-        Self::put_hints(metadata, hints)?;
-
-        let response = client.handle(request).await?.into_inner();
-        from_grpc_response(response)
-    }
-
    fn put_hints(metadata: &mut MetadataMap, hints: &[(&str, &str)]) -> Result<()> {
        let Some(value) = hints
            .iter()
@@ -215,7 +187,6 @@ impl Database {
        Ok(())
    }

-    /// Make a request to the database.
    pub async fn handle(&self, request: Request) -> Result<u32> {
        let mut client = make_database_client(&self.client)?.inner;
        let request = self.to_rpc_request(request);
@@ -225,22 +196,12 @@ impl Database {

    /// Retry if connection fails, max_retries is the max number of retries, so the total wait time
    /// is `max_retries * GRPC_CONN_TIMEOUT`
-    pub async fn handle_with_retry(
-        &self,
-        request: Request,
-        max_retries: u32,
-        hints: &[(&str, &str)],
-    ) -> Result<u32> {
+    pub async fn handle_with_retry(&self, request: Request, max_retries: u32) -> Result<u32> {
        let mut client = make_database_client(&self.client)?.inner;
        let mut retries = 0;
-
        let request = self.to_rpc_request(request);
-
        loop {
-            let mut tonic_request = tonic::Request::new(request.clone());
-            let metadata = tonic_request.metadata_mut();
-            Self::put_hints(metadata, hints)?;
-            let raw_response = client.handle(tonic_request).await;
+            let raw_response = client.handle(request.clone()).await;
            match (raw_response, retries < max_retries) {
                (Ok(resp), _) => return from_grpc_response(resp.into_inner()),
                (Err(err), true) => {
@@ -279,7 +240,6 @@ impl Database {
        }
    }

-    /// Executes a SQL query without any hints.
    pub async fn sql<S>(&self, sql: S) -> Result<Output>
    where
        S: AsRef<str>,
@@ -287,7 +247,6 @@ impl Database {
        self.sql_with_hint(sql, &[]).await
    }

-    /// Executes a SQL query with optional hints for query optimization.
    pub async fn sql_with_hint<S>(&self, sql: S, hints: &[(&str, &str)]) -> Result<Output>
    where
        S: AsRef<str>,
@@ -298,7 +257,6 @@ impl Database {
        self.do_get(request, hints).await
    }

-    /// Executes a logical plan directly without SQL parsing.
    pub async fn logical_plan(&self, logical_plan: Vec<u8>) -> Result<Output> {
        let request = Request::Query(QueryRequest {
            query: Some(Query::LogicalPlan(logical_plan)),
@@ -306,7 +264,6 @@ impl Database {
        self.do_get(request, &[]).await
    }

-    /// Creates a new table using the provided table expression.
    pub async fn create(&self, expr: CreateTableExpr) -> Result<Output> {
        let request = Request::Ddl(DdlRequest {
            expr: Some(DdlExpr::CreateTable(expr)),
@@ -314,7 +271,6 @@ impl Database {
        self.do_get(request, &[]).await
    }

-    /// Alters an existing table using the provided alter expression.
    pub async fn alter(&self, expr: AlterTableExpr) -> Result<Output> {
        let request = Request::Ddl(DdlRequest {
            expr: Some(DdlExpr::AlterTable(expr)),
@@ -336,16 +292,21 @@ impl Database {
        let response = client.mut_inner().do_get(request).await.or_else(|e| {
            let tonic_code = e.code();
            let e: Error = e.into();
+            let code = e.status_code();
+            let msg = e.to_string();
+            let error =
+                Err(BoxedError::new(ServerSnafu { code, msg }.build())).with_context(|_| {
+                    FlightGetSnafu {
+                        addr: client.addr().to_string(),
+                        tonic_code,
+                    }
+                });
            error!(
                "Failed to do Flight get, addr: {}, code: {}, source: {:?}",
                client.addr(),
                tonic_code,
-                e
+                error
            );
-            let error = Err(BoxedError::new(e)).with_context(|_| FlightGetSnafu {
-                addr: client.addr().to_string(),
-                tonic_code,
-            });
            error
        })?;

@@ -475,11 +436,8 @@ mod tests {

    use api::v1::auth_header::AuthScheme;
    use api::v1::{AuthHeader, Basic};
-    use common_error::status_code::StatusCode;
-    use tonic::{Code, Status};

    use super::*;
-    use crate::error::TonicSnafu;

    #[test]
    fn test_flight_ctx() {
@@ -502,19 +460,4 @@ mod tests {
            })
        )
    }
-
-    #[test]
-    fn test_from_tonic_status() {
-        let expected = TonicSnafu {
-            code: StatusCode::Internal,
-            msg: "blabla".to_string(),
-            tonic_code: Code::Internal,
-        }
-        .build();
-
-        let status = Status::new(Code::Internal, "blabla");
-        let actual: Error = status.into();
-
-        assert_eq!(expected.to_string(), actual.to_string());
-    }
 }
--- a/src/client/src/error.rs
+++ b/src/client/src/error.rs
@@ -14,13 +14,13 @@

 use std::any::Any;

-use common_error::define_from_tonic_status;
 use common_error::ext::{BoxedError, ErrorExt};
-use common_error::status_code::StatusCode;
+use common_error::status_code::{convert_tonic_code_to_status_code, StatusCode};
+use common_error::{GREPTIME_DB_HEADER_ERROR_CODE, GREPTIME_DB_HEADER_ERROR_MSG};
 use common_macro::stack_trace_debug;
 use snafu::{location, Location, Snafu};
 use tonic::metadata::errors::InvalidMetadataValue;
-use tonic::Code;
+use tonic::{Code, Status};

 #[derive(Snafu)]
 #[snafu(visibility(pub))]
@@ -124,15 +124,6 @@ pub enum Error {
        location: Location,
        source: datatypes::error::Error,
    },
-
-    #[snafu(display("{}", msg))]
-    Tonic {
-        code: StatusCode,
-        msg: String,
-        tonic_code: Code,
-        #[snafu(implicit)]
-        location: Location,
-    },
 }

 pub type Result<T> = std::result::Result<T, Error>;
@@ -144,7 +135,7 @@ impl ErrorExt for Error {
            | Error::MissingField { .. }
            | Error::IllegalDatabaseResponse { .. } => StatusCode::Internal,

-            Error::Server { code, .. } | Error::Tonic { code, .. } => *code,
+            Error::Server { code, .. } => *code,
            Error::FlightGet { source, .. }
            | Error::RegionServer { source, .. }
            | Error::FlowServer { source, .. } => source.status_code(),
@@ -162,7 +153,34 @@ impl ErrorExt for Error {
    }
 }

-define_from_tonic_status!(Error, Tonic);
+impl From<Status> for Error {
+    fn from(e: Status) -> Self {
+        fn get_metadata_value(e: &Status, key: &str) -> Option<String> {
+            e.metadata()
+                .get(key)
+                .and_then(|v| String::from_utf8(v.as_bytes().to_vec()).ok())
+        }
+
+        let code = get_metadata_value(&e, GREPTIME_DB_HEADER_ERROR_CODE).and_then(|s| {
+            if let Ok(code) = s.parse::<u32>() {
+                StatusCode::from_u32(code)
+            } else {
+                None
+            }
+        });
+        let tonic_code = e.code();
+        let code = code.unwrap_or_else(|| convert_tonic_code_to_status_code(tonic_code));
+
+        let msg = get_metadata_value(&e, GREPTIME_DB_HEADER_ERROR_MSG)
+            .unwrap_or_else(|| e.message().to_string());
+
+        Self::Server {
+            code,
+            msg,
+            location: location!(),
+        }
+    }
+}

 impl Error {
    pub fn should_retry(&self) -> bool {
--- a/src/client/src/region.rs
+++ b/src/client/src/region.rs
@@ -21,7 +21,7 @@ use arc_swap::ArcSwapOption;
 use arrow_flight::Ticket;
 use async_stream::stream;
 use async_trait::async_trait;
-use common_error::ext::BoxedError;
+use common_error::ext::{BoxedError, ErrorExt};
 use common_error::status_code::StatusCode;
 use common_grpc::flight::{FlightDecoder, FlightMessage};
 use common_meta::error::{self as meta_error, Result as MetaResult};
@@ -107,18 +107,24 @@ impl RegionRequester {
            .mut_inner()
            .do_get(ticket)
            .await
-            .or_else(|e| {
+            .map_err(|e| {
                let tonic_code = e.code();
                let e: error::Error = e.into();
+                let code = e.status_code();
+                let msg = e.to_string();
+                let error = ServerSnafu { code, msg }
+                    .fail::<()>()
+                    .map_err(BoxedError::new)
+                    .with_context(|_| FlightGetSnafu {
+                        tonic_code,
+                        addr: flight_client.addr().to_string(),
+                    })
+                    .unwrap_err();
                error!(
                    e; "Failed to do Flight get, addr: {}, code: {}",
                    flight_client.addr(),
                    tonic_code
                );
-                let error = Err(BoxedError::new(e)).with_context(|_| FlightGetSnafu {
-                    addr: flight_client.addr().to_string(),
-                    tonic_code,
-                });
                error
            })?;

--- a/src/cmd/Cargo.toml
+++ b/src/cmd/Cargo.toml
@@ -16,7 +16,7 @@ default = [
    "meta-srv/pg_kvbackend",
    "meta-srv/mysql_kvbackend",
 ]
-enterprise = ["common-meta/enterprise", "frontend/enterprise", "meta-srv/enterprise", "catalog/enterprise"]
+enterprise = ["common-meta/enterprise", "frontend/enterprise", "meta-srv/enterprise"]
 tokio-console = ["common-telemetry/tokio-console"]

 [lints]
@@ -52,6 +52,7 @@ common-version.workspace = true
 common-wal.workspace = true
 datanode.workspace = true
 datatypes.workspace = true
+either = "1.8"
 etcd-client.workspace = true
 file-engine.workspace = true
 flow.workspace = true
--- a/src/cmd/src/bin/greptime.rs
+++ b/src/cmd/src/bin/greptime.rs
@@ -20,11 +20,11 @@ use cmd::error::{InitTlsProviderSnafu, Result};
 use cmd::options::GlobalOptions;
 use cmd::{cli, datanode, flownode, frontend, metasrv, standalone, App};
 use common_base::Plugins;
-use common_version::{verbose_version, version};
+use common_version::version;
 use servers::install_ring_crypto_provider;

 #[derive(Parser)]
-#[command(name = "greptime", author, version, long_version = verbose_version(), about)]
+#[command(name = "greptime", author, version, long_version = version(), about)]
 #[command(propagate_version = true)]
 pub(crate) struct Command {
    #[clap(subcommand)]
@@ -143,8 +143,10 @@ async fn start(cli: Command) -> Result<()> {
 }

 fn setup_human_panic() {
-    human_panic::setup_panic!(human_panic::Metadata::new("GreptimeDB", version())
-        .homepage("https://github.com/GreptimeTeam/greptimedb/discussions"));
+    human_panic::setup_panic!(
+        human_panic::Metadata::new("GreptimeDB", env!("CARGO_PKG_VERSION"))
+            .homepage("https://github.com/GreptimeTeam/greptimedb/discussions")
+    );

    common_telemetry::set_panic_hook();
 }
--- a/src/cmd/src/datanode/builder.rs
+++ b/src/cmd/src/datanode/builder.rs
@@ -19,7 +19,7 @@ use catalog::kvbackend::MetaKvBackend;
 use common_base::Plugins;
 use common_meta::cache::LayeredCacheRegistryBuilder;
 use common_telemetry::info;
-use common_version::{short_version, verbose_version};
+use common_version::{short_version, version};
 use datanode::datanode::DatanodeBuilder;
 use datanode::service::DatanodeServiceBuilder;
 use meta_client::MetaClientType;
@@ -67,7 +67,7 @@ impl InstanceBuilder {
            None,
        );

-        log_versions(verbose_version(), short_version(), APP_NAME);
+        log_versions(version(), short_version(), APP_NAME);
        create_resource_limit_metrics(APP_NAME);

        plugins::setup_datanode_plugins(plugins, &opts.plugins, dn_opts)
--- a/src/cmd/src/flownode.rs
+++ b/src/cmd/src/flownode.rs
@@ -18,7 +18,7 @@ use std::time::Duration;

 use cache::{build_fundamental_cache_registry, with_default_composite_cache_registry};
 use catalog::information_extension::DistributedInformationExtension;
-use catalog::kvbackend::{CachedKvBackendBuilder, KvBackendCatalogManagerBuilder, MetaKvBackend};
+use catalog::kvbackend::{CachedKvBackendBuilder, KvBackendCatalogManager, MetaKvBackend};
 use clap::Parser;
 use client::client_manager::NodeClients;
 use common_base::Plugins;
@@ -32,7 +32,7 @@ use common_meta::key::flow::FlowMetadataManager;
 use common_meta::key::TableMetadataManager;
 use common_telemetry::info;
 use common_telemetry::logging::{TracingOptions, DEFAULT_LOGGING_DIR};
-use common_version::{short_version, verbose_version};
+use common_version::{short_version, version};
 use flow::{
    get_flow_auth_options, FlownodeBuilder, FlownodeInstance, FlownodeServiceBuilder,
    FrontendClient, FrontendInvoker,
@@ -279,7 +279,7 @@ impl StartCommand {
            None,
        );

-        log_versions(verbose_version(), short_version(), APP_NAME);
+        log_versions(version(), short_version(), APP_NAME);
        create_resource_limit_metrics(APP_NAME);

        info!("Flownode start command: {:#?}", self);
@@ -342,12 +342,13 @@ impl StartCommand {

        let information_extension =
            Arc::new(DistributedInformationExtension::new(meta_client.clone()));
-        let catalog_manager = KvBackendCatalogManagerBuilder::new(
+        let catalog_manager = KvBackendCatalogManager::new(
            information_extension,
            cached_meta_backend.clone(),
            layered_cache_registry.clone(),
-        )
-        .build();
+            None,
+            None,
+        );

        let table_metadata_manager =
            Arc::new(TableMetadataManager::new(cached_meta_backend.clone()));
@@ -370,11 +371,8 @@ impl StartCommand {

        let flow_metadata_manager = Arc::new(FlowMetadataManager::new(cached_meta_backend.clone()));
        let flow_auth_header = get_flow_auth_options(&opts).context(StartFlownodeSnafu)?;
-        let frontend_client = FrontendClient::from_meta_client(
-            meta_client.clone(),
-            flow_auth_header,
-            opts.query.clone(),
-        );
+        let frontend_client =
+            FrontendClient::from_meta_client(meta_client.clone(), flow_auth_header);
        let frontend_client = Arc::new(frontend_client);
        let flownode_builder = FlownodeBuilder::new(
            opts.clone(),
--- a/src/cmd/src/frontend.rs
+++ b/src/cmd/src/frontend.rs
@@ -19,7 +19,7 @@ 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::kvbackend::{CachedKvBackendBuilder, KvBackendCatalogManagerBuilder, MetaKvBackend};
+use catalog::kvbackend::{CachedKvBackendBuilder, KvBackendCatalogManager, MetaKvBackend};
 use catalog::process_manager::ProcessManager;
 use clap::Parser;
 use client::client_manager::NodeClients;
@@ -33,7 +33,7 @@ use common_meta::heartbeat::handler::HandlerGroupExecutor;
 use common_telemetry::info;
 use common_telemetry::logging::{TracingOptions, DEFAULT_LOGGING_DIR};
 use common_time::timezone::set_default_timezone;
-use common_version::{short_version, verbose_version};
+use common_version::{short_version, version};
 use frontend::frontend::Frontend;
 use frontend::heartbeat::HeartbeatTask;
 use frontend::instance::builder::FrontendBuilder;
@@ -102,7 +102,7 @@ impl App for Instance {
 #[derive(Parser)]
 pub struct Command {
    #[clap(subcommand)]
-    pub subcmd: SubCommand,
+    subcmd: SubCommand,
 }

 impl Command {
@@ -116,7 +116,7 @@ impl Command {
 }

 #[derive(Parser)]
-pub enum SubCommand {
+enum SubCommand {
    Start(StartCommand),
 }

@@ -153,7 +153,7 @@ pub struct StartCommand {
    #[clap(long)]
    postgres_addr: Option<String>,
    #[clap(short, long)]
-    pub config_file: Option<String>,
+    config_file: Option<String>,
    #[clap(short, long)]
    influxdb_enable: Option<bool>,
    #[clap(long, value_delimiter = ',', num_args = 1..)]
@@ -169,7 +169,7 @@ pub struct StartCommand {
    #[clap(long)]
    disable_dashboard: Option<bool>,
    #[clap(long, default_value = "GREPTIMEDB_FRONTEND")]
-    pub env_prefix: String,
+    env_prefix: String,
 }

 impl StartCommand {
@@ -282,7 +282,7 @@ impl StartCommand {
            opts.component.slow_query.as_ref(),
        );

-        log_versions(verbose_version(), short_version(), APP_NAME);
+        log_versions(version(), short_version(), APP_NAME);
        create_resource_limit_metrics(APP_NAME);

        info!("Frontend start command: {:#?}", self);
@@ -350,20 +350,13 @@ impl StartCommand {
            addrs::resolve_addr(&opts.grpc.bind_addr, Some(&opts.grpc.server_addr)),
            Some(meta_client.clone()),
        ));
-
-        let builder = KvBackendCatalogManagerBuilder::new(
+        let catalog_manager = KvBackendCatalogManager::new(
            information_extension,
            cached_meta_backend.clone(),
            layered_cache_registry.clone(),
-        )
-        .with_process_manager(process_manager.clone());
-        #[cfg(feature = "enterprise")]
-        let builder = if let Some(factories) = plugins.get() {
-            builder.with_extra_information_table_factories(factories)
-        } else {
-            builder
-        };
-        let catalog_manager = builder.build();
+            None,
+            Some(process_manager.clone()),
+        );

        let executor = HandlerGroupExecutor::new(vec![
            Arc::new(ParseMailboxMessageHandler),
--- a/src/cmd/src/lib.rs
+++ b/src/cmd/src/lib.rs
@@ -112,7 +112,7 @@ pub trait App: Send {
 pub fn log_versions(version: &str, short_version: &str, app: &str) {
    // Report app version as gauge.
    APP_VERSION
-        .with_label_values(&[common_version::version(), short_version, app])
+        .with_label_values(&[env!("CARGO_PKG_VERSION"), short_version, app])
        .inc();

    // Log version and argument flags.
--- a/src/cmd/src/metasrv.rs
+++ b/src/cmd/src/metasrv.rs
@@ -22,7 +22,7 @@ use common_base::Plugins;
 use common_config::Configurable;
 use common_telemetry::info;
 use common_telemetry::logging::{TracingOptions, DEFAULT_LOGGING_DIR};
-use common_version::{short_version, verbose_version};
+use common_version::{short_version, version};
 use meta_srv::bootstrap::MetasrvInstance;
 use meta_srv::metasrv::BackendImpl;
 use snafu::ResultExt;
@@ -54,10 +54,6 @@ impl Instance {
    pub fn get_inner(&self) -> &MetasrvInstance {
        &self.instance
    }
-
-    pub fn mut_inner(&mut self) -> &mut MetasrvInstance {
-        &mut self.instance
-    }
 }

 #[async_trait]
@@ -324,7 +320,7 @@ impl StartCommand {
            None,
        );

-        log_versions(verbose_version(), short_version(), APP_NAME);
+        log_versions(version(), short_version(), APP_NAME);
        create_resource_limit_metrics(APP_NAME);

        info!("Metasrv start command: {:#?}", self);
@@ -340,12 +336,12 @@ impl StartCommand {
            .await
            .context(StartMetaServerSnafu)?;

-        let builder = meta_srv::bootstrap::metasrv_builder(&opts, plugins, None)
+        let builder = meta_srv::bootstrap::metasrv_builder(&opts, plugins.clone(), None)
            .await
            .context(error::BuildMetaServerSnafu)?;
        let metasrv = builder.build().await.context(error::BuildMetaServerSnafu)?;

-        let instance = MetasrvInstance::new(metasrv)
+        let instance = MetasrvInstance::new(opts, plugins, metasrv)
            .await
            .context(error::BuildMetaServerSnafu)?;

--- a/src/cmd/src/standalone.rs
+++ b/src/cmd/src/standalone.rs
@@ -20,7 +20,7 @@ use std::{fs, path};
 use async_trait::async_trait;
 use cache::{build_fundamental_cache_registry, with_default_composite_cache_registry};
 use catalog::information_schema::InformationExtension;
-use catalog::kvbackend::KvBackendCatalogManagerBuilder;
+use catalog::kvbackend::KvBackendCatalogManager;
 use catalog::process_manager::ProcessManager;
 use clap::Parser;
 use client::api::v1::meta::RegionRole;
@@ -51,7 +51,7 @@ use common_telemetry::logging::{
    LoggingOptions, SlowQueryOptions, TracingOptions, DEFAULT_LOGGING_DIR,
 };
 use common_time::timezone::set_default_timezone;
-use common_version::{short_version, verbose_version};
+use common_version::{short_version, version};
 use common_wal::config::DatanodeWalConfig;
 use datanode::config::{DatanodeOptions, ProcedureConfig, RegionEngineConfig, StorageConfig};
 use datanode::datanode::{Datanode, DatanodeBuilder};
@@ -485,7 +485,7 @@ impl StartCommand {
            opts.component.slow_query.as_ref(),
        );

-        log_versions(verbose_version(), short_version(), APP_NAME);
+        log_versions(version(), short_version(), APP_NAME);
        create_resource_limit_metrics(APP_NAME);

        info!("Standalone start command: {:#?}", self);
@@ -544,20 +544,13 @@ impl StartCommand {
        ));

        let process_manager = Arc::new(ProcessManager::new(opts.grpc.server_addr.clone(), None));
-        let builder = KvBackendCatalogManagerBuilder::new(
+        let catalog_manager = KvBackendCatalogManager::new(
            information_extension.clone(),
            kv_backend.clone(),
            layered_cache_registry.clone(),
-        )
-        .with_procedure_manager(procedure_manager.clone())
-        .with_process_manager(process_manager.clone());
-        #[cfg(feature = "enterprise")]
-        let builder = if let Some(factories) = plugins.get() {
-            builder.with_extra_information_table_factories(factories)
-        } else {
-            builder
-        };
-        let catalog_manager = builder.build();
+            Some(procedure_manager.clone()),
+            Some(process_manager.clone()),
+        );

        let table_metadata_manager =
            Self::create_table_metadata_manager(kv_backend.clone()).await?;
@@ -571,7 +564,7 @@ impl StartCommand {
        // for standalone not use grpc, but get a handler to frontend grpc client without
        // actually make a connection
        let (frontend_client, frontend_instance_handler) =
-            FrontendClient::from_empty_grpc_handler(opts.query.clone());
+            FrontendClient::from_empty_grpc_handler();
        let frontend_client = Arc::new(frontend_client);
        let flow_builder = FlownodeBuilder::new(
            flownode_options,
--- a/src/cmd/tests/load_config_test.rs
+++ b/src/cmd/tests/load_config_test.rs
@@ -23,14 +23,12 @@ use common_wal::config::raft_engine::RaftEngineConfig;
 use common_wal::config::DatanodeWalConfig;
 use datanode::config::{DatanodeOptions, RegionEngineConfig, StorageConfig};
 use file_engine::config::EngineConfig as FileEngineConfig;
-use flow::FlownodeOptions;
 use frontend::frontend::FrontendOptions;
 use meta_client::MetaClientOptions;
 use meta_srv::metasrv::MetasrvOptions;
 use meta_srv::selector::SelectorType;
 use metric_engine::config::EngineConfig as MetricEngineConfig;
 use mito2::config::MitoConfig;
-use query::options::QueryOptions;
 use servers::export_metrics::ExportMetricsOption;
 use servers::grpc::GrpcOptions;
 use servers::http::HttpOptions;
@@ -197,57 +195,6 @@ fn test_load_metasrv_example_config() {
    similar_asserts::assert_eq!(options, expected);
 }

-#[test]
-fn test_load_flownode_example_config() {
-    let example_config = common_test_util::find_workspace_path("config/flownode.example.toml");
-    let options =
-        GreptimeOptions::<FlownodeOptions>::load_layered_options(example_config.to_str(), "")
-            .unwrap();
-    let expected = GreptimeOptions::<FlownodeOptions> {
-        component: FlownodeOptions {
-            node_id: Some(14),
-            flow: Default::default(),
-            grpc: GrpcOptions {
-                bind_addr: "127.0.0.1:6800".to_string(),
-                server_addr: "127.0.0.1:6800".to_string(),
-                runtime_size: 2,
-                ..Default::default()
-            },
-            logging: LoggingOptions {
-                dir: format!("{}/{}", DEFAULT_DATA_HOME, DEFAULT_LOGGING_DIR),
-                level: Some("info".to_string()),
-                otlp_endpoint: Some(DEFAULT_OTLP_HTTP_ENDPOINT.to_string()),
-                otlp_export_protocol: Some(common_telemetry::logging::OtlpExportProtocol::Http),
-                tracing_sample_ratio: Some(Default::default()),
-                ..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 { parallelism: 1 },
-            meta_client: Some(MetaClientOptions {
-                metasrv_addrs: vec!["127.0.0.1:3002".to_string()],
-                timeout: Duration::from_secs(3),
-                heartbeat_timeout: Duration::from_millis(500),
-                ddl_timeout: Duration::from_secs(10),
-                connect_timeout: Duration::from_secs(1),
-                tcp_nodelay: true,
-                metadata_cache_max_capacity: 100000,
-                metadata_cache_ttl: Duration::from_secs(600),
-                metadata_cache_tti: Duration::from_secs(300),
-            }),
-            http: HttpOptions {
-                addr: "127.0.0.1:4000".to_string(),
-                ..Default::default()
-            },
-            user_provider: None,
-        },
-        ..Default::default()
-    };
-    similar_asserts::assert_eq!(options, expected);
-}
-
 #[test]
 fn test_load_standalone_example_config() {
    let example_config = common_test_util::find_workspace_path("config/standalone.example.toml");
--- a/src/common/catalog/src/consts.rs
+++ b/src/common/catalog/src/consts.rs
@@ -78,7 +78,7 @@ pub const INFORMATION_SCHEMA_ROUTINES_TABLE_ID: u32 = 21;
 pub const INFORMATION_SCHEMA_SCHEMA_PRIVILEGES_TABLE_ID: u32 = 22;
 /// id for information_schema.TABLE_PRIVILEGES
 pub const INFORMATION_SCHEMA_TABLE_PRIVILEGES_TABLE_ID: u32 = 23;
-/// id for information_schema.TRIGGERS (for mysql)
+/// id for information_schema.TRIGGERS
 pub const INFORMATION_SCHEMA_TRIGGERS_TABLE_ID: u32 = 24;
 /// id for information_schema.GLOBAL_STATUS
 pub const INFORMATION_SCHEMA_GLOBAL_STATUS_TABLE_ID: u32 = 25;
@@ -104,8 +104,6 @@ pub const INFORMATION_SCHEMA_PROCEDURE_INFO_TABLE_ID: u32 = 34;
 pub const INFORMATION_SCHEMA_REGION_STATISTICS_TABLE_ID: u32 = 35;
 /// id for information_schema.process_list
 pub const INFORMATION_SCHEMA_PROCESS_LIST_TABLE_ID: u32 = 36;
-/// id for information_schema.trigger_list (for greptimedb trigger)
-pub const INFORMATION_SCHEMA_TRIGGER_TABLE_ID: u32 = 37;

 // ----- End of information_schema tables -----

--- a/src/common/datasource/src/lib.rs
+++ b/src/common/datasource/src/lib.rs
@@ -21,6 +21,7 @@ pub mod error;
 pub mod file_format;
 pub mod lister;
 pub mod object_store;
+pub mod parquet_writer;
 pub mod share_buffer;
 #[cfg(test)]
 pub mod test_util;
--- a/src/common/datasource/src/parquet_writer.rs
+++ b/src/common/datasource/src/parquet_writer.rs
@@ -0,0 +1,52 @@
+// 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 bytes::Bytes;
+use futures::future::BoxFuture;
+use object_store::Writer;
+use parquet::arrow::async_writer::AsyncFileWriter;
+use parquet::errors::ParquetError;
+
+/// Bridges opendal [Writer] with parquet [AsyncFileWriter].
+pub struct AsyncWriter {
+    inner: Writer,
+}
+
+impl AsyncWriter {
+    /// Create a [`AsyncWriter`] by given [`Writer`].
+    pub fn new(writer: Writer) -> Self {
+        Self { inner: writer }
+    }
+}
+
+impl AsyncFileWriter for AsyncWriter {
+    fn write(&mut self, bs: Bytes) -> BoxFuture<'_, parquet::errors::Result<()>> {
+        Box::pin(async move {
+            self.inner
+                .write(bs)
+                .await
+                .map_err(|err| ParquetError::External(Box::new(err)))
+        })
+    }
+
+    fn complete(&mut self) -> BoxFuture<'_, parquet::errors::Result<()>> {
+        Box::pin(async move {
+            self.inner
+                .close()
+                .await
+                .map(|_| ())
+                .map_err(|err| ParquetError::External(Box::new(err)))
+        })
+    }
+}
--- a/src/common/error/src/status_code.rs
+++ b/src/common/error/src/status_code.rs
@@ -119,11 +119,6 @@ pub enum StatusCode {
    FlowAlreadyExists = 8000,
    FlowNotFound = 8001,
    // ====== End of flow related status code =====
-
-    // ====== Begin of trigger related status code =====
-    TriggerAlreadyExists = 9000,
-    TriggerNotFound = 9001,
-    // ====== End of trigger related status code =====
 }

 impl StatusCode {
@@ -160,8 +155,6 @@ impl StatusCode {
            | StatusCode::RegionNotFound
            | StatusCode::FlowAlreadyExists
            | StatusCode::FlowNotFound
-            | StatusCode::TriggerAlreadyExists
-            | StatusCode::TriggerNotFound
            | StatusCode::RegionReadonly
            | StatusCode::TableColumnNotFound
            | StatusCode::TableColumnExists
@@ -205,8 +198,6 @@ impl StatusCode {
            | StatusCode::PlanQuery
            | StatusCode::FlowAlreadyExists
            | StatusCode::FlowNotFound
-            | StatusCode::TriggerAlreadyExists
-            | StatusCode::TriggerNotFound
            | StatusCode::RegionNotReady
            | StatusCode::RegionBusy
            | StatusCode::RegionReadonly
@@ -239,48 +230,6 @@ impl fmt::Display for StatusCode {
    }
 }

-#[macro_export]
-macro_rules! define_from_tonic_status {
-    ($Error: ty, $Variant: ident) => {
-        impl From<tonic::Status> for $Error {
-            fn from(e: tonic::Status) -> Self {
-                use snafu::location;
-
-                fn metadata_value(e: &tonic::Status, key: &str) -> Option<String> {
-                    e.metadata()
-                        .get(key)
-                        .and_then(|v| String::from_utf8(v.as_bytes().to_vec()).ok())
-                }
-
-                let code = metadata_value(&e, $crate::GREPTIME_DB_HEADER_ERROR_CODE)
-                    .and_then(|s| {
-                        if let Ok(code) = s.parse::<u32>() {
-                            StatusCode::from_u32(code)
-                        } else {
-                            None
-                        }
-                    })
-                    .unwrap_or_else(|| match e.code() {
-                        tonic::Code::Cancelled => StatusCode::Cancelled,
-                        tonic::Code::DeadlineExceeded => StatusCode::DeadlineExceeded,
-                        _ => StatusCode::Internal,
-                    });
-
-                let msg = metadata_value(&e, $crate::GREPTIME_DB_HEADER_ERROR_MSG)
-                    .unwrap_or_else(|| e.message().to_string());
-
-                // TODO(LFC): Make the error variant defined automatically.
-                Self::$Variant {
-                    code,
-                    msg,
-                    tonic_code: e.code(),
-                    location: location!(),
-                }
-            }
-        }
-    };
-}
-
 #[macro_export]
 macro_rules! define_into_tonic_status {
    ($Error: ty) => {
@@ -332,14 +281,12 @@ pub fn status_to_tonic_code(status_code: StatusCode) -> Code {
        | StatusCode::TableColumnExists
        | StatusCode::RegionAlreadyExists
        | StatusCode::DatabaseAlreadyExists
-        | StatusCode::TriggerAlreadyExists
        | StatusCode::FlowAlreadyExists => Code::AlreadyExists,
        StatusCode::TableNotFound
        | StatusCode::RegionNotFound
        | StatusCode::TableColumnNotFound
        | StatusCode::DatabaseNotFound
        | StatusCode::UserNotFound
-        | StatusCode::TriggerNotFound
        | StatusCode::FlowNotFound => Code::NotFound,
        StatusCode::TableUnavailable
        | StatusCode::StorageUnavailable
@@ -357,6 +304,15 @@ pub fn status_to_tonic_code(status_code: StatusCode) -> Code {
    }
 }

+/// Converts tonic [Code] to [StatusCode].
+pub fn convert_tonic_code_to_status_code(code: Code) -> StatusCode {
+    match code {
+        Code::Cancelled => StatusCode::Cancelled,
+        Code::DeadlineExceeded => StatusCode::DeadlineExceeded,
+        _ => StatusCode::Internal,
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use strum::IntoEnumIterator;
--- a/src/common/frontend/src/selector.rs
+++ b/src/common/frontend/src/selector.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::fmt::Debug;
 use std::time::Duration;

 use common_grpc::channel_manager::{ChannelConfig, ChannelManager};
@@ -31,7 +30,7 @@ use crate::error::{MetaSnafu, Result};
 pub type FrontendClientPtr = Box<dyn FrontendClient>;

 #[async_trait::async_trait]
-pub trait FrontendClient: Send + Debug {
+pub trait FrontendClient: Send {
    async fn list_process(&mut self, req: ListProcessRequest) -> Result<ListProcessResponse>;

    async fn kill_process(&mut self, req: KillProcessRequest) -> Result<KillProcessResponse>;
--- a/src/common/function/src/scalars/math.rs
+++ b/src/common/function/src/scalars/math.rs
@@ -14,6 +14,7 @@

 pub mod clamp;
 mod modulo;
+mod pow;
 mod rate;

 use std::fmt;
@@ -25,6 +26,7 @@ use datafusion::error::DataFusionError;
 use datafusion::logical_expr::Volatility;
 use datatypes::prelude::ConcreteDataType;
 use datatypes::vectors::VectorRef;
+pub use pow::PowFunction;
 pub use rate::RateFunction;
 use snafu::ResultExt;

@@ -37,6 +39,7 @@ pub(crate) struct MathFunction;
 impl MathFunction {
    pub fn register(registry: &FunctionRegistry) {
        registry.register_scalar(ModuloFunction);
+        registry.register_scalar(PowFunction);
        registry.register_scalar(RateFunction);
        registry.register_scalar(RangeFunction);
        registry.register_scalar(ClampFunction);
--- a/src/common/function/src/scalars/math/pow.rs
+++ b/src/common/function/src/scalars/math/pow.rs
@@ -0,0 +1,120 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt;
+use std::sync::Arc;
+
+use common_query::error::Result;
+use common_query::prelude::{Signature, Volatility};
+use datatypes::data_type::DataType;
+use datatypes::prelude::ConcreteDataType;
+use datatypes::types::LogicalPrimitiveType;
+use datatypes::vectors::VectorRef;
+use datatypes::with_match_primitive_type_id;
+use num::traits::Pow;
+use num_traits::AsPrimitive;
+
+use crate::function::{Function, FunctionContext};
+use crate::scalars::expression::{scalar_binary_op, EvalContext};
+
+#[derive(Clone, Debug, Default)]
+pub struct PowFunction;
+
+impl Function for PowFunction {
+    fn name(&self) -> &str {
+        "pow"
+    }
+
+    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
+        Ok(ConcreteDataType::float64_datatype())
+    }
+
+    fn signature(&self) -> Signature {
+        Signature::uniform(2, ConcreteDataType::numerics(), Volatility::Immutable)
+    }
+
+    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+        with_match_primitive_type_id!(columns[0].data_type().logical_type_id(), |$S| {
+            with_match_primitive_type_id!(columns[1].data_type().logical_type_id(), |$T| {
+                let col = scalar_binary_op::<<$S as LogicalPrimitiveType>::Native, <$T as LogicalPrimitiveType>::Native, f64, _>(&columns[0], &columns[1], scalar_pow, &mut EvalContext::default())?;
+                Ok(Arc::new(col))
+            },{
+                unreachable!()
+            })
+        },{
+            unreachable!()
+        })
+    }
+}
+
+#[inline]
+fn scalar_pow<S, T>(value: Option<S>, base: Option<T>, _ctx: &mut EvalContext) -> Option<f64>
+where
+    S: AsPrimitive<f64>,
+    T: AsPrimitive<f64>,
+{
+    match (value, base) {
+        (Some(value), Some(base)) => Some(value.as_().pow(base.as_())),
+        _ => None,
+    }
+}
+
+impl fmt::Display for PowFunction {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "POW")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use common_query::prelude::TypeSignature;
+    use datatypes::value::Value;
+    use datatypes::vectors::{Float32Vector, Int8Vector};
+
+    use super::*;
+    use crate::function::FunctionContext;
+    #[test]
+    fn test_pow_function() {
+        let pow = PowFunction;
+
+        assert_eq!("pow", pow.name());
+        assert_eq!(
+            ConcreteDataType::float64_datatype(),
+            pow.return_type(&[]).unwrap()
+        );
+
+        assert!(matches!(pow.signature(),
+                         Signature {
+                             type_signature: TypeSignature::Uniform(2, valid_types),
+                             volatility: Volatility::Immutable
+                         } if  valid_types == ConcreteDataType::numerics()
+        ));
+
+        let values = vec![1.0, 2.0, 3.0];
+        let bases = vec![0i8, -1i8, 3i8];
+
+        let args: Vec<VectorRef> = vec![
+            Arc::new(Float32Vector::from_vec(values.clone())),
+            Arc::new(Int8Vector::from_vec(bases.clone())),
+        ];
+
+        let vector = pow.eval(&FunctionContext::default(), &args).unwrap();
+        assert_eq!(3, vector.len());
+
+        for i in 0..3 {
+            let p: f64 = (values[i] as f64).pow(bases[i] as f64);
+            assert!(matches!(vector.get(i), Value::Float64(v) if v == p));
+        }
+    }
+}
--- a/src/common/function/src/system/pg_catalog/version.rs
+++ b/src/common/function/src/system/pg_catalog/version.rs
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::fmt;
 use std::sync::Arc;
+use std::{env, fmt};

 use common_query::error::Result;
 use common_query::prelude::{Signature, Volatility};
@@ -47,7 +47,7 @@ impl Function for PGVersionFunction {
    fn eval(&self, _func_ctx: &FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
        let result = StringVector::from(vec![format!(
            "PostgreSQL 16.3 GreptimeDB {}",
-            common_version::version()
+            env!("CARGO_PKG_VERSION")
        )]);
        Ok(Arc::new(result))
    }
--- a/src/common/function/src/system/version.rs
+++ b/src/common/function/src/system/version.rs
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::fmt;
 use std::sync::Arc;
+use std::{env, fmt};

 use common_query::error::Result;
 use common_query::prelude::{Signature, Volatility};
@@ -52,13 +52,13 @@ impl Function for VersionFunction {
                    "{}-greptimedb-{}",
                    std::env::var("GREPTIMEDB_MYSQL_SERVER_VERSION")
                        .unwrap_or_else(|_| "8.4.2".to_string()),
-                    common_version::version()
+                    env!("CARGO_PKG_VERSION")
                )
            }
            Channel::Postgres => {
-                format!("16.3-greptimedb-{}", common_version::version())
+                format!("16.3-greptimedb-{}", env!("CARGO_PKG_VERSION"))
            }
-            _ => common_version::version().to_string(),
+            _ => env!("CARGO_PKG_VERSION").to_string(),
        };
        let result = StringVector::from(vec![version]);
        Ok(Arc::new(result))
--- a/src/common/grpc-expr/src/alter.rs
+++ b/src/common/grpc-expr/src/alter.rs
@@ -34,7 +34,7 @@ use table::requests::{
 };

 use crate::error::{
-    InvalidColumnDefSnafu, InvalidIndexOptionSnafu, InvalidSetFulltextOptionRequestSnafu,
+    InvalidColumnDefSnafu, InvalidSetFulltextOptionRequestSnafu,
    InvalidSetSkippingIndexOptionRequestSnafu, InvalidSetTableOptionRequestSnafu,
    InvalidUnsetTableOptionRequestSnafu, MissingAlterIndexOptionSnafu, MissingFieldSnafu,
    MissingTimestampColumnSnafu, Result, UnknownLocationTypeSnafu,
@@ -126,21 +126,18 @@ pub fn alter_expr_to_request(table_id: TableId, expr: AlterTableExpr) -> Result<
                api::v1::set_index::Options::Fulltext(f) => AlterKind::SetIndex {
                    options: SetIndexOptions::Fulltext {
                        column_name: f.column_name.clone(),
-                        options: FulltextOptions::new(
-                            f.enable,
-                            as_fulltext_option_analyzer(
+                        options: FulltextOptions {
+                            enable: f.enable,
+                            analyzer: as_fulltext_option_analyzer(
                                Analyzer::try_from(f.analyzer)
                                    .context(InvalidSetFulltextOptionRequestSnafu)?,
                            ),
-                            f.case_sensitive,
-                            as_fulltext_option_backend(
+                            case_sensitive: f.case_sensitive,
+                            backend: as_fulltext_option_backend(
                                PbFulltextBackend::try_from(f.backend)
                                    .context(InvalidSetFulltextOptionRequestSnafu)?,
                            ),
-                            f.granularity as u32,
-                            f.false_positive_rate,
-                        )
-                        .context(InvalidIndexOptionSnafu)?,
+                        },
                    },
                },
                api::v1::set_index::Options::Inverted(i) => AlterKind::SetIndex {
@@ -151,15 +148,13 @@ pub fn alter_expr_to_request(table_id: TableId, expr: AlterTableExpr) -> Result<
                api::v1::set_index::Options::Skipping(s) => AlterKind::SetIndex {
                    options: SetIndexOptions::Skipping {
                        column_name: s.column_name,
-                        options: SkippingIndexOptions::new(
-                            s.granularity as u32,
-                            s.false_positive_rate,
-                            as_skipping_index_type(
+                        options: SkippingIndexOptions {
+                            granularity: s.granularity as u32,
+                            index_type: as_skipping_index_type(
                                PbSkippingIndexType::try_from(s.skipping_index_type)
                                    .context(InvalidSetSkippingIndexOptionRequestSnafu)?,
                            ),
-                        )
-                        .context(InvalidIndexOptionSnafu)?,
+                        },
                    },
                },
            },
--- a/src/common/grpc-expr/src/error.rs
+++ b/src/common/grpc-expr/src/error.rs
@@ -153,14 +153,6 @@ pub enum Error {
        #[snafu(implicit)]
        location: Location,
    },
-
-    #[snafu(display("Invalid index option"))]
-    InvalidIndexOption {
-        #[snafu(implicit)]
-        location: Location,
-        #[snafu(source)]
-        error: datatypes::error::Error,
-    },
 }

 pub type Result<T> = std::result::Result<T, Error>;
@@ -188,8 +180,7 @@ impl ErrorExt for Error {
            | Error::InvalidUnsetTableOptionRequest { .. }
            | Error::InvalidSetFulltextOptionRequest { .. }
            | Error::InvalidSetSkippingIndexOptionRequest { .. }
-            | Error::MissingAlterIndexOption { .. }
-            | Error::InvalidIndexOption { .. } => StatusCode::InvalidArguments,
+            | Error::MissingAlterIndexOption { .. } => StatusCode::InvalidArguments,
        }
    }

--- a/src/common/meta/Cargo.toml
+++ b/src/common/meta/Cargo.toml
@@ -69,7 +69,6 @@ table = { workspace = true, features = ["testing"] }
 tokio.workspace = true
 tokio-postgres = { workspace = true, optional = true }
 tonic.workspace = true
-tracing.workspace = true
 typetag.workspace = true

 [dev-dependencies]
--- a/src/common/meta/src/ddl.rs
+++ b/src/common/meta/src/ddl.rs
@@ -50,6 +50,7 @@ pub mod drop_flow;
 pub mod drop_table;
 pub mod drop_view;
 pub mod flow_meta;
+mod physical_table_metadata;
 pub mod table_meta;
 #[cfg(any(test, feature = "testing"))]
 pub mod test_util;
--- a/src/common/meta/src/ddl/alter_logical_tables.rs
+++ b/src/common/meta/src/ddl/alter_logical_tables.rs
@@ -12,32 +12,32 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-mod executor;
+mod check;
+mod metadata;
+mod region_request;
+mod table_cache_keys;
 mod update_metadata;
-mod validator;

 use api::region::RegionResponse;
 use async_trait::async_trait;
 use common_catalog::format_full_table_name;
 use common_procedure::error::{FromJsonSnafu, Result as ProcedureResult, ToJsonSnafu};
 use common_procedure::{Context, LockKey, Procedure, Status};
-use common_telemetry::{debug, error, info, warn};
-pub use executor::make_alter_region_request;
+use common_telemetry::{error, info, warn};
+use futures_util::future;
+pub use region_request::make_alter_region_request;
 use serde::{Deserialize, Serialize};
-use snafu::ResultExt;
+use snafu::{ensure, ResultExt};
 use store_api::metadata::ColumnMetadata;
 use store_api::metric_engine_consts::ALTER_PHYSICAL_EXTENSION_KEY;
 use strum::AsRefStr;
 use table::metadata::TableId;

-use crate::cache_invalidator::Context as CacheContext;
-use crate::ddl::alter_logical_tables::executor::AlterLogicalTablesExecutor;
-use crate::ddl::alter_logical_tables::validator::{
-    retain_unskipped, AlterLogicalTableValidator, ValidatorResult,
+use crate::ddl::utils::{
+    add_peer_context_if_needed, map_to_procedure_error, sync_follower_regions,
 };
-use crate::ddl::utils::{extract_column_metadatas, map_to_procedure_error, sync_follower_regions};
 use crate::ddl::DdlContext;
-use crate::error::Result;
+use crate::error::{DecodeJsonSnafu, MetadataCorruptionSnafu, Result};
 use crate::instruction::CacheIdent;
 use crate::key::table_info::TableInfoValue;
 use crate::key::table_route::PhysicalTableRouteValue;
@@ -45,38 +45,13 @@ use crate::key::DeserializedValueWithBytes;
 use crate::lock_key::{CatalogLock, SchemaLock, TableLock};
 use crate::metrics;
 use crate::rpc::ddl::AlterTableTask;
-use crate::rpc::router::RegionRoute;
+use crate::rpc::router::{find_leaders, RegionRoute};

 pub struct AlterLogicalTablesProcedure {
    pub context: DdlContext,
    pub data: AlterTablesData,
 }

-/// Builds the validator from the [`AlterTablesData`].
-fn build_validator_from_alter_table_data<'a>(
-    data: &'a AlterTablesData,
-) -> AlterLogicalTableValidator<'a> {
-    let phsycial_table_id = data.physical_table_id;
-    let alters = data
-        .tasks
-        .iter()
-        .map(|task| &task.alter_table)
-        .collect::<Vec<_>>();
-    AlterLogicalTableValidator::new(phsycial_table_id, alters)
-}
-
-/// Builds the executor from the [`AlterTablesData`].
-fn build_executor_from_alter_expr<'a>(data: &'a AlterTablesData) -> AlterLogicalTablesExecutor<'a> {
-    debug_assert_eq!(data.tasks.len(), data.table_info_values.len());
-    let alters = data
-        .tasks
-        .iter()
-        .zip(data.table_info_values.iter())
-        .map(|(task, table_info)| (table_info.table_info.ident.table_id, &task.alter_table))
-        .collect::<Vec<_>>();
-    AlterLogicalTablesExecutor::new(alters)
-}
-
 impl AlterLogicalTablesProcedure {
    pub const TYPE_NAME: &'static str = "metasrv-procedure::AlterLogicalTables";

@@ -106,44 +81,35 @@ impl AlterLogicalTablesProcedure {
    }

    pub(crate) async fn on_prepare(&mut self) -> Result<Status> {
-        let validator = build_validator_from_alter_table_data(&self.data);
-        let ValidatorResult {
-            num_skipped,
-            skip_alter,
-            table_info_values,
-            physical_table_info,
-            physical_table_route,
-        } = validator
-            .validate(&self.context.table_metadata_manager)
-            .await?;
-
-        let num_tasks = self.data.tasks.len();
-        if num_skipped == num_tasks {
+        // Checks all the tasks
+        self.check_input_tasks()?;
+        // Fills the table info values
+        self.fill_table_info_values().await?;
+        // Checks the physical table, must after [fill_table_info_values]
+        self.check_physical_table().await?;
+        // Fills the physical table info
+        self.fill_physical_table_info().await?;
+        // Filter the finished tasks
+        let finished_tasks = self.check_finished_tasks()?;
+        let already_finished_count = finished_tasks
+            .iter()
+            .map(|x| if *x { 1 } else { 0 })
+            .sum::<usize>();
+        let apply_tasks_count = self.data.tasks.len();
+        if already_finished_count == apply_tasks_count {
            info!("All the alter tasks are finished, will skip the procedure.");
-            let cache_ident_keys = AlterLogicalTablesExecutor::build_cache_ident_keys(
-                &physical_table_info,
-                &table_info_values
-                    .iter()
-                    .map(|v| v.get_inner_ref())
-                    .collect::<Vec<_>>(),
-            );
-            self.data.table_cache_keys_to_invalidate = cache_ident_keys;
            // Re-invalidate the table cache
            self.data.state = AlterTablesState::InvalidateTableCache;
            return Ok(Status::executing(true));
-        } else if num_skipped > 0 {
+        } else if already_finished_count > 0 {
            info!(
                "There are {} alter tasks, {} of them were already finished.",
-                num_tasks, num_skipped
+                apply_tasks_count, already_finished_count
            );
        }
+        self.filter_task(&finished_tasks)?;

-        // Updates the procedure state.
-        retain_unskipped(&mut self.data.tasks, &skip_alter);
-        self.data.physical_table_info = Some(physical_table_info);
-        self.data.physical_table_route = Some(physical_table_route);
-        self.data.table_info_values = table_info_values;
-        debug_assert_eq!(self.data.tasks.len(), self.data.table_info_values.len());
+        // Next state
        self.data.state = AlterTablesState::SubmitAlterRegionRequests;
        Ok(Status::executing(true))
    }
@@ -151,21 +117,57 @@ impl AlterLogicalTablesProcedure {
    pub(crate) async fn on_submit_alter_region_requests(&mut self) -> Result<Status> {
        // Safety: we have checked the state in on_prepare
        let physical_table_route = &self.data.physical_table_route.as_ref().unwrap();
-        let executor = build_executor_from_alter_expr(&self.data);
-        let mut results = executor
-            .on_alter_regions(
-                &self.context.node_manager,
-                &physical_table_route.region_routes,
-            )
-            .await?;
+        let leaders = find_leaders(&physical_table_route.region_routes);
+        let mut alter_region_tasks = Vec::with_capacity(leaders.len());

-        if let Some(column_metadatas) =
-            extract_column_metadatas(&mut results, ALTER_PHYSICAL_EXTENSION_KEY)?
-        {
-            self.data.physical_columns = column_metadatas;
+        for peer in leaders {
+            let requester = self.context.node_manager.datanode(&peer).await;
+            let request = self.make_request(&peer, &physical_table_route.region_routes)?;
+
+            alter_region_tasks.push(async move {
+                requester
+                    .handle(request)
+                    .await
+                    .map_err(add_peer_context_if_needed(peer))
+            });
+        }
+
+        let mut results = future::join_all(alter_region_tasks)
+            .await
+            .into_iter()
+            .collect::<Result<Vec<_>>>()?;
+
+        // Collects responses from datanodes.
+        let phy_raw_schemas = results
+            .iter_mut()
+            .map(|res| res.extensions.remove(ALTER_PHYSICAL_EXTENSION_KEY))
+            .collect::<Vec<_>>();
+
+        if phy_raw_schemas.is_empty() {
+            self.submit_sync_region_requests(results, &physical_table_route.region_routes)
+                .await;
+            self.data.state = AlterTablesState::UpdateMetadata;
+            return Ok(Status::executing(true));
+        }
+
+        // Verify all the physical schemas are the same
+        // Safety: previous check ensures this vec is not empty
+        let first = phy_raw_schemas.first().unwrap();
+        ensure!(
+            phy_raw_schemas.iter().all(|x| x == first),
+            MetadataCorruptionSnafu {
+                err_msg: "The physical schemas from datanodes are not the same."
+            }
+        );
+
+        // Decodes the physical raw schemas
+        if let Some(phy_raw_schema) = first {
+            self.data.physical_columns =
+                ColumnMetadata::decode_list(phy_raw_schema).context(DecodeJsonSnafu)?;
        } else {
            warn!("altering logical table result doesn't contains extension key `{ALTER_PHYSICAL_EXTENSION_KEY}`,leaving the physical table's schema unchanged");
        }
+
        self.submit_sync_region_requests(results, &physical_table_route.region_routes)
            .await;
        self.data.state = AlterTablesState::UpdateMetadata;
@@ -181,7 +183,7 @@ impl AlterLogicalTablesProcedure {
        if let Err(err) = sync_follower_regions(
            &self.context,
            self.data.physical_table_id,
-            &results,
+            results,
            region_routes,
            table_info.meta.engine.as_str(),
        )
@@ -198,18 +200,7 @@ impl AlterLogicalTablesProcedure {
        self.update_physical_table_metadata().await?;
        self.update_logical_tables_metadata().await?;

-        let logical_table_info_values = self
-            .data
-            .table_info_values
-            .iter()
-            .map(|v| v.get_inner_ref())
-            .collect::<Vec<_>>();
-
-        let cache_ident_keys = AlterLogicalTablesExecutor::build_cache_ident_keys(
-            self.data.physical_table_info.as_ref().unwrap(),
-            &logical_table_info_values,
-        );
-        self.data.table_cache_keys_to_invalidate = cache_ident_keys;
+        self.data.build_cache_keys_to_invalidate();
        self.data.clear_metadata_fields();

        self.data.state = AlterTablesState::InvalidateTableCache;
@@ -219,16 +210,9 @@ impl AlterLogicalTablesProcedure {
    pub(crate) async fn on_invalidate_table_cache(&mut self) -> Result<Status> {
        let to_invalidate = &self.data.table_cache_keys_to_invalidate;

-        let ctx = CacheContext {
-            subject: Some(format!(
-                "Invalidate table cache by altering logical tables, physical_table_id: {}",
-                self.data.physical_table_id,
-            )),
-        };
-
        self.context
            .cache_invalidator
-            .invalidate(&ctx, to_invalidate)
+            .invalidate(&Default::default(), to_invalidate)
            .await?;
        Ok(Status::done())
    }
@@ -248,10 +232,6 @@ impl Procedure for AlterLogicalTablesProcedure {
        let _timer = metrics::METRIC_META_PROCEDURE_ALTER_TABLE
            .with_label_values(&[step])
            .start_timer();
-        debug!(
-            "Executing alter logical tables procedure, state: {:?}",
-            state
-        );

        match state {
            AlterTablesState::Prepare => self.on_prepare().await,
--- a/src/common/meta/src/ddl/alter_logical_tables/check.rs
+++ b/src/common/meta/src/ddl/alter_logical_tables/check.rs
@@ -0,0 +1,136 @@
+// 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::HashSet;
+
+use api::v1::alter_table_expr::Kind;
+use snafu::{ensure, OptionExt};
+
+use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
+use crate::error::{AlterLogicalTablesInvalidArgumentsSnafu, Result};
+use crate::key::table_info::TableInfoValue;
+use crate::key::table_route::TableRouteValue;
+use crate::rpc::ddl::AlterTableTask;
+
+impl AlterLogicalTablesProcedure {
+    pub(crate) fn check_input_tasks(&self) -> Result<()> {
+        self.check_schema()?;
+        self.check_alter_kind()?;
+        Ok(())
+    }
+
+    pub(crate) async fn check_physical_table(&self) -> Result<()> {
+        let table_route_manager = self.context.table_metadata_manager.table_route_manager();
+        let table_ids = self
+            .data
+            .table_info_values
+            .iter()
+            .map(|v| v.table_info.ident.table_id)
+            .collect::<Vec<_>>();
+        let table_routes = table_route_manager
+            .table_route_storage()
+            .batch_get(&table_ids)
+            .await?;
+        let physical_table_id = self.data.physical_table_id;
+        let is_same_physical_table = table_routes.iter().all(|r| {
+            if let Some(TableRouteValue::Logical(r)) = r {
+                r.physical_table_id() == physical_table_id
+            } else {
+                false
+            }
+        });
+
+        ensure!(
+            is_same_physical_table,
+            AlterLogicalTablesInvalidArgumentsSnafu {
+                err_msg: "All the tasks should have the same physical table id"
+            }
+        );
+
+        Ok(())
+    }
+
+    pub(crate) fn check_finished_tasks(&self) -> Result<Vec<bool>> {
+        let task = &self.data.tasks;
+        let table_info_values = &self.data.table_info_values;
+
+        Ok(task
+            .iter()
+            .zip(table_info_values.iter())
+            .map(|(task, table)| Self::check_finished_task(task, table))
+            .collect())
+    }
+
+    // Checks if the schemas of the tasks are the same
+    fn check_schema(&self) -> Result<()> {
+        let is_same_schema = self.data.tasks.windows(2).all(|pair| {
+            pair[0].alter_table.catalog_name == pair[1].alter_table.catalog_name
+                && pair[0].alter_table.schema_name == pair[1].alter_table.schema_name
+        });
+
+        ensure!(
+            is_same_schema,
+            AlterLogicalTablesInvalidArgumentsSnafu {
+                err_msg: "Schemas of the tasks are not the same"
+            }
+        );
+
+        Ok(())
+    }
+
+    fn check_alter_kind(&self) -> Result<()> {
+        for task in &self.data.tasks {
+            let kind = task.alter_table.kind.as_ref().context(
+                AlterLogicalTablesInvalidArgumentsSnafu {
+                    err_msg: "Alter kind is missing",
+                },
+            )?;
+            let Kind::AddColumns(_) = kind else {
+                return AlterLogicalTablesInvalidArgumentsSnafu {
+                    err_msg: "Only support add columns operation",
+                }
+                .fail();
+            };
+        }
+
+        Ok(())
+    }
+
+    fn check_finished_task(task: &AlterTableTask, table: &TableInfoValue) -> bool {
+        let columns = table
+            .table_info
+            .meta
+            .schema
+            .column_schemas
+            .iter()
+            .map(|c| &c.name)
+            .collect::<HashSet<_>>();
+
+        let Some(kind) = task.alter_table.kind.as_ref() else {
+            return true; // Never get here since we have checked it in `check_alter_kind`
+        };
+        let Kind::AddColumns(add_columns) = kind else {
+            return true; // Never get here since we have checked it in `check_alter_kind`
+        };
+
+        // We only check that all columns have been finished. That is to say,
+        // if one part is finished but another part is not, it will be considered
+        // unfinished.
+        add_columns
+            .add_columns
+            .iter()
+            .map(|add_column| add_column.column_def.as_ref().map(|c| &c.name))
+            .all(|column| column.map(|c| columns.contains(c)).unwrap_or(false))
+    }
+}
--- a/src/common/meta/src/ddl/alter_logical_tables/executor.rs
+++ b/src/common/meta/src/ddl/alter_logical_tables/executor.rs
@@ -1,216 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::collections::HashMap;
-
-use api::region::RegionResponse;
-use api::v1::alter_table_expr::Kind;
-use api::v1::region::{
-    alter_request, region_request, AddColumn, AddColumns, AlterRequest, AlterRequests,
-    RegionColumnDef, RegionRequest, RegionRequestHeader,
-};
-use api::v1::{self, AlterTableExpr};
-use common_telemetry::tracing_context::TracingContext;
-use common_telemetry::{debug, warn};
-use futures::future;
-use store_api::metadata::ColumnMetadata;
-use store_api::storage::{RegionId, RegionNumber, TableId};
-
-use crate::ddl::utils::{add_peer_context_if_needed, raw_table_info};
-use crate::error::Result;
-use crate::instruction::CacheIdent;
-use crate::key::table_info::TableInfoValue;
-use crate::key::{DeserializedValueWithBytes, RegionDistribution, TableMetadataManagerRef};
-use crate::node_manager::NodeManagerRef;
-use crate::rpc::router::{find_leaders, region_distribution, RegionRoute};
-
-/// [AlterLogicalTablesExecutor] performs:
-/// - Alters logical regions on the datanodes.
-/// - Updates table metadata for alter table operation.
-pub struct AlterLogicalTablesExecutor<'a> {
-    /// The alter table expressions.
-    ///
-    /// The first element is the logical table id, the second element is the alter table expression.
-    alters: Vec<(TableId, &'a AlterTableExpr)>,
-}
-
-impl<'a> AlterLogicalTablesExecutor<'a> {
-    pub fn new(alters: Vec<(TableId, &'a AlterTableExpr)>) -> Self {
-        Self { alters }
-    }
-
-    /// Alters logical regions on the datanodes.
-    pub(crate) async fn on_alter_regions(
-        &self,
-        node_manager: &NodeManagerRef,
-        region_routes: &[RegionRoute],
-    ) -> Result<Vec<RegionResponse>> {
-        let region_distribution = region_distribution(region_routes);
-        let leaders = find_leaders(region_routes)
-            .into_iter()
-            .map(|p| (p.id, p))
-            .collect::<HashMap<_, _>>();
-        let mut alter_region_tasks = Vec::with_capacity(leaders.len());
-        for (datanode_id, region_role_set) in region_distribution {
-            if region_role_set.leader_regions.is_empty() {
-                continue;
-            }
-            // Safety: must exists.
-            let peer = leaders.get(&datanode_id).unwrap();
-            let requester = node_manager.datanode(peer).await;
-            let requests = self.make_alter_region_request(&region_role_set.leader_regions);
-            let requester = requester.clone();
-            let peer = peer.clone();
-
-            debug!("Sending alter region requests to datanode {}", peer);
-            alter_region_tasks.push(async move {
-                requester
-                    .handle(make_request(requests))
-                    .await
-                    .map_err(add_peer_context_if_needed(peer))
-            });
-        }
-
-        future::join_all(alter_region_tasks)
-            .await
-            .into_iter()
-            .collect::<Result<Vec<_>>>()
-    }
-
-    fn make_alter_region_request(&self, region_numbers: &[RegionNumber]) -> AlterRequests {
-        let mut requests = Vec::with_capacity(region_numbers.len() * self.alters.len());
-        for (table_id, alter) in self.alters.iter() {
-            for region_number in region_numbers {
-                let region_id = RegionId::new(*table_id, *region_number);
-                let request = make_alter_region_request(region_id, alter);
-                requests.push(request);
-            }
-        }
-
-        AlterRequests { requests }
-    }
-
-    /// Updates table metadata for alter table operation.
-    ///
-    /// ## Panic:
-    /// - If the region distribution is not set when updating table metadata.
-    pub(crate) async fn on_alter_metadata(
-        physical_table_id: TableId,
-        table_metadata_manager: &TableMetadataManagerRef,
-        current_table_info_value: &DeserializedValueWithBytes<TableInfoValue>,
-        region_distribution: RegionDistribution,
-        physical_columns: &[ColumnMetadata],
-    ) -> Result<()> {
-        if physical_columns.is_empty() {
-            warn!("No physical columns found, leaving the physical table's schema unchanged when altering logical tables");
-            return Ok(());
-        }
-
-        let table_ref = current_table_info_value.table_ref();
-        let table_id = physical_table_id;
-
-        // Generates new table info
-        let old_raw_table_info = current_table_info_value.table_info.clone();
-        let new_raw_table_info =
-            raw_table_info::build_new_physical_table_info(old_raw_table_info, physical_columns);
-
-        debug!(
-            "Starting update table: {} metadata, table_id: {}, new table info: {:?}",
-            table_ref, table_id, new_raw_table_info
-        );
-
-        table_metadata_manager
-            .update_table_info(
-                current_table_info_value,
-                Some(region_distribution),
-                new_raw_table_info,
-            )
-            .await?;
-
-        Ok(())
-    }
-
-    /// Builds the cache ident keys for the alter logical tables.
-    ///
-    /// The cache ident keys are:
-    /// - The table id of the logical tables.
-    /// - The table name of the logical tables.
-    /// - The table id of the physical table.
-    pub(crate) fn build_cache_ident_keys(
-        physical_table_info: &TableInfoValue,
-        logical_table_info_values: &[&TableInfoValue],
-    ) -> Vec<CacheIdent> {
-        let mut cache_keys = Vec::with_capacity(logical_table_info_values.len() * 2 + 2);
-        cache_keys.extend(logical_table_info_values.iter().flat_map(|table| {
-            vec![
-                CacheIdent::TableId(table.table_info.ident.table_id),
-                CacheIdent::TableName(table.table_name()),
-            ]
-        }));
-        cache_keys.push(CacheIdent::TableId(
-            physical_table_info.table_info.ident.table_id,
-        ));
-        cache_keys.push(CacheIdent::TableName(physical_table_info.table_name()));
-
-        cache_keys
-    }
-}
-
-fn make_request(alter_requests: AlterRequests) -> RegionRequest {
-    RegionRequest {
-        header: Some(RegionRequestHeader {
-            tracing_context: TracingContext::from_current_span().to_w3c(),
-            ..Default::default()
-        }),
-        body: Some(region_request::Body::Alters(alter_requests)),
-    }
-}
-
-/// Makes an alter region request.
-pub fn make_alter_region_request(
-    region_id: RegionId,
-    alter_table_expr: &AlterTableExpr,
-) -> AlterRequest {
-    let region_id = region_id.as_u64();
-    let kind = match &alter_table_expr.kind {
-        Some(Kind::AddColumns(add_columns)) => Some(alter_request::Kind::AddColumns(
-            to_region_add_columns(add_columns),
-        )),
-        _ => unreachable!(), // Safety: we have checked the kind in check_input_tasks
-    };
-
-    AlterRequest {
-        region_id,
-        schema_version: 0,
-        kind,
-    }
-}
-
-fn to_region_add_columns(add_columns: &v1::AddColumns) -> AddColumns {
-    let add_columns = add_columns
-        .add_columns
-        .iter()
-        .map(|add_column| {
-            let region_column_def = RegionColumnDef {
-                column_def: add_column.column_def.clone(),
-                ..Default::default() // other fields are not used in alter logical table
-            };
-            AddColumn {
-                column_def: Some(region_column_def),
-                ..Default::default() // other fields are not used in alter logical table
-            }
-        })
-        .collect();
-    AddColumns { add_columns }
-}
--- a/src/common/meta/src/ddl/alter_logical_tables/metadata.rs
+++ b/src/common/meta/src/ddl/alter_logical_tables/metadata.rs
@@ -0,0 +1,158 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use common_catalog::format_full_table_name;
+use snafu::OptionExt;
+use table::metadata::TableId;
+
+use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
+use crate::error::{
+    AlterLogicalTablesInvalidArgumentsSnafu, Result, TableInfoNotFoundSnafu, TableNotFoundSnafu,
+    TableRouteNotFoundSnafu,
+};
+use crate::key::table_info::TableInfoValue;
+use crate::key::table_name::TableNameKey;
+use crate::key::table_route::TableRouteValue;
+use crate::key::DeserializedValueWithBytes;
+use crate::rpc::ddl::AlterTableTask;
+
+impl AlterLogicalTablesProcedure {
+    pub(crate) fn filter_task(&mut self, finished_tasks: &[bool]) -> Result<()> {
+        debug_assert_eq!(finished_tasks.len(), self.data.tasks.len());
+        debug_assert_eq!(finished_tasks.len(), self.data.table_info_values.len());
+        self.data.tasks = self
+            .data
+            .tasks
+            .drain(..)
+            .zip(finished_tasks.iter())
+            .filter_map(|(task, finished)| if *finished { None } else { Some(task) })
+            .collect();
+        self.data.table_info_values = self
+            .data
+            .table_info_values
+            .drain(..)
+            .zip(finished_tasks.iter())
+            .filter_map(|(table_info_value, finished)| {
+                if *finished {
+                    None
+                } else {
+                    Some(table_info_value)
+                }
+            })
+            .collect();
+
+        Ok(())
+    }
+
+    pub(crate) async fn fill_physical_table_info(&mut self) -> Result<()> {
+        let (physical_table_info, physical_table_route) = self
+            .context
+            .table_metadata_manager
+            .get_full_table_info(self.data.physical_table_id)
+            .await?;
+
+        let physical_table_info = physical_table_info.with_context(|| TableInfoNotFoundSnafu {
+            table: format!("table id - {}", self.data.physical_table_id),
+        })?;
+        let physical_table_route = physical_table_route
+            .context(TableRouteNotFoundSnafu {
+                table_id: self.data.physical_table_id,
+            })?
+            .into_inner();
+
+        self.data.physical_table_info = Some(physical_table_info);
+        let TableRouteValue::Physical(physical_table_route) = physical_table_route else {
+            return AlterLogicalTablesInvalidArgumentsSnafu {
+                err_msg: format!(
+                    "expected a physical table but got a logical table: {:?}",
+                    self.data.physical_table_id
+                ),
+            }
+            .fail();
+        };
+        self.data.physical_table_route = Some(physical_table_route);
+
+        Ok(())
+    }
+
+    pub(crate) async fn fill_table_info_values(&mut self) -> Result<()> {
+        let table_ids = self.get_all_table_ids().await?;
+        let table_info_values = self.get_all_table_info_values(&table_ids).await?;
+        debug_assert_eq!(table_info_values.len(), self.data.tasks.len());
+        self.data.table_info_values = table_info_values;
+
+        Ok(())
+    }
+
+    async fn get_all_table_info_values(
+        &self,
+        table_ids: &[TableId],
+    ) -> Result<Vec<DeserializedValueWithBytes<TableInfoValue>>> {
+        let table_info_manager = self.context.table_metadata_manager.table_info_manager();
+        let mut table_info_map = table_info_manager.batch_get_raw(table_ids).await?;
+        let mut table_info_values = Vec::with_capacity(table_ids.len());
+        for (table_id, task) in table_ids.iter().zip(self.data.tasks.iter()) {
+            let table_info_value =
+                table_info_map
+                    .remove(table_id)
+                    .with_context(|| TableInfoNotFoundSnafu {
+                        table: extract_table_name(task),
+                    })?;
+            table_info_values.push(table_info_value);
+        }
+
+        Ok(table_info_values)
+    }
+
+    async fn get_all_table_ids(&self) -> Result<Vec<TableId>> {
+        let table_name_manager = self.context.table_metadata_manager.table_name_manager();
+        let table_name_keys = self
+            .data
+            .tasks
+            .iter()
+            .map(|task| extract_table_name_key(task))
+            .collect();
+
+        let table_name_values = table_name_manager.batch_get(table_name_keys).await?;
+        let mut table_ids = Vec::with_capacity(table_name_values.len());
+        for (value, task) in table_name_values.into_iter().zip(self.data.tasks.iter()) {
+            let table_id = value
+                .with_context(|| TableNotFoundSnafu {
+                    table_name: extract_table_name(task),
+                })?
+                .table_id();
+            table_ids.push(table_id);
+        }
+
+        Ok(table_ids)
+    }
+}
+
+#[inline]
+fn extract_table_name(task: &AlterTableTask) -> String {
+    format_full_table_name(
+        &task.alter_table.catalog_name,
+        &task.alter_table.schema_name,
+        &task.alter_table.table_name,
+    )
+}
+
+#[inline]
+fn extract_table_name_key(task: &AlterTableTask) -> TableNameKey {
+    TableNameKey::new(
+        &task.alter_table.catalog_name,
+        &task.alter_table.schema_name,
+        &task.alter_table.table_name,
+    )
+}
--- a/src/common/meta/src/ddl/alter_logical_tables/region_request.rs
+++ b/src/common/meta/src/ddl/alter_logical_tables/region_request.rs
@@ -0,0 +1,113 @@
+// 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 api::v1::alter_table_expr::Kind;
+use api::v1::region::{
+    alter_request, region_request, AddColumn, AddColumns, AlterRequest, AlterRequests,
+    RegionColumnDef, RegionRequest, RegionRequestHeader,
+};
+use api::v1::{self, AlterTableExpr};
+use common_telemetry::tracing_context::TracingContext;
+use store_api::storage::RegionId;
+
+use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
+use crate::error::Result;
+use crate::peer::Peer;
+use crate::rpc::router::{find_leader_regions, RegionRoute};
+
+impl AlterLogicalTablesProcedure {
+    pub(crate) fn make_request(
+        &self,
+        peer: &Peer,
+        region_routes: &[RegionRoute],
+    ) -> Result<RegionRequest> {
+        let alter_requests = self.make_alter_region_requests(peer, region_routes)?;
+        let request = RegionRequest {
+            header: Some(RegionRequestHeader {
+                tracing_context: TracingContext::from_current_span().to_w3c(),
+                ..Default::default()
+            }),
+            body: Some(region_request::Body::Alters(alter_requests)),
+        };
+
+        Ok(request)
+    }
+
+    fn make_alter_region_requests(
+        &self,
+        peer: &Peer,
+        region_routes: &[RegionRoute],
+    ) -> Result<AlterRequests> {
+        let tasks = &self.data.tasks;
+        let regions_on_this_peer = find_leader_regions(region_routes, peer);
+        let mut requests = Vec::with_capacity(tasks.len() * regions_on_this_peer.len());
+        for (task, table) in self
+            .data
+            .tasks
+            .iter()
+            .zip(self.data.table_info_values.iter())
+        {
+            for region_number in &regions_on_this_peer {
+                let region_id = RegionId::new(table.table_info.ident.table_id, *region_number);
+                let request = make_alter_region_request(
+                    region_id,
+                    &task.alter_table,
+                    table.table_info.ident.version,
+                );
+                requests.push(request);
+            }
+        }
+
+        Ok(AlterRequests { requests })
+    }
+}
+
+/// Makes an alter region request.
+pub fn make_alter_region_request(
+    region_id: RegionId,
+    alter_table_expr: &AlterTableExpr,
+    schema_version: u64,
+) -> AlterRequest {
+    let region_id = region_id.as_u64();
+    let kind = match &alter_table_expr.kind {
+        Some(Kind::AddColumns(add_columns)) => Some(alter_request::Kind::AddColumns(
+            to_region_add_columns(add_columns),
+        )),
+        _ => unreachable!(), // Safety: we have checked the kind in check_input_tasks
+    };
+
+    AlterRequest {
+        region_id,
+        schema_version,
+        kind,
+    }
+}
+
+fn to_region_add_columns(add_columns: &v1::AddColumns) -> AddColumns {
+    let add_columns = add_columns
+        .add_columns
+        .iter()
+        .map(|add_column| {
+            let region_column_def = RegionColumnDef {
+                column_def: add_column.column_def.clone(),
+                ..Default::default() // other fields are not used in alter logical table
+            };
+            AddColumn {
+                column_def: Some(region_column_def),
+                ..Default::default() // other fields are not used in alter logical table
+            }
+        })
+        .collect();
+    AddColumns { add_columns }
+}
--- a/src/common/meta/src/ddl/alter_logical_tables/table_cache_keys.rs
+++ b/src/common/meta/src/ddl/alter_logical_tables/table_cache_keys.rs
@@ -0,0 +1,50 @@
+// 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 table::metadata::RawTableInfo;
+use table::table_name::TableName;
+
+use crate::ddl::alter_logical_tables::AlterTablesData;
+use crate::instruction::CacheIdent;
+
+impl AlterTablesData {
+    pub(crate) fn build_cache_keys_to_invalidate(&mut self) {
+        let mut cache_keys = self
+            .table_info_values
+            .iter()
+            .flat_map(|table| {
+                vec![
+                    CacheIdent::TableId(table.table_info.ident.table_id),
+                    CacheIdent::TableName(extract_table_name(&table.table_info)),
+                ]
+            })
+            .collect::<Vec<_>>();
+        cache_keys.push(CacheIdent::TableId(self.physical_table_id));
+        // Safety: physical_table_info already filled in previous steps
+        let physical_table_info = &self.physical_table_info.as_ref().unwrap().table_info;
+        cache_keys.push(CacheIdent::TableName(extract_table_name(
+            physical_table_info,
+        )));
+
+        self.table_cache_keys_to_invalidate = cache_keys;
+    }
+}
+
+fn extract_table_name(table_info: &RawTableInfo) -> TableName {
+    TableName::new(
+        &table_info.catalog_name,
+        &table_info.schema_name,
+        &table_info.name,
+    )
+}
--- a/src/common/meta/src/ddl/alter_logical_tables/update_metadata.rs
+++ b/src/common/meta/src/ddl/alter_logical_tables/update_metadata.rs
@@ -13,35 +13,41 @@
 // limitations under the License.

 use common_grpc_expr::alter_expr_to_request;
+use common_telemetry::warn;
 use itertools::Itertools;
 use snafu::ResultExt;
 use table::metadata::{RawTableInfo, TableInfo};

-use crate::ddl::alter_logical_tables::executor::AlterLogicalTablesExecutor;
 use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
+use crate::ddl::physical_table_metadata;
 use crate::error;
 use crate::error::{ConvertAlterTableRequestSnafu, Result};
 use crate::key::table_info::TableInfoValue;
 use crate::key::DeserializedValueWithBytes;
 use crate::rpc::ddl::AlterTableTask;
-use crate::rpc::router::region_distribution;

 impl AlterLogicalTablesProcedure {
    pub(crate) async fn update_physical_table_metadata(&mut self) -> Result<()> {
+        if self.data.physical_columns.is_empty() {
+            warn!("No physical columns found, leaving the physical table's schema unchanged when altering logical tables");
+            return Ok(());
+        }
+
        // Safety: must exist.
        let physical_table_info = self.data.physical_table_info.as_ref().unwrap();
-        let physical_table_route = self.data.physical_table_route.as_ref().unwrap();
-        let region_distribution = region_distribution(&physical_table_route.region_routes);

-        // Updates physical table's metadata.
-        AlterLogicalTablesExecutor::on_alter_metadata(
-            self.data.physical_table_id,
-            &self.context.table_metadata_manager,
-            physical_table_info,
-            region_distribution,
+        // Generates new table info
+        let old_raw_table_info = physical_table_info.table_info.clone();
+        let new_raw_table_info = physical_table_metadata::build_new_physical_table_info(
+            old_raw_table_info,
            &self.data.physical_columns,
-        )
-        .await?;
+        );
+
+        // Updates physical table's metadata, and we don't need to touch per-region settings.
+        self.context
+            .table_metadata_manager
+            .update_table_info(physical_table_info, None, new_raw_table_info)
+            .await?;

        Ok(())
    }
--- a/src/common/meta/src/ddl/alter_logical_tables/validator.rs
+++ b/src/common/meta/src/ddl/alter_logical_tables/validator.rs
@@ -1,284 +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::HashSet;
-
-use api::v1::alter_table_expr::Kind;
-use api::v1::AlterTableExpr;
-use snafu::{ensure, OptionExt};
-use store_api::storage::TableId;
-use table::table_reference::TableReference;
-
-use crate::ddl::utils::table_id::get_all_table_ids_by_names;
-use crate::ddl::utils::table_info::get_all_table_info_values_by_table_ids;
-use crate::error::{
-    AlterLogicalTablesInvalidArgumentsSnafu, Result, TableInfoNotFoundSnafu,
-    TableRouteNotFoundSnafu,
-};
-use crate::key::table_info::TableInfoValue;
-use crate::key::table_route::{PhysicalTableRouteValue, TableRouteManager, TableRouteValue};
-use crate::key::{DeserializedValueWithBytes, TableMetadataManagerRef};
-
-/// [AlterLogicalTableValidator] validates the alter logical expressions.
-pub struct AlterLogicalTableValidator<'a> {
-    physical_table_id: TableId,
-    alters: Vec<&'a AlterTableExpr>,
-}
-
-impl<'a> AlterLogicalTableValidator<'a> {
-    pub fn new(physical_table_id: TableId, alters: Vec<&'a AlterTableExpr>) -> Self {
-        Self {
-            physical_table_id,
-            alters,
-        }
-    }
-
-    /// Validates all alter table expressions have the same schema and catalog.
-    fn validate_schema(&self) -> Result<()> {
-        let is_same_schema = self.alters.windows(2).all(|pair| {
-            pair[0].catalog_name == pair[1].catalog_name
-                && pair[0].schema_name == pair[1].schema_name
-        });
-
-        ensure!(
-            is_same_schema,
-            AlterLogicalTablesInvalidArgumentsSnafu {
-                err_msg: "Schemas of the alter table expressions are not the same"
-            }
-        );
-
-        Ok(())
-    }
-
-    /// Validates that all alter table expressions are of the supported kind.
-    /// Currently only supports `AddColumns` operations.
-    fn validate_alter_kind(&self) -> Result<()> {
-        for alter in &self.alters {
-            let kind = alter
-                .kind
-                .as_ref()
-                .context(AlterLogicalTablesInvalidArgumentsSnafu {
-                    err_msg: "Alter kind is missing",
-                })?;
-
-            let Kind::AddColumns(_) = kind else {
-                return AlterLogicalTablesInvalidArgumentsSnafu {
-                    err_msg: "Only support add columns operation",
-                }
-                .fail();
-            };
-        }
-
-        Ok(())
-    }
-
-    fn table_names(&self) -> Vec<TableReference> {
-        self.alters
-            .iter()
-            .map(|alter| {
-                TableReference::full(&alter.catalog_name, &alter.schema_name, &alter.table_name)
-            })
-            .collect()
-    }
-
-    /// Validates that the physical table info and route exist.
-    ///
-    /// This method performs the following validations:
-    /// 1. Retrieves the full table info and route for the given physical table id
-    /// 2. Ensures the table info and table route exists
-    /// 3. Verifies that the table route is actually a physical table route, not a logical one
-    ///
-    /// Returns a tuple containing the validated table info and physical table route.
-    async fn validate_physical_table(
-        &self,
-        table_metadata_manager: &TableMetadataManagerRef,
-    ) -> Result<(
-        DeserializedValueWithBytes<TableInfoValue>,
-        PhysicalTableRouteValue,
-    )> {
-        let (table_info, table_route) = table_metadata_manager
-            .get_full_table_info(self.physical_table_id)
-            .await?;
-
-        let table_info = table_info.with_context(|| TableInfoNotFoundSnafu {
-            table: format!("table id - {}", self.physical_table_id),
-        })?;
-
-        let physical_table_route = table_route
-            .context(TableRouteNotFoundSnafu {
-                table_id: self.physical_table_id,
-            })?
-            .into_inner();
-
-        let TableRouteValue::Physical(table_route) = physical_table_route else {
-            return AlterLogicalTablesInvalidArgumentsSnafu {
-                err_msg: format!(
-                    "expected a physical table but got a logical table: {:?}",
-                    self.physical_table_id
-                ),
-            }
-            .fail();
-        };
-
-        Ok((table_info, table_route))
-    }
-
-    /// Validates that all logical table routes have the same physical table id.
-    ///
-    /// This method performs the following validations:
-    /// 1. Retrieves table routes for all the given table ids.
-    /// 2. Ensures that all retrieved routes are logical table routes (not physical)
-    /// 3. Verifies that all logical table routes reference the same physical table id.
-    /// 4. Returns an error if any route is not logical or references a different physical table.
-    async fn validate_logical_table_routes(
-        &self,
-        table_route_manager: &TableRouteManager,
-        table_ids: &[TableId],
-    ) -> Result<()> {
-        let table_routes = table_route_manager
-            .table_route_storage()
-            .batch_get(table_ids)
-            .await?;
-
-        let physical_table_id = self.physical_table_id;
-
-        let is_same_physical_table = table_routes.iter().all(|r| {
-            if let Some(TableRouteValue::Logical(r)) = r {
-                r.physical_table_id() == physical_table_id
-            } else {
-                false
-            }
-        });
-
-        ensure!(
-            is_same_physical_table,
-            AlterLogicalTablesInvalidArgumentsSnafu {
-                err_msg: "All the tasks should have the same physical table id"
-            }
-        );
-
-        Ok(())
-    }
-
-    /// Validates the alter logical expressions.
-    ///
-    /// This method performs the following validations:
-    /// 1. Validates that all alter table expressions have the same schema and catalog.
-    /// 2. Validates that all alter table expressions are of the supported kind.
-    /// 3. Validates that the physical table info and route exist.
-    /// 4. Validates that all logical table routes have the same physical table id.
-    ///
-    /// Returns a [ValidatorResult] containing the validation results.
-    pub async fn validate(
-        &self,
-        table_metadata_manager: &TableMetadataManagerRef,
-    ) -> Result<ValidatorResult> {
-        self.validate_schema()?;
-        self.validate_alter_kind()?;
-        let (physical_table_info, physical_table_route) =
-            self.validate_physical_table(table_metadata_manager).await?;
-        let table_names = self.table_names();
-        let table_ids =
-            get_all_table_ids_by_names(table_metadata_manager.table_name_manager(), &table_names)
-                .await?;
-        let mut table_info_values = get_all_table_info_values_by_table_ids(
-            table_metadata_manager.table_info_manager(),
-            &table_ids,
-            &table_names,
-        )
-        .await?;
-        self.validate_logical_table_routes(
-            table_metadata_manager.table_route_manager(),
-            &table_ids,
-        )
-        .await?;
-        let skip_alter = self
-            .alters
-            .iter()
-            .zip(table_info_values.iter())
-            .map(|(task, table)| skip_alter_logical_region(task, table))
-            .collect::<Vec<_>>();
-        retain_unskipped(&mut table_info_values, &skip_alter);
-        let num_skipped = skip_alter.iter().filter(|&&x| x).count();
-
-        Ok(ValidatorResult {
-            num_skipped,
-            skip_alter,
-            table_info_values,
-            physical_table_info,
-            physical_table_route,
-        })
-    }
-}
-
-/// The result of the validator.
-pub(crate) struct ValidatorResult {
-    pub(crate) num_skipped: usize,
-    pub(crate) skip_alter: Vec<bool>,
-    pub(crate) table_info_values: Vec<DeserializedValueWithBytes<TableInfoValue>>,
-    pub(crate) physical_table_info: DeserializedValueWithBytes<TableInfoValue>,
-    pub(crate) physical_table_route: PhysicalTableRouteValue,
-}
-
-/// Retains the elements that are not skipped.
-pub(crate) fn retain_unskipped<T>(target: &mut Vec<T>, skipped: &[bool]) {
-    debug_assert_eq!(target.len(), skipped.len());
-    let mut iter = skipped.iter();
-    target.retain(|_| !iter.next().unwrap());
-}
-
-/// Returns true if does not required to alter the logical region.
-fn skip_alter_logical_region(alter: &AlterTableExpr, table: &TableInfoValue) -> bool {
-    let existing_columns = table
-        .table_info
-        .meta
-        .schema
-        .column_schemas
-        .iter()
-        .map(|c| &c.name)
-        .collect::<HashSet<_>>();
-
-    let Some(kind) = alter.kind.as_ref() else {
-        return true; // Never get here since we have checked it in `validate_alter_kind`
-    };
-    let Kind::AddColumns(add_columns) = kind else {
-        return true; // Never get here since we have checked it in `validate_alter_kind`
-    };
-
-    // We only check that all columns have been finished. That is to say,
-    // if one part is finished but another part is not, it will be considered
-    // unfinished.
-    add_columns
-        .add_columns
-        .iter()
-        .map(|add_column| add_column.column_def.as_ref().map(|c| &c.name))
-        .all(|column| {
-            column
-                .map(|c| existing_columns.contains(c))
-                .unwrap_or(false)
-        })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_retain_unskipped() {
-        let mut target = vec![1, 2, 3, 4, 5];
-        let skipped = vec![false, true, false, true, false];
-        retain_unskipped(&mut target, &skipped);
-        assert_eq!(target, vec![1, 3, 5]);
-    }
-}
--- a/src/common/meta/src/ddl/alter_table.rs
+++ b/src/common/meta/src/ddl/alter_table.rs
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-mod executor;
+mod check;
 mod metadata;
 mod region_request;
+mod update_metadata;

 use std::vec;

@@ -28,29 +29,30 @@ use common_procedure::{
    Context as ProcedureContext, ContextProvider, Error as ProcedureError, LockKey, PoisonKey,
    PoisonKeys, Procedure, ProcedureId, Status, StringKey,
 };
-use common_telemetry::{error, info, warn};
+use common_telemetry::{debug, error, info};
+use futures::future::{self};
 use serde::{Deserialize, Serialize};
 use snafu::{ensure, ResultExt};
-use store_api::metadata::ColumnMetadata;
-use store_api::metric_engine_consts::TABLE_COLUMN_METADATA_EXTENSION_KEY;
+use store_api::storage::RegionId;
 use strum::AsRefStr;
 use table::metadata::{RawTableInfo, TableId, TableInfo};
 use table::table_reference::TableReference;

-use crate::ddl::alter_table::executor::AlterTableExecutor;
+use crate::cache_invalidator::Context;
 use crate::ddl::utils::{
-    extract_column_metadatas, handle_multiple_results, map_to_procedure_error,
+    add_peer_context_if_needed, handle_multiple_results, map_to_procedure_error,
    sync_follower_regions, MultipleResults,
 };
 use crate::ddl::DdlContext;
 use crate::error::{AbortProcedureSnafu, NoLeaderSnafu, PutPoisonSnafu, Result, RetryLaterSnafu};
+use crate::instruction::CacheIdent;
 use crate::key::table_info::TableInfoValue;
 use crate::key::{DeserializedValueWithBytes, RegionDistribution};
 use crate::lock_key::{CatalogLock, SchemaLock, TableLock, TableNameLock};
 use crate::metrics;
 use crate::poison_key::table_poison_key;
 use crate::rpc::ddl::AlterTableTask;
-use crate::rpc::router::{find_leaders, region_distribution, RegionRoute};
+use crate::rpc::router::{find_leader_regions, find_leaders, region_distribution, RegionRoute};

 /// The alter table procedure
 pub struct AlterTableProcedure {
@@ -62,24 +64,6 @@ pub struct AlterTableProcedure {
    /// If we recover the procedure from json, then the table info value is not cached.
    /// But we already validated it in the prepare step.
    new_table_info: Option<TableInfo>,
-    /// The alter table executor.
-    executor: AlterTableExecutor,
-}
-
-/// Builds the executor from the [`AlterTableData`].
-///
-/// # Panics
-/// - If the alter kind is not set.
-fn build_executor_from_alter_expr(alter_data: &AlterTableData) -> AlterTableExecutor {
-    let table_name = alter_data.table_ref().into();
-    let table_id = alter_data.table_id;
-    let alter_kind = alter_data.task.alter_table.kind.as_ref().unwrap();
-    let new_table_name = if let Kind::RenameTable(RenameTable { new_table_name }) = alter_kind {
-        Some(new_table_name.to_string())
-    } else {
-        None
-    };
-    AlterTableExecutor::new(table_name, table_id, new_table_name)
 }

 impl AlterTableProcedure {
@@ -87,42 +71,33 @@ impl AlterTableProcedure {

    pub fn new(table_id: TableId, task: AlterTableTask, context: DdlContext) -> Result<Self> {
        task.validate()?;
-        let data = AlterTableData::new(task, table_id);
-        let executor = build_executor_from_alter_expr(&data);
        Ok(Self {
            context,
-            data,
+            data: AlterTableData::new(task, table_id),
            new_table_info: None,
-            executor,
        })
    }

    pub fn from_json(json: &str, context: DdlContext) -> ProcedureResult<Self> {
        let data: AlterTableData = serde_json::from_str(json).context(FromJsonSnafu)?;
-        let executor = build_executor_from_alter_expr(&data);
-
        Ok(AlterTableProcedure {
            context,
            data,
            new_table_info: None,
-            executor,
        })
    }

    // Checks whether the table exists.
    pub(crate) async fn on_prepare(&mut self) -> Result<Status> {
-        self.executor
-            .on_prepare(&self.context.table_metadata_manager)
-            .await?;
+        self.check_alter().await?;
        self.fill_table_info().await?;

-        // Safety: filled in `fill_table_info`.
+        // Validates the request and builds the new table info.
+        // We need to build the new table info here because we should ensure the alteration
+        // is valid in `UpdateMeta` state as we already altered the region.
+        // Safety: `fill_table_info()` already set it.
        let table_info_value = self.data.table_info_value.as_ref().unwrap();
-        let new_table_info = AlterTableExecutor::validate_alter_table_expr(
-            &table_info_value.table_info,
-            self.data.task.alter_table.clone(),
-        )?;
-        self.new_table_info = Some(new_table_info);
+        self.new_table_info = Some(self.build_new_table_info(&table_info_value.table_info)?);

        // Safety: Checked in `AlterTableProcedure::new`.
        let alter_kind = self.data.task.alter_table.kind.as_ref().unwrap();
@@ -165,7 +140,9 @@ impl AlterTableProcedure {

        self.data.region_distribution =
            Some(region_distribution(&physical_table_route.region_routes));
+
        let leaders = find_leaders(&physical_table_route.region_routes);
+        let mut alter_region_tasks = Vec::with_capacity(leaders.len());
        let alter_kind = self.make_region_alter_kind()?;

        info!(
@@ -178,14 +155,31 @@ impl AlterTableProcedure {
        ensure!(!leaders.is_empty(), NoLeaderSnafu { table_id });
        // Puts the poison before submitting alter region requests to datanodes.
        self.put_poison(ctx_provider, procedure_id).await?;
-        let results = self
-            .executor
-            .on_alter_regions(
-                &self.context.node_manager,
-                &physical_table_route.region_routes,
-                alter_kind,
-            )
-            .await;
+        for datanode in leaders {
+            let requester = self.context.node_manager.datanode(&datanode).await;
+            let regions = find_leader_regions(&physical_table_route.region_routes, &datanode);
+
+            for region in regions {
+                let region_id = RegionId::new(table_id, region);
+                let request = self.make_alter_region_request(region_id, alter_kind.clone())?;
+                debug!("Submitting {request:?} to {datanode}");
+
+                let datanode = datanode.clone();
+                let requester = requester.clone();
+
+                alter_region_tasks.push(async move {
+                    requester
+                        .handle(request)
+                        .await
+                        .map_err(add_peer_context_if_needed(datanode))
+                });
+            }
+        }
+
+        let results = future::join_all(alter_region_tasks)
+            .await
+            .into_iter()
+            .collect::<Vec<_>>();

        match handle_multiple_results(results) {
            MultipleResults::PartialRetryable(error) => {
@@ -208,9 +202,9 @@ impl AlterTableProcedure {
                })
            }
            MultipleResults::Ok(results) => {
-                self.submit_sync_region_requests(&results, &physical_table_route.region_routes)
+                self.submit_sync_region_requests(results, &physical_table_route.region_routes)
                    .await;
-                self.handle_alter_region_response(results)?;
+                self.data.state = AlterTableState::UpdateMetadata;
                Ok(Status::executing_with_clean_poisons(true))
            }
            MultipleResults::AllNonRetryable(error) => {
@@ -226,22 +220,9 @@ impl AlterTableProcedure {
        }
    }

-    fn handle_alter_region_response(&mut self, mut results: Vec<RegionResponse>) -> Result<()> {
-        self.data.state = AlterTableState::UpdateMetadata;
-        if let Some(column_metadatas) =
-            extract_column_metadatas(&mut results, TABLE_COLUMN_METADATA_EXTENSION_KEY)?
-        {
-            self.data.column_metadatas = column_metadatas;
-        } else {
-            warn!("altering table result doesn't contains extension key `{TABLE_COLUMN_METADATA_EXTENSION_KEY}`,leaving the table's column metadata unchanged");
-        }
-
-        Ok(())
-    }
-
    async fn submit_sync_region_requests(
        &mut self,
-        results: &[RegionResponse],
+        results: Vec<RegionResponse>,
        region_routes: &[RegionRoute],
    ) {
        // Safety: filled in `prepare` step.
@@ -263,34 +244,39 @@ impl AlterTableProcedure {
    pub(crate) async fn on_update_metadata(&mut self) -> Result<Status> {
        let table_id = self.data.table_id();
        let table_ref = self.data.table_ref();
-        // Safety: filled in `fill_table_info`.
+        // Safety: checked before.
        let table_info_value = self.data.table_info_value.as_ref().unwrap();
-        // Safety: Checked in `AlterTableProcedure::new`.
-        let alter_kind = self.data.task.alter_table.kind.as_ref().unwrap();
-
        // Gets the table info from the cache or builds it.
-        let  new_info = match &self.new_table_info {
+        let new_info = match &self.new_table_info {
            Some(cached) => cached.clone(),
-            None => AlterTableExecutor::validate_alter_table_expr(
-                &table_info_value.table_info,
-                self.data.task.alter_table.clone(),
-               )
+            None => self.build_new_table_info(&table_info_value.table_info)
                .inspect_err(|e| {
                    // We already check the table info in the prepare step so this should not happen.
                    error!(e; "Unable to build info for table {} in update metadata step, table_id: {}", table_ref, table_id);
                })?,
        };

-        // Safety: region distribution is set in `submit_alter_region_requests`.
-        self.executor
-            .on_alter_metadata(
-                &self.context.table_metadata_manager,
-                table_info_value,
-                self.data.region_distribution.as_ref(),
+        debug!(
+            "Starting update table: {} metadata, new table info {:?}",
+            table_ref.to_string(),
+            new_info
+        );
+
+        // Safety: Checked in `AlterTableProcedure::new`.
+        let alter_kind = self.data.task.alter_table.kind.as_ref().unwrap();
+        if let Kind::RenameTable(RenameTable { new_table_name }) = alter_kind {
+            self.on_update_metadata_for_rename(new_table_name.to_string(), table_info_value)
+                .await?;
+        } else {
+            // region distribution is set in submit_alter_region_requests
+            let region_distribution = self.data.region_distribution.as_ref().unwrap().clone();
+            self.on_update_metadata_for_alter(
                new_info.into(),
-                &self.data.column_metadatas,
+                region_distribution,
+                table_info_value,
            )
            .await?;
+        }

        info!("Updated table metadata for table {table_ref}, table_id: {table_id}, kind: {alter_kind:?}");
        self.data.state = AlterTableState::InvalidateTableCache;
@@ -299,9 +285,18 @@ impl AlterTableProcedure {

    /// Broadcasts the invalidating table cache instructions.
    async fn on_broadcast(&mut self) -> Result<Status> {
-        self.executor
-            .invalidate_table_cache(&self.context.cache_invalidator)
+        let cache_invalidator = &self.context.cache_invalidator;
+
+        cache_invalidator
+            .invalidate(
+                &Context::default(),
+                &[
+                    CacheIdent::TableId(self.data.table_id()),
+                    CacheIdent::TableName(self.data.table_ref().into()),
+                ],
+            )
            .await?;
+
        Ok(Status::done())
    }

@@ -323,16 +318,6 @@ impl AlterTableProcedure {

        lock_key
    }
-
-    #[cfg(test)]
-    pub(crate) fn data(&self) -> &AlterTableData {
-        &self.data
-    }
-
-    #[cfg(test)]
-    pub(crate) fn mut_data(&mut self) -> &mut AlterTableData {
-        &mut self.data
-    }
 }

 #[async_trait]
@@ -395,8 +380,6 @@ pub struct AlterTableData {
    state: AlterTableState,
    task: AlterTableTask,
    table_id: TableId,
-    #[serde(default)]
-    column_metadatas: Vec<ColumnMetadata>,
    /// Table info value before alteration.
    table_info_value: Option<DeserializedValueWithBytes<TableInfoValue>>,
    /// Region distribution for table in case we need to update region options.
@@ -409,7 +392,6 @@ impl AlterTableData {
            state: AlterTableState::Prepare,
            task,
            table_id,
-            column_metadatas: vec![],
            table_info_value: None,
            region_distribution: None,
        }
@@ -428,14 +410,4 @@ impl AlterTableData {
            .as_ref()
            .map(|value| &value.table_info)
    }
-
-    #[cfg(test)]
-    pub(crate) fn column_metadatas(&self) -> &[ColumnMetadata] {
-        &self.column_metadatas
-    }
-
-    #[cfg(test)]
-    pub(crate) fn set_column_metadatas(&mut self, column_metadatas: Vec<ColumnMetadata>) {
-        self.column_metadatas = column_metadatas;
-    }
 }
--- a/src/common/meta/src/ddl/alter_table/check.rs
+++ b/src/common/meta/src/ddl/alter_table/check.rs
@@ -0,0 +1,62 @@
+// 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 api::v1::alter_table_expr::Kind;
+use api::v1::RenameTable;
+use common_catalog::format_full_table_name;
+use snafu::ensure;
+
+use crate::ddl::alter_table::AlterTableProcedure;
+use crate::error::{self, Result};
+use crate::key::table_name::TableNameKey;
+
+impl AlterTableProcedure {
+    /// Checks:
+    /// - The new table name doesn't exist (rename).
+    /// - Table exists.
+    pub(crate) async fn check_alter(&self) -> Result<()> {
+        let alter_expr = &self.data.task.alter_table;
+        let catalog = &alter_expr.catalog_name;
+        let schema = &alter_expr.schema_name;
+        let table_name = &alter_expr.table_name;
+        // Safety: Checked in `AlterTableProcedure::new`.
+        let alter_kind = self.data.task.alter_table.kind.as_ref().unwrap();
+
+        let manager = &self.context.table_metadata_manager;
+        if let Kind::RenameTable(RenameTable { new_table_name }) = alter_kind {
+            let new_table_name_key = TableNameKey::new(catalog, schema, new_table_name);
+            let exists = manager
+                .table_name_manager()
+                .exists(new_table_name_key)
+                .await?;
+            ensure!(
+                !exists,
+                error::TableAlreadyExistsSnafu {
+                    table_name: format_full_table_name(catalog, schema, new_table_name),
+                }
+            )
+        }
+
+        let table_name_key = TableNameKey::new(catalog, schema, table_name);
+        let exists = manager.table_name_manager().exists(table_name_key).await?;
+        ensure!(
+            exists,
+            error::TableNotFoundSnafu {
+                table_name: format_full_table_name(catalog, schema, &alter_expr.table_name),
+            }
+        );
+
+        Ok(())
+    }
+}
--- a/src/common/meta/src/ddl/alter_table/executor.rs
+++ b/src/common/meta/src/ddl/alter_table/executor.rs
@@ -1,313 +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::region::RegionResponse;
-use api::v1::region::region_request::Body;
-use api::v1::region::{alter_request, AlterRequest, RegionRequest, RegionRequestHeader};
-use api::v1::AlterTableExpr;
-use common_catalog::format_full_table_name;
-use common_grpc_expr::alter_expr_to_request;
-use common_telemetry::tracing_context::TracingContext;
-use common_telemetry::{debug, info};
-use futures::future;
-use snafu::{ensure, ResultExt};
-use store_api::metadata::ColumnMetadata;
-use store_api::storage::{RegionId, TableId};
-use table::metadata::{RawTableInfo, TableInfo};
-use table::requests::AlterKind;
-use table::table_name::TableName;
-
-use crate::cache_invalidator::{CacheInvalidatorRef, Context};
-use crate::ddl::utils::{add_peer_context_if_needed, raw_table_info};
-use crate::error::{self, Result, UnexpectedSnafu};
-use crate::instruction::CacheIdent;
-use crate::key::table_info::TableInfoValue;
-use crate::key::table_name::TableNameKey;
-use crate::key::{DeserializedValueWithBytes, RegionDistribution, TableMetadataManagerRef};
-use crate::node_manager::NodeManagerRef;
-use crate::rpc::router::{find_leaders, region_distribution, RegionRoute};
-
-/// [AlterTableExecutor] performs:
-/// - Alters the metadata of the table.
-/// - Alters regions on the datanode nodes.
-pub struct AlterTableExecutor {
-    table: TableName,
-    table_id: TableId,
-    /// The new table name if the alter kind is rename table.
-    new_table_name: Option<String>,
-}
-
-impl AlterTableExecutor {
-    /// Creates a new [`AlterTableExecutor`].
-    pub fn new(table: TableName, table_id: TableId, new_table_name: Option<String>) -> Self {
-        Self {
-            table,
-            table_id,
-            new_table_name,
-        }
-    }
-
-    /// Prepares to alter the table.
-    ///
-    /// ## Checks:
-    /// - The new table name doesn't exist (rename).
-    /// - Table exists.
-    pub(crate) async fn on_prepare(
-        &self,
-        table_metadata_manager: &TableMetadataManagerRef,
-    ) -> Result<()> {
-        let catalog = &self.table.catalog_name;
-        let schema = &self.table.schema_name;
-        let table_name = &self.table.table_name;
-
-        let manager = table_metadata_manager;
-        if let Some(new_table_name) = &self.new_table_name {
-            let new_table_name_key = TableNameKey::new(catalog, schema, new_table_name);
-            let exists = manager
-                .table_name_manager()
-                .exists(new_table_name_key)
-                .await?;
-            ensure!(
-                !exists,
-                error::TableAlreadyExistsSnafu {
-                    table_name: format_full_table_name(catalog, schema, new_table_name),
-                }
-            )
-        }
-
-        let table_name_key = TableNameKey::new(catalog, schema, table_name);
-        let exists = manager.table_name_manager().exists(table_name_key).await?;
-        ensure!(
-            exists,
-            error::TableNotFoundSnafu {
-                table_name: format_full_table_name(catalog, schema, table_name),
-            }
-        );
-
-        Ok(())
-    }
-
-    /// Validates the alter table expression and builds the new table info.
-    ///
-    /// This validation is performed early to ensure the alteration is valid before
-    /// proceeding to the `on_alter_metadata` state, where regions have already been altered.
-    /// Building the new table info here allows us to catch any issues with the
-    /// alteration before committing metadata changes.
-    pub(crate) fn validate_alter_table_expr(
-        table_info: &RawTableInfo,
-        alter_table_expr: AlterTableExpr,
-    ) -> Result<TableInfo> {
-        build_new_table_info(table_info, alter_table_expr)
-    }
-
-    /// Updates table metadata for alter table operation.
-    pub(crate) async fn on_alter_metadata(
-        &self,
-        table_metadata_manager: &TableMetadataManagerRef,
-        current_table_info_value: &DeserializedValueWithBytes<TableInfoValue>,
-        region_distribution: Option<&RegionDistribution>,
-        mut raw_table_info: RawTableInfo,
-        column_metadatas: &[ColumnMetadata],
-    ) -> Result<()> {
-        let table_ref = self.table.table_ref();
-        let table_id = self.table_id;
-
-        if let Some(new_table_name) = &self.new_table_name {
-            debug!(
-                "Starting update table: {} metadata, table_id: {}, new table info: {:?}, new table name: {}",
-                table_ref, table_id, raw_table_info, new_table_name
-            );
-
-            table_metadata_manager
-                .rename_table(current_table_info_value, new_table_name.to_string())
-                .await?;
-        } else {
-            debug!(
-                "Starting update table: {} metadata, table_id: {}, new table info: {:?}",
-                table_ref, table_id, raw_table_info
-            );
-
-            ensure!(
-                region_distribution.is_some(),
-                UnexpectedSnafu {
-                    err_msg: "region distribution is not set when updating table metadata",
-                }
-            );
-
-            if !column_metadatas.is_empty() {
-                raw_table_info::update_table_info_column_ids(&mut raw_table_info, column_metadatas);
-            }
-            table_metadata_manager
-                .update_table_info(
-                    current_table_info_value,
-                    region_distribution.cloned(),
-                    raw_table_info,
-                )
-                .await?;
-        }
-
-        Ok(())
-    }
-
-    /// Alters regions on the datanode nodes.
-    pub(crate) async fn on_alter_regions(
-        &self,
-        node_manager: &NodeManagerRef,
-        region_routes: &[RegionRoute],
-        kind: Option<alter_request::Kind>,
-    ) -> Vec<Result<RegionResponse>> {
-        let region_distribution = region_distribution(region_routes);
-        let leaders = find_leaders(region_routes)
-            .into_iter()
-            .map(|p| (p.id, p))
-            .collect::<HashMap<_, _>>();
-        let total_num_region = region_distribution
-            .values()
-            .map(|r| r.leader_regions.len())
-            .sum::<usize>();
-        let mut alter_region_tasks = Vec::with_capacity(total_num_region);
-        for (datanode_id, region_role_set) in region_distribution {
-            if region_role_set.leader_regions.is_empty() {
-                continue;
-            }
-            // Safety: must exists.
-            let peer = leaders.get(&datanode_id).unwrap();
-            let requester = node_manager.datanode(peer).await;
-
-            for region_id in region_role_set.leader_regions {
-                let region_id = RegionId::new(self.table_id, region_id);
-                let request = make_alter_region_request(region_id, kind.clone());
-
-                let requester = requester.clone();
-                let peer = peer.clone();
-
-                alter_region_tasks.push(async move {
-                    requester
-                        .handle(request)
-                        .await
-                        .map_err(add_peer_context_if_needed(peer))
-                });
-            }
-        }
-
-        future::join_all(alter_region_tasks)
-            .await
-            .into_iter()
-            .collect::<Vec<_>>()
-    }
-
-    /// Invalidates cache for the table.
-    pub(crate) async fn invalidate_table_cache(
-        &self,
-        cache_invalidator: &CacheInvalidatorRef,
-    ) -> Result<()> {
-        let ctx = Context {
-            subject: Some(format!(
-                "Invalidate table cache by altering table {}, table_id: {}",
-                self.table.table_ref(),
-                self.table_id,
-            )),
-        };
-
-        cache_invalidator
-            .invalidate(
-                &ctx,
-                &[
-                    CacheIdent::TableName(self.table.clone()),
-                    CacheIdent::TableId(self.table_id),
-                ],
-            )
-            .await?;
-
-        Ok(())
-    }
-}
-
-/// Makes alter region request.
-pub(crate) fn make_alter_region_request(
-    region_id: RegionId,
-    kind: Option<alter_request::Kind>,
-) -> RegionRequest {
-    RegionRequest {
-        header: Some(RegionRequestHeader {
-            tracing_context: TracingContext::from_current_span().to_w3c(),
-            ..Default::default()
-        }),
-        body: Some(Body::Alter(AlterRequest {
-            region_id: region_id.as_u64(),
-            kind,
-            ..Default::default()
-        })),
-    }
-}
-
-/// Builds new table info after alteration.
-///
-/// This function creates a new table info by applying the alter table expression
-/// to the existing table info. For add column operations, it increments the
-/// `next_column_id` by the number of columns being added, which may result in gaps
-/// in the column id sequence.
-fn build_new_table_info(
-    table_info: &RawTableInfo,
-    alter_table_expr: AlterTableExpr,
-) -> Result<TableInfo> {
-    let table_info =
-        TableInfo::try_from(table_info.clone()).context(error::ConvertRawTableInfoSnafu)?;
-    let schema_name = &table_info.schema_name;
-    let catalog_name = &table_info.catalog_name;
-    let table_name = &table_info.name;
-    let table_id = table_info.ident.table_id;
-    let request = alter_expr_to_request(table_id, alter_table_expr)
-        .context(error::ConvertAlterTableRequestSnafu)?;
-
-    let new_meta = table_info
-        .meta
-        .builder_with_alter_kind(table_name, &request.alter_kind)
-        .context(error::TableSnafu)?
-        .build()
-        .with_context(|_| error::BuildTableMetaSnafu {
-            table_name: format_full_table_name(catalog_name, schema_name, table_name),
-        })?;
-
-    let mut new_info = table_info.clone();
-    new_info.meta = new_meta;
-    new_info.ident.version = table_info.ident.version + 1;
-    match request.alter_kind {
-        AlterKind::AddColumns { columns } => {
-            // Bumps the column id for the new columns.
-            // It may bump more than the actual number of columns added if there are
-            // existing columns, but it's fine.
-            new_info.meta.next_column_id += columns.len() as u32;
-        }
-        AlterKind::RenameTable { new_table_name } => {
-            new_info.name = new_table_name.to_string();
-        }
-        AlterKind::DropColumns { .. }
-        | AlterKind::ModifyColumnTypes { .. }
-        | AlterKind::SetTableOptions { .. }
-        | AlterKind::UnsetTableOptions { .. }
-        | AlterKind::SetIndex { .. }
-        | AlterKind::UnsetIndex { .. }
-        | AlterKind::DropDefaults { .. } => {}
-    }
-
-    info!(
-        "Built new table info: {:?} for table {}, table_id: {}",
-        new_info.meta, table_name, table_id
-    );
-
-    Ok(new_info)
-}
--- a/src/common/meta/src/ddl/alter_table/region_request.rs
+++ b/src/common/meta/src/ddl/alter_table/region_request.rs
@@ -15,16 +15,43 @@
 use std::collections::HashSet;

 use api::v1::alter_table_expr::Kind;
+use api::v1::region::region_request::Body;
 use api::v1::region::{
-    alter_request, AddColumn, AddColumns, DropColumn, DropColumns, RegionColumnDef,
+    alter_request, AddColumn, AddColumns, AlterRequest, DropColumn, DropColumns, RegionColumnDef,
+    RegionRequest, RegionRequestHeader,
 };
+use common_telemetry::tracing_context::TracingContext;
 use snafu::OptionExt;
+use store_api::storage::RegionId;
 use table::metadata::RawTableInfo;

 use crate::ddl::alter_table::AlterTableProcedure;
 use crate::error::{InvalidProtoMsgSnafu, Result};

 impl AlterTableProcedure {
+    /// Makes alter region request from existing an alter kind.
+    /// Region alter request always add columns if not exist.
+    pub(crate) fn make_alter_region_request(
+        &self,
+        region_id: RegionId,
+        kind: Option<alter_request::Kind>,
+    ) -> Result<RegionRequest> {
+        // Safety: checked
+        let table_info = self.data.table_info().unwrap();
+
+        Ok(RegionRequest {
+            header: Some(RegionRequestHeader {
+                tracing_context: TracingContext::from_current_span().to_w3c(),
+                ..Default::default()
+            }),
+            body: Some(Body::Alter(AlterRequest {
+                region_id: region_id.as_u64(),
+                schema_version: table_info.ident.version,
+                kind,
+            })),
+        })
+    }
+
    /// Makes alter kind proto that all regions can reuse.
    /// Region alter request always add columns if not exist.
    pub(crate) fn make_region_alter_kind(&self) -> Result<Option<alter_request::Kind>> {
@@ -128,7 +155,6 @@ mod tests {
    use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
    use store_api::storage::{RegionId, TableId};

-    use crate::ddl::alter_table::executor::make_alter_region_request;
    use crate::ddl::alter_table::AlterTableProcedure;
    use crate::ddl::test_util::columns::TestColumnDefBuilder;
    use crate::ddl::test_util::create_table::{
@@ -235,13 +261,15 @@ mod tests {
        let mut procedure = AlterTableProcedure::new(table_id, task, ddl_context).unwrap();
        procedure.on_prepare().await.unwrap();
        let alter_kind = procedure.make_region_alter_kind().unwrap();
-        let Some(Body::Alter(alter_region_request)) =
-            make_alter_region_request(region_id, alter_kind).body
+        let Some(Body::Alter(alter_region_request)) = procedure
+            .make_alter_region_request(region_id, alter_kind)
+            .unwrap()
+            .body
        else {
            unreachable!()
        };
        assert_eq!(alter_region_request.region_id, region_id.as_u64());
-        assert_eq!(alter_region_request.schema_version, 0);
+        assert_eq!(alter_region_request.schema_version, 1);
        assert_eq!(
            alter_region_request.kind,
            Some(region::alter_request::Kind::AddColumns(
@@ -291,13 +319,15 @@ mod tests {
        let mut procedure = AlterTableProcedure::new(table_id, task, ddl_context).unwrap();
        procedure.on_prepare().await.unwrap();
        let alter_kind = procedure.make_region_alter_kind().unwrap();
-        let Some(Body::Alter(alter_region_request)) =
-            make_alter_region_request(region_id, alter_kind).body
+        let Some(Body::Alter(alter_region_request)) = procedure
+            .make_alter_region_request(region_id, alter_kind)
+            .unwrap()
+            .body
        else {
            unreachable!()
        };
        assert_eq!(alter_region_request.region_id, region_id.as_u64());
-        assert_eq!(alter_region_request.schema_version, 0);
+        assert_eq!(alter_region_request.schema_version, 1);
        assert_eq!(
            alter_region_request.kind,
            Some(region::alter_request::Kind::ModifyColumnTypes(
--- a/src/common/meta/src/ddl/alter_table/update_metadata.rs
+++ b/src/common/meta/src/ddl/alter_table/update_metadata.rs
@@ -0,0 +1,103 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use common_grpc_expr::alter_expr_to_request;
+use snafu::ResultExt;
+use table::metadata::{RawTableInfo, TableInfo};
+use table::requests::AlterKind;
+
+use crate::ddl::alter_table::AlterTableProcedure;
+use crate::error::{self, Result};
+use crate::key::table_info::TableInfoValue;
+use crate::key::{DeserializedValueWithBytes, RegionDistribution};
+
+impl AlterTableProcedure {
+    /// Builds new table info after alteration.
+    /// It bumps the column id of the table by the number of the add column requests.
+    /// So there may be holes in the column id sequence.
+    pub(crate) fn build_new_table_info(&self, table_info: &RawTableInfo) -> Result<TableInfo> {
+        let table_info =
+            TableInfo::try_from(table_info.clone()).context(error::ConvertRawTableInfoSnafu)?;
+        let table_ref = self.data.table_ref();
+        let alter_expr = self.data.task.alter_table.clone();
+        let request = alter_expr_to_request(self.data.table_id(), alter_expr)
+            .context(error::ConvertAlterTableRequestSnafu)?;
+
+        let new_meta = table_info
+            .meta
+            .builder_with_alter_kind(table_ref.table, &request.alter_kind)
+            .context(error::TableSnafu)?
+            .build()
+            .with_context(|_| error::BuildTableMetaSnafu {
+                table_name: table_ref.table,
+            })?;
+
+        let mut new_info = table_info.clone();
+        new_info.meta = new_meta;
+        new_info.ident.version = table_info.ident.version + 1;
+        match request.alter_kind {
+            AlterKind::AddColumns { columns } => {
+                // Bumps the column id for the new columns.
+                // It may bump more than the actual number of columns added if there are
+                // existing columns, but it's fine.
+                new_info.meta.next_column_id += columns.len() as u32;
+            }
+            AlterKind::RenameTable { new_table_name } => {
+                new_info.name = new_table_name.to_string();
+            }
+            AlterKind::DropColumns { .. }
+            | AlterKind::ModifyColumnTypes { .. }
+            | AlterKind::SetTableOptions { .. }
+            | AlterKind::UnsetTableOptions { .. }
+            | AlterKind::SetIndex { .. }
+            | AlterKind::UnsetIndex { .. }
+            | AlterKind::DropDefaults { .. } => {}
+        }
+
+        Ok(new_info)
+    }
+
+    /// Updates table metadata for rename table operation.
+    pub(crate) async fn on_update_metadata_for_rename(
+        &self,
+        new_table_name: String,
+        current_table_info_value: &DeserializedValueWithBytes<TableInfoValue>,
+    ) -> Result<()> {
+        let table_metadata_manager = &self.context.table_metadata_manager;
+        table_metadata_manager
+            .rename_table(current_table_info_value, new_table_name)
+            .await?;
+
+        Ok(())
+    }
+
+    /// Updates table metadata for alter table operation.
+    pub(crate) async fn on_update_metadata_for_alter(
+        &self,
+        new_table_info: RawTableInfo,
+        region_distribution: RegionDistribution,
+        current_table_info_value: &DeserializedValueWithBytes<TableInfoValue>,
+    ) -> Result<()> {
+        let table_metadata_manager = &self.context.table_metadata_manager;
+        table_metadata_manager
+            .update_table_info(
+                current_table_info_value,
+                Some(region_distribution),
+                new_table_info,
+            )
+            .await?;
+
+        Ok(())
+    }
+}
--- a/src/common/meta/src/ddl/create_flow.rs
+++ b/src/common/meta/src/ddl/create_flow.rs
@@ -167,25 +167,6 @@ impl CreateFlowProcedure {
        }

        self.collect_source_tables().await?;
-
-        // Validate that source and sink tables are not the same
-        let sink_table_name = &self.data.task.sink_table_name;
-        if self
-            .data
-            .task
-            .source_table_names
-            .iter()
-            .any(|source| source == sink_table_name)
-        {
-            return error::UnsupportedSnafu {
-                operation: format!(
-                    "Creating flow with source and sink table being the same: {}",
-                    sink_table_name
-                ),
-            }
-            .fail();
-        }
-
        if self.data.flow_id.is_none() {
            self.allocate_flow_id().await?;
        }
--- a/src/common/meta/src/ddl/create_flow/metadata.rs
+++ b/src/common/meta/src/ddl/create_flow/metadata.rs
@@ -21,7 +21,7 @@ use crate::key::table_name::TableNameKey;
 impl CreateFlowProcedure {
    /// Allocates the [FlowId].
    pub(crate) async fn allocate_flow_id(&mut self) -> Result<()> {
-        // TODO(weny, ruihang): We don't support the partitions. It's always be 1, now.
+        //TODO(weny, ruihang): We doesn't support the partitions. It's always be 1, now.
        let partitions = 1;
        let (flow_id, peers) = self
            .context
--- a/src/common/meta/src/ddl/create_logical_tables.rs
+++ b/src/common/meta/src/ddl/create_logical_tables.rs
@@ -27,7 +27,7 @@ use common_telemetry::{debug, error, warn};
 use futures::future;
 pub use region_request::create_region_request_builder;
 use serde::{Deserialize, Serialize};
-use snafu::ResultExt;
+use snafu::{ensure, ResultExt};
 use store_api::metadata::ColumnMetadata;
 use store_api::metric_engine_consts::ALTER_PHYSICAL_EXTENSION_KEY;
 use store_api::storage::{RegionId, RegionNumber};
@@ -35,11 +35,10 @@ use strum::AsRefStr;
 use table::metadata::{RawTableInfo, TableId};

 use crate::ddl::utils::{
-    add_peer_context_if_needed, extract_column_metadatas, map_to_procedure_error,
-    sync_follower_regions,
+    add_peer_context_if_needed, map_to_procedure_error, sync_follower_regions,
 };
 use crate::ddl::DdlContext;
-use crate::error::Result;
+use crate::error::{DecodeJsonSnafu, MetadataCorruptionSnafu, Result};
 use crate::key::table_route::TableRouteValue;
 use crate::lock_key::{CatalogLock, SchemaLock, TableLock, TableNameLock};
 use crate::metrics;
@@ -167,23 +166,47 @@ impl CreateLogicalTablesProcedure {
            .into_iter()
            .collect::<Result<Vec<_>>>()?;

-        if let Some(column_metadatas) =
-            extract_column_metadatas(&mut results, ALTER_PHYSICAL_EXTENSION_KEY)?
-        {
-            self.data.physical_columns = column_metadatas;
+        // Collects response from datanodes.
+        let phy_raw_schemas = results
+            .iter_mut()
+            .map(|res| res.extensions.remove(ALTER_PHYSICAL_EXTENSION_KEY))
+            .collect::<Vec<_>>();
+
+        if phy_raw_schemas.is_empty() {
+            self.submit_sync_region_requests(results, region_routes)
+                .await;
+            self.data.state = CreateTablesState::CreateMetadata;
+            return Ok(Status::executing(false));
+        }
+
+        // Verify all the physical schemas are the same
+        // Safety: previous check ensures this vec is not empty
+        let first = phy_raw_schemas.first().unwrap();
+        ensure!(
+            phy_raw_schemas.iter().all(|x| x == first),
+            MetadataCorruptionSnafu {
+                err_msg: "The physical schemas from datanodes are not the same."
+            }
+        );
+
+        // Decodes the physical raw schemas
+        if let Some(phy_raw_schemas) = first {
+            self.data.physical_columns =
+                ColumnMetadata::decode_list(phy_raw_schemas).context(DecodeJsonSnafu)?;
        } else {
            warn!("creating logical table result doesn't contains extension key `{ALTER_PHYSICAL_EXTENSION_KEY}`,leaving the physical table's schema unchanged");
        }

-        self.submit_sync_region_requests(&results, region_routes)
+        self.submit_sync_region_requests(results, region_routes)
            .await;
        self.data.state = CreateTablesState::CreateMetadata;
+
        Ok(Status::executing(true))
    }

    async fn submit_sync_region_requests(
        &self,
-        results: &[RegionResponse],
+        results: Vec<RegionResponse>,
        region_routes: &[RegionRoute],
    ) {
        if let Err(err) = sync_follower_regions(
--- a/src/common/meta/src/ddl/create_logical_tables/update_metadata.rs
+++ b/src/common/meta/src/ddl/create_logical_tables/update_metadata.rs
@@ -22,7 +22,7 @@ use table::table_name::TableName;

 use crate::cache_invalidator::Context;
 use crate::ddl::create_logical_tables::CreateLogicalTablesProcedure;
-use crate::ddl::utils::raw_table_info;
+use crate::ddl::physical_table_metadata;
 use crate::error::{Result, TableInfoNotFoundSnafu};
 use crate::instruction::CacheIdent;

@@ -47,7 +47,7 @@ impl CreateLogicalTablesProcedure {
        // Generates new table info
        let raw_table_info = physical_table_info.deref().table_info.clone();

-        let new_table_info = raw_table_info::build_new_physical_table_info(
+        let new_table_info = physical_table_metadata::build_new_physical_table_info(
            raw_table_info,
            &self.data.physical_columns,
        );
--- a/src/common/meta/src/ddl/create_table.rs
+++ b/src/common/meta/src/ddl/create_table.rs
@@ -22,23 +22,20 @@ use common_procedure::error::{
    ExternalSnafu, FromJsonSnafu, Result as ProcedureResult, ToJsonSnafu,
 };
 use common_procedure::{Context as ProcedureContext, LockKey, Procedure, 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::{ensure, OptionExt, ResultExt};
-use store_api::metadata::ColumnMetadata;
-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_reference::TableReference;

 use crate::ddl::create_table_template::{build_template, CreateRequestBuilder};
-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,
+    add_peer_context_if_needed, convert_region_routes_to_detecting_regions, map_to_procedure_error,
+    region_storage_path,
 };
 use crate::ddl::{DdlContext, TableMetadata};
 use crate::error::{self, Result};
@@ -246,21 +243,14 @@ impl CreateTableProcedure {
            }
        }

-        self.creator.data.state = CreateTableState::CreateMetadata;
-
-        let mut results = join_all(create_region_tasks)
+        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;

+        // TODO(weny): Add more tests.
        Ok(Status::executing(true))
    }

@@ -272,10 +262,7 @@ impl CreateTableProcedure {
        let table_id = self.table_id();
        let manager = &self.context.table_metadata_manager;

-        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);
-        }
+        let raw_table_info = self.table_info().clone();
        // Safety: the region_wal_options must be allocated.
        let region_wal_options = self.region_wal_options()?.clone();
        // Safety: the table_route must be allocated.
@@ -359,7 +346,6 @@ impl TableCreator {
        Self {
            data: CreateTableData {
                state: CreateTableState::Prepare,
-                column_metadatas: vec![],
                task,
                table_route: None,
                region_wal_options: None,
@@ -421,8 +407,6 @@ pub enum CreateTableState {
 pub struct CreateTableData {
    pub state: CreateTableState,
    pub task: CreateTableTask,
-    #[serde(default)]
-    pub column_metadatas: Vec<ColumnMetadata>,
    /// None stands for not allocated yet.
    table_route: Option<PhysicalTableRouteValue>,
    /// None stands for not allocated yet.
--- a/src/common/meta/src/ddl/drop_table/executor.rs
+++ b/src/common/meta/src/ddl/drop_table/executor.rs
@@ -185,15 +185,11 @@ impl DropTableExecutor {
            .await
    }

-    /// Invalidates caches for the table.
+    /// Invalidates frontend caches
    pub async fn invalidate_table_cache(&self, ctx: &DdlContext) -> Result<()> {
        let cache_invalidator = &ctx.cache_invalidator;
        let ctx = Context {
-            subject: Some(format!(
-                "Invalidate table cache by dropping table {}, table_id: {}",
-                self.table.table_ref(),
-                self.table_id,
-            )),
+            subject: Some("Invalidate table cache by dropping table".to_string()),
        };

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

-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;

 use api::v1::SemanticType;
-use common_telemetry::debug;
-use common_telemetry::tracing::warn;
 use store_api::metadata::ColumnMetadata;
 use table::metadata::RawTableInfo;

@@ -25,10 +23,6 @@ pub(crate) fn build_new_physical_table_info(
    mut raw_table_info: RawTableInfo,
    physical_columns: &[ColumnMetadata],
 ) -> RawTableInfo {
-    debug!(
-        "building new physical table info for table: {}, table_id: {}",
-        raw_table_info.name, raw_table_info.ident.table_id
-    );
    let existing_columns = raw_table_info
        .meta
        .schema
@@ -42,8 +36,6 @@ pub(crate) fn build_new_physical_table_info(
    let time_index = &mut raw_table_info.meta.schema.timestamp_index;
    let columns = &mut raw_table_info.meta.schema.column_schemas;
    columns.clear();
-    let column_ids = &mut raw_table_info.meta.column_ids;
-    column_ids.clear();

    for (idx, col) in physical_columns.iter().enumerate() {
        match col.semantic_type {
@@ -58,7 +50,6 @@ pub(crate) fn build_new_physical_table_info(
        }

        columns.push(col.column_schema.clone());
-        column_ids.push(col.column_id);
    }

    if let Some(time_index) = *time_index {
@@ -67,54 +58,3 @@ pub(crate) fn build_new_physical_table_info(

    raw_table_info
 }
-
-/// Updates the column IDs in the table info based on the provided column metadata.
-///
-/// This function validates that the column metadata matches the existing table schema
-/// before updating the column ids. If the column metadata doesn't match the table schema,
-/// the table info remains unchanged.
-pub(crate) fn update_table_info_column_ids(
-    raw_table_info: &mut RawTableInfo,
-    column_metadatas: &[ColumnMetadata],
-) {
-    let mut table_column_names = raw_table_info
-        .meta
-        .schema
-        .column_schemas
-        .iter()
-        .map(|c| c.name.as_str())
-        .collect::<Vec<_>>();
-    table_column_names.sort_unstable();
-
-    let mut column_names = column_metadatas
-        .iter()
-        .map(|c| c.column_schema.name.as_str())
-        .collect::<Vec<_>>();
-    column_names.sort_unstable();
-
-    if table_column_names != column_names {
-        warn!(
-            "Column metadata doesn't match the table schema for table {}, table_id: {}, column in table: {:?}, column in metadata: {:?}",
-            raw_table_info.name,
-            raw_table_info.ident.table_id,
-            table_column_names,
-            column_names,
-        );
-        return;
-    }
-
-    let name_to_id = column_metadatas
-        .iter()
-        .map(|c| (c.column_schema.name.clone(), c.column_id))
-        .collect::<HashMap<_, _>>();
-
-    let schema = &raw_table_info.meta.schema.column_schemas;
-    let mut column_ids = Vec::with_capacity(schema.len());
-    for column_schema in schema {
-        if let Some(id) = name_to_id.get(&column_schema.name) {
-            column_ids.push(*id);
-        }
-    }
-
-    raw_table_info.meta.column_ids = column_ids;
-}
--- a/src/common/meta/src/ddl/table_meta.rs
+++ b/src/common/meta/src/ddl/table_meta.rs
@@ -113,20 +113,15 @@ impl TableMetadataAllocator {
        table_id: TableId,
        task: &CreateTableTask,
    ) -> Result<PhysicalTableRouteValue> {
-        let num_regions = task
-            .partitions
-            .as_ref()
-            .map(|p| p.value_list.len())
-            .unwrap_or(1);
+        let regions = task.partitions.len();
        ensure!(
-            num_regions > 0,
+            regions > 0,
            error::UnexpectedSnafu {
                err_msg: "The number of partitions must be greater than 0"
            }
        );

-        let peers = self.peer_allocator.alloc(num_regions).await?;
-        debug!("Allocated peers {:?} for table {}", peers, table_id);
+        let peers = self.peer_allocator.alloc(regions).await?;
        let region_routes = task
            .partitions
            .iter()
--- a/src/common/meta/src/ddl/test_util.rs
+++ b/src/common/meta/src/ddl/test_util.rs
@@ -21,16 +21,10 @@ pub mod flownode_handler;
 use std::assert_matches::assert_matches;
 use std::collections::HashMap;

+use api::v1::meta::Partition;
 use api::v1::{ColumnDataType, SemanticType};
 use common_procedure::Status;
-use datatypes::prelude::ConcreteDataType;
-use datatypes::schema::ColumnSchema;
-use store_api::metadata::ColumnMetadata;
-use store_api::metric_engine_consts::{
-    DATA_SCHEMA_TABLE_ID_COLUMN_NAME, DATA_SCHEMA_TSID_COLUMN_NAME, LOGICAL_TABLE_METADATA_KEY,
-    METRIC_ENGINE_NAME,
-};
-use store_api::storage::consts::ReservedColumnId;
+use store_api::metric_engine_consts::{LOGICAL_TABLE_METADATA_KEY, METRIC_ENGINE_NAME};
 use table::metadata::{RawTableInfo, TableId};

 use crate::ddl::create_logical_tables::CreateLogicalTablesProcedure;
@@ -144,12 +138,14 @@ pub fn test_create_logical_table_task(name: &str) -> CreateTableTask {
    CreateTableTask {
        create_table,
        // Single region
-        partitions: None,
+        partitions: vec![Partition {
+            column_list: vec![],
+            value_list: vec![],
+        }],
        table_info,
    }
 }

-/// Creates a physical table task with a single region.
 pub fn test_create_physical_table_task(name: &str) -> CreateTableTask {
    let create_table = TestCreateTableExprBuilder::default()
        .column_defs([
@@ -179,99 +175,10 @@ pub fn test_create_physical_table_task(name: &str) -> CreateTableTask {
    CreateTableTask {
        create_table,
        // Single region
-        partitions: None,
+        partitions: vec![Partition {
+            column_list: vec![],
+            value_list: vec![],
+        }],
        table_info,
    }
 }
-
-/// Creates a column metadata list with tag fields.
-pub fn test_column_metadatas(tag_fields: &[&str]) -> Vec<ColumnMetadata> {
-    let mut output = Vec::with_capacity(tag_fields.len() + 4);
-    output.extend([
-        ColumnMetadata {
-            column_schema: ColumnSchema::new(
-                "ts",
-                ConcreteDataType::timestamp_millisecond_datatype(),
-                false,
-            ),
-            semantic_type: SemanticType::Timestamp,
-            column_id: 0,
-        },
-        ColumnMetadata {
-            column_schema: ColumnSchema::new("value", ConcreteDataType::float64_datatype(), false),
-            semantic_type: SemanticType::Field,
-            column_id: 1,
-        },
-        ColumnMetadata {
-            column_schema: ColumnSchema::new(
-                DATA_SCHEMA_TABLE_ID_COLUMN_NAME,
-                ConcreteDataType::timestamp_millisecond_datatype(),
-                false,
-            ),
-            semantic_type: SemanticType::Tag,
-            column_id: ReservedColumnId::table_id(),
-        },
-        ColumnMetadata {
-            column_schema: ColumnSchema::new(
-                DATA_SCHEMA_TSID_COLUMN_NAME,
-                ConcreteDataType::float64_datatype(),
-                false,
-            ),
-            semantic_type: SemanticType::Tag,
-            column_id: ReservedColumnId::tsid(),
-        },
-    ]);
-
-    for (i, name) in tag_fields.iter().enumerate() {
-        output.push(ColumnMetadata {
-            column_schema: ColumnSchema::new(
-                name.to_string(),
-                ConcreteDataType::string_datatype(),
-                true,
-            ),
-            semantic_type: SemanticType::Tag,
-            column_id: (i + 2) as u32,
-        });
-    }
-
-    output
-}
-
-/// Asserts the column names.
-pub fn assert_column_name(table_info: &RawTableInfo, expected_column_names: &[&str]) {
-    assert_eq!(
-        table_info
-            .meta
-            .schema
-            .column_schemas
-            .iter()
-            .map(|c| c.name.to_string())
-            .collect::<Vec<_>>(),
-        expected_column_names
-    );
-}
-
-/// Asserts the column metadatas
-pub fn assert_column_name_and_id(column_metadatas: &[ColumnMetadata], expected: &[(&str, u32)]) {
-    assert_eq!(expected.len(), column_metadatas.len());
-    for (name, id) in expected {
-        let column_metadata = column_metadatas
-            .iter()
-            .find(|c| c.column_id == *id)
-            .unwrap();
-        assert_eq!(column_metadata.column_schema.name, *name);
-    }
-}
-
-/// Gets the raw table info.
-pub async fn get_raw_table_info(ddl_context: &DdlContext, table_id: TableId) -> RawTableInfo {
-    ddl_context
-        .table_metadata_manager
-        .table_info_manager()
-        .get(table_id)
-        .await
-        .unwrap()
-        .unwrap()
-        .into_inner()
-        .table_info
-}
--- a/src/common/meta/src/ddl/test_util/create_table.rs
+++ b/src/common/meta/src/ddl/test_util/create_table.rs
@@ -15,6 +15,7 @@
 use std::collections::HashMap;

 use api::v1::column_def::try_as_column_schema;
+use api::v1::meta::Partition;
 use api::v1::{ColumnDataType, ColumnDef, CreateTableExpr, SemanticType};
 use chrono::DateTime;
 use common_catalog::consts::{
@@ -131,7 +132,6 @@ pub fn build_raw_table_info_from_expr(expr: &CreateTableExpr) -> RawTableInfo {
            options: TableOptions::try_from_iter(&expr.table_options).unwrap(),
            created_on: DateTime::default(),
            partition_key_indices: vec![],
-            column_ids: vec![],
        },
        table_type: TableType::Base,
    }
@@ -174,7 +174,10 @@ pub fn test_create_table_task(name: &str, table_id: TableId) -> CreateTableTask
    CreateTableTask {
        create_table,
        // Single region
-        partitions: None,
+        partitions: vec![Partition {
+            column_list: vec![],
+            value_list: vec![],
+        }],
        table_info,
    }
 }
--- a/src/common/meta/src/ddl/test_util/datanode_handler.rs
+++ b/src/common/meta/src/ddl/test_util/datanode_handler.rs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::sync::Arc;
-
 use api::region::RegionResponse;
 use api::v1::region::RegionRequest;
 use common_error::ext::{BoxedError, ErrorExt, StackError};
@@ -47,13 +45,10 @@ impl MockDatanodeHandler for () {
    }
 }

-type RegionRequestHandler =
-    Arc<dyn Fn(Peer, RegionRequest) -> Result<RegionResponse> + Send + Sync>;
-
 #[derive(Clone)]
 pub struct DatanodeWatcher {
    sender: mpsc::Sender<(Peer, RegionRequest)>,
-    handler: Option<RegionRequestHandler>,
+    handler: Option<fn(Peer, RegionRequest) -> Result<RegionResponse>>,
 }

 impl DatanodeWatcher {
@@ -66,9 +61,9 @@ impl DatanodeWatcher {

    pub fn with_handler(
        mut self,
-        user_handler: impl Fn(Peer, RegionRequest) -> Result<RegionResponse> + Send + Sync + 'static,
+        user_handler: fn(Peer, RegionRequest) -> Result<RegionResponse>,
    ) -> Self {
-        self.handler = Some(Arc::new(user_handler));
+        self.handler = Some(user_handler);
        self
    }
 }
@@ -81,7 +76,7 @@ impl MockDatanodeHandler for DatanodeWatcher {
            .send((peer.clone(), request.clone()))
            .await
            .unwrap();
-        if let Some(handler) = self.handler.as_ref() {
+        if let Some(handler) = self.handler {
            handler(peer.clone(), request)
        } else {
            Ok(RegionResponse::new(0))
--- a/src/common/meta/src/ddl/tests/alter_logical_tables.rs
+++ b/src/common/meta/src/ddl/tests/alter_logical_tables.rs
@@ -23,20 +23,17 @@ use api::v1::{ColumnDataType, SemanticType};
 use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
 use common_procedure::{Procedure, ProcedureId, Status};
 use common_procedure_test::MockContextProvider;
-use store_api::metadata::ColumnMetadata;
-use store_api::metric_engine_consts::{ALTER_PHYSICAL_EXTENSION_KEY, MANIFEST_INFO_EXTENSION_KEY};
+use store_api::metric_engine_consts::MANIFEST_INFO_EXTENSION_KEY;
 use store_api::region_engine::RegionManifestInfo;
-use store_api::storage::consts::ReservedColumnId;
 use store_api::storage::RegionId;
 use tokio::sync::mpsc;

 use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
 use crate::ddl::test_util::alter_table::TestAlterTableExprBuilder;
 use crate::ddl::test_util::columns::TestColumnDefBuilder;
-use crate::ddl::test_util::datanode_handler::DatanodeWatcher;
+use crate::ddl::test_util::datanode_handler::{DatanodeWatcher, NaiveDatanodeHandler};
 use crate::ddl::test_util::{
-    assert_column_name, create_logical_table, create_physical_table,
-    create_physical_table_metadata, get_raw_table_info, test_column_metadatas,
+    create_logical_table, create_physical_table, create_physical_table_metadata,
    test_create_physical_table_task,
 };
 use crate::error::Error::{AlterLogicalTablesInvalidArguments, TableNotFound};
@@ -99,52 +96,6 @@ fn make_alter_logical_table_rename_task(
    }
 }

-fn make_alters_request_handler(
-    column_metadatas: Vec<ColumnMetadata>,
-) -> impl Fn(Peer, RegionRequest) -> Result<RegionResponse> {
-    move |_peer: Peer, request: RegionRequest| {
-        if let region_request::Body::Alters(_) = request.body.unwrap() {
-            let mut response = RegionResponse::new(0);
-            // Default region id for physical table.
-            let region_id = RegionId::new(1000, 1);
-            response.extensions.insert(
-                MANIFEST_INFO_EXTENSION_KEY.to_string(),
-                RegionManifestInfo::encode_list(&[(
-                    region_id,
-                    RegionManifestInfo::metric(1, 0, 2, 0),
-                )])
-                .unwrap(),
-            );
-            response.extensions.insert(
-                ALTER_PHYSICAL_EXTENSION_KEY.to_string(),
-                ColumnMetadata::encode_list(&column_metadatas).unwrap(),
-            );
-            return Ok(response);
-        }
-        Ok(RegionResponse::new(0))
-    }
-}
-
-fn assert_alters_request(
-    peer: Peer,
-    request: RegionRequest,
-    expected_peer_id: u64,
-    expected_region_ids: &[RegionId],
-) {
-    assert_eq!(peer.id, expected_peer_id,);
-    let Some(region_request::Body::Alters(req)) = request.body else {
-        unreachable!();
-    };
-    for (i, region_id) in expected_region_ids.iter().enumerate() {
-        assert_eq!(
-            req.requests[i].region_id,
-            *region_id,
-            "actual region id: {}",
-            RegionId::from_u64(req.requests[i].region_id)
-        );
-    }
-}
-
 #[tokio::test]
 async fn test_on_prepare_check_schema() {
    let node_manager = Arc::new(MockDatanodeManager::new(()));
@@ -254,20 +205,15 @@ async fn test_on_prepare() {

 #[tokio::test]
 async fn test_on_update_metadata() {
-    common_telemetry::init_default_ut_logging();
-    let (tx, mut rx) = mpsc::channel(8);
-    let test_column_metadatas = test_column_metadatas(&["new_col", "mew_col"]);
-    let datanode_handler =
-        DatanodeWatcher::new(tx).with_handler(make_alters_request_handler(test_column_metadatas));
-    let node_manager = Arc::new(MockDatanodeManager::new(datanode_handler));
+    let node_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
    let ddl_context = new_ddl_context(node_manager);

    // Creates physical table
    let phy_id = create_physical_table(&ddl_context, "phy").await;
    // Creates 3 logical tables
-    let logical_table1_id = create_logical_table(ddl_context.clone(), phy_id, "table1").await;
-    let logical_table2_id = create_logical_table(ddl_context.clone(), phy_id, "table2").await;
-    let logical_table3_id = create_logical_table(ddl_context.clone(), phy_id, "table3").await;
+    create_logical_table(ddl_context.clone(), phy_id, "table1").await;
+    create_logical_table(ddl_context.clone(), phy_id, "table2").await;
+    create_logical_table(ddl_context.clone(), phy_id, "table3").await;
    create_logical_table(ddl_context.clone(), phy_id, "table4").await;
    create_logical_table(ddl_context.clone(), phy_id, "table5").await;

@@ -277,7 +223,7 @@ async fn test_on_update_metadata() {
        make_alter_logical_table_add_column_task(None, "table3", vec!["new_col".to_string()]),
    ];

-    let mut procedure = AlterLogicalTablesProcedure::new(tasks, phy_id, ddl_context.clone());
+    let mut procedure = AlterLogicalTablesProcedure::new(tasks, phy_id, ddl_context);
    let mut status = procedure.on_prepare().await.unwrap();
    assert_matches!(
        status,
@@ -309,52 +255,18 @@ async fn test_on_update_metadata() {
            clean_poisons: false
        }
    );
-    let (peer, request) = rx.try_recv().unwrap();
-    rx.try_recv().unwrap_err();
-    assert_alters_request(
-        peer,
-        request,
-        0,
-        &[
-            RegionId::new(logical_table1_id, 0),
-            RegionId::new(logical_table2_id, 0),
-            RegionId::new(logical_table3_id, 0),
-        ],
-    );
-
-    let table_info = get_raw_table_info(&ddl_context, phy_id).await;
-    assert_column_name(
-        &table_info,
-        &["ts", "value", "__table_id", "__tsid", "new_col", "mew_col"],
-    );
-    assert_eq!(
-        table_info.meta.column_ids,
-        vec![
-            0,
-            1,
-            ReservedColumnId::table_id(),
-            ReservedColumnId::tsid(),
-            2,
-            3
-        ]
-    );
 }

 #[tokio::test]
 async fn test_on_part_duplicate_alter_request() {
-    common_telemetry::init_default_ut_logging();
-    let (tx, mut rx) = mpsc::channel(8);
-    let column_metadatas = test_column_metadatas(&["col_0"]);
-    let handler =
-        DatanodeWatcher::new(tx).with_handler(make_alters_request_handler(column_metadatas));
-    let node_manager = Arc::new(MockDatanodeManager::new(handler));
-    let mut ddl_context = new_ddl_context(node_manager);
+    let node_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
+    let ddl_context = new_ddl_context(node_manager);

    // Creates physical table
    let phy_id = create_physical_table(&ddl_context, "phy").await;
    // Creates 3 logical tables
-    let logical_table1_id = create_logical_table(ddl_context.clone(), phy_id, "table1").await;
-    let logical_table2_id = create_logical_table(ddl_context.clone(), phy_id, "table2").await;
+    create_logical_table(ddl_context.clone(), phy_id, "table1").await;
+    create_logical_table(ddl_context.clone(), phy_id, "table2").await;

    let tasks = vec![
        make_alter_logical_table_add_column_task(None, "table1", vec!["col_0".to_string()]),
@@ -393,40 +305,6 @@ async fn test_on_part_duplicate_alter_request() {
            clean_poisons: false
        }
    );
-    let (peer, request) = rx.try_recv().unwrap();
-    rx.try_recv().unwrap_err();
-    assert_alters_request(
-        peer,
-        request,
-        0,
-        &[
-            RegionId::new(logical_table1_id, 0),
-            RegionId::new(logical_table2_id, 0),
-        ],
-    );
-
-    let table_info = get_raw_table_info(&ddl_context, phy_id).await;
-    assert_column_name(
-        &table_info,
-        &["ts", "value", "__table_id", "__tsid", "col_0"],
-    );
-    assert_eq!(
-        table_info.meta.column_ids,
-        vec![
-            0,
-            1,
-            ReservedColumnId::table_id(),
-            ReservedColumnId::tsid(),
-            2
-        ]
-    );
-
-    let (tx, mut rx) = mpsc::channel(8);
-    let column_metadatas = test_column_metadatas(&["col_0", "new_col_1", "new_col_2"]);
-    let handler =
-        DatanodeWatcher::new(tx).with_handler(make_alters_request_handler(column_metadatas));
-    let node_manager = Arc::new(MockDatanodeManager::new(handler));
-    ddl_context.node_manager = node_manager;

    // re-alter
    let tasks = vec![
@@ -479,44 +357,6 @@ async fn test_on_part_duplicate_alter_request() {
        }
    );

-    let (peer, request) = rx.try_recv().unwrap();
-    rx.try_recv().unwrap_err();
-    assert_alters_request(
-        peer,
-        request,
-        0,
-        &[
-            RegionId::new(logical_table1_id, 0),
-            RegionId::new(logical_table2_id, 0),
-        ],
-    );
-
-    let table_info = get_raw_table_info(&ddl_context, phy_id).await;
-    assert_column_name(
-        &table_info,
-        &[
-            "ts",
-            "value",
-            "__table_id",
-            "__tsid",
-            "col_0",
-            "new_col_1",
-            "new_col_2",
-        ],
-    );
-    assert_eq!(
-        table_info.meta.column_ids,
-        vec![
-            0,
-            1,
-            ReservedColumnId::table_id(),
-            ReservedColumnId::tsid(),
-            2,
-            3,
-            4,
-        ]
-    );
-
    let table_name_keys = vec![
        TableNameKey::new(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, "table1"),
        TableNameKey::new(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, "table2"),
@@ -582,13 +422,27 @@ async fn test_on_part_duplicate_alter_request() {
    );
 }

+fn alters_request_handler(_peer: Peer, request: RegionRequest) -> Result<RegionResponse> {
+    if let region_request::Body::Alters(_) = request.body.unwrap() {
+        let mut response = RegionResponse::new(0);
+        // Default region id for physical table.
+        let region_id = RegionId::new(1000, 1);
+        response.extensions.insert(
+            MANIFEST_INFO_EXTENSION_KEY.to_string(),
+            RegionManifestInfo::encode_list(&[(region_id, RegionManifestInfo::metric(1, 0, 2, 0))])
+                .unwrap(),
+        );
+        return Ok(response);
+    }
+
+    Ok(RegionResponse::new(0))
+}
+
 #[tokio::test]
 async fn test_on_submit_alter_region_request() {
    common_telemetry::init_default_ut_logging();
    let (tx, mut rx) = mpsc::channel(8);
-    let column_metadatas = test_column_metadatas(&["new_col", "mew_col"]);
-    let handler =
-        DatanodeWatcher::new(tx).with_handler(make_alters_request_handler(column_metadatas));
+    let handler = DatanodeWatcher::new(tx).with_handler(alters_request_handler);
    let node_manager = Arc::new(MockDatanodeManager::new(handler));
    let ddl_context = new_ddl_context(node_manager);

--- a/src/common/meta/src/ddl/tests/alter_table.rs
+++ b/src/common/meta/src/ddl/tests/alter_table.rs
@@ -30,12 +30,7 @@ use common_error::status_code::StatusCode;
 use common_procedure::store::poison_store::PoisonStore;
 use common_procedure::{ProcedureId, Status};
 use common_procedure_test::MockContextProvider;
-use datatypes::prelude::ConcreteDataType;
-use datatypes::schema::ColumnSchema;
-use store_api::metadata::ColumnMetadata;
-use store_api::metric_engine_consts::{
-    MANIFEST_INFO_EXTENSION_KEY, TABLE_COLUMN_METADATA_EXTENSION_KEY,
-};
+use store_api::metric_engine_consts::MANIFEST_INFO_EXTENSION_KEY;
 use store_api::region_engine::RegionManifestInfo;
 use store_api::storage::RegionId;
 use table::requests::TTL_KEY;
@@ -48,7 +43,6 @@ use crate::ddl::test_util::datanode_handler::{
    AllFailureDatanodeHandler, DatanodeWatcher, PartialSuccessDatanodeHandler,
    RequestOutdatedErrorDatanodeHandler,
 };
-use crate::ddl::test_util::{assert_column_name, assert_column_name_and_id};
 use crate::error::{Error, Result};
 use crate::key::datanode_table::DatanodeTableKey;
 use crate::key::table_name::TableNameKey;
@@ -185,30 +179,6 @@ fn alter_request_handler(_peer: Peer, request: RegionRequest) -> Result<RegionRe
            RegionManifestInfo::encode_list(&[(region_id, RegionManifestInfo::mito(1, 1))])
                .unwrap(),
        );
-        response.extensions.insert(
-            TABLE_COLUMN_METADATA_EXTENSION_KEY.to_string(),
-            ColumnMetadata::encode_list(&[
-                ColumnMetadata {
-                    column_schema: ColumnSchema::new(
-                        "ts",
-                        ConcreteDataType::timestamp_millisecond_datatype(),
-                        false,
-                    ),
-                    semantic_type: SemanticType::Timestamp,
-                    column_id: 0,
-                },
-                ColumnMetadata {
-                    column_schema: ColumnSchema::new(
-                        "host",
-                        ConcreteDataType::float64_datatype(),
-                        false,
-                    ),
-                    semantic_type: SemanticType::Tag,
-                    column_id: 1,
-                },
-            ])
-            .unwrap(),
-        );
        return Ok(response);
    }

@@ -217,7 +187,6 @@ fn alter_request_handler(_peer: Peer, request: RegionRequest) -> Result<RegionRe

 #[tokio::test]
 async fn test_on_submit_alter_request() {
-    common_telemetry::init_default_ut_logging();
    let (tx, mut rx) = mpsc::channel(8);
    let datanode_handler = DatanodeWatcher::new(tx).with_handler(alter_request_handler);
    let node_manager = Arc::new(MockDatanodeManager::new(datanode_handler));
@@ -265,8 +234,6 @@ async fn test_on_submit_alter_request() {
    assert_sync_request(peer, request, 4, RegionId::new(table_id, 2), 1);
    let (peer, request) = results.remove(0);
    assert_sync_request(peer, request, 5, RegionId::new(table_id, 1), 1);
-    let column_metadatas = procedure.data().column_metadatas();
-    assert_column_name_and_id(column_metadatas, &[("ts", 0), ("host", 1)]);
 }

 #[tokio::test]
@@ -411,7 +378,6 @@ async fn test_on_update_metadata_rename() {

 #[tokio::test]
 async fn test_on_update_metadata_add_columns() {
-    common_telemetry::init_default_ut_logging();
    let node_manager = Arc::new(MockDatanodeManager::new(()));
    let ddl_context = new_ddl_context(node_manager);
    let table_name = "foo";
@@ -465,34 +431,6 @@ async fn test_on_update_metadata_add_columns() {
        .submit_alter_region_requests(procedure_id, provider.as_ref())
        .await
        .unwrap();
-    // Returned column metadatas is empty.
-    assert!(procedure.data().column_metadatas().is_empty());
-    procedure.mut_data().set_column_metadatas(vec![
-        ColumnMetadata {
-            column_schema: ColumnSchema::new(
-                "ts",
-                ConcreteDataType::timestamp_millisecond_datatype(),
-                false,
-            ),
-            semantic_type: SemanticType::Timestamp,
-            column_id: 0,
-        },
-        ColumnMetadata {
-            column_schema: ColumnSchema::new("host", ConcreteDataType::float64_datatype(), false),
-            semantic_type: SemanticType::Tag,
-            column_id: 1,
-        },
-        ColumnMetadata {
-            column_schema: ColumnSchema::new("cpu", ConcreteDataType::float64_datatype(), false),
-            semantic_type: SemanticType::Tag,
-            column_id: 2,
-        },
-        ColumnMetadata {
-            column_schema: ColumnSchema::new("my_tag3", ConcreteDataType::string_datatype(), true),
-            semantic_type: SemanticType::Tag,
-            column_id: 3,
-        },
-    ]);
    procedure.on_update_metadata().await.unwrap();

    let table_info = ddl_context
@@ -509,8 +447,6 @@ async fn test_on_update_metadata_add_columns() {
        table_info.meta.schema.column_schemas.len() as u32,
        table_info.meta.next_column_id
    );
-    assert_column_name(&table_info, &["ts", "host", "cpu", "my_tag3"]);
-    assert_eq!(table_info.meta.column_ids, vec![0, 1, 2, 3]);
 }

 #[tokio::test]
--- a/src/common/meta/src/ddl/tests/create_flow.rs
+++ b/src/common/meta/src/ddl/tests/create_flow.rs
@@ -141,41 +141,3 @@ async fn test_create_flow() {
    let err = procedure.on_prepare().await.unwrap_err();
    assert_matches!(err, error::Error::FlowAlreadyExists { .. });
 }
-
-#[tokio::test]
-async fn test_create_flow_same_source_and_sink_table() {
-    let table_id = 1024;
-    let table_name = TableName::new(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, "same_table");
-
-    // Use the same table for both source and sink
-    let source_table_names = vec![table_name.clone()];
-    let sink_table_name = table_name.clone();
-
-    let node_manager = Arc::new(MockFlownodeManager::new(NaiveFlownodeHandler));
-    let ddl_context = new_ddl_context(node_manager);
-
-    // Create the table first so it exists
-    let task = test_create_table_task("same_table", table_id);
-    ddl_context
-        .table_metadata_manager
-        .create_table_metadata(
-            task.table_info.clone(),
-            TableRouteValue::physical(vec![]),
-            HashMap::new(),
-        )
-        .await
-        .unwrap();
-
-    // Try to create a flow with same source and sink table - should fail
-    let task = test_create_flow_task("my_flow", source_table_names, sink_table_name, false);
-    let query_ctx = QueryContext::arc().into();
-    let mut procedure = CreateFlowProcedure::new(task, query_ctx, ddl_context);
-    let err = procedure.on_prepare().await.unwrap_err();
-    assert_matches!(err, error::Error::Unsupported { .. });
-
-    // Verify the error message contains information about the same table
-    if let error::Error::Unsupported { operation, .. } = &err {
-        assert!(operation.contains("source and sink table being the same"));
-        assert!(operation.contains("same_table"));
-    }
-}
--- a/src/common/meta/src/ddl/tests/create_logical_tables.rs
+++ b/src/common/meta/src/ddl/tests/create_logical_tables.rs
@@ -23,18 +23,15 @@ use common_error::ext::ErrorExt;
 use common_error::status_code::StatusCode;
 use common_procedure::{Context as ProcedureContext, Procedure, ProcedureId, Status};
 use common_procedure_test::MockContextProvider;
-use store_api::metadata::ColumnMetadata;
-use store_api::metric_engine_consts::{ALTER_PHYSICAL_EXTENSION_KEY, MANIFEST_INFO_EXTENSION_KEY};
+use store_api::metric_engine_consts::MANIFEST_INFO_EXTENSION_KEY;
 use store_api::region_engine::RegionManifestInfo;
-use store_api::storage::consts::ReservedColumnId;
 use store_api::storage::RegionId;
 use tokio::sync::mpsc;

 use crate::ddl::create_logical_tables::CreateLogicalTablesProcedure;
 use crate::ddl::test_util::datanode_handler::{DatanodeWatcher, NaiveDatanodeHandler};
 use crate::ddl::test_util::{
-    assert_column_name, create_physical_table_metadata, get_raw_table_info, test_column_metadatas,
-    test_create_logical_table_task, test_create_physical_table_task,
+    create_physical_table_metadata, test_create_logical_table_task, test_create_physical_table_task,
 };
 use crate::ddl::TableMetadata;
 use crate::error::{Error, Result};
@@ -42,54 +39,6 @@ use crate::key::table_route::{PhysicalTableRouteValue, TableRouteValue};
 use crate::rpc::router::{Region, RegionRoute};
 use crate::test_util::{new_ddl_context, MockDatanodeManager};

-fn make_creates_request_handler(
-    column_metadatas: Vec<ColumnMetadata>,
-) -> impl Fn(Peer, RegionRequest) -> Result<RegionResponse> {
-    move |_peer, request| {
-        let _ = _peer;
-        if let region_request::Body::Creates(_) = request.body.unwrap() {
-            let mut response = RegionResponse::new(0);
-            // Default region id for physical table.
-            let region_id = RegionId::new(1024, 1);
-            response.extensions.insert(
-                MANIFEST_INFO_EXTENSION_KEY.to_string(),
-                RegionManifestInfo::encode_list(&[(
-                    region_id,
-                    RegionManifestInfo::metric(1, 0, 2, 0),
-                )])
-                .unwrap(),
-            );
-            response.extensions.insert(
-                ALTER_PHYSICAL_EXTENSION_KEY.to_string(),
-                ColumnMetadata::encode_list(&column_metadatas).unwrap(),
-            );
-            return Ok(response);
-        }
-
-        Ok(RegionResponse::new(0))
-    }
-}
-
-fn assert_creates_request(
-    peer: Peer,
-    request: RegionRequest,
-    expected_peer_id: u64,
-    expected_region_ids: &[RegionId],
-) {
-    assert_eq!(peer.id, expected_peer_id,);
-    let Some(region_request::Body::Creates(req)) = request.body else {
-        unreachable!();
-    };
-    for (i, region_id) in expected_region_ids.iter().enumerate() {
-        assert_eq!(
-            req.requests[i].region_id,
-            *region_id,
-            "actual region id: {}",
-            RegionId::from_u64(req.requests[i].region_id)
-        );
-    }
-}
-
 #[tokio::test]
 async fn test_on_prepare_physical_table_not_found() {
    let node_manager = Arc::new(MockDatanodeManager::new(()));
@@ -278,12 +227,7 @@ async fn test_on_prepare_part_logical_tables_exist() {

 #[tokio::test]
 async fn test_on_create_metadata() {
-    common_telemetry::init_default_ut_logging();
-    let (tx, mut rx) = mpsc::channel(8);
-    let column_metadatas = test_column_metadatas(&["host", "cpu"]);
-    let datanode_handler =
-        DatanodeWatcher::new(tx).with_handler(make_creates_request_handler(column_metadatas));
-    let node_manager = Arc::new(MockDatanodeManager::new(datanode_handler));
+    let node_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
    let ddl_context = new_ddl_context(node_manager);
    // Prepares physical table metadata.
    let mut create_physical_table_task = test_create_physical_table_task("phy_table");
@@ -311,7 +255,7 @@ async fn test_on_create_metadata() {
    let mut procedure = CreateLogicalTablesProcedure::new(
        vec![task, yet_another_task],
        physical_table_id,
-        ddl_context.clone(),
+        ddl_context,
    );
    let status = procedure.on_prepare().await.unwrap();
    assert_matches!(
@@ -330,42 +274,11 @@ async fn test_on_create_metadata() {
    let status = procedure.execute(&ctx).await.unwrap();
    let table_ids = status.downcast_output_ref::<Vec<u32>>().unwrap();
    assert_eq!(*table_ids, vec![1025, 1026]);
-
-    let (peer, request) = rx.try_recv().unwrap();
-    rx.try_recv().unwrap_err();
-    assert_creates_request(
-        peer,
-        request,
-        0,
-        &[RegionId::new(1025, 0), RegionId::new(1026, 0)],
-    );
-
-    let table_info = get_raw_table_info(&ddl_context, table_id).await;
-    assert_column_name(
-        &table_info,
-        &["ts", "value", "__table_id", "__tsid", "host", "cpu"],
-    );
-    assert_eq!(
-        table_info.meta.column_ids,
-        vec![
-            0,
-            1,
-            ReservedColumnId::table_id(),
-            ReservedColumnId::tsid(),
-            2,
-            3
-        ]
-    );
 }

 #[tokio::test]
 async fn test_on_create_metadata_part_logical_tables_exist() {
-    common_telemetry::init_default_ut_logging();
-    let (tx, mut rx) = mpsc::channel(8);
-    let column_metadatas = test_column_metadatas(&["host", "cpu"]);
-    let datanode_handler =
-        DatanodeWatcher::new(tx).with_handler(make_creates_request_handler(column_metadatas));
-    let node_manager = Arc::new(MockDatanodeManager::new(datanode_handler));
+    let node_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
    let ddl_context = new_ddl_context(node_manager);
    // Prepares physical table metadata.
    let mut create_physical_table_task = test_create_physical_table_task("phy_table");
@@ -404,7 +317,7 @@ async fn test_on_create_metadata_part_logical_tables_exist() {
    let mut procedure = CreateLogicalTablesProcedure::new(
        vec![task, non_exist_task],
        physical_table_id,
-        ddl_context.clone(),
+        ddl_context,
    );
    let status = procedure.on_prepare().await.unwrap();
    assert_matches!(
@@ -423,27 +336,6 @@ async fn test_on_create_metadata_part_logical_tables_exist() {
    let status = procedure.execute(&ctx).await.unwrap();
    let table_ids = status.downcast_output_ref::<Vec<u32>>().unwrap();
    assert_eq!(*table_ids, vec![8192, 1025]);
-
-    let (peer, request) = rx.try_recv().unwrap();
-    rx.try_recv().unwrap_err();
-    assert_creates_request(peer, request, 0, &[RegionId::new(1025, 0)]);
-
-    let table_info = get_raw_table_info(&ddl_context, table_id).await;
-    assert_column_name(
-        &table_info,
-        &["ts", "value", "__table_id", "__tsid", "host", "cpu"],
-    );
-    assert_eq!(
-        table_info.meta.column_ids,
-        vec![
-            0,
-            1,
-            ReservedColumnId::table_id(),
-            ReservedColumnId::tsid(),
-            2,
-            3
-        ]
-    );
 }

 #[tokio::test]
@@ -507,13 +399,27 @@ async fn test_on_create_metadata_err() {
    assert!(!error.is_retry_later());
 }

+fn creates_request_handler(_peer: Peer, request: RegionRequest) -> Result<RegionResponse> {
+    if let region_request::Body::Creates(_) = request.body.unwrap() {
+        let mut response = RegionResponse::new(0);
+        // Default region id for physical table.
+        let region_id = RegionId::new(1024, 1);
+        response.extensions.insert(
+            MANIFEST_INFO_EXTENSION_KEY.to_string(),
+            RegionManifestInfo::encode_list(&[(region_id, RegionManifestInfo::metric(1, 0, 2, 0))])
+                .unwrap(),
+        );
+        return Ok(response);
+    }
+
+    Ok(RegionResponse::new(0))
+}
+
 #[tokio::test]
 async fn test_on_submit_create_request() {
    common_telemetry::init_default_ut_logging();
    let (tx, mut rx) = mpsc::channel(8);
-    let column_metadatas = test_column_metadatas(&["host", "cpu"]);
-    let handler =
-        DatanodeWatcher::new(tx).with_handler(make_creates_request_handler(column_metadatas));
+    let handler = DatanodeWatcher::new(tx).with_handler(creates_request_handler);
    let node_manager = Arc::new(MockDatanodeManager::new(handler));
    let ddl_context = new_ddl_context(node_manager);
    let mut create_physical_table_task = test_create_physical_table_task("phy_table");
--- a/src/common/meta/src/ddl/tests/create_table.rs
+++ b/src/common/meta/src/ddl/tests/create_table.rs
@@ -16,9 +16,7 @@ use std::assert_matches::assert_matches;
 use std::collections::HashMap;
 use std::sync::Arc;

-use api::region::RegionResponse;
-use api::v1::meta::Peer;
-use api::v1::region::{region_request, RegionRequest};
+use api::v1::meta::Partition;
 use api::v1::{ColumnDataType, SemanticType};
 use common_error::ext::ErrorExt;
 use common_error::status_code::StatusCode;
@@ -26,12 +24,7 @@ use common_procedure::{Context as ProcedureContext, Procedure, ProcedureId, Stat
 use common_procedure_test::{
    execute_procedure_until, execute_procedure_until_done, MockContextProvider,
 };
-use datatypes::prelude::ConcreteDataType;
-use datatypes::schema::ColumnSchema;
-use store_api::metadata::ColumnMetadata;
-use store_api::metric_engine_consts::TABLE_COLUMN_METADATA_EXTENSION_KEY;
 use store_api::storage::RegionId;
-use tokio::sync::mpsc;

 use crate::ddl::create_table::{CreateTableProcedure, CreateTableState};
 use crate::ddl::test_util::columns::TestColumnDefBuilder;
@@ -39,73 +32,14 @@ use crate::ddl::test_util::create_table::{
    build_raw_table_info_from_expr, TestCreateTableExprBuilder,
 };
 use crate::ddl::test_util::datanode_handler::{
-    DatanodeWatcher, NaiveDatanodeHandler, RetryErrorDatanodeHandler,
-    UnexpectedErrorDatanodeHandler,
+    NaiveDatanodeHandler, RetryErrorDatanodeHandler, UnexpectedErrorDatanodeHandler,
 };
-use crate::ddl::test_util::{assert_column_name, get_raw_table_info};
-use crate::error::{Error, Result};
+use crate::error::Error;
 use crate::key::table_route::TableRouteValue;
 use crate::kv_backend::memory::MemoryKvBackend;
 use crate::rpc::ddl::CreateTableTask;
 use crate::test_util::{new_ddl_context, new_ddl_context_with_kv_backend, MockDatanodeManager};

-fn create_request_handler(_peer: Peer, request: RegionRequest) -> Result<RegionResponse> {
-    let _ = _peer;
-    if let region_request::Body::Create(_) = request.body.unwrap() {
-        let mut response = RegionResponse::new(0);
-
-        response.extensions.insert(
-            TABLE_COLUMN_METADATA_EXTENSION_KEY.to_string(),
-            ColumnMetadata::encode_list(&[
-                ColumnMetadata {
-                    column_schema: ColumnSchema::new(
-                        "ts",
-                        ConcreteDataType::timestamp_millisecond_datatype(),
-                        false,
-                    ),
-                    semantic_type: SemanticType::Timestamp,
-                    column_id: 0,
-                },
-                ColumnMetadata {
-                    column_schema: ColumnSchema::new(
-                        "host",
-                        ConcreteDataType::float64_datatype(),
-                        false,
-                    ),
-                    semantic_type: SemanticType::Tag,
-                    column_id: 1,
-                },
-                ColumnMetadata {
-                    column_schema: ColumnSchema::new(
-                        "cpu",
-                        ConcreteDataType::float64_datatype(),
-                        false,
-                    ),
-                    semantic_type: SemanticType::Tag,
-                    column_id: 2,
-                },
-            ])
-            .unwrap(),
-        );
-        return Ok(response);
-    }
-
-    Ok(RegionResponse::new(0))
-}
-
-fn assert_create_request(
-    peer: Peer,
-    request: RegionRequest,
-    expected_peer_id: u64,
-    expected_region_id: RegionId,
-) {
-    assert_eq!(peer.id, expected_peer_id);
-    let Some(region_request::Body::Create(req)) = request.body else {
-        unreachable!();
-    };
-    assert_eq!(req.region_id, expected_region_id);
-}
-
 pub(crate) fn test_create_table_task(name: &str) -> CreateTableTask {
    let create_table = TestCreateTableExprBuilder::default()
        .column_defs([
@@ -141,7 +75,10 @@ pub(crate) fn test_create_table_task(name: &str) -> CreateTableTask {
    CreateTableTask {
        create_table,
        // Single region
-        partitions: None,
+        partitions: vec![Partition {
+            column_list: vec![],
+            value_list: vec![],
+        }],
        table_info,
    }
 }
@@ -215,7 +152,7 @@ async fn test_on_prepare_with_no_partition_err() {
    let node_manager = Arc::new(MockDatanodeManager::new(()));
    let ddl_context = new_ddl_context(node_manager);
    let mut task = test_create_table_task("foo");
-    task.partitions = None;
+    task.partitions = vec![];
    task.create_table.create_if_not_exists = true;
    let mut procedure = CreateTableProcedure::new(task, ddl_context);
    let err = procedure.on_prepare().await.unwrap_err();
@@ -293,13 +230,11 @@ async fn test_on_create_metadata_error() {
 #[tokio::test]
 async fn test_on_create_metadata() {
    common_telemetry::init_default_ut_logging();
-    let (tx, mut rx) = mpsc::channel(8);
-    let datanode_handler = DatanodeWatcher::new(tx).with_handler(create_request_handler);
-    let node_manager = Arc::new(MockDatanodeManager::new(datanode_handler));
+    let node_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
    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());
+    let mut procedure = CreateTableProcedure::new(task, ddl_context);
    procedure.on_prepare().await.unwrap();
    let ctx = ProcedureContext {
        procedure_id: ProcedureId::random(),
@@ -308,16 +243,8 @@ async fn test_on_create_metadata() {
    procedure.execute(&ctx).await.unwrap();
    // Triggers procedure to create table metadata
    let status = procedure.execute(&ctx).await.unwrap();
-    let table_id = *status.downcast_output_ref::<u32>().unwrap();
-    assert_eq!(table_id, 1024);
-
-    let (peer, request) = rx.try_recv().unwrap();
-    rx.try_recv().unwrap_err();
-    assert_create_request(peer, request, 0, RegionId::new(table_id, 0));
-
-    let table_info = get_raw_table_info(&ddl_context, table_id).await;
-    assert_column_name(&table_info, &["ts", "host", "cpu"]);
-    assert_eq!(table_info.meta.column_ids, vec![0, 1, 2]);
+    let table_id = status.downcast_output_ref::<u32>().unwrap();
+    assert_eq!(*table_id, 1024);
 }

 #[tokio::test]
--- a/src/common/meta/src/ddl/utils.rs
+++ b/src/common/meta/src/ddl/utils.rs
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-pub(crate) mod raw_table_info;
-pub(crate) mod table_id;
-pub(crate) mod table_info;
-
 use std::collections::HashMap;
 use std::fmt::Debug;

@@ -33,7 +29,6 @@ use common_telemetry::{error, info, warn};
 use common_wal::options::WalOptions;
 use futures::future::join_all;
 use snafu::{ensure, OptionExt, ResultExt};
-use store_api::metadata::ColumnMetadata;
 use store_api::metric_engine_consts::{LOGICAL_TABLE_METADATA_KEY, MANIFEST_INFO_EXTENSION_KEY};
 use store_api::region_engine::RegionManifestInfo;
 use store_api::storage::{RegionId, RegionNumber};
@@ -42,8 +37,8 @@ use table::table_reference::TableReference;

 use crate::ddl::{DdlContext, DetectingRegion};
 use crate::error::{
-    self, DecodeJsonSnafu, Error, MetadataCorruptionSnafu, OperateDatanodeSnafu,
-    ParseWalOptionsSnafu, Result, TableNotFoundSnafu, UnsupportedSnafu,
+    self, Error, OperateDatanodeSnafu, ParseWalOptionsSnafu, Result, TableNotFoundSnafu,
+    UnsupportedSnafu,
 };
 use crate::key::datanode_table::DatanodeTableValue;
 use crate::key::table_name::TableNameKey;
@@ -319,23 +314,11 @@ pub fn parse_manifest_infos_from_extensions(
    Ok(data_manifest_version)
 }

-/// Parses column metadatas from extensions.
-pub fn parse_column_metadatas(
-    extensions: &HashMap<String, Vec<u8>>,
-    key: &str,
-) -> Result<Vec<ColumnMetadata>> {
-    let value = extensions.get(key).context(error::UnexpectedSnafu {
-        err_msg: format!("column metadata extension not found: {}", key),
-    })?;
-    let column_metadatas = ColumnMetadata::decode_list(value).context(error::SerdeJsonSnafu {})?;
-    Ok(column_metadatas)
-}
-
 /// Sync follower regions on datanodes.
 pub async fn sync_follower_regions(
    context: &DdlContext,
    table_id: TableId,
-    results: &[RegionResponse],
+    results: Vec<RegionResponse>,
    region_routes: &[RegionRoute],
    engine: &str,
 ) -> Result<()> {
@@ -348,7 +331,7 @@ pub async fn sync_follower_regions(
    }

    let results = results
-        .iter()
+        .into_iter()
        .map(|response| parse_manifest_infos_from_extensions(&response.extensions))
        .collect::<Result<Vec<_>>>()?
        .into_iter()
@@ -435,38 +418,6 @@ pub async fn sync_follower_regions(
    Ok(())
 }

-/// Extracts column metadatas from extensions.
-pub fn extract_column_metadatas(
-    results: &mut [RegionResponse],
-    key: &str,
-) -> Result<Option<Vec<ColumnMetadata>>> {
-    let schemas = results
-        .iter_mut()
-        .map(|r| r.extensions.remove(key))
-        .collect::<Vec<_>>();
-
-    if schemas.is_empty() {
-        return Ok(None);
-    }
-
-    // Verify all the physical schemas are the same
-    // Safety: previous check ensures this vec is not empty
-    let first = schemas.first().unwrap();
-    ensure!(
-        schemas.iter().all(|x| x == first),
-        MetadataCorruptionSnafu {
-            err_msg: "The table column metadata schemas from datanodes are not the same."
-        }
-    );
-
-    if let Some(first) = first {
-        let column_metadatas = ColumnMetadata::decode_list(first).context(DecodeJsonSnafu)?;
-        Ok(Some(column_metadatas))
-    } else {
-        Ok(None)
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
--- a/src/common/meta/src/ddl/utils/table_id.rs
+++ b/src/common/meta/src/ddl/utils/table_id.rs
@@ -1,46 +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 snafu::OptionExt;
-use store_api::storage::TableId;
-use table::table_reference::TableReference;
-
-use crate::error::{Result, TableNotFoundSnafu};
-use crate::key::table_name::{TableNameKey, TableNameManager};
-
-/// Get all the table ids from the table names.
-///
-/// Returns an error if any table does not exist.
-pub(crate) async fn get_all_table_ids_by_names<'a>(
-    table_name_manager: &TableNameManager,
-    table_names: &[TableReference<'a>],
-) -> Result<Vec<TableId>> {
-    let table_name_keys = table_names
-        .iter()
-        .map(TableNameKey::from)
-        .collect::<Vec<_>>();
-    let table_name_values = table_name_manager.batch_get(table_name_keys).await?;
-    let mut table_ids = Vec::with_capacity(table_name_values.len());
-    for (value, table_name) in table_name_values.into_iter().zip(table_names) {
-        let value = value
-            .with_context(|| TableNotFoundSnafu {
-                table_name: table_name.to_string(),
-            })?
-            .table_id();
-
-        table_ids.push(value);
-    }
-
-    Ok(table_ids)
-}
--- a/src/common/meta/src/ddl/utils/table_info.rs
+++ b/src/common/meta/src/ddl/utils/table_info.rs
@@ -1,44 +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 snafu::OptionExt;
-use store_api::storage::TableId;
-use table::table_reference::TableReference;
-
-use crate::error::{Result, TableInfoNotFoundSnafu};
-use crate::key::table_info::{TableInfoManager, TableInfoValue};
-use crate::key::DeserializedValueWithBytes;
-
-/// Get all table info values by table ids.
-///
-/// Returns an error if any table does not exist.
-pub(crate) async fn get_all_table_info_values_by_table_ids<'a>(
-    table_info_manager: &TableInfoManager,
-    table_ids: &[TableId],
-    table_names: &[TableReference<'a>],
-) -> Result<Vec<DeserializedValueWithBytes<TableInfoValue>>> {
-    let mut table_info_map = table_info_manager.batch_get_raw(table_ids).await?;
-    let mut table_info_values = Vec::with_capacity(table_ids.len());
-    for (table_id, table_name) in table_ids.iter().zip(table_names) {
-        let table_info_value =
-            table_info_map
-                .remove(table_id)
-                .with_context(|| TableInfoNotFoundSnafu {
-                    table: table_name.to_string(),
-                })?;
-        table_info_values.push(table_info_value);
-    }
-
-    Ok(table_info_values)
-}
--- a/src/common/meta/src/ddl_manager.rs
+++ b/src/common/meta/src/ddl_manager.rs
@@ -995,7 +995,6 @@ mod tests {
            Default::default(),
            state_store,
            poison_manager,
-            None,
        ));

        let _ = DdlManager::try_new(
--- a/src/common/meta/src/key.rs
+++ b/src/common/meta/src/key.rs
@@ -100,8 +100,8 @@
 pub mod catalog_name;
 pub mod datanode_table;
 pub mod flow;
+pub mod maintenance;
 pub mod node_address;
-pub mod runtime_switch;
 mod schema_metadata_manager;
 pub mod schema_name;
 pub mod table_info;
@@ -164,9 +164,7 @@ use crate::state_store::PoisonValue;
 use crate::DatanodeId;

 pub const NAME_PATTERN: &str = r"[a-zA-Z_:-][a-zA-Z0-9_:\-\.@#]*";
-pub const LEGACY_MAINTENANCE_KEY: &str = "__maintenance";
-pub const MAINTENANCE_KEY: &str = "__switches/maintenance";
-pub const PAUSE_PROCEDURE_KEY: &str = "__switches/pause_procedure";
+pub const MAINTENANCE_KEY: &str = "__maintenance";

 pub const DATANODE_TABLE_KEY_PREFIX: &str = "__dn_table";
 pub const TABLE_INFO_KEY_PREFIX: &str = "__table_info";
--- a/src/common/meta/src/key/maintenance.rs
+++ b/src/common/meta/src/key/maintenance.rs
@@ -0,0 +1,86 @@
+// 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 crate::error::Result;
+use crate::key::MAINTENANCE_KEY;
+use crate::kv_backend::KvBackendRef;
+use crate::rpc::store::PutRequest;
+
+pub type MaintenanceModeManagerRef = Arc<MaintenanceModeManager>;
+
+/// The maintenance mode manager.
+///
+/// Used to enable or disable maintenance mode.
+#[derive(Clone)]
+pub struct MaintenanceModeManager {
+    kv_backend: KvBackendRef,
+}
+
+impl MaintenanceModeManager {
+    pub fn new(kv_backend: KvBackendRef) -> Self {
+        Self { kv_backend }
+    }
+
+    /// Enables maintenance mode.
+    pub async fn set_maintenance_mode(&self) -> Result<()> {
+        let req = PutRequest {
+            key: Vec::from(MAINTENANCE_KEY),
+            value: vec![],
+            prev_kv: false,
+        };
+        self.kv_backend.put(req).await?;
+        Ok(())
+    }
+
+    /// Unsets maintenance mode.
+    pub async fn unset_maintenance_mode(&self) -> Result<()> {
+        self.kv_backend
+            .delete(MAINTENANCE_KEY.as_bytes(), false)
+            .await?;
+        Ok(())
+    }
+
+    /// Returns true if maintenance mode is enabled.
+    pub async fn maintenance_mode(&self) -> Result<bool> {
+        self.kv_backend.exists(MAINTENANCE_KEY.as_bytes()).await
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+
+    use crate::key::maintenance::MaintenanceModeManager;
+    use crate::kv_backend::memory::MemoryKvBackend;
+
+    #[tokio::test]
+    async fn test_maintenance_mode_manager() {
+        let maintenance_mode_manager = Arc::new(MaintenanceModeManager::new(Arc::new(
+            MemoryKvBackend::new(),
+        )));
+        assert!(!maintenance_mode_manager.maintenance_mode().await.unwrap());
+        maintenance_mode_manager
+            .set_maintenance_mode()
+            .await
+            .unwrap();
+        assert!(maintenance_mode_manager.maintenance_mode().await.unwrap());
+        maintenance_mode_manager
+            .unset_maintenance_mode()
+            .await
+            .unwrap();
+        assert!(!maintenance_mode_manager.maintenance_mode().await.unwrap());
+    }
+}
--- a/src/common/meta/src/key/runtime_switch.rs
+++ b/src/common/meta/src/key/runtime_switch.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.
-
-use std::sync::Arc;
-use std::time::Duration;
-
-use common_error::ext::BoxedError;
-use common_procedure::local::PauseAware;
-use moka::future::Cache;
-use snafu::ResultExt;
-
-use crate::error::{GetCacheSnafu, Result};
-use crate::key::{LEGACY_MAINTENANCE_KEY, MAINTENANCE_KEY, PAUSE_PROCEDURE_KEY};
-use crate::kv_backend::KvBackendRef;
-use crate::rpc::store::{BatchDeleteRequest, PutRequest};
-
-pub type RuntimeSwitchManagerRef = Arc<RuntimeSwitchManager>;
-
-/// The runtime switch manager.
-///
-/// Used to enable or disable runtime switches.
-#[derive(Clone)]
-pub struct RuntimeSwitchManager {
-    kv_backend: KvBackendRef,
-    cache: Cache<Vec<u8>, Option<Vec<u8>>>,
-}
-
-#[async_trait::async_trait]
-impl PauseAware for RuntimeSwitchManager {
-    async fn is_paused(&self) -> std::result::Result<bool, BoxedError> {
-        self.is_procedure_paused().await.map_err(BoxedError::new)
-    }
-}
-
-const CACHE_TTL: Duration = Duration::from_secs(10);
-const MAX_CAPACITY: u64 = 32;
-
-impl RuntimeSwitchManager {
-    pub fn new(kv_backend: KvBackendRef) -> Self {
-        let cache = Cache::builder()
-            .time_to_live(CACHE_TTL)
-            .max_capacity(MAX_CAPACITY)
-            .build();
-        Self { kv_backend, cache }
-    }
-
-    async fn put_key(&self, key: &str) -> Result<()> {
-        let req = PutRequest {
-            key: Vec::from(key),
-            value: vec![],
-            prev_kv: false,
-        };
-        self.kv_backend.put(req).await?;
-        self.cache.invalidate(key.as_bytes()).await;
-        Ok(())
-    }
-
-    async fn delete_keys(&self, keys: &[&str]) -> Result<()> {
-        let req = BatchDeleteRequest::new()
-            .with_keys(keys.iter().map(|x| x.as_bytes().to_vec()).collect());
-        self.kv_backend.batch_delete(req).await?;
-        for key in keys {
-            self.cache.invalidate(key.as_bytes()).await;
-        }
-        Ok(())
-    }
-
-    /// Returns true if the key exists.
-    async fn exists(&self, key: &str) -> Result<bool> {
-        let key = key.as_bytes().to_vec();
-        let kv_backend = self.kv_backend.clone();
-        let value = self
-            .cache
-            .try_get_with(key.clone(), async move {
-                kv_backend.get(&key).await.map(|v| v.map(|v| v.value))
-            })
-            .await
-            .context(GetCacheSnafu)?;
-
-        Ok(value.is_some())
-    }
-
-    /// Enables maintenance mode.
-    pub async fn set_maintenance_mode(&self) -> Result<()> {
-        self.put_key(MAINTENANCE_KEY).await
-    }
-
-    /// Unsets maintenance mode.
-    pub async fn unset_maintenance_mode(&self) -> Result<()> {
-        self.delete_keys(&[MAINTENANCE_KEY, LEGACY_MAINTENANCE_KEY])
-            .await
-    }
-
-    /// Returns true if maintenance mode is enabled.
-    pub async fn maintenance_mode(&self) -> Result<bool> {
-        let exists = self.exists(MAINTENANCE_KEY).await?;
-        if exists {
-            return Ok(true);
-        }
-
-        let exists = self.exists(LEGACY_MAINTENANCE_KEY).await?;
-        if exists {
-            return Ok(true);
-        }
-
-        Ok(false)
-    }
-
-    // Pauses handling of incoming procedure requests.
-    pub async fn pasue_procedure(&self) -> Result<()> {
-        self.put_key(PAUSE_PROCEDURE_KEY).await
-    }
-
-    /// Resumes processing of incoming procedure requests.
-    pub async fn resume_procedure(&self) -> Result<()> {
-        self.delete_keys(&[PAUSE_PROCEDURE_KEY]).await
-    }
-
-    /// Returns true if the system is currently pausing incoming procedure requests.
-    pub async fn is_procedure_paused(&self) -> Result<bool> {
-        self.exists(PAUSE_PROCEDURE_KEY).await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use crate::key::runtime_switch::RuntimeSwitchManager;
-    use crate::key::{LEGACY_MAINTENANCE_KEY, MAINTENANCE_KEY};
-    use crate::kv_backend::memory::MemoryKvBackend;
-    use crate::kv_backend::KvBackend;
-    use crate::rpc::store::PutRequest;
-
-    #[tokio::test]
-    async fn test_runtime_switch_manager_basic() {
-        let runtime_switch_manager =
-            Arc::new(RuntimeSwitchManager::new(Arc::new(MemoryKvBackend::new())));
-        runtime_switch_manager
-            .put_key(MAINTENANCE_KEY)
-            .await
-            .unwrap();
-        let v = runtime_switch_manager
-            .cache
-            .get(MAINTENANCE_KEY.as_bytes())
-            .await;
-        assert!(v.is_none());
-        runtime_switch_manager
-            .exists(MAINTENANCE_KEY)
-            .await
-            .unwrap();
-        let v = runtime_switch_manager
-            .cache
-            .get(MAINTENANCE_KEY.as_bytes())
-            .await;
-        assert!(v.is_some());
-        runtime_switch_manager
-            .delete_keys(&[MAINTENANCE_KEY])
-            .await
-            .unwrap();
-        let v = runtime_switch_manager
-            .cache
-            .get(MAINTENANCE_KEY.as_bytes())
-            .await;
-        assert!(v.is_none());
-    }
-
-    #[tokio::test]
-    async fn test_runtime_switch_manager() {
-        let runtime_switch_manager =
-            Arc::new(RuntimeSwitchManager::new(Arc::new(MemoryKvBackend::new())));
-        assert!(!runtime_switch_manager.maintenance_mode().await.unwrap());
-        runtime_switch_manager.set_maintenance_mode().await.unwrap();
-        assert!(runtime_switch_manager.maintenance_mode().await.unwrap());
-        runtime_switch_manager
-            .unset_maintenance_mode()
-            .await
-            .unwrap();
-        assert!(!runtime_switch_manager.maintenance_mode().await.unwrap());
-    }
-
-    #[tokio::test]
-    async fn test_runtime_switch_manager_with_legacy_key() {
-        let kv_backend = Arc::new(MemoryKvBackend::new());
-        kv_backend
-            .put(PutRequest {
-                key: Vec::from(LEGACY_MAINTENANCE_KEY),
-                value: vec![],
-                prev_kv: false,
-            })
-            .await
-            .unwrap();
-        let runtime_switch_manager = Arc::new(RuntimeSwitchManager::new(kv_backend));
-        assert!(runtime_switch_manager.maintenance_mode().await.unwrap());
-        runtime_switch_manager
-            .unset_maintenance_mode()
-            .await
-            .unwrap();
-        assert!(!runtime_switch_manager.maintenance_mode().await.unwrap());
-        runtime_switch_manager.set_maintenance_mode().await.unwrap();
-        assert!(runtime_switch_manager.maintenance_mode().await.unwrap());
-    }
-
-    #[tokio::test]
-    async fn test_pasue_procedure() {
-        let runtime_switch_manager =
-            Arc::new(RuntimeSwitchManager::new(Arc::new(MemoryKvBackend::new())));
-        runtime_switch_manager.pasue_procedure().await.unwrap();
-        assert!(runtime_switch_manager.is_procedure_paused().await.unwrap());
-        runtime_switch_manager.resume_procedure().await.unwrap();
-        assert!(!runtime_switch_manager.is_procedure_paused().await.unwrap());
-    }
-}
--- a/src/common/meta/src/key/table_info.rs
+++ b/src/common/meta/src/key/table_info.rs
@@ -334,7 +334,6 @@ mod tests {
            options: Default::default(),
            region_numbers: vec![1],
            partition_key_indices: vec![],
-            column_ids: vec![],
        };

        RawTableInfo {
--- a/src/common/meta/src/key/table_name.rs
+++ b/src/common/meta/src/key/table_name.rs
@@ -103,26 +103,6 @@ pub fn table_decoder(kv: KeyValue) -> Result<(String, TableNameValue)> {
    Ok((table_name_key.table.to_string(), table_name_value))
 }

-impl<'a> From<&TableReference<'a>> for TableNameKey<'a> {
-    fn from(value: &TableReference<'a>) -> Self {
-        Self {
-            catalog: value.catalog,
-            schema: value.schema,
-            table: value.table,
-        }
-    }
-}
-
-impl<'a> From<TableReference<'a>> for TableNameKey<'a> {
-    fn from(value: TableReference<'a>) -> Self {
-        Self {
-            catalog: value.catalog,
-            schema: value.schema,
-            table: value.table,
-        }
-    }
-}
-
 impl<'a> From<&'a TableName> for TableNameKey<'a> {
    fn from(value: &'a TableName) -> Self {
        Self {
--- a/src/common/meta/src/key/tombstone.rs
+++ b/src/common/meta/src/key/tombstone.rs
@@ -14,14 +14,13 @@

 use std::collections::HashMap;

-use common_telemetry::debug;
 use snafu::ensure;

 use crate::error::{self, Result};
 use crate::key::txn_helper::TxnOpGetResponseSet;
 use crate::kv_backend::txn::{Compare, CompareOp, Txn, TxnOp};
 use crate::kv_backend::KvBackendRef;
-use crate::rpc::store::{BatchDeleteRequest, BatchGetRequest};
+use crate::rpc::store::BatchGetRequest;

 /// [TombstoneManager] provides the ability to:
 /// - logically delete values
@@ -29,9 +28,6 @@ use crate::rpc::store::{BatchDeleteRequest, BatchGetRequest};
 pub struct TombstoneManager {
    kv_backend: KvBackendRef,
    tombstone_prefix: String,
-    // Only used for testing.
-    #[cfg(test)]
-    max_txn_ops: Option<usize>,
 }

 const TOMBSTONE_PREFIX: &str = "__tombstone/";
@@ -39,7 +35,10 @@ const TOMBSTONE_PREFIX: &str = "__tombstone/";
 impl TombstoneManager {
    /// Returns [TombstoneManager].
    pub fn new(kv_backend: KvBackendRef) -> Self {
-        Self::new_with_prefix(kv_backend, TOMBSTONE_PREFIX)
+        Self {
+            kv_backend,
+            tombstone_prefix: TOMBSTONE_PREFIX.to_string(),
+        }
    }

    /// Returns [TombstoneManager] with a custom tombstone prefix.
@@ -47,8 +46,6 @@ impl TombstoneManager {
        Self {
            kv_backend,
            tombstone_prefix: prefix.to_string(),
-            #[cfg(test)]
-            max_txn_ops: None,
        }
    }

@@ -56,11 +53,6 @@ impl TombstoneManager {
        [self.tombstone_prefix.as_bytes(), key].concat()
    }

-    #[cfg(test)]
-    pub fn set_max_txn_ops(&mut self, max_txn_ops: usize) {
-        self.max_txn_ops = Some(max_txn_ops);
-    }
-
    /// Moves value to `dest_key`.
    ///
    /// Puts `value` to `dest_key` if the value of `src_key` equals `value`.
@@ -91,11 +83,7 @@ impl TombstoneManager {
        ensure!(
            keys.len() == dest_keys.len(),
            error::UnexpectedSnafu {
-                err_msg: format!(
-                    "The length of keys({}) does not match the length of dest_keys({}).",
-                    keys.len(),
-                    dest_keys.len()
-                ),
+                err_msg: "The length of keys does not match the length of dest_keys."
            }
        );
        // The key -> dest key mapping.
@@ -148,45 +136,19 @@ impl TombstoneManager {
        .fail()
    }

-    fn max_txn_ops(&self) -> usize {
-        #[cfg(test)]
-        if let Some(max_txn_ops) = self.max_txn_ops {
-            return max_txn_ops;
-        }
-        self.kv_backend.max_txn_ops()
-    }
-
    /// Moves values to `dest_key`.
    ///
    /// Returns the number of keys that were moved.
    async fn move_values(&self, keys: Vec<Vec<u8>>, dest_keys: Vec<Vec<u8>>) -> Result<usize> {
-        ensure!(
-            keys.len() == dest_keys.len(),
-            error::UnexpectedSnafu {
-                err_msg: format!(
-                    "The length of keys({}) does not match the length of dest_keys({}).",
-                    keys.len(),
-                    dest_keys.len()
-                ),
-            }
-        );
-        if keys.is_empty() {
-            return Ok(0);
-        }
-        let chunk_size = self.max_txn_ops() / 2;
+        let chunk_size = self.kv_backend.max_txn_ops() / 2;
        if keys.len() > chunk_size {
-            debug!(
-                "Moving values with multiple chunks, keys len: {}, chunk_size: {}",
-                keys.len(),
-                chunk_size
-            );
-            let mut moved_keys = 0;
            let keys_chunks = keys.chunks(chunk_size).collect::<Vec<_>>();
-            let dest_keys_chunks = dest_keys.chunks(chunk_size).collect::<Vec<_>>();
+            let dest_keys_chunks = keys.chunks(chunk_size).collect::<Vec<_>>();
            for (keys, dest_keys) in keys_chunks.into_iter().zip(dest_keys_chunks) {
-                moved_keys += self.move_values_inner(keys, dest_keys).await?;
+                self.move_values_inner(keys, dest_keys).await?;
            }
-            Ok(moved_keys)
+
+            Ok(keys.len())
        } else {
            self.move_values_inner(&keys, &dest_keys).await
        }
@@ -234,18 +196,15 @@ impl TombstoneManager {
    ///
    /// Returns the number of keys that were deleted.
    pub async fn delete(&self, keys: Vec<Vec<u8>>) -> Result<usize> {
-        let keys = keys
+        let operations = keys
            .iter()
-            .map(|key| self.to_tombstone(key))
+            .map(|key| TxnOp::Delete(self.to_tombstone(key)))
            .collect::<Vec<_>>();

-        let num_keys = keys.len();
-        let _ = self
-            .kv_backend
-            .batch_delete(BatchDeleteRequest::new().with_keys(keys))
-            .await?;
-
-        Ok(num_keys)
+        let txn = Txn::new().and_then(operations);
+        // Always success.
+        let _ = self.kv_backend.txn(txn).await?;
+        Ok(keys.len())
    }
 }

@@ -433,73 +392,16 @@ mod tests {
            .into_iter()
            .map(|kv| (kv.key, kv.dest_key))
            .unzip();
-        let moved_keys = tombstone_manager
+        tombstone_manager
            .move_values(keys.clone(), dest_keys.clone())
            .await
            .unwrap();
-        assert_eq!(kvs.len(), moved_keys);
        check_moved_values(kv_backend.clone(), &move_values).await;
        // Moves again
-        let moved_keys = tombstone_manager
+        tombstone_manager
            .move_values(keys.clone(), dest_keys.clone())
            .await
            .unwrap();
-        assert_eq!(0, moved_keys);
-        check_moved_values(kv_backend.clone(), &move_values).await;
-    }
-
-    #[tokio::test]
-    async fn test_move_values_with_max_txn_ops() {
-        common_telemetry::init_default_ut_logging();
-        let kv_backend = Arc::new(MemoryKvBackend::default());
-        let mut tombstone_manager = TombstoneManager::new(kv_backend.clone());
-        tombstone_manager.set_max_txn_ops(4);
-        let kvs = HashMap::from([
-            (b"bar".to_vec(), b"baz".to_vec()),
-            (b"foo".to_vec(), b"hi".to_vec()),
-            (b"baz".to_vec(), b"hello".to_vec()),
-            (b"qux".to_vec(), b"world".to_vec()),
-            (b"quux".to_vec(), b"world".to_vec()),
-            (b"quuux".to_vec(), b"world".to_vec()),
-            (b"quuuux".to_vec(), b"world".to_vec()),
-            (b"quuuuux".to_vec(), b"world".to_vec()),
-            (b"quuuuuux".to_vec(), b"world".to_vec()),
-        ]);
-        for (key, value) in &kvs {
-            kv_backend
-                .put(
-                    PutRequest::new()
-                        .with_key(key.clone())
-                        .with_value(value.clone()),
-                )
-                .await
-                .unwrap();
-        }
-        let move_values = kvs
-            .iter()
-            .map(|(key, value)| MoveValue {
-                key: key.clone(),
-                dest_key: tombstone_manager.to_tombstone(key),
-                value: value.clone(),
-            })
-            .collect::<Vec<_>>();
-        let (keys, dest_keys): (Vec<_>, Vec<_>) = move_values
-            .clone()
-            .into_iter()
-            .map(|kv| (kv.key, kv.dest_key))
-            .unzip();
-        let moved_keys = tombstone_manager
-            .move_values(keys.clone(), dest_keys.clone())
-            .await
-            .unwrap();
-        assert_eq!(kvs.len(), moved_keys);
-        check_moved_values(kv_backend.clone(), &move_values).await;
-        // Moves again
-        let moved_keys = tombstone_manager
-            .move_values(keys.clone(), dest_keys.clone())
-            .await
-            .unwrap();
-        assert_eq!(0, moved_keys);
        check_moved_values(kv_backend.clone(), &move_values).await;
    }

@@ -537,19 +439,17 @@ mod tests {
            .unzip();
        keys.push(b"non-exists".to_vec());
        dest_keys.push(b"hi/non-exists".to_vec());
-        let moved_keys = tombstone_manager
+        tombstone_manager
            .move_values(keys.clone(), dest_keys.clone())
            .await
            .unwrap();
        check_moved_values(kv_backend.clone(), &move_values).await;
-        assert_eq!(3, moved_keys);
        // Moves again
-        let moved_keys = tombstone_manager
+        tombstone_manager
            .move_values(keys.clone(), dest_keys.clone())
            .await
            .unwrap();
        check_moved_values(kv_backend.clone(), &move_values).await;
-        assert_eq!(0, moved_keys);
    }

    #[tokio::test]
@@ -590,11 +490,10 @@ mod tests {
            .into_iter()
            .map(|kv| (kv.key, kv.dest_key))
            .unzip();
-        let moved_keys = tombstone_manager
+        tombstone_manager
            .move_values(keys, dest_keys)
            .await
            .unwrap();
-        assert_eq!(kvs.len(), moved_keys);
    }

    #[tokio::test]
@@ -672,24 +571,4 @@ mod tests {
            .unwrap();
        check_moved_values(kv_backend.clone(), &move_values).await;
    }
-
-    #[tokio::test]
-    async fn test_move_values_with_different_lengths() {
-        let kv_backend = Arc::new(MemoryKvBackend::default());
-        let tombstone_manager = TombstoneManager::new(kv_backend.clone());
-
-        let keys = vec![b"bar".to_vec(), b"foo".to_vec()];
-        let dest_keys = vec![b"bar".to_vec(), b"foo".to_vec(), b"baz".to_vec()];
-
-        let err = tombstone_manager
-            .move_values(keys, dest_keys)
-            .await
-            .unwrap_err();
-        assert!(err
-            .to_string()
-            .contains("The length of keys(2) does not match the length of dest_keys(3)."),);
-
-        let moved_keys = tombstone_manager.move_values(vec![], vec![]).await.unwrap();
-        assert_eq!(0, moved_keys);
-    }
 }
--- a/src/common/meta/src/peer.rs
+++ b/src/common/meta/src/peer.rs
@@ -19,17 +19,11 @@ pub use api::v1::meta::Peer;
 use crate::error::Error;
 use crate::{DatanodeId, FlownodeId};

-/// PeerLookupService is a service that can lookup peers.
+/// can query peer given a node id
 #[async_trait::async_trait]
 pub trait PeerLookupService {
-    /// Returns the datanode with the given id. It may return inactive peers.
    async fn datanode(&self, id: DatanodeId) -> Result<Option<Peer>, Error>;
-
-    /// Returns the flownode with the given id. It may return inactive peers.
    async fn flownode(&self, id: FlownodeId) -> Result<Option<Peer>, Error>;
-
-    /// Returns all currently active frontend nodes that have reported a heartbeat within the most recent heartbeat interval from the in-memory backend.
-    async fn active_frontends(&self) -> Result<Vec<Peer>, Error>;
 }

 pub type PeerLookupServiceRef = Arc<dyn PeerLookupService + Send + Sync>;
--- a/src/common/meta/src/rpc/ddl.rs
+++ b/src/common/meta/src/rpc/ddl.rs
@@ -96,7 +96,7 @@ impl DdlTask {
    /// Creates a [`DdlTask`] to create a table.
    pub fn new_create_table(
        expr: CreateTableExpr,
-        partitions: Option<Partition>,
+        partitions: Vec<Partition>,
        table_info: RawTableInfo,
    ) -> Self {
        DdlTask::CreateTable(CreateTableTask::new(expr, partitions, table_info))
@@ -107,7 +107,7 @@ impl DdlTask {
        DdlTask::CreateLogicalTables(
            table_data
                .into_iter()
-                .map(|(expr, table_info)| CreateTableTask::new(expr, None, table_info))
+                .map(|(expr, table_info)| CreateTableTask::new(expr, Vec::new(), table_info))
                .collect(),
        )
    }
@@ -606,10 +606,7 @@ impl From<DropTableTask> for PbDropTableTask {
 #[derive(Debug, PartialEq, Clone)]
 pub struct CreateTableTask {
    pub create_table: CreateTableExpr,
-    /// The partitions of the table.
-    ///
-    /// If the table is created with a single region (not partitioned), this field is `None`.
-    pub partitions: Option<Partition>,
+    pub partitions: Vec<Partition>,
    pub table_info: RawTableInfo,
 }

@@ -623,7 +620,7 @@ impl TryFrom<PbCreateTableTask> for CreateTableTask {
            pb.create_table.context(error::InvalidProtoMsgSnafu {
                err_msg: "expected create table",
            })?,
-            pb.partitions.first().cloned(),
+            pb.partitions,
            table_info,
        ))
    }
@@ -636,10 +633,7 @@ impl TryFrom<CreateTableTask> for PbCreateTableTask {
        Ok(PbCreateTableTask {
            table_info: serde_json::to_vec(&task.table_info).context(error::SerdeJsonSnafu)?,
            create_table: Some(task.create_table),
-            partitions: match task.partitions {
-                Some(p) => vec![p],
-                None => vec![],
-            },
+            partitions: task.partitions,
        })
    }
 }
@@ -647,7 +641,7 @@ impl TryFrom<CreateTableTask> for PbCreateTableTask {
 impl CreateTableTask {
    pub fn new(
        expr: CreateTableExpr,
-        partitions: Option<Partition>,
+        partitions: Vec<Partition>,
        table_info: RawTableInfo,
    ) -> CreateTableTask {
        CreateTableTask {
@@ -707,10 +701,7 @@ impl Serialize for CreateTableTask {

        let pb = PbCreateTableTask {
            create_table: Some(self.create_table.clone()),
-            partitions: match &self.partitions {
-                Some(p) => vec![p.clone()],
-                None => vec![],
-            },
+            partitions: self.partitions.clone(),
            table_info,
        };
        let buf = pb.encode_to_vec();
@@ -1324,7 +1315,7 @@ mod tests {
        let table_info = test_table_info(1025, "foo", "bar", "baz", Arc::new(schema));
        let task = CreateTableTask::new(
            CreateTableExpr::default(),
-            None,
+            Vec::new(),
            RawTableInfo::from(table_info),
        );

@@ -1383,7 +1374,6 @@ mod tests {
            options: Default::default(),
            created_on: Default::default(),
            partition_key_indices: Default::default(),
-            column_ids: Default::default(),
        };

        // construct RawTableInfo
@@ -1420,7 +1410,8 @@ mod tests {
            ..Default::default()
        };

-        let mut create_table_task = CreateTableTask::new(create_table_expr, None, raw_table_info);
+        let mut create_table_task =
+            CreateTableTask::new(create_table_expr, Vec::new(), raw_table_info);

        // Call the sort_columns method
        create_table_task.sort_columns();
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lei, HUANG	7e79b4b2f6	poc/create-alter-for-metrics: ### Commit Message Enhance Prometheus Bulk Write Handling - `server.rs`: Introduced `start_background_task` in `PromBulkState` to handle asynchronous batch processing and SST file writing. Added a new `tx` field to manage task communication. - `access_layer.rs`: Added `file_id` method to `ParquetWriter` for file identification. - `batch_builder.rs`: Modified `MetricsBatchBuilder` to utilize session catalog and schema, and updated batch processing logic to handle column metadata. - `prom_store.rs`: Updated `remote_write` to use `decode_remote_write_request_to_batch` for batch processing and send data to the background task. - `prom_row_builder.rs`: Made `TableBuilder` and `TablesBuilder` fields public for external access. - `proto.rs`: Exposed `table_data` in `PromWriteRequest` for batch processing. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-30 08:27:26 +00:00
Lei, HUANG	4ad40af468	poc/create-alter-for-metrics: - Refactor `BatchEncoder` and `Columns`: - Introduced `Columns` and `ColumnsBuilder` to manage primary key, timestamp, and value data more efficiently. - Updated `BatchEncoder` to utilize `ColumnsBuilder` for handling multiple record batches. - Modified `finish` method to return a vector of record batches instead of a single optional batch. - Added methods for estimating size and counting total rows in `BatchEncoder`. - Enhance `MetricsBatchBuilder`: - Changed the structure to store multiple record batches per region in `MetricsBatchBuilder`. - Update `TablesBuilder` in `prom_row_builder.rs`: - Modified to handle multiple record batches per region and collect file metadata for logging. - Remove unnecessary logging in `prom_store.rs`: - Removed the "Use bulk mode" log statement. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-29 14:07:57 +00:00
Lei, HUANG	e4b048e788	poc/create-alter-for-metrics: ### Commit Message Enhance Schema Handling and Add Telemetry Logging - `access_layer.rs`: Refactored to use `physical_schema` for schema creation and improved error handling with telemetry logging for batch writing. - `batch_builder.rs`: Introduced `physical_schema` function for schema creation and updated data structures to use `RegionId` for physical tables. Removed redundant schema function. - `prom_store.rs`: Added telemetry logging to track bulk mode usage and processing time. - `prom_row_builder.rs`: Implemented telemetry logging to measure elapsed time for key operations like table creation, metadata collection, and batch appending. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-28 09:58:33 +00:00
Lei, HUANG	ecbf372de3	poc/create-alter-for-metrics: ### Add Object Store Integration and Access Layer Factory - Cargo.lock, Cargo.toml: Added `object-store` as a dependency to integrate object storage capabilities. - frontend.rs, instance.rs, builder.rs, server.rs: Introduced `ObjectStoreConfig` and `AccessLayerFactory` to manage object storage configurations and access layers. - access_layer.rs: Made `AccessLayerFactory` clonable and its constructor public to facilitate object store access layer creation. - prom_store.rs: Updated `PromBulkState` to include `AccessLayerFactory` and modified `remote_write` to utilize the access layer for processing requests. - lib.rs: Made `access_layer` module public to expose access layer functionalities. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-27 08:50:25 +00:00
Lei, HUANG	3d81a17360	poc/create-alter-for-metrics: ### Commit Message Enhance Schema and Table Handling in MetricsBatchBuilder - `access_layer.rs`: Made `create_sst_writer` function public within the crate to facilitate SST writing. - `batch_builder.rs`: Updated `MetricsBatchBuilder` to handle builders as a nested `HashMap` for schemas and logical table names. Modified `finish` method to return record batches grouped by schema and logical table name. - `prom_row_builder.rs`: Renamed `as_record_batch` to `as_record_batches` and implemented logic to write record batches using `AccessLayerFactory`. - `proto.rs`: Updated method call from `as_record_batch` to `as_record_batches` to reflect the new method name. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-26 13:00:54 +00:00
Lei, HUANG	025cae3679	poc/create-alter-for-metrics: - Refactor `AccessLayerFactory`: Updated the method for joining paths in `access_layer.rs` by replacing `join_dir` with `join_path` for file path construction. - Enhance Testing: Added comprehensive tests in `access_layer.rs` to verify the functionality of the Parquet writer, including writing multiple batches and handling provided timestamp ranges. - Optimize `MetricsBatchBuilder`: Simplified the loop in `batch_builder.rs` by removing unnecessary mutability in the encoder variable. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-26 11:31:29 +00:00
Lei, HUANG	68409e28ea	poc/create-alter-for-metrics: ### Add Parquet Writer and Access Layer - `Cargo.lock`, `Cargo.toml`: Updated dependencies to include `parquet`, `object-store`, and `common-datasource`. - `parquet_writer.rs`: Introduced a new module for writing Parquet files asynchronously using `AsyncWriter`. - `access_layer.rs`: Added a new access layer for managing Parquet file writing, including `AccessLayerFactory` and `ParquetWriter` for handling record batches and metadata. ### Enhance Batch Builder - `batch_builder.rs`: Enhanced `BatchEncoder` to handle timestamp ranges and return optional record batches with timestamp metadata. ### Update Error Handling - `error.rs`: Added new error variants for handling object store and Parquet operations. ### Modify Mito2 Parquet Constants - `parquet.rs`: Changed visibility of `DEFAULT_ROW_GROUP_SIZE` to public for broader access. ### Add Tests - `access_layer.rs`: Added basic tests for building data region directories. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-26 09:17:53 +00:00
evenyag	699406ae32	refactor: update MetricsBatchBuilder to use physical region metadata - Update append_rows_to_batch to accept physical_region_metadata parameter - Refactor metadata lookup to use HashMap<String, HashMap<String, (TableId, RegionMetadataRef)>> - Fix collect_physical_region_metadata call in TablesBuilder to extract logical table info - Remove unused TableName import from batch_builder.rs Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:41 +00:00
evenyag	344006deca	feat: Implements collect_physical_region_metadata Add partition_manager and node_manager to PromBulkState and PromBulkContext Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:41 +00:00
Lei, HUANG	63803f2b43	poc/create-alter-for-metrics: ### Commit Message Enhance `MetricsBatchBuilder` and `TablesBuilder` functionalities - `batch_builder.rs`: - Made `collect_physical_region_metadata` and `append_rows_to_batch` methods public to allow external access. - Implemented the `finish` method to complete record batch building and return batches grouped by physical table ID. - `prom_row_builder.rs`: - Updated `TablesBuilder::build` to utilize `MetricsBatchBuilder` for creating or altering physical tables and appending rows. - Integrated collection of physical region metadata and finalized record batch processing. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-25 16:44:40 +00:00
Lei, HUANG	cf62767b98	poc/create-alter-for-metrics: ### Commit Message Enhance error handling in `batch_builder.rs` and `error.rs` - `batch_builder.rs`: - Replaced `todo!` with specific error handling for invalid timestamp and field value types using `InvalidTimestampValueTypeSnafu` and `InvalidFieldValueTypeSnafu`. - `error.rs`: - Added new error variants `InvalidTimestampValueType` and `InvalidFieldValueType` with descriptive messages. - Updated `status_code` method to handle new error types with `StatusCode::Unexpected`. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-25 16:44:40 +00:00
Lei, HUANG	4e53c1531d	poc/create-alter-for-metrics: ### Commit Message Enhance batch sorting in `batch_builder.rs` - Implement sorting of batches by primary key using `compute::sort_to_indices`. - Update `op_type` and `sequence` to use `Arc` for consistency. - Apply sorting to `value`, `timestamp`, and primary key arrays using `compute::take`. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-25 16:44:40 +00:00
Lei, HUANG	892cb66c53	poc/create-alter-for-metrics: - Add `ahash` Dependency: Updated `Cargo.lock` and `Cargo.toml` to include `ahash` as a dependency for the `metric-engine` project. - Refactor `MetricsBatchBuilder`: Modified `MetricsBatchBuilder` in `batch_builder.rs` to include a `builders` field and refactored methods to use `BatchEncoder` for appending rows. - Update `BatchEncoder`: Changed `BatchEncoder` in `batch_builder.rs` to use a `name_to_id` map and added `append_rows` and `finish` methods for handling row encoding. - Modify `LogicalSchemas` Structure: Updated `schema_helper.rs` to use `HashMap` instead of `ahash::HashMap` for the `schemas` field in `LogicalSchemas`. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-25 16:44:39 +00:00
Lei, HUANG	8b392477c8	poc/create-alter-for-metrics: ### Commit Summary - Add New Dependencies: Updated `Cargo.lock` and `Cargo.toml` to include `metric-engine` and `mito-codec` dependencies. - Enhance `MetricEngineInner`: Modified `put.rs` to use `logical_table_id` instead of `table_id` and adjusted method calls accordingly. - Expose Structs and Methods: Made `RowModifier`, `RowsIter`, and `RowIter` structs and their methods public in `row_modifier.rs`. - Implement Batch Processing: Added batch processing logic in `batch_builder.rs` to handle row conversion to record batches with primary key encoding. - Error Handling: Introduced `EncodePrimaryKey` error variant in `error.rs` for handling primary key encoding errors. - Clone Support for `TableBuilder`: Added `Clone` trait to `TableBuilder` in `prom_row_builder.rs`. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-25 16:44:39 +00:00
evenyag	905593dc16	feat: add bulk mode flag for prom store with SchemaHelper integration Add a new bulk_mode flag to PromStoreOptions that enables bulk processing for prometheus metrics ingestion. When enabled, initializes PromBulkState with a SchemaHelper instance for efficient schema management. Changes: - Add bulk_mode field to PromStoreOptions (default: false) - Add create_schema_helper() method to Instance for SchemaHelper construction - Add getter methods to StatementExecutor for procedure_executor and cache_invalidator - Update server initialization to conditionally create PromBulkState when bulk_mode is enabled - Fix clippy warnings in schema_helper.rs Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:38 +00:00
evenyag	6c04cb9b19	feat: use schema_helper to create/alter physical table Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:38 +00:00
Lei, HUANG	24da3367c1	poc/create-alter-for-metrics: - Add `operator` dependency: Updated `Cargo.lock` and `Cargo.toml` to include the `operator` dependency. - Expose structs and functions in `schema_helper.rs`: Made `LogicalSchema`, `LogicalSchemas`, and `ensure_logical_tables_for_metrics` public in `src/operator/src/schema_helper.rs`. - Refactor `batch_builder.rs`: - Changed the logic for handling physical and logical tables, including the introduction of `tags_to_logical_schemas` function. - Modified `determine_physical_table_name` to return a string instead of a table reference. - Updated logic for managing tags and logical schemas in `MetricsBatchBuilder`. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-25 16:44:38 +00:00
Lei, HUANG	80b14965a6	feat/frontend-stager: ### Commit Summary - Enhancements in `MetricsBatchBuilder`: - Added support for session catalog and schema in `create_or_alter_physical_tables`. - Introduced `physical_tables` mapping for logical to physical table references. - Implemented `rows_to_batch` to build `RecordBatch` from rows with primary key encoded. - Function Modifications: - Updated `determine_physical_table` to use session catalog and schema. - Modified `build_create_table_expr` and `build_alter_table_expr` to include additional parameters for schema compatibility. - Error Handling: - Added error handling for missing physical tables in `rows_to_batch`. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-25 16:44:37 +00:00
Lei, HUANG	5da3f86d0c	feat/frontend-stager: ### Add `MetricsBatchBuilder` for Physical Table Management - New Feature: Introduced `MetricsBatchBuilder` in `batch_builder.rs` to manage the creation and alteration of physical tables based on logical table tags. - Error Handling: Added `CommonMeta` error variant in `error.rs` to handle errors from `common_meta`. - Enhancements: - Added `tags` method in `prom_row_builder.rs` to retrieve tag names from `TableBuilder`. - Implemented `primary_key_names` method in `metadata.rs` to return primary key names from `TableMeta`. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-06-25 16:44:37 +00:00
evenyag	151273d1df	feat: get region metadata by ids Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:36 +00:00
evenyag	b0289dbdde	refactor: extract logics for filling options Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:36 +00:00
evenyag	c51730a954	feat: create or alter logical tables for metrics Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:36 +00:00
evenyag	207709c727	refactor: remove Inserter::create_physical_table_on_demand Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:35 +00:00
evenyag	deca8c44fa	refactor: StatementExecutor calls SchemaHelper to change schema Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:35 +00:00
evenyag	2edd861ce9	refactor: use SchemaHelper in Inserter Remove the dependency to StatementExecutor from Inserter Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:34 +00:00
evenyag	14f3a4ab05	refactor: copy alter logic to SchemaHelper Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:34 +00:00
evenyag	34875c0346	refactor: define schema_helper mod to handle schema creation It has the same logic as Inserter and StatementExecutor Signed-off-by: evenyag <realevenyag@gmail.com>	2025-06-25 16:44:34 +00:00