chore: fix statement compile errors

Signed-off-by: evenyag <realevenyag@gmail.com>
fix: enable max_execution time for other read only statements (#6454 )
2025-12-27 00:19:58 +00:00 · 2025-07-03 23:05:21 +08:00 · 2025-07-03 23:05:21 +08:00 · 2025-07-03 23:05:21 +08:00 · 2025-07-03 23:05:21 +08:00 · 2025-07-03 23:05:21 +08:00
235 changed files with 3811 additions and 9085 deletions
--- 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",
@@ -1610,7 +1610,7 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

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

 [[package]]
 name = "cli"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -1975,6 +1975,7 @@ dependencies = [
 "common-version",
 "common-wal",
 "datatypes",
+ "either",
 "etcd-client",
 "futures",
 "humantime",
@@ -1985,14 +1986,14 @@ dependencies = [
 "operator",
 "query",
 "rand 0.9.0",
- "reqwest 0.12.9",
+ "reqwest",
 "serde",
 "serde_json",
 "servers",
 "session",
 "snafu 0.8.5",
 "store-api",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tempfile",
 "tokio",
@@ -2001,7 +2002,7 @@ dependencies = [

 [[package]]
 name = "client"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arc-swap",
@@ -2031,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",
@@ -2072,7 +2073,7 @@ dependencies = [

 [[package]]
 name = "cmd"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "auth",
@@ -2102,6 +2103,7 @@ dependencies = [
 "common-wal",
 "datanode",
 "datatypes",
+ "either",
 "etcd-client",
 "file-engine",
 "flow",
@@ -2116,14 +2118,13 @@ dependencies = [
 "mito2",
 "moka",
 "nu-ansi-term",
- "object-store",
 "plugins",
 "prometheus",
 "prost 0.13.5",
 "query",
 "rand 0.9.0",
 "regex",
- "reqwest 0.12.9",
+ "reqwest",
 "rexpect",
 "serde",
 "serde_json",
@@ -2133,7 +2134,7 @@ dependencies = [
 "snafu 0.8.5",
 "stat",
 "store-api",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "temp-env",
 "tempfile",
@@ -2180,7 +2181,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"

 [[package]]
 name = "common-base"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "anymap2",
 "async-trait",
@@ -2202,11 +2203,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",
@@ -2219,7 +2220,6 @@ dependencies = [
 "humantime-serde",
 "meta-client",
 "num_cpus",
- "object-store",
 "serde",
 "serde_json",
 "serde_with",
@@ -2232,7 +2232,7 @@ dependencies = [

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

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

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

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

 [[package]]
 name = "common-function"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -2332,7 +2332,6 @@ dependencies = [
 "datafusion",
 "datafusion-common",
 "datafusion-expr",
- "datafusion-functions-aggregate-common",
 "datatypes",
 "derive_more",
 "geo",
@@ -2363,7 +2362,7 @@ dependencies = [

 [[package]]
 name = "common-greptimedb-telemetry"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "common-runtime",
@@ -2371,7 +2370,7 @@ dependencies = [
 "common-test-util",
 "common-version",
 "hyper 0.14.30",
- "reqwest 0.12.9",
+ "reqwest",
 "serde",
 "tempfile",
 "tokio",
@@ -2380,7 +2379,7 @@ dependencies = [

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

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

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

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

 [[package]]
 name = "common-meta"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "anymap2",
 "api",
@@ -2526,7 +2525,7 @@ dependencies = [

 [[package]]
 name = "common-options"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "common-grpc",
 "humantime-serde",
@@ -2535,11 +2534,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",
@@ -2551,7 +2550,7 @@ dependencies = [

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

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

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

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

 [[package]]
 name = "common-runtime"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "clap 4.5.19",
@@ -2663,32 +2662,14 @@ 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",
@@ -2715,7 +2696,7 @@ dependencies = [

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

 [[package]]
 name = "common-time"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "arrow 54.2.1",
 "chrono",
@@ -2746,7 +2727,7 @@ dependencies = [

 [[package]]
 name = "common-version"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "build-data",
 "const_format",
@@ -2756,7 +2737,7 @@ dependencies = [

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

 [[package]]
 name = "common-workload"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "common-telemetry",
@@ -3735,7 +3716,7 @@ dependencies = [

 [[package]]
 name = "datanode"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arrow-flight",
@@ -3781,14 +3762,14 @@ dependencies = [
 "prometheus",
 "prost 0.13.5",
 "query",
- "reqwest 0.12.9",
+ "reqwest",
 "serde",
 "serde_json",
 "servers",
 "session",
 "snafu 0.8.5",
 "store-api",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tokio",
 "toml 0.8.19",
@@ -3797,7 +3778,7 @@ dependencies = [

 [[package]]
 name = "datatypes"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "arrow 54.2.1",
 "arrow-array 54.2.1",
@@ -4217,9 +4198,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",
 ]
@@ -4457,7 +4438,7 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"

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

 [[package]]
 name = "flow"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arrow 54.2.1",
@@ -4659,7 +4640,7 @@ dependencies = [
 "sql",
 "store-api",
 "strum 0.27.1",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tokio",
 "tonic 0.12.3",
@@ -4714,7 +4695,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"

 [[package]]
 name = "frontend"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arc-swap",
@@ -4774,7 +4755,7 @@ 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",
@@ -5164,7 +5145,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=96c733f8472284d3c83a4c011dc6de9cf830c353#96c733f8472284d3c83a4c011dc6de9cf830c353"
 dependencies = [
 "prost 0.13.5",
 "serde",
@@ -5935,7 +5916,7 @@ dependencies = [

 [[package]]
 name = "index"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "asynchronous-codec",
@@ -6715,7 +6696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
 "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]

 [[package]]
@@ -6820,7 +6801,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

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

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

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

 [[package]]
 name = "meta-srv"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "async-trait",
@@ -7188,7 +7169,6 @@ dependencies = [
 "deadpool",
 "deadpool-postgres",
 "derive_builder 0.20.1",
- "either",
 "etcd-client",
 "futures",
 "h2 0.3.26",
@@ -7250,7 +7230,7 @@ dependencies = [

 [[package]]
 name = "metric-engine"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "aquamarine",
@@ -7260,7 +7240,6 @@ dependencies = [
 "common-base",
 "common-error",
 "common-macro",
- "common-meta",
 "common-query",
 "common-recordbatch",
 "common-runtime",
@@ -7341,7 +7320,7 @@ dependencies = [

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

 [[package]]
 name = "mito2"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "aquamarine",
@@ -8114,25 +8093,18 @@ dependencies = [

 [[package]]
 name = "object-store"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "anyhow",
 "bytes",
- "common-base",
- "common-error",
- "common-macro",
 "common-telemetry",
 "common-test-util",
 "futures",
- "humantime-serde",
 "lazy_static",
 "md5",
 "moka",
 "opendal",
 "prometheus",
- "reqwest 0.12.9",
- "serde",
- "snafu 0.8.5",
 "tokio",
 "uuid",
 ]
@@ -8267,7 +8239,7 @@ dependencies = [
 "prometheus",
 "quick-xml 0.36.2",
 "reqsign",
- "reqwest 0.12.9",
+ "reqwest",
 "serde",
 "serde_json",
 "sha2",
@@ -8339,19 +8311,6 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "opentelemetry-http"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e"
-dependencies = [
- "async-trait",
- "bytes",
- "http 0.2.12",
- "opentelemetry 0.21.0",
- "reqwest 0.11.27",
-]
-
 [[package]]
 name = "opentelemetry-otlp"
 version = "0.14.0"
@@ -8362,12 +8321,10 @@ dependencies = [
 "futures-core",
 "http 0.2.12",
 "opentelemetry 0.21.0",
- "opentelemetry-http",
 "opentelemetry-proto 0.4.0",
 "opentelemetry-semantic-conventions",
 "opentelemetry_sdk 0.21.2",
 "prost 0.11.9",
- "reqwest 0.11.27",
 "thiserror 1.0.64",
 "tokio",
 "tonic 0.9.2",
@@ -8450,7 +8407,7 @@ dependencies = [

 [[package]]
 name = "operator"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -8475,7 +8432,6 @@ dependencies = [
 "common-query",
 "common-recordbatch",
 "common-runtime",
- "common-sql",
 "common-telemetry",
 "common-test-util",
 "common-time",
@@ -8506,7 +8462,7 @@ 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",
@@ -8773,7 +8729,7 @@ dependencies = [

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

 [[package]]
 name = "pipeline"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -9204,7 +9160,7 @@ dependencies = [

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

 [[package]]
 name = "promql"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "async-trait",
@@ -9613,7 +9569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
 dependencies = [
 "heck 0.5.0",
- "itertools 0.14.0",
+ "itertools 0.11.0",
 "log",
 "multimap",
 "once_cell",
@@ -9659,7 +9615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
 "anyhow",
- "itertools 0.14.0",
+ "itertools 0.11.0",
 "proc-macro2",
 "quote",
 "syn 2.0.100",
@@ -9799,7 +9755,7 @@ dependencies = [

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

 [[package]]
 name = "query"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -9907,7 +9863,7 @@ 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",
@@ -10355,7 +10311,7 @@ dependencies = [
 "percent-encoding",
 "quick-xml 0.35.0",
 "rand 0.8.5",
- "reqwest 0.12.9",
+ "reqwest",
 "rsa",
 "rust-ini 0.21.1",
 "serde",
@@ -10364,42 +10320,6 @@ dependencies = [
 "sha2",
 ]

-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.30",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration",
- "tokio",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.12.9"
@@ -11229,7 +11149,7 @@ dependencies = [

 [[package]]
 name = "servers"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -11262,7 +11182,6 @@ dependencies = [
 "common-recordbatch",
 "common-runtime",
 "common-session",
- "common-sql",
 "common-telemetry",
 "common-test-util",
 "common-time",
@@ -11316,7 +11235,7 @@ dependencies = [
 "quoted-string",
 "rand 0.9.0",
 "regex",
- "reqwest 0.12.9",
+ "reqwest",
 "rust-embed",
 "rustls",
 "rustls-pemfile",
@@ -11351,7 +11270,7 @@ dependencies = [

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

 [[package]]
 name = "sql"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "chrono",
@@ -11701,7 +11620,6 @@ dependencies = [
 "common-error",
 "common-macro",
 "common-query",
- "common-sql",
 "common-time",
 "datafusion",
 "datafusion-common",
@@ -11746,7 +11664,7 @@ dependencies = [

 [[package]]
 name = "sqlness-runner"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "clap 4.5.19",
@@ -11761,7 +11679,7 @@ dependencies = [
 "local-ip-address",
 "mysql",
 "num_cpus",
- "reqwest 0.12.9",
+ "reqwest",
 "serde",
 "serde_json",
 "sha2",
@@ -12046,7 +11964,7 @@ dependencies = [

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

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

 [[package]]
 name = "substrait"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "async-trait",
 "bytes",
@@ -12411,30 +12329,9 @@ dependencies = [
 "nom",
 ]

-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "table"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "async-trait",
@@ -12695,7 +12592,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"

 [[package]]
 name = "tests-fuzz"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "arbitrary",
 "async-trait",
@@ -12722,7 +12619,7 @@ dependencies = [
 "paste",
 "rand 0.9.0",
 "rand_chacha 0.9.0",
- "reqwest 0.12.9",
+ "reqwest",
 "schemars",
 "serde",
 "serde_json",
@@ -12739,7 +12636,7 @@ dependencies = [

 [[package]]
 name = "tests-integration"
-version = "0.16.0"
+version = "0.15.0"
 dependencies = [
 "api",
 "arrow-flight",
@@ -12806,7 +12703,7 @@ dependencies = [
 "sql",
 "sqlx",
 "store-api",
- "substrait 0.16.0",
+ "substrait 0.15.0",
 "table",
 "tempfile",
 "time",
@@ -14287,7 +14184,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@@ -14605,16 +14502,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.39.0"
--- 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"
@@ -124,7 +121,6 @@ datafusion = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "
 datafusion-common = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "12c0381babd52c681043957e9d6ee083a03f7646" }
 datafusion-expr = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "12c0381babd52c681043957e9d6ee083a03f7646" }
 datafusion-functions = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "12c0381babd52c681043957e9d6ee083a03f7646" }
-datafusion-functions-aggregate-common = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "12c0381babd52c681043957e9d6ee083a03f7646" }
 datafusion-optimizer = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "12c0381babd52c681043957e9d6ee083a03f7646" }
 datafusion-physical-expr = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "12c0381babd52c681043957e9d6ee083a03f7646" }
 datafusion-physical-plan = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "12c0381babd52c681043957e9d6ee083a03f7646" }
@@ -134,12 +130,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 = "96c733f8472284d3c83a4c011dc6de9cf830c353" }
 hex = "0.4"
 http = "1"
 humantime = "2.1"
@@ -263,7 +258,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
@@ -185,11 +185,10 @@
 | `logging.dir` | String | `./greptimedb_data/logs` | The directory to store the log files. If set to empty, logs will not be written to files. |
 | `logging.level` | String | Unset | The log level. Can be `info`/`debug`/`warn`/`error`. |
 | `logging.enable_otlp_tracing` | Bool | `false` | Enable OTLP tracing. |
-| `logging.otlp_endpoint` | String | `http://localhost:4318` | The OTLP tracing endpoint. |
+| `logging.otlp_endpoint` | String | `http://localhost:4317` | The OTLP tracing endpoint. |
 | `logging.append_stdout` | Bool | `true` | Whether to append logs to stdout. |
 | `logging.log_format` | String | `text` | The log format. Can be `text`/`json`. |
 | `logging.max_log_files` | Integer | `720` | The maximum amount of log files. |
-| `logging.otlp_export_protocol` | String | `http` | The OTLP tracing export protocol. Can be `grpc`/`http`. |
 | `logging.tracing_sample_ratio` | -- | -- | The percentage of tracing will be sampled and exported.<br/>Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.<br/>ratio > 1 are treated as 1. Fractions < 0 are treated as 0 |
 | `logging.tracing_sample_ratio.default_ratio` | Float | `1.0` | -- |
 | `slow_query` | -- | -- | The slow query log options. |
@@ -289,11 +288,10 @@
 | `logging.dir` | String | `./greptimedb_data/logs` | The directory to store the log files. If set to empty, logs will not be written to files. |
 | `logging.level` | String | Unset | The log level. Can be `info`/`debug`/`warn`/`error`. |
 | `logging.enable_otlp_tracing` | Bool | `false` | Enable OTLP tracing. |
-| `logging.otlp_endpoint` | String | `http://localhost:4318` | The OTLP tracing endpoint. |
+| `logging.otlp_endpoint` | String | `http://localhost:4317` | The OTLP tracing endpoint. |
 | `logging.append_stdout` | Bool | `true` | Whether to append logs to stdout. |
 | `logging.log_format` | String | `text` | The log format. Can be `text`/`json`. |
 | `logging.max_log_files` | Integer | `720` | The maximum amount of log files. |
-| `logging.otlp_export_protocol` | String | `http` | The OTLP tracing export protocol. Can be `grpc`/`http`. |
 | `logging.tracing_sample_ratio` | -- | -- | The percentage of tracing will be sampled and exported.<br/>Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.<br/>ratio > 1 are treated as 1. Fractions < 0 are treated as 0 |
 | `logging.tracing_sample_ratio.default_ratio` | Float | `1.0` | -- |
 | `slow_query` | -- | -- | The slow query log options. |
@@ -325,7 +323,6 @@
 | `selector` | String | `round_robin` | Datanode selector type.<br/>- `round_robin` (default value)<br/>- `lease_based`<br/>- `load_based`<br/>For details, please see "https://docs.greptime.com/developer-guide/metasrv/selector". |
 | `use_memory_store` | Bool | `false` | Store data in memory. |
 | `enable_region_failover` | Bool | `false` | Whether to enable region failover.<br/>This feature is only available on GreptimeDB running on cluster mode and<br/>- Using Remote WAL<br/>- Using shared storage (e.g., s3). |
-| `region_failure_detector_initialization_delay` | String | `10m` | The delay before starting region failure detection.<br/>This delay helps prevent Metasrv from triggering unnecessary region failovers before all Datanodes are fully started.<br/>Especially useful when the cluster is not deployed with GreptimeDB Operator and maintenance mode is not enabled. |
 | `allow_region_failover_on_local_wal` | Bool | `false` | Whether to allow region failover on local WAL.<br/>**This option is not recommended to be set to true, because it may lead to data loss during failover.** |
 | `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. |
@@ -373,11 +370,10 @@
 | `logging.dir` | String | `./greptimedb_data/logs` | The directory to store the log files. If set to empty, logs will not be written to files. |
 | `logging.level` | String | Unset | The log level. Can be `info`/`debug`/`warn`/`error`. |
 | `logging.enable_otlp_tracing` | Bool | `false` | Enable OTLP tracing. |
-| `logging.otlp_endpoint` | String | `http://localhost:4318` | The OTLP tracing endpoint. |
+| `logging.otlp_endpoint` | String | `http://localhost:4317` | The OTLP tracing endpoint. |
 | `logging.append_stdout` | Bool | `true` | Whether to append logs to stdout. |
 | `logging.log_format` | String | `text` | The log format. Can be `text`/`json`. |
 | `logging.max_log_files` | Integer | `720` | The maximum amount of log files. |
-| `logging.otlp_export_protocol` | String | `http` | The OTLP tracing export protocol. Can be `grpc`/`http`. |
 | `logging.tracing_sample_ratio` | -- | -- | The percentage of tracing will be sampled and exported.<br/>Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.<br/>ratio > 1 are treated as 1. Fractions < 0 are treated as 0 |
 | `logging.tracing_sample_ratio.default_ratio` | Float | `1.0` | -- |
 | `export_metrics` | -- | -- | The metasrv can export its metrics and send to Prometheus compatible service (e.g. `greptimedb` itself) from remote-write API.<br/>This is only used for `greptimedb` to export its own metrics internally. It's different from prometheus scrape. |
@@ -436,8 +432,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`**. |
@@ -538,11 +534,10 @@
 | `logging.dir` | String | `./greptimedb_data/logs` | The directory to store the log files. If set to empty, logs will not be written to files. |
 | `logging.level` | String | Unset | The log level. Can be `info`/`debug`/`warn`/`error`. |
 | `logging.enable_otlp_tracing` | Bool | `false` | Enable OTLP tracing. |
-| `logging.otlp_endpoint` | String | `http://localhost:4318` | The OTLP tracing endpoint. |
+| `logging.otlp_endpoint` | String | `http://localhost:4317` | The OTLP tracing endpoint. |
 | `logging.append_stdout` | Bool | `true` | Whether to append logs to stdout. |
 | `logging.log_format` | String | `text` | The log format. Can be `text`/`json`. |
 | `logging.max_log_files` | Integer | `720` | The maximum amount of log files. |
-| `logging.otlp_export_protocol` | String | `http` | The OTLP tracing export protocol. Can be `grpc`/`http`. |
 | `logging.tracing_sample_ratio` | -- | -- | The percentage of tracing will be sampled and exported.<br/>Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.<br/>ratio > 1 are treated as 1. Fractions < 0 are treated as 0 |
 | `logging.tracing_sample_ratio.default_ratio` | Float | `1.0` | -- |
 | `export_metrics` | -- | -- | The datanode can export its metrics and send to Prometheus compatible service (e.g. `greptimedb` itself) from remote-write API.<br/>This is only used for `greptimedb` to export its own metrics internally. It's different from prometheus scrape. |
@@ -589,14 +584,11 @@
 | `logging.dir` | String | `./greptimedb_data/logs` | The directory to store the log files. If set to empty, logs will not be written to files. |
 | `logging.level` | String | Unset | The log level. Can be `info`/`debug`/`warn`/`error`. |
 | `logging.enable_otlp_tracing` | Bool | `false` | Enable OTLP tracing. |
-| `logging.otlp_endpoint` | String | `http://localhost:4318` | The OTLP tracing endpoint. |
+| `logging.otlp_endpoint` | String | `http://localhost:4317` | The OTLP tracing endpoint. |
 | `logging.append_stdout` | Bool | `true` | Whether to append logs to stdout. |
 | `logging.log_format` | String | `text` | The log format. Can be `text`/`json`. |
 | `logging.max_log_files` | Integer | `720` | The maximum amount of log files. |
-| `logging.otlp_export_protocol` | String | `http` | The OTLP tracing export protocol. Can be `grpc`/`http`. |
 | `logging.tracing_sample_ratio` | -- | -- | The percentage of tracing will be sampled and exported.<br/>Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.<br/>ratio > 1 are treated as 1. Fractions < 0 are treated as 0 |
 | `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"

@@ -629,7 +629,7 @@ level = "info"
 enable_otlp_tracing = false

 ## The OTLP tracing endpoint.
-otlp_endpoint = "http://localhost:4318"
+otlp_endpoint = "http://localhost:4317"

 ## Whether to append logs to stdout.
 append_stdout = true
@@ -640,9 +640,6 @@ log_format = "text"
 ## The maximum amount of log files.
 max_log_files = 720

-## The OTLP tracing export protocol. Can be `grpc`/`http`.
-otlp_export_protocol = "http"
-
 ## The percentage of tracing will be sampled and exported.
 ## Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.
 ## ratio > 1 are treated as 1. Fractions < 0 are treated as 0
--- a/config/flownode.example.toml
+++ b/config/flownode.example.toml
@@ -83,7 +83,7 @@ level = "info"
 enable_otlp_tracing = false

 ## The OTLP tracing endpoint.
-otlp_endpoint = "http://localhost:4318"
+otlp_endpoint = "http://localhost:4317"

 ## Whether to append logs to stdout.
 append_stdout = true
@@ -94,9 +94,6 @@ log_format = "text"
 ## The maximum amount of log files.
 max_log_files = 720

-## The OTLP tracing export protocol. Can be `grpc`/`http`.
-otlp_export_protocol = "http"
-
 ## The percentage of tracing will be sampled and exported.
 ## Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.
 ## ratio > 1 are treated as 1. Fractions < 0 are treated as 0
@@ -108,8 +105,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/frontend.example.toml
+++ b/config/frontend.example.toml
@@ -218,7 +218,7 @@ level = "info"
 enable_otlp_tracing = false

 ## The OTLP tracing endpoint.
-otlp_endpoint = "http://localhost:4318"
+otlp_endpoint = "http://localhost:4317"

 ## Whether to append logs to stdout.
 append_stdout = true
@@ -229,9 +229,6 @@ log_format = "text"
 ## The maximum amount of log files.
 max_log_files = 720

-## The OTLP tracing export protocol. Can be `grpc`/`http`.
-otlp_export_protocol = "http"
-
 ## The percentage of tracing will be sampled and exported.
 ## Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.
 ## ratio > 1 are treated as 1. Fractions < 0 are treated as 0
--- a/config/metasrv.example.toml
+++ b/config/metasrv.example.toml
@@ -43,11 +43,6 @@ 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.
-region_failure_detector_initialization_delay = '10m'
-
 ## Whether to allow region failover on local WAL.
 ## **This option is not recommended to be set to true, because it may lead to data loss during failover.**
 allow_region_failover_on_local_wal = false
@@ -225,7 +220,7 @@ level = "info"
 enable_otlp_tracing = false

 ## The OTLP tracing endpoint.
-otlp_endpoint = "http://localhost:4318"
+otlp_endpoint = "http://localhost:4317"

 ## Whether to append logs to stdout.
 append_stdout = true
@@ -236,9 +231,6 @@ log_format = "text"
 ## The maximum amount of log files.
 max_log_files = 720

-## The OTLP tracing export protocol. Can be `grpc`/`http`.
-otlp_export_protocol = "http"
-
 ## The percentage of tracing will be sampled and exported.
 ## Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.
 ## ratio > 1 are treated as 1. Fractions < 0 are treated as 0
--- a/config/standalone.example.toml
+++ b/config/standalone.example.toml
@@ -720,7 +720,7 @@ level = "info"
 enable_otlp_tracing = false

 ## The OTLP tracing endpoint.
-otlp_endpoint = "http://localhost:4318"
+otlp_endpoint = "http://localhost:4317"

 ## Whether to append logs to stdout.
 append_stdout = true
@@ -731,9 +731,6 @@ log_format = "text"
 ## The maximum amount of log files.
 max_log_files = 720

-## The OTLP tracing export protocol. Can be `grpc`/`http`.
-otlp_export_protocol = "http"
-
 ## The percentage of tracing will be sampled and exported.
 ## Valid range `[0, 1]`, 1 means all traces are sampled, 0 means all traces are not sampled, the default value is 1.
 ## ratio > 1 are treated as 1. Fractions < 0 are treated as 0
--- 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
@@ -31,10 +31,8 @@ excludes = [
    "src/operator/src/expr_helper/trigger.rs",
    "src/sql/src/statements/create/trigger.rs",
    "src/sql/src/statements/show/trigger.rs",
-    "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/src/api/src/region.rs
+++ b/src/api/src/region.rs
@@ -22,7 +22,6 @@ use greptime_proto::v1::region::RegionResponse as RegionResponseV1;
 pub struct RegionResponse {
    pub affected_rows: AffectedRows,
    pub extensions: HashMap<String, Vec<u8>>,
-    pub metadata: Vec<u8>,
 }

 impl RegionResponse {
@@ -30,7 +29,6 @@ impl RegionResponse {
        Self {
            affected_rows: region_response.affected_rows as _,
            extensions: region_response.extensions,
-            metadata: region_response.metadata,
        }
    }

@@ -39,16 +37,6 @@ impl RegionResponse {
        Self {
            affected_rows,
            extensions: Default::default(),
-            metadata: Vec::new(),
-        }
-    }
-
-    /// Creates one response with metadata.
-    pub fn from_metadata(metadata: Vec<u8>) -> Self {
-        Self {
-            affected_rows: 0,
-            extensions: Default::default(),
-            metadata,
        }
    }
 }
--- 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
@@ -30,13 +30,13 @@ 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_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;
@@ -52,8 +52,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 +67,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",
@@ -471,19 +507,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 +580,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/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
@@ -19,7 +19,7 @@ mod information_memory_table;
 pub mod key_column_usage;
 mod partitions;
 mod procedure_info;
-pub mod process_list;
+mod process_list;
 pub mod region_peers;
 mod region_statistics;
 mod runtime_metrics;
@@ -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/process_list.rs
+++ b/src/catalog/src/system_schema/information_schema/process_list.rs
@@ -39,14 +39,14 @@ use crate::process_manager::ProcessManagerRef;
 use crate::system_schema::information_schema::InformationTable;

 /// Column names of `information_schema.process_list`
-pub const ID: &str = "id";
-pub const CATALOG: &str = "catalog";
-pub const SCHEMAS: &str = "schemas";
-pub const QUERY: &str = "query";
-pub const CLIENT: &str = "client";
-pub const FRONTEND: &str = "frontend";
-pub const START_TIMESTAMP: &str = "start_timestamp";
-pub const ELAPSED_TIME: &str = "elapsed_time";
+const ID: &str = "id";
+const CATALOG: &str = "catalog";
+const SCHEMAS: &str = "schemas";
+const QUERY: &str = "query";
+const CLIENT: &str = "client";
+const FRONTEND: &str = "frontend";
+const START_TIMESTAMP: &str = "start_timestamp";
+const ELAPSED_TIME: &str = "elapsed_time";

 /// `information_schema.process_list` table implementation that tracks running
 /// queries in current cluster.
--- 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/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/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
@@ -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};

@@ -196,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) => {
@@ -302,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
        })?;

@@ -441,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() {
@@ -468,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
@@ -66,7 +67,6 @@ metric-engine.workspace = true
 mito2.workspace = true
 moka.workspace = true
 nu-ansi-term = "0.46"
-object-store.workspace = true
 plugins.workspace = true
 prometheus.workspace = true
 prost.workspace = true
--- a/src/cmd/src/datanode.rs
+++ b/src/cmd/src/datanode.rs
@@ -280,7 +280,7 @@ mod tests {

    use common_config::ENV_VAR_SEP;
    use common_test_util::temp_dir::create_named_temp_file;
-    use object_store::config::{FileConfig, GcsConfig, ObjectStoreConfig, S3Config};
+    use datanode::config::{FileConfig, GcsConfig, ObjectStoreConfig, S3Config};
    use servers::heartbeat_options::HeartbeatOptions;

    use super::*;
--- 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;
@@ -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;
@@ -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 {
@@ -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/metasrv.rs
+++ b/src/cmd/src/metasrv.rs
@@ -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]
--- 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;
@@ -257,34 +257,15 @@ pub struct Instance {
    flownode: FlownodeInstance,
    procedure_manager: ProcedureManagerRef,
    wal_options_allocator: WalOptionsAllocatorRef,
-
-    // The components of standalone, which make it easier to expand based
-    // on the components.
-    #[cfg(feature = "enterprise")]
-    components: Components,
-
    // Keep the logging guard to prevent the worker from being dropped.
    _guard: Vec<WorkerGuard>,
 }

-#[cfg(feature = "enterprise")]
-pub struct Components {
-    pub plugins: Plugins,
-    pub kv_backend: KvBackendRef,
-    pub frontend_client: Arc<FrontendClient>,
-    pub catalog_manager: catalog::CatalogManagerRef,
-}
-
 impl Instance {
    /// Find the socket addr of a server by its `name`.
    pub fn server_addr(&self, name: &str) -> Option<SocketAddr> {
        self.frontend.server_handlers().addr(name)
    }
-
-    #[cfg(feature = "enterprise")]
-    pub fn components(&self) -> &Components {
-        &self.components
-    }
 }

 #[async_trait]
@@ -544,20 +525,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,15 +545,14 @@ 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());
-        let frontend_client = Arc::new(frontend_client);
+            FrontendClient::from_empty_grpc_handler();
        let flow_builder = FlownodeBuilder::new(
            flownode_options,
            plugins.clone(),
            table_metadata_manager.clone(),
            catalog_manager.clone(),
            flow_metadata_manager.clone(),
-            frontend_client.clone(),
+            Arc::new(frontend_client.clone()),
        );
        let flownode = flow_builder
            .build()
@@ -689,7 +662,7 @@ impl StartCommand {
        let export_metrics_task = ExportMetricsTask::try_new(&opts.export_metrics, Some(&plugins))
            .context(error::ServersSnafu)?;

-        let servers = Services::new(opts, fe_instance.clone(), plugins.clone())
+        let servers = Services::new(opts, fe_instance.clone(), plugins)
            .build()
            .context(error::StartFrontendSnafu)?;

@@ -700,22 +673,12 @@ impl StartCommand {
            export_metrics_task,
        };

-        #[cfg(feature = "enterprise")]
-        let components = Components {
-            plugins,
-            kv_backend,
-            frontend_client,
-            catalog_manager,
-        };
-
        Ok(Instance {
            datanode,
            frontend,
            flownode,
            procedure_manager,
            wal_options_allocator,
-            #[cfg(feature = "enterprise")]
-            components,
            _guard: guard,
        })
    }
@@ -855,7 +818,7 @@ mod tests {
    use common_config::ENV_VAR_SEP;
    use common_test_util::temp_dir::create_named_temp_file;
    use common_wal::config::DatanodeWalConfig;
-    use object_store::config::{FileConfig, GcsConfig};
+    use datanode::config::{FileConfig, GcsConfig};

    use super::*;
    use crate::options::GlobalOptions;
@@ -974,15 +937,15 @@ mod tests {

        assert!(matches!(
            &dn_opts.storage.store,
-            object_store::config::ObjectStoreConfig::File(FileConfig { .. })
+            datanode::config::ObjectStoreConfig::File(FileConfig { .. })
        ));
        assert_eq!(dn_opts.storage.providers.len(), 2);
        assert!(matches!(
            dn_opts.storage.providers[0],
-            object_store::config::ObjectStoreConfig::Gcs(GcsConfig { .. })
+            datanode::config::ObjectStoreConfig::Gcs(GcsConfig { .. })
        ));
        match &dn_opts.storage.providers[1] {
-            object_store::config::ObjectStoreConfig::S3(s3_config) => {
+            datanode::config::ObjectStoreConfig::S3(s3_config) => {
                assert_eq!(
                    "SecretBox<alloc::string::String>([REDACTED])".to_string(),
                    format!("{:?}", s3_config.access_key_id)
--- a/src/cmd/tests/load_config_test.rs
+++ b/src/cmd/tests/load_config_test.rs
@@ -18,19 +18,17 @@ use cmd::options::GreptimeOptions;
 use cmd::standalone::StandaloneOptions;
 use common_config::{Configurable, DEFAULT_DATA_HOME};
 use common_options::datanode::{ClientOptions, DatanodeClientOptions};
-use common_telemetry::logging::{LoggingOptions, DEFAULT_LOGGING_DIR, DEFAULT_OTLP_HTTP_ENDPOINT};
+use common_telemetry::logging::{LoggingOptions, DEFAULT_LOGGING_DIR, DEFAULT_OTLP_ENDPOINT};
 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;
@@ -83,7 +81,7 @@ fn test_load_datanode_example_config() {
            logging: LoggingOptions {
                level: Some("info".to_string()),
                dir: format!("{}/{}", DEFAULT_DATA_HOME, DEFAULT_LOGGING_DIR),
-                otlp_endpoint: Some(DEFAULT_OTLP_HTTP_ENDPOINT.to_string()),
+                otlp_endpoint: Some(DEFAULT_OTLP_ENDPOINT.to_string()),
                tracing_sample_ratio: Some(Default::default()),
                ..Default::default()
            },
@@ -126,7 +124,7 @@ fn test_load_frontend_example_config() {
            logging: LoggingOptions {
                level: Some("info".to_string()),
                dir: format!("{}/{}", DEFAULT_DATA_HOME, DEFAULT_LOGGING_DIR),
-                otlp_endpoint: Some(DEFAULT_OTLP_HTTP_ENDPOINT.to_string()),
+                otlp_endpoint: Some(DEFAULT_OTLP_ENDPOINT.to_string()),
                tracing_sample_ratio: Some(Default::default()),
                ..Default::default()
            },
@@ -174,7 +172,7 @@ fn test_load_metasrv_example_config() {
            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_endpoint: Some(DEFAULT_OTLP_ENDPOINT.to_string()),
                tracing_sample_ratio: Some(Default::default()),
                ..Default::default()
            },
@@ -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");
@@ -282,7 +229,7 @@ fn test_load_standalone_example_config() {
            logging: LoggingOptions {
                level: Some("info".to_string()),
                dir: format!("{}/{}", DEFAULT_DATA_HOME, DEFAULT_LOGGING_DIR),
-                otlp_endpoint: Some(DEFAULT_OTLP_HTTP_ENDPOINT.to_string()),
+                otlp_endpoint: Some(DEFAULT_OTLP_ENDPOINT.to_string()),
                tracing_sample_ratio: Some(Default::default()),
                ..Default::default()
            },
--- 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/config/Cargo.toml
+++ b/src/common/config/Cargo.toml
@@ -14,7 +14,6 @@ common-macro.workspace = true
 config.workspace = true
 humantime-serde.workspace = true
 num_cpus.workspace = true
-object-store.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 serde_with.workspace = true
--- a/src/common/config/src/config.rs
+++ b/src/common/config/src/config.rs
@@ -106,7 +106,7 @@ mod tests {
    use common_telemetry::logging::LoggingOptions;
    use common_test_util::temp_dir::create_named_temp_file;
    use common_wal::config::DatanodeWalConfig;
-    use datanode::config::StorageConfig;
+    use datanode::config::{ObjectStoreConfig, StorageConfig};
    use meta_client::MetaClientOptions;
    use serde::{Deserialize, Serialize};

@@ -212,7 +212,7 @@ mod tests {

                // Check the configs from environment variables.
                match &opts.storage.store {
-                    object_store::config::ObjectStoreConfig::S3(s3_config) => {
+                    ObjectStoreConfig::S3(s3_config) => {
                        assert_eq!(s3_config.bucket, "mybucket".to_string());
                    }
                    _ => panic!("unexpected store type"),
--- 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/function/Cargo.toml
+++ b/src/common/function/Cargo.toml
@@ -33,7 +33,6 @@ common-version.workspace = true
 datafusion.workspace = true
 datafusion-common.workspace = true
 datafusion-expr.workspace = true
-datafusion-functions-aggregate-common.workspace = true
 datatypes.workspace = true
 derive_more = { version = "1", default-features = false, features = ["display"] }
 geo = { version = "0.29", optional = true }
--- a/src/common/function/src/aggrs.rs
+++ b/src/common/function/src/aggrs.rs
@@ -13,7 +13,6 @@
 // limitations under the License.

 pub mod approximate;
-pub mod count_hash;
 #[cfg(feature = "geo")]
 pub mod geo;
 pub mod vector;
--- a/src/common/function/src/aggrs/count_hash.rs
+++ b/src/common/function/src/aggrs/count_hash.rs
@@ -1,647 +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.
-
-//! `CountHash` / `count_hash` is a hash-based approximate distinct count function.
-//!
-//! It is a variant of `CountDistinct` that uses a hash function to approximate the
-//! distinct count.
-//! It is designed to be more efficient than `CountDistinct` for large datasets,
-//! but it is not as accurate, as the hash value may be collision.
-
-use std::collections::HashSet;
-use std::fmt::Debug;
-use std::sync::Arc;
-
-use ahash::RandomState;
-use datafusion_common::cast::as_list_array;
-use datafusion_common::error::Result;
-use datafusion_common::hash_utils::create_hashes;
-use datafusion_common::utils::SingleRowListArrayBuilder;
-use datafusion_common::{internal_err, not_impl_err, ScalarValue};
-use datafusion_expr::function::{AccumulatorArgs, StateFieldsArgs};
-use datafusion_expr::utils::{format_state_name, AggregateOrderSensitivity};
-use datafusion_expr::{
-    Accumulator, AggregateUDF, AggregateUDFImpl, EmitTo, GroupsAccumulator, ReversedUDAF,
-    SetMonotonicity, Signature, TypeSignature, Volatility,
-};
-use datafusion_functions_aggregate_common::aggregate::groups_accumulator::nulls::filtered_null_mask;
-use datatypes::arrow;
-use datatypes::arrow::array::{
-    Array, ArrayRef, AsArray, BooleanArray, Int64Array, ListArray, UInt64Array,
-};
-use datatypes::arrow::buffer::{OffsetBuffer, ScalarBuffer};
-use datatypes::arrow::datatypes::{DataType, Field};
-
-use crate::function_registry::FunctionRegistry;
-
-type HashValueType = u64;
-
-// read from /dev/urandom 4047821dc6144e4b2abddf23ad4171126a52eeecd26eff2191cf673b965a7875
-const RANDOM_SEED_0: u64 = 0x4047821dc6144e4b;
-const RANDOM_SEED_1: u64 = 0x2abddf23ad417112;
-const RANDOM_SEED_2: u64 = 0x6a52eeecd26eff21;
-const RANDOM_SEED_3: u64 = 0x91cf673b965a7875;
-
-impl CountHash {
-    pub fn register(registry: &FunctionRegistry) {
-        registry.register_aggr(CountHash::udf_impl());
-    }
-
-    pub fn udf_impl() -> AggregateUDF {
-        AggregateUDF::new_from_impl(CountHash {
-            signature: Signature::one_of(
-                vec![TypeSignature::VariadicAny, TypeSignature::Nullary],
-                Volatility::Immutable,
-            ),
-        })
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct CountHash {
-    signature: Signature,
-}
-
-impl AggregateUDFImpl for CountHash {
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        "count_hash"
-    }
-
-    fn signature(&self) -> &Signature {
-        &self.signature
-    }
-
-    fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType> {
-        Ok(DataType::Int64)
-    }
-
-    fn is_nullable(&self) -> bool {
-        false
-    }
-
-    fn state_fields(&self, args: StateFieldsArgs) -> Result<Vec<Field>> {
-        Ok(vec![Field::new_list(
-            format_state_name(args.name, "count_hash"),
-            Field::new_list_field(DataType::UInt64, true),
-            // For count_hash accumulator, null list item stands for an
-            // empty value set (i.e., all NULL value so far for that group).
-            true,
-        )])
-    }
-
-    fn accumulator(&self, acc_args: AccumulatorArgs) -> Result<Box<dyn Accumulator>> {
-        if acc_args.exprs.len() > 1 {
-            return not_impl_err!("count_hash with multiple arguments");
-        }
-
-        Ok(Box::new(CountHashAccumulator {
-            values: HashSet::default(),
-            random_state: RandomState::with_seeds(
-                RANDOM_SEED_0,
-                RANDOM_SEED_1,
-                RANDOM_SEED_2,
-                RANDOM_SEED_3,
-            ),
-            batch_hashes: vec![],
-        }))
-    }
-
-    fn aliases(&self) -> &[String] {
-        &[]
-    }
-
-    fn groups_accumulator_supported(&self, _args: AccumulatorArgs) -> bool {
-        true
-    }
-
-    fn create_groups_accumulator(
-        &self,
-        args: AccumulatorArgs,
-    ) -> Result<Box<dyn GroupsAccumulator>> {
-        if args.exprs.len() > 1 {
-            return not_impl_err!("count_hash with multiple arguments");
-        }
-
-        Ok(Box::new(CountHashGroupAccumulator::new()))
-    }
-
-    fn reverse_expr(&self) -> ReversedUDAF {
-        ReversedUDAF::Identical
-    }
-
-    fn order_sensitivity(&self) -> AggregateOrderSensitivity {
-        AggregateOrderSensitivity::Insensitive
-    }
-
-    fn default_value(&self, _data_type: &DataType) -> Result<ScalarValue> {
-        Ok(ScalarValue::Int64(Some(0)))
-    }
-
-    fn set_monotonicity(&self, _data_type: &DataType) -> SetMonotonicity {
-        SetMonotonicity::Increasing
-    }
-}
-
-/// GroupsAccumulator for `count_hash` aggregate function
-#[derive(Debug)]
-pub struct CountHashGroupAccumulator {
-    /// One HashSet per group to track distinct values
-    distinct_sets: Vec<HashSet<HashValueType, RandomState>>,
-    random_state: RandomState,
-    batch_hashes: Vec<HashValueType>,
-}
-
-impl Default for CountHashGroupAccumulator {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl CountHashGroupAccumulator {
-    pub fn new() -> Self {
-        Self {
-            distinct_sets: vec![],
-            random_state: RandomState::with_seeds(
-                RANDOM_SEED_0,
-                RANDOM_SEED_1,
-                RANDOM_SEED_2,
-                RANDOM_SEED_3,
-            ),
-            batch_hashes: vec![],
-        }
-    }
-
-    fn ensure_sets(&mut self, total_num_groups: usize) {
-        if self.distinct_sets.len() < total_num_groups {
-            self.distinct_sets
-                .resize_with(total_num_groups, HashSet::default);
-        }
-    }
-}
-
-impl GroupsAccumulator for CountHashGroupAccumulator {
-    fn update_batch(
-        &mut self,
-        values: &[ArrayRef],
-        group_indices: &[usize],
-        opt_filter: Option<&BooleanArray>,
-        total_num_groups: usize,
-    ) -> Result<()> {
-        assert_eq!(values.len(), 1, "count_hash expects a single argument");
-        self.ensure_sets(total_num_groups);
-
-        let array = &values[0];
-        self.batch_hashes.clear();
-        self.batch_hashes.resize(array.len(), 0);
-        let hashes = create_hashes(
-            &[ArrayRef::clone(array)],
-            &self.random_state,
-            &mut self.batch_hashes,
-        )?;
-
-        // Use a pattern similar to accumulate_indices to process rows
-        // that are not null and pass the filter
-        let nulls = array.logical_nulls();
-
-        match (nulls.as_ref(), opt_filter) {
-            (None, None) => {
-                // No nulls, no filter - process all rows
-                for (row_idx, &group_idx) in group_indices.iter().enumerate() {
-                    self.distinct_sets[group_idx].insert(hashes[row_idx]);
-                }
-            }
-            (Some(nulls), None) => {
-                // Has nulls, no filter
-                for (row_idx, (&group_idx, is_valid)) in
-                    group_indices.iter().zip(nulls.iter()).enumerate()
-                {
-                    if is_valid {
-                        self.distinct_sets[group_idx].insert(hashes[row_idx]);
-                    }
-                }
-            }
-            (None, Some(filter)) => {
-                // No nulls, has filter
-                for (row_idx, (&group_idx, filter_value)) in
-                    group_indices.iter().zip(filter.iter()).enumerate()
-                {
-                    if let Some(true) = filter_value {
-                        self.distinct_sets[group_idx].insert(hashes[row_idx]);
-                    }
-                }
-            }
-            (Some(nulls), Some(filter)) => {
-                // Has nulls and filter
-                let iter = filter
-                    .iter()
-                    .zip(group_indices.iter())
-                    .zip(nulls.iter())
-                    .enumerate();
-
-                for (row_idx, ((filter_value, &group_idx), is_valid)) in iter {
-                    if is_valid && filter_value == Some(true) {
-                        self.distinct_sets[group_idx].insert(hashes[row_idx]);
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn evaluate(&mut self, emit_to: EmitTo) -> Result<ArrayRef> {
-        let distinct_sets: Vec<HashSet<u64, RandomState>> =
-            emit_to.take_needed(&mut self.distinct_sets);
-
-        let counts = distinct_sets
-            .iter()
-            .map(|set| set.len() as i64)
-            .collect::<Vec<_>>();
-        Ok(Arc::new(Int64Array::from(counts)))
-    }
-
-    fn merge_batch(
-        &mut self,
-        values: &[ArrayRef],
-        group_indices: &[usize],
-        _opt_filter: Option<&BooleanArray>,
-        total_num_groups: usize,
-    ) -> Result<()> {
-        assert_eq!(
-            values.len(),
-            1,
-            "count_hash merge expects a single state array"
-        );
-        self.ensure_sets(total_num_groups);
-
-        let list_array = as_list_array(&values[0])?;
-
-        // For each group in the incoming batch
-        for (i, &group_idx) in group_indices.iter().enumerate() {
-            if i < list_array.len() {
-                let inner_array = list_array.value(i);
-                let inner_array = inner_array.as_any().downcast_ref::<UInt64Array>().unwrap();
-                // Add each value to our set for this group
-                for j in 0..inner_array.len() {
-                    if !inner_array.is_null(j) {
-                        self.distinct_sets[group_idx].insert(inner_array.value(j));
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn state(&mut self, emit_to: EmitTo) -> Result<Vec<ArrayRef>> {
-        let distinct_sets: Vec<HashSet<u64, RandomState>> =
-            emit_to.take_needed(&mut self.distinct_sets);
-
-        let mut offsets = Vec::with_capacity(distinct_sets.len() + 1);
-        offsets.push(0);
-        let mut curr_len = 0i32;
-
-        let mut value_iter = distinct_sets
-            .into_iter()
-            .flat_map(|set| {
-                // build offset
-                curr_len += set.len() as i32;
-                offsets.push(curr_len);
-                // convert into iter
-                set.into_iter()
-            })
-            .peekable();
-        let data_array: ArrayRef = if value_iter.peek().is_none() {
-            arrow::array::new_empty_array(&DataType::UInt64) as _
-        } else {
-            Arc::new(UInt64Array::from_iter_values(value_iter))
-        };
-        let offset_buffer = OffsetBuffer::new(ScalarBuffer::from(offsets));
-
-        let list_array = ListArray::new(
-            Arc::new(Field::new_list_field(DataType::UInt64, true)),
-            offset_buffer,
-            data_array,
-            None,
-        );
-
-        Ok(vec![Arc::new(list_array) as _])
-    }
-
-    fn convert_to_state(
-        &self,
-        values: &[ArrayRef],
-        opt_filter: Option<&BooleanArray>,
-    ) -> Result<Vec<ArrayRef>> {
-        // For a single hash value per row, create a list array with that value
-        assert_eq!(values.len(), 1, "count_hash expects a single argument");
-        let values = ArrayRef::clone(&values[0]);
-
-        let offsets = OffsetBuffer::new(ScalarBuffer::from_iter(0..values.len() as i32 + 1));
-        let nulls = filtered_null_mask(opt_filter, &values);
-        let list_array = ListArray::new(
-            Arc::new(Field::new_list_field(DataType::UInt64, true)),
-            offsets,
-            values,
-            nulls,
-        );
-
-        Ok(vec![Arc::new(list_array)])
-    }
-
-    fn supports_convert_to_state(&self) -> bool {
-        true
-    }
-
-    fn size(&self) -> usize {
-        // Base size of the struct
-        let mut size = size_of::<Self>();
-
-        // Size of the vector holding the HashSets
-        size += size_of::<Vec<HashSet<HashValueType, RandomState>>>()
-            + self.distinct_sets.capacity() * size_of::<HashSet<HashValueType, RandomState>>();
-
-        // Estimate HashSet contents size more efficiently
-        // Instead of iterating through all values which is expensive, use an approximation
-        for set in &self.distinct_sets {
-            // Base size of the HashSet
-            size += set.capacity() * size_of::<HashValueType>();
-        }
-
-        size
-    }
-}
-
-#[derive(Debug)]
-struct CountHashAccumulator {
-    values: HashSet<HashValueType, RandomState>,
-    random_state: RandomState,
-    batch_hashes: Vec<HashValueType>,
-}
-
-impl CountHashAccumulator {
-    // calculating the size for fixed length values, taking first batch size *
-    // number of batches.
-    fn fixed_size(&self) -> usize {
-        size_of_val(self) + (size_of::<HashValueType>() * self.values.capacity())
-    }
-}
-
-impl Accumulator for CountHashAccumulator {
-    /// Returns the distinct values seen so far as (one element) ListArray.
-    fn state(&mut self) -> Result<Vec<ScalarValue>> {
-        let values = self.values.iter().cloned().collect::<Vec<_>>();
-        let arr = Arc::new(UInt64Array::from(values)) as _;
-        let list_scalar = SingleRowListArrayBuilder::new(arr).build_list_scalar();
-        Ok(vec![list_scalar])
-    }
-
-    fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
-        if values.is_empty() {
-            return Ok(());
-        }
-
-        let arr = &values[0];
-        if arr.data_type() == &DataType::Null {
-            return Ok(());
-        }
-
-        self.batch_hashes.clear();
-        self.batch_hashes.resize(arr.len(), 0);
-        let hashes = create_hashes(
-            &[ArrayRef::clone(arr)],
-            &self.random_state,
-            &mut self.batch_hashes,
-        )?;
-        for hash in hashes.as_slice() {
-            self.values.insert(*hash);
-        }
-        Ok(())
-    }
-
-    /// Merges multiple sets of distinct values into the current set.
-    ///
-    /// The input to this function is a `ListArray` with **multiple** rows,
-    /// where each row contains the values from a partial aggregate's phase (e.g.
-    /// the result of calling `Self::state` on multiple accumulators).
-    fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
-        if states.is_empty() {
-            return Ok(());
-        }
-        assert_eq!(states.len(), 1, "array_agg states must be singleton!");
-        let array = &states[0];
-        let list_array = array.as_list::<i32>();
-        for inner_array in list_array.iter() {
-            let Some(inner_array) = inner_array else {
-                return internal_err!(
-                    "Intermediate results of count_hash should always be non null"
-                );
-            };
-            let hash_array = inner_array.as_any().downcast_ref::<UInt64Array>().unwrap();
-            for i in 0..hash_array.len() {
-                self.values.insert(hash_array.value(i));
-            }
-        }
-        Ok(())
-    }
-
-    fn evaluate(&mut self) -> Result<ScalarValue> {
-        Ok(ScalarValue::Int64(Some(self.values.len() as i64)))
-    }
-
-    fn size(&self) -> usize {
-        self.fixed_size()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use datatypes::arrow::array::{Array, BooleanArray, Int32Array, Int64Array};
-
-    use super::*;
-
-    fn create_test_accumulator() -> CountHashAccumulator {
-        CountHashAccumulator {
-            values: HashSet::default(),
-            random_state: RandomState::with_seeds(
-                RANDOM_SEED_0,
-                RANDOM_SEED_1,
-                RANDOM_SEED_2,
-                RANDOM_SEED_3,
-            ),
-            batch_hashes: vec![],
-        }
-    }
-
-    #[test]
-    fn test_count_hash_accumulator() -> Result<()> {
-        let mut acc = create_test_accumulator();
-
-        // Test with some data
-        let array = Arc::new(Int32Array::from(vec![
-            Some(1),
-            Some(2),
-            Some(3),
-            Some(1),
-            Some(2),
-            None,
-        ])) as ArrayRef;
-        acc.update_batch(&[array])?;
-        let result = acc.evaluate()?;
-        assert_eq!(result, ScalarValue::Int64(Some(4)));
-
-        // Test with empty data
-        let mut acc = create_test_accumulator();
-        let array = Arc::new(Int32Array::from(vec![] as Vec<Option<i32>>)) as ArrayRef;
-        acc.update_batch(&[array])?;
-        let result = acc.evaluate()?;
-        assert_eq!(result, ScalarValue::Int64(Some(0)));
-
-        // Test with only nulls
-        let mut acc = create_test_accumulator();
-        let array = Arc::new(Int32Array::from(vec![None, None, None])) as ArrayRef;
-        acc.update_batch(&[array])?;
-        let result = acc.evaluate()?;
-        assert_eq!(result, ScalarValue::Int64(Some(1)));
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_count_hash_accumulator_merge() -> Result<()> {
-        // Accumulator 1
-        let mut acc1 = create_test_accumulator();
-        let array1 = Arc::new(Int32Array::from(vec![Some(1), Some(2), Some(3)])) as ArrayRef;
-        acc1.update_batch(&[array1])?;
-        let state1 = acc1.state()?;
-
-        // Accumulator 2
-        let mut acc2 = create_test_accumulator();
-        let array2 = Arc::new(Int32Array::from(vec![Some(3), Some(4), Some(5)])) as ArrayRef;
-        acc2.update_batch(&[array2])?;
-        let state2 = acc2.state()?;
-
-        // Merge state1 and state2 into a new accumulator
-        let mut acc_merged = create_test_accumulator();
-        let state_array1 = state1[0].to_array()?;
-        let state_array2 = state2[0].to_array()?;
-
-        acc_merged.merge_batch(&[state_array1])?;
-        acc_merged.merge_batch(&[state_array2])?;
-
-        let result = acc_merged.evaluate()?;
-        // Distinct values are {1, 2, 3, 4, 5}, so count is 5
-        assert_eq!(result, ScalarValue::Int64(Some(5)));
-
-        Ok(())
-    }
-
-    fn create_test_group_accumulator() -> CountHashGroupAccumulator {
-        CountHashGroupAccumulator::new()
-    }
-
-    #[test]
-    fn test_count_hash_group_accumulator() -> Result<()> {
-        let mut acc = create_test_group_accumulator();
-        let values = Arc::new(Int32Array::from(vec![1, 2, 1, 3, 2, 4, 5])) as ArrayRef;
-        let group_indices = vec![0, 1, 0, 0, 1, 2, 0];
-        let total_num_groups = 3;
-
-        acc.update_batch(&[values], &group_indices, None, total_num_groups)?;
-
-        let result_array = acc.evaluate(EmitTo::All)?;
-        let result = result_array.as_any().downcast_ref::<Int64Array>().unwrap();
-
-        // Group 0: {1, 3, 5} -> 3
-        // Group 1: {2} -> 1
-        // Group 2: {4} -> 1
-        assert_eq!(result.value(0), 3);
-        assert_eq!(result.value(1), 1);
-        assert_eq!(result.value(2), 1);
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_count_hash_group_accumulator_with_filter() -> Result<()> {
-        let mut acc = create_test_group_accumulator();
-        let values = Arc::new(Int32Array::from(vec![1, 2, 3, 4, 5, 6])) as ArrayRef;
-        let group_indices = vec![0, 0, 1, 1, 2, 2];
-        let filter = BooleanArray::from(vec![true, false, true, true, false, true]);
-        let total_num_groups = 3;
-
-        acc.update_batch(&[values], &group_indices, Some(&filter), total_num_groups)?;
-
-        let result_array = acc.evaluate(EmitTo::All)?;
-        let result = result_array.as_any().downcast_ref::<Int64Array>().unwrap();
-
-        // Group 0: {1} (2 is filtered out) -> 1
-        // Group 1: {3, 4} -> 2
-        // Group 2: {6} (5 is filtered out) -> 1
-        assert_eq!(result.value(0), 1);
-        assert_eq!(result.value(1), 2);
-        assert_eq!(result.value(2), 1);
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_count_hash_group_accumulator_merge() -> Result<()> {
-        // Accumulator 1
-        let mut acc1 = create_test_group_accumulator();
-        let values1 = Arc::new(Int32Array::from(vec![1, 2, 3, 4])) as ArrayRef;
-        let group_indices1 = vec![0, 0, 1, 1];
-        acc1.update_batch(&[values1], &group_indices1, None, 2)?;
-        // acc1 state: group 0 -> {1, 2}, group 1 -> {3, 4}
-        let state1 = acc1.state(EmitTo::All)?;
-
-        // Accumulator 2
-        let mut acc2 = create_test_group_accumulator();
-        let values2 = Arc::new(Int32Array::from(vec![5, 6, 1, 3])) as ArrayRef;
-        // Merge into different group indices
-        let group_indices2 = vec![2, 2, 0, 1];
-        acc2.update_batch(&[values2], &group_indices2, None, 3)?;
-        // acc2 state: group 0 -> {1}, group 1 -> {3}, group 2 -> {5, 6}
-
-        // Merge state from acc1 into acc2
-        // We will merge acc1's group 0 into acc2's group 0
-        // and acc1's group 1 into acc2's group 2
-        let merge_group_indices = vec![0, 2];
-        acc2.merge_batch(&state1, &merge_group_indices, None, 3)?;
-
-        let result_array = acc2.evaluate(EmitTo::All)?;
-        let result = result_array.as_any().downcast_ref::<Int64Array>().unwrap();
-
-        // Final state of acc2:
-        // Group 0: {1} U {1, 2} -> {1, 2}, count = 2
-        // Group 1: {3}, count = 1
-        // Group 2: {5, 6} U {3, 4} -> {3, 4, 5, 6}, count = 4
-        assert_eq!(result.value(0), 2);
-        assert_eq!(result.value(1), 1);
-        assert_eq!(result.value(2), 4);
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_size() {
-        let acc = create_test_group_accumulator();
-        // Just test it doesn't crash and returns a value.
-        assert!(acc.size() > 0);
-    }
-}
--- a/src/common/function/src/function_registry.rs
+++ b/src/common/function/src/function_registry.rs
@@ -21,7 +21,6 @@ use once_cell::sync::Lazy;

 use crate::admin::AdminFunction;
 use crate::aggrs::approximate::ApproximateFunction;
-use crate::aggrs::count_hash::CountHash;
 use crate::aggrs::vector::VectorFunction as VectorAggrFunction;
 use crate::function::{AsyncFunctionRef, Function, FunctionRef};
 use crate::function_factory::ScalarFunctionFactory;
@@ -145,9 +144,6 @@ pub static FUNCTION_REGISTRY: Lazy<Arc<FunctionRegistry>> = Lazy::new(|| {
    // Approximate functions
    ApproximateFunction::register(&function_registry);

-    // CountHash function
-    CountHash::register(&function_registry);
-
    Arc::new(function_registry)
 });

--- 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/meta/src/ddl/alter_logical_tables.rs
+++ b/src/common/meta/src/ddl/alter_logical_tables.rs
@@ -27,18 +27,17 @@ 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::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::instruction::CacheIdent;
 use crate::key::table_info::TableInfoValue;
 use crate::key::table_route::PhysicalTableRouteValue;
@@ -138,13 +137,37 @@ impl AlterLogicalTablesProcedure {
            .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 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;
@@ -160,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(),
        )
--- a/src/common/meta/src/ddl/alter_table.rs
+++ b/src/common/meta/src/ddl/alter_table.rs
@@ -29,22 +29,19 @@ use common_procedure::{
    Context as ProcedureContext, ContextProvider, Error as ProcedureError, LockKey, PoisonKey,
    PoisonKeys, Procedure, ProcedureId, Status, StringKey,
 };
-use common_telemetry::{debug, 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::cache_invalidator::Context;
-use crate::ddl::physical_table_metadata::update_table_info_column_ids;
 use crate::ddl::utils::{
-    add_peer_context_if_needed, extract_column_metadatas, handle_multiple_results,
-    map_to_procedure_error, sync_follower_regions, MultipleResults,
+    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};
@@ -205,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) => {
@@ -223,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.
@@ -284,14 +268,10 @@ impl AlterTableProcedure {
            self.on_update_metadata_for_rename(new_table_name.to_string(), table_info_value)
                .await?;
        } else {
-            let mut raw_table_info = new_info.into();
-            if !self.data.column_metadatas.is_empty() {
-                update_table_info_column_ids(&mut raw_table_info, &self.data.column_metadatas);
-            }
            // 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(
-                raw_table_info,
+                new_info.into(),
                region_distribution,
                table_info_value,
            )
@@ -338,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]
@@ -410,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.
@@ -424,7 +392,6 @@ impl AlterTableData {
            state: AlterTableState::Prepare,
            task,
            table_id,
-            column_metadatas: vec![],
            table_info_value: None,
            region_distribution: None,
        }
@@ -443,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/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_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_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::physical_table_metadata::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/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
@@ -122,7 +122,6 @@ impl TableMetadataAllocator {
        );

        let peers = self.peer_allocator.alloc(regions).await?;
-        debug!("Allocated peers {:?} for table {}", peers, table_id);
        let region_routes = task
            .partitions
            .iter()
--- a/src/common/meta/src/ddl/test_util.rs
+++ b/src/common/meta/src/ddl/test_util.rs
@@ -24,14 +24,7 @@ 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;
@@ -153,7 +146,6 @@ pub fn test_create_logical_table_task(name: &str) -> CreateTableTask {
    }
 }

-/// 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([
@@ -190,95 +182,3 @@ pub fn test_create_physical_table_task(name: &str) -> CreateTableTask {
        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
@@ -132,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,
    }
--- 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};
@@ -34,7 +32,6 @@ impl MockDatanodeHandler for () {
        Ok(RegionResponse {
            affected_rows: 0,
            extensions: Default::default(),
-            metadata: Vec::new(),
        })
    }

@@ -47,13 +44,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 +60,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 +75,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::{Partition, 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([
@@ -296,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(),
@@ -311,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
@@ -29,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};
@@ -38,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;
@@ -315,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<()> {
@@ -344,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()
@@ -431,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_manager.rs
+++ b/src/common/meta/src/ddl_manager.rs
@@ -50,11 +50,7 @@ use crate::key::{DeserializedValueWithBytes, TableMetadataManagerRef};
 #[cfg(feature = "enterprise")]
 use crate::rpc::ddl::trigger::CreateTriggerTask;
 #[cfg(feature = "enterprise")]
-use crate::rpc::ddl::trigger::DropTriggerTask;
-#[cfg(feature = "enterprise")]
 use crate::rpc::ddl::DdlTask::CreateTrigger;
-#[cfg(feature = "enterprise")]
-use crate::rpc::ddl::DdlTask::DropTrigger;
 use crate::rpc::ddl::DdlTask::{
    AlterDatabase, AlterLogicalTables, AlterTable, CreateDatabase, CreateFlow, CreateLogicalTables,
    CreateTable, CreateView, DropDatabase, DropFlow, DropLogicalTables, DropTable, DropView,
@@ -95,14 +91,6 @@ pub trait TriggerDdlManager: Send + Sync {
        query_context: QueryContext,
    ) -> Result<SubmitDdlTaskResponse>;

-    async fn drop_trigger(
-        &self,
-        drop_trigger_task: DropTriggerTask,
-        procedure_manager: ProcedureManagerRef,
-        ddl_context: DdlContext,
-        query_context: QueryContext,
-    ) -> Result<SubmitDdlTaskResponse>;
-
    fn as_any(&self) -> &dyn std::any::Any;
 }

@@ -660,28 +648,6 @@ async fn handle_drop_flow_task(
    })
 }

-#[cfg(feature = "enterprise")]
-async fn handle_drop_trigger_task(
-    ddl_manager: &DdlManager,
-    drop_trigger_task: DropTriggerTask,
-    query_context: QueryContext,
-) -> Result<SubmitDdlTaskResponse> {
-    let Some(m) = ddl_manager.trigger_ddl_manager.as_ref() else {
-        return UnsupportedSnafu {
-            operation: "drop trigger",
-        }
-        .fail();
-    };
-
-    m.drop_trigger(
-        drop_trigger_task,
-        ddl_manager.procedure_manager.clone(),
-        ddl_manager.ddl_context.clone(),
-        query_context,
-    )
-    .await
-}
-
 async fn handle_drop_view_task(
    ddl_manager: &DdlManager,
    drop_view_task: DropViewTask,
@@ -869,11 +835,6 @@ impl ProcedureExecutor for DdlManager {
                    handle_create_flow_task(self, create_flow_task, request.query_context.into())
                        .await
                }
-                DropFlow(drop_flow_task) => handle_drop_flow_task(self, drop_flow_task).await,
-                CreateView(create_view_task) => {
-                    handle_create_view_task(self, create_view_task).await
-                }
-                DropView(drop_view_task) => handle_drop_view_task(self, drop_view_task).await,
                #[cfg(feature = "enterprise")]
                CreateTrigger(create_trigger_task) => {
                    handle_create_trigger_task(
@@ -883,11 +844,11 @@ impl ProcedureExecutor for DdlManager {
                    )
                    .await
                }
-                #[cfg(feature = "enterprise")]
-                DropTrigger(drop_trigger_task) => {
-                    handle_drop_trigger_task(self, drop_trigger_task, request.query_context.into())
-                        .await
+                DropFlow(drop_flow_task) => handle_drop_flow_task(self, drop_flow_task).await,
+                CreateView(create_view_task) => {
+                    handle_create_view_task(self, create_view_task).await
                }
+                DropView(drop_view_task) => handle_drop_view_task(self, drop_view_task).await,
            }
        }
        .trace(span)
@@ -995,7 +956,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_route.rs
+++ b/src/common/meta/src/key/table_route.rs
@@ -48,11 +48,6 @@ impl TableRouteKey {
    pub fn new(table_id: TableId) -> Self {
        Self { table_id }
    }
-
-    /// Returns the range prefix of the table route key.
-    pub fn range_prefix() -> Vec<u8> {
-        format!("{}/", TABLE_ROUTE_PREFIX).into_bytes()
-    }
 }

 #[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
--- a/src/common/meta/src/rpc/ddl.rs
+++ b/src/common/meta/src/rpc/ddl.rs
@@ -69,8 +69,6 @@ pub enum DdlTask {
    AlterDatabase(AlterDatabaseTask),
    CreateFlow(CreateFlowTask),
    DropFlow(DropFlowTask),
-    #[cfg(feature = "enterprise")]
-    DropTrigger(trigger::DropTriggerTask),
    CreateView(CreateViewTask),
    DropView(DropViewTask),
    #[cfg(feature = "enterprise")]
@@ -261,18 +259,6 @@ impl TryFrom<Task> for DdlTask {
                    .fail()
                }
            }
-            Task::DropTriggerTask(drop_trigger) => {
-                #[cfg(feature = "enterprise")]
-                return Ok(DdlTask::DropTrigger(drop_trigger.try_into()?));
-                #[cfg(not(feature = "enterprise"))]
-                {
-                    let _ = drop_trigger;
-                    crate::error::UnsupportedSnafu {
-                        operation: "drop trigger",
-                    }
-                    .fail()
-                }
-            }
        }
    }
 }
@@ -325,8 +311,6 @@ impl TryFrom<SubmitDdlTaskRequest> for PbDdlTaskRequest {
            DdlTask::DropView(task) => Task::DropViewTask(task.into()),
            #[cfg(feature = "enterprise")]
            DdlTask::CreateTrigger(task) => Task::CreateTriggerTask(task.into()),
-            #[cfg(feature = "enterprise")]
-            DdlTask::DropTrigger(task) => Task::DropTriggerTask(task.into()),
        };

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

        // construct RawTableInfo
--- a/src/common/meta/src/rpc/ddl/trigger.rs
+++ b/src/common/meta/src/rpc/ddl/trigger.rs
@@ -1,13 +1,10 @@
 use std::collections::HashMap;
 use std::time::Duration;

-use api::v1::meta::{
-    CreateTriggerTask as PbCreateTriggerTask, DropTriggerTask as PbDropTriggerTask,
-};
+use api::v1::meta::CreateTriggerTask as PbCreateTriggerTask;
 use api::v1::notify_channel::ChannelType as PbChannelType;
 use api::v1::{
-    CreateTriggerExpr as PbCreateTriggerExpr, DropTriggerExpr as PbDropTriggerExpr,
-    NotifyChannel as PbNotifyChannel, WebhookOptions as PbWebhookOptions,
+    CreateTriggerExpr, NotifyChannel as PbNotifyChannel, WebhookOptions as PbWebhookOptions,
 };
 use serde::{Deserialize, Serialize};
 use snafu::OptionExt;
@@ -59,7 +56,7 @@ impl From<CreateTriggerTask> for PbCreateTriggerTask {
            .map(PbNotifyChannel::from)
            .collect();

-        let expr = PbCreateTriggerExpr {
+        let expr = CreateTriggerExpr {
            catalog_name: task.catalog_name,
            trigger_name: task.trigger_name,
            create_if_not_exists: task.if_not_exists,
@@ -142,86 +139,17 @@ impl TryFrom<PbNotifyChannel> for NotifyChannel {
    }
 }

-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct DropTriggerTask {
-    pub catalog_name: String,
-    pub trigger_name: String,
-    pub drop_if_exists: bool,
-}
-
-impl From<DropTriggerTask> for PbDropTriggerTask {
-    fn from(task: DropTriggerTask) -> Self {
-        let expr = PbDropTriggerExpr {
-            catalog_name: task.catalog_name,
-            trigger_name: task.trigger_name,
-            drop_if_exists: task.drop_if_exists,
-        };
-
-        PbDropTriggerTask {
-            drop_trigger: Some(expr),
-        }
-    }
-}
-
-impl TryFrom<PbDropTriggerTask> for DropTriggerTask {
-    type Error = error::Error;
-
-    fn try_from(task: PbDropTriggerTask) -> Result<Self> {
-        let expr = task.drop_trigger.context(error::InvalidProtoMsgSnafu {
-            err_msg: "expected drop_trigger",
-        })?;
-
-        Ok(DropTriggerTask {
-            catalog_name: expr.catalog_name,
-            trigger_name: expr.trigger_name,
-            drop_if_exists: expr.drop_if_exists,
-        })
-    }
-}
-
 impl DdlTask {
    /// Creates a [`DdlTask`] to create a trigger.
    pub fn new_create_trigger(expr: CreateTriggerTask) -> Self {
        DdlTask::CreateTrigger(expr)
    }
-
-    /// Creates a [`DdlTask`] to drop a trigger.
-    pub fn new_drop_trigger(expr: DropTriggerTask) -> Self {
-        DdlTask::DropTrigger(expr)
-    }
 }

 #[cfg(test)]
 mod tests {
    use super::*;

-    #[test]
-    fn test_convert_drop_trigger_task() {
-        let original = DropTriggerTask {
-            catalog_name: "test_catalog".to_string(),
-            trigger_name: "test_trigger".to_string(),
-            drop_if_exists: true,
-        };
-
-        let pb_task: PbDropTriggerTask = original.clone().into();
-
-        let expr = pb_task.drop_trigger.as_ref().unwrap();
-        assert_eq!(expr.catalog_name, "test_catalog");
-        assert_eq!(expr.trigger_name, "test_trigger");
-        assert!(expr.drop_if_exists);
-
-        let round_tripped = DropTriggerTask::try_from(pb_task).unwrap();
-
-        assert_eq!(original.catalog_name, round_tripped.catalog_name);
-        assert_eq!(original.trigger_name, round_tripped.trigger_name);
-        assert_eq!(original.drop_if_exists, round_tripped.drop_if_exists);
-
-        // Test invalid case where drop_trigger is None
-        let invalid_task = PbDropTriggerTask { drop_trigger: None };
-        let result = DropTriggerTask::try_from(invalid_task);
-        assert!(result.is_err());
-    }
-
    #[test]
    fn test_convert_create_trigger_task() {
        let original = CreateTriggerTask {
--- a/src/common/procedure/src/error.rs
+++ b/src/common/procedure/src/error.rs
@@ -28,19 +28,6 @@ use crate::PoisonKey;
 #[snafu(visibility(pub))]
 #[stack_trace_debug]
 pub enum Error {
-    #[snafu(display("Failed to check procedure manager status"))]
-    CheckStatus {
-        source: BoxedError,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Manager is pasued"))]
-    ManagerPasued {
-        #[snafu(implicit)]
-        location: Location,
-    },
-
    #[snafu(display(
        "Failed to execute procedure due to external error, clean poisons: {}",
        clean_poisons
@@ -259,8 +246,7 @@ impl ErrorExt for Error {
            | Error::ListState { source, .. }
            | Error::PutPoison { source, .. }
            | Error::DeletePoison { source, .. }
-            | Error::GetPoison { source, .. }
-            | Error::CheckStatus { source, .. } => source.status_code(),
+            | Error::GetPoison { source, .. } => source.status_code(),

            Error::ToJson { .. }
            | Error::DeleteState { .. }
@@ -273,8 +259,7 @@ impl ErrorExt for Error {

            Error::RetryTimesExceeded { .. }
            | Error::RollbackTimesExceeded { .. }
-            | Error::ManagerNotStart { .. }
-            | Error::ManagerPasued { .. } => StatusCode::IllegalState,
+            | Error::ManagerNotStart { .. } => StatusCode::IllegalState,

            Error::RollbackNotSupported { .. } => StatusCode::Unsupported,
            Error::LoaderConflict { .. } | Error::DuplicateProcedure { .. } => {
--- a/src/common/procedure/src/local.rs
+++ b/src/common/procedure/src/local.rs
@@ -22,7 +22,6 @@ use std::time::{Duration, Instant};

 use async_trait::async_trait;
 use backon::ExponentialBuilder;
-use common_error::ext::BoxedError;
 use common_runtime::{RepeatedTask, TaskFunction};
 use common_telemetry::tracing_context::{FutureExt, TracingContext};
 use common_telemetry::{error, info, tracing};
@@ -31,10 +30,9 @@ use tokio::sync::watch::{self, Receiver, Sender};
 use tokio::sync::{Mutex as TokioMutex, Notify};

 use crate::error::{
-    self, CheckStatusSnafu, DuplicateProcedureSnafu, Error, LoaderConflictSnafu,
-    ManagerNotStartSnafu, ManagerPasuedSnafu, PoisonKeyNotDefinedSnafu, ProcedureNotFoundSnafu,
-    Result, StartRemoveOutdatedMetaTaskSnafu, StopRemoveOutdatedMetaTaskSnafu,
-    TooManyRunningProceduresSnafu,
+    self, DuplicateProcedureSnafu, Error, LoaderConflictSnafu, ManagerNotStartSnafu,
+    PoisonKeyNotDefinedSnafu, ProcedureNotFoundSnafu, Result, StartRemoveOutdatedMetaTaskSnafu,
+    StopRemoveOutdatedMetaTaskSnafu, TooManyRunningProceduresSnafu,
 };
 use crate::local::runner::Runner;
 use crate::procedure::{BoxedProcedureLoader, InitProcedureState, PoisonKeys, ProcedureInfo};
@@ -524,14 +522,6 @@ impl Default for ManagerConfig {
    }
 }

-type PauseAwareRef = Arc<dyn PauseAware>;
-
-#[async_trait]
-pub trait PauseAware: Send + Sync {
-    /// Returns true if the procedure manager is paused.
-    async fn is_paused(&self) -> std::result::Result<bool, BoxedError>;
-}
-
 /// A [ProcedureManager] that maintains procedure states locally.
 pub struct LocalManager {
    manager_ctx: Arc<ManagerContext>,
@@ -541,7 +531,6 @@ pub struct LocalManager {
    /// GC task.
    remove_outdated_meta_task: TokioMutex<Option<RepeatedTask<Error>>>,
    config: ManagerConfig,
-    pause_aware: Option<PauseAwareRef>,
 }

 impl LocalManager {
@@ -550,7 +539,6 @@ impl LocalManager {
        config: ManagerConfig,
        state_store: StateStoreRef,
        poison_store: PoisonStoreRef,
-        pause_aware: Option<PauseAwareRef>,
    ) -> LocalManager {
        let manager_ctx = Arc::new(ManagerContext::new(poison_store));

@@ -561,7 +549,6 @@ impl LocalManager {
            retry_delay: config.retry_delay,
            remove_outdated_meta_task: TokioMutex::new(None),
            config,
-            pause_aware,
        }
    }

@@ -732,17 +719,6 @@ impl LocalManager {
        let loaders = self.manager_ctx.loaders.lock().unwrap();
        loaders.contains_key(name)
    }
-
-    async fn check_status(&self) -> Result<()> {
-        if let Some(pause_aware) = self.pause_aware.as_ref() {
-            ensure!(
-                !pause_aware.is_paused().await.context(CheckStatusSnafu)?,
-                ManagerPasuedSnafu
-            );
-        }
-
-        Ok(())
-    }
 }

 #[async_trait]
@@ -798,7 +774,6 @@ impl ProcedureManager for LocalManager {
            !self.manager_ctx.contains_procedure(procedure_id),
            DuplicateProcedureSnafu { procedure_id }
        );
-        self.check_status().await?;

        self.submit_root(
            procedure.id,
@@ -1004,7 +979,7 @@ mod tests {
        };
        let state_store = Arc::new(ObjectStateStore::new(test_util::new_object_store(&dir)));
        let poison_manager = Arc::new(InMemoryPoisonStore::new());
-        let manager = LocalManager::new(config, state_store, poison_manager, None);
+        let manager = LocalManager::new(config, state_store, poison_manager);
        manager.manager_ctx.start();

        manager
@@ -1029,7 +1004,7 @@ mod tests {
        };
        let state_store = Arc::new(ObjectStateStore::new(object_store.clone()));
        let poison_manager = Arc::new(InMemoryPoisonStore::new());
-        let manager = LocalManager::new(config, state_store, poison_manager, None);
+        let manager = LocalManager::new(config, state_store, poison_manager);
        manager.manager_ctx.start();

        manager
@@ -1083,7 +1058,7 @@ mod tests {
        };
        let state_store = Arc::new(ObjectStateStore::new(test_util::new_object_store(&dir)));
        let poison_manager = Arc::new(InMemoryPoisonStore::new());
-        let manager = LocalManager::new(config, state_store, poison_manager, None);
+        let manager = LocalManager::new(config, state_store, poison_manager);
        manager.manager_ctx.start();

        let procedure_id = ProcedureId::random();
@@ -1135,7 +1110,7 @@ mod tests {
        };
        let state_store = Arc::new(ObjectStateStore::new(test_util::new_object_store(&dir)));
        let poison_manager = Arc::new(InMemoryPoisonStore::new());
-        let manager = LocalManager::new(config, state_store, poison_manager, None);
+        let manager = LocalManager::new(config, state_store, poison_manager);
        manager.manager_ctx.start();

        #[derive(Debug)]
@@ -1216,7 +1191,7 @@ mod tests {
        };
        let state_store = Arc::new(ObjectStateStore::new(test_util::new_object_store(&dir)));
        let poison_manager = Arc::new(InMemoryPoisonStore::new());
-        let manager = LocalManager::new(config, state_store, poison_manager, None);
+        let manager = LocalManager::new(config, state_store, poison_manager);

        let mut procedure = ProcedureToLoad::new("submit");
        procedure.lock_key = LockKey::single_exclusive("test.submit");
@@ -1244,7 +1219,7 @@ mod tests {
        };
        let state_store = Arc::new(ObjectStateStore::new(test_util::new_object_store(&dir)));
        let poison_manager = Arc::new(InMemoryPoisonStore::new());
-        let manager = LocalManager::new(config, state_store, poison_manager, None);
+        let manager = LocalManager::new(config, state_store, poison_manager);

        manager.start().await.unwrap();
        manager.stop().await.unwrap();
@@ -1281,7 +1256,7 @@ mod tests {
        };
        let state_store = Arc::new(ObjectStateStore::new(object_store.clone()));
        let poison_manager = Arc::new(InMemoryPoisonStore::new());
-        let manager = LocalManager::new(config, state_store, poison_manager, None);
+        let manager = LocalManager::new(config, state_store, poison_manager);
        manager.manager_ctx.set_running();

        let mut procedure = ProcedureToLoad::new("submit");
@@ -1363,7 +1338,7 @@ mod tests {
        };
        let state_store = Arc::new(ObjectStateStore::new(test_util::new_object_store(&dir)));
        let poison_manager = Arc::new(InMemoryPoisonStore::new());
-        let manager = LocalManager::new(config, state_store, poison_manager, None);
+        let manager = LocalManager::new(config, state_store, poison_manager);
        manager.manager_ctx.set_running();

        manager
@@ -1488,7 +1463,7 @@ mod tests {
        };
        let state_store = Arc::new(ObjectStateStore::new(object_store.clone()));
        let poison_manager = Arc::new(InMemoryPoisonStore::new());
-        let manager = LocalManager::new(config, state_store, poison_manager, None);
+        let manager = LocalManager::new(config, state_store, poison_manager);
        manager.manager_ctx.start();

        let notify = Arc::new(Notify::new());
--- a/src/common/procedure/src/watcher.rs
+++ b/src/common/procedure/src/watcher.rs
@@ -83,7 +83,7 @@ mod tests {
        };
        let state_store = Arc::new(ObjectStateStore::new(test_util::new_object_store(&dir)));
        let poison_manager = Arc::new(InMemoryPoisonStore::default());
-        let manager = LocalManager::new(config, state_store, poison_manager, None);
+        let manager = LocalManager::new(config, state_store, poison_manager);
        manager.start().await.unwrap();

        #[derive(Debug)]
--- a/src/common/query/src/lib.rs
+++ b/src/common/query/src/lib.rs
@@ -14,7 +14,7 @@

 pub mod columnar_value;
 pub mod error;
-pub mod function;
+mod function;
 pub mod logical_plan;
 pub mod prelude;
 pub mod request;
--- a/src/common/sql/Cargo.toml
+++ b/src/common/sql/Cargo.toml
@@ -1,22 +0,0 @@
-[package]
-name = "common-sql"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-common-base.workspace = true
-common-datasource.workspace = true
-common-decimal.workspace = true
-common-error.workspace = true
-common-macro.workspace = true
-common-time.workspace = true
-datafusion-sql.workspace = true
-datatypes.workspace = true
-hex = "0.4"
-jsonb.workspace = true
-snafu.workspace = true
-sqlparser.workspace = true
-
-[lints]
-workspace = true
--- a/src/common/sql/src/convert.rs
+++ b/src/common/sql/src/convert.rs
--- a/src/common/sql/src/default_constraint.rs
+++ b/src/common/sql/src/default_constraint.rs
@@ -1,182 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use common_time::timezone::Timezone;
-use datatypes::prelude::ConcreteDataType;
-use datatypes::schema::constraint::{CURRENT_TIMESTAMP, CURRENT_TIMESTAMP_FN};
-use datatypes::schema::ColumnDefaultConstraint;
-pub use sqlparser::ast::{
-    visit_expressions_mut, visit_statements_mut, BinaryOperator, ColumnDef, ColumnOption,
-    ColumnOptionDef, DataType, Expr, Function, FunctionArg, FunctionArgExpr, FunctionArguments,
-    Ident, ObjectName, SqlOption, TableConstraint, TimezoneInfo, UnaryOperator, Value as SqlValue,
-    Visit, VisitMut, Visitor, VisitorMut,
-};
-
-use crate::convert::{sql_number_to_value, sql_value_to_value};
-use crate::error::{Result, UnsupportedDefaultValueSnafu};
-
-pub fn parse_column_default_constraint(
-    column_name: &str,
-    data_type: &ConcreteDataType,
-    opts: &[ColumnOptionDef],
-    timezone: Option<&Timezone>,
-) -> Result<Option<ColumnDefaultConstraint>> {
-    if let Some(opt) = opts
-        .iter()
-        .find(|o| matches!(o.option, ColumnOption::Default(_)))
-    {
-        let default_constraint = match &opt.option {
-            ColumnOption::Default(Expr::Value(v)) => ColumnDefaultConstraint::Value(
-                sql_value_to_value(column_name, data_type, v, timezone, None, false)?,
-            ),
-            ColumnOption::Default(Expr::Function(func)) => {
-                let mut func = format!("{func}").to_lowercase();
-                // normalize CURRENT_TIMESTAMP to CURRENT_TIMESTAMP()
-                if func == CURRENT_TIMESTAMP {
-                    func = CURRENT_TIMESTAMP_FN.to_string();
-                }
-                // Always use lowercase for function expression
-                ColumnDefaultConstraint::Function(func.to_lowercase())
-            }
-
-            ColumnOption::Default(Expr::UnaryOp { op, expr }) => {
-                // Specialized process for handling numerical inputs to prevent
-                // overflow errors during the parsing of negative numbers,
-                // See https://github.com/GreptimeTeam/greptimedb/issues/4351
-                if let (UnaryOperator::Minus, Expr::Value(SqlValue::Number(n, _))) =
-                    (op, expr.as_ref())
-                {
-                    return Ok(Some(ColumnDefaultConstraint::Value(sql_number_to_value(
-                        data_type,
-                        &format!("-{n}"),
-                    )?)));
-                }
-
-                if let Expr::Value(v) = &**expr {
-                    let value =
-                        sql_value_to_value(column_name, data_type, v, timezone, Some(*op), false)?;
-                    ColumnDefaultConstraint::Value(value)
-                } else {
-                    return UnsupportedDefaultValueSnafu {
-                        column_name,
-                        expr: *expr.clone(),
-                    }
-                    .fail();
-                }
-            }
-            ColumnOption::Default(others) => {
-                return UnsupportedDefaultValueSnafu {
-                    column_name,
-                    expr: others.clone(),
-                }
-                .fail();
-            }
-            _ => {
-                return UnsupportedDefaultValueSnafu {
-                    column_name,
-                    expr: Expr::Value(SqlValue::Null),
-                }
-                .fail();
-            }
-        };
-
-        Ok(Some(default_constraint))
-    } else {
-        Ok(None)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::assert_matches::assert_matches;
-
-    use datatypes::prelude::{ConcreteDataType, Value};
-    use datatypes::types::BooleanType;
-
-    use super::*;
-
-    #[test]
-    pub fn test_parse_column_default_constraint() {
-        let bool_value = sqlparser::ast::Value::Boolean(true);
-
-        let opts = vec![
-            ColumnOptionDef {
-                name: None,
-                option: ColumnOption::Default(Expr::Value(bool_value)),
-            },
-            ColumnOptionDef {
-                name: None,
-                option: ColumnOption::NotNull,
-            },
-        ];
-
-        let constraint = parse_column_default_constraint(
-            "coll",
-            &ConcreteDataType::Boolean(BooleanType),
-            &opts,
-            None,
-        )
-        .unwrap();
-
-        assert_matches!(
-            constraint,
-            Some(ColumnDefaultConstraint::Value(Value::Boolean(true)))
-        );
-
-        // Test negative number
-        let opts = vec![ColumnOptionDef {
-            name: None,
-            option: ColumnOption::Default(Expr::UnaryOp {
-                op: UnaryOperator::Minus,
-                expr: Box::new(Expr::Value(SqlValue::Number("32768".to_string(), false))),
-            }),
-        }];
-
-        let constraint = parse_column_default_constraint(
-            "coll",
-            &ConcreteDataType::int16_datatype(),
-            &opts,
-            None,
-        )
-        .unwrap();
-
-        assert_matches!(
-            constraint,
-            Some(ColumnDefaultConstraint::Value(Value::Int16(-32768)))
-        );
-    }
-
-    #[test]
-    fn test_incorrect_default_value_issue_3479() {
-        let opts = vec![ColumnOptionDef {
-            name: None,
-            option: ColumnOption::Default(Expr::Value(SqlValue::Number(
-                "0.047318541668048164".into(),
-                false,
-            ))),
-        }];
-        let constraint = parse_column_default_constraint(
-            "coll",
-            &ConcreteDataType::float64_datatype(),
-            &opts,
-            None,
-        )
-        .unwrap()
-        .unwrap();
-        assert_eq!("0.047318541668048164", constraint.to_string());
-        let encoded: Vec<u8> = constraint.clone().try_into().unwrap();
-        let decoded = ColumnDefaultConstraint::try_from(encoded.as_ref()).unwrap();
-        assert_eq!(decoded, constraint);
-    }
-}
--- a/src/common/sql/src/error.rs
+++ b/src/common/sql/src/error.rs
@@ -1,158 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::any::Any;
-
-use common_error::ext::ErrorExt;
-use common_error::status_code::StatusCode;
-use common_macro::stack_trace_debug;
-use common_time::timestamp::TimeUnit;
-use common_time::Timestamp;
-use datafusion_sql::sqlparser::ast::UnaryOperator;
-use datatypes::prelude::{ConcreteDataType, Value};
-use snafu::{Location, Snafu};
-pub use sqlparser::ast::{Expr, Value as SqlValue};
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-/// SQL parser errors.
-// Now the error in parser does not contain backtrace to avoid generating backtrace
-// every time the parser parses an invalid SQL.
-#[derive(Snafu)]
-#[snafu(visibility(pub))]
-#[stack_trace_debug]
-pub enum Error {
-    #[snafu(display(
-        "Column {} expect type: {:?}, actual: {:?}",
-        column_name,
-        expect,
-        actual,
-    ))]
-    ColumnTypeMismatch {
-        column_name: String,
-        expect: ConcreteDataType,
-        actual: ConcreteDataType,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Failed to parse value: {}", msg))]
-    ParseSqlValue {
-        msg: String,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display(
-        "Unsupported expr in default constraint: {:?} for column: {}",
-        expr,
-        column_name
-    ))]
-    UnsupportedDefaultValue {
-        column_name: String,
-        expr: Expr,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Unable to convert sql value {} to datatype {:?}", value, datatype))]
-    ConvertSqlValue {
-        value: SqlValue,
-        datatype: ConcreteDataType,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Invalid sql value: {}", value))]
-    InvalidSqlValue {
-        value: String,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Unsupported unary operator {}", unary_op))]
-    UnsupportedUnaryOp {
-        unary_op: UnaryOperator,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Invalid unary operator {} for value {}", unary_op, value))]
-    InvalidUnaryOp {
-        unary_op: UnaryOperator,
-        value: Value,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Failed to cast SQL value {} to datatype {}", sql_value, datatype))]
-    InvalidCast {
-        sql_value: sqlparser::ast::Value,
-        datatype: ConcreteDataType,
-        #[snafu(implicit)]
-        location: Location,
-        source: datatypes::error::Error,
-    },
-
-    #[snafu(display("Unable to convert {} to datatype {:?}", value, datatype))]
-    ConvertStr {
-        value: String,
-        datatype: ConcreteDataType,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display(
-        "Converting timestamp {:?} to unit {:?} overflow",
-        timestamp,
-        target_unit
-    ))]
-    TimestampOverflow {
-        timestamp: Timestamp,
-        target_unit: TimeUnit,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Datatype error: {}", source))]
-    Datatype {
-        source: datatypes::error::Error,
-        #[snafu(implicit)]
-        location: Location,
-    },
-}
-
-impl ErrorExt for Error {
-    fn status_code(&self) -> StatusCode {
-        use Error::*;
-
-        match self {
-            UnsupportedDefaultValue { .. } => StatusCode::Unsupported,
-            ParseSqlValue { .. } => StatusCode::InvalidSyntax,
-            ColumnTypeMismatch { .. }
-            | InvalidSqlValue { .. }
-            | UnsupportedUnaryOp { .. }
-            | InvalidUnaryOp { .. }
-            | InvalidCast { .. }
-            | ConvertStr { .. }
-            | TimestampOverflow { .. } => StatusCode::InvalidArguments,
-            Datatype { source, .. } => source.status_code(),
-            ConvertSqlValue { .. } => StatusCode::Unsupported,
-        }
-    }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-}
--- a/src/common/sql/src/lib.rs
+++ b/src/common/sql/src/lib.rs
@@ -1,19 +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.
-
-#![feature(assert_matches)]
-
-pub mod convert;
-pub mod default_constraint;
-pub mod error;
--- a/src/common/telemetry/Cargo.toml
+++ b/src/common/telemetry/Cargo.toml
@@ -22,7 +22,7 @@ once_cell.workspace = true
 opentelemetry = { version = "0.21.0", default-features = false, features = [
    "trace",
 ] }
-opentelemetry-otlp = { version = "0.14.0", features = ["tokio", "http-proto", "reqwest-client"] }
+opentelemetry-otlp = { version = "0.14.0", features = ["tokio"] }
 opentelemetry-semantic-conventions = "0.13.0"
 opentelemetry_sdk = { version = "0.21.0", features = ["rt-tokio"] }
 parking_lot.workspace = true
--- a/src/common/telemetry/src/logging.rs
+++ b/src/common/telemetry/src/logging.rs
@@ -20,7 +20,7 @@ use std::time::Duration;

 use once_cell::sync::{Lazy, OnceCell};
 use opentelemetry::{global, KeyValue};
-use opentelemetry_otlp::{Protocol, SpanExporterBuilder, WithExportConfig};
+use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::propagation::TraceContextPropagator;
 use opentelemetry_sdk::trace::Sampler;
 use opentelemetry_semantic_conventions::resource;
@@ -36,11 +36,7 @@ use tracing_subscriber::{filter, EnvFilter, Registry};

 use crate::tracing_sampler::{create_sampler, TracingSampleOptions};

-/// The default endpoint when use gRPC exporter protocol.
-pub const DEFAULT_OTLP_GRPC_ENDPOINT: &str = "http://localhost:4317";
-
-/// The default endpoint when use HTTP exporter protocol.
-pub const DEFAULT_OTLP_HTTP_ENDPOINT: &str = "http://localhost:4318";
+pub const DEFAULT_OTLP_ENDPOINT: &str = "http://localhost:4317";

 /// The default logs directory.
 pub const DEFAULT_LOGGING_DIR: &str = "logs";
@@ -71,25 +67,11 @@ pub struct LoggingOptions {
    /// Whether to enable tracing with OTLP. Default is false.
    pub enable_otlp_tracing: bool,

-    /// The endpoint of OTLP. Default is "http://localhost:4318".
+    /// The endpoint of OTLP. Default is "http://localhost:4317".
    pub otlp_endpoint: Option<String>,

    /// The tracing sample ratio.
    pub tracing_sample_ratio: Option<TracingSampleOptions>,
-
-    /// The protocol of OTLP export.
-    pub otlp_export_protocol: Option<OtlpExportProtocol>,
-}
-
-/// The protocol of OTLP export.
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub enum OtlpExportProtocol {
-    /// GRPC protocol.
-    Grpc,
-
-    /// HTTP protocol with binary protobuf.
-    Http,
 }

 /// The options of slow query.
@@ -165,7 +147,6 @@ impl Default for LoggingOptions {
            append_stdout: true,
            // Rotation hourly, 24 files per day, keeps info log files of 30 days
            max_log_files: 720,
-            otlp_export_protocol: None,
        }
    }
 }
@@ -407,9 +388,22 @@ pub fn init_global_logging(
                    KeyValue::new(resource::PROCESS_PID, std::process::id().to_string()),
                ]));

+            let exporter = opentelemetry_otlp::new_exporter().tonic().with_endpoint(
+                opts.otlp_endpoint
+                    .as_ref()
+                    .map(|e| {
+                        if e.starts_with("http") {
+                            e.to_string()
+                        } else {
+                            format!("http://{}", e)
+                        }
+                    })
+                    .unwrap_or(DEFAULT_OTLP_ENDPOINT.to_string()),
+            );
+
            let tracer = opentelemetry_otlp::new_pipeline()
                .tracing()
-                .with_exporter(build_otlp_exporter(opts))
+                .with_exporter(exporter)
                .with_trace_config(trace_config)
                .install_batch(opentelemetry_sdk::runtime::Tokio)
                .expect("otlp tracer install failed");
@@ -427,42 +421,6 @@ pub fn init_global_logging(
    guards
 }

-fn build_otlp_exporter(opts: &LoggingOptions) -> SpanExporterBuilder {
-    let protocol = opts
-        .otlp_export_protocol
-        .clone()
-        .unwrap_or(OtlpExportProtocol::Http);
-
-    let endpoint = opts
-        .otlp_endpoint
-        .as_ref()
-        .map(|e| {
-            if e.starts_with("http") {
-                e.to_string()
-            } else {
-                format!("http://{}", e)
-            }
-        })
-        .unwrap_or_else(|| match protocol {
-            OtlpExportProtocol::Grpc => DEFAULT_OTLP_GRPC_ENDPOINT.to_string(),
-            OtlpExportProtocol::Http => DEFAULT_OTLP_HTTP_ENDPOINT.to_string(),
-        });
-
-    match protocol {
-        OtlpExportProtocol::Grpc => SpanExporterBuilder::Tonic(
-            opentelemetry_otlp::new_exporter()
-                .tonic()
-                .with_endpoint(endpoint),
-        ),
-        OtlpExportProtocol::Http => SpanExporterBuilder::Http(
-            opentelemetry_otlp::new_exporter()
-                .http()
-                .with_endpoint(endpoint)
-                .with_protocol(Protocol::HttpBinary),
-        ),
-    }
-}
-
 fn build_slow_query_logger<S>(
    opts: &LoggingOptions,
    slow_query_opts: Option<&SlowQueryOptions>,
--- a/src/datanode/src/alive_keeper.rs
+++ b/src/datanode/src/alive_keeper.rs
@@ -86,33 +86,26 @@ impl RegionAliveKeeper {
    /// Add the countdown task for a specific region.
    /// It will be ignored if the task exists.
    pub async fn register_region(&self, region_id: RegionId) {
+        if self.find_handle(region_id).await.is_some() {
+            return;
+        }
+
        let handle = Arc::new(CountdownTaskHandle::new(
            self.region_server.clone(),
            self.countdown_task_handler_ext.clone(),
            region_id,
        ));

-        let should_start = {
-            let mut handles = self.tasks.lock().await;
+        let mut handles = self.tasks.lock().await;
+        let _ = handles.insert(region_id, handle.clone());

-            // Check if already exists, return early if so
-            if handles.contains_key(&region_id) {
-                return;
-            }
-
-            // Insert new handle
-            handles.insert(region_id, handle.clone());
-
-            // Return whether we should start (check state inside lock)
-            self.started.load(Ordering::Relaxed)
-        };
-
-        if should_start {
+        if self.started.load(Ordering::Relaxed) {
            handle.start(self.heartbeat_interval_millis).await;
-            info!("Region alive countdown for region {region_id} is started!");
+
+            info!("Region alive countdown for region {region_id} is started!",);
        } else {
            info!(
-                "Region alive countdown for region {region_id} is registered but not started yet!"
+                "Region alive countdown for region {region_id} is registered but not started yet!",
            );
        }
    }
--- a/src/datanode/src/config.rs
+++ b/src/datanode/src/config.rs
@@ -14,7 +14,10 @@

 //! Datanode configurations

+use core::time::Duration;
+
 use common_base::readable_size::ReadableSize;
+use common_base::secrets::{ExposeSecret, SecretString};
 use common_config::{Configurable, DEFAULT_DATA_HOME};
 pub use common_procedure::options::ProcedureConfig;
 use common_telemetry::logging::{LoggingOptions, TracingOptions};
@@ -24,7 +27,6 @@ use file_engine::config::EngineConfig as FileEngineConfig;
 use meta_client::MetaClientOptions;
 use metric_engine::config::EngineConfig as MetricEngineConfig;
 use mito2::config::MitoConfig;
-pub(crate) use object_store::config::ObjectStoreConfig;
 use query::options::QueryOptions;
 use serde::{Deserialize, Serialize};
 use servers::export_metrics::ExportMetricsOption;
@@ -34,6 +36,53 @@ use servers::http::HttpOptions;

 pub const DEFAULT_OBJECT_STORE_CACHE_SIZE: ReadableSize = ReadableSize::gb(5);

+/// Object storage config
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[serde(tag = "type")]
+pub enum ObjectStoreConfig {
+    File(FileConfig),
+    S3(S3Config),
+    Oss(OssConfig),
+    Azblob(AzblobConfig),
+    Gcs(GcsConfig),
+}
+
+impl ObjectStoreConfig {
+    /// Returns the object storage type name, such as `S3`, `Oss` etc.
+    pub fn provider_name(&self) -> &'static str {
+        match self {
+            Self::File(_) => "File",
+            Self::S3(_) => "S3",
+            Self::Oss(_) => "Oss",
+            Self::Azblob(_) => "Azblob",
+            Self::Gcs(_) => "Gcs",
+        }
+    }
+
+    /// Returns true when it's a remote object storage such as AWS s3 etc.
+    pub fn is_object_storage(&self) -> bool {
+        !matches!(self, Self::File(_))
+    }
+
+    /// Returns the object storage configuration name, return the provider name if it's empty.
+    pub fn config_name(&self) -> &str {
+        let name = match self {
+            // file storage doesn't support name
+            Self::File(_) => self.provider_name(),
+            Self::S3(s3) => &s3.name,
+            Self::Oss(oss) => &oss.name,
+            Self::Azblob(az) => &az.name,
+            Self::Gcs(gcs) => &gcs.name,
+        };
+
+        if name.trim().is_empty() {
+            return self.provider_name();
+        }
+
+        name
+    }
+}
+
 /// Storage engine config
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 #[serde(default)]
@@ -63,6 +112,252 @@ impl Default for StorageConfig {
    }
 }

+#[derive(Debug, Clone, Serialize, Default, Deserialize, Eq, PartialEq)]
+#[serde(default)]
+pub struct FileConfig {}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
+#[serde(default)]
+pub struct ObjectStorageCacheConfig {
+    /// The local file cache directory
+    pub cache_path: Option<String>,
+    /// The cache capacity in bytes
+    pub cache_capacity: Option<ReadableSize>,
+}
+
+/// The http client options to the storage.
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[serde(default)]
+pub struct HttpClientConfig {
+    /// The maximum idle connection per host allowed in the pool.
+    pub(crate) pool_max_idle_per_host: u32,
+
+    /// The timeout for only the connect phase of a http client.
+    #[serde(with = "humantime_serde")]
+    pub(crate) connect_timeout: Duration,
+
+    /// The total request timeout, applied from when the request starts connecting until the response body has finished.
+    /// Also considered a total deadline.
+    #[serde(with = "humantime_serde")]
+    pub(crate) timeout: Duration,
+
+    /// The timeout for idle sockets being kept-alive.
+    #[serde(with = "humantime_serde")]
+    pub(crate) pool_idle_timeout: Duration,
+
+    /// Skip SSL certificate validation (insecure)
+    pub skip_ssl_validation: bool,
+}
+
+impl Default for HttpClientConfig {
+    fn default() -> Self {
+        Self {
+            pool_max_idle_per_host: 1024,
+            connect_timeout: Duration::from_secs(30),
+            timeout: Duration::from_secs(30),
+            pool_idle_timeout: Duration::from_secs(90),
+            skip_ssl_validation: false,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(default)]
+pub struct S3Config {
+    pub name: String,
+    pub bucket: String,
+    pub root: String,
+    #[serde(skip_serializing)]
+    pub access_key_id: SecretString,
+    #[serde(skip_serializing)]
+    pub secret_access_key: SecretString,
+    pub endpoint: Option<String>,
+    pub region: Option<String>,
+    /// Enable virtual host style so that opendal will send API requests in virtual host style instead of path style.
+    /// By default, opendal will send API to https://s3.us-east-1.amazonaws.com/bucket_name
+    /// Enabled, opendal will send API to https://bucket_name.s3.us-east-1.amazonaws.com
+    pub enable_virtual_host_style: bool,
+    #[serde(flatten)]
+    pub cache: ObjectStorageCacheConfig,
+    pub http_client: HttpClientConfig,
+}
+
+impl PartialEq for S3Config {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name
+            && self.bucket == other.bucket
+            && self.root == other.root
+            && self.access_key_id.expose_secret() == other.access_key_id.expose_secret()
+            && self.secret_access_key.expose_secret() == other.secret_access_key.expose_secret()
+            && self.endpoint == other.endpoint
+            && self.region == other.region
+            && self.enable_virtual_host_style == other.enable_virtual_host_style
+            && self.cache == other.cache
+            && self.http_client == other.http_client
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(default)]
+pub struct OssConfig {
+    pub name: String,
+    pub bucket: String,
+    pub root: String,
+    #[serde(skip_serializing)]
+    pub access_key_id: SecretString,
+    #[serde(skip_serializing)]
+    pub access_key_secret: SecretString,
+    pub endpoint: String,
+    #[serde(flatten)]
+    pub cache: ObjectStorageCacheConfig,
+    pub http_client: HttpClientConfig,
+}
+
+impl PartialEq for OssConfig {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name
+            && self.bucket == other.bucket
+            && self.root == other.root
+            && self.access_key_id.expose_secret() == other.access_key_id.expose_secret()
+            && self.access_key_secret.expose_secret() == other.access_key_secret.expose_secret()
+            && self.endpoint == other.endpoint
+            && self.cache == other.cache
+            && self.http_client == other.http_client
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(default)]
+pub struct AzblobConfig {
+    pub name: String,
+    pub container: String,
+    pub root: String,
+    #[serde(skip_serializing)]
+    pub account_name: SecretString,
+    #[serde(skip_serializing)]
+    pub account_key: SecretString,
+    pub endpoint: String,
+    pub sas_token: Option<String>,
+    #[serde(flatten)]
+    pub cache: ObjectStorageCacheConfig,
+    pub http_client: HttpClientConfig,
+}
+
+impl PartialEq for AzblobConfig {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name
+            && self.container == other.container
+            && self.root == other.root
+            && self.account_name.expose_secret() == other.account_name.expose_secret()
+            && self.account_key.expose_secret() == other.account_key.expose_secret()
+            && self.endpoint == other.endpoint
+            && self.sas_token == other.sas_token
+            && self.cache == other.cache
+            && self.http_client == other.http_client
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(default)]
+pub struct GcsConfig {
+    pub name: String,
+    pub root: String,
+    pub bucket: String,
+    pub scope: String,
+    #[serde(skip_serializing)]
+    pub credential_path: SecretString,
+    #[serde(skip_serializing)]
+    pub credential: SecretString,
+    pub endpoint: String,
+    #[serde(flatten)]
+    pub cache: ObjectStorageCacheConfig,
+    pub http_client: HttpClientConfig,
+}
+
+impl PartialEq for GcsConfig {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name
+            && self.root == other.root
+            && self.bucket == other.bucket
+            && self.scope == other.scope
+            && self.credential_path.expose_secret() == other.credential_path.expose_secret()
+            && self.credential.expose_secret() == other.credential.expose_secret()
+            && self.endpoint == other.endpoint
+            && self.cache == other.cache
+            && self.http_client == other.http_client
+    }
+}
+
+impl Default for S3Config {
+    fn default() -> Self {
+        Self {
+            name: String::default(),
+            bucket: String::default(),
+            root: String::default(),
+            access_key_id: SecretString::from(String::default()),
+            secret_access_key: SecretString::from(String::default()),
+            enable_virtual_host_style: false,
+            endpoint: Option::default(),
+            region: Option::default(),
+            cache: ObjectStorageCacheConfig::default(),
+            http_client: HttpClientConfig::default(),
+        }
+    }
+}
+
+impl Default for OssConfig {
+    fn default() -> Self {
+        Self {
+            name: String::default(),
+            bucket: String::default(),
+            root: String::default(),
+            access_key_id: SecretString::from(String::default()),
+            access_key_secret: SecretString::from(String::default()),
+            endpoint: String::default(),
+            cache: ObjectStorageCacheConfig::default(),
+            http_client: HttpClientConfig::default(),
+        }
+    }
+}
+
+impl Default for AzblobConfig {
+    fn default() -> Self {
+        Self {
+            name: String::default(),
+            container: String::default(),
+            root: String::default(),
+            account_name: SecretString::from(String::default()),
+            account_key: SecretString::from(String::default()),
+            endpoint: String::default(),
+            sas_token: Option::default(),
+            cache: ObjectStorageCacheConfig::default(),
+            http_client: HttpClientConfig::default(),
+        }
+    }
+}
+
+impl Default for GcsConfig {
+    fn default() -> Self {
+        Self {
+            name: String::default(),
+            root: String::default(),
+            bucket: String::default(),
+            scope: String::default(),
+            credential_path: SecretString::from(String::default()),
+            credential: SecretString::from(String::default()),
+            endpoint: String::default(),
+            cache: ObjectStorageCacheConfig::default(),
+            http_client: HttpClientConfig::default(),
+        }
+    }
+}
+
+impl Default for ObjectStoreConfig {
+    fn default() -> Self {
+        ObjectStoreConfig::File(FileConfig {})
+    }
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 #[serde(default)]
 pub struct DatanodeOptions {
@@ -172,6 +467,37 @@ mod tests {
        let _parsed: DatanodeOptions = toml::from_str(&toml_string).unwrap();
    }

+    #[test]
+    fn test_config_name() {
+        let object_store_config = ObjectStoreConfig::default();
+        assert_eq!("File", object_store_config.config_name());
+
+        let s3_config = ObjectStoreConfig::S3(S3Config::default());
+        assert_eq!("S3", s3_config.config_name());
+        assert_eq!("S3", s3_config.provider_name());
+
+        let s3_config = ObjectStoreConfig::S3(S3Config {
+            name: "test".to_string(),
+            ..Default::default()
+        });
+        assert_eq!("test", s3_config.config_name());
+        assert_eq!("S3", s3_config.provider_name());
+    }
+
+    #[test]
+    fn test_is_object_storage() {
+        let store = ObjectStoreConfig::default();
+        assert!(!store.is_object_storage());
+        let s3_config = ObjectStoreConfig::S3(S3Config::default());
+        assert!(s3_config.is_object_storage());
+        let oss_config = ObjectStoreConfig::Oss(OssConfig::default());
+        assert!(oss_config.is_object_storage());
+        let gcs_config = ObjectStoreConfig::Gcs(GcsConfig::default());
+        assert!(gcs_config.is_object_storage());
+        let azblob_config = ObjectStoreConfig::Azblob(AzblobConfig::default());
+        assert!(azblob_config.is_object_storage());
+    }
+
    #[test]
    fn test_secstr() {
        let toml_str = r#"
--- a/src/datanode/src/datanode.rs
+++ b/src/datanode/src/datanode.rs
@@ -40,7 +40,7 @@ use log_store::raft_engine::log_store::RaftEngineLogStore;
 use meta_client::MetaClientRef;
 use metric_engine::engine::MetricEngine;
 use mito2::config::MitoConfig;
-use mito2::engine::{MitoEngine, MitoEngineBuilder};
+use mito2::engine::MitoEngine;
 use object_store::manager::{ObjectStoreManager, ObjectStoreManagerRef};
 use object_store::util::normalize_dir;
 use query::dummy_catalog::TableProviderFactoryRef;
@@ -162,8 +162,6 @@ pub struct DatanodeBuilder {
    meta_client: Option<MetaClientRef>,
    kv_backend: KvBackendRef,
    cache_registry: Option<Arc<LayeredCacheRegistry>>,
-    #[cfg(feature = "enterprise")]
-    extension_range_provider_factory: Option<mito2::extension::BoxedExtensionRangeProviderFactory>,
 }

 impl DatanodeBuilder {
@@ -175,8 +173,6 @@ impl DatanodeBuilder {
            meta_client: None,
            kv_backend,
            cache_registry: None,
-            #[cfg(feature = "enterprise")]
-            extension_range_provider_factory: None,
        }
    }

@@ -203,15 +199,6 @@ impl DatanodeBuilder {
        self
    }

-    #[cfg(feature = "enterprise")]
-    pub fn with_extension_range_provider(
-        &mut self,
-        extension_range_provider_factory: mito2::extension::BoxedExtensionRangeProviderFactory,
-    ) -> &mut Self {
-        self.extension_range_provider_factory = Some(extension_range_provider_factory);
-        self
-    }
-
    pub async fn build(mut self) -> Result<Datanode> {
        let node_id = self.opts.node_id.context(MissingNodeIdSnafu)?;

@@ -353,7 +340,7 @@ impl DatanodeBuilder {
    }

    async fn new_region_server(
-        &mut self,
+        &self,
        schema_metadata_manager: SchemaMetadataManagerRef,
        event_listener: RegionServerEventListenerRef,
    ) -> Result<RegionServer> {
@@ -389,13 +376,13 @@ impl DatanodeBuilder {
        );

        let object_store_manager = Self::build_object_store_manager(&opts.storage).await?;
-        let engines = self
-            .build_store_engines(
-                object_store_manager,
-                schema_metadata_manager,
-                self.plugins.clone(),
-            )
-            .await?;
+        let engines = Self::build_store_engines(
+            opts,
+            object_store_manager,
+            schema_metadata_manager,
+            self.plugins.clone(),
+        )
+        .await?;
        for engine in engines {
            region_server.register_engine(engine);
        }
@@ -407,7 +394,7 @@ impl DatanodeBuilder {

    /// Builds [RegionEngineRef] from `store_engine` section in `opts`
    async fn build_store_engines(
-        &mut self,
+        opts: &DatanodeOptions,
        object_store_manager: ObjectStoreManagerRef,
        schema_metadata_manager: SchemaMetadataManagerRef,
        plugins: Plugins,
@@ -416,7 +403,7 @@ impl DatanodeBuilder {
        let mut mito_engine_config = MitoConfig::default();
        let mut file_engine_config = file_engine::config::EngineConfig::default();

-        for engine in &self.opts.region_engine {
+        for engine in &opts.region_engine {
            match engine {
                RegionEngineConfig::Mito(config) => {
                    mito_engine_config = config.clone();
@@ -430,14 +417,14 @@ impl DatanodeBuilder {
            }
        }

-        let mito_engine = self
-            .build_mito_engine(
-                object_store_manager.clone(),
-                mito_engine_config,
-                schema_metadata_manager.clone(),
-                plugins.clone(),
-            )
-            .await?;
+        let mito_engine = Self::build_mito_engine(
+            opts,
+            object_store_manager.clone(),
+            mito_engine_config,
+            schema_metadata_manager.clone(),
+            plugins.clone(),
+        )
+        .await?;

        let metric_engine = MetricEngine::try_new(mito_engine.clone(), metric_engine_config)
            .context(BuildMetricEngineSnafu)?;
@@ -456,13 +443,12 @@ impl DatanodeBuilder {

    /// Builds [MitoEngine] according to options.
    async fn build_mito_engine(
-        &mut self,
+        opts: &DatanodeOptions,
        object_store_manager: ObjectStoreManagerRef,
        mut config: MitoConfig,
        schema_metadata_manager: SchemaMetadataManagerRef,
        plugins: Plugins,
    ) -> Result<MitoEngine> {
-        let opts = &self.opts;
        if opts.storage.is_object_storage() {
            // Enable the write cache when setting object storage
            config.enable_write_cache = true;
@@ -470,27 +456,17 @@ impl DatanodeBuilder {
        }

        let mito_engine = match &opts.wal {
-            DatanodeWalConfig::RaftEngine(raft_engine_config) => {
-                let log_store =
-                    Self::build_raft_engine_log_store(&opts.storage.data_home, raft_engine_config)
-                        .await?;
-
-                let builder = MitoEngineBuilder::new(
-                    &opts.storage.data_home,
-                    config,
-                    log_store,
-                    object_store_manager,
-                    schema_metadata_manager,
-                    plugins,
-                );
-
-                #[cfg(feature = "enterprise")]
-                let builder = builder.with_extension_range_provider_factory(
-                    self.extension_range_provider_factory.take(),
-                );
-
-                builder.try_build().await.context(BuildMitoEngineSnafu)?
-            }
+            DatanodeWalConfig::RaftEngine(raft_engine_config) => MitoEngine::new(
+                &opts.storage.data_home,
+                config,
+                Self::build_raft_engine_log_store(&opts.storage.data_home, raft_engine_config)
+                    .await?,
+                object_store_manager,
+                schema_metadata_manager,
+                plugins,
+            )
+            .await
+            .context(BuildMitoEngineSnafu)?,
            DatanodeWalConfig::Kafka(kafka_config) => {
                if kafka_config.create_index && opts.node_id.is_none() {
                    warn!("The WAL index creation only available in distributed mode.")
@@ -512,21 +488,16 @@ impl DatanodeBuilder {
                    None
                };

-                let builder = MitoEngineBuilder::new(
+                MitoEngine::new(
                    &opts.storage.data_home,
                    config,
                    Self::build_kafka_log_store(kafka_config, global_index_collector).await?,
                    object_store_manager,
                    schema_metadata_manager,
                    plugins,
-                );
-
-                #[cfg(feature = "enterprise")]
-                let builder = builder.with_extension_range_provider_factory(
-                    self.extension_range_provider_factory.take(),
-                );
-
-                builder.try_build().await.context(BuildMitoEngineSnafu)?
+                )
+                .await
+                .context(BuildMitoEngineSnafu)?
            }
        };
        Ok(mito_engine)
--- a/src/datanode/src/error.rs
+++ b/src/datanode/src/error.rs
@@ -142,6 +142,14 @@ pub enum Error {
        source: Box<log_store::error::Error>,
    },

+    #[snafu(display("Failed to init backend"))]
+    InitBackend {
+        #[snafu(source)]
+        error: object_store::Error,
+        #[snafu(implicit)]
+        location: Location,
+    },
+
    #[snafu(display("Invalid SQL, error: {}", msg))]
    InvalidSql { msg: String },

@@ -379,29 +387,6 @@ pub enum Error {
        #[snafu(implicit)]
        location: Location,
    },
-
-    #[snafu(display("Failed to serialize json"))]
-    SerializeJson {
-        #[snafu(source)]
-        error: serde_json::Error,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Failed object store operation"))]
-    ObjectStore {
-        source: object_store::error::Error,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Failed to build cache store"))]
-    BuildCacheStore {
-        #[snafu(source)]
-        error: object_store::Error,
-        #[snafu(implicit)]
-        location: Location,
-    },
 }

 pub type Result<T> = std::result::Result<T, Error>;
@@ -454,6 +439,8 @@ impl ErrorExt for Error {

            StartServer { source, .. } | ShutdownServer { source, .. } => source.status_code(),

+            InitBackend { .. } => StatusCode::StorageUnavailable,
+
            OpenLogStore { source, .. } => source.status_code(),
            MetaClientInit { source, .. } => source.status_code(),
            UnsupportedOutput { .. } => StatusCode::Unsupported,
@@ -470,10 +457,6 @@ impl ErrorExt for Error {
                StatusCode::RegionBusy
            }
            MissingCache { .. } => StatusCode::Internal,
-            SerializeJson { .. } => StatusCode::Internal,
-
-            ObjectStore { source, .. } => source.status_code(),
-            BuildCacheStore { .. } => StatusCode::StorageUnavailable,
        }
    }

--- a/src/datanode/src/region_server.rs
+++ b/src/datanode/src/region_server.rs
@@ -20,14 +20,12 @@ use std::time::Duration;

 use api::region::RegionResponse;
 use api::v1::region::sync_request::ManifestInfo;
-use api::v1::region::{
-    region_request, ListMetadataRequest, RegionResponse as RegionResponseV1, SyncRequest,
-};
+use api::v1::region::{region_request, RegionResponse as RegionResponseV1, SyncRequest};
 use api::v1::{ResponseHeader, Status};
 use arrow_flight::{FlightData, Ticket};
 use async_trait::async_trait;
 use bytes::Bytes;
-use common_error::ext::{BoxedError, ErrorExt};
+use common_error::ext::BoxedError;
 use common_error::status_code::StatusCode;
 use common_query::request::QueryRequest;
 use common_query::OutputData;
@@ -49,7 +47,6 @@ pub use query::dummy_catalog::{
    DummyCatalogList, DummyTableProviderFactory, TableProviderFactoryRef,
 };
 use query::QueryEngineRef;
-use serde_json;
 use servers::error::{self as servers_error, ExecuteGrpcRequestSnafu, Result as ServerResult};
 use servers::grpc::flight::{FlightCraft, FlightRecordBatchStream, TonicStream};
 use servers::grpc::region_server::RegionServerHandler;
@@ -74,10 +71,10 @@ use tonic::{Request, Response, Result as TonicResult};
 use crate::error::{
    self, BuildRegionRequestsSnafu, ConcurrentQueryLimiterClosedSnafu,
    ConcurrentQueryLimiterTimeoutSnafu, DataFusionSnafu, DecodeLogicalPlanSnafu,
-    ExecuteLogicalPlanSnafu, FindLogicalRegionsSnafu, GetRegionMetadataSnafu,
-    HandleBatchDdlRequestSnafu, HandleBatchOpenRequestSnafu, HandleRegionRequestSnafu,
-    NewPlanDecoderSnafu, RegionEngineNotFoundSnafu, RegionNotFoundSnafu, RegionNotReadySnafu,
-    Result, SerializeJsonSnafu, StopRegionEngineSnafu, UnexpectedSnafu, UnsupportedOutputSnafu,
+    ExecuteLogicalPlanSnafu, FindLogicalRegionsSnafu, HandleBatchDdlRequestSnafu,
+    HandleBatchOpenRequestSnafu, HandleRegionRequestSnafu, NewPlanDecoderSnafu,
+    RegionEngineNotFoundSnafu, RegionNotFoundSnafu, RegionNotReadySnafu, Result,
+    StopRegionEngineSnafu, UnexpectedSnafu, UnsupportedOutputSnafu,
 };
 use crate::event_listener::RegionServerEventListenerRef;

@@ -141,12 +138,12 @@ impl RegionServer {

    /// Finds the region's engine by its id. If the region is not ready, returns `None`.
    pub fn find_engine(&self, region_id: RegionId) -> Result<Option<RegionEngineRef>> {
-        match self.inner.get_engine(region_id, &RegionChange::None) {
-            Ok(CurrentEngine::Engine(engine)) => Ok(Some(engine)),
-            Ok(CurrentEngine::EarlyReturn(_)) => Ok(None),
-            Err(error::Error::RegionNotFound { .. }) => Ok(None),
-            Err(err) => Err(err),
-        }
+        self.inner
+            .get_engine(region_id, &RegionChange::None)
+            .map(|x| match x {
+                CurrentEngine::Engine(engine) => Some(engine),
+                CurrentEngine::EarlyReturn(_) => None,
+            })
    }

    #[tracing::instrument(skip_all)]
@@ -415,7 +412,6 @@ impl RegionServer {
        Ok(RegionResponse {
            affected_rows,
            extensions,
-            metadata: Vec::new(),
        })
    }

@@ -445,7 +441,6 @@ impl RegionServer {
        Ok(RegionResponse {
            affected_rows,
            extensions,
-            metadata: Vec::new(),
        })
    }

@@ -478,48 +473,6 @@ impl RegionServer {
            .map(|_| RegionResponse::new(AffectedRows::default()))
    }

-    /// Handles the ListMetadata request and retrieves metadata for specified regions.
-    ///
-    /// Returns the results as a JSON-serialized list in the [RegionResponse]. It serializes
-    /// non-existing regions as `null`.
-    #[tracing::instrument(skip_all)]
-    async fn handle_list_metadata_request(
-        &self,
-        request: &ListMetadataRequest,
-    ) -> Result<RegionResponse> {
-        let mut region_metadatas = Vec::new();
-        // Collect metadata for each region
-        for region_id in &request.region_ids {
-            let region_id = RegionId::from_u64(*region_id);
-            // Get the engine.
-            let Some(engine) = self.find_engine(region_id)? else {
-                region_metadatas.push(None);
-                continue;
-            };
-
-            match engine.get_metadata(region_id).await {
-                Ok(metadata) => region_metadatas.push(Some(metadata)),
-                Err(err) => {
-                    if err.status_code() == StatusCode::RegionNotFound {
-                        region_metadatas.push(None);
-                    } else {
-                        Err(err).with_context(|_| GetRegionMetadataSnafu {
-                            engine: engine.name(),
-                            region_id,
-                        })?;
-                    }
-                }
-            }
-        }
-
-        // Serialize metadata to JSON
-        let json_result = serde_json::to_vec(&region_metadatas).context(SerializeJsonSnafu)?;
-
-        let response = RegionResponse::from_metadata(json_result);
-
-        Ok(response)
-    }
-
    /// Sync region manifest and registers new opened logical regions.
    pub async fn sync_region(
        &self,
@@ -551,10 +504,6 @@ impl RegionServerHandler for RegionServer {
            region_request::Body::Sync(sync_request) => {
                self.handle_sync_region_request(sync_request).await
            }
-            region_request::Body::ListMetadata(list_metadata_request) => {
-                self.handle_list_metadata_request(list_metadata_request)
-                    .await
-            }
            _ => self.handle_requests_in_serial(request).await,
        }
        .map_err(BoxedError::new)
@@ -569,7 +518,6 @@ impl RegionServerHandler for RegionServer {
            }),
            affected_rows: response.affected_rows as _,
            extensions: response.extensions,
-            metadata: response.metadata,
        })
    }
 }
@@ -949,7 +897,6 @@ impl RegionServerInner {
                Ok(RegionResponse {
                    affected_rows: result.affected_rows,
                    extensions: result.extensions,
-                    metadata: Vec::new(),
                })
            }
            Err(err) => {
@@ -1020,7 +967,6 @@ impl RegionServerInner {
                Ok(RegionResponse {
                    affected_rows: result.affected_rows,
                    extensions: result.extensions,
-                    metadata: Vec::new(),
                })
            }
            Err(err) => {
@@ -1296,11 +1242,8 @@ mod tests {

    use std::assert_matches::assert_matches;

-    use api::v1::SemanticType;
    use common_error::ext::ErrorExt;
-    use datatypes::prelude::ConcreteDataType;
    use mito2::test_util::CreateRequestBuilder;
-    use store_api::metadata::{ColumnMetadata, RegionMetadata, RegionMetadataBuilder};
    use store_api::region_engine::RegionEngine;
    use store_api::region_request::{RegionDropRequest, RegionOpenRequest, RegionTruncateRequest};
    use store_api::storage::RegionId;
@@ -1662,175 +1605,4 @@ mod tests {
        let forth_query = p.acquire().await;
        assert!(forth_query.is_ok());
    }
-
-    fn mock_region_metadata(region_id: RegionId) -> RegionMetadata {
-        let mut metadata_builder = RegionMetadataBuilder::new(region_id);
-        metadata_builder.push_column_metadata(ColumnMetadata {
-            column_schema: datatypes::schema::ColumnSchema::new(
-                "timestamp",
-                ConcreteDataType::timestamp_nanosecond_datatype(),
-                false,
-            ),
-            semantic_type: SemanticType::Timestamp,
-            column_id: 0,
-        });
-        metadata_builder.push_column_metadata(ColumnMetadata {
-            column_schema: datatypes::schema::ColumnSchema::new(
-                "file",
-                ConcreteDataType::string_datatype(),
-                true,
-            ),
-            semantic_type: SemanticType::Tag,
-            column_id: 1,
-        });
-        metadata_builder.push_column_metadata(ColumnMetadata {
-            column_schema: datatypes::schema::ColumnSchema::new(
-                "message",
-                ConcreteDataType::string_datatype(),
-                true,
-            ),
-            semantic_type: SemanticType::Field,
-            column_id: 2,
-        });
-        metadata_builder.primary_key(vec![1]);
-        metadata_builder.build().unwrap()
-    }
-
-    #[tokio::test]
-    async fn test_handle_list_metadata_request() {
-        common_telemetry::init_default_ut_logging();
-
-        let mut mock_region_server = mock_region_server();
-        let region_id_1 = RegionId::new(1, 0);
-        let region_id_2 = RegionId::new(2, 0);
-
-        let metadata_1 = mock_region_metadata(region_id_1);
-        let metadata_2 = mock_region_metadata(region_id_2);
-        let metadatas = vec![Some(metadata_1.clone()), Some(metadata_2.clone())];
-
-        let metadata_1 = Arc::new(metadata_1);
-        let metadata_2 = Arc::new(metadata_2);
-        let (engine, _) = MockRegionEngine::with_metadata_mock_fn(
-            MITO_ENGINE_NAME,
-            Box::new(move |region_id| {
-                if region_id == region_id_1 {
-                    Ok(metadata_1.clone())
-                } else if region_id == region_id_2 {
-                    Ok(metadata_2.clone())
-                } else {
-                    error::RegionNotFoundSnafu { region_id }.fail()
-                }
-            }),
-        );
-
-        mock_region_server.register_engine(engine.clone());
-        mock_region_server
-            .inner
-            .region_map
-            .insert(region_id_1, RegionEngineWithStatus::Ready(engine.clone()));
-        mock_region_server
-            .inner
-            .region_map
-            .insert(region_id_2, RegionEngineWithStatus::Ready(engine.clone()));
-
-        // All regions exist.
-        let list_metadata_request = ListMetadataRequest {
-            region_ids: vec![region_id_1.as_u64(), region_id_2.as_u64()],
-        };
-        let response = mock_region_server
-            .handle_list_metadata_request(&list_metadata_request)
-            .await
-            .unwrap();
-        let decoded_metadata: Vec<Option<RegionMetadata>> =
-            serde_json::from_slice(&response.metadata).unwrap();
-        assert_eq!(metadatas, decoded_metadata);
-    }
-
-    #[tokio::test]
-    async fn test_handle_list_metadata_not_found() {
-        common_telemetry::init_default_ut_logging();
-
-        let mut mock_region_server = mock_region_server();
-        let region_id_1 = RegionId::new(1, 0);
-        let region_id_2 = RegionId::new(2, 0);
-
-        let metadata_1 = mock_region_metadata(region_id_1);
-        let metadatas = vec![Some(metadata_1.clone()), None];
-
-        let metadata_1 = Arc::new(metadata_1);
-        let (engine, _) = MockRegionEngine::with_metadata_mock_fn(
-            MITO_ENGINE_NAME,
-            Box::new(move |region_id| {
-                if region_id == region_id_1 {
-                    Ok(metadata_1.clone())
-                } else {
-                    error::RegionNotFoundSnafu { region_id }.fail()
-                }
-            }),
-        );
-
-        mock_region_server.register_engine(engine.clone());
-        mock_region_server
-            .inner
-            .region_map
-            .insert(region_id_1, RegionEngineWithStatus::Ready(engine.clone()));
-
-        // Not in region map.
-        let list_metadata_request = ListMetadataRequest {
-            region_ids: vec![region_id_1.as_u64(), region_id_2.as_u64()],
-        };
-        let response = mock_region_server
-            .handle_list_metadata_request(&list_metadata_request)
-            .await
-            .unwrap();
-        let decoded_metadata: Vec<Option<RegionMetadata>> =
-            serde_json::from_slice(&response.metadata).unwrap();
-        assert_eq!(metadatas, decoded_metadata);
-
-        // Not in region engine.
-        mock_region_server
-            .inner
-            .region_map
-            .insert(region_id_2, RegionEngineWithStatus::Ready(engine.clone()));
-        let response = mock_region_server
-            .handle_list_metadata_request(&list_metadata_request)
-            .await
-            .unwrap();
-        let decoded_metadata: Vec<Option<RegionMetadata>> =
-            serde_json::from_slice(&response.metadata).unwrap();
-        assert_eq!(metadatas, decoded_metadata);
-    }
-
-    #[tokio::test]
-    async fn test_handle_list_metadata_failed() {
-        common_telemetry::init_default_ut_logging();
-
-        let mut mock_region_server = mock_region_server();
-        let region_id_1 = RegionId::new(1, 0);
-
-        let (engine, _) = MockRegionEngine::with_metadata_mock_fn(
-            MITO_ENGINE_NAME,
-            Box::new(move |region_id| {
-                error::UnexpectedSnafu {
-                    violated: format!("Failed to get region {region_id}"),
-                }
-                .fail()
-            }),
-        );
-
-        mock_region_server.register_engine(engine.clone());
-        mock_region_server
-            .inner
-            .region_map
-            .insert(region_id_1, RegionEngineWithStatus::Ready(engine.clone()));
-
-        // Failed to get.
-        let list_metadata_request = ListMetadataRequest {
-            region_ids: vec![region_id_1.as_u64()],
-        };
-        mock_region_server
-            .handle_list_metadata_request(&list_metadata_request)
-            .await
-            .unwrap_err();
-    }
 }
--- a/src/datanode/src/store.rs
+++ b/src/datanode/src/store.rs
@@ -14,22 +14,45 @@

 //! object storage utilities

+mod azblob;
+pub mod fs;
+mod gcs;
+mod oss;
+mod s3;
+use std::path;
 use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;

 use common_telemetry::{info, warn};
-use object_store::factory::new_raw_object_store;
+use mito2::access_layer::{ATOMIC_WRITE_DIR, OLD_ATOMIC_WRITE_DIR};
 use object_store::layers::{LruCacheLayer, RetryInterceptor, RetryLayer};
 use object_store::services::Fs;
-use object_store::util::{clean_temp_dir, join_dir, with_instrument_layers};
-use object_store::{
-    Access, Error, ObjectStore, ObjectStoreBuilder, ATOMIC_WRITE_DIR, OLD_ATOMIC_WRITE_DIR,
-};
+use object_store::util::{join_dir, normalize_dir, with_instrument_layers};
+use object_store::{Access, Error, HttpClient, ObjectStore, ObjectStoreBuilder};
 use snafu::prelude::*;

-use crate::config::{ObjectStoreConfig, DEFAULT_OBJECT_STORE_CACHE_SIZE};
-use crate::error::{self, CreateDirSnafu, Result};
+use crate::config::{HttpClientConfig, ObjectStoreConfig, DEFAULT_OBJECT_STORE_CACHE_SIZE};
+use crate::error::{self, BuildHttpClientSnafu, CreateDirSnafu, Result};
+
+pub(crate) async fn new_raw_object_store(
+    store: &ObjectStoreConfig,
+    data_home: &str,
+) -> Result<ObjectStore> {
+    let data_home = normalize_dir(data_home);
+    let object_store = match store {
+        ObjectStoreConfig::File(file_config) => {
+            fs::new_fs_object_store(&data_home, file_config).await
+        }
+        ObjectStoreConfig::S3(s3_config) => s3::new_s3_object_store(s3_config).await,
+        ObjectStoreConfig::Oss(oss_config) => oss::new_oss_object_store(oss_config).await,
+        ObjectStoreConfig::Azblob(azblob_config) => {
+            azblob::new_azblob_object_store(azblob_config).await
+        }
+        ObjectStoreConfig::Gcs(gcs_config) => gcs::new_gcs_object_store(gcs_config).await,
+    }?;
+    Ok(object_store)
+}

 fn with_retry_layers(object_store: ObjectStore) -> ObjectStore {
    object_store.layer(
@@ -43,9 +66,7 @@ pub(crate) async fn new_object_store_without_cache(
    store: &ObjectStoreConfig,
    data_home: &str,
 ) -> Result<ObjectStore> {
-    let object_store = new_raw_object_store(store, data_home)
-        .await
-        .context(error::ObjectStoreSnafu)?;
+    let object_store = new_raw_object_store(store, data_home).await?;
    // Enable retry layer and cache layer for non-fs object storages
    let object_store = if store.is_object_storage() {
        // Adds retry layer
@@ -62,9 +83,7 @@ pub(crate) async fn new_object_store(
    store: ObjectStoreConfig,
    data_home: &str,
 ) -> Result<ObjectStore> {
-    let object_store = new_raw_object_store(&store, data_home)
-        .await
-        .context(error::ObjectStoreSnafu)?;
+    let object_store = new_raw_object_store(&store, data_home).await?;
    // Enable retry layer and cache layer for non-fs object storages
    let object_store = if store.is_object_storage() {
        let object_store = if let Some(cache_layer) = build_cache_layer(&store, data_home).await? {
@@ -151,20 +170,20 @@ async fn build_cache_layer(
        && !path.trim().is_empty()
    {
        let atomic_temp_dir = join_dir(path, ATOMIC_WRITE_DIR);
-        clean_temp_dir(&atomic_temp_dir).context(error::ObjectStoreSnafu)?;
+        clean_temp_dir(&atomic_temp_dir)?;

        // Compatible code. Remove this after a major release.
        let old_atomic_temp_dir = join_dir(path, OLD_ATOMIC_WRITE_DIR);
-        clean_temp_dir(&old_atomic_temp_dir).context(error::ObjectStoreSnafu)?;
+        clean_temp_dir(&old_atomic_temp_dir)?;

        let cache_store = Fs::default()
            .root(path)
            .atomic_write_dir(&atomic_temp_dir)
            .build()
-            .context(error::BuildCacheStoreSnafu)?;
+            .context(error::InitBackendSnafu)?;

        let cache_layer = LruCacheLayer::new(Arc::new(cache_store), cache_capacity.0 as usize)
-            .context(error::BuildCacheStoreSnafu)?;
+            .context(error::InitBackendSnafu)?;
        cache_layer.recover_cache(false).await;
        info!(
            "Enabled local object storage cache, path: {}, capacity: {}.",
@@ -177,6 +196,31 @@ async fn build_cache_layer(
    }
 }

+pub(crate) fn clean_temp_dir(dir: &str) -> Result<()> {
+    if path::Path::new(&dir).exists() {
+        info!("Begin to clean temp storage directory: {}", dir);
+        std::fs::remove_dir_all(dir).context(error::RemoveDirSnafu { dir })?;
+        info!("Cleaned temp storage directory: {}", dir);
+    }
+
+    Ok(())
+}
+
+pub(crate) fn build_http_client(config: &HttpClientConfig) -> Result<HttpClient> {
+    if config.skip_ssl_validation {
+        common_telemetry::warn!("Skipping SSL validation for object storage HTTP client. Please ensure the environment is trusted.");
+    }
+
+    let client = reqwest::ClientBuilder::new()
+        .pool_max_idle_per_host(config.pool_max_idle_per_host as usize)
+        .connect_timeout(config.connect_timeout)
+        .pool_idle_timeout(config.pool_idle_timeout)
+        .timeout(config.timeout)
+        .danger_accept_invalid_certs(config.skip_ssl_validation)
+        .build()
+        .context(BuildHttpClientSnafu)?;
+    Ok(HttpClient::with(client))
+}
 struct PrintDetailedError;

 // PrintDetailedError is a retry interceptor that prints error in Debug format in retrying.
--- a/src/datanode/src/store/azblob.rs
+++ b/src/datanode/src/store/azblob.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 common_base::secrets::ExposeSecret;
+use common_telemetry::info;
+use object_store::services::Azblob;
+use object_store::{util, ObjectStore};
+use snafu::prelude::*;
+
+use crate::config::AzblobConfig;
+use crate::error::{self, Result};
+use crate::store::build_http_client;
+
+pub(crate) async fn new_azblob_object_store(azblob_config: &AzblobConfig) -> Result<ObjectStore> {
+    let root = util::normalize_dir(&azblob_config.root);
+
+    info!(
+        "The azure storage container is: {}, root is: {}",
+        azblob_config.container, &root
+    );
+
+    let client = build_http_client(&azblob_config.http_client)?;
+
+    let mut builder = Azblob::default()
+        .root(&root)
+        .container(&azblob_config.container)
+        .endpoint(&azblob_config.endpoint)
+        .account_name(azblob_config.account_name.expose_secret())
+        .account_key(azblob_config.account_key.expose_secret())
+        .http_client(client);
+
+    if let Some(token) = &azblob_config.sas_token {
+        builder = builder.sas_token(token);
+    };
+
+    Ok(ObjectStore::new(builder)
+        .context(error::InitBackendSnafu)?
+        .finish())
+}
--- a/src/datanode/src/store/fs.rs
+++ b/src/datanode/src/store/fs.rs
@@ -0,0 +1,53 @@
+// 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::{fs, path};
+
+use common_telemetry::info;
+use mito2::access_layer::{ATOMIC_WRITE_DIR, OLD_ATOMIC_WRITE_DIR};
+use object_store::services::Fs;
+use object_store::util::join_dir;
+use object_store::ObjectStore;
+use snafu::prelude::*;
+
+use crate::config::FileConfig;
+use crate::error::{self, Result};
+use crate::store;
+
+/// A helper function to create a file system object store.
+pub async fn new_fs_object_store(
+    data_home: &str,
+    _file_config: &FileConfig,
+) -> Result<ObjectStore> {
+    fs::create_dir_all(path::Path::new(&data_home))
+        .context(error::CreateDirSnafu { dir: data_home })?;
+    info!("The file storage home is: {}", data_home);
+
+    let atomic_write_dir = join_dir(data_home, ATOMIC_WRITE_DIR);
+    store::clean_temp_dir(&atomic_write_dir)?;
+
+    // Compatible code. Remove this after a major release.
+    let old_atomic_temp_dir = join_dir(data_home, OLD_ATOMIC_WRITE_DIR);
+    store::clean_temp_dir(&old_atomic_temp_dir)?;
+
+    let builder = Fs::default()
+        .root(data_home)
+        .atomic_write_dir(&atomic_write_dir);
+
+    let object_store = ObjectStore::new(builder)
+        .context(error::InitBackendSnafu)?
+        .finish();
+
+    Ok(object_store)
+}
--- a/src/datanode/src/store/gcs.rs
+++ b/src/datanode/src/store/gcs.rs
@@ -0,0 +1,46 @@
+// 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_base::secrets::ExposeSecret;
+use common_telemetry::info;
+use object_store::services::Gcs;
+use object_store::{util, ObjectStore};
+use snafu::prelude::*;
+
+use crate::config::GcsConfig;
+use crate::error::{self, Result};
+use crate::store::build_http_client;
+
+pub(crate) async fn new_gcs_object_store(gcs_config: &GcsConfig) -> Result<ObjectStore> {
+    let root = util::normalize_dir(&gcs_config.root);
+    info!(
+        "The gcs storage bucket is: {}, root is: {}",
+        gcs_config.bucket, &root
+    );
+
+    let client = build_http_client(&gcs_config.http_client);
+
+    let builder = Gcs::default()
+        .root(&root)
+        .bucket(&gcs_config.bucket)
+        .scope(&gcs_config.scope)
+        .credential_path(gcs_config.credential_path.expose_secret())
+        .credential(gcs_config.credential.expose_secret())
+        .endpoint(&gcs_config.endpoint)
+        .http_client(client?);
+
+    Ok(ObjectStore::new(builder)
+        .context(error::InitBackendSnafu)?
+        .finish())
+}
--- a/src/datanode/src/store/oss.rs
+++ b/src/datanode/src/store/oss.rs
@@ -0,0 +1,45 @@
+// 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_base::secrets::ExposeSecret;
+use common_telemetry::info;
+use object_store::services::Oss;
+use object_store::{util, ObjectStore};
+use snafu::prelude::*;
+
+use crate::config::OssConfig;
+use crate::error::{self, Result};
+use crate::store::build_http_client;
+
+pub(crate) async fn new_oss_object_store(oss_config: &OssConfig) -> Result<ObjectStore> {
+    let root = util::normalize_dir(&oss_config.root);
+    info!(
+        "The oss storage bucket is: {}, root is: {}",
+        oss_config.bucket, &root
+    );
+
+    let client = build_http_client(&oss_config.http_client)?;
+
+    let builder = Oss::default()
+        .root(&root)
+        .bucket(&oss_config.bucket)
+        .endpoint(&oss_config.endpoint)
+        .access_key_id(oss_config.access_key_id.expose_secret())
+        .access_key_secret(oss_config.access_key_secret.expose_secret())
+        .http_client(client);
+
+    Ok(ObjectStore::new(builder)
+        .context(error::InitBackendSnafu)?
+        .finish())
+}
--- a/src/datanode/src/store/s3.rs
+++ b/src/datanode/src/store/s3.rs
@@ -0,0 +1,55 @@
+// 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_base::secrets::ExposeSecret;
+use common_telemetry::info;
+use object_store::services::S3;
+use object_store::{util, ObjectStore};
+use snafu::prelude::*;
+
+use crate::config::S3Config;
+use crate::error::{self, Result};
+use crate::store::build_http_client;
+
+pub(crate) async fn new_s3_object_store(s3_config: &S3Config) -> Result<ObjectStore> {
+    let root = util::normalize_dir(&s3_config.root);
+
+    info!(
+        "The s3 storage bucket is: {}, root is: {}",
+        s3_config.bucket, &root
+    );
+
+    let client = build_http_client(&s3_config.http_client)?;
+
+    let mut builder = S3::default()
+        .root(&root)
+        .bucket(&s3_config.bucket)
+        .access_key_id(s3_config.access_key_id.expose_secret())
+        .secret_access_key(s3_config.secret_access_key.expose_secret())
+        .http_client(client);
+
+    if s3_config.endpoint.is_some() {
+        builder = builder.endpoint(s3_config.endpoint.as_ref().unwrap());
+    }
+    if s3_config.region.is_some() {
+        builder = builder.region(s3_config.region.as_ref().unwrap());
+    }
+    if s3_config.enable_virtual_host_style {
+        builder = builder.enable_virtual_host_style();
+    }
+
+    Ok(ObjectStore::new(builder)
+        .context(error::InitBackendSnafu)?
+        .finish())
+}
--- a/src/datanode/src/tests.rs
+++ b/src/datanode/src/tests.rs
@@ -108,15 +108,11 @@ pub type MockRequestHandler =
 pub type MockSetReadonlyGracefullyHandler =
    Box<dyn Fn(RegionId) -> Result<SetRegionRoleStateResponse, Error> + Send + Sync>;

-pub type MockGetMetadataHandler =
-    Box<dyn Fn(RegionId) -> Result<RegionMetadataRef, Error> + Send + Sync>;
-
 pub struct MockRegionEngine {
    sender: Sender<(RegionId, RegionRequest)>,
    pub(crate) handle_request_delay: Option<Duration>,
    pub(crate) handle_request_mock_fn: Option<MockRequestHandler>,
    pub(crate) handle_set_readonly_gracefully_mock_fn: Option<MockSetReadonlyGracefullyHandler>,
-    pub(crate) handle_get_metadata_mock_fn: Option<MockGetMetadataHandler>,
    pub(crate) mock_role: Option<Option<RegionRole>>,
    engine: String,
 }
@@ -131,7 +127,6 @@ impl MockRegionEngine {
                sender: tx,
                handle_request_mock_fn: None,
                handle_set_readonly_gracefully_mock_fn: None,
-                handle_get_metadata_mock_fn: None,
                mock_role: None,
                engine: engine.to_string(),
            }),
@@ -151,27 +146,6 @@ impl MockRegionEngine {
                sender: tx,
                handle_request_mock_fn: Some(mock_fn),
                handle_set_readonly_gracefully_mock_fn: None,
-                handle_get_metadata_mock_fn: None,
-                mock_role: None,
-                engine: engine.to_string(),
-            }),
-            rx,
-        )
-    }
-
-    pub fn with_metadata_mock_fn(
-        engine: &str,
-        mock_fn: MockGetMetadataHandler,
-    ) -> (Arc<Self>, Receiver<(RegionId, RegionRequest)>) {
-        let (tx, rx) = tokio::sync::mpsc::channel(8);
-
-        (
-            Arc::new(Self {
-                handle_request_delay: None,
-                sender: tx,
-                handle_request_mock_fn: None,
-                handle_set_readonly_gracefully_mock_fn: None,
-                handle_get_metadata_mock_fn: Some(mock_fn),
                mock_role: None,
                engine: engine.to_string(),
            }),
@@ -192,7 +166,6 @@ impl MockRegionEngine {
            sender: tx,
            handle_request_mock_fn: None,
            handle_set_readonly_gracefully_mock_fn: None,
-            handle_get_metadata_mock_fn: None,
            mock_role: None,
            engine: engine.to_string(),
        };
@@ -235,11 +208,7 @@ impl RegionEngine for MockRegionEngine {
        unimplemented!()
    }

-    async fn get_metadata(&self, region_id: RegionId) -> Result<RegionMetadataRef, BoxedError> {
-        if let Some(mock_fn) = &self.handle_get_metadata_mock_fn {
-            return mock_fn(region_id).map_err(BoxedError::new);
-        };
-
+    async fn get_metadata(&self, _region_id: RegionId) -> Result<RegionMetadataRef, BoxedError> {
        unimplemented!()
    }

--- a/src/datatypes/src/schema/column_schema.rs
+++ b/src/datatypes/src/schema/column_schema.rs
@@ -527,7 +527,7 @@ pub struct FulltextOptions {
    #[serde(default = "fulltext_options_default_granularity")]
    pub granularity: u32,
    /// The false positive rate of the fulltext index (for bloom backend only)
-    #[serde(default = "index_options_default_false_positive_rate_in_10000")]
+    #[serde(default = "fulltext_options_default_false_positive_rate_in_10000")]
    pub false_positive_rate_in_10000: u32,
 }

@@ -535,7 +535,7 @@ fn fulltext_options_default_granularity() -> u32 {
    DEFAULT_GRANULARITY
 }

-fn index_options_default_false_positive_rate_in_10000() -> u32 {
+fn fulltext_options_default_false_positive_rate_in_10000() -> u32 {
    (DEFAULT_FALSE_POSITIVE_RATE * 10000.0) as u32
 }

@@ -773,7 +773,6 @@ pub struct SkippingIndexOptions {
    /// The granularity of the skip index.
    pub granularity: u32,
    /// The false positive rate of the skip index (in ten-thousandths, e.g., 100 = 1%).
-    #[serde(default = "index_options_default_false_positive_rate_in_10000")]
    pub false_positive_rate_in_10000: u32,
    /// The type of the skip index.
    #[serde(default)]
@@ -1180,59 +1179,4 @@ mod tests {
        assert!(column_schema.default_constraint.is_none());
        assert!(column_schema.metadata.is_empty());
    }
-
-    #[test]
-    fn test_skipping_index_options_deserialization() {
-        let original_options = "{\"granularity\":1024,\"false-positive-rate-in-10000\":10,\"index-type\":\"BloomFilter\"}";
-        let options = serde_json::from_str::<SkippingIndexOptions>(original_options).unwrap();
-        assert_eq!(1024, options.granularity);
-        assert_eq!(SkippingIndexType::BloomFilter, options.index_type);
-        assert_eq!(0.001, options.false_positive_rate());
-
-        let options_str = serde_json::to_string(&options).unwrap();
-        assert_eq!(options_str, original_options);
-    }
-
-    #[test]
-    fn test_skipping_index_options_deserialization_v0_14_to_v0_15() {
-        let options = "{\"granularity\":10240,\"index-type\":\"BloomFilter\"}";
-        let options = serde_json::from_str::<SkippingIndexOptions>(options).unwrap();
-        assert_eq!(10240, options.granularity);
-        assert_eq!(SkippingIndexType::BloomFilter, options.index_type);
-        assert_eq!(DEFAULT_FALSE_POSITIVE_RATE, options.false_positive_rate());
-
-        let options_str = serde_json::to_string(&options).unwrap();
-        assert_eq!(options_str, "{\"granularity\":10240,\"false-positive-rate-in-10000\":100,\"index-type\":\"BloomFilter\"}");
-    }
-
-    #[test]
-    fn test_fulltext_options_deserialization() {
-        let original_options = "{\"enable\":true,\"analyzer\":\"English\",\"case-sensitive\":false,\"backend\":\"bloom\",\"granularity\":1024,\"false-positive-rate-in-10000\":10}";
-        let options = serde_json::from_str::<FulltextOptions>(original_options).unwrap();
-        assert!(!options.case_sensitive);
-        assert!(options.enable);
-        assert_eq!(FulltextBackend::Bloom, options.backend);
-        assert_eq!(FulltextAnalyzer::default(), options.analyzer);
-        assert_eq!(1024, options.granularity);
-        assert_eq!(0.001, options.false_positive_rate());
-
-        let options_str = serde_json::to_string(&options).unwrap();
-        assert_eq!(options_str, original_options);
-    }
-
-    #[test]
-    fn test_fulltext_options_deserialization_v0_14_to_v0_15() {
-        // 0.14 to 0.15
-        let options = "{\"enable\":true,\"analyzer\":\"English\",\"case-sensitive\":false,\"backend\":\"bloom\"}";
-        let options = serde_json::from_str::<FulltextOptions>(options).unwrap();
-        assert!(!options.case_sensitive);
-        assert!(options.enable);
-        assert_eq!(FulltextBackend::Bloom, options.backend);
-        assert_eq!(FulltextAnalyzer::default(), options.analyzer);
-        assert_eq!(DEFAULT_GRANULARITY, options.granularity);
-        assert_eq!(DEFAULT_FALSE_POSITIVE_RATE, options.false_positive_rate());
-
-        let options_str = serde_json::to_string(&options).unwrap();
-        assert_eq!(options_str, "{\"enable\":true,\"analyzer\":\"English\",\"case-sensitive\":false,\"backend\":\"bloom\",\"granularity\":10240,\"false-positive-rate-in-10000\":100}");
-    }
 }
--- a/src/datatypes/src/timestamp.rs
+++ b/src/datatypes/src/timestamp.rs
@@ -12,11 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use arrow_array::{
-    ArrayRef, PrimitiveArray, TimestampMicrosecondArray, TimestampMillisecondArray,
-    TimestampNanosecondArray, TimestampSecondArray,
-};
-use arrow_schema::DataType;
 use common_time::timestamp::TimeUnit;
 use common_time::Timestamp;
 use paste::paste;
@@ -143,41 +138,6 @@ define_timestamp_with_unit!(Millisecond);
 define_timestamp_with_unit!(Microsecond);
 define_timestamp_with_unit!(Nanosecond);

-pub fn timestamp_array_to_primitive(
-    ts_array: &ArrayRef,
-) -> Option<(
-    PrimitiveArray<arrow_array::types::Int64Type>,
-    arrow::datatypes::TimeUnit,
-)> {
-    let DataType::Timestamp(unit, _) = ts_array.data_type() else {
-        return None;
-    };
-
-    let ts_primitive = match unit {
-        arrow_schema::TimeUnit::Second => ts_array
-            .as_any()
-            .downcast_ref::<TimestampSecondArray>()
-            .unwrap()
-            .reinterpret_cast::<arrow_array::types::Int64Type>(),
-        arrow_schema::TimeUnit::Millisecond => ts_array
-            .as_any()
-            .downcast_ref::<TimestampMillisecondArray>()
-            .unwrap()
-            .reinterpret_cast::<arrow_array::types::Int64Type>(),
-        arrow_schema::TimeUnit::Microsecond => ts_array
-            .as_any()
-            .downcast_ref::<TimestampMicrosecondArray>()
-            .unwrap()
-            .reinterpret_cast::<arrow_array::types::Int64Type>(),
-        arrow_schema::TimeUnit::Nanosecond => ts_array
-            .as_any()
-            .downcast_ref::<TimestampNanosecondArray>()
-            .unwrap()
-            .reinterpret_cast::<arrow_array::types::Int64Type>(),
-    };
-    Some((ts_primitive, *unit))
-}
-
 #[cfg(test)]
 mod tests {
    use common_time::timezone::set_default_timezone;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
evenyag	8612bb066f	chore: fix statement compile errors Signed-off-by: evenyag <realevenyag@gmail.com>	2025-07-03 23:05:21 +08:00
Yingwen	467593d329	fix: enable max_execution time for other read only statements (#6454 ) Also disable the timeout when timeout is 0 Signed-off-by: evenyag <realevenyag@gmail.com>	2025-07-03 23:05:21 +08:00
Ruihang Xia	9e4ae070b2	feat: skip rule checker on ingestion (#6453 ) Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2025-07-03 23:05:21 +08:00
Ruihang Xia	d8261dda51	feat!: point matrix based partition rule checker (#6431 ) * bare implementation Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * stateful generator Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * error report Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix remap checkpoint Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * use matrix generator as iterator Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * pre-calculate suffix product Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * update existing test cases Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix clippy Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * sqlness Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix ut Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * clean up Signed-off-by: Ruihang Xia <waynestxia@gmail.com> --------- Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: evenyag <realevenyag@gmail.com>	2025-07-03 23:05:21 +08:00
dennis zhuang	7ab9b335a1	fix: label_replace and label_join functions when used as sub‐expressions (#6443 ) * fix: label_replace and label_join functions in expressions Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: remove update_fields Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: tql eval -> TQL EVAL Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * fix: empty regex and not existing source label Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: simplfy test Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * fix: test Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * fix: test Signed-off-by: Dennis Zhuang <killme2008@gmail.com> --------- Signed-off-by: Dennis Zhuang <killme2008@gmail.com> Signed-off-by: evenyag <realevenyag@gmail.com>	2025-07-03 23:05:21 +08:00
Ruihang Xia	60835afb47	feat: `Collider` for playing with `PartitionRule` (#6399 ) * skeleton Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * initial impl and tests Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * refactor and reorganize Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix clippy Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix typo Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * add comment Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * error handling Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * explain naming Signed-off-by: Ruihang Xia <waynestxia@gmail.com> --------- Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: evenyag <realevenyag@gmail.com>	2025-07-03 23:05:21 +08:00
fys	aba5bf7431	refactor: avoid adding feature to parameter (#6391 ) * refactor: avoid adding feature to parameter * avoid `cfg(not(feature = ...))` block	2025-07-03 15:48:22 +08:00
Yingwen	7897fe8dbe	fix: correct MAX_EXECUTION_TIME timeout calculation (#6444 ) * feat: implement statement timeout in frontend instance Signed-off-by: evenyag <realevenyag@gmail.com> * fix: fail fast when timeout is 0 Signed-off-by: evenyag <realevenyag@gmail.com> * fix: update start time Signed-off-by: evenyag <realevenyag@gmail.com> --------- Signed-off-by: evenyag <realevenyag@gmail.com>	2025-07-03 10:46:35 +08:00
Ruihang Xia	cc8ec706a1	fix: remap column indices on overriding logical table partitions (#6446 ) * fix: remap column indices on overriding logical table partitions Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * sqlness Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * refactor map query Signed-off-by: Ruihang Xia <waynestxia@gmail.com> --------- Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: evenyag <realevenyag@gmail.com>	2025-07-03 10:46:35 +08:00
Weny Xu	7c688718db	fix: fix dest_keys chunks bug in TombstoneManager (#6432 ) * fix(meta): fix dest_keys_chunks bug in TombstoneManager Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: fix typo Signed-off-by: WenyXu <wenymedia@gmail.com> * fix: fix sqlness tests Signed-off-by: WenyXu <wenymedia@gmail.com> --------- Signed-off-by: WenyXu <wenymedia@gmail.com> Signed-off-by: evenyag <realevenyag@gmail.com>	2025-07-03 10:46:35 +08:00
shuiyisong	8a0e554e5a	feat(pipeline): support Loki API (#6390 ) * chore: use schema_info Signed-off-by: shuiyisong <xixing.sys@gmail.com> * refactor: abstract loki item generator Signed-off-by: shuiyisong <xixing.sys@gmail.com> * chore: introduce middle item Signed-off-by: shuiyisong <xixing.sys@gmail.com> * feat: introduce pipeline in loki api Signed-off-by: shuiyisong <xixing.sys@gmail.com> * test: add tests Signed-off-by: shuiyisong <xixing.sys@gmail.com> * chore: minor update Signed-off-by: shuiyisong <xixing.sys@gmail.com> * chore: minor update Signed-off-by: shuiyisong <xixing.sys@gmail.com> * chore: update prefix and test Signed-off-by: shuiyisong <xixing.sys@gmail.com> * chore: change recursion to loop Signed-off-by: shuiyisong <xixing.sys@gmail.com> * fix: cr issue Signed-off-by: shuiyisong <xixing.sys@gmail.com> --------- Signed-off-by: shuiyisong <xixing.sys@gmail.com> Signed-off-by: evenyag <realevenyag@gmail.com>	2025-07-03 10:46:35 +08:00
jeremyhi	80fae1c559	feat: override logical table's partition key indices (#6385 ) * feat: Override logical table's partition key indices with physical table's * chore: by comment Signed-off-by: evenyag <realevenyag@gmail.com>	2025-07-03 10:46:35 +08:00
Zhenchi	c37c4df20d	feat: pick #6416 to release/0.15 (#6445 ) * feat: pick #6416 to release/0.15 Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> * upgrade proto Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> --------- Signed-off-by: Zhenchi <zhongzc_arch@outlook.com>	2025-07-02 08:55:54 +00:00
Yingwen	f712c1b356	feat: cherry-pick #6384 #6388 #6396 #6403 #6412 #6405 to 0.15 branch (#6414 ) * feat: supports CsvWithNames and CsvWithNamesAndTypes formats (#6384) * feat: supports CsvWithNames and CsvWithNamesAndTypes formats and object/array types Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * test: added and fixed tests Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: fix test Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: remove comments Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * test: add json type csv tests Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: remove comment Co-authored-by: Yingwen <realevenyag@gmail.com> --------- Signed-off-by: Dennis Zhuang <killme2008@gmail.com> Co-authored-by: Yingwen <realevenyag@gmail.com> Signed-off-by: evenyag <realevenyag@gmail.com> * feat: introduce /v1/health for healthcheck from external (#6388) Signed-off-by: Ning Sun <sunning@greptime.com> Signed-off-by: evenyag <realevenyag@gmail.com> * feat: update dashboard to v0.10.1 (#6396) Co-authored-by: ZonaHex <ZonaHex@users.noreply.github.com> Signed-off-by: evenyag <realevenyag@gmail.com> * fix: complete partial index search results in cache (#6403) * fix: complete partial index search results in cache Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> * polish Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> * address comments Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> * add initial tests Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> * cover issue case Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> * TestEnv new -> async Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> --------- Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> Signed-off-by: evenyag <realevenyag@gmail.com> * fix: skip failing nodes when gathering porcess info (#6412) * fix/process-manager-skip-fail-nodes: - Enhance Error Handling in `process_manager.rs`: Improved error handling by adding a warning log for failing nodes in the `list_process` method. This ensures that the process listing continues even if some nodes fail to respond. - Add Error Type Import in `process_manager.rs`: Included the `Error` type from the `error` module to handle errors more effectively within the `ProcessManager` implementation. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com> * fix: clippy Signed-off-by: Lei, HUANG <mrsatangel@gmail.com> * fix/process-manager-skip-fail-nodes: Enhancements to Debugging and Trait Implementation - `process_manager.rs`: Improved logging by adding more detailed error messages when skipping failing nodes. - `selector.rs`: Enhanced the `FrontendClient` trait by adding the `Debug` trait bound to improve debugging capabilities. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com> --------- Signed-off-by: Lei, HUANG <mrsatangel@gmail.com> Signed-off-by: evenyag <realevenyag@gmail.com> * refactor: pass pipeline name through http header and get db from query context (#6405) Signed-off-by: zyy17 <zyylsxm@gmail.com> Signed-off-by: evenyag <realevenyag@gmail.com> --------- Signed-off-by: Dennis Zhuang <killme2008@gmail.com> Signed-off-by: evenyag <realevenyag@gmail.com> Signed-off-by: Ning Sun <sunning@greptime.com> Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> Signed-off-by: Lei, HUANG <mrsatangel@gmail.com> Signed-off-by: zyy17 <zyylsxm@gmail.com> Co-authored-by: dennis zhuang <killme2008@gmail.com> Co-authored-by: Ning Sun <sunng@protonmail.com> Co-authored-by: ZonaHe <zonahe@qq.com> Co-authored-by: ZonaHex <ZonaHex@users.noreply.github.com> Co-authored-by: Zhenchi <zhongzc_arch@outlook.com> Co-authored-by: Lei, HUANG <6406592+v0y4g3r@users.noreply.github.com> Co-authored-by: zyy17 <zyylsxm@gmail.com>	2025-06-27 20:11:28 +08:00