diff --git a/.github/workflows/apidoc.yml b/.github/workflows/apidoc.yml
index 06e845f63021..ca1befa52cff 100644
--- a/.github/workflows/apidoc.yml
+++ b/.github/workflows/apidoc.yml
@@ -40,3 +40,4 @@ jobs:
       uses: JamesIves/github-pages-deploy-action@v4
       with:
         folder: target/doc
+        single-commit: true
diff --git a/.github/workflows/unassign.yml b/.github/workflows/unassign.yml
index 3772bc499d21..e2d793b8ab11 100644
--- a/.github/workflows/unassign.yml
+++ b/.github/workflows/unassign.yml
@@ -17,5 +17,5 @@ jobs:
       - name: Auto Unassign
         uses: tisonspieces/auto-unassign@main
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
           repository: ${{ github.repository }}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 32fd3760e8d4..000000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,132 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-info@greptime.com.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
diff --git a/Cargo.lock b/Cargo.lock
index 2fce6ba811b3..d47c6c355904 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -219,7 +219,6 @@ dependencies = [
  "paste",
  "prost 0.12.3",
  "snafu",
- "tonic 0.10.2",
  "tonic-build 0.9.2",
 ]
 
@@ -334,7 +333,7 @@ dependencies = [
  "arrow-data",
  "arrow-schema",
  "chrono",
- "chrono-tz 0.8.4",
+ "chrono-tz",
  "half 2.3.1",
  "hashbrown 0.14.3",
  "num",
@@ -551,19 +550,6 @@ dependencies = [
  "futures-core",
 ]
 
-[[package]]
-name = "async-compat"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f68a707c1feb095d8c07f8a65b9f506b117d30af431cab89374357de7c11461b"
-dependencies = [
- "futures-core",
- "futures-io",
- "once_cell",
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "async-compression"
 version = "0.3.15"
@@ -703,7 +689,6 @@ dependencies = [
  "common-macro",
  "common-test-util",
  "digest",
- "hex",
  "secrecy",
  "sha1",
  "snafu",
@@ -895,7 +880,6 @@ dependencies = [
  "client",
  "futures-util",
  "indicatif",
- "itertools 0.10.5",
  "parquet",
  "tokio",
 ]
@@ -913,12 +897,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "bimap"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -1256,8 +1234,6 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 name = "catalog"
 version = "0.7.1"
 dependencies = [
- "api",
- "arc-swap",
  "arrow",
  "arrow-schema",
  "async-stream",
@@ -1266,12 +1242,10 @@ dependencies = [
  "chrono",
  "common-catalog",
  "common-error",
- "common-grpc",
  "common-macro",
  "common-meta",
  "common-query",
  "common-recordbatch",
- "common-runtime",
  "common-telemetry",
  "common-test-util",
  "common-time",
@@ -1287,12 +1261,9 @@ dependencies = [
  "meta-client",
  "moka",
  "object-store",
- "parking_lot 0.12.1",
  "partition",
  "paste",
  "prometheus",
- "regex",
- "serde",
  "serde_json",
  "session",
  "snafu",
@@ -1388,17 +1359,6 @@ dependencies = [
  "windows-targets 0.52.0",
 ]
 
-[[package]]
-name = "chrono-tz"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c39203181991a7dd4343b8005bd804e7a9a37afb8ac070e43771e8c820bbde"
-dependencies = [
- "chrono",
- "chrono-tz-build 0.0.3",
- "phf",
-]
-
 [[package]]
 name = "chrono-tz"
 version = "0.8.4"
@@ -1406,21 +1366,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76"
 dependencies = [
  "chrono",
- "chrono-tz-build 0.2.1",
+ "chrono-tz-build",
  "phf",
 ]
 
-[[package]]
-name = "chrono-tz-build"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f509c3a87b33437b05e2458750a0700e5bdd6956176773e6c7d6dd15a283a0c"
-dependencies = [
- "parse-zoneinfo",
- "phf",
- "phf_codegen",
-]
-
 [[package]]
 name = "chrono-tz-build"
 version = "0.2.1"
@@ -1571,7 +1520,6 @@ dependencies = [
  "arrow-flight",
  "async-stream",
  "async-trait",
- "common-base",
  "common-catalog",
  "common-error",
  "common-grpc",
@@ -1581,12 +1529,8 @@ dependencies = [
  "common-query",
  "common-recordbatch",
  "common-telemetry",
- "common-time",
- "datafusion",
  "datanode",
- "datatypes",
  "derive-new 0.5.9",
- "derive_builder 0.12.0",
  "enum_dispatch",
  "futures-util",
  "lazy_static",
@@ -1595,9 +1539,7 @@ dependencies = [
  "prometheus",
  "prost 0.12.3",
  "rand",
- "serde",
  "serde_json",
- "session",
  "snafu",
  "substrait 0.17.1",
  "substrait 0.7.1",
@@ -1632,7 +1574,6 @@ dependencies = [
 name = "cmd"
 version = "0.7.1"
 dependencies = [
- "anymap",
  "async-trait",
  "auth",
  "catalog",
@@ -1668,7 +1609,6 @@ dependencies = [
  "meta-srv",
  "mito2",
  "nu-ansi-term",
- "partition",
  "plugins",
  "prometheus",
  "prost 0.12.3",
@@ -1755,7 +1695,6 @@ name = "common-config"
 version = "0.7.1"
 dependencies = [
  "common-base",
- "humantime-serde",
  "num_cpus",
  "serde",
  "sysinfo",
@@ -1797,7 +1736,6 @@ dependencies = [
 name = "common-decimal"
 version = "0.7.1"
 dependencies = [
- "arrow",
  "bigdecimal",
  "common-error",
  "common-macro",
@@ -1822,7 +1760,6 @@ dependencies = [
  "api",
  "arc-swap",
  "async-trait",
- "chrono-tz 0.6.3",
  "common-base",
  "common-catalog",
  "common-error",
@@ -1835,7 +1772,6 @@ dependencies = [
  "common-version",
  "datafusion",
  "datatypes",
- "libc",
  "num",
  "num-traits",
  "once_cell",
@@ -1855,7 +1791,6 @@ name = "common-greptimedb-telemetry"
 version = "0.7.1"
 dependencies = [
  "async-trait",
- "common-error",
  "common-runtime",
  "common-telemetry",
  "common-test-util",
@@ -1863,7 +1798,6 @@ dependencies = [
  "hyper",
  "reqwest",
  "serde",
- "serde_json",
  "tempfile",
  "tokio",
  "uuid",
@@ -1875,8 +1809,6 @@ version = "0.7.1"
 dependencies = [
  "api",
  "arrow-flight",
- "async-trait",
- "backtrace",
  "common-base",
  "common-error",
  "common-macro",
@@ -1886,10 +1818,8 @@ dependencies = [
  "common-time",
  "criterion",
  "dashmap",
- "datafusion",
  "datatypes",
  "flatbuffers",
- "futures",
  "lazy_static",
  "prost 0.12.3",
  "rand",
@@ -1904,13 +1834,11 @@ name = "common-grpc-expr"
 version = "0.7.1"
 dependencies = [
  "api",
- "async-trait",
  "common-base",
  "common-catalog",
  "common-error",
  "common-macro",
  "common-query",
- "common-telemetry",
  "common-time",
  "datatypes",
  "paste",
@@ -1952,7 +1880,6 @@ version = "0.7.1"
 dependencies = [
  "api",
  "async-recursion",
- "async-stream",
  "async-trait",
  "base64 0.21.5",
  "bytes",
@@ -1965,7 +1892,6 @@ dependencies = [
  "common-procedure",
  "common-procedure-test",
  "common-recordbatch",
- "common-runtime",
  "common-telemetry",
  "common-time",
  "common-wal",
@@ -1993,6 +1919,7 @@ dependencies = [
  "table",
  "tokio",
  "tonic 0.10.2",
+ "typetag",
  "uuid",
 ]
 
@@ -2060,14 +1987,12 @@ name = "common-recordbatch"
 version = "0.7.1"
 dependencies = [
  "arc-swap",
- "common-base",
  "common-error",
  "common-macro",
  "datafusion",
  "datafusion-common",
  "datatypes",
  "futures",
- "paste",
  "pin-project",
  "serde",
  "serde_json",
@@ -2117,7 +2042,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-appender",
- "tracing-futures",
  "tracing-log 0.1.4",
  "tracing-opentelemetry",
  "tracing-subscriber",
@@ -2141,7 +2065,7 @@ version = "0.7.1"
 dependencies = [
  "arrow",
  "chrono",
- "chrono-tz 0.8.4",
+ "chrono-tz",
  "common-error",
  "common-macro",
  "once_cell",
@@ -2812,21 +2736,15 @@ version = "0.7.1"
 dependencies = [
  "api",
  "arrow-flight",
- "async-compat",
- "async-stream",
  "async-trait",
  "bytes",
  "catalog",
  "client",
  "common-base",
- "common-catalog",
- "common-config",
- "common-datasource",
  "common-error",
  "common-function",
  "common-greptimedb-telemetry",
  "common-grpc",
- "common-grpc-expr",
  "common-macro",
  "common-meta",
  "common-procedure",
@@ -2846,36 +2764,27 @@ dependencies = [
  "futures",
  "futures-util",
  "humantime-serde",
- "hyper",
  "lazy_static",
  "log-store",
  "meta-client",
  "metric-engine",
  "mito2",
  "object-store",
- "pin-project",
  "prometheus",
  "prost 0.12.3",
  "query",
  "reqwest",
  "secrecy",
  "serde",
- "serde_json",
  "servers",
  "session",
  "snafu",
- "sql",
  "store-api",
  "substrait 0.7.1",
  "table",
  "tokio",
- "tokio-stream",
  "toml 0.8.8",
  "tonic 0.10.2",
- "tower",
- "tower-http",
- "url",
- "uuid",
 ]
 
 [[package]]
@@ -2897,7 +2806,6 @@ dependencies = [
  "num-traits",
  "ordered-float 3.9.2",
  "paste",
- "rust_decimal",
  "serde",
  "serde_json",
  "snafu",
@@ -3471,12 +3379,9 @@ name = "flow"
 version = "0.7.1"
 dependencies = [
  "api",
- "bimap",
  "common-decimal",
  "common-error",
  "common-macro",
- "common-meta",
- "common-query",
  "common-telemetry",
  "common-time",
  "datatypes",
@@ -3487,7 +3392,6 @@ dependencies = [
  "serde",
  "serde_json",
  "servers",
- "session",
  "smallvec",
  "snafu",
  "tokio",
@@ -3530,22 +3434,16 @@ version = "0.7.1"
 dependencies = [
  "api",
  "arc-swap",
- "arrow-flight",
- "async-compat",
- "async-stream",
  "async-trait",
  "auth",
  "catalog",
- "chrono",
  "client",
  "common-base",
  "common-catalog",
  "common-config",
  "common-datasource",
  "common-error",
- "common-function",
  "common-grpc",
- "common-grpc-expr",
  "common-macro",
  "common-meta",
  "common-procedure",
@@ -3554,24 +3452,13 @@ dependencies = [
  "common-runtime",
  "common-telemetry",
  "common-test-util",
- "common-time",
- "datafusion",
- "datafusion-common",
- "datafusion-expr",
  "datanode",
- "datatypes",
- "file-engine",
  "futures",
- "futures-util",
  "humantime-serde",
- "itertools 0.10.5",
  "lazy_static",
  "log-store",
  "meta-client",
  "meta-srv",
- "moka",
- "object-store",
- "openmetrics-parser",
  "opentelemetry-proto 0.3.0",
  "operator",
  "partition",
@@ -3579,10 +3466,8 @@ dependencies = [
  "prost 0.12.3",
  "query",
  "raft-engine",
- "regex",
  "script",
  "serde",
- "serde_json",
  "servers",
  "session",
  "snafu",
@@ -3590,7 +3475,6 @@ dependencies = [
  "sqlparser 0.38.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=6a93567ae38d42be5c8d08b13c8ff4dde26502ef)",
  "store-api",
  "strfmt",
- "substrait 0.7.1",
  "table",
  "tokio",
  "toml 0.8.8",
@@ -3870,7 +3754,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 [[package]]
 name = "greptime-proto"
 version = "0.1.0"
-source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=96f1f0404f421ee560a4310c73c5071e49168168#96f1f0404f421ee560a4310c73c5071e49168168"
+source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=06f6297ff3cab578a1589741b504342fbad70453#06f6297ff3cab578a1589741b504342fbad70453"
 dependencies = [
  "prost 0.12.3",
  "serde",
@@ -4377,7 +4261,7 @@ dependencies = [
  "prost 0.12.3",
  "rand",
  "regex",
- "regex-automata 0.2.0",
+ "regex-automata 0.4.3",
  "snafu",
  "tempfile",
  "tokio",
@@ -4942,11 +4826,8 @@ version = "0.7.1"
 dependencies = [
  "async-stream",
  "async-trait",
- "byteorder",
- "bytes",
  "chrono",
  "common-base",
- "common-config",
  "common-error",
  "common-macro",
  "common-meta",
@@ -4955,7 +4836,6 @@ dependencies = [
  "common-test-util",
  "common-time",
  "common-wal",
- "dashmap",
  "futures",
  "futures-util",
  "itertools 0.10.5",
@@ -4970,7 +4850,6 @@ dependencies = [
  "snafu",
  "store-api",
  "tokio",
- "tokio-util",
  "uuid",
 ]
 
@@ -5231,22 +5110,18 @@ version = "0.7.1"
 dependencies = [
  "api",
  "async-trait",
- "chrono",
  "common-error",
  "common-grpc",
  "common-macro",
  "common-meta",
  "common-telemetry",
  "datatypes",
- "etcd-client",
  "futures",
  "humantime-serde",
  "meta-srv",
  "rand",
  "serde",
- "serde_json",
  "snafu",
- "table",
  "tokio",
  "tokio-stream",
  "tonic 0.10.2",
@@ -5259,11 +5134,8 @@ dependencies = [
 name = "meta-srv"
 version = "0.7.1"
 dependencies = [
- "anymap",
  "api",
- "async-stream",
  "async-trait",
- "catalog",
  "chrono",
  "client",
  "common-base",
@@ -5271,7 +5143,6 @@ dependencies = [
  "common-error",
  "common-greptimedb-telemetry",
  "common-grpc",
- "common-grpc-expr",
  "common-macro",
  "common-meta",
  "common-procedure",
@@ -5303,7 +5174,6 @@ dependencies = [
  "session",
  "snafu",
  "store-api",
- "strum 0.25.0",
  "table",
  "tokio",
  "tokio-stream",
@@ -5314,7 +5184,6 @@ dependencies = [
  "tracing-subscriber",
  "typetag",
  "url",
- "uuid",
 ]
 
 [[package]]
@@ -5411,23 +5280,18 @@ dependencies = [
 name = "mito2"
 version = "0.7.1"
 dependencies = [
- "anymap",
  "api",
  "aquamarine",
- "arc-swap",
  "async-channel",
  "async-stream",
  "async-trait",
  "bytes",
- "chrono",
  "common-base",
- "common-catalog",
  "common-config",
  "common-datasource",
  "common-decimal",
  "common-error",
  "common-macro",
- "common-procedure",
  "common-procedure-test",
  "common-query",
  "common-recordbatch",
@@ -5437,7 +5301,6 @@ dependencies = [
  "common-time",
  "common-wal",
  "criterion",
- "dashmap",
  "datafusion",
  "datafusion-common",
  "datafusion-expr",
@@ -6028,9 +5891,6 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bytes",
- "common-error",
- "common-macro",
- "common-runtime",
  "common-telemetry",
  "common-test-util",
  "futures",
@@ -6039,7 +5899,6 @@ dependencies = [
  "moka",
  "opendal",
  "prometheus",
- "snafu",
  "tokio",
  "uuid",
 ]
@@ -6270,7 +6129,6 @@ version = "0.7.1"
 dependencies = [
  "api",
  "async-trait",
- "auth",
  "catalog",
  "chrono",
  "client",
@@ -6297,7 +6155,6 @@ dependencies = [
  "futures-util",
  "lazy_static",
  "meta-client",
- "meter-core",
  "meter-macros",
  "object-store",
  "partition",
@@ -6305,7 +6162,6 @@ dependencies = [
  "prometheus",
  "query",
  "regex",
- "serde",
  "serde_json",
  "servers",
  "session",
@@ -6313,7 +6169,6 @@ dependencies = [
  "sql",
  "sqlparser 0.38.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=6a93567ae38d42be5c8d08b13c8ff4dde26502ef)",
  "store-api",
- "substrait 0.7.1",
  "table",
  "tokio",
  "tonic 0.10.2",
@@ -6548,21 +6403,14 @@ version = "0.7.1"
 dependencies = [
  "api",
  "async-trait",
- "common-catalog",
  "common-error",
  "common-macro",
  "common-meta",
  "common-query",
- "common-telemetry",
- "datafusion",
  "datafusion-common",
  "datafusion-expr",
  "datatypes",
  "itertools 0.10.5",
- "lazy_static",
- "meta-client",
- "moka",
- "prometheus",
  "serde",
  "serde_json",
  "snafu",
@@ -6773,7 +6621,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
 dependencies = [
  "siphasher",
- "uncased",
 ]
 
 [[package]]
@@ -7516,7 +7363,6 @@ dependencies = [
  "async-trait",
  "catalog",
  "chrono",
- "client",
  "common-base",
  "common-catalog",
  "common-datasource",
@@ -7548,15 +7394,12 @@ dependencies = [
  "num-traits",
  "object-store",
  "once_cell",
- "partition",
  "paste",
  "prometheus",
  "promql",
  "promql-parser",
  "rand",
  "regex",
- "serde",
- "serde_json",
  "session",
  "snafu",
  "sql",
@@ -7800,17 +7643,6 @@ dependencies = [
  "regex-syntax 0.6.29",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782"
-dependencies = [
- "fst",
- "memchr",
- "regex-syntax 0.6.29",
-]
-
 [[package]]
 name = "regex-automata"
 version = "0.4.3"
@@ -8907,7 +8739,6 @@ dependencies = [
  "datafusion-physical-expr",
  "datatypes",
  "futures",
- "futures-util",
  "lazy_static",
  "log-store",
  "once_cell",
@@ -8918,7 +8749,6 @@ dependencies = [
  "query",
  "rayon",
  "ron",
- "rustpython-ast",
  "rustpython-codegen",
  "rustpython-compiler",
  "rustpython-compiler-core",
@@ -8931,7 +8761,6 @@ dependencies = [
  "session",
  "snafu",
  "sql",
- "store-api",
  "table",
  "tokio",
  "tokio-test",
@@ -9187,7 +9016,6 @@ dependencies = [
  "common-catalog",
  "common-error",
  "common-grpc",
- "common-grpc-expr",
  "common-macro",
  "common-mem-prof",
  "common-meta",
@@ -9202,14 +9030,11 @@ dependencies = [
  "criterion",
  "datafusion",
  "datafusion-common",
- "datafusion-expr",
  "datatypes",
  "derive_builder 0.12.0",
- "digest",
  "futures",
  "hashbrown 0.14.3",
  "headers",
- "hex",
  "hostname",
  "http-body",
  "humantime-serde",
@@ -9248,7 +9073,6 @@ dependencies = [
  "serde",
  "serde_json",
  "session",
- "sha1",
  "snafu",
  "snap",
  "sql",
@@ -9277,10 +9101,8 @@ dependencies = [
  "arc-swap",
  "auth",
  "common-catalog",
- "common-telemetry",
  "common-time",
  "derive_builder 0.12.0",
- "snafu",
  "sql",
 ]
 
@@ -9562,7 +9384,6 @@ dependencies = [
  "hex",
  "itertools 0.10.5",
  "lazy_static",
- "once_cell",
  "regex",
  "snafu",
  "sqlparser 0.38.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=6a93567ae38d42be5c8d08b13c8ff4dde26502ef)",
@@ -9603,9 +9424,7 @@ dependencies = [
  "async-trait",
  "clap 4.4.11",
  "client",
- "common-base",
  "common-error",
- "common-grpc",
  "common-query",
  "common-recordbatch",
  "common-time",
@@ -9811,13 +9630,11 @@ dependencies = [
  "aquamarine",
  "async-stream",
  "async-trait",
- "bytes",
  "common-base",
  "common-error",
  "common-macro",
  "common-query",
  "common-recordbatch",
- "common-time",
  "common-wal",
  "datatypes",
  "derive_builder 0.12.0",
@@ -9947,26 +9764,20 @@ dependencies = [
 name = "substrait"
 version = "0.7.1"
 dependencies = [
- "async-recursion",
  "async-trait",
  "bytes",
  "catalog",
- "common-catalog",
  "common-error",
  "common-macro",
- "common-telemetry",
  "datafusion",
  "datafusion-common",
  "datafusion-expr",
  "datafusion-substrait",
  "datatypes",
- "futures",
  "promql",
  "prost 0.12.3",
- "session",
  "snafu",
  "substrait 0.17.1",
- "table",
  "tokio",
 ]
 
@@ -10120,7 +9931,6 @@ dependencies = [
 name = "table"
 version = "0.7.1"
 dependencies = [
- "anymap",
  "async-trait",
  "chrono",
  "common-base",
@@ -10128,7 +9938,6 @@ dependencies = [
  "common-datasource",
  "common-error",
  "common-macro",
- "common-procedure",
  "common-query",
  "common-recordbatch",
  "common-telemetry",
@@ -10296,23 +10105,19 @@ dependencies = [
  "meta-srv",
  "mysql_async",
  "object-store",
- "once_cell",
  "opentelemetry-proto 0.3.0",
  "operator",
  "partition",
  "paste",
  "prost 0.12.3",
  "query",
- "rand",
  "rstest",
  "rstest_reuse",
  "script",
  "secrecy",
- "serde",
  "serde_json",
  "servers",
  "session",
- "snafu",
  "sql",
  "sqlx",
  "store-api",
@@ -10960,18 +10765,6 @@ dependencies = [
  "valuable",
 ]
 
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "futures",
- "futures-task",
- "pin-project",
- "tracing",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.1.4"
@@ -11268,15 +11061,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "uncased"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index 4681c6535479..cebad1ef89b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -103,7 +103,7 @@ etcd-client = "0.12"
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "96f1f0404f421ee560a4310c73c5071e49168168" }
+greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "06f6297ff3cab578a1589741b504342fbad70453" }
 humantime-serde = "1.1"
 itertools = "0.10"
 lazy_static = "1.4"
@@ -125,7 +125,7 @@ prost = "0.12"
 raft-engine = { version = "0.4.1", default-features = false }
 rand = "0.8"
 regex = "1.8"
-regex-automata = { version = "0.2", features = ["transducer"] }
+regex-automata = { version = "0.4" }
 reqwest = { version = "0.11", default-features = false, features = [
     "json",
     "rustls-tls-native-roots",
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
index c2fddd474ab1..862579b26dfb 100644
--- a/benchmarks/Cargo.toml
+++ b/benchmarks/Cargo.toml
@@ -14,6 +14,5 @@ clap.workspace = true
 client.workspace = true
 futures-util.workspace = true
 indicatif = "0.17.1"
-itertools.workspace = true
 parquet.workspace = true
 tokio.workspace = true
diff --git a/licenserc.toml b/licenserc.toml
index 8bcf6c452410..f01f7727e813 100644
--- a/licenserc.toml
+++ b/licenserc.toml
@@ -19,6 +19,12 @@ includes = [
     "*.py",
 ]
 
+excludes = [
+    # copied sources
+    "src/common/base/src/readable_size.rs",
+    "src/servers/src/repeated_field.rs",
+]
+
 [properties]
 inceptionYear = 2023
 copyrightOwner = "Greptime Team"
diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml
index d3390e6c213f..cd1837465bd7 100644
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@@ -18,7 +18,6 @@ greptime-proto.workspace = true
 paste = "1.0"
 prost.workspace = true
 snafu.workspace = true
-tonic.workspace = true
 
 [build-dependencies]
 tonic-build = "0.9"
diff --git a/src/auth/Cargo.toml b/src/auth/Cargo.toml
index d50b63fcfcbf..a3e9f199a1b1 100644
--- a/src/auth/Cargo.toml
+++ b/src/auth/Cargo.toml
@@ -17,7 +17,6 @@ async-trait.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
 digest = "0.10"
-hex = { version = "0.4" }
 secrecy = { version = "0.8", features = ["serde", "alloc"] }
 sha1 = "0.10"
 snafu.workspace = true
diff --git a/src/auth/src/common.rs b/src/auth/src/common.rs
index 16e1ecec2b4c..109a98175d4c 100644
--- a/src/auth/src/common.rs
+++ b/src/auth/src/common.rs
@@ -40,7 +40,7 @@ pub fn user_provider_from_option(opt: &String) -> Result<UserProviderRef> {
     match name {
         STATIC_USER_PROVIDER => {
             let provider =
-                StaticUserProvider::try_from(content).map(|p| Arc::new(p) as UserProviderRef)?;
+                StaticUserProvider::new(content).map(|p| Arc::new(p) as UserProviderRef)?;
             Ok(provider)
         }
         _ => InvalidConfigSnafu {
diff --git a/src/auth/src/user_provider/static_user_provider.rs b/src/auth/src/user_provider/static_user_provider.rs
index 591a116b9281..e6d474389431 100644
--- a/src/auth/src/user_provider/static_user_provider.rs
+++ b/src/auth/src/user_provider/static_user_provider.rs
@@ -23,7 +23,7 @@ use secrecy::ExposeSecret;
 use snafu::{ensure, OptionExt, ResultExt};
 
 use crate::error::{
-    Error, IllegalParamSnafu, InvalidConfigSnafu, IoSnafu, Result, UnsupportedPasswordTypeSnafu,
+    IllegalParamSnafu, InvalidConfigSnafu, IoSnafu, Result, UnsupportedPasswordTypeSnafu,
     UserNotFoundSnafu, UserPasswordMismatchSnafu,
 };
 use crate::user_info::DefaultUserInfo;
@@ -31,10 +31,12 @@ use crate::{auth_mysql, Identity, Password, UserInfoRef, UserProvider};
 
 pub(crate) const STATIC_USER_PROVIDER: &str = "static_user_provider";
 
-impl TryFrom<&str> for StaticUserProvider {
-    type Error = Error;
+pub(crate) struct StaticUserProvider {
+    users: HashMap<String, Vec<u8>>,
+}
 
-    fn try_from(value: &str) -> Result<Self> {
+impl StaticUserProvider {
+    pub(crate) fn new(value: &str) -> Result<Self> {
         let (mode, content) = value.split_once(':').context(InvalidConfigSnafu {
             value: value.to_string(),
             msg: "StaticUserProviderOption must be in format `<option>:<value>`",
@@ -83,15 +85,11 @@ impl TryFrom<&str> for StaticUserProvider {
                 value: mode.to_string(),
                 msg: "StaticUserProviderOption must be in format `file:<path>` or `cmd:<values>`",
             }
-            .fail(),
+                .fail(),
         };
     }
 }
 
-pub(crate) struct StaticUserProvider {
-    users: HashMap<String, Vec<u8>>,
-}
-
 #[async_trait]
 impl UserProvider for StaticUserProvider {
     fn name(&self) -> &str {
@@ -181,7 +179,7 @@ pub mod test {
     #[tokio::test]
     async fn test_authorize() {
         let user_info = DefaultUserInfo::with_name("root");
-        let provider = StaticUserProvider::try_from("cmd:root=123456,admin=654321").unwrap();
+        let provider = StaticUserProvider::new("cmd:root=123456,admin=654321").unwrap();
         provider
             .authorize("catalog", "schema", &user_info)
             .await
@@ -190,7 +188,7 @@ pub mod test {
 
     #[tokio::test]
     async fn test_inline_provider() {
-        let provider = StaticUserProvider::try_from("cmd:root=123456,admin=654321").unwrap();
+        let provider = StaticUserProvider::new("cmd:root=123456,admin=654321").unwrap();
         test_authenticate(&provider, "root", "123456").await;
         test_authenticate(&provider, "admin", "654321").await;
     }
@@ -214,7 +212,7 @@ admin=654321",
         }
 
         let param = format!("file:{file_path}");
-        let provider = StaticUserProvider::try_from(param.as_str()).unwrap();
+        let provider = StaticUserProvider::new(param.as_str()).unwrap();
         test_authenticate(&provider, "root", "123456").await;
         test_authenticate(&provider, "admin", "654321").await;
     }
diff --git a/src/catalog/Cargo.toml b/src/catalog/Cargo.toml
index e16eadfdf8c1..8d91421ebaac 100644
--- a/src/catalog/Cargo.toml
+++ b/src/catalog/Cargo.toml
@@ -11,20 +11,16 @@ testing = []
 workspace = true
 
 [dependencies]
-api.workspace = true
-arc-swap = "1.0"
 arrow.workspace = true
 arrow-schema.workspace = true
 async-stream.workspace = true
 async-trait = "0.1"
 common-catalog.workspace = true
 common-error.workspace = true
-common-grpc.workspace = true
 common-macro.workspace = true
 common-meta.workspace = true
 common-query.workspace = true
 common-recordbatch.workspace = true
-common-runtime.workspace = true
 common-telemetry.workspace = true
 common-time.workspace = true
 common-version.workspace = true
@@ -37,12 +33,9 @@ itertools.workspace = true
 lazy_static.workspace = true
 meta-client.workspace = true
 moka = { workspace = true, features = ["future", "sync"] }
-parking_lot = "0.12"
 partition.workspace = true
 paste = "1.0"
 prometheus.workspace = true
-regex.workspace = true
-serde.workspace = true
 serde_json.workspace = true
 session.workspace = true
 snafu.workspace = true
diff --git a/src/catalog/src/kvbackend/manager.rs b/src/catalog/src/kvbackend/manager.rs
index 6a6038f1daea..327a08180975 100644
--- a/src/catalog/src/kvbackend/manager.rs
+++ b/src/catalog/src/kvbackend/manager.rs
@@ -138,8 +138,7 @@ impl CatalogManager for KvBackendCatalogManager {
         let stream = self
             .table_metadata_manager
             .catalog_manager()
-            .catalog_names()
-            .await;
+            .catalog_names();
 
         let keys = stream
             .try_collect::<Vec<_>>()
@@ -154,8 +153,7 @@ impl CatalogManager for KvBackendCatalogManager {
         let stream = self
             .table_metadata_manager
             .schema_manager()
-            .schema_names(catalog)
-            .await;
+            .schema_names(catalog);
         let mut keys = stream
             .try_collect::<BTreeSet<_>>()
             .await
@@ -171,8 +169,7 @@ impl CatalogManager for KvBackendCatalogManager {
         let stream = self
             .table_metadata_manager
             .table_name_manager()
-            .tables(catalog, schema)
-            .await;
+            .tables(catalog, schema);
         let mut tables = stream
             .try_collect::<Vec<_>>()
             .await
@@ -297,7 +294,6 @@ impl CatalogManager for KvBackendCatalogManager {
             .table_metadata_manager
             .table_name_manager()
             .tables(catalog, schema)
-            .await
             .map_ok(|(_, v)| v.table_id());
         const BATCH_SIZE: usize = 128;
         let user_tables = try_stream!({
diff --git a/src/client/Cargo.toml b/src/client/Cargo.toml
index 914c808c6661..3c5f2a68fb76 100644
--- a/src/client/Cargo.toml
+++ b/src/client/Cargo.toml
@@ -16,7 +16,6 @@ arc-swap = "1.6"
 arrow-flight.workspace = true
 async-stream.workspace = true
 async-trait.workspace = true
-common-base.workspace = true
 common-catalog.workspace = true
 common-error.workspace = true
 common-grpc.workspace = true
@@ -25,10 +24,6 @@ common-meta.workspace = true
 common-query.workspace = true
 common-recordbatch.workspace = true
 common-telemetry.workspace = true
-common-time.workspace = true
-datafusion.workspace = true
-datatypes.workspace = true
-derive_builder.workspace = true
 enum_dispatch = "0.3"
 futures-util.workspace = true
 lazy_static.workspace = true
@@ -37,9 +32,7 @@ parking_lot = "0.12"
 prometheus.workspace = true
 prost.workspace = true
 rand.workspace = true
-serde.workspace = true
 serde_json.workspace = true
-session.workspace = true
 snafu.workspace = true
 tokio.workspace = true
 tokio-stream = { workspace = true, features = ["net"] }
diff --git a/src/client/src/region.rs b/src/client/src/region.rs
index 819c4453f9a2..39c5ddddcc64 100644
--- a/src/client/src/region.rs
+++ b/src/client/src/region.rs
@@ -14,7 +14,7 @@
 
 use std::sync::Arc;
 
-use api::v1::region::{QueryRequest, RegionRequest, RegionResponse};
+use api::v1::region::{QueryRequest, RegionRequest};
 use api::v1::ResponseHeader;
 use arc_swap::ArcSwapOption;
 use arrow_flight::Ticket;
@@ -23,7 +23,7 @@ use async_trait::async_trait;
 use common_error::ext::{BoxedError, ErrorExt};
 use common_error::status_code::StatusCode;
 use common_grpc::flight::{FlightDecoder, FlightMessage};
-use common_meta::datanode_manager::{AffectedRows, Datanode};
+use common_meta::datanode_manager::{Datanode, HandleResponse};
 use common_meta::error::{self as meta_error, Result as MetaResult};
 use common_recordbatch::error::ExternalSnafu;
 use common_recordbatch::{RecordBatchStreamWrapper, SendableRecordBatchStream};
@@ -46,7 +46,7 @@ pub struct RegionRequester {
 
 #[async_trait]
 impl Datanode for RegionRequester {
-    async fn handle(&self, request: RegionRequest) -> MetaResult<AffectedRows> {
+    async fn handle(&self, request: RegionRequest) -> MetaResult<HandleResponse> {
         self.handle_inner(request).await.map_err(|err| {
             if err.should_retry() {
                 meta_error::Error::RetryLater {
@@ -165,7 +165,7 @@ impl RegionRequester {
         Ok(Box::pin(record_batch_stream))
     }
 
-    async fn handle_inner(&self, request: RegionRequest) -> Result<AffectedRows> {
+    async fn handle_inner(&self, request: RegionRequest) -> Result<HandleResponse> {
         let request_type = request
             .body
             .as_ref()
@@ -178,10 +178,7 @@ impl RegionRequester {
 
         let mut client = self.client.raw_region_client()?;
 
-        let RegionResponse {
-            header,
-            affected_rows,
-        } = client
+        let response = client
             .handle(request)
             .await
             .map_err(|e| {
@@ -195,19 +192,20 @@ impl RegionRequester {
             })?
             .into_inner();
 
-        check_response_header(header)?;
+        check_response_header(&response.header)?;
 
-        Ok(affected_rows as _)
+        Ok(HandleResponse::from_region_response(response))
     }
 
-    pub async fn handle(&self, request: RegionRequest) -> Result<AffectedRows> {
+    pub async fn handle(&self, request: RegionRequest) -> Result<HandleResponse> {
         self.handle_inner(request).await
     }
 }
 
-pub fn check_response_header(header: Option<ResponseHeader>) -> Result<()> {
+pub fn check_response_header(header: &Option<ResponseHeader>) -> Result<()> {
     let status = header
-        .and_then(|header| header.status)
+        .as_ref()
+        .and_then(|header| header.status.as_ref())
         .context(IllegalDatabaseResponseSnafu {
             err_msg: "either response header or status is missing",
         })?;
@@ -221,7 +219,7 @@ pub fn check_response_header(header: Option<ResponseHeader>) -> Result<()> {
             })?;
         ServerSnafu {
             code,
-            msg: status.err_msg,
+            msg: status.err_msg.clone(),
         }
         .fail()
     }
@@ -236,19 +234,19 @@ mod test {
 
     #[test]
     fn test_check_response_header() {
-        let result = check_response_header(None);
+        let result = check_response_header(&None);
         assert!(matches!(
             result.unwrap_err(),
             IllegalDatabaseResponse { .. }
         ));
 
-        let result = check_response_header(Some(ResponseHeader { status: None }));
+        let result = check_response_header(&Some(ResponseHeader { status: None }));
         assert!(matches!(
             result.unwrap_err(),
             IllegalDatabaseResponse { .. }
         ));
 
-        let result = check_response_header(Some(ResponseHeader {
+        let result = check_response_header(&Some(ResponseHeader {
             status: Some(PbStatus {
                 status_code: StatusCode::Success as u32,
                 err_msg: String::default(),
@@ -256,7 +254,7 @@ mod test {
         }));
         assert!(result.is_ok());
 
-        let result = check_response_header(Some(ResponseHeader {
+        let result = check_response_header(&Some(ResponseHeader {
             status: Some(PbStatus {
                 status_code: u32::MAX,
                 err_msg: String::default(),
@@ -267,7 +265,7 @@ mod test {
             IllegalDatabaseResponse { .. }
         ));
 
-        let result = check_response_header(Some(ResponseHeader {
+        let result = check_response_header(&Some(ResponseHeader {
             status: Some(PbStatus {
                 status_code: StatusCode::Internal as u32,
                 err_msg: "blabla".to_string(),
diff --git a/src/cmd/Cargo.toml b/src/cmd/Cargo.toml
index d6e11b68a376..3cd340e61cfb 100644
--- a/src/cmd/Cargo.toml
+++ b/src/cmd/Cargo.toml
@@ -16,7 +16,6 @@ tokio-console = ["common-telemetry/tokio-console"]
 workspace = true
 
 [dependencies]
-anymap = "1.0.0-beta.2"
 async-trait.workspace = true
 auth.workspace = true
 catalog.workspace = true
@@ -52,7 +51,6 @@ meta-client.workspace = true
 meta-srv.workspace = true
 mito2.workspace = true
 nu-ansi-term = "0.46"
-partition.workspace = true
 plugins.workspace = true
 prometheus.workspace = true
 prost.workspace = true
diff --git a/src/cmd/build.rs b/src/cmd/build.rs
index 5b7f1458843c..87615c2c990f 100644
--- a/src/cmd/build.rs
+++ b/src/cmd/build.rs
@@ -13,5 +13,8 @@
 // limitations under the License.
 
 fn main() {
+    // Trigger this script if the git branch/commit changes
+    println!("cargo:rerun-if-changed=.git/refs/heads");
+
     common_version::setup_build_info();
 }
diff --git a/src/cmd/src/frontend.rs b/src/cmd/src/frontend.rs
index 124330ee477e..39c7982eae79 100644
--- a/src/cmd/src/frontend.rs
+++ b/src/cmd/src/frontend.rs
@@ -16,7 +16,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use async_trait::async_trait;
-use catalog::kvbackend::CachedMetaKvBackendBuilder;
+use catalog::kvbackend::{CachedMetaKvBackendBuilder, KvBackendCatalogManager};
 use clap::Parser;
 use client::client_manager::DatanodeClients;
 use common_meta::heartbeat::handler::parse_mailbox_message::ParseMailboxMessageHandler;
@@ -248,11 +248,12 @@ impl StartCommand {
             .build();
         let cached_meta_backend = Arc::new(cached_meta_backend);
 
+        let catalog_manager =
+            KvBackendCatalogManager::new(cached_meta_backend.clone(), cached_meta_backend.clone());
+
         let executor = HandlerGroupExecutor::new(vec![
             Arc::new(ParseMailboxMessageHandler),
-            Arc::new(InvalidateTableCacheHandler::new(
-                cached_meta_backend.clone(),
-            )),
+            Arc::new(InvalidateTableCacheHandler::new(catalog_manager.clone())),
         ]);
 
         let heartbeat_task = HeartbeatTask::new(
@@ -263,10 +264,11 @@ impl StartCommand {
 
         let mut instance = FrontendBuilder::new(
             cached_meta_backend.clone(),
+            catalog_manager.clone(),
             Arc::new(DatanodeClients::default()),
             meta_client,
         )
-        .with_cache_invalidator(cached_meta_backend)
+        .with_cache_invalidator(catalog_manager.clone())
         .with_plugin(plugins.clone())
         .with_heartbeat_task(heartbeat_task)
         .try_build()
diff --git a/src/cmd/src/standalone.rs b/src/cmd/src/standalone.rs
index c8b0385cfe44..4082b8aa9e14 100644
--- a/src/cmd/src/standalone.rs
+++ b/src/cmd/src/standalone.rs
@@ -16,10 +16,11 @@ use std::sync::Arc;
 use std::{fs, path};
 
 use async_trait::async_trait;
+use catalog::kvbackend::KvBackendCatalogManager;
 use clap::Parser;
 use common_catalog::consts::MIN_USER_TABLE_ID;
 use common_config::{metadata_store_dir, KvBackendConfig};
-use common_meta::cache_invalidator::DummyCacheInvalidator;
+use common_meta::cache_invalidator::{CacheInvalidatorRef, DummyCacheInvalidator};
 use common_meta::datanode_manager::DatanodeManagerRef;
 use common_meta::ddl::table_meta::{TableMetadataAllocator, TableMetadataAllocatorRef};
 use common_meta::ddl::ProcedureExecutorRef;
@@ -399,6 +400,9 @@ impl StartCommand {
         .await
         .context(StartFrontendSnafu)?;
 
+        let catalog_manager =
+            KvBackendCatalogManager::new(kv_backend.clone(), Arc::new(DummyCacheInvalidator));
+
         let builder =
             DatanodeBuilder::new(dn_opts, fe_plugins.clone()).with_kv_backend(kv_backend.clone());
         let datanode = builder.build().await.context(StartDatanodeSnafu)?;
@@ -429,15 +433,22 @@ impl StartCommand {
             table_metadata_manager,
             procedure_manager.clone(),
             datanode_manager.clone(),
+            catalog_manager.clone(),
             table_meta_allocator,
         )
         .await?;
 
-        let mut frontend = FrontendBuilder::new(kv_backend, datanode_manager, ddl_task_executor)
-            .with_plugin(fe_plugins.clone())
-            .try_build()
-            .await
-            .context(StartFrontendSnafu)?;
+        let mut frontend = FrontendBuilder::new(
+            kv_backend,
+            catalog_manager.clone(),
+            datanode_manager,
+            ddl_task_executor,
+        )
+        .with_plugin(fe_plugins.clone())
+        .with_cache_invalidator(catalog_manager)
+        .try_build()
+        .await
+        .context(StartFrontendSnafu)?;
 
         let servers = Services::new(fe_opts.clone(), Arc::new(frontend.clone()), fe_plugins)
             .build()
@@ -459,13 +470,14 @@ impl StartCommand {
         table_metadata_manager: TableMetadataManagerRef,
         procedure_manager: ProcedureManagerRef,
         datanode_manager: DatanodeManagerRef,
+        cache_invalidator: CacheInvalidatorRef,
         table_meta_allocator: TableMetadataAllocatorRef,
     ) -> Result<ProcedureExecutorRef> {
         let procedure_executor: ProcedureExecutorRef = Arc::new(
             DdlManager::try_new(
                 procedure_manager,
                 datanode_manager,
-                Arc::new(DummyCacheInvalidator),
+                cache_invalidator,
                 table_metadata_manager,
                 table_meta_allocator,
                 Arc::new(MemoryRegionKeeper::default()),
diff --git a/src/common/base/src/readable_size.rs b/src/common/base/src/readable_size.rs
index 8c539f3f782b..21908526c72a 100644
--- a/src/common/base/src/readable_size.rs
+++ b/src/common/base/src/readable_size.rs
@@ -1,20 +1,6 @@
 // Copyright (c) 2017-present, PingCAP, Inc. Licensed under Apache-2.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.
-
-// This file is copied from https://github.com/tikv/raft-engine/blob/8dd2a39f359ff16f5295f35343f626e0c10132fa/src/util.rs
+// This file is copied from https://github.com/tikv/raft-engine/blob/0.3.0/src/util.rs
 
 use std::fmt::{self, Debug, Display, Write};
 use std::ops::{Div, Mul};
diff --git a/src/common/config/Cargo.toml b/src/common/config/Cargo.toml
index dccd1f2df4a3..e85f220c651e 100644
--- a/src/common/config/Cargo.toml
+++ b/src/common/config/Cargo.toml
@@ -9,7 +9,6 @@ workspace = true
 
 [dependencies]
 common-base.workspace = true
-humantime-serde.workspace = true
 num_cpus.workspace = true
 serde.workspace = true
 sysinfo.workspace = true
diff --git a/src/common/decimal/Cargo.toml b/src/common/decimal/Cargo.toml
index 671364d49fae..5812e6a43d53 100644
--- a/src/common/decimal/Cargo.toml
+++ b/src/common/decimal/Cargo.toml
@@ -8,7 +8,6 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-arrow.workspace = true
 bigdecimal.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
diff --git a/src/common/function/Cargo.toml b/src/common/function/Cargo.toml
index d6570782d489..ae71af6d8f5c 100644
--- a/src/common/function/Cargo.toml
+++ b/src/common/function/Cargo.toml
@@ -11,7 +11,6 @@ workspace = true
 api.workspace = true
 arc-swap = "1.0"
 async-trait.workspace = true
-chrono-tz = "0.6"
 common-base.workspace = true
 common-catalog.workspace = true
 common-error.workspace = true
@@ -24,7 +23,6 @@ common-time.workspace = true
 common-version.workspace = true
 datafusion.workspace = true
 datatypes.workspace = true
-libc = "0.2"
 num = "0.4"
 num-traits = "0.2"
 once_cell.workspace = true
diff --git a/src/common/greptimedb-telemetry/Cargo.toml b/src/common/greptimedb-telemetry/Cargo.toml
index 6bff7a719e91..b46f1e5aa902 100644
--- a/src/common/greptimedb-telemetry/Cargo.toml
+++ b/src/common/greptimedb-telemetry/Cargo.toml
@@ -9,12 +9,10 @@ workspace = true
 
 [dependencies]
 async-trait.workspace = true
-common-error.workspace = true
 common-runtime.workspace = true
 common-telemetry.workspace = true
 reqwest.workspace = true
 serde.workspace = true
-serde_json.workspace = true
 tokio.workspace = true
 uuid.workspace = true
 
diff --git a/src/common/grpc-expr/Cargo.toml b/src/common/grpc-expr/Cargo.toml
index 3415b54200b3..ce98a6396da2 100644
--- a/src/common/grpc-expr/Cargo.toml
+++ b/src/common/grpc-expr/Cargo.toml
@@ -9,13 +9,11 @@ workspace = true
 
 [dependencies]
 api.workspace = true
-async-trait.workspace = true
 common-base.workspace = true
 common-catalog.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
 common-query.workspace = true
-common-telemetry.workspace = true
 common-time.workspace = true
 datatypes.workspace = true
 snafu.workspace = true
diff --git a/src/common/grpc/Cargo.toml b/src/common/grpc/Cargo.toml
index 0f11d6873158..abf57978186e 100644
--- a/src/common/grpc/Cargo.toml
+++ b/src/common/grpc/Cargo.toml
@@ -10,8 +10,6 @@ workspace = true
 [dependencies]
 api.workspace = true
 arrow-flight.workspace = true
-async-trait = "0.1"
-backtrace = "0.3"
 common-base.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
@@ -20,10 +18,8 @@ common-runtime.workspace = true
 common-telemetry.workspace = true
 common-time.workspace = true
 dashmap.workspace = true
-datafusion.workspace = true
 datatypes.workspace = true
 flatbuffers = "23.1"
-futures = "0.3"
 lazy_static.workspace = true
 prost.workspace = true
 snafu.workspace = true
diff --git a/src/common/meta/Cargo.toml b/src/common/meta/Cargo.toml
index fdab5eae0371..9132f6de559b 100644
--- a/src/common/meta/Cargo.toml
+++ b/src/common/meta/Cargo.toml
@@ -13,7 +13,6 @@ workspace = true
 [dependencies]
 api.workspace = true
 async-recursion = "1.0"
-async-stream.workspace = true
 async-trait.workspace = true
 base64.workspace = true
 bytes.workspace = true
@@ -26,7 +25,6 @@ common-macro.workspace = true
 common-procedure.workspace = true
 common-procedure-test.workspace = true
 common-recordbatch.workspace = true
-common-runtime.workspace = true
 common-telemetry.workspace = true
 common-time.workspace = true
 common-wal.workspace = true
@@ -53,6 +51,7 @@ strum.workspace = true
 table.workspace = true
 tokio.workspace = true
 tonic.workspace = true
+typetag = "0.2"
 
 [dev-dependencies]
 chrono.workspace = true
diff --git a/src/common/meta/src/datanode_manager.rs b/src/common/meta/src/datanode_manager.rs
index 4795512f25ec..1fdc2f314eb9 100644
--- a/src/common/meta/src/datanode_manager.rs
+++ b/src/common/meta/src/datanode_manager.rs
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::collections::HashMap;
 use std::sync::Arc;
 
-use api::v1::region::{QueryRequest, RegionRequest};
+use api::v1::region::{QueryRequest, RegionRequest, RegionResponse};
 pub use common_base::AffectedRows;
 use common_recordbatch::SendableRecordBatchStream;
 
@@ -25,7 +26,7 @@ use crate::peer::Peer;
 #[async_trait::async_trait]
 pub trait Datanode: Send + Sync {
     /// Handles DML, and DDL requests.
-    async fn handle(&self, request: RegionRequest) -> Result<AffectedRows>;
+    async fn handle(&self, request: RegionRequest) -> Result<HandleResponse>;
 
     /// Handles query requests
     async fn handle_query(&self, request: QueryRequest) -> Result<SendableRecordBatchStream>;
@@ -41,3 +42,27 @@ pub trait DatanodeManager: Send + Sync {
 }
 
 pub type DatanodeManagerRef = Arc<dyn DatanodeManager>;
+
+/// This result struct is derived from [RegionResponse]
+#[derive(Debug)]
+pub struct HandleResponse {
+    pub affected_rows: AffectedRows,
+    pub extension: HashMap<String, Vec<u8>>,
+}
+
+impl HandleResponse {
+    pub fn from_region_response(region_response: RegionResponse) -> Self {
+        Self {
+            affected_rows: region_response.affected_rows as _,
+            extension: region_response.extension,
+        }
+    }
+
+    /// Creates one response without extension
+    pub fn new(affected_rows: AffectedRows) -> Self {
+        Self {
+            affected_rows,
+            extension: Default::default(),
+        }
+    }
+}
diff --git a/src/common/meta/src/ddl.rs b/src/common/meta/src/ddl.rs
index d5d790f95838..4f2fd6f6df1d 100644
--- a/src/common/meta/src/ddl.rs
+++ b/src/common/meta/src/ddl.rs
@@ -28,11 +28,14 @@ use crate::region_keeper::MemoryRegionKeeperRef;
 use crate::rpc::ddl::{SubmitDdlTaskRequest, SubmitDdlTaskResponse};
 use crate::rpc::procedure::{MigrateRegionRequest, MigrateRegionResponse, ProcedureStateResponse};
 
+pub mod alter_logical_tables;
 pub mod alter_table;
 pub mod create_logical_tables;
 pub mod create_table;
 mod create_table_template;
+pub mod drop_database;
 pub mod drop_table;
+mod physical_table_metadata;
 pub mod table_meta;
 #[cfg(any(test, feature = "testing"))]
 pub mod test_util;
diff --git a/src/common/meta/src/ddl/alter_logical_tables.rs b/src/common/meta/src/ddl/alter_logical_tables.rs
new file mode 100644
index 000000000000..b2b8b6858bd1
--- /dev/null
+++ b/src/common/meta/src/ddl/alter_logical_tables.rs
@@ -0,0 +1,309 @@
+// 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.
+
+mod check;
+mod metadata;
+mod region_request;
+mod table_cache_keys;
+mod update_metadata;
+
+use async_trait::async_trait;
+use common_procedure::error::{FromJsonSnafu, Result as ProcedureResult, ToJsonSnafu};
+use common_procedure::{Context, LockKey, Procedure, Status};
+use common_telemetry::{info, warn};
+use futures_util::future;
+use itertools::Itertools;
+use serde::{Deserialize, Serialize};
+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;
+use crate::ddl::{physical_table_metadata, DdlContext};
+use crate::error::{DecodeJsonSnafu, Error, MetadataCorruptionSnafu, Result};
+use crate::key::table_info::TableInfoValue;
+use crate::key::table_route::PhysicalTableRouteValue;
+use crate::key::DeserializedValueWithBytes;
+use crate::lock_key::{CatalogLock, SchemaLock, TableLock};
+use crate::rpc::ddl::AlterTableTask;
+use crate::rpc::router::{find_leader_regions, find_leaders};
+use crate::{cache_invalidator, metrics, ClusterId};
+
+pub struct AlterLogicalTablesProcedure {
+    pub context: DdlContext,
+    pub data: AlterTablesData,
+}
+
+impl AlterLogicalTablesProcedure {
+    pub const TYPE_NAME: &'static str = "metasrv-procedure::AlterLogicalTables";
+
+    pub fn new(
+        cluster_id: ClusterId,
+        tasks: Vec<AlterTableTask>,
+        physical_table_id: TableId,
+        context: DdlContext,
+    ) -> Self {
+        Self {
+            context,
+            data: AlterTablesData {
+                cluster_id,
+                state: AlterTablesState::Prepare,
+                tasks,
+                table_info_values: vec![],
+                physical_table_id,
+                physical_table_info: None,
+                physical_table_route: None,
+                physical_columns: vec![],
+            },
+        }
+    }
+
+    pub fn from_json(json: &str, context: DdlContext) -> ProcedureResult<Self> {
+        let data = serde_json::from_str(json).context(FromJsonSnafu)?;
+        Ok(Self { context, data })
+    }
+
+    pub(crate) async fn on_prepare(&mut self) -> Result<Status> {
+        // Checks all the tasks
+        self.check_input_tasks()?;
+        // Fills the table info values
+        self.fill_table_info_values().await?;
+        // Checks the physical table, must after [fill_table_info_values]
+        self.check_physical_table().await?;
+        // Fills the physical table info
+        self.fill_physical_table_info().await?;
+        // Filter the finished tasks
+        let finished_tasks = self.check_finished_tasks()?;
+        let already_finished_count = finished_tasks
+            .iter()
+            .map(|x| if *x { 1 } else { 0 })
+            .sum::<usize>();
+        let apply_tasks_count = self.data.tasks.len();
+        if already_finished_count == apply_tasks_count {
+            info!("All the alter tasks are finished, will skip the procedure.");
+            // Re-invalidate the table cache
+            self.data.state = AlterTablesState::InvalidateTableCache;
+            return Ok(Status::executing(true));
+        } else if already_finished_count > 0 {
+            info!(
+                "There are {} alter tasks, {} of them were already finished.",
+                apply_tasks_count, already_finished_count
+            );
+        }
+        self.filter_task(&finished_tasks)?;
+
+        // Next state
+        self.data.state = AlterTablesState::SubmitAlterRegionRequests;
+        Ok(Status::executing(true))
+    }
+
+    pub(crate) async fn on_submit_alter_region_requests(&mut self) -> Result<Status> {
+        // Safety: we have checked the state in on_prepare
+        let physical_table_route = &self.data.physical_table_route.as_ref().unwrap();
+        let leaders = find_leaders(&physical_table_route.region_routes);
+        let mut alter_region_tasks = Vec::with_capacity(leaders.len());
+
+        for peer in leaders {
+            let requester = self.context.datanode_manager.datanode(&peer).await;
+            let region_numbers = find_leader_regions(&physical_table_route.region_routes, &peer);
+
+            for region_number in region_numbers {
+                let request = self.make_request(region_number)?;
+                let peer = peer.clone();
+                let requester = requester.clone();
+
+                alter_region_tasks.push(async move {
+                    requester
+                        .handle(request)
+                        .await
+                        .map_err(add_peer_context_if_needed(peer))
+                });
+            }
+        }
+
+        // Collects responses from all the alter region tasks.
+        let phy_raw_schemas = future::join_all(alter_region_tasks)
+            .await
+            .into_iter()
+            .map(|res| res.map(|mut res| res.extension.remove(ALTER_PHYSICAL_EXTENSION_KEY)))
+            .collect::<Result<Vec<_>>>()?;
+
+        if phy_raw_schemas.is_empty() {
+            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.data.state = AlterTablesState::UpdateMetadata;
+        Ok(Status::executing(true))
+    }
+
+    pub(crate) async fn on_update_metadata(&mut self) -> Result<Status> {
+        if !self.data.physical_columns.is_empty() {
+            let physical_table_info = self.data.physical_table_info.as_ref().unwrap();
+
+            // Generates new table info
+            let old_raw_table_info = physical_table_info.table_info.clone();
+            let new_raw_table_info = physical_table_metadata::build_new_physical_table_info(
+                old_raw_table_info,
+                &self.data.physical_columns,
+            );
+
+            // Updates physical table's metadata
+            self.context
+                .table_metadata_manager
+                .update_table_info(
+                    DeserializedValueWithBytes::from_inner(physical_table_info.clone()),
+                    new_raw_table_info,
+                )
+                .await?;
+        }
+
+        let table_info_values = self.build_update_metadata()?;
+        let manager = &self.context.table_metadata_manager;
+        let chunk_size = manager.batch_update_table_info_value_chunk_size();
+        if table_info_values.len() > chunk_size {
+            let chunks = table_info_values
+                .into_iter()
+                .chunks(chunk_size)
+                .into_iter()
+                .map(|check| check.collect::<Vec<_>>())
+                .collect::<Vec<_>>();
+            for chunk in chunks {
+                manager.batch_update_table_info_values(chunk).await?;
+            }
+        } else {
+            manager
+                .batch_update_table_info_values(table_info_values)
+                .await?;
+        }
+
+        self.data.state = AlterTablesState::InvalidateTableCache;
+        Ok(Status::executing(true))
+    }
+
+    pub(crate) async fn on_invalidate_table_cache(&mut self) -> Result<Status> {
+        let ctx = cache_invalidator::Context::default();
+        let to_invalidate = self.build_table_cache_keys_to_invalidate();
+
+        self.context
+            .cache_invalidator
+            .invalidate(&ctx, to_invalidate)
+            .await?;
+        Ok(Status::done())
+    }
+}
+
+#[async_trait]
+impl Procedure for AlterLogicalTablesProcedure {
+    fn type_name(&self) -> &str {
+        Self::TYPE_NAME
+    }
+
+    async fn execute(&mut self, _ctx: &Context) -> ProcedureResult<Status> {
+        let error_handler = |e: Error| {
+            if e.is_retry_later() {
+                common_procedure::Error::retry_later(e)
+            } else {
+                common_procedure::Error::external(e)
+            }
+        };
+
+        let state = &self.data.state;
+
+        let step = state.as_ref();
+
+        let _timer = metrics::METRIC_META_PROCEDURE_ALTER_TABLE
+            .with_label_values(&[step])
+            .start_timer();
+
+        match state {
+            AlterTablesState::Prepare => self.on_prepare().await,
+            AlterTablesState::SubmitAlterRegionRequests => {
+                self.on_submit_alter_region_requests().await
+            }
+            AlterTablesState::UpdateMetadata => self.on_update_metadata().await,
+            AlterTablesState::InvalidateTableCache => self.on_invalidate_table_cache().await,
+        }
+        .map_err(error_handler)
+    }
+
+    fn dump(&self) -> ProcedureResult<String> {
+        serde_json::to_string(&self.data).context(ToJsonSnafu)
+    }
+
+    fn lock_key(&self) -> LockKey {
+        // CatalogLock, SchemaLock,
+        // TableLock
+        // TableNameLock(s)
+        let mut lock_key = Vec::with_capacity(2 + 1 + self.data.tasks.len());
+        let table_ref = self.data.tasks[0].table_ref();
+        lock_key.push(CatalogLock::Read(table_ref.catalog).into());
+        lock_key.push(SchemaLock::read(table_ref.catalog, table_ref.schema).into());
+        lock_key.push(TableLock::Write(self.data.physical_table_id).into());
+        lock_key.extend(
+            self.data
+                .table_info_values
+                .iter()
+                .map(|table| TableLock::Write(table.table_info.ident.table_id).into()),
+        );
+
+        LockKey::new(lock_key)
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct AlterTablesData {
+    cluster_id: ClusterId,
+    state: AlterTablesState,
+    tasks: Vec<AlterTableTask>,
+    /// Table info values before the alter operation.
+    /// Corresponding one-to-one with the AlterTableTask in tasks.
+    table_info_values: Vec<TableInfoValue>,
+    /// Physical table info
+    physical_table_id: TableId,
+    physical_table_info: Option<TableInfoValue>,
+    physical_table_route: Option<PhysicalTableRouteValue>,
+    physical_columns: Vec<ColumnMetadata>,
+}
+
+#[derive(Debug, Serialize, Deserialize, AsRefStr)]
+enum AlterTablesState {
+    /// Prepares to alter the table
+    Prepare,
+    SubmitAlterRegionRequests,
+    /// Updates table metadata.
+    UpdateMetadata,
+    /// Broadcasts the invalidating table cache instruction.
+    InvalidateTableCache,
+}
diff --git a/src/common/meta/src/ddl/alter_logical_tables/check.rs b/src/common/meta/src/ddl/alter_logical_tables/check.rs
new file mode 100644
index 000000000000..d0d4b8ef3945
--- /dev/null
+++ b/src/common/meta/src/ddl/alter_logical_tables/check.rs
@@ -0,0 +1,136 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::collections::HashSet;
+
+use api::v1::alter_expr::Kind;
+use snafu::{ensure, OptionExt};
+
+use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
+use crate::error::{AlterLogicalTablesInvalidArgumentsSnafu, Result};
+use crate::key::table_info::TableInfoValue;
+use crate::key::table_route::TableRouteValue;
+use crate::rpc::ddl::AlterTableTask;
+
+impl AlterLogicalTablesProcedure {
+    pub(crate) fn check_input_tasks(&self) -> Result<()> {
+        self.check_schema()?;
+        self.check_alter_kind()?;
+        Ok(())
+    }
+
+    pub(crate) async fn check_physical_table(&self) -> Result<()> {
+        let table_route_manager = self.context.table_metadata_manager.table_route_manager();
+        let table_ids = self
+            .data
+            .table_info_values
+            .iter()
+            .map(|v| v.table_info.ident.table_id)
+            .collect::<Vec<_>>();
+        let table_routes = table_route_manager
+            .table_route_storage()
+            .batch_get(&table_ids)
+            .await?;
+        let physical_table_id = self.data.physical_table_id;
+        let is_same_physical_table = table_routes.iter().all(|r| {
+            if let Some(TableRouteValue::Logical(r)) = r {
+                r.physical_table_id() == physical_table_id
+            } else {
+                false
+            }
+        });
+
+        ensure!(
+            is_same_physical_table,
+            AlterLogicalTablesInvalidArgumentsSnafu {
+                err_msg: "All the tasks should have the same physical table id"
+            }
+        );
+
+        Ok(())
+    }
+
+    pub(crate) fn check_finished_tasks(&self) -> Result<Vec<bool>> {
+        let task = &self.data.tasks;
+        let table_info_values = &self.data.table_info_values;
+
+        Ok(task
+            .iter()
+            .zip(table_info_values.iter())
+            .map(|(task, table)| Self::check_finished_task(task, table))
+            .collect())
+    }
+
+    // Checks if the schemas of the tasks are the same
+    fn check_schema(&self) -> Result<()> {
+        let is_same_schema = self.data.tasks.windows(2).all(|pair| {
+            pair[0].alter_table.catalog_name == pair[1].alter_table.catalog_name
+                && pair[0].alter_table.schema_name == pair[1].alter_table.schema_name
+        });
+
+        ensure!(
+            is_same_schema,
+            AlterLogicalTablesInvalidArgumentsSnafu {
+                err_msg: "Schemas of the tasks are not the same"
+            }
+        );
+
+        Ok(())
+    }
+
+    fn check_alter_kind(&self) -> Result<()> {
+        for task in &self.data.tasks {
+            let kind = task.alter_table.kind.as_ref().context(
+                AlterLogicalTablesInvalidArgumentsSnafu {
+                    err_msg: "Alter kind is missing",
+                },
+            )?;
+            let Kind::AddColumns(_) = kind else {
+                return AlterLogicalTablesInvalidArgumentsSnafu {
+                    err_msg: "Only support add columns operation",
+                }
+                .fail();
+            };
+        }
+
+        Ok(())
+    }
+
+    fn check_finished_task(task: &AlterTableTask, table: &TableInfoValue) -> bool {
+        let columns = table
+            .table_info
+            .meta
+            .schema
+            .column_schemas
+            .iter()
+            .map(|c| &c.name)
+            .collect::<HashSet<_>>();
+
+        let Some(kind) = task.alter_table.kind.as_ref() else {
+            return true; // Never get here since we have checked it in `check_alter_kind`
+        };
+        let Kind::AddColumns(add_columns) = kind else {
+            return true; // Never get here since we have checked it in `check_alter_kind`
+        };
+
+        // We only check that all columns have been finished. That is to say,
+        // if one part is finished but another part is not, it will be considered
+        // unfinished.
+        add_columns
+            .add_columns
+            .iter()
+            .map(|add_column| add_column.column_def.as_ref().map(|c| &c.name))
+            .all(|column| column.map(|c| columns.contains(c)).unwrap_or(false))
+    }
+}
diff --git a/src/common/meta/src/ddl/alter_logical_tables/metadata.rs b/src/common/meta/src/ddl/alter_logical_tables/metadata.rs
new file mode 100644
index 000000000000..60dde7a6341e
--- /dev/null
+++ b/src/common/meta/src/ddl/alter_logical_tables/metadata.rs
@@ -0,0 +1,159 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use common_catalog::format_full_table_name;
+use snafu::OptionExt;
+use table::metadata::TableId;
+
+use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
+use crate::error::{
+    AlterLogicalTablesInvalidArgumentsSnafu, Result, TableInfoNotFoundSnafu, TableNotFoundSnafu,
+    TableRouteNotFoundSnafu,
+};
+use crate::key::table_info::TableInfoValue;
+use crate::key::table_name::TableNameKey;
+use crate::key::table_route::TableRouteValue;
+use crate::rpc::ddl::AlterTableTask;
+
+impl AlterLogicalTablesProcedure {
+    pub(crate) fn filter_task(&mut self, finished_tasks: &[bool]) -> Result<()> {
+        debug_assert_eq!(finished_tasks.len(), self.data.tasks.len());
+        debug_assert_eq!(finished_tasks.len(), self.data.table_info_values.len());
+        self.data.tasks = self
+            .data
+            .tasks
+            .drain(..)
+            .zip(finished_tasks.iter())
+            .filter_map(|(task, finished)| if *finished { None } else { Some(task) })
+            .collect();
+        self.data.table_info_values = self
+            .data
+            .table_info_values
+            .drain(..)
+            .zip(finished_tasks.iter())
+            .filter_map(|(table_info_value, finished)| {
+                if *finished {
+                    None
+                } else {
+                    Some(table_info_value)
+                }
+            })
+            .collect();
+
+        Ok(())
+    }
+
+    pub(crate) async fn fill_physical_table_info(&mut self) -> Result<()> {
+        let (physical_table_info, physical_table_route) = self
+            .context
+            .table_metadata_manager
+            .get_full_table_info(self.data.physical_table_id)
+            .await?;
+
+        let physical_table_info = physical_table_info
+            .with_context(|| TableInfoNotFoundSnafu {
+                table: format!("table id - {}", self.data.physical_table_id),
+            })?
+            .into_inner();
+        let physical_table_route = physical_table_route
+            .context(TableRouteNotFoundSnafu {
+                table_id: self.data.physical_table_id,
+            })?
+            .into_inner();
+
+        self.data.physical_table_info = Some(physical_table_info);
+        let TableRouteValue::Physical(physical_table_route) = physical_table_route else {
+            return AlterLogicalTablesInvalidArgumentsSnafu {
+                err_msg: format!(
+                    "expected a physical table but got a logical table: {:?}",
+                    self.data.physical_table_id
+                ),
+            }
+            .fail();
+        };
+        self.data.physical_table_route = Some(physical_table_route);
+
+        Ok(())
+    }
+
+    pub(crate) async fn fill_table_info_values(&mut self) -> Result<()> {
+        let table_ids = self.get_all_table_ids().await?;
+        let table_info_values = self.get_all_table_info_values(&table_ids).await?;
+        debug_assert_eq!(table_info_values.len(), self.data.tasks.len());
+        self.data.table_info_values = table_info_values;
+
+        Ok(())
+    }
+
+    async fn get_all_table_info_values(
+        &self,
+        table_ids: &[TableId],
+    ) -> Result<Vec<TableInfoValue>> {
+        let table_info_manager = self.context.table_metadata_manager.table_info_manager();
+        let mut table_info_map = table_info_manager.batch_get(table_ids).await?;
+        let mut table_info_values = Vec::with_capacity(table_ids.len());
+        for (table_id, task) in table_ids.iter().zip(self.data.tasks.iter()) {
+            let table_info_value =
+                table_info_map
+                    .remove(table_id)
+                    .with_context(|| TableInfoNotFoundSnafu {
+                        table: extract_table_name(task),
+                    })?;
+            table_info_values.push(table_info_value);
+        }
+
+        Ok(table_info_values)
+    }
+
+    async fn get_all_table_ids(&self) -> Result<Vec<TableId>> {
+        let table_name_manager = self.context.table_metadata_manager.table_name_manager();
+        let table_name_keys = self
+            .data
+            .tasks
+            .iter()
+            .map(|task| extract_table_name_key(task))
+            .collect();
+
+        let table_name_values = table_name_manager.batch_get(table_name_keys).await?;
+        let mut table_ids = Vec::with_capacity(table_name_values.len());
+        for (value, task) in table_name_values.into_iter().zip(self.data.tasks.iter()) {
+            let table_id = value
+                .with_context(|| TableNotFoundSnafu {
+                    table_name: extract_table_name(task),
+                })?
+                .table_id();
+            table_ids.push(table_id);
+        }
+
+        Ok(table_ids)
+    }
+}
+
+#[inline]
+fn extract_table_name(task: &AlterTableTask) -> String {
+    format_full_table_name(
+        &task.alter_table.catalog_name,
+        &task.alter_table.schema_name,
+        &task.alter_table.table_name,
+    )
+}
+
+#[inline]
+fn extract_table_name_key(task: &AlterTableTask) -> TableNameKey {
+    TableNameKey::new(
+        &task.alter_table.catalog_name,
+        &task.alter_table.schema_name,
+        &task.alter_table.table_name,
+    )
+}
diff --git a/src/common/meta/src/ddl/alter_logical_tables/region_request.rs b/src/common/meta/src/ddl/alter_logical_tables/region_request.rs
new file mode 100644
index 000000000000..1f6fa2e67b2d
--- /dev/null
+++ b/src/common/meta/src/ddl/alter_logical_tables/region_request.rs
@@ -0,0 +1,98 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use api::v1;
+use api::v1::alter_expr::Kind;
+use api::v1::region::{
+    alter_request, region_request, AddColumn, AddColumns, AlterRequest, AlterRequests,
+    RegionColumnDef, RegionRequest, RegionRequestHeader,
+};
+use common_telemetry::tracing_context::TracingContext;
+use store_api::storage::{RegionId, RegionNumber};
+
+use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
+use crate::error::Result;
+use crate::key::table_info::TableInfoValue;
+use crate::rpc::ddl::AlterTableTask;
+
+impl AlterLogicalTablesProcedure {
+    pub(crate) fn make_request(&self, region_number: RegionNumber) -> Result<RegionRequest> {
+        let alter_requests = self.make_alter_region_requests(region_number)?;
+        let request = RegionRequest {
+            header: Some(RegionRequestHeader {
+                tracing_context: TracingContext::from_current_span().to_w3c(),
+                ..Default::default()
+            }),
+            body: Some(region_request::Body::Alters(alter_requests)),
+        };
+
+        Ok(request)
+    }
+
+    fn make_alter_region_requests(&self, region_number: RegionNumber) -> Result<AlterRequests> {
+        let mut requests = Vec::with_capacity(self.data.tasks.len());
+        for (task, table) in self
+            .data
+            .tasks
+            .iter()
+            .zip(self.data.table_info_values.iter())
+        {
+            let region_id = RegionId::new(table.table_info.ident.table_id, region_number);
+            let request = self.make_alter_region_request(region_id, task, table)?;
+            requests.push(request);
+        }
+
+        Ok(AlterRequests { requests })
+    }
+
+    fn make_alter_region_request(
+        &self,
+        region_id: RegionId,
+        task: &AlterTableTask,
+        table: &TableInfoValue,
+    ) -> Result<AlterRequest> {
+        let region_id = region_id.as_u64();
+        let schema_version = table.table_info.ident.version;
+        let kind = match &task.alter_table.kind {
+            Some(Kind::AddColumns(add_columns)) => Some(alter_request::Kind::AddColumns(
+                to_region_add_columns(add_columns),
+            )),
+            _ => unreachable!(), // Safety: we have checked the kind in check_input_tasks
+        };
+
+        Ok(AlterRequest {
+            region_id,
+            schema_version,
+            kind,
+        })
+    }
+}
+
+fn to_region_add_columns(add_columns: &v1::AddColumns) -> AddColumns {
+    let add_columns = add_columns
+        .add_columns
+        .iter()
+        .map(|add_column| {
+            let region_column_def = RegionColumnDef {
+                column_def: add_column.column_def.clone(),
+                ..Default::default() // other fields are not used in alter logical table
+            };
+            AddColumn {
+                column_def: Some(region_column_def),
+                ..Default::default() // other fields are not used in alter logical table
+            }
+        })
+        .collect();
+    AddColumns { add_columns }
+}
diff --git a/src/common/meta/src/ddl/alter_logical_tables/table_cache_keys.rs b/src/common/meta/src/ddl/alter_logical_tables/table_cache_keys.rs
new file mode 100644
index 000000000000..23cf22e2c02c
--- /dev/null
+++ b/src/common/meta/src/ddl/alter_logical_tables/table_cache_keys.rs
@@ -0,0 +1,51 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use table::metadata::RawTableInfo;
+
+use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
+use crate::instruction::CacheIdent;
+use crate::table_name::TableName;
+
+impl AlterLogicalTablesProcedure {
+    pub(crate) fn build_table_cache_keys_to_invalidate(&self) -> Vec<CacheIdent> {
+        let mut cache_keys = self
+            .data
+            .table_info_values
+            .iter()
+            .flat_map(|table| {
+                vec![
+                    CacheIdent::TableId(table.table_info.ident.table_id),
+                    CacheIdent::TableName(extract_table_name(&table.table_info)),
+                ]
+            })
+            .collect::<Vec<_>>();
+        cache_keys.push(CacheIdent::TableId(self.data.physical_table_id));
+        // Safety: physical_table_info already filled in previous steps
+        let physical_table_info = &self.data.physical_table_info.as_ref().unwrap().table_info;
+        cache_keys.push(CacheIdent::TableName(extract_table_name(
+            physical_table_info,
+        )));
+
+        cache_keys
+    }
+}
+
+fn extract_table_name(table_info: &RawTableInfo) -> TableName {
+    TableName::new(
+        &table_info.catalog_name,
+        &table_info.schema_name,
+        &table_info.name,
+    )
+}
diff --git a/src/common/meta/src/ddl/alter_logical_tables/update_metadata.rs b/src/common/meta/src/ddl/alter_logical_tables/update_metadata.rs
new file mode 100644
index 000000000000..b31e0a879935
--- /dev/null
+++ b/src/common/meta/src/ddl/alter_logical_tables/update_metadata.rs
@@ -0,0 +1,70 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use common_grpc_expr::alter_expr_to_request;
+use snafu::ResultExt;
+use table::metadata::{RawTableInfo, TableInfo};
+
+use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
+use crate::error;
+use crate::error::{ConvertAlterTableRequestSnafu, Result};
+use crate::key::table_info::TableInfoValue;
+use crate::rpc::ddl::AlterTableTask;
+
+impl AlterLogicalTablesProcedure {
+    pub(crate) fn build_update_metadata(&self) -> Result<Vec<(TableInfoValue, RawTableInfo)>> {
+        let mut table_info_values_to_update = Vec::with_capacity(self.data.tasks.len());
+        for (task, table) in self
+            .data
+            .tasks
+            .iter()
+            .zip(self.data.table_info_values.iter())
+        {
+            table_info_values_to_update.push(self.build_new_table_info(task, table)?);
+        }
+
+        Ok(table_info_values_to_update)
+    }
+
+    fn build_new_table_info(
+        &self,
+        task: &AlterTableTask,
+        table: &TableInfoValue,
+    ) -> Result<(TableInfoValue, RawTableInfo)> {
+        // Builds new_meta
+        let table_info = TableInfo::try_from(table.table_info.clone())
+            .context(error::ConvertRawTableInfoSnafu)?;
+        let table_ref = task.table_ref();
+        let request =
+            alter_expr_to_request(table.table_info.ident.table_id, task.alter_table.clone())
+                .context(ConvertAlterTableRequestSnafu)?;
+        let new_meta = table_info
+            .meta
+            .builder_with_alter_kind(table_ref.table, &request.alter_kind, true)
+            .context(error::TableSnafu)?
+            .build()
+            .with_context(|_| error::BuildTableMetaSnafu {
+                table_name: table_ref.table,
+            })?;
+        let version = table_info.ident.version + 1;
+        let mut new_table = table_info;
+        new_table.meta = new_meta;
+        new_table.ident.version = version;
+
+        let mut raw_table_info = RawTableInfo::from(new_table);
+        raw_table_info.sort_columns();
+
+        Ok((table.clone(), raw_table_info))
+    }
+}
diff --git a/src/common/meta/src/ddl/alter_table.rs b/src/common/meta/src/ddl/alter_table.rs
index e554256a1b39..e1bec25cd078 100644
--- a/src/common/meta/src/ddl/alter_table.rs
+++ b/src/common/meta/src/ddl/alter_table.rs
@@ -281,7 +281,7 @@ impl AlterTableProcedure {
 
         let new_meta = table_info
             .meta
-            .builder_with_alter_kind(table_ref.table, &request.alter_kind)
+            .builder_with_alter_kind(table_ref.table, &request.alter_kind, false)
             .context(error::TableSnafu)?
             .build()
             .with_context(|_| error::BuildTableMetaSnafu {
@@ -363,7 +363,8 @@ impl AlterTableProcedure {
                 )
                 .into(),
             );
-            lock_key.push(TableLock::Read(*physical_table_id).into())
+            // We must acquire the write lock since this may update the physical table schema
+            lock_key.push(TableLock::Write(*physical_table_id).into())
         }
 
         let table_ref = self.data.table_ref();
diff --git a/src/common/meta/src/ddl/create_logical_tables.rs b/src/common/meta/src/ddl/create_logical_tables.rs
index 8831e3aeb21c..df64b8e286e3 100644
--- a/src/common/meta/src/ddl/create_logical_tables.rs
+++ b/src/common/meta/src/ddl/create_logical_tables.rs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use std::collections::HashMap;
+use std::ops::Deref;
 
 use api::v1::region::region_request::Body as PbRegionRequest;
 use api::v1::region::{CreateRequests, RegionRequest, RegionRequestHeader};
@@ -20,31 +21,41 @@ use api::v1::CreateTableExpr;
 use async_trait::async_trait;
 use common_procedure::error::{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_util::future::join_all;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use snafu::{ensure, ResultExt};
+use snafu::{ensure, OptionExt, ResultExt};
+use store_api::metadata::ColumnMetadata;
+use store_api::metric_engine_consts::ALTER_PHYSICAL_EXTENSION_KEY;
 use store_api::storage::{RegionId, RegionNumber};
 use strum::AsRefStr;
 use table::metadata::{RawTableInfo, TableId};
 
+use crate::cache_invalidator::Context;
 use crate::ddl::create_table_template::{build_template, CreateRequestBuilder};
 use crate::ddl::utils::{add_peer_context_if_needed, handle_retry_error, region_storage_path};
-use crate::ddl::DdlContext;
-use crate::error::{Result, TableAlreadyExistsSnafu};
+use crate::ddl::{physical_table_metadata, DdlContext};
+use crate::error::{
+    DecodeJsonSnafu, MetadataCorruptionSnafu, Result, TableAlreadyExistsSnafu,
+    TableInfoNotFoundSnafu,
+};
+use crate::instruction::CacheIdent;
+use crate::key::table_info::TableInfoValue;
 use crate::key::table_name::TableNameKey;
 use crate::key::table_route::TableRouteValue;
+use crate::key::DeserializedValueWithBytes;
 use crate::lock_key::{CatalogLock, SchemaLock, TableLock, TableNameLock};
 use crate::peer::Peer;
 use crate::rpc::ddl::CreateTableTask;
 use crate::rpc::router::{find_leader_regions, find_leaders, RegionRoute};
+use crate::table_name::TableName;
 use crate::{metrics, ClusterId};
 
 pub struct CreateLogicalTablesProcedure {
     pub context: DdlContext,
-    pub creator: TablesCreator,
+    pub data: CreateTablesData,
 }
 
 impl CreateLogicalTablesProcedure {
@@ -56,20 +67,29 @@ impl CreateLogicalTablesProcedure {
         physical_table_id: TableId,
         context: DdlContext,
     ) -> Self {
-        let creator = TablesCreator::new(cluster_id, tasks, physical_table_id);
-        Self { context, creator }
+        let len = tasks.len();
+        let data = CreateTablesData {
+            cluster_id,
+            state: CreateTablesState::Prepare,
+            tasks,
+            table_ids_already_exists: vec![None; len],
+            physical_table_id,
+            physical_region_numbers: vec![],
+            physical_columns: vec![],
+        };
+        Self { context, data }
     }
 
     pub fn from_json(json: &str, context: DdlContext) -> ProcedureResult<Self> {
         let data = serde_json::from_str(json).context(FromJsonSnafu)?;
-        let creator = TablesCreator { data };
-        Ok(Self { context, creator })
+        Ok(Self { context, data })
     }
 
     /// On the prepares step, it performs:
     /// - Checks whether physical table exists.
     /// - Checks whether logical tables exist.
     /// - Allocates the table ids.
+    /// - Modify tasks to sort logical columns on their names.
     ///
     /// Abort(non-retry):
     /// - The physical table does not exist.
@@ -79,19 +99,17 @@ impl CreateLogicalTablesProcedure {
         let manager = &self.context.table_metadata_manager;
 
         // Sets physical region numbers
-        let physical_table_id = self.creator.data.physical_table_id();
+        let physical_table_id = self.data.physical_table_id();
         let physical_region_numbers = manager
             .table_route_manager()
             .get_physical_table_route(physical_table_id)
             .await
             .map(|(_, route)| TableRouteValue::Physical(route).region_numbers())?;
-        self.creator
-            .data
+        self.data
             .set_physical_region_numbers(physical_region_numbers);
 
         // Checks if the tables exist
         let table_name_keys = self
-            .creator
             .data
             .all_create_table_exprs()
             .iter()
@@ -106,7 +124,7 @@ impl CreateLogicalTablesProcedure {
             .collect::<Vec<_>>();
 
         // Validates the tasks
-        let tasks = &mut self.creator.data.tasks;
+        let tasks = &mut self.data.tasks;
         for (task, table_id) in tasks.iter().zip(already_exists_tables_ids.iter()) {
             if table_id.is_some() {
                 // If a table already exists, we just ignore it.
@@ -130,7 +148,7 @@ impl CreateLogicalTablesProcedure {
             ));
         }
 
-        // Allocates table ids
+        // Allocates table ids and sort columns on their names.
         for (task, table_id) in tasks.iter_mut().zip(already_exists_tables_ids.iter()) {
             let table_id = if let Some(table_id) = table_id {
                 *table_id
@@ -141,17 +159,19 @@ impl CreateLogicalTablesProcedure {
                     .await?
             };
             task.set_table_id(table_id);
+
+            // sort columns in task
+            task.sort_columns();
         }
 
-        self.creator
-            .data
+        self.data
             .set_table_ids_already_exists(already_exists_tables_ids);
-        self.creator.data.state = CreateTablesState::DatanodeCreateRegions;
+        self.data.state = CreateTablesState::DatanodeCreateRegions;
         Ok(Status::executing(true))
     }
 
     pub async fn on_datanode_create_regions(&mut self) -> Result<Status> {
-        let physical_table_id = self.creator.data.physical_table_id();
+        let physical_table_id = self.data.physical_table_id();
         let (_, physical_table_route) = self
             .context
             .table_metadata_manager
@@ -163,18 +183,19 @@ impl CreateLogicalTablesProcedure {
         self.create_regions(region_routes).await
     }
 
-    /// Creates table metadata
+    /// Creates table metadata for logical tables and update corresponding physical
+    /// table's metadata.
     ///
     /// Abort(not-retry):
     /// - Failed to create table metadata.
-    pub async fn on_create_metadata(&self) -> Result<Status> {
+    pub async fn on_create_metadata(&mut self) -> Result<Status> {
         let manager = &self.context.table_metadata_manager;
-        let physical_table_id = self.creator.data.physical_table_id();
-        let remaining_tasks = self.creator.data.remaining_tasks();
+        let physical_table_id = self.data.physical_table_id();
+        let remaining_tasks = self.data.remaining_tasks();
         let num_tables = remaining_tasks.len();
 
         if num_tables > 0 {
-            let chunk_size = manager.max_logical_tables_per_batch();
+            let chunk_size = manager.create_logical_tables_metadata_chunk_size();
             if num_tables > chunk_size {
                 let chunks = remaining_tasks
                     .into_iter()
@@ -195,13 +216,56 @@ impl CreateLogicalTablesProcedure {
         // The `table_id` MUST be collected after the [Prepare::Prepare],
         // ensures the all `table_id`s have been allocated.
         let table_ids = self
-            .creator
             .data
             .tasks
             .iter()
             .map(|task| task.table_info.ident.table_id)
             .collect::<Vec<_>>();
 
+        if !self.data.physical_columns.is_empty() {
+            // fetch old physical table's info
+            let physical_table_info = self
+                .context
+                .table_metadata_manager
+                .table_info_manager()
+                .get(self.data.physical_table_id)
+                .await?
+                .with_context(|| TableInfoNotFoundSnafu {
+                    table: format!("table id - {}", self.data.physical_table_id),
+                })?;
+
+            // generate new table info
+            let new_table_info = self
+                .data
+                .build_new_physical_table_info(&physical_table_info);
+
+            let physical_table_name = TableName::new(
+                &new_table_info.catalog_name,
+                &new_table_info.schema_name,
+                &new_table_info.name,
+            );
+
+            // update physical table's metadata
+            self.context
+                .table_metadata_manager
+                .update_table_info(physical_table_info, new_table_info)
+                .await?;
+
+            // invalid table cache
+            self.context
+                .cache_invalidator
+                .invalidate(
+                    &Context::default(),
+                    vec![
+                        CacheIdent::TableId(self.data.physical_table_id),
+                        CacheIdent::TableName(physical_table_name),
+                    ],
+                )
+                .await?;
+        } else {
+            warn!("No physical columns found, leaving the physical table's schema unchanged");
+        }
+
         info!("Created {num_tables} tables {table_ids:?} metadata for physical table {physical_table_id}");
 
         Ok(Status::done_with_output(table_ids))
@@ -222,7 +286,7 @@ impl CreateLogicalTablesProcedure {
         datanode: &Peer,
         region_routes: &[RegionRoute],
     ) -> Result<CreateRequests> {
-        let create_tables_data = &self.creator.data;
+        let create_tables_data = &self.data;
         let tasks = &create_tables_data.tasks;
         let physical_table_id = create_tables_data.physical_table_id();
         let regions = find_leader_regions(region_routes, datanode);
@@ -269,15 +333,42 @@ impl CreateLogicalTablesProcedure {
             });
         }
 
-        join_all(create_region_tasks)
+        // collect response from datanodes
+        let raw_schemas = join_all(create_region_tasks)
             .await
             .into_iter()
+            .map(|response| {
+                response.map(|mut response| response.extension.remove(ALTER_PHYSICAL_EXTENSION_KEY))
+            })
             .collect::<Result<Vec<_>>>()?;
 
-        self.creator.data.state = CreateTablesState::CreateMetadata;
+        if raw_schemas.is_empty() {
+            self.data.state = CreateTablesState::CreateMetadata;
+            return Ok(Status::executing(false));
+        }
+
+        // verify all datanodes return the same raw schemas
+        // Safety: previous check ensures this vector is not empty.
+        let first = raw_schemas.first().unwrap();
+        ensure!(
+            raw_schemas.iter().all(|x| x == first),
+            MetadataCorruptionSnafu {
+                err_msg: "Raw schemas from datanodes are not the same"
+            }
+        );
+
+        // decode raw schemas and store it
+        if let Some(raw_schema) = first {
+            let physical_columns =
+                ColumnMetadata::decode_list(raw_schema).context(DecodeJsonSnafu)?;
+            self.data.physical_columns = physical_columns;
+        } else {
+            warn!("creating logical table result doesn't contains extension key `{ALTER_PHYSICAL_EXTENSION_KEY}`,leaving the physical table's schema unchanged");
+        }
 
-        // Ensures the procedures after the crash start from the `DatanodeCreateRegions` stage.
-        Ok(Status::executing(false))
+        self.data.state = CreateTablesState::CreateMetadata;
+
+        Ok(Status::executing(true))
     }
 }
 
@@ -288,7 +379,7 @@ impl Procedure for CreateLogicalTablesProcedure {
     }
 
     async fn execute(&mut self, _ctx: &ProcedureContext) -> ProcedureResult<Status> {
-        let state = &self.creator.data.state;
+        let state = &self.data.state;
 
         let _timer = metrics::METRIC_META_PROCEDURE_CREATE_TABLES
             .with_label_values(&[state.as_ref()])
@@ -303,20 +394,20 @@ impl Procedure for CreateLogicalTablesProcedure {
     }
 
     fn dump(&self) -> ProcedureResult<String> {
-        serde_json::to_string(&self.creator.data).context(ToJsonSnafu)
+        serde_json::to_string(&self.data).context(ToJsonSnafu)
     }
 
     fn lock_key(&self) -> LockKey {
         // CatalogLock, SchemaLock,
         // TableLock
         // TableNameLock(s)
-        let mut lock_key = Vec::with_capacity(2 + 1 + self.creator.data.tasks.len());
-        let table_ref = self.creator.data.tasks[0].table_ref();
+        let mut lock_key = Vec::with_capacity(2 + 1 + self.data.tasks.len());
+        let table_ref = self.data.tasks[0].table_ref();
         lock_key.push(CatalogLock::Read(table_ref.catalog).into());
         lock_key.push(SchemaLock::read(table_ref.catalog, table_ref.schema).into());
-        lock_key.push(TableLock::Write(self.creator.data.physical_table_id()).into());
+        lock_key.push(TableLock::Write(self.data.physical_table_id()).into());
 
-        for task in &self.creator.data.tasks {
+        for task in &self.data.tasks {
             lock_key.push(
                 TableNameLock::new(
                     &task.create_table.catalog_name,
@@ -330,32 +421,6 @@ impl Procedure for CreateLogicalTablesProcedure {
     }
 }
 
-pub struct TablesCreator {
-    /// The serializable data.
-    pub data: CreateTablesData,
-}
-
-impl TablesCreator {
-    pub fn new(
-        cluster_id: ClusterId,
-        tasks: Vec<CreateTableTask>,
-        physical_table_id: TableId,
-    ) -> Self {
-        let len = tasks.len();
-
-        Self {
-            data: CreateTablesData {
-                cluster_id,
-                state: CreateTablesState::Prepare,
-                tasks,
-                table_ids_already_exists: vec![None; len],
-                physical_table_id,
-                physical_region_numbers: vec![],
-            },
-        }
-    }
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct CreateTablesData {
     cluster_id: ClusterId,
@@ -364,6 +429,7 @@ pub struct CreateTablesData {
     table_ids_already_exists: Vec<Option<TableId>>,
     physical_table_id: TableId,
     physical_region_numbers: Vec<RegionNumber>,
+    physical_columns: Vec<ColumnMetadata>,
 }
 
 impl CreateTablesData {
@@ -414,6 +480,21 @@ impl CreateTablesData {
             })
             .collect::<Vec<_>>()
     }
+
+    /// Generate the new physical table info.
+    ///
+    /// This method will consumes the physical columns.
+    fn build_new_physical_table_info(
+        &mut self,
+        old_table_info: &DeserializedValueWithBytes<TableInfoValue>,
+    ) -> RawTableInfo {
+        let raw_table_info = old_table_info.deref().table_info.clone();
+
+        physical_table_metadata::build_new_physical_table_info(
+            raw_table_info,
+            &self.physical_columns,
+        )
+    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, AsRefStr)]
diff --git a/src/common/meta/src/ddl/drop_database.rs b/src/common/meta/src/ddl/drop_database.rs
new file mode 100644
index 000000000000..6454a403e327
--- /dev/null
+++ b/src/common/meta/src/ddl/drop_database.rs
@@ -0,0 +1,171 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod cursor;
+pub mod end;
+pub mod executor;
+pub mod metadata;
+pub mod start;
+use std::fmt::Debug;
+
+use common_procedure::error::{Error as ProcedureError, FromJsonSnafu, ToJsonSnafu};
+use common_procedure::{
+    Context as ProcedureContext, LockKey, Procedure, Result as ProcedureResult, Status,
+};
+use futures::stream::BoxStream;
+use serde::{Deserialize, Serialize};
+use snafu::ResultExt;
+use tonic::async_trait;
+
+use self::start::DropDatabaseStart;
+use crate::ddl::DdlContext;
+use crate::error::Result;
+use crate::key::table_name::TableNameValue;
+use crate::lock_key::{CatalogLock, SchemaLock};
+
+pub struct DropDatabaseProcedure {
+    /// The context of procedure runtime.
+    runtime_context: DdlContext,
+    context: DropDatabaseContext,
+
+    state: Box<dyn State>,
+}
+
+/// Target of dropping tables.
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+pub enum DropTableTarget {
+    Logical,
+    Physical,
+}
+
+/// Context of [DropDatabaseProcedure] execution.
+pub struct DropDatabaseContext {
+    catalog: String,
+    schema: String,
+    drop_if_exists: bool,
+    tables: Option<BoxStream<'static, Result<(String, TableNameValue)>>>,
+}
+
+#[async_trait::async_trait]
+#[typetag::serde(tag = "drop_database_state")]
+pub(crate) trait State: Send + Debug {
+    /// Yields the next [State] and [Status].
+    async fn next(
+        &mut self,
+        ddl_ctx: &DdlContext,
+        ctx: &mut DropDatabaseContext,
+    ) -> Result<(Box<dyn State>, Status)>;
+}
+
+impl DropDatabaseProcedure {
+    pub const TYPE_NAME: &'static str = "metasrv-procedure::DropDatabase";
+
+    pub fn new(catalog: String, schema: String, drop_if_exists: bool, context: DdlContext) -> Self {
+        Self {
+            runtime_context: context,
+            context: DropDatabaseContext {
+                catalog,
+                schema,
+                drop_if_exists,
+                tables: None,
+            },
+            state: Box::new(DropDatabaseStart),
+        }
+    }
+
+    pub fn from_json(json: &str, runtime_context: DdlContext) -> ProcedureResult<Self> {
+        let DropDatabaseOwnedData {
+            catalog,
+            schema,
+            drop_if_exists,
+            state,
+        } = serde_json::from_str(json).context(FromJsonSnafu)?;
+
+        Ok(Self {
+            runtime_context,
+            context: DropDatabaseContext {
+                catalog,
+                schema,
+                drop_if_exists,
+                tables: None,
+            },
+            state,
+        })
+    }
+}
+
+#[async_trait]
+impl Procedure for DropDatabaseProcedure {
+    fn type_name(&self) -> &str {
+        Self::TYPE_NAME
+    }
+
+    async fn execute(&mut self, _ctx: &ProcedureContext) -> ProcedureResult<Status> {
+        let state = &mut self.state;
+
+        let (next, status) = state
+            .next(&self.runtime_context, &mut self.context)
+            .await
+            .map_err(|e| {
+                if e.is_retry_later() {
+                    ProcedureError::retry_later(e)
+                } else {
+                    ProcedureError::external(e)
+                }
+            })?;
+
+        *state = next;
+        Ok(status)
+    }
+
+    fn dump(&self) -> ProcedureResult<String> {
+        let data = DropDatabaseData {
+            catalog: &self.context.catalog,
+            schema: &self.context.schema,
+            drop_if_exists: self.context.drop_if_exists,
+            state: self.state.as_ref(),
+        };
+
+        serde_json::to_string(&data).context(ToJsonSnafu)
+    }
+
+    fn lock_key(&self) -> LockKey {
+        let lock_key = vec![
+            CatalogLock::Read(&self.context.catalog).into(),
+            SchemaLock::write(&self.context.catalog, &self.context.schema).into(),
+        ];
+
+        LockKey::new(lock_key)
+    }
+}
+
+#[derive(Debug, Serialize)]
+struct DropDatabaseData<'a> {
+    // The catalog name
+    catalog: &'a str,
+    // The schema name
+    schema: &'a str,
+    drop_if_exists: bool,
+    state: &'a dyn State,
+}
+
+#[derive(Debug, Deserialize)]
+struct DropDatabaseOwnedData {
+    // The catalog name
+    catalog: String,
+    // The schema name
+    schema: String,
+    drop_if_exists: bool,
+    state: Box<dyn State>,
+}
diff --git a/src/common/meta/src/ddl/drop_database/cursor.rs b/src/common/meta/src/ddl/drop_database/cursor.rs
new file mode 100644
index 000000000000..afc5b152afc0
--- /dev/null
+++ b/src/common/meta/src/ddl/drop_database/cursor.rs
@@ -0,0 +1,141 @@
+// 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_procedure::Status;
+use futures::TryStreamExt;
+use serde::{Deserialize, Serialize};
+use snafu::OptionExt;
+use table::metadata::TableId;
+
+use super::executor::DropDatabaseExecutor;
+use super::metadata::DropDatabaseRemoveMetadata;
+use super::DropTableTarget;
+use crate::ddl::drop_database::{DropDatabaseContext, State};
+use crate::ddl::DdlContext;
+use crate::error::{self, Result};
+use crate::key::table_route::TableRouteValue;
+use crate::key::DeserializedValueWithBytes;
+use crate::table_name::TableName;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct DropDatabaseCursor {
+    target: DropTableTarget,
+}
+
+impl DropDatabaseCursor {
+    /// Returns a new [DropDatabaseCursor].
+    pub fn new(target: DropTableTarget) -> Self {
+        Self { target }
+    }
+
+    fn handle_reach_end(
+        &mut self,
+        ctx: &mut DropDatabaseContext,
+    ) -> Result<(Box<dyn State>, Status)> {
+        match self.target {
+            DropTableTarget::Logical => {
+                // Consumes the tables stream.
+                ctx.tables.take();
+
+                Ok((
+                    Box::new(DropDatabaseCursor::new(DropTableTarget::Physical)),
+                    Status::executing(true),
+                ))
+            }
+            DropTableTarget::Physical => Ok((
+                Box::new(DropDatabaseRemoveMetadata),
+                Status::executing(true),
+            )),
+        }
+    }
+
+    async fn handle_table(
+        &mut self,
+        ddl_ctx: &DdlContext,
+        ctx: &mut DropDatabaseContext,
+        table_name: String,
+        table_id: TableId,
+        table_route_value: DeserializedValueWithBytes<TableRouteValue>,
+    ) -> Result<(Box<dyn State>, Status)> {
+        match (self.target, table_route_value.get_inner_ref()) {
+            (DropTableTarget::Logical, TableRouteValue::Logical(_))
+            | (DropTableTarget::Physical, TableRouteValue::Physical(_)) => {
+                // TODO(weny): Maybe we can drop the table without fetching the `TableInfoValue`
+                let table_info_value = ddl_ctx
+                    .table_metadata_manager
+                    .table_info_manager()
+                    .get(table_id)
+                    .await?
+                    .context(error::TableNotFoundSnafu {
+                        table_name: &table_name,
+                    })?;
+                Ok((
+                    Box::new(DropDatabaseExecutor::new(
+                        TableName::new(&ctx.catalog, &ctx.schema, &table_name),
+                        table_id,
+                        table_info_value,
+                        table_route_value,
+                        self.target,
+                    )),
+                    Status::executing(true),
+                ))
+            }
+            _ => Ok((
+                Box::new(DropDatabaseCursor::new(self.target)),
+                Status::executing(false),
+            )),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+#[typetag::serde]
+impl State for DropDatabaseCursor {
+    async fn next(
+        &mut self,
+        ddl_ctx: &DdlContext,
+        ctx: &mut DropDatabaseContext,
+    ) -> Result<(Box<dyn State>, Status)> {
+        if ctx.tables.as_deref().is_none() {
+            let tables = ddl_ctx
+                .table_metadata_manager
+                .table_name_manager()
+                .tables(&ctx.catalog, &ctx.schema);
+            ctx.tables = Some(tables);
+        }
+        // Safety: must exist
+        match ctx.tables.as_mut().unwrap().try_next().await? {
+            Some((table_name, table_name_value)) => {
+                let table_id = table_name_value.table_id();
+                match ddl_ctx
+                    .table_metadata_manager
+                    .table_route_manager()
+                    .table_route_storage()
+                    .get_raw(table_id)
+                    .await?
+                {
+                    Some(table_route_value) => {
+                        self.handle_table(ddl_ctx, ctx, table_name, table_id, table_route_value)
+                            .await
+                    }
+                    None => Ok((
+                        Box::new(DropDatabaseCursor::new(self.target)),
+                        Status::executing(false),
+                    )),
+                }
+            }
+            None => self.handle_reach_end(ctx),
+        }
+    }
+}
diff --git a/src/partition/src/metrics.rs b/src/common/meta/src/ddl/drop_database/end.rs
similarity index 52%
rename from src/partition/src/metrics.rs
rename to src/common/meta/src/ddl/drop_database/end.rs
index 59f3388c4861..39e5c1a1add2 100644
--- a/src/partition/src/metrics.rs
+++ b/src/common/meta/src/ddl/drop_database/end.rs
@@ -11,3 +11,25 @@
 // 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_procedure::Status;
+use serde::{Deserialize, Serialize};
+
+use crate::ddl::drop_database::{DropDatabaseContext, State};
+use crate::ddl::DdlContext;
+use crate::error::Result;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct DropDatabaseEnd;
+
+#[async_trait::async_trait]
+#[typetag::serde]
+impl State for DropDatabaseEnd {
+    async fn next(
+        &mut self,
+        _: &DdlContext,
+        _: &mut DropDatabaseContext,
+    ) -> Result<(Box<dyn State>, Status)> {
+        Ok((Box::new(DropDatabaseEnd), Status::done()))
+    }
+}
diff --git a/src/common/meta/src/ddl/drop_database/executor.rs b/src/common/meta/src/ddl/drop_database/executor.rs
new file mode 100644
index 000000000000..096493b9ce43
--- /dev/null
+++ b/src/common/meta/src/ddl/drop_database/executor.rs
@@ -0,0 +1,109 @@
+// 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_procedure::Status;
+use common_telemetry::info;
+use serde::{Deserialize, Serialize};
+use snafu::OptionExt;
+use table::metadata::TableId;
+
+use super::cursor::DropDatabaseCursor;
+use super::{DropDatabaseContext, DropTableTarget};
+use crate::ddl::drop_database::State;
+use crate::ddl::drop_table::executor::DropTableExecutor;
+use crate::ddl::DdlContext;
+use crate::error::{self, Result};
+use crate::key::table_info::TableInfoValue;
+use crate::key::table_route::TableRouteValue;
+use crate::key::DeserializedValueWithBytes;
+use crate::region_keeper::OperatingRegionGuard;
+use crate::rpc::router::operating_leader_regions;
+use crate::table_name::TableName;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct DropDatabaseExecutor {
+    table_name: TableName,
+    table_id: TableId,
+    table_info_value: DeserializedValueWithBytes<TableInfoValue>,
+    table_route_value: DeserializedValueWithBytes<TableRouteValue>,
+    target: DropTableTarget,
+    #[serde(skip)]
+    dropping_regions: Vec<OperatingRegionGuard>,
+}
+
+impl DropDatabaseExecutor {
+    /// Returns a new [DropDatabaseExecutor].
+    pub fn new(
+        table_name: TableName,
+        table_id: TableId,
+        table_info_value: DeserializedValueWithBytes<TableInfoValue>,
+        table_route_value: DeserializedValueWithBytes<TableRouteValue>,
+        target: DropTableTarget,
+    ) -> Self {
+        Self {
+            table_name,
+            table_id,
+            table_info_value,
+            table_route_value,
+            target,
+            dropping_regions: vec![],
+        }
+    }
+}
+
+impl DropDatabaseExecutor {
+    fn register_dropping_regions(&mut self, ddl_ctx: &DdlContext) -> Result<()> {
+        let region_routes = self.table_route_value.region_routes()?;
+        let dropping_regions = operating_leader_regions(region_routes);
+        let mut dropping_region_guards = Vec::with_capacity(dropping_regions.len());
+        for (region_id, datanode_id) in dropping_regions {
+            let guard = ddl_ctx
+                .memory_region_keeper
+                .register(datanode_id, region_id)
+                .context(error::RegionOperatingRaceSnafu {
+                    region_id,
+                    peer_id: datanode_id,
+                })?;
+            dropping_region_guards.push(guard);
+        }
+        self.dropping_regions = dropping_region_guards;
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+#[typetag::serde]
+impl State for DropDatabaseExecutor {
+    async fn next(
+        &mut self,
+        ddl_ctx: &DdlContext,
+        _ctx: &mut DropDatabaseContext,
+    ) -> Result<(Box<dyn State>, Status)> {
+        self.register_dropping_regions(ddl_ctx)?;
+        let executor = DropTableExecutor::new(self.table_name.clone(), self.table_id, true);
+        executor
+            .on_remove_metadata(ddl_ctx, &self.table_info_value, &self.table_route_value)
+            .await?;
+        executor.invalidate_table_cache(ddl_ctx).await?;
+        executor
+            .on_drop_regions(ddl_ctx, &self.table_route_value)
+            .await?;
+        info!("Table: {}({}) is dropped", self.table_name, self.table_id);
+
+        Ok((
+            Box::new(DropDatabaseCursor::new(self.target)),
+            Status::executing(false),
+        ))
+    }
+}
diff --git a/src/common/meta/src/ddl/drop_database/metadata.rs b/src/common/meta/src/ddl/drop_database/metadata.rs
new file mode 100644
index 000000000000..37129f16d566
--- /dev/null
+++ b/src/common/meta/src/ddl/drop_database/metadata.rs
@@ -0,0 +1,43 @@
+// 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_procedure::Status;
+use serde::{Deserialize, Serialize};
+
+use super::end::DropDatabaseEnd;
+use crate::ddl::drop_database::{DropDatabaseContext, State};
+use crate::ddl::DdlContext;
+use crate::error::Result;
+use crate::key::schema_name::SchemaNameKey;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct DropDatabaseRemoveMetadata;
+
+#[async_trait::async_trait]
+#[typetag::serde]
+impl State for DropDatabaseRemoveMetadata {
+    async fn next(
+        &mut self,
+        ddl_ctx: &DdlContext,
+        ctx: &mut DropDatabaseContext,
+    ) -> Result<(Box<dyn State>, Status)> {
+        ddl_ctx
+            .table_metadata_manager
+            .schema_manager()
+            .delete(SchemaNameKey::new(&ctx.catalog, &ctx.schema))
+            .await?;
+
+        return Ok((Box::new(DropDatabaseEnd), Status::done()));
+    }
+}
diff --git a/src/common/meta/src/ddl/drop_database/start.rs b/src/common/meta/src/ddl/drop_database/start.rs
new file mode 100644
index 000000000000..2c20517fb5f1
--- /dev/null
+++ b/src/common/meta/src/ddl/drop_database/start.rs
@@ -0,0 +1,65 @@
+// 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_procedure::Status;
+use serde::{Deserialize, Serialize};
+use snafu::ensure;
+
+use crate::ddl::drop_database::cursor::DropDatabaseCursor;
+use crate::ddl::drop_database::end::DropDatabaseEnd;
+use crate::ddl::drop_database::{DropDatabaseContext, DropTableTarget, State};
+use crate::ddl::DdlContext;
+use crate::error::{self, Result};
+use crate::key::schema_name::SchemaNameKey;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct DropDatabaseStart;
+
+#[async_trait::async_trait]
+#[typetag::serde]
+impl State for DropDatabaseStart {
+    /// Checks whether schema exists.
+    /// - Early returns if schema not exists and `drop_if_exists` is `true`.
+    /// - Throws an error if schema not exists and `drop_if_exists` is `false`.
+    async fn next(
+        &mut self,
+        ddl_ctx: &DdlContext,
+        ctx: &mut DropDatabaseContext,
+    ) -> Result<(Box<dyn State>, Status)> {
+        let exists = ddl_ctx
+            .table_metadata_manager
+            .schema_manager()
+            .exists(SchemaNameKey {
+                catalog: &ctx.catalog,
+                schema: &ctx.schema,
+            })
+            .await?;
+
+        if !exists && ctx.drop_if_exists {
+            return Ok((Box::new(DropDatabaseEnd), Status::done()));
+        }
+
+        ensure!(
+            exists,
+            error::SchemaNotFoundSnafu {
+                table_schema: &ctx.schema,
+            }
+        );
+
+        Ok((
+            Box::new(DropDatabaseCursor::new(DropTableTarget::Logical)),
+            Status::executing(true),
+        ))
+    }
+}
diff --git a/src/common/meta/src/ddl/drop_table/executor.rs b/src/common/meta/src/ddl/drop_table/executor.rs
index e7e1992b337b..d869af7c90d2 100644
--- a/src/common/meta/src/ddl/drop_table/executor.rs
+++ b/src/common/meta/src/ddl/drop_table/executor.rs
@@ -198,8 +198,10 @@ mod tests {
     use table::metadata::RawTableInfo;
 
     use super::*;
-    use crate::ddl::test_util::create_table::build_raw_table_info_from_expr;
-    use crate::ddl::test_util::{TestColumnDefBuilder, TestCreateTableExprBuilder};
+    use crate::ddl::test_util::columns::TestColumnDefBuilder;
+    use crate::ddl::test_util::create_table::{
+        build_raw_table_info_from_expr, TestCreateTableExprBuilder,
+    };
     use crate::table_name::TableName;
     use crate::test_util::{new_ddl_context, MockDatanodeManager};
 
diff --git a/src/common/meta/src/ddl/physical_table_metadata.rs b/src/common/meta/src/ddl/physical_table_metadata.rs
new file mode 100644
index 000000000000..df66995bd883
--- /dev/null
+++ b/src/common/meta/src/ddl/physical_table_metadata.rs
@@ -0,0 +1,56 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::collections::HashSet;
+
+use api::v1::SemanticType;
+use store_api::metadata::ColumnMetadata;
+use table::metadata::RawTableInfo;
+
+/// Generate the new physical table info.
+pub(crate) fn build_new_physical_table_info(
+    mut raw_table_info: RawTableInfo,
+    physical_columns: &[ColumnMetadata],
+) -> RawTableInfo {
+    let existing_columns = raw_table_info
+        .meta
+        .schema
+        .column_schemas
+        .iter()
+        .map(|col| col.name.clone())
+        .collect::<HashSet<_>>();
+    let primary_key_indices = &mut raw_table_info.meta.primary_key_indices;
+    let value_indices = &mut raw_table_info.meta.value_indices;
+    value_indices.clear();
+    let time_index = &mut raw_table_info.meta.schema.timestamp_index;
+    let columns = &mut raw_table_info.meta.schema.column_schemas;
+    columns.clear();
+
+    for (idx, col) in physical_columns.iter().enumerate() {
+        match col.semantic_type {
+            SemanticType::Tag => {
+                // push new primary key to the end.
+                if !existing_columns.contains(&col.column_schema.name) {
+                    primary_key_indices.push(idx);
+                }
+            }
+            SemanticType::Field => value_indices.push(idx),
+            SemanticType::Timestamp => *time_index = Some(idx),
+        }
+
+        columns.push(col.column_schema.clone());
+    }
+
+    raw_table_info
+}
diff --git a/src/common/meta/src/ddl/test_util.rs b/src/common/meta/src/ddl/test_util.rs
index 239a655fb2cb..0245d4fc905a 100644
--- a/src/common/meta/src/ddl/test_util.rs
+++ b/src/common/meta/src/ddl/test_util.rs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub mod alter_table;
+pub mod columns;
 pub mod create_table;
-
-pub use create_table::{
-    TestColumnDef, TestColumnDefBuilder, TestCreateTableExpr, TestCreateTableExprBuilder,
-};
diff --git a/src/common/meta/src/ddl/test_util/alter_table.rs b/src/common/meta/src/ddl/test_util/alter_table.rs
new file mode 100644
index 000000000000..13da97e3d82e
--- /dev/null
+++ b/src/common/meta/src/ddl/test_util/alter_table.rs
@@ -0,0 +1,62 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use api::v1::alter_expr::Kind;
+use api::v1::{AddColumn, AddColumns, AlterExpr, ColumnDef, RenameTable};
+use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
+use derive_builder::Builder;
+
+#[derive(Default, Builder)]
+#[builder(default)]
+pub struct TestAlterTableExpr {
+    #[builder(setter(into), default = "DEFAULT_CATALOG_NAME.to_string()")]
+    catalog_name: String,
+    #[builder(setter(into), default = "DEFAULT_SCHEMA_NAME.to_string()")]
+    schema_name: String,
+    #[builder(setter(into))]
+    table_name: String,
+    #[builder(setter(into))]
+    add_columns: Vec<ColumnDef>,
+    #[builder(setter(into))]
+    new_table_name: Option<String>,
+}
+
+impl From<TestAlterTableExpr> for AlterExpr {
+    fn from(value: TestAlterTableExpr) -> Self {
+        if let Some(new_table_name) = value.new_table_name {
+            Self {
+                catalog_name: value.catalog_name,
+                schema_name: value.schema_name,
+                table_name: value.table_name,
+                kind: Some(Kind::RenameTable(RenameTable { new_table_name })),
+            }
+        } else {
+            Self {
+                catalog_name: value.catalog_name,
+                schema_name: value.schema_name,
+                table_name: value.table_name,
+                kind: Some(Kind::AddColumns(AddColumns {
+                    add_columns: value
+                        .add_columns
+                        .into_iter()
+                        .map(|col| AddColumn {
+                            column_def: Some(col),
+                            location: None,
+                        })
+                        .collect(),
+                })),
+            }
+        }
+    }
+}
diff --git a/src/common/meta/src/ddl/test_util/columns.rs b/src/common/meta/src/ddl/test_util/columns.rs
new file mode 100644
index 000000000000..9e258939b021
--- /dev/null
+++ b/src/common/meta/src/ddl/test_util/columns.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 api::v1::{ColumnDataType, ColumnDef, SemanticType};
+use derive_builder::Builder;
+
+#[derive(Default, Builder)]
+pub struct TestColumnDef {
+    #[builder(setter(into), default)]
+    name: String,
+    data_type: ColumnDataType,
+    #[builder(default)]
+    is_nullable: bool,
+    semantic_type: SemanticType,
+    #[builder(setter(into), default)]
+    comment: String,
+}
+
+impl From<TestColumnDef> for ColumnDef {
+    fn from(
+        TestColumnDef {
+            name,
+            data_type,
+            is_nullable,
+            semantic_type,
+            comment,
+        }: TestColumnDef,
+    ) -> Self {
+        Self {
+            name,
+            data_type: data_type as i32,
+            is_nullable,
+            default_constraint: vec![],
+            semantic_type: semantic_type as i32,
+            comment,
+            datatype_extension: None,
+        }
+    }
+}
diff --git a/src/common/meta/src/ddl/test_util/create_table.rs b/src/common/meta/src/ddl/test_util/create_table.rs
index 12b13d74f93c..eb80d8c16007 100644
--- a/src/common/meta/src/ddl/test_util/create_table.rs
+++ b/src/common/meta/src/ddl/test_util/create_table.rs
@@ -15,7 +15,7 @@
 use std::collections::HashMap;
 
 use api::v1::column_def::try_as_column_schema;
-use api::v1::{ColumnDataType, ColumnDef, CreateTableExpr, SemanticType};
+use api::v1::{ColumnDef, CreateTableExpr, SemanticType};
 use chrono::DateTime;
 use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, MITO2_ENGINE};
 use datatypes::schema::RawSchema;
@@ -24,40 +24,6 @@ use store_api::storage::TableId;
 use table::metadata::{RawTableInfo, RawTableMeta, TableIdent, TableType};
 use table::requests::TableOptions;
 
-#[derive(Default, Builder)]
-pub struct TestColumnDef {
-    #[builder(setter(into), default)]
-    name: String,
-    data_type: ColumnDataType,
-    #[builder(default)]
-    is_nullable: bool,
-    semantic_type: SemanticType,
-    #[builder(setter(into), default)]
-    comment: String,
-}
-
-impl From<TestColumnDef> for ColumnDef {
-    fn from(
-        TestColumnDef {
-            name,
-            data_type,
-            is_nullable,
-            semantic_type,
-            comment,
-        }: TestColumnDef,
-    ) -> Self {
-        Self {
-            name,
-            data_type: data_type as i32,
-            is_nullable,
-            default_constraint: vec![],
-            semantic_type: semantic_type as i32,
-            comment,
-            datatype_extension: None,
-        }
-    }
-}
-
 #[derive(Default, Builder)]
 #[builder(default)]
 pub struct TestCreateTableExpr {
diff --git a/src/common/meta/src/ddl/tests.rs b/src/common/meta/src/ddl/tests.rs
index 5ea7d6a85803..fcbe52189a84 100644
--- a/src/common/meta/src/ddl/tests.rs
+++ b/src/common/meta/src/ddl/tests.rs
@@ -12,5 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+mod alter_logical_tables;
 mod create_logical_tables;
 mod create_table;
diff --git a/src/common/meta/src/ddl/tests/alter_logical_tables.rs b/src/common/meta/src/ddl/tests/alter_logical_tables.rs
new file mode 100644
index 000000000000..9be0f4c584de
--- /dev/null
+++ b/src/common/meta/src/ddl/tests/alter_logical_tables.rs
@@ -0,0 +1,412 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::assert_matches::assert_matches;
+use std::sync::Arc;
+
+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 table::metadata::TableId;
+
+use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
+use crate::ddl::create_logical_tables::CreateLogicalTablesProcedure;
+use crate::ddl::test_util::alter_table::TestAlterTableExprBuilder;
+use crate::ddl::test_util::columns::TestColumnDefBuilder;
+use crate::ddl::tests::create_logical_tables;
+use crate::ddl::tests::create_logical_tables::{
+    test_create_physical_table_task, NaiveDatanodeHandler,
+};
+use crate::ddl::{DdlContext, TableMetadata, TableMetadataAllocatorContext};
+use crate::error::Error::{AlterLogicalTablesInvalidArguments, TableNotFound};
+use crate::key::table_name::TableNameKey;
+use crate::rpc::ddl::AlterTableTask;
+use crate::test_util::{new_ddl_context, MockDatanodeManager};
+use crate::ClusterId;
+
+fn make_alter_logical_table_add_column_task(
+    schema: Option<&str>,
+    table: &str,
+    add_columns: Vec<String>,
+) -> AlterTableTask {
+    let add_columns = add_columns
+        .into_iter()
+        .map(|name| {
+            TestColumnDefBuilder::default()
+                .name(name)
+                .data_type(ColumnDataType::String)
+                .is_nullable(true)
+                .semantic_type(SemanticType::Tag)
+                .comment("new column".to_string())
+                .build()
+                .unwrap()
+                .into()
+        })
+        .collect::<Vec<_>>();
+    let mut alter_table = TestAlterTableExprBuilder::default();
+    if let Some(schema) = schema {
+        alter_table.schema_name(schema.to_string());
+    }
+    let alter_table = alter_table
+        .table_name(table.to_string())
+        .add_columns(add_columns)
+        .build()
+        .unwrap();
+
+    AlterTableTask {
+        alter_table: alter_table.into(),
+    }
+}
+
+fn make_alter_logical_table_rename_task(
+    schema: &str,
+    table: &str,
+    new_table_name: &str,
+) -> AlterTableTask {
+    let alter_table = TestAlterTableExprBuilder::default()
+        .schema_name(schema.to_string())
+        .table_name(table.to_string())
+        .new_table_name(new_table_name.to_string())
+        .build()
+        .unwrap();
+
+    AlterTableTask {
+        alter_table: alter_table.into(),
+    }
+}
+
+#[tokio::test]
+async fn test_on_prepare_check_schema() {
+    let datanode_manager = Arc::new(MockDatanodeManager::new(()));
+    let ddl_context = new_ddl_context(datanode_manager);
+    let cluster_id = 1;
+    let tasks = vec![
+        make_alter_logical_table_add_column_task(
+            Some("schema1"),
+            "table1",
+            vec!["column1".to_string()],
+        ),
+        make_alter_logical_table_add_column_task(
+            Some("schema2"),
+            "table2",
+            vec!["column2".to_string()],
+        ),
+    ];
+    let physical_table_id = 1024u32;
+    let mut procedure =
+        AlterLogicalTablesProcedure::new(cluster_id, tasks, physical_table_id, ddl_context);
+    let err = procedure.on_prepare().await.unwrap_err();
+    assert_matches!(err, AlterLogicalTablesInvalidArguments { .. });
+}
+
+#[tokio::test]
+async fn test_on_prepare_check_alter_kind() {
+    let datanode_manager = Arc::new(MockDatanodeManager::new(()));
+    let ddl_context = new_ddl_context(datanode_manager);
+    let cluster_id = 1;
+    let tasks = vec![make_alter_logical_table_rename_task(
+        "schema1",
+        "table1",
+        "new_table1",
+    )];
+    let physical_table_id = 1024u32;
+    let mut procedure =
+        AlterLogicalTablesProcedure::new(cluster_id, tasks, physical_table_id, ddl_context);
+    let err = procedure.on_prepare().await.unwrap_err();
+    assert_matches!(err, AlterLogicalTablesInvalidArguments { .. });
+}
+
+async fn create_physical_table(
+    ddl_context: DdlContext,
+    cluster_id: ClusterId,
+    name: &str,
+) -> TableId {
+    // Prepares physical table metadata.
+    let mut create_physical_table_task = test_create_physical_table_task(name);
+    let TableMetadata {
+        table_id,
+        table_route,
+        ..
+    } = ddl_context
+        .table_metadata_allocator
+        .create(
+            &TableMetadataAllocatorContext { cluster_id },
+            &create_physical_table_task,
+        )
+        .await
+        .unwrap();
+    create_physical_table_task.set_table_id(table_id);
+    create_logical_tables::create_physical_table_metadata(
+        &ddl_context,
+        create_physical_table_task.table_info.clone(),
+        table_route,
+    )
+    .await;
+
+    table_id
+}
+
+async fn create_logical_table(
+    ddl_context: DdlContext,
+    cluster_id: ClusterId,
+    physical_table_id: TableId,
+    table_name: &str,
+) {
+    let tasks = vec![create_logical_tables::test_create_logical_table_task(
+        table_name,
+    )];
+    let mut procedure =
+        CreateLogicalTablesProcedure::new(cluster_id, tasks, physical_table_id, ddl_context);
+    let status = procedure.on_prepare().await.unwrap();
+    assert_matches!(status, Status::Executing { persist: true });
+    let status = procedure.on_create_metadata().await.unwrap();
+    assert_matches!(status, Status::Done { .. });
+}
+
+#[tokio::test]
+async fn test_on_prepare_different_physical_table() {
+    let cluster_id = 1;
+    let datanode_manager = Arc::new(MockDatanodeManager::new(()));
+    let ddl_context = new_ddl_context(datanode_manager);
+
+    let phy1_id = create_physical_table(ddl_context.clone(), cluster_id, "phy1").await;
+    create_logical_table(ddl_context.clone(), cluster_id, phy1_id, "table1").await;
+    let phy2_id = create_physical_table(ddl_context.clone(), cluster_id, "phy2").await;
+    create_logical_table(ddl_context.clone(), cluster_id, phy2_id, "table2").await;
+
+    let tasks = vec![
+        make_alter_logical_table_add_column_task(None, "table1", vec!["column1".to_string()]),
+        make_alter_logical_table_add_column_task(None, "table2", vec!["column2".to_string()]),
+    ];
+
+    let mut procedure = AlterLogicalTablesProcedure::new(cluster_id, tasks, phy1_id, ddl_context);
+    let err = procedure.on_prepare().await.unwrap_err();
+    assert_matches!(err, AlterLogicalTablesInvalidArguments { .. });
+}
+
+#[tokio::test]
+async fn test_on_prepare_logical_table_not_exists() {
+    let cluster_id = 1;
+    let datanode_manager = Arc::new(MockDatanodeManager::new(()));
+    let ddl_context = new_ddl_context(datanode_manager);
+
+    // Creates physical table
+    let phy_id = create_physical_table(ddl_context.clone(), cluster_id, "phy").await;
+    // Creates 3 logical tables
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table1").await;
+
+    let tasks = vec![
+        make_alter_logical_table_add_column_task(None, "table1", vec!["column1".to_string()]),
+        // table2 not exists
+        make_alter_logical_table_add_column_task(None, "table2", vec!["column2".to_string()]),
+    ];
+
+    let mut procedure = AlterLogicalTablesProcedure::new(cluster_id, tasks, phy_id, ddl_context);
+    let err = procedure.on_prepare().await.unwrap_err();
+    assert_matches!(err, TableNotFound { .. });
+}
+
+#[tokio::test]
+async fn test_on_prepare() {
+    let cluster_id = 1;
+    let datanode_manager = Arc::new(MockDatanodeManager::new(()));
+    let ddl_context = new_ddl_context(datanode_manager);
+
+    // Creates physical table
+    let phy_id = create_physical_table(ddl_context.clone(), cluster_id, "phy").await;
+    // Creates 3 logical tables
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table1").await;
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table2").await;
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table3").await;
+
+    let tasks = vec![
+        make_alter_logical_table_add_column_task(None, "table1", vec!["column1".to_string()]),
+        make_alter_logical_table_add_column_task(None, "table2", vec!["column2".to_string()]),
+        make_alter_logical_table_add_column_task(None, "table3", vec!["column3".to_string()]),
+    ];
+
+    let mut procedure = AlterLogicalTablesProcedure::new(cluster_id, tasks, phy_id, ddl_context);
+    let result = procedure.on_prepare().await;
+    assert_matches!(result, Ok(Status::Executing { persist: true }));
+}
+
+#[tokio::test]
+async fn test_on_update_metadata() {
+    let cluster_id = 1;
+    let datanode_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
+    let ddl_context = new_ddl_context(datanode_manager);
+
+    // Creates physical table
+    let phy_id = create_physical_table(ddl_context.clone(), cluster_id, "phy").await;
+    // Creates 3 logical tables
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table1").await;
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table2").await;
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table3").await;
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table4").await;
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table5").await;
+
+    let tasks = vec![
+        make_alter_logical_table_add_column_task(None, "table1", vec!["new_col".to_string()]),
+        make_alter_logical_table_add_column_task(None, "table2", vec!["mew_col".to_string()]),
+        make_alter_logical_table_add_column_task(None, "table3", vec!["new_col".to_string()]),
+    ];
+
+    let mut procedure = AlterLogicalTablesProcedure::new(cluster_id, tasks, phy_id, ddl_context);
+    let mut status = procedure.on_prepare().await.unwrap();
+    assert_matches!(status, Status::Executing { persist: true });
+
+    let ctx = common_procedure::Context {
+        procedure_id: ProcedureId::random(),
+        provider: Arc::new(MockContextProvider::default()),
+    };
+    // on_submit_alter_region_requests
+    status = procedure.execute(&ctx).await.unwrap();
+    assert_matches!(status, Status::Executing { persist: true });
+    // on_update_metadata
+    status = procedure.execute(&ctx).await.unwrap();
+    assert_matches!(status, Status::Executing { persist: true });
+}
+
+#[tokio::test]
+async fn test_on_part_duplicate_alter_request() {
+    let cluster_id = 1;
+    let datanode_manager = Arc::new(MockDatanodeManager::new(NaiveDatanodeHandler));
+    let ddl_context = new_ddl_context(datanode_manager);
+
+    // Creates physical table
+    let phy_id = create_physical_table(ddl_context.clone(), cluster_id, "phy").await;
+    // Creates 3 logical tables
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table1").await;
+    create_logical_table(ddl_context.clone(), cluster_id, phy_id, "table2").await;
+
+    let tasks = vec![
+        make_alter_logical_table_add_column_task(None, "table1", vec!["col_0".to_string()]),
+        make_alter_logical_table_add_column_task(None, "table2", vec!["col_0".to_string()]),
+    ];
+
+    let mut procedure =
+        AlterLogicalTablesProcedure::new(cluster_id, tasks, phy_id, ddl_context.clone());
+    let mut status = procedure.on_prepare().await.unwrap();
+    assert_matches!(status, Status::Executing { persist: true });
+
+    let ctx = common_procedure::Context {
+        procedure_id: ProcedureId::random(),
+        provider: Arc::new(MockContextProvider::default()),
+    };
+    // on_submit_alter_region_requests
+    status = procedure.execute(&ctx).await.unwrap();
+    assert_matches!(status, Status::Executing { persist: true });
+    // on_update_metadata
+    status = procedure.execute(&ctx).await.unwrap();
+    assert_matches!(status, Status::Executing { persist: true });
+
+    // re-alter
+    let tasks = vec![
+        make_alter_logical_table_add_column_task(
+            None,
+            "table1",
+            vec!["col_0".to_string(), "new_col_1".to_string()],
+        ),
+        make_alter_logical_table_add_column_task(
+            None,
+            "table2",
+            vec![
+                "col_0".to_string(),
+                "new_col_2".to_string(),
+                "new_col_1".to_string(),
+            ],
+        ),
+    ];
+
+    let mut procedure =
+        AlterLogicalTablesProcedure::new(cluster_id, tasks, phy_id, ddl_context.clone());
+    let mut status = procedure.on_prepare().await.unwrap();
+    assert_matches!(status, Status::Executing { persist: true });
+
+    let ctx = common_procedure::Context {
+        procedure_id: ProcedureId::random(),
+        provider: Arc::new(MockContextProvider::default()),
+    };
+    // on_submit_alter_region_requests
+    status = procedure.execute(&ctx).await.unwrap();
+    assert_matches!(status, Status::Executing { persist: true });
+    // on_update_metadata
+    status = procedure.execute(&ctx).await.unwrap();
+    assert_matches!(status, Status::Executing { persist: true });
+
+    let table_name_keys = vec![
+        TableNameKey::new(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, "table1"),
+        TableNameKey::new(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, "table2"),
+    ];
+    let table_ids = ddl_context
+        .table_metadata_manager
+        .table_name_manager()
+        .batch_get(table_name_keys)
+        .await
+        .unwrap()
+        .into_iter()
+        .map(|x| x.unwrap().table_id())
+        .collect::<Vec<_>>();
+    let tables = ddl_context
+        .table_metadata_manager
+        .table_info_manager()
+        .batch_get(&table_ids)
+        .await
+        .unwrap();
+
+    let table1 = tables.get(&table_ids[0]).unwrap();
+    let table2 = tables.get(&table_ids[1]).unwrap();
+    assert_eq!(table1.table_info.name, "table1");
+    assert_eq!(table2.table_info.name, "table2");
+
+    let table1_cols = table1
+        .table_info
+        .meta
+        .schema
+        .column_schemas
+        .iter()
+        .map(|x| x.name.clone())
+        .collect::<Vec<_>>();
+    assert_eq!(
+        table1_cols,
+        vec![
+            "col_0".to_string(),
+            "cpu".to_string(),
+            "host".to_string(),
+            "new_col_1".to_string(),
+            "ts".to_string()
+        ]
+    );
+
+    let table2_cols = table2
+        .table_info
+        .meta
+        .schema
+        .column_schemas
+        .iter()
+        .map(|x| x.name.clone())
+        .collect::<Vec<_>>();
+    assert_eq!(
+        table2_cols,
+        vec![
+            "col_0".to_string(),
+            "cpu".to_string(),
+            "host".to_string(),
+            "new_col_1".to_string(),
+            "new_col_2".to_string(),
+            "ts".to_string()
+        ]
+    );
+}
diff --git a/src/common/meta/src/ddl/tests/create_logical_tables.rs b/src/common/meta/src/ddl/tests/create_logical_tables.rs
index e6710d7440c8..7223c2e43458 100644
--- a/src/common/meta/src/ddl/tests/create_logical_tables.rs
+++ b/src/common/meta/src/ddl/tests/create_logical_tables.rs
@@ -28,19 +28,22 @@ use common_telemetry::debug;
 use store_api::storage::RegionId;
 use table::metadata::RawTableInfo;
 
+use crate::datanode_manager::HandleResponse;
 use crate::ddl::create_logical_tables::CreateLogicalTablesProcedure;
-use crate::ddl::test_util::create_table::build_raw_table_info_from_expr;
-use crate::ddl::test_util::{TestColumnDefBuilder, TestCreateTableExprBuilder};
+use crate::ddl::test_util::columns::TestColumnDefBuilder;
+use crate::ddl::test_util::create_table::{
+    build_raw_table_info_from_expr, TestCreateTableExprBuilder,
+};
 use crate::ddl::{DdlContext, TableMetadata, TableMetadataAllocatorContext};
 use crate::error::{Error, Result};
 use crate::key::table_route::TableRouteValue;
 use crate::peer::Peer;
 use crate::rpc::ddl::CreateTableTask;
-use crate::test_util::{new_ddl_context, AffectedRows, MockDatanodeHandler, MockDatanodeManager};
+use crate::test_util::{new_ddl_context, MockDatanodeHandler, MockDatanodeManager};
 
 // Note: this code may be duplicated with others.
 // However, it's by design, ensures the tests are easy to be modified or added.
-fn test_create_logical_table_task(name: &str) -> CreateTableTask {
+pub(crate) fn test_create_logical_table_task(name: &str) -> CreateTableTask {
     let create_table = TestCreateTableExprBuilder::default()
         .column_defs([
             TestColumnDefBuilder::default()
@@ -85,7 +88,7 @@ fn test_create_logical_table_task(name: &str) -> CreateTableTask {
 
 // Note: this code may be duplicated with others.
 // However, it's by design, ensures the tests are easy to be modified or added.
-fn test_create_physical_table_task(name: &str) -> CreateTableTask {
+pub(crate) fn test_create_physical_table_task(name: &str) -> CreateTableTask {
     let create_table = TestCreateTableExprBuilder::default()
         .column_defs([
             TestColumnDefBuilder::default()
@@ -134,7 +137,7 @@ async fn test_on_prepare_physical_table_not_found() {
     assert_matches!(err, Error::TableRouteNotFound { .. });
 }
 
-async fn create_physical_table_metadata(
+pub(crate) async fn create_physical_table_metadata(
     ddl_context: &DdlContext,
     table_info: RawTableInfo,
     table_route: TableRouteValue,
@@ -332,9 +335,9 @@ pub struct NaiveDatanodeHandler;
 
 #[async_trait::async_trait]
 impl MockDatanodeHandler for NaiveDatanodeHandler {
-    async fn handle(&self, peer: &Peer, request: RegionRequest) -> Result<AffectedRows> {
+    async fn handle(&self, peer: &Peer, request: RegionRequest) -> Result<HandleResponse> {
         debug!("Returning Ok(0) for request: {request:?}, peer: {peer:?}");
-        Ok(0)
+        Ok(HandleResponse::new(0))
     }
 
     async fn handle_query(
diff --git a/src/common/meta/src/ddl/tests/create_table.rs b/src/common/meta/src/ddl/tests/create_table.rs
index d31c78479da6..2ba289488dea 100644
--- a/src/common/meta/src/ddl/tests/create_table.rs
+++ b/src/common/meta/src/ddl/tests/create_table.rs
@@ -26,19 +26,22 @@ use common_procedure_test::MockContextProvider;
 use common_recordbatch::SendableRecordBatchStream;
 use common_telemetry::debug;
 
+use crate::datanode_manager::HandleResponse;
 use crate::ddl::create_table::CreateTableProcedure;
-use crate::ddl::test_util::create_table::build_raw_table_info_from_expr;
-use crate::ddl::test_util::{TestColumnDefBuilder, TestCreateTableExprBuilder};
+use crate::ddl::test_util::columns::TestColumnDefBuilder;
+use crate::ddl::test_util::create_table::{
+    build_raw_table_info_from_expr, TestCreateTableExprBuilder,
+};
 use crate::error;
 use crate::error::{Error, Result};
 use crate::key::table_route::TableRouteValue;
 use crate::peer::Peer;
 use crate::rpc::ddl::CreateTableTask;
-use crate::test_util::{new_ddl_context, AffectedRows, MockDatanodeHandler, MockDatanodeManager};
+use crate::test_util::{new_ddl_context, MockDatanodeHandler, MockDatanodeManager};
 
 #[async_trait::async_trait]
 impl MockDatanodeHandler for () {
-    async fn handle(&self, _peer: &Peer, _request: RegionRequest) -> Result<AffectedRows> {
+    async fn handle(&self, _peer: &Peer, _request: RegionRequest) -> Result<HandleResponse> {
         unreachable!()
     }
 
@@ -176,7 +179,7 @@ pub struct RetryErrorDatanodeHandler;
 
 #[async_trait::async_trait]
 impl MockDatanodeHandler for RetryErrorDatanodeHandler {
-    async fn handle(&self, peer: &Peer, request: RegionRequest) -> Result<AffectedRows> {
+    async fn handle(&self, peer: &Peer, request: RegionRequest) -> Result<HandleResponse> {
         debug!("Returning retry later for request: {request:?}, peer: {peer:?}");
         Err(Error::RetryLater {
             source: BoxedError::new(
@@ -220,7 +223,7 @@ pub struct UnexpectedErrorDatanodeHandler;
 
 #[async_trait::async_trait]
 impl MockDatanodeHandler for UnexpectedErrorDatanodeHandler {
-    async fn handle(&self, peer: &Peer, request: RegionRequest) -> Result<AffectedRows> {
+    async fn handle(&self, peer: &Peer, request: RegionRequest) -> Result<HandleResponse> {
         debug!("Returning mock error for request: {request:?}, peer: {peer:?}");
         error::UnexpectedSnafu {
             err_msg: "mock error",
@@ -260,9 +263,9 @@ pub struct NaiveDatanodeHandler;
 
 #[async_trait::async_trait]
 impl MockDatanodeHandler for NaiveDatanodeHandler {
-    async fn handle(&self, peer: &Peer, request: RegionRequest) -> Result<AffectedRows> {
+    async fn handle(&self, peer: &Peer, request: RegionRequest) -> Result<HandleResponse> {
         debug!("Returning Ok(0) for request: {request:?}, peer: {peer:?}");
-        Ok(0)
+        Ok(HandleResponse::new(0))
     }
 
     async fn handle_query(
diff --git a/src/common/meta/src/ddl/utils.rs b/src/common/meta/src/ddl/utils.rs
index e8fc3ef5fe38..de6171d4efcf 100644
--- a/src/common/meta/src/ddl/utils.rs
+++ b/src/common/meta/src/ddl/utils.rs
@@ -19,9 +19,7 @@ use snafu::{ensure, location, Location, OptionExt};
 use store_api::metric_engine_consts::LOGICAL_TABLE_METADATA_KEY;
 use table::metadata::TableId;
 
-use crate::error::{
-    EmptyCreateTableTasksSnafu, Error, Result, TableNotFoundSnafu, UnsupportedSnafu,
-};
+use crate::error::{Error, Result, TableNotFoundSnafu, UnsupportedSnafu};
 use crate::key::table_name::TableNameKey;
 use crate::key::TableMetadataManagerRef;
 use crate::peer::Peer;
@@ -98,7 +96,8 @@ pub async fn check_and_get_physical_table_id(
             None => Some(current_physical_table_name),
         };
     }
-    let physical_table_name = physical_table_name.context(EmptyCreateTableTasksSnafu)?;
+    // Safety: `physical_table_name` is `Some` here
+    let physical_table_name = physical_table_name.unwrap();
     table_metadata_manager
         .table_name_manager()
         .get(physical_table_name)
@@ -108,3 +107,22 @@ pub async fn check_and_get_physical_table_id(
         })
         .map(|table| table.table_id())
 }
+
+pub async fn get_physical_table_id(
+    table_metadata_manager: &TableMetadataManagerRef,
+    logical_table_name: TableNameKey<'_>,
+) -> Result<TableId> {
+    let logical_table_id = table_metadata_manager
+        .table_name_manager()
+        .get(logical_table_name)
+        .await?
+        .context(TableNotFoundSnafu {
+            table_name: logical_table_name.to_string(),
+        })
+        .map(|table| table.table_id())?;
+
+    table_metadata_manager
+        .table_route_manager()
+        .get_physical_table_id(logical_table_id)
+        .await
+}
diff --git a/src/common/meta/src/ddl_manager.rs b/src/common/meta/src/ddl_manager.rs
index 5f712fbdd8a6..059094d819a9 100644
--- a/src/common/meta/src/ddl_manager.rs
+++ b/src/common/meta/src/ddl_manager.rs
@@ -14,7 +14,9 @@
 
 use std::sync::Arc;
 
-use common_procedure::{watcher, Output, ProcedureId, ProcedureManagerRef, ProcedureWithId};
+use common_procedure::{
+    watcher, BoxedProcedureLoader, Output, ProcedureId, ProcedureManagerRef, ProcedureWithId,
+};
 use common_telemetry::tracing_context::{FutureExt, TracingContext};
 use common_telemetry::{debug, info, tracing};
 use snafu::{ensure, OptionExt, ResultExt};
@@ -22,15 +24,17 @@ use store_api::storage::TableId;
 
 use crate::cache_invalidator::CacheInvalidatorRef;
 use crate::datanode_manager::DatanodeManagerRef;
+use crate::ddl::alter_logical_tables::AlterLogicalTablesProcedure;
 use crate::ddl::alter_table::AlterTableProcedure;
 use crate::ddl::create_logical_tables::CreateLogicalTablesProcedure;
 use crate::ddl::create_table::CreateTableProcedure;
+use crate::ddl::drop_database::DropDatabaseProcedure;
 use crate::ddl::drop_table::DropTableProcedure;
 use crate::ddl::table_meta::TableMetadataAllocatorRef;
 use crate::ddl::truncate_table::TruncateTableProcedure;
 use crate::ddl::{utils, DdlContext, ExecutorContext, ProcedureExecutor};
 use crate::error::{
-    self, EmptyCreateTableTasksSnafu, ProcedureOutputSnafu, RegisterProcedureLoaderSnafu, Result,
+    self, EmptyDdlTasksSnafu, ProcedureOutputSnafu, RegisterProcedureLoaderSnafu, Result,
     SubmitProcedureSnafu, TableNotFoundSnafu, UnsupportedSnafu, WaitProcedureSnafu,
 };
 use crate::key::table_info::TableInfoValue;
@@ -39,12 +43,12 @@ use crate::key::table_route::TableRouteValue;
 use crate::key::{DeserializedValueWithBytes, TableMetadataManagerRef};
 use crate::region_keeper::MemoryRegionKeeperRef;
 use crate::rpc::ddl::DdlTask::{
-    AlterLogicalTables, AlterTable, CreateLogicalTables, CreateTable, DropLogicalTables, DropTable,
-    TruncateTable,
+    AlterLogicalTables, AlterTable, CreateLogicalTables, CreateTable, DropDatabase,
+    DropLogicalTables, DropTable, TruncateTable,
 };
 use crate::rpc::ddl::{
-    AlterTableTask, CreateTableTask, DropTableTask, SubmitDdlTaskRequest, SubmitDdlTaskResponse,
-    TruncateTableTask,
+    AlterTableTask, CreateTableTask, DropDatabaseTask, DropTableTask, SubmitDdlTaskRequest,
+    SubmitDdlTaskResponse, TruncateTableTask,
 };
 use crate::rpc::procedure;
 use crate::rpc::procedure::{MigrateRegionRequest, MigrateRegionResponse, ProcedureStateResponse};
@@ -54,6 +58,8 @@ use crate::ClusterId;
 
 pub type DdlManagerRef = Arc<DdlManager>;
 
+pub type BoxedProcedureLoaderFactory = dyn Fn(DdlContext) -> BoxedProcedureLoader;
+
 /// The [DdlManager] provides the ability to execute Ddl.
 pub struct DdlManager {
     procedure_manager: ProcedureManagerRef,
@@ -64,8 +70,8 @@ pub struct DdlManager {
     memory_region_keeper: MemoryRegionKeeperRef,
 }
 
+/// Returns a new [DdlManager] with all Ddl [BoxedProcedureLoader](common_procedure::procedure::BoxedProcedureLoader)s registered.
 impl DdlManager {
-    /// Returns a new [DdlManager] with all Ddl [BoxedProcedureLoader](common_procedure::procedure::BoxedProcedureLoader)s registered.
     pub fn try_new(
         procedure_manager: ProcedureManagerRef,
         datanode_clients: DatanodeManagerRef,
@@ -103,75 +109,82 @@ impl DdlManager {
     }
 
     fn register_loaders(&self) -> Result<()> {
-        let context = self.create_context();
-
-        self.procedure_manager
-            .register_loader(
+        let loaders: Vec<(&str, &BoxedProcedureLoaderFactory)> = vec![
+            (
                 CreateTableProcedure::TYPE_NAME,
-                Box::new(move |json| {
-                    let context = context.clone();
-                    CreateTableProcedure::from_json(json, context).map(|p| Box::new(p) as _)
-                }),
-            )
-            .context(RegisterProcedureLoaderSnafu {
-                type_name: CreateTableProcedure::TYPE_NAME,
-            })?;
-
-        let context = self.create_context();
-
-        self.procedure_manager
-            .register_loader(
+                &|context: DdlContext| -> BoxedProcedureLoader {
+                    Box::new(move |json: &str| {
+                        let context = context.clone();
+                        CreateTableProcedure::from_json(json, context).map(|p| Box::new(p) as _)
+                    })
+                },
+            ),
+            (
                 CreateLogicalTablesProcedure::TYPE_NAME,
-                Box::new(move |json| {
-                    let context = context.clone();
-                    CreateLogicalTablesProcedure::from_json(json, context).map(|p| Box::new(p) as _)
-                }),
-            )
-            .context(RegisterProcedureLoaderSnafu {
-                type_name: CreateLogicalTablesProcedure::TYPE_NAME,
-            })?;
-
-        let context = self.create_context();
-
-        self.procedure_manager
-            .register_loader(
-                DropTableProcedure::TYPE_NAME,
-                Box::new(move |json| {
-                    let context = context.clone();
-                    DropTableProcedure::from_json(json, context).map(|p| Box::new(p) as _)
-                }),
-            )
-            .context(RegisterProcedureLoaderSnafu {
-                type_name: DropTableProcedure::TYPE_NAME,
-            })?;
-
-        let context = self.create_context();
-
-        self.procedure_manager
-            .register_loader(
+                &|context: DdlContext| -> BoxedProcedureLoader {
+                    Box::new(move |json: &str| {
+                        let context = context.clone();
+                        CreateLogicalTablesProcedure::from_json(json, context)
+                            .map(|p| Box::new(p) as _)
+                    })
+                },
+            ),
+            (
                 AlterTableProcedure::TYPE_NAME,
-                Box::new(move |json| {
-                    let context = context.clone();
-                    AlterTableProcedure::from_json(json, context).map(|p| Box::new(p) as _)
-                }),
-            )
-            .context(RegisterProcedureLoaderSnafu {
-                type_name: AlterTableProcedure::TYPE_NAME,
-            })?;
+                &|context: DdlContext| -> BoxedProcedureLoader {
+                    Box::new(move |json: &str| {
+                        let context = context.clone();
+                        AlterTableProcedure::from_json(json, context).map(|p| Box::new(p) as _)
+                    })
+                },
+            ),
+            (
+                AlterLogicalTablesProcedure::TYPE_NAME,
+                &|context: DdlContext| -> BoxedProcedureLoader {
+                    Box::new(move |json: &str| {
+                        let context = context.clone();
+                        AlterLogicalTablesProcedure::from_json(json, context)
+                            .map(|p| Box::new(p) as _)
+                    })
+                },
+            ),
+            (
+                DropTableProcedure::TYPE_NAME,
+                &|context: DdlContext| -> BoxedProcedureLoader {
+                    Box::new(move |json: &str| {
+                        let context = context.clone();
+                        DropTableProcedure::from_json(json, context).map(|p| Box::new(p) as _)
+                    })
+                },
+            ),
+            (
+                TruncateTableProcedure::TYPE_NAME,
+                &|context: DdlContext| -> BoxedProcedureLoader {
+                    Box::new(move |json: &str| {
+                        let context = context.clone();
+                        TruncateTableProcedure::from_json(json, context).map(|p| Box::new(p) as _)
+                    })
+                },
+            ),
+            (
+                DropDatabaseProcedure::TYPE_NAME,
+                &|context: DdlContext| -> BoxedProcedureLoader {
+                    Box::new(move |json: &str| {
+                        let context = context.clone();
+                        DropDatabaseProcedure::from_json(json, context).map(|p| Box::new(p) as _)
+                    })
+                },
+            ),
+        ];
 
-        let context = self.create_context();
+        for (type_name, loader_factory) in loaders {
+            let context = self.create_context();
+            self.procedure_manager
+                .register_loader(type_name, loader_factory(context))
+                .context(RegisterProcedureLoaderSnafu { type_name })?;
+        }
 
-        self.procedure_manager
-            .register_loader(
-                TruncateTableProcedure::TYPE_NAME,
-                Box::new(move |json| {
-                    let context = context.clone();
-                    TruncateTableProcedure::from_json(json, context).map(|p| Box::new(p) as _)
-                }),
-            )
-            .context(RegisterProcedureLoaderSnafu {
-                type_name: TruncateTableProcedure::TYPE_NAME,
-            })
+        Ok(())
     }
 
     #[tracing::instrument(skip_all)]
@@ -215,7 +228,7 @@ impl DdlManager {
     }
 
     #[tracing::instrument(skip_all)]
-    /// Submits and executes a create table task.
+    /// Submits and executes a create multiple logical table tasks.
     pub async fn submit_create_logical_table_tasks(
         &self,
         cluster_id: ClusterId,
@@ -236,6 +249,28 @@ impl DdlManager {
         self.submit_procedure(procedure_with_id).await
     }
 
+    #[tracing::instrument(skip_all)]
+    /// Submits and executes alter multiple table tasks.
+    pub async fn submit_alter_logical_table_tasks(
+        &self,
+        cluster_id: ClusterId,
+        alter_table_tasks: Vec<AlterTableTask>,
+        physical_table_id: TableId,
+    ) -> Result<(ProcedureId, Option<Output>)> {
+        let context = self.create_context();
+
+        let procedure = AlterLogicalTablesProcedure::new(
+            cluster_id,
+            alter_table_tasks,
+            physical_table_id,
+            context,
+        );
+
+        let procedure_with_id = ProcedureWithId::with_random_id(Box::new(procedure));
+
+        self.submit_procedure(procedure_with_id).await
+    }
+
     #[tracing::instrument(skip_all)]
     /// Submits and executes a drop table task.
     pub async fn submit_drop_table_task(
@@ -260,6 +295,24 @@ impl DdlManager {
         self.submit_procedure(procedure_with_id).await
     }
 
+    #[tracing::instrument(skip_all)]
+    /// Submits and executes a drop table task.
+    pub async fn submit_drop_database(
+        &self,
+        _cluster_id: ClusterId,
+        DropDatabaseTask {
+            catalog,
+            schema,
+            drop_if_exists,
+        }: DropDatabaseTask,
+    ) -> Result<(ProcedureId, Option<Output>)> {
+        let context = self.create_context();
+        let procedure = DropDatabaseProcedure::new(catalog, schema, drop_if_exists, context);
+        let procedure_with_id = ProcedureWithId::with_random_id(Box::new(procedure));
+
+        self.submit_procedure(procedure_with_id).await
+    }
+
     #[tracing::instrument(skip_all)]
     /// Submits and executes a truncate table task.
     pub async fn submit_truncate_table_task(
@@ -316,7 +369,7 @@ async fn handle_truncate_table_task(
         table_metadata_manager.get_full_table_info(table_id).await?;
 
     let table_info_value = table_info_value.with_context(|| error::TableInfoNotFoundSnafu {
-        table_name: table_ref.to_string(),
+        table: table_ref.to_string(),
     })?;
 
     let table_route_value =
@@ -368,7 +421,7 @@ async fn handle_alter_table_task(
         .get(table_id)
         .await?
         .with_context(|| error::TableInfoNotFoundSnafu {
-            table_name: table_ref.to_string(),
+            table: table_ref.to_string(),
         })?;
 
     let physical_table_id = ddl_manager
@@ -386,7 +439,7 @@ async fn handle_alter_table_task(
             .get(physical_table_id)
             .await?
             .with_context(|| error::TableInfoNotFoundSnafu {
-                table_name: table_ref.to_string(),
+                table: table_ref.to_string(),
             })?
             .table_info;
         Some((
@@ -435,7 +488,7 @@ async fn handle_drop_table_task(
         .await?;
 
     let table_info_value = table_info_value.with_context(|| error::TableInfoNotFoundSnafu {
-        table_name: table_ref.to_string(),
+        table: table_ref.to_string(),
     })?;
 
     let table_route_value =
@@ -490,7 +543,12 @@ async fn handle_create_logical_table_tasks(
     cluster_id: ClusterId,
     mut create_table_tasks: Vec<CreateTableTask>,
 ) -> Result<SubmitDdlTaskResponse> {
-    ensure!(!create_table_tasks.is_empty(), EmptyCreateTableTasksSnafu);
+    ensure!(
+        !create_table_tasks.is_empty(),
+        EmptyDdlTasksSnafu {
+            name: "create logical tables"
+        }
+    );
     let physical_table_id = utils::check_and_get_physical_table_id(
         &ddl_manager.table_metadata_manager,
         &create_table_tasks,
@@ -529,6 +587,63 @@ async fn handle_create_logical_table_tasks(
     })
 }
 
+async fn handle_drop_database_task(
+    ddl_manager: &DdlManager,
+    cluster_id: ClusterId,
+    drop_database_task: DropDatabaseTask,
+) -> Result<SubmitDdlTaskResponse> {
+    let (id, _) = ddl_manager
+        .submit_drop_database(cluster_id, drop_database_task.clone())
+        .await?;
+
+    let procedure_id = id.to_string();
+    info!(
+        "Database {}.{} is dropped via procedure_id {id:?}",
+        drop_database_task.catalog, drop_database_task.schema
+    );
+
+    Ok(SubmitDdlTaskResponse {
+        key: procedure_id.into(),
+        ..Default::default()
+    })
+}
+
+async fn handle_alter_logical_table_tasks(
+    ddl_manager: &DdlManager,
+    cluster_id: ClusterId,
+    alter_table_tasks: Vec<AlterTableTask>,
+) -> Result<SubmitDdlTaskResponse> {
+    ensure!(
+        !alter_table_tasks.is_empty(),
+        EmptyDdlTasksSnafu {
+            name: "alter logical tables"
+        }
+    );
+
+    // Use the physical table id in the first logical table, then it will be checked in the procedure.
+    let first_table = TableNameKey {
+        catalog: &alter_table_tasks[0].alter_table.catalog_name,
+        schema: &alter_table_tasks[0].alter_table.schema_name,
+        table: &alter_table_tasks[0].alter_table.table_name,
+    };
+    let physical_table_id =
+        utils::get_physical_table_id(&ddl_manager.table_metadata_manager, first_table).await?;
+    let num_logical_tables = alter_table_tasks.len();
+
+    let (id, _) = ddl_manager
+        .submit_alter_logical_table_tasks(cluster_id, alter_table_tasks, physical_table_id)
+        .await?;
+
+    info!("{num_logical_tables} logical tables on physical table: {physical_table_id:?} is altered via procedure_id {id:?}");
+
+    let procedure_id = id.to_string();
+
+    Ok(SubmitDdlTaskResponse {
+        key: procedure_id.into(),
+        ..Default::default()
+    })
+}
+
 /// TODO(dennis): let [`DdlManager`] implement [`ProcedureExecutor`] looks weird, find some way to refactor it.
 #[async_trait::async_trait]
 impl ProcedureExecutor for DdlManager {
@@ -562,8 +677,13 @@ impl ProcedureExecutor for DdlManager {
                 CreateLogicalTables(create_table_tasks) => {
                     handle_create_logical_table_tasks(self, cluster_id, create_table_tasks).await
                 }
+                AlterLogicalTables(alter_table_tasks) => {
+                    handle_alter_logical_table_tasks(self, cluster_id, alter_table_tasks).await
+                }
                 DropLogicalTables(_) => todo!(),
-                AlterLogicalTables(_) => todo!(),
+                DropDatabase(drop_database_task) => {
+                    handle_drop_database_task(self, cluster_id, drop_database_task).await
+                }
             }
         }
         .trace(span)
diff --git a/src/common/meta/src/error.rs b/src/common/meta/src/error.rs
index 56823fd2e9ab..ff067aa609a9 100644
--- a/src/common/meta/src/error.rs
+++ b/src/common/meta/src/error.rs
@@ -89,11 +89,8 @@ pub enum Error {
     #[snafu(display("Unexpected sequence value: {}", err_msg))]
     UnexpectedSequenceValue { err_msg: String, location: Location },
 
-    #[snafu(display("Table info not found: {}", table_name))]
-    TableInfoNotFound {
-        table_name: String,
-        location: Location,
-    },
+    #[snafu(display("Table info not found: {}", table))]
+    TableInfoNotFound { table: String, location: Location },
 
     #[snafu(display("Failed to register procedure loader, type name: {}", type_name))]
     RegisterProcedureLoader {
@@ -267,6 +264,12 @@ pub enum Error {
         location: Location,
     },
 
+    #[snafu(display("Schema nod found, schema: {}", table_schema))]
+    SchemaNotFound {
+        table_schema: String,
+        location: Location,
+    },
+
     #[snafu(display("Failed to rename table, reason: {}", reason))]
     RenameTable { reason: String, location: Location },
 
@@ -392,11 +395,14 @@ pub enum Error {
     #[snafu(display("Unexpected table route type: {}", err_msg))]
     UnexpectedLogicalRouteTable { location: Location, err_msg: String },
 
-    #[snafu(display("The tasks of create tables cannot be empty"))]
-    EmptyCreateTableTasks { location: Location },
+    #[snafu(display("The tasks of {} cannot be empty", name))]
+    EmptyDdlTasks { name: String, location: Location },
 
     #[snafu(display("Metadata corruption: {}", err_msg))]
     MetadataCorruption { err_msg: String, location: Location },
+
+    #[snafu(display("Alter logical tables invalid arguments: {}", err_msg))]
+    AlterLogicalTablesInvalidArguments { err_msg: String, location: Location },
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -456,7 +462,8 @@ impl ErrorExt for Error {
             ProcedureNotFound { .. }
             | PrimaryKeyNotFound { .. }
             | EmptyKey { .. }
-            | InvalidEngineType { .. } => StatusCode::InvalidArguments,
+            | InvalidEngineType { .. }
+            | AlterLogicalTablesInvalidArguments { .. } => StatusCode::InvalidArguments,
 
             TableNotFound { .. } => StatusCode::TableNotFound,
             TableAlreadyExists { .. } => StatusCode::TableAlreadyExists,
@@ -472,9 +479,10 @@ impl ErrorExt for Error {
             InvalidCatalogValue { source, .. } => source.status_code(),
             ConvertAlterTableRequest { source, .. } => source.status_code(),
 
-            ParseProcedureId { .. } | InvalidNumTopics { .. } | EmptyCreateTableTasks { .. } => {
-                StatusCode::InvalidArguments
-            }
+            ParseProcedureId { .. }
+            | InvalidNumTopics { .. }
+            | SchemaNotFound { .. }
+            | EmptyDdlTasks { .. } => StatusCode::InvalidArguments,
         }
     }
 
diff --git a/src/common/meta/src/key.rs b/src/common/meta/src/key.rs
index acc5e38c1a9e..c6fc331a2be8 100644
--- a/src/common/meta/src/key.rs
+++ b/src/common/meta/src/key.rs
@@ -273,6 +273,10 @@ impl<T: Serialize + DeserializeOwned + TableMetaValue> DeserializedValueWithByte
         self.inner
     }
 
+    pub fn get_inner_ref(&self) -> &T {
+        &self.inner
+    }
+
     /// Returns original `bytes`
     pub fn get_raw_bytes(&self) -> Vec<u8> {
         self.bytes.to_vec()
@@ -457,7 +461,7 @@ impl TableMetadataManager {
         Ok(())
     }
 
-    pub fn max_logical_tables_per_batch(&self) -> usize {
+    pub fn create_logical_tables_metadata_chunk_size(&self) -> usize {
         // The batch size is max_txn_size / 3 because the size of the `tables_data`
         // is 3 times the size of the `tables_data`.
         self.kv_backend.max_txn_ops() / 3
@@ -682,6 +686,64 @@ impl TableMetadataManager {
         Ok(())
     }
 
+    pub fn batch_update_table_info_value_chunk_size(&self) -> usize {
+        self.kv_backend.max_txn_ops()
+    }
+
+    pub async fn batch_update_table_info_values(
+        &self,
+        table_info_value_pairs: Vec<(TableInfoValue, RawTableInfo)>,
+    ) -> Result<()> {
+        let len = table_info_value_pairs.len();
+        let mut txns = Vec::with_capacity(len);
+        struct OnFailure<F, R>
+        where
+            F: FnOnce(&Vec<TxnOpResponse>) -> R,
+        {
+            table_info_value: TableInfoValue,
+            on_update_table_info_failure: F,
+        }
+        let mut on_failures = Vec::with_capacity(len);
+
+        for (table_info_value, new_table_info) in table_info_value_pairs {
+            let table_id = table_info_value.table_info.ident.table_id;
+
+            let new_table_info_value = table_info_value.update(new_table_info);
+
+            let (update_table_info_txn, on_update_table_info_failure) =
+                self.table_info_manager().build_update_txn(
+                    table_id,
+                    &DeserializedValueWithBytes::from_inner(table_info_value),
+                    &new_table_info_value,
+                )?;
+
+            txns.push(update_table_info_txn);
+
+            on_failures.push(OnFailure {
+                table_info_value: new_table_info_value,
+                on_update_table_info_failure,
+            });
+        }
+
+        let txn = Txn::merge_all(txns);
+        let r = self.kv_backend.txn(txn).await?;
+
+        if !r.succeeded {
+            for on_failure in on_failures {
+                let remote_table_info = (on_failure.on_update_table_info_failure)(&r.responses)?
+                    .context(error::UnexpectedSnafu {
+                        err_msg: "Reads the empty table info during the updating table info",
+                    })?
+                    .into_inner();
+
+                let op_name = "the batch updating table info";
+                ensure_values!(remote_table_info, on_failure.table_info_value, op_name);
+            }
+        }
+
+        Ok(())
+    }
+
     pub async fn update_table_route(
         &self,
         table_id: TableId,
diff --git a/src/common/meta/src/key/catalog_name.rs b/src/common/meta/src/key/catalog_name.rs
index fc393712eda2..4bbfb367b9f4 100644
--- a/src/common/meta/src/key/catalog_name.rs
+++ b/src/common/meta/src/key/catalog_name.rs
@@ -123,7 +123,7 @@ impl CatalogManager {
         self.kv_backend.exists(&raw_key).await
     }
 
-    pub async fn catalog_names(&self) -> BoxStream<'static, Result<String>> {
+    pub fn catalog_names(&self) -> BoxStream<'static, Result<String>> {
         let start_key = CatalogNameKey::range_start_key();
         let req = RangeRequest::new().with_prefix(start_key.as_bytes());
 
diff --git a/src/common/meta/src/key/schema_name.rs b/src/common/meta/src/key/schema_name.rs
index 3364e1ade322..8b391ca9b3d7 100644
--- a/src/common/meta/src/key/schema_name.rs
+++ b/src/common/meta/src/key/schema_name.rs
@@ -173,8 +173,16 @@ impl SchemaManager {
             .transpose()
     }
 
+    /// Deletes a [SchemaNameKey].
+    pub async fn delete(&self, schema: SchemaNameKey<'_>) -> Result<()> {
+        let raw_key = schema.as_raw_key();
+        self.kv_backend.delete(&raw_key, false).await?;
+
+        Ok(())
+    }
+
     /// Returns a schema stream, it lists all schemas belong to the target `catalog`.
-    pub async fn schema_names(&self, catalog: &str) -> BoxStream<'static, Result<String>> {
+    pub fn schema_names(&self, catalog: &str) -> BoxStream<'static, Result<String>> {
         let start_key = SchemaNameKey::range_start_key(catalog);
         let req = RangeRequest::new().with_prefix(start_key.as_bytes());
 
diff --git a/src/common/meta/src/key/table_name.rs b/src/common/meta/src/key/table_name.rs
index 971856f2b6c2..75b5b86cffd1 100644
--- a/src/common/meta/src/key/table_name.rs
+++ b/src/common/meta/src/key/table_name.rs
@@ -241,7 +241,7 @@ impl TableNameManager {
         self.kv_backend.exists(&raw_key).await
     }
 
-    pub async fn tables(
+    pub fn tables(
         &self,
         catalog: &str,
         schema: &str,
diff --git a/src/common/meta/src/range_stream.rs b/src/common/meta/src/range_stream.rs
index ce15c5b7ecad..878d5c0c9f24 100644
--- a/src/common/meta/src/range_stream.rs
+++ b/src/common/meta/src/range_stream.rs
@@ -236,6 +236,8 @@ impl<K, V> Stream for PaginationStream<K, V> {
                 PaginationStreamState::Init => {
                     let factory = self.factory.take().expect("lost factory");
                     if !factory.more {
+                        // Ensures the factory always exists.
+                        self.factory = Some(factory);
                         return Poll::Ready(None);
                     }
                     let fut = factory.read_next().boxed();
diff --git a/src/common/meta/src/rpc/ddl.rs b/src/common/meta/src/rpc/ddl.rs
index b88867bd3d09..bba6ee63d36b 100644
--- a/src/common/meta/src/rpc/ddl.rs
+++ b/src/common/meta/src/rpc/ddl.rs
@@ -19,10 +19,11 @@ use api::v1::meta::{
     AlterTableTask as PbAlterTableTask, AlterTableTasks as PbAlterTableTasks,
     CreateTableTask as PbCreateTableTask, CreateTableTasks as PbCreateTableTasks,
     DdlTaskRequest as PbDdlTaskRequest, DdlTaskResponse as PbDdlTaskResponse,
-    DropTableTask as PbDropTableTask, DropTableTasks as PbDropTableTasks, Partition, ProcedureId,
+    DropDatabaseTask as PbDropDatabaseTask, DropTableTask as PbDropTableTask,
+    DropTableTasks as PbDropTableTasks, Partition, ProcedureId,
     TruncateTableTask as PbTruncateTableTask,
 };
-use api::v1::{AlterExpr, CreateTableExpr, DropTableExpr, TruncateTableExpr};
+use api::v1::{AlterExpr, CreateTableExpr, DropDatabaseExpr, DropTableExpr, TruncateTableExpr};
 use base64::engine::general_purpose;
 use base64::Engine as _;
 use prost::Message;
@@ -43,6 +44,7 @@ pub enum DdlTask {
     CreateLogicalTables(Vec<CreateTableTask>),
     DropLogicalTables(Vec<DropTableTask>),
     AlterLogicalTables(Vec<AlterTableTask>),
+    DropDatabase(DropDatabaseTask),
 }
 
 impl DdlTask {
@@ -63,6 +65,15 @@ impl DdlTask {
         )
     }
 
+    pub fn new_alter_logical_tables(table_data: Vec<AlterExpr>) -> Self {
+        DdlTask::AlterLogicalTables(
+            table_data
+                .into_iter()
+                .map(|alter_table| AlterTableTask { alter_table })
+                .collect(),
+        )
+    }
+
     pub fn new_drop_table(
         catalog: String,
         schema: String,
@@ -79,6 +90,14 @@ impl DdlTask {
         })
     }
 
+    pub fn new_drop_database(catalog: String, schema: String, drop_if_exists: bool) -> Self {
+        DdlTask::DropDatabase(DropDatabaseTask {
+            catalog,
+            schema,
+            drop_if_exists,
+        })
+    }
+
     pub fn new_alter_table(alter_table: AlterExpr) -> Self {
         DdlTask::AlterTable(AlterTableTask { alter_table })
     }
@@ -137,6 +156,9 @@ impl TryFrom<Task> for DdlTask {
 
                 Ok(DdlTask::AlterLogicalTables(tasks))
             }
+            Task::DropDatabaseTask(drop_database) => {
+                Ok(DdlTask::DropDatabase(drop_database.try_into()?))
+            }
         }
     }
 }
@@ -179,6 +201,7 @@ impl TryFrom<SubmitDdlTaskRequest> for PbDdlTaskRequest {
 
                 Task::AlterTableTasks(PbAlterTableTasks { tasks })
             }
+            DdlTask::DropDatabase(task) => Task::DropDatabaseTask(task.try_into()?),
         };
 
         Ok(Self {
@@ -368,6 +391,20 @@ impl CreateTableTask {
     pub fn set_table_id(&mut self, table_id: TableId) {
         self.table_info.ident.table_id = table_id;
     }
+
+    /// Sort the columns in [CreateTableExpr] and [RawTableInfo].
+    ///
+    /// This function won't do any check or verification. Caller should
+    /// ensure this task is valid.
+    pub fn sort_columns(&mut self) {
+        // sort create table expr
+        // sort column_defs by name
+        self.create_table
+            .column_defs
+            .sort_unstable_by(|a, b| a.name.cmp(&b.name));
+
+        self.table_info.sort_columns();
+    }
 }
 
 impl Serialize for CreateTableTask {
@@ -519,7 +556,7 @@ impl TryFrom<PbTruncateTableTask> for TruncateTableTask {
 
     fn try_from(pb: PbTruncateTableTask) -> Result<Self> {
         let truncate_table = pb.truncate_table.context(error::InvalidProtoMsgSnafu {
-            err_msg: "expected drop table",
+            err_msg: "expected truncate table",
         })?;
 
         Ok(Self {
@@ -551,13 +588,62 @@ impl TryFrom<TruncateTableTask> for PbTruncateTableTask {
     }
 }
 
+#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
+pub struct DropDatabaseTask {
+    pub catalog: String,
+    pub schema: String,
+    pub drop_if_exists: bool,
+}
+
+impl TryFrom<PbDropDatabaseTask> for DropDatabaseTask {
+    type Error = error::Error;
+
+    fn try_from(pb: PbDropDatabaseTask) -> Result<Self> {
+        let DropDatabaseExpr {
+            catalog_name,
+            schema_name,
+            drop_if_exists,
+        } = pb.drop_database.context(error::InvalidProtoMsgSnafu {
+            err_msg: "expected drop database",
+        })?;
+
+        Ok(DropDatabaseTask {
+            catalog: catalog_name,
+            schema: schema_name,
+            drop_if_exists,
+        })
+    }
+}
+
+impl TryFrom<DropDatabaseTask> for PbDropDatabaseTask {
+    type Error = error::Error;
+
+    fn try_from(
+        DropDatabaseTask {
+            catalog,
+            schema,
+            drop_if_exists,
+        }: DropDatabaseTask,
+    ) -> Result<Self> {
+        Ok(PbDropDatabaseTask {
+            drop_database: Some(DropDatabaseExpr {
+                catalog_name: catalog,
+                schema_name: schema,
+                drop_if_exists,
+            }),
+        })
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::sync::Arc;
 
-    use api::v1::{AlterExpr, CreateTableExpr};
-    use datatypes::schema::SchemaBuilder;
-    use table::metadata::RawTableInfo;
+    use api::v1::{AlterExpr, ColumnDef, CreateTableExpr, SemanticType};
+    use datatypes::schema::{ColumnSchema, RawSchema, SchemaBuilder};
+    use store_api::metric_engine_consts::METRIC_ENGINE_NAME;
+    use store_api::storage::ConcreteDataType;
+    use table::metadata::{RawTableInfo, RawTableMeta, TableType};
     use table::test_util::table_info::test_table_info;
 
     use super::{AlterTableTask, CreateTableTask};
@@ -589,4 +675,109 @@ mod tests {
         let de = serde_json::from_slice(&output).unwrap();
         assert_eq!(task, de);
     }
+
+    #[test]
+    fn test_sort_columns() {
+        // construct RawSchema
+        let raw_schema = RawSchema {
+            column_schemas: vec![
+                ColumnSchema::new(
+                    "column3".to_string(),
+                    ConcreteDataType::string_datatype(),
+                    true,
+                ),
+                ColumnSchema::new(
+                    "column1".to_string(),
+                    ConcreteDataType::timestamp_millisecond_datatype(),
+                    false,
+                )
+                .with_time_index(true),
+                ColumnSchema::new(
+                    "column2".to_string(),
+                    ConcreteDataType::float64_datatype(),
+                    true,
+                ),
+            ],
+            timestamp_index: Some(1),
+            version: 0,
+        };
+
+        // construct RawTableMeta
+        let raw_table_meta = RawTableMeta {
+            schema: raw_schema,
+            primary_key_indices: vec![0],
+            value_indices: vec![2],
+            engine: METRIC_ENGINE_NAME.to_string(),
+            next_column_id: 0,
+            region_numbers: vec![0],
+            options: Default::default(),
+            created_on: Default::default(),
+            partition_key_indices: Default::default(),
+        };
+
+        // construct RawTableInfo
+        let raw_table_info = RawTableInfo {
+            ident: Default::default(),
+            meta: raw_table_meta,
+            name: Default::default(),
+            desc: Default::default(),
+            catalog_name: Default::default(),
+            schema_name: Default::default(),
+            table_type: TableType::Base,
+        };
+
+        // construct create table expr
+        let create_table_expr = CreateTableExpr {
+            column_defs: vec![
+                ColumnDef {
+                    name: "column3".to_string(),
+                    semantic_type: SemanticType::Tag as i32,
+                    ..Default::default()
+                },
+                ColumnDef {
+                    name: "column1".to_string(),
+                    semantic_type: SemanticType::Timestamp as i32,
+                    ..Default::default()
+                },
+                ColumnDef {
+                    name: "column2".to_string(),
+                    semantic_type: SemanticType::Field as i32,
+                    ..Default::default()
+                },
+            ],
+            primary_keys: vec!["column3".to_string()],
+            ..Default::default()
+        };
+
+        let mut create_table_task =
+            CreateTableTask::new(create_table_expr, Vec::new(), raw_table_info);
+
+        // Call the sort_columns method
+        create_table_task.sort_columns();
+
+        // Assert that the columns are sorted correctly
+        assert_eq!(
+            create_table_task.create_table.column_defs[0].name,
+            "column1".to_string()
+        );
+        assert_eq!(
+            create_table_task.create_table.column_defs[1].name,
+            "column2".to_string()
+        );
+        assert_eq!(
+            create_table_task.create_table.column_defs[2].name,
+            "column3".to_string()
+        );
+
+        // Assert that the table_info is updated correctly
+        assert_eq!(
+            create_table_task.table_info.meta.schema.timestamp_index,
+            Some(0)
+        );
+        assert_eq!(
+            create_table_task.table_info.meta.primary_key_indices,
+            vec![2]
+        );
+        assert_eq!(create_table_task.table_info.meta.value_indices, vec![1]);
+    }
 }
diff --git a/src/common/meta/src/test_util.rs b/src/common/meta/src/test_util.rs
index 605be9dfe320..3a312fa0218c 100644
--- a/src/common/meta/src/test_util.rs
+++ b/src/common/meta/src/test_util.rs
@@ -19,7 +19,9 @@ pub use common_base::AffectedRows;
 use common_recordbatch::SendableRecordBatchStream;
 
 use crate::cache_invalidator::DummyCacheInvalidator;
-use crate::datanode_manager::{Datanode, DatanodeManager, DatanodeManagerRef, DatanodeRef};
+use crate::datanode_manager::{
+    Datanode, DatanodeManager, DatanodeManagerRef, DatanodeRef, HandleResponse,
+};
 use crate::ddl::table_meta::TableMetadataAllocator;
 use crate::ddl::DdlContext;
 use crate::error::Result;
@@ -32,7 +34,7 @@ use crate::wal_options_allocator::WalOptionsAllocator;
 
 #[async_trait::async_trait]
 pub trait MockDatanodeHandler: Sync + Send + Clone {
-    async fn handle(&self, peer: &Peer, request: RegionRequest) -> Result<AffectedRows>;
+    async fn handle(&self, peer: &Peer, request: RegionRequest) -> Result<HandleResponse>;
 
     async fn handle_query(
         &self,
@@ -62,7 +64,7 @@ struct MockDatanode<T> {
 
 #[async_trait::async_trait]
 impl<T: MockDatanodeHandler> Datanode for MockDatanode<T> {
-    async fn handle(&self, request: RegionRequest) -> Result<AffectedRows> {
+    async fn handle(&self, request: RegionRequest) -> Result<HandleResponse> {
         self.handler.handle(&self.peer, request).await
     }
 
diff --git a/src/common/procedure/src/lib.rs b/src/common/procedure/src/lib.rs
index cef90d8dfe09..ece2ce4189a0 100644
--- a/src/common/procedure/src/lib.rs
+++ b/src/common/procedure/src/lib.rs
@@ -25,8 +25,8 @@ pub mod watcher;
 
 pub use crate::error::{Error, Result};
 pub use crate::procedure::{
-    BoxedProcedure, Context, ContextProvider, LockKey, Output, ParseIdError, Procedure,
-    ProcedureId, ProcedureManager, ProcedureManagerRef, ProcedureState, ProcedureWithId, Status,
-    StringKey,
+    BoxedProcedure, BoxedProcedureLoader, Context, ContextProvider, LockKey, Output, ParseIdError,
+    Procedure, ProcedureId, ProcedureManager, ProcedureManagerRef, ProcedureState, ProcedureWithId,
+    Status, StringKey,
 };
 pub use crate::watcher::Watcher;
diff --git a/src/common/procedure/src/local.rs b/src/common/procedure/src/local.rs
index c68005db590d..9602d0a87bae 100644
--- a/src/common/procedure/src/local.rs
+++ b/src/common/procedure/src/local.rs
@@ -799,8 +799,10 @@ mod tests {
         let root_id = ProcedureId::random();
         // Prepare data for the root procedure.
         for step in 0..3 {
+            let type_name = root.type_name().to_string();
+            let data = root.dump().unwrap();
             procedure_store
-                .store_procedure(root_id, step, &root, None)
+                .store_procedure(root_id, step, type_name, data, None)
                 .await
                 .unwrap();
         }
@@ -809,8 +811,10 @@ mod tests {
         let child_id = ProcedureId::random();
         // Prepare data for the child procedure
         for step in 0..2 {
+            let type_name = child.type_name().to_string();
+            let data = child.dump().unwrap();
             procedure_store
-                .store_procedure(child_id, step, &child, Some(root_id))
+                .store_procedure(child_id, step, type_name, data, Some(root_id))
                 .await
                 .unwrap();
         }
diff --git a/src/common/procedure/src/local/runner.rs b/src/common/procedure/src/local/runner.rs
index b787fbf77e4b..bd866ea1d4e2 100644
--- a/src/common/procedure/src/local/runner.rs
+++ b/src/common/procedure/src/local/runner.rs
@@ -385,7 +385,7 @@ impl Runner {
     }
 
     /// Extend the retry time to wait for the next retry.
-    async fn wait_on_err(&self, d: Duration, i: u64) {
+    async fn wait_on_err(&mut self, d: Duration, i: u64) {
         logging::info!(
             "Procedure {}-{} retry for the {} times after {} millis",
             self.procedure.type_name(),
@@ -396,7 +396,7 @@ impl Runner {
         time::sleep(d).await;
     }
 
-    async fn on_suspended(&self, subprocedures: Vec<ProcedureWithId>) {
+    async fn on_suspended(&mut self, subprocedures: Vec<ProcedureWithId>) {
         let has_child = !subprocedures.is_empty();
         for subprocedure in subprocedures {
             logging::info!(
@@ -429,11 +429,15 @@ impl Runner {
     }
 
     async fn persist_procedure(&mut self) -> Result<()> {
+        let type_name = self.procedure.type_name().to_string();
+        let data = self.procedure.dump()?;
+
         self.store
             .store_procedure(
                 self.meta.id,
                 self.step,
-                &self.procedure,
+                type_name,
+                data,
                 self.meta.parent_id,
             )
             .await
diff --git a/src/common/procedure/src/procedure.rs b/src/common/procedure/src/procedure.rs
index b46428eb6860..434d54950e67 100644
--- a/src/common/procedure/src/procedure.rs
+++ b/src/common/procedure/src/procedure.rs
@@ -116,7 +116,7 @@ pub struct Context {
 
 /// A `Procedure` represents an operation or a set of operations to be performed step-by-step.
 #[async_trait]
-pub trait Procedure: Send + Sync {
+pub trait Procedure: Send {
     /// Type name of the procedure.
     fn type_name(&self) -> &str;
 
diff --git a/src/common/procedure/src/store.rs b/src/common/procedure/src/store.rs
index 11aeec6551af..84dd39520d9a 100644
--- a/src/common/procedure/src/store.rs
+++ b/src/common/procedure/src/store.rs
@@ -22,7 +22,7 @@ use snafu::ResultExt;
 
 use crate::error::{Result, ToJsonSnafu};
 pub(crate) use crate::store::state_store::StateStoreRef;
-use crate::{BoxedProcedure, ProcedureId};
+use crate::ProcedureId;
 
 pub mod state_store;
 
@@ -75,14 +75,12 @@ impl ProcedureStore {
         &self,
         procedure_id: ProcedureId,
         step: u32,
-        procedure: &BoxedProcedure,
+        type_name: String,
+        data: String,
         parent_id: Option<ProcedureId>,
     ) -> Result<()> {
-        let type_name = procedure.type_name();
-        let data = procedure.dump()?;
-
         let message = ProcedureMessage {
-            type_name: type_name.to_string(),
+            type_name,
             data,
             parent_id,
             step,
@@ -312,6 +310,7 @@ mod tests {
     use object_store::ObjectStore;
 
     use crate::store::state_store::ObjectStateStore;
+    use crate::BoxedProcedure;
 
     impl ProcedureStore {
         pub(crate) fn from_object_store(store: ObjectStore) -> ProcedureStore {
@@ -481,9 +480,10 @@ mod tests {
 
         let procedure_id = ProcedureId::random();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("test store procedure"));
-
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(procedure_id, 0, &procedure, None)
+            .store_procedure(procedure_id, 0, type_name, data, None)
             .await
             .unwrap();
 
@@ -507,9 +507,10 @@ mod tests {
 
         let procedure_id = ProcedureId::random();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("test store procedure"));
-
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(procedure_id, 0, &procedure, None)
+            .store_procedure(procedure_id, 0, type_name, data, None)
             .await
             .unwrap();
         store.commit_procedure(procedure_id, 1).await.unwrap();
@@ -526,9 +527,10 @@ mod tests {
 
         let procedure_id = ProcedureId::random();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("test store procedure"));
-
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(procedure_id, 0, &procedure, None)
+            .store_procedure(procedure_id, 0, type_name, data, None)
             .await
             .unwrap();
         store.rollback_procedure(procedure_id, 1).await.unwrap();
@@ -545,13 +547,16 @@ mod tests {
 
         let procedure_id = ProcedureId::random();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("test store procedure"));
-
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(procedure_id, 0, &procedure, None)
+            .store_procedure(procedure_id, 0, type_name, data, None)
             .await
             .unwrap();
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(procedure_id, 1, &procedure, None)
+            .store_procedure(procedure_id, 1, type_name, data, None)
             .await
             .unwrap();
 
@@ -570,12 +575,17 @@ mod tests {
         let procedure_id = ProcedureId::random();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("test store procedure"));
 
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(procedure_id, 0, &procedure, None)
+            .store_procedure(procedure_id, 0, type_name, data, None)
             .await
             .unwrap();
+
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(procedure_id, 1, &procedure, None)
+            .store_procedure(procedure_id, 1, type_name, data, None)
             .await
             .unwrap();
         store.commit_procedure(procedure_id, 2).await.unwrap();
@@ -595,31 +605,41 @@ mod tests {
         // store 3 steps
         let id0 = ProcedureId::random();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("id0-0"));
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(id0, 0, &procedure, None)
+            .store_procedure(id0, 0, type_name, data, None)
             .await
             .unwrap();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("id0-1"));
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(id0, 1, &procedure, None)
+            .store_procedure(id0, 1, type_name, data, None)
             .await
             .unwrap();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("id0-2"));
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(id0, 2, &procedure, None)
+            .store_procedure(id0, 2, type_name, data, None)
             .await
             .unwrap();
 
         // store 2 steps and then commit
         let id1 = ProcedureId::random();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("id1-0"));
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(id1, 0, &procedure, None)
+            .store_procedure(id1, 0, type_name, data, None)
             .await
             .unwrap();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("id1-1"));
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(id1, 1, &procedure, None)
+            .store_procedure(id1, 1, type_name, data, None)
             .await
             .unwrap();
         store.commit_procedure(id1, 2).await.unwrap();
@@ -627,8 +647,10 @@ mod tests {
         // store 1 step
         let id2 = ProcedureId::random();
         let procedure: BoxedProcedure = Box::new(MockProcedure::new("id2-0"));
+        let type_name = procedure.type_name().to_string();
+        let data = procedure.dump().unwrap();
         store
-            .store_procedure(id2, 0, &procedure, None)
+            .store_procedure(id2, 0, type_name, data, None)
             .await
             .unwrap();
 
diff --git a/src/common/recordbatch/Cargo.toml b/src/common/recordbatch/Cargo.toml
index 01d051067b94..12494cdcf532 100644
--- a/src/common/recordbatch/Cargo.toml
+++ b/src/common/recordbatch/Cargo.toml
@@ -9,14 +9,12 @@ workspace = true
 
 [dependencies]
 arc-swap = "1.6"
-common-base.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
 datafusion.workspace = true
 datafusion-common.workspace = true
 datatypes.workspace = true
 futures.workspace = true
-paste = "1.0"
 pin-project.workspace = true
 serde.workspace = true
 serde_json.workspace = true
diff --git a/src/common/substrait/Cargo.toml b/src/common/substrait/Cargo.toml
index 1c4f4047977b..9ac4fc150f77 100644
--- a/src/common/substrait/Cargo.toml
+++ b/src/common/substrait/Cargo.toml
@@ -8,25 +8,19 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-async-recursion = "1.0"
 async-trait.workspace = true
 bytes.workspace = true
 catalog.workspace = true
-common-catalog.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
-common-telemetry.workspace = true
 datafusion.workspace = true
 datafusion-common.workspace = true
 datafusion-expr.workspace = true
 datafusion-substrait.workspace = true
 datatypes.workspace = true
-futures = "0.3"
 promql.workspace = true
 prost.workspace = true
-session.workspace = true
 snafu.workspace = true
-table.workspace = true
 
 [dependencies.substrait_proto]
 package = "substrait"
@@ -34,5 +28,4 @@ version = "0.17"
 
 [dev-dependencies]
 datatypes.workspace = true
-table.workspace = true
 tokio.workspace = true
diff --git a/src/common/telemetry/Cargo.toml b/src/common/telemetry/Cargo.toml
index 6a8dc96b460b..3cf2a36a4020 100644
--- a/src/common/telemetry/Cargo.toml
+++ b/src/common/telemetry/Cargo.toml
@@ -32,7 +32,6 @@ serde_json.workspace = true
 tokio.workspace = true
 tracing = "0.1"
 tracing-appender = "0.2"
-tracing-futures = { version = "0.2", features = ["futures-03"] }
 tracing-log = "0.1"
 tracing-opentelemetry = "0.22.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/src/datanode/Cargo.toml b/src/datanode/Cargo.toml
index f03625eb66cc..8e7c565d7d0d 100644
--- a/src/datanode/Cargo.toml
+++ b/src/datanode/Cargo.toml
@@ -13,21 +13,15 @@ workspace = true
 [dependencies]
 api.workspace = true
 arrow-flight.workspace = true
-async-compat = "0.2"
-async-stream.workspace = true
 async-trait.workspace = true
 bytes.workspace = true
 catalog.workspace = true
 client.workspace = true
 common-base.workspace = true
-common-catalog.workspace = true
-common-config.workspace = true
-common-datasource.workspace = true
 common-error.workspace = true
 common-function.workspace = true
 common-greptimedb-telemetry.workspace = true
 common-grpc.workspace = true
-common-grpc-expr.workspace = true
 common-macro.workspace = true
 common-meta.workspace = true
 common-procedure.workspace = true
@@ -46,36 +40,27 @@ file-engine.workspace = true
 futures = "0.3"
 futures-util.workspace = true
 humantime-serde.workspace = true
-hyper = { version = "0.14", features = ["full"] }
 lazy_static.workspace = true
 log-store.workspace = true
 meta-client.workspace = true
 metric-engine.workspace = true
 mito2.workspace = true
 object-store.workspace = true
-pin-project = "1.0"
 prometheus.workspace = true
 prost.workspace = true
 query.workspace = true
 reqwest.workspace = true
 secrecy = { version = "0.8", features = ["serde", "alloc"] }
 serde.workspace = true
-serde_json.workspace = true
 servers.workspace = true
 session.workspace = true
 snafu.workspace = true
-sql.workspace = true
 store-api.workspace = true
 substrait.workspace = true
 table.workspace = true
 tokio.workspace = true
-tokio-stream = { workspace = true, features = ["net"] }
 toml.workspace = true
 tonic.workspace = true
-tower = { version = "0.4", features = ["full"] }
-tower-http = { version = "0.4", features = ["full"] }
-url = "2.3.1"
-uuid.workspace = true
 
 [dev-dependencies]
 client.workspace = true
diff --git a/src/datanode/src/region_server.rs b/src/datanode/src/region_server.rs
index d9b74e02aa66..0dc9845850b2 100644
--- a/src/datanode/src/region_server.rs
+++ b/src/datanode/src/region_server.rs
@@ -25,6 +25,7 @@ use async_trait::async_trait;
 use bytes::Bytes;
 use common_error::ext::BoxedError;
 use common_error::status_code::StatusCode;
+use common_meta::datanode_manager::HandleResponse;
 use common_query::logical_plan::Expr;
 use common_query::physical_plan::DfPhysicalPlanAdapter;
 use common_query::{DfPhysicalPlan, OutputData};
@@ -128,7 +129,7 @@ impl RegionServer {
         &self,
         region_id: RegionId,
         request: RegionRequest,
-    ) -> Result<AffectedRows> {
+    ) -> Result<HandleResponse> {
         self.inner.handle_request(region_id, request).await
     }
 
@@ -267,11 +268,12 @@ impl RegionServerHandler for RegionServer {
             results
         };
 
-        // merge results by simply sum up affected rows.
-        // only insert/delete will have multiple results.
+        // merge results by sum up affected rows and merge extensions.
         let mut affected_rows = 0;
+        let mut extension = HashMap::new();
         for result in results {
-            affected_rows += result;
+            affected_rows += result.affected_rows;
+            extension.extend(result.extension);
         }
 
         Ok(RegionResponse {
@@ -282,6 +284,7 @@ impl RegionServerHandler for RegionServer {
                 }),
             }),
             affected_rows: affected_rows as _,
+            extension,
         })
     }
 }
@@ -462,7 +465,7 @@ impl RegionServerInner {
         &self,
         region_id: RegionId,
         request: RegionRequest,
-    ) -> Result<AffectedRows> {
+    ) -> Result<HandleResponse> {
         let request_type = request.request_type();
         let _timer = crate::metrics::HANDLE_REGION_REQUEST_ELAPSED
             .with_label_values(&[request_type])
@@ -487,7 +490,7 @@ impl RegionServerInner {
 
         let engine = match self.get_engine(region_id, &region_change)? {
             CurrentEngine::Engine(engine) => engine,
-            CurrentEngine::EarlyReturn(rows) => return Ok(rows),
+            CurrentEngine::EarlyReturn(rows) => return Ok(HandleResponse::new(rows)),
         };
 
         // Sets corresponding region status to registering/deregistering before the operation.
@@ -502,7 +505,10 @@ impl RegionServerInner {
                 // Sets corresponding region status to ready.
                 self.set_region_status_ready(region_id, engine, region_change)
                     .await?;
-                Ok(result)
+                Ok(HandleResponse {
+                    affected_rows: result.affected_rows,
+                    extension: result.extension,
+                })
             }
             Err(err) => {
                 // Removes the region status if the operation fails.
@@ -645,6 +651,7 @@ impl RegionServerInner {
             .decode(Bytes::from(plan), catalog_list, "", "")
             .await
             .context(DecodeLogicalPlanSnafu)?;
+
         let result = self
             .query_engine
             .execute(logical_plan.into(), ctx)
@@ -916,11 +923,11 @@ mod tests {
             RegionEngineWithStatus::Registering(engine.clone()),
         );
 
-        let affected_rows = mock_region_server
+        let response = mock_region_server
             .handle_request(region_id, RegionRequest::Create(create_req))
             .await
             .unwrap();
-        assert_eq!(affected_rows, 0);
+        assert_eq!(response.affected_rows, 0);
 
         let status = mock_region_server
             .inner
@@ -931,7 +938,7 @@ mod tests {
 
         assert!(matches!(status, RegionEngineWithStatus::Registering(_)));
 
-        let affected_rows = mock_region_server
+        let response = mock_region_server
             .handle_request(
                 region_id,
                 RegionRequest::Open(RegionOpenRequest {
@@ -943,7 +950,7 @@ mod tests {
             )
             .await
             .unwrap();
-        assert_eq!(affected_rows, 0);
+        assert_eq!(response.affected_rows, 0);
 
         let status = mock_region_server
             .inner
@@ -971,11 +978,11 @@ mod tests {
             RegionEngineWithStatus::Deregistering(engine.clone()),
         );
 
-        let affected_rows = mock_region_server
+        let response = mock_region_server
             .handle_request(region_id, RegionRequest::Drop(RegionDropRequest {}))
             .await
             .unwrap();
-        assert_eq!(affected_rows, 0);
+        assert_eq!(response.affected_rows, 0);
 
         let status = mock_region_server
             .inner
@@ -990,11 +997,11 @@ mod tests {
             RegionEngineWithStatus::Deregistering(engine.clone()),
         );
 
-        let affected_rows = mock_region_server
+        let response = mock_region_server
             .handle_request(region_id, RegionRequest::Close(RegionCloseRequest {}))
             .await
             .unwrap();
-        assert_eq!(affected_rows, 0);
+        assert_eq!(response.affected_rows, 0);
 
         let status = mock_region_server
             .inner
diff --git a/src/datanode/src/tests.rs b/src/datanode/src/tests.rs
index 1a38c88f0c8d..cffa3828655f 100644
--- a/src/datanode/src/tests.rs
+++ b/src/datanode/src/tests.rs
@@ -31,7 +31,7 @@ use query::query_engine::DescribeResult;
 use query::{QueryEngine, QueryEngineContext};
 use session::context::QueryContextRef;
 use store_api::metadata::RegionMetadataRef;
-use store_api::region_engine::{RegionEngine, RegionRole, SetReadonlyResponse};
+use store_api::region_engine::{RegionEngine, RegionHandleResult, RegionRole, SetReadonlyResponse};
 use store_api::region_request::{AffectedRows, RegionRequest};
 use store_api::storage::{RegionId, ScanRequest};
 use table::TableRef;
@@ -166,16 +166,18 @@ impl RegionEngine for MockRegionEngine {
         &self,
         region_id: RegionId,
         request: RegionRequest,
-    ) -> Result<AffectedRows, BoxedError> {
+    ) -> Result<RegionHandleResult, BoxedError> {
         if let Some(delay) = self.handle_request_delay {
             tokio::time::sleep(delay).await;
         }
         if let Some(mock_fn) = &self.handle_request_mock_fn {
-            return mock_fn(region_id, request).map_err(BoxedError::new);
+            return mock_fn(region_id, request)
+                .map_err(BoxedError::new)
+                .map(RegionHandleResult::new);
         };
 
         let _ = self.sender.send((region_id, request)).await;
-        Ok(0)
+        Ok(RegionHandleResult::new(0))
     }
 
     async fn handle_query(
diff --git a/src/datatypes/Cargo.toml b/src/datatypes/Cargo.toml
index ee8254627260..281057ce80c9 100644
--- a/src/datatypes/Cargo.toml
+++ b/src/datatypes/Cargo.toml
@@ -27,7 +27,6 @@ num = "0.4"
 num-traits = "0.2"
 ordered-float = { version = "3.0", features = ["serde"] }
 paste = "1.0"
-rust_decimal = "1.32.0"
 serde.workspace = true
 serde_json.workspace = true
 snafu.workspace = true
diff --git a/src/datatypes/src/schema/column_schema.rs b/src/datatypes/src/schema/column_schema.rs
index 17c39ee11bd9..f515370f0e98 100644
--- a/src/datatypes/src/schema/column_schema.rs
+++ b/src/datatypes/src/schema/column_schema.rs
@@ -143,11 +143,22 @@ impl ColumnSchema {
     }
 
     /// Set the nullablity to `true` of the column.
+    /// Similar to [set_nullable] but take the ownership and return a owned value.
+    ///
+    /// [set_nullable]: Self::set_nullable
     pub fn with_nullable_set(mut self) -> Self {
         self.is_nullable = true;
         self
     }
 
+    /// Set the nullability to `true` of the column.
+    /// Similar to [with_nullable_set] but don't take the ownership
+    ///
+    /// [with_nullable_set]: Self::with_nullable_set
+    pub fn set_nullable(&mut self) {
+        self.is_nullable = true;
+    }
+
     /// Creates a new [`ColumnSchema`] with given metadata.
     pub fn with_metadata(mut self, metadata: Metadata) -> Self {
         self.metadata = metadata;
diff --git a/src/file-engine/src/engine.rs b/src/file-engine/src/engine.rs
index f5a7d0e259f1..0b9192b5c925 100644
--- a/src/file-engine/src/engine.rs
+++ b/src/file-engine/src/engine.rs
@@ -24,7 +24,7 @@ use common_telemetry::{error, info};
 use object_store::ObjectStore;
 use snafu::{ensure, OptionExt};
 use store_api::metadata::RegionMetadataRef;
-use store_api::region_engine::{RegionEngine, RegionRole, SetReadonlyResponse};
+use store_api::region_engine::{RegionEngine, RegionHandleResult, RegionRole, SetReadonlyResponse};
 use store_api::region_request::{
     AffectedRows, RegionCloseRequest, RegionCreateRequest, RegionDropRequest, RegionOpenRequest,
     RegionRequest,
@@ -60,7 +60,7 @@ impl RegionEngine for FileRegionEngine {
         &self,
         region_id: RegionId,
         request: RegionRequest,
-    ) -> Result<AffectedRows, BoxedError> {
+    ) -> Result<RegionHandleResult, BoxedError> {
         self.inner
             .handle_request(region_id, request)
             .await
@@ -154,8 +154,8 @@ impl EngineInner {
         &self,
         region_id: RegionId,
         request: RegionRequest,
-    ) -> EngineResult<AffectedRows> {
-        match request {
+    ) -> EngineResult<RegionHandleResult> {
+        let result = match request {
             RegionRequest::Create(req) => self.handle_create(region_id, req).await,
             RegionRequest::Drop(req) => self.handle_drop(region_id, req).await,
             RegionRequest::Open(req) => self.handle_open(region_id, req).await,
@@ -164,7 +164,8 @@ impl EngineInner {
                 operation: request.to_string(),
             }
             .fail(),
-        }
+        };
+        result.map(RegionHandleResult::new)
     }
 
     async fn stop(&self) -> EngineResult<()> {
diff --git a/src/flow/Cargo.toml b/src/flow/Cargo.toml
index 815602a77944..ab8a090d71c6 100644
--- a/src/flow/Cargo.toml
+++ b/src/flow/Cargo.toml
@@ -9,12 +9,9 @@ workspace = true
 
 [dependencies]
 api.workspace = true
-bimap = "0.6.3"
 common-decimal.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
-common-meta.workspace = true
-common-query.workspace = true
 common-telemetry.workspace = true
 common-time.workspace = true
 datatypes.workspace = true
@@ -24,7 +21,6 @@ itertools.workspace = true
 num-traits = "0.2"
 serde.workspace = true
 servers.workspace = true
-session.workspace = true
 smallvec.workspace = true
 snafu.workspace = true
 tokio.workspace = true
diff --git a/src/flow/src/utils.rs b/src/flow/src/utils.rs
index 41114e1f0cb2..01c6539d2dd2 100644
--- a/src/flow/src/utils.rs
+++ b/src/flow/src/utils.rs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use std::collections::{BTreeMap, BTreeSet};
+use std::ops::Bound;
 use std::sync::Arc;
 
 use itertools::Itertools;
@@ -24,11 +25,12 @@ use crate::expr::error::InternalSnafu;
 use crate::expr::{EvalError, ScalarExpr};
 use crate::repr::{value_to_internal_ts, Diff, DiffRow, Duration, KeyValDiffRow, Row, Timestamp};
 
+pub type Batch = BTreeMap<Row, SmallVec<[DiffRow; 2]>>;
+pub type Spine = BTreeMap<Timestamp, Batch>;
+
 /// Determine when should a key expire according to it's event timestamp in key,
 /// if a key is expired, any future updates to it should be ignored
 /// Note that key is expired by it's event timestamp(contained in the key), not by the time it's inserted(system timestamp)
-///
-/// TODO(discord9): find a better way to handle key expiration, like write to disk or something instead of throw away
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Deserialize, Serialize)]
 pub struct KeyExpiryManager {
     /// a map from event timestamp to key, used for expire keys
@@ -121,13 +123,16 @@ pub struct Arrangement {
     /// And for consolidated batch(i.e. btach representing now), there should be only one update for each key with `diff==1`
     ///
     /// And since most time a key gots updated by first delete then insert, small vec with size of 2 make sense
-    spine: BTreeMap<Timestamp, BTreeMap<Row, SmallVec<[DiffRow; 2]>>>,
+    /// TODO: batch size balancing?
+    spine: Spine,
     /// if set to false, will not update current value of the arrangement, useful for case like `map -> arrange -> reduce`
     full_arrangement: bool,
     /// flag to mark that this arrangement haven't been written to, so that it can be cloned and shared
     is_written: bool,
     /// manage the expire state of the arrangement
     expire_state: Option<KeyExpiryManager>,
+    /// the time that the last compaction happened, also know as current time
+    last_compaction_time: Option<Timestamp>,
 }
 
 impl Arrangement {
@@ -137,6 +142,7 @@ impl Arrangement {
             full_arrangement: false,
             is_written: false,
             expire_state: None,
+            last_compaction_time: None,
         }
     }
 
@@ -160,6 +166,7 @@ impl Arrangement {
                     continue;
                 }
             }
+
             // the first batch with key that's greater or equal to ts
             let batch = if let Some((_, batch)) = self.spine.range_mut(ts..).next() {
                 batch
@@ -171,20 +178,87 @@ impl Arrangement {
             {
                 let key_updates = batch.entry(key).or_insert(smallvec![]);
                 key_updates.push((val, ts, diff));
+                // a stable sort make updates sort in order of insertion
+                // without changing the order of updates within same tick
+                key_updates.sort_by_key(|r| r.1);
             }
         }
         Ok(max_late_by)
     }
 
+    /// find out the time of next update in the future
+    /// that is the next update with `timestamp > now`
+    pub fn get_next_update_time(&self, now: &Timestamp) -> Option<Timestamp> {
+        // iter over batches that only have updates of `timestamp>now` and find the first non empty batch, then get the minimum timestamp in that batch
+        let next_batches = self.spine.range((Bound::Excluded(now), Bound::Unbounded));
+        for (_ts, batch) in next_batches {
+            let min_ts = batch
+                .iter()
+                .flat_map(|(_k, v)| v.iter().map(|(_, ts, _)| *ts))
+                .min();
+            if let Some(min_ts) = min_ts {
+                return Some(min_ts);
+            } else {
+                continue;
+            }
+        }
+        // all batches are empty, return now
+        None
+    }
+
+    /// get the last compaction time
+    pub fn get_compaction(&self) -> Option<Timestamp> {
+        self.last_compaction_time
+    }
+
+    /// split spine off at `now`, and return the spine that's before `now`(including `now`)
+    fn split_lte(&mut self, now: &Timestamp) -> Spine {
+        let mut before = self.spine.split_off(&(now + 1));
+        std::mem::swap(&mut before, &mut self.spine);
+
+        // if before's last key == now, then all the keys we needed are found
+        if before
+            .last_key_value()
+            .map(|(k, _v)| *k == *now)
+            .unwrap_or(false)
+        {
+            return before;
+        }
+
+        // also need to move all keys from the first batch in spine with timestamp<=now to before
+        // we know that all remaining keys to be split off are last key < key <= now, we will make them into a new batch
+        if let Some(mut first_batch) = self.spine.first_entry() {
+            let mut new_batch: Batch = Default::default();
+            // remove all keys with val of empty vec
+            first_batch.get_mut().retain(|key, updates| {
+                // remove keys <= now from updates
+                updates.retain(|(val, ts, diff)| {
+                    if *ts <= *now {
+                        new_batch.entry(key.clone()).or_insert(smallvec![]).push((
+                            val.clone(),
+                            *ts,
+                            *diff,
+                        ));
+                    }
+                    *ts > *now
+                });
+                !updates.is_empty()
+            });
+
+            before.entry(*now).or_default().extend(new_batch);
+        }
+        before
+    }
+
     /// advance time to `now` and consolidate all older(`now` included) updates to the first key
     ///
     /// return the maximum expire time(already expire by how much time) of all updates if any keys is already expired
     pub fn set_compaction(&mut self, now: Timestamp) -> Result<Option<Duration>, EvalError> {
         let mut max_late_by: Option<Duration> = None;
 
-        let mut should_compact = self.spine.split_off(&(now + 1));
-        std::mem::swap(&mut should_compact, &mut self.spine);
+        let should_compact = self.split_lte(&now);
 
+        self.last_compaction_time = Some(now);
         // if a full arrangement is not needed, we can just discard everything before and including now
         if !self.full_arrangement {
             return Ok(None);
@@ -221,18 +295,62 @@ impl Arrangement {
     }
 
     /// get the updates of the arrangement from the given range of time
-    pub fn get_updates_in_range<R: std::ops::RangeBounds<Timestamp>>(
+    pub fn get_updates_in_range<R: std::ops::RangeBounds<Timestamp> + Clone>(
         &self,
         range: R,
     ) -> Vec<KeyValDiffRow> {
         let mut result = vec![];
-        for (_ts, batch) in self.spine.range(range) {
-            for (key, updates) in batch.clone() {
-                for (val, ts, diff) in updates {
-                    result.push(((key.clone(), val), ts, diff));
+        // three part:
+        // 1.the starting batch with first key >= range.start, which may contain updates that not in range
+        // 2. the batches with key in range
+        // 3. the last batch with first key > range.end, which may contain updates that are in range
+        let mut is_first = true;
+        for (_ts, batch) in self.spine.range(range.clone()) {
+            if is_first {
+                for (key, updates) in batch {
+                    let iter = updates
+                        .iter()
+                        .filter(|(_val, ts, _diff)| range.contains(ts))
+                        .map(|(val, ts, diff)| ((key.clone(), val.clone()), *ts, *diff));
+                    result.extend(iter);
+                }
+                is_first = false;
+            } else {
+                for (key, updates) in batch.clone() {
+                    result.extend(
+                        updates
+                            .iter()
+                            .map(|(val, ts, diff)| ((key.clone(), val.clone()), *ts, *diff)),
+                    );
                 }
             }
         }
+
+        // deal with boundary include start and end
+        // and for the next batch with upper_bound >= range.end
+        // we need to search for updates within range
+        let neg_bound = match range.end_bound() {
+            Bound::Included(b) => {
+                // if boundary is aligned, the last batch in range actually cover the full range
+                // then there will be no further keys we need in the next batch
+                if self.spine.contains_key(b) {
+                    return result;
+                }
+                Bound::Excluded(*b)
+            }
+            Bound::Excluded(b) => Bound::Included(*b),
+            Bound::Unbounded => return result,
+        };
+        let search_range = (neg_bound, Bound::Unbounded);
+        if let Some(last_batch) = self.spine.range(search_range).next() {
+            for (key, updates) in last_batch.1 {
+                let iter = updates
+                    .iter()
+                    .filter(|(_val, ts, _diff)| range.contains(ts))
+                    .map(|(val, ts, diff)| ((key.clone(), val.clone()), *ts, *diff));
+                result.extend(iter);
+            }
+        };
         result
     }
 
@@ -260,11 +378,12 @@ impl Arrangement {
     /// get current state of things
     /// useful for query existing keys(i.e. reduce and join operator need to query existing state)
     pub fn get(&self, now: Timestamp, key: &Row) -> Option<(Row, Timestamp, Diff)> {
-        if self
-            .spine
-            .first_key_value()
-            .map(|(ts, _)| *ts >= now)
-            .unwrap_or(false)
+        if self.full_arrangement
+            && self
+                .spine
+                .first_key_value()
+                .map(|(ts, _)| *ts >= now)
+                .unwrap_or(false)
         {
             self.spine
                 .first_key_value()
@@ -272,10 +391,38 @@ impl Arrangement {
         } else {
             // check keys <= now to know current value
             let mut final_val = None;
-            for (_ts, batch) in self.spine.range(..=now) {
+
+            let with_extra_batch = {
+                let unaligned = self.spine.range(..=now);
+                if unaligned
+                    .clone()
+                    .last()
+                    .map(|(ts, _)| *ts == now)
+                    .unwrap_or(false)
+                {
+                    // this extra chain is there just to make type the same
+                    unaligned.chain(None)
+                } else {
+                    // if the last key is not equal to now, then we need to include the next batch
+                    // because we know last batch key < now < next batch key
+                    // therefore next batch may contain updates that we want
+                    unaligned.chain(
+                        self.spine
+                            .range((Bound::Excluded(now), Bound::Unbounded))
+                            .next(),
+                    )
+                }
+            };
+            for (ts, batch) in with_extra_batch {
                 if let Some(new_rows) = batch.get(key).map(|v| v.iter()) {
-                    for new_row in new_rows {
-                        final_val = compact_diff_row(final_val, new_row);
+                    if *ts <= now {
+                        for new_row in new_rows {
+                            final_val = compact_diff_row(final_val, new_row);
+                        }
+                    } else {
+                        for new_row in new_rows.filter(|new_row| new_row.1 <= now) {
+                            final_val = compact_diff_row(final_val, new_row);
+                        }
                     }
                 }
             }
@@ -530,4 +677,108 @@ mod test {
             assert_eq!(arr.get(12, &Row::new(vec![1i64.into()])), None);
         }
     }
+
+    /// test if split_lte get ranges that are not aligned with batch boundaries
+    /// this split_lte can correctly retrieve all updates in the range, including updates that are in the batches
+    /// near the boundary of input range
+    #[test]
+    fn test_split_off() {
+        let mut arr = Arrangement::new();
+        // manually create batch ..=1 and 2..=3
+        arr.spine.insert(1, Default::default());
+        arr.spine.insert(3, Default::default());
+        arr.apply_updates(
+            2,
+            vec![((Row::new(vec![1.into()]), Row::new(vec![2.into()])), 2, 1)],
+        )
+        .unwrap();
+        // updates falls into the range of 2..=3
+        let mut arr1 = arr.clone();
+        {
+            assert_eq!(arr.get_next_update_time(&1), Some(2));
+            // split expect to take batch ..=1 and create a new batch 2..=2(which contain update)
+            let split = &arr.split_lte(&2);
+            assert_eq!(split.len(), 2);
+            assert_eq!(split[&2].len(), 1);
+            let _ = &arr.split_lte(&3);
+            assert_eq!(arr.get_next_update_time(&1), None);
+        }
+        {
+            // take all updates with timestamp <=1, will get no updates
+            let split = &arr1.split_lte(&1);
+            assert_eq!(split.len(), 1);
+        }
+    }
+
+    /// test if get ranges is not aligned with boundary of batch,
+    /// whether can get correct result
+    #[test]
+    fn test_get_by_range() {
+        let mut arr = Arrangement::new();
+
+        // will form {2: [2, 1], 4: [4,3], 6: [6,5]} three batch
+        // TODO(discord9): manually set batch
+        let updates: Vec<KeyValDiffRow> = vec![
+            ((Row::new(vec![1i64.into()]), Row::empty()), 2, 1),
+            ((Row::new(vec![1i64.into()]), Row::empty()), 1, 1),
+            ((Row::new(vec![2i64.into()]), Row::empty()), 4, 1),
+            ((Row::new(vec![3i64.into()]), Row::empty()), 3, 1),
+            ((Row::new(vec![3i64.into()]), Row::empty()), 6, 1),
+            ((Row::new(vec![1i64.into()]), Row::empty()), 5, 1),
+        ];
+        arr.apply_updates(0, updates).unwrap();
+        assert_eq!(
+            arr.get_updates_in_range(2..=5),
+            vec![
+                ((Row::new(vec![1i64.into()]), Row::empty()), 2, 1),
+                ((Row::new(vec![2i64.into()]), Row::empty()), 4, 1),
+                ((Row::new(vec![3i64.into()]), Row::empty()), 3, 1),
+                ((Row::new(vec![1i64.into()]), Row::empty()), 5, 1),
+            ]
+        );
+    }
+
+    /// test if get with range unaligned with batch boundary
+    ///  can get correct result
+    #[test]
+    fn test_get_unaligned() {
+        let mut arr = Arrangement::new();
+
+        // will form {2: [2, 1], 4: [4,3], 6: [6,5]} three batch
+        // TODO(discord9): manually set batch
+        let key = Row::new(vec![1i64.into()]);
+        let updates: Vec<KeyValDiffRow> = vec![
+            ((key.clone(), Row::new(vec![1i64.into()])), 2, 1),
+            ((key.clone(), Row::new(vec![2i64.into()])), 1, 1),
+            ((key.clone(), Row::new(vec![3i64.into()])), 4, 1),
+            ((key.clone(), Row::new(vec![4i64.into()])), 3, 1),
+            ((key.clone(), Row::new(vec![5i64.into()])), 6, 1),
+            ((key.clone(), Row::new(vec![6i64.into()])), 5, 1),
+        ];
+        arr.apply_updates(0, updates).unwrap();
+        // aligned with batch boundary
+        assert_eq!(arr.get(2, &key), Some((Row::new(vec![1i64.into()]), 2, 1)));
+        // unaligned with batch boundary
+        assert_eq!(arr.get(3, &key), Some((Row::new(vec![4i64.into()]), 3, 1)));
+    }
+
+    /// test if out of order updates can be sorted correctly
+    #[test]
+    fn test_out_of_order_apply_updates() {
+        let mut arr = Arrangement::new();
+
+        let key = Row::new(vec![1i64.into()]);
+        let updates: Vec<KeyValDiffRow> = vec![
+            ((key.clone(), Row::new(vec![5i64.into()])), 6, 1),
+            ((key.clone(), Row::new(vec![2i64.into()])), 2, -1),
+            ((key.clone(), Row::new(vec![1i64.into()])), 2, 1),
+            ((key.clone(), Row::new(vec![2i64.into()])), 1, 1),
+            ((key.clone(), Row::new(vec![3i64.into()])), 4, 1),
+            ((key.clone(), Row::new(vec![4i64.into()])), 3, 1),
+            ((key.clone(), Row::new(vec![6i64.into()])), 5, 1),
+        ];
+        arr.apply_updates(0, updates.clone()).unwrap();
+        let sorted = updates.iter().sorted_by_key(|r| r.1).cloned().collect_vec();
+        assert_eq!(arr.get_updates_in_range(1..7), sorted);
+    }
 }
diff --git a/src/frontend/Cargo.toml b/src/frontend/Cargo.toml
index 9d5578eb50be..114ed4833600 100644
--- a/src/frontend/Cargo.toml
+++ b/src/frontend/Cargo.toml
@@ -15,22 +15,16 @@ workspace = true
 [dependencies]
 api.workspace = true
 arc-swap = "1.0"
-arrow-flight.workspace = true
-async-compat = "0.2"
-async-stream.workspace = true
 async-trait = "0.1"
 auth.workspace = true
 catalog.workspace = true
-chrono.workspace = true
 client.workspace = true
 common-base.workspace = true
 common-catalog.workspace = true
 common-config.workspace = true
 common-datasource.workspace = true
 common-error.workspace = true
-common-function.workspace = true
 common-grpc.workspace = true
-common-grpc-expr.workspace = true
 common-macro.workspace = true
 common-meta.workspace = true
 common-procedure.workspace = true
@@ -38,23 +32,11 @@ common-query.workspace = true
 common-recordbatch.workspace = true
 common-runtime.workspace = true
 common-telemetry.workspace = true
-common-time.workspace = true
-datafusion.workspace = true
-datafusion-common.workspace = true
-datafusion-expr.workspace = true
 datanode.workspace = true
-datatypes.workspace = true
-file-engine.workspace = true
-futures = "0.3"
-futures-util.workspace = true
 humantime-serde.workspace = true
-itertools.workspace = true
 lazy_static.workspace = true
 log-store.workspace = true
 meta-client.workspace = true
-moka = { workspace = true, features = ["future"] }
-object-store.workspace = true
-openmetrics-parser = "0.4"
 opentelemetry-proto.workspace = true
 operator.workspace = true
 partition.workspace = true
@@ -62,17 +44,14 @@ prometheus.workspace = true
 prost.workspace = true
 query.workspace = true
 raft-engine.workspace = true
-regex.workspace = true
 script = { workspace = true, features = ["python"], optional = true }
 serde.workspace = true
-serde_json.workspace = true
 servers.workspace = true
 session.workspace = true
 snafu.workspace = true
 sql.workspace = true
 sqlparser.workspace = true
 store-api.workspace = true
-substrait.workspace = true
 table.workspace = true
 tokio.workspace = true
 toml.workspace = true
diff --git a/src/frontend/src/instance/builder.rs b/src/frontend/src/instance/builder.rs
index bb99c2c5ee4a..1464a11c27d1 100644
--- a/src/frontend/src/instance/builder.rs
+++ b/src/frontend/src/instance/builder.rs
@@ -14,7 +14,7 @@
 
 use std::sync::Arc;
 
-use catalog::kvbackend::KvBackendCatalogManager;
+use catalog::CatalogManagerRef;
 use common_base::Plugins;
 use common_meta::cache_invalidator::{CacheInvalidatorRef, DummyCacheInvalidator};
 use common_meta::datanode_manager::DatanodeManagerRef;
@@ -41,6 +41,7 @@ use crate::script::ScriptExecutor;
 pub struct FrontendBuilder {
     kv_backend: KvBackendRef,
     cache_invalidator: Option<CacheInvalidatorRef>,
+    catalog_manager: CatalogManagerRef,
     datanode_manager: DatanodeManagerRef,
     plugins: Option<Plugins>,
     procedure_executor: ProcedureExecutorRef,
@@ -50,12 +51,14 @@ pub struct FrontendBuilder {
 impl FrontendBuilder {
     pub fn new(
         kv_backend: KvBackendRef,
+        catalog_manager: CatalogManagerRef,
         datanode_manager: DatanodeManagerRef,
         procedure_executor: ProcedureExecutorRef,
     ) -> Self {
         Self {
             kv_backend,
             cache_invalidator: None,
+            catalog_manager,
             datanode_manager,
             plugins: None,
             procedure_executor,
@@ -89,29 +92,27 @@ impl FrontendBuilder {
         let datanode_manager = self.datanode_manager;
         let plugins = self.plugins.unwrap_or_default();
 
-        let catalog_manager = KvBackendCatalogManager::new(
-            kv_backend.clone(),
-            self.cache_invalidator
-                .unwrap_or_else(|| Arc::new(DummyCacheInvalidator)),
-        );
-
         let partition_manager = Arc::new(PartitionRuleManager::new(kv_backend.clone()));
 
+        let cache_invalidator = self
+            .cache_invalidator
+            .unwrap_or_else(|| Arc::new(DummyCacheInvalidator));
+
         let region_query_handler =
             FrontendRegionQueryHandler::arc(partition_manager.clone(), datanode_manager.clone());
 
         let inserter = Arc::new(Inserter::new(
-            catalog_manager.clone(),
+            self.catalog_manager.clone(),
             partition_manager.clone(),
             datanode_manager.clone(),
         ));
         let deleter = Arc::new(Deleter::new(
-            catalog_manager.clone(),
+            self.catalog_manager.clone(),
             partition_manager.clone(),
             datanode_manager.clone(),
         ));
         let requester = Arc::new(Requester::new(
-            catalog_manager.clone(),
+            self.catalog_manager.clone(),
             partition_manager,
             datanode_manager.clone(),
         ));
@@ -126,7 +127,7 @@ impl FrontendBuilder {
         ));
 
         let query_engine = QueryEngineFactory::new_with_plugins(
-            catalog_manager.clone(),
+            self.catalog_manager.clone(),
             Some(region_query_handler.clone()),
             Some(table_mutation_handler),
             Some(procedure_service_handler),
@@ -135,22 +136,23 @@ impl FrontendBuilder {
         )
         .query_engine();
 
-        let script_executor =
-            Arc::new(ScriptExecutor::new(catalog_manager.clone(), query_engine.clone()).await?);
+        let script_executor = Arc::new(
+            ScriptExecutor::new(self.catalog_manager.clone(), query_engine.clone()).await?,
+        );
 
         let statement_executor = Arc::new(StatementExecutor::new(
-            catalog_manager.clone(),
+            self.catalog_manager.clone(),
             query_engine.clone(),
             self.procedure_executor,
             kv_backend.clone(),
-            catalog_manager.clone(),
+            cache_invalidator,
             inserter.clone(),
         ));
 
         plugins.insert::<StatementExecutorRef>(statement_executor.clone());
 
         Ok(Instance {
-            catalog_manager,
+            catalog_manager: self.catalog_manager,
             script_executor,
             statement_executor,
             query_engine,
diff --git a/src/frontend/src/instance/prom_store.rs b/src/frontend/src/instance/prom_store.rs
index 1b5aa14c5ff6..104573bf8621 100644
--- a/src/frontend/src/instance/prom_store.rs
+++ b/src/frontend/src/instance/prom_store.rs
@@ -16,7 +16,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use api::prom_store::remote::read_request::ResponseType;
-use api::prom_store::remote::{Query, QueryResult, ReadRequest, ReadResponse, WriteRequest};
+use api::prom_store::remote::{Query, QueryResult, ReadRequest, ReadResponse};
 use api::v1::RowInsertRequests;
 use async_trait::async_trait;
 use auth::{PermissionChecker, PermissionCheckerRef, PermissionReq};
@@ -46,7 +46,6 @@ use crate::error::{
     TableNotFoundSnafu,
 };
 use crate::instance::Instance;
-use crate::metrics::PROM_STORE_REMOTE_WRITE_SAMPLES;
 
 const SAMPLES_RESPONSE_TYPE: i32 = ResponseType::Samples as i32;
 
@@ -163,43 +162,6 @@ impl Instance {
 #[async_trait]
 impl PromStoreProtocolHandler for Instance {
     async fn write(
-        &self,
-        request: WriteRequest,
-        ctx: QueryContextRef,
-        with_metric_engine: bool,
-    ) -> ServerResult<Output> {
-        self.plugins
-            .get::<PermissionCheckerRef>()
-            .as_ref()
-            .check_permission(ctx.current_user(), PermissionReq::PromStoreWrite)
-            .context(AuthSnafu)?;
-        let interceptor_ref = self
-            .plugins
-            .get::<PromStoreProtocolInterceptorRef<servers::error::Error>>();
-        interceptor_ref.pre_write(&request, ctx.clone())?;
-
-        let (requests, samples) = prom_store::to_grpc_row_insert_requests(&request)?;
-        let output = if with_metric_engine {
-            let physical_table = ctx
-                .extension(PHYSICAL_TABLE_PARAM)
-                .unwrap_or(GREPTIME_PHYSICAL_TABLE)
-                .to_string();
-            self.handle_metric_row_inserts(requests, ctx.clone(), physical_table.to_string())
-                .await
-                .map_err(BoxedError::new)
-                .context(error::ExecuteGrpcQuerySnafu)?
-        } else {
-            self.handle_row_inserts(requests, ctx.clone())
-                .await
-                .map_err(BoxedError::new)
-                .context(error::ExecuteGrpcQuerySnafu)?
-        };
-
-        PROM_STORE_REMOTE_WRITE_SAMPLES.inc_by(samples as u64);
-        Ok(output)
-    }
-
-    async fn write_fast(
         &self,
         request: RowInsertRequests,
         ctx: QueryContextRef,
@@ -316,14 +278,13 @@ impl ExportMetricHandler {
 impl PromStoreProtocolHandler for ExportMetricHandler {
     async fn write(
         &self,
-        request: WriteRequest,
+        request: RowInsertRequests,
         ctx: QueryContextRef,
         _: bool,
     ) -> ServerResult<Output> {
-        let (requests, _) = prom_store::to_grpc_row_insert_requests(&request)?;
         self.inserter
             .handle_metric_row_inserts(
-                requests,
+                request,
                 ctx,
                 &self.statement_executor,
                 GREPTIME_PHYSICAL_TABLE.to_string(),
@@ -333,15 +294,6 @@ impl PromStoreProtocolHandler for ExportMetricHandler {
             .context(error::ExecuteGrpcQuerySnafu)
     }
 
-    async fn write_fast(
-        &self,
-        _request: RowInsertRequests,
-        _ctx: QueryContextRef,
-        _with_metric_engine: bool,
-    ) -> ServerResult<Output> {
-        unimplemented!()
-    }
-
     async fn read(
         &self,
         _request: ReadRequest,
diff --git a/src/frontend/src/instance/standalone.rs b/src/frontend/src/instance/standalone.rs
index 28758504257b..615e14f5d9c8 100644
--- a/src/frontend/src/instance/standalone.rs
+++ b/src/frontend/src/instance/standalone.rs
@@ -18,7 +18,7 @@ use api::v1::region::{QueryRequest, RegionRequest, RegionResponse};
 use async_trait::async_trait;
 use client::region::check_response_header;
 use common_error::ext::BoxedError;
-use common_meta::datanode_manager::{AffectedRows, Datanode, DatanodeManager, DatanodeRef};
+use common_meta::datanode_manager::{Datanode, DatanodeManager, DatanodeRef, HandleResponse};
 use common_meta::error::{self as meta_error, Result as MetaResult};
 use common_meta::peer::Peer;
 use common_recordbatch::SendableRecordBatchStream;
@@ -63,7 +63,7 @@ impl RegionInvoker {
 
 #[async_trait]
 impl Datanode for RegionInvoker {
-    async fn handle(&self, request: RegionRequest) -> MetaResult<AffectedRows> {
+    async fn handle(&self, request: RegionRequest) -> MetaResult<HandleResponse> {
         let span = request
             .header
             .as_ref()
@@ -76,10 +76,10 @@ impl Datanode for RegionInvoker {
             .await
             .map_err(BoxedError::new)
             .context(meta_error::ExternalSnafu)?;
-        check_response_header(response.header)
+        check_response_header(&response.header)
             .map_err(BoxedError::new)
             .context(meta_error::ExternalSnafu)?;
-        Ok(response.affected_rows as _)
+        Ok(HandleResponse::from_region_response(response))
     }
 
     async fn handle_query(&self, request: QueryRequest) -> MetaResult<SendableRecordBatchStream> {
diff --git a/src/frontend/src/metrics.rs b/src/frontend/src/metrics.rs
index 5c3c6122e492..db9d53ac19aa 100644
--- a/src/frontend/src/metrics.rs
+++ b/src/frontend/src/metrics.rs
@@ -41,13 +41,6 @@ lazy_static! {
         .with_label_values(&["insert"]);
     pub static ref EXECUTE_SCRIPT_ELAPSED: Histogram = HANDLE_SCRIPT_ELAPSED
         .with_label_values(&["execute"]);
-
-    /// The samples count of Prometheus remote write.
-    pub static ref PROM_STORE_REMOTE_WRITE_SAMPLES: IntCounter = register_int_counter!(
-        "greptime_frontend_prometheus_remote_write_samples",
-        "frontend prometheus remote write samples"
-    )
-    .unwrap();
     pub static ref OTLP_METRICS_ROWS: IntCounter = register_int_counter!(
         "greptime_frontend_otlp_metrics_rows",
         "frontend otlp metrics rows"
diff --git a/src/index/src/inverted_index/error.rs b/src/index/src/inverted_index/error.rs
index c3c40dddeae7..d831eaa1b12c 100644
--- a/src/index/src/inverted_index/error.rs
+++ b/src/index/src/inverted_index/error.rs
@@ -113,7 +113,7 @@ pub enum Error {
     #[snafu(display("Failed to parse regex DFA"))]
     ParseDFA {
         #[snafu(source)]
-        error: Box<regex_automata::dfa::Error>,
+        error: Box<regex_automata::dfa::dense::BuildError>,
         location: Location,
     },
 
diff --git a/src/index/src/inverted_index/search/fst_apply/intersection_apply.rs b/src/index/src/inverted_index/search/fst_apply/intersection_apply.rs
index d76b44fe9d4b..ed8d48323042 100644
--- a/src/index/src/inverted_index/search/fst_apply/intersection_apply.rs
+++ b/src/index/src/inverted_index/search/fst_apply/intersection_apply.rs
@@ -17,6 +17,10 @@ use std::mem::size_of;
 use fst::map::OpBuilder;
 use fst::{IntoStreamer, Streamer};
 use regex_automata::dfa::dense::DFA;
+use regex_automata::dfa::Automaton;
+use regex_automata::util::primitives::StateID;
+use regex_automata::util::start::Config;
+use regex_automata::Anchored;
 use snafu::{ensure, ResultExt};
 
 use crate::inverted_index::error::{
@@ -32,7 +36,53 @@ pub struct IntersectionFstApplier {
     ranges: Vec<Range>,
 
     /// A list of `Dfa` compiled from regular expression patterns.
-    dfas: Vec<DFA<Vec<u32>>>,
+    dfas: Vec<DfaFstAutomaton>,
+}
+
+#[derive(Debug)]
+struct DfaFstAutomaton(DFA<Vec<u32>>);
+
+impl fst::Automaton for DfaFstAutomaton {
+    type State = StateID;
+
+    #[inline]
+    fn start(&self) -> Self::State {
+        let config = Config::new().anchored(Anchored::No);
+        self.0.start_state(&config).unwrap()
+    }
+
+    #[inline]
+    fn is_match(&self, state: &Self::State) -> bool {
+        self.0.is_match_state(*state)
+    }
+
+    #[inline]
+    fn can_match(&self, state: &Self::State) -> bool {
+        !self.0.is_dead_state(*state)
+    }
+
+    #[inline]
+    fn accept_eof(&self, state: &StateID) -> Option<StateID> {
+        if self.0.is_match_state(*state) {
+            return Some(*state);
+        }
+        Some(self.0.next_eoi_state(*state))
+    }
+
+    #[inline]
+    fn accept(&self, state: &Self::State, byte: u8) -> Self::State {
+        if self.0.is_match_state(*state) {
+            return *state;
+        }
+        self.0.next_state(*state, byte)
+    }
+}
+
+impl IntersectionFstApplier {
+    fn new(ranges: Vec<Range>, dfas: Vec<DFA<Vec<u32>>>) -> Self {
+        let dfas = dfas.into_iter().map(DfaFstAutomaton).collect();
+        Self { ranges, dfas }
+    }
 }
 
 impl FstApplier for IntersectionFstApplier {
@@ -86,7 +136,7 @@ impl FstApplier for IntersectionFstApplier {
 
         size += self.dfas.capacity() * size_of::<DFA<Vec<u32>>>();
         for dfa in &self.dfas {
-            size += dfa.memory_usage();
+            size += dfa.0.memory_usage();
         }
         size
     }
@@ -119,7 +169,7 @@ impl IntersectionFstApplier {
             }
         }
 
-        Ok(Self { dfas, ranges })
+        Ok(Self::new(ranges, dfas))
     }
 }
 
@@ -365,18 +415,15 @@ mod tests {
 
     #[test]
     fn test_intersection_fst_applier_memory_usage() {
-        let applier = IntersectionFstApplier {
-            ranges: vec![],
-            dfas: vec![],
-        };
+        let applier = IntersectionFstApplier::new(vec![], vec![]);
 
         assert_eq!(applier.memory_usage(), 0);
 
         let dfa = DFA::new("^abc$").unwrap();
         assert_eq!(dfa.memory_usage(), 320);
 
-        let applier = IntersectionFstApplier {
-            ranges: vec![Range {
+        let applier = IntersectionFstApplier::new(
+            vec![Range {
                 lower: Some(Bound {
                     value: b"aa".to_vec(),
                     inclusive: true,
@@ -386,9 +433,8 @@ mod tests {
                     inclusive: true,
                 }),
             }],
-            dfas: vec![dfa],
-        };
-
+            vec![dfa],
+        );
         assert_eq!(
             applier.memory_usage(),
             size_of::<Range>() + 4 + size_of::<DFA<Vec<u32>>>() + 320
diff --git a/src/log-store/Cargo.toml b/src/log-store/Cargo.toml
index e134399e4558..fa98d65daebc 100644
--- a/src/log-store/Cargo.toml
+++ b/src/log-store/Cargo.toml
@@ -15,11 +15,8 @@ workspace = true
 [dependencies]
 async-stream.workspace = true
 async-trait.workspace = true
-byteorder = "1.4"
-bytes.workspace = true
 chrono.workspace = true
 common-base.workspace = true
-common-config.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
 common-meta.workspace = true
@@ -27,7 +24,6 @@ common-runtime.workspace = true
 common-telemetry.workspace = true
 common-time.workspace = true
 common-wal.workspace = true
-dashmap.workspace = true
 futures.workspace = true
 futures-util.workspace = true
 protobuf = { version = "2", features = ["bytes"] }
@@ -38,7 +34,6 @@ serde_json.workspace = true
 snafu.workspace = true
 store-api.workspace = true
 tokio.workspace = true
-tokio-util.workspace = true
 
 [dev-dependencies]
 common-meta = { workspace = true, features = ["testing"] }
diff --git a/src/meta-client/Cargo.toml b/src/meta-client/Cargo.toml
index 2ba3b784b71d..6ea3bdb73070 100644
--- a/src/meta-client/Cargo.toml
+++ b/src/meta-client/Cargo.toml
@@ -10,19 +10,15 @@ workspace = true
 [dependencies]
 api.workspace = true
 async-trait = "0.1"
-chrono.workspace = true
 common-error.workspace = true
 common-grpc.workspace = true
 common-macro.workspace = true
 common-meta.workspace = true
 common-telemetry.workspace = true
-etcd-client.workspace = true
 humantime-serde.workspace = true
 rand.workspace = true
 serde.workspace = true
-serde_json.workspace = true
 snafu.workspace = true
-table.workspace = true
 tokio.workspace = true
 tokio-stream = { workspace = true, features = ["net"] }
 tonic.workspace = true
diff --git a/src/meta-srv/Cargo.toml b/src/meta-srv/Cargo.toml
index 176c4a1f4f37..13e27b4efd75 100644
--- a/src/meta-srv/Cargo.toml
+++ b/src/meta-srv/Cargo.toml
@@ -11,18 +11,14 @@ mock = []
 workspace = true
 
 [dependencies]
-anymap = "1.0.0-beta.2"
 api.workspace = true
-async-stream.workspace = true
 async-trait = "0.1"
-catalog.workspace = true
 client.workspace = true
 common-base.workspace = true
 common-catalog.workspace = true
 common-error.workspace = true
 common-greptimedb-telemetry.workspace = true
 common-grpc.workspace = true
-common-grpc-expr.workspace = true
 common-macro.workspace = true
 common-meta.workspace = true
 common-procedure.workspace = true
@@ -52,7 +48,6 @@ serde_json.workspace = true
 servers.workspace = true
 snafu.workspace = true
 store-api.workspace = true
-strum.workspace = true
 table.workspace = true
 tokio.workspace = true
 tokio-stream = { workspace = true, features = ["net"] }
@@ -61,7 +56,6 @@ tonic.workspace = true
 tower = "0.4"
 typetag = "0.2"
 url = "2.3"
-uuid.workspace = true
 
 [dev-dependencies]
 chrono.workspace = true
diff --git a/src/meta-srv/src/procedure/tests.rs b/src/meta-srv/src/procedure/tests.rs
index 84ab373dc9e4..d40ca633ff5d 100644
--- a/src/meta-srv/src/procedure/tests.rs
+++ b/src/meta-srv/src/procedure/tests.rs
@@ -32,8 +32,10 @@ use common_meta::ddl::create_logical_tables::{CreateLogicalTablesProcedure, Crea
 use common_meta::ddl::create_table::*;
 use common_meta::ddl::drop_table::executor::DropTableExecutor;
 use common_meta::ddl::drop_table::DropTableProcedure;
-use common_meta::ddl::test_util::create_table::build_raw_table_info_from_expr;
-use common_meta::ddl::test_util::{TestColumnDefBuilder, TestCreateTableExprBuilder};
+use common_meta::ddl::test_util::columns::TestColumnDefBuilder;
+use common_meta::ddl::test_util::create_table::{
+    build_raw_table_info_from_expr, TestCreateTableExprBuilder,
+};
 use common_meta::key::table_info::TableInfoValue;
 use common_meta::key::table_route::TableRouteValue;
 use common_meta::key::DeserializedValueWithBytes;
@@ -252,7 +254,7 @@ async fn test_on_datanode_create_logical_regions() {
     let region_routes = test_data::new_region_routes();
     let datanode_manager = new_datanode_manager(&region_server, &region_routes).await;
     let physical_table_route = TableRouteValue::physical(region_routes);
-    let physical_table_id = 111;
+    let physical_table_id = 1;
 
     let task1 = create_table_task(Some("my_table1"));
     let task2 = create_table_task(Some("my_table2"));
@@ -301,9 +303,9 @@ async fn test_on_datanode_create_logical_regions() {
     });
 
     let status = procedure.on_datanode_create_regions().await.unwrap();
-    assert!(matches!(status, Status::Executing { persist: false }));
+    assert!(matches!(status, Status::Executing { persist: true }));
     assert!(matches!(
-        procedure.creator.data.state(),
+        procedure.data.state(),
         &CreateTablesState::CreateMetadata
     ));
 
diff --git a/src/meta-srv/src/procedure/utils.rs b/src/meta-srv/src/procedure/utils.rs
index 0a9ace054c45..408aeb1f296c 100644
--- a/src/meta-srv/src/procedure/utils.rs
+++ b/src/meta-srv/src/procedure/utils.rs
@@ -93,6 +93,7 @@ pub mod mock {
                     }),
                 }),
                 affected_rows: 0,
+                extension: Default::default(),
             })
         }
     }
diff --git a/src/meta-srv/src/service/admin/meta.rs b/src/meta-srv/src/service/admin/meta.rs
index 77eb38e7dd5b..d13ca93b0eec 100644
--- a/src/meta-srv/src/service/admin/meta.rs
+++ b/src/meta-srv/src/service/admin/meta.rs
@@ -52,8 +52,7 @@ impl HttpHandler for CatalogsHandler {
         let stream = self
             .table_metadata_manager
             .catalog_manager()
-            .catalog_names()
-            .await;
+            .catalog_names();
 
         let keys = stream
             .try_collect::<Vec<_>>()
@@ -84,8 +83,7 @@ impl HttpHandler for SchemasHandler {
         let stream = self
             .table_metadata_manager
             .schema_manager()
-            .schema_names(catalog)
-            .await;
+            .schema_names(catalog);
 
         let keys = stream
             .try_collect::<Vec<_>>()
@@ -118,8 +116,7 @@ impl HttpHandler for TablesHandler {
         let stream = self
             .table_metadata_manager
             .table_name_manager()
-            .tables(catalog, schema)
-            .await;
+            .tables(catalog, schema);
         let tables = stream
             .try_collect::<Vec<_>>()
             .await
diff --git a/src/metric-engine/src/data_region.rs b/src/metric-engine/src/data_region.rs
index 16028c702764..9207d0f107bf 100644
--- a/src/metric-engine/src/data_region.rs
+++ b/src/metric-engine/src/data_region.rs
@@ -58,18 +58,19 @@ impl DataRegion {
     /// Invoker don't need to set up or verify the column id. This method will adjust
     /// it using underlying schema.
     ///
-    /// This method will also set the nullable marker to true.
+    /// This method will also set the nullable marker to true. All of those change are applies
+    /// to `columns` in-place.
     pub async fn add_columns(
         &self,
         region_id: RegionId,
-        columns: Vec<ColumnMetadata>,
+        columns: &mut [ColumnMetadata],
     ) -> Result<()> {
         let region_id = utils::to_data_region_id(region_id);
 
         let mut retries = 0;
         // submit alter request
         while retries < MAX_RETRIES {
-            let request = self.assemble_alter_request(region_id, &columns).await?;
+            let request = self.assemble_alter_request(region_id, columns).await?;
 
             let _timer = MITO_DDL_DURATION.start_timer();
 
@@ -90,10 +91,12 @@ impl DataRegion {
         Ok(())
     }
 
+    /// Generate warpped [RegionAlterRequest] with given [ColumnMetadata].
+    /// This method will modify `columns` in-place.
     async fn assemble_alter_request(
         &self,
         region_id: RegionId,
-        columns: &[ColumnMetadata],
+        columns: &mut [ColumnMetadata],
     ) -> Result<RegionRequest> {
         // retrieve underlying version
         let region_metadata = self
@@ -118,15 +121,14 @@ impl DataRegion {
             .unwrap_or(0);
 
         // overwrite semantic type
-        let columns = columns
-            .iter()
+        let new_columns = columns
+            .iter_mut()
             .enumerate()
             .map(|(delta, c)| {
-                let mut c = c.clone();
                 if c.semantic_type == SemanticType::Tag {
                     if !c.column_schema.data_type.is_string() {
                         return ColumnTypeMismatchSnafu {
-                            column_type: c.column_schema.data_type,
+                            column_type: c.column_schema.data_type.clone(),
                         }
                         .fail();
                     }
@@ -138,11 +140,10 @@ impl DataRegion {
                 };
 
                 c.column_id = new_column_id_start + delta as u32;
-
-                c.column_schema = c.column_schema.with_nullable_set();
+                c.column_schema.set_nullable();
 
                 Ok(AddColumn {
-                    column_metadata: c,
+                    column_metadata: c.clone(),
                     location: None,
                 })
             })
@@ -151,7 +152,9 @@ impl DataRegion {
         // assemble alter request
         let alter_request = RegionRequest::Alter(RegionAlterRequest {
             schema_version: version,
-            kind: AlterKind::AddColumns { columns },
+            kind: AlterKind::AddColumns {
+                columns: new_columns,
+            },
         });
 
         Ok(alter_request)
@@ -167,6 +170,7 @@ impl DataRegion {
             .handle_request(region_id, RegionRequest::Put(request))
             .await
             .context(MitoWriteOperationSnafu)
+            .map(|result| result.affected_rows)
     }
 
     pub async fn physical_columns(
@@ -205,7 +209,7 @@ mod test {
         // TestEnv will create a logical region which changes the version to 1.
         assert_eq!(current_version, 1);
 
-        let new_columns = vec![
+        let mut new_columns = vec![
             ColumnMetadata {
                 column_id: 0,
                 semantic_type: SemanticType::Tag,
@@ -226,7 +230,7 @@ mod test {
             },
         ];
         env.data_region()
-            .add_columns(env.default_physical_region_id(), new_columns)
+            .add_columns(env.default_physical_region_id(), &mut new_columns)
             .await
             .unwrap();
 
@@ -258,14 +262,14 @@ mod test {
         let env = TestEnv::new().await;
         env.init_metric_region().await;
 
-        let new_columns = vec![ColumnMetadata {
+        let mut new_columns = vec![ColumnMetadata {
             column_id: 0,
             semantic_type: SemanticType::Tag,
             column_schema: ColumnSchema::new("tag2", ConcreteDataType::int64_datatype(), false),
         }];
         let result = env
             .data_region()
-            .add_columns(env.default_physical_region_id(), new_columns)
+            .add_columns(env.default_physical_region_id(), &mut new_columns)
             .await;
         assert!(result.is_err());
     }
diff --git a/src/metric-engine/src/engine.rs b/src/metric-engine/src/engine.rs
index 1240b7cd6f0b..41f14fd76607 100644
--- a/src/metric-engine/src/engine.rs
+++ b/src/metric-engine/src/engine.rs
@@ -24,6 +24,7 @@ mod region_metadata;
 mod state;
 
 use std::any::Any;
+use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
 
 use async_trait::async_trait;
@@ -33,13 +34,13 @@ use common_recordbatch::SendableRecordBatchStream;
 use mito2::engine::MitoEngine;
 use store_api::metadata::RegionMetadataRef;
 use store_api::metric_engine_consts::METRIC_ENGINE_NAME;
-use store_api::region_engine::{RegionEngine, RegionRole, SetReadonlyResponse};
-use store_api::region_request::{AffectedRows, RegionRequest};
+use store_api::region_engine::{RegionEngine, RegionHandleResult, RegionRole, SetReadonlyResponse};
+use store_api::region_request::RegionRequest;
 use store_api::storage::{RegionId, ScanRequest};
 
 use self::state::MetricEngineState;
 use crate::data_region::DataRegion;
-use crate::error::Result;
+use crate::error::{Result, UnsupportedRegionRequestSnafu};
 use crate::metadata_region::MetadataRegion;
 use crate::utils;
 
@@ -121,23 +122,38 @@ impl RegionEngine for MetricEngine {
         &self,
         region_id: RegionId,
         request: RegionRequest,
-    ) -> Result<AffectedRows, BoxedError> {
+    ) -> Result<RegionHandleResult, BoxedError> {
+        let mut extension_return_value = HashMap::new();
+
         let result = match request {
             RegionRequest::Put(put) => self.inner.put_region(region_id, put).await,
-            RegionRequest::Delete(_) => todo!(),
-            RegionRequest::Create(create) => self.inner.create_region(region_id, create).await,
+            RegionRequest::Create(create) => {
+                self.inner
+                    .create_region(region_id, create, &mut extension_return_value)
+                    .await
+            }
             RegionRequest::Drop(drop) => self.inner.drop_region(region_id, drop).await,
             RegionRequest::Open(open) => self.inner.open_region(region_id, open).await,
             RegionRequest::Close(close) => self.inner.close_region(region_id, close).await,
-            RegionRequest::Alter(alter) => self.inner.alter_region(region_id, alter).await,
-            RegionRequest::Flush(_) => todo!(),
-            RegionRequest::Compact(_) => todo!(),
-            RegionRequest::Truncate(_) => todo!(),
+            RegionRequest::Alter(alter) => {
+                self.inner
+                    .alter_region(region_id, alter, &mut extension_return_value)
+                    .await
+            }
+            RegionRequest::Delete(_)
+            | RegionRequest::Flush(_)
+            | RegionRequest::Compact(_)
+            | RegionRequest::Truncate(_) => UnsupportedRegionRequestSnafu { request }.fail(),
             // It always Ok(0), all data is the latest.
             RegionRequest::Catchup(_) => Ok(0),
         };
 
-        result.map_err(BoxedError::new)
+        result
+            .map_err(BoxedError::new)
+            .map(|rows| RegionHandleResult {
+                affected_rows: rows,
+                extension: extension_return_value,
+            })
     }
 
     /// Handles substrait query and return a stream of record batches
diff --git a/src/metric-engine/src/engine/alter.rs b/src/metric-engine/src/engine/alter.rs
index 60520407ec21..c99942dec606 100644
--- a/src/metric-engine/src/engine/alter.rs
+++ b/src/metric-engine/src/engine/alter.rs
@@ -12,13 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::collections::HashMap;
+
 use common_telemetry::{error, info};
-use snafu::OptionExt;
+use snafu::{OptionExt, ResultExt};
+use store_api::metadata::ColumnMetadata;
+use store_api::metric_engine_consts::ALTER_PHYSICAL_EXTENSION_KEY;
 use store_api::region_request::{AffectedRows, AlterKind, RegionAlterRequest};
 use store_api::storage::RegionId;
 
 use crate::engine::MetricEngineInner;
-use crate::error::{ForbiddenPhysicalAlterSnafu, LogicalRegionNotFoundSnafu, Result};
+use crate::error::{
+    ForbiddenPhysicalAlterSnafu, LogicalRegionNotFoundSnafu, Result, SerializeColumnMetadataSnafu,
+};
 use crate::metrics::FORBIDDEN_OPERATION_COUNT;
 use crate::utils::{to_data_region_id, to_metadata_region_id};
 
@@ -28,23 +34,39 @@ impl MetricEngineInner {
         &self,
         region_id: RegionId,
         request: RegionAlterRequest,
+        extension_return_value: &mut HashMap<String, Vec<u8>>,
     ) -> Result<AffectedRows> {
         let is_altering_physical_region = self.is_physical_region(region_id);
 
         let result = if is_altering_physical_region {
             self.alter_physical_region(region_id, request).await
         } else {
-            self.alter_logical_region(region_id, request).await
+            let physical_region_id = self.alter_logical_region(region_id, request).await?;
+
+            // Add physical table's column to extension map.
+            // It's ok to overwrite existing key, as the latter come schema is more up-to-date
+            let physical_columns = self
+                .data_region
+                .physical_columns(physical_region_id)
+                .await?;
+            extension_return_value.insert(
+                ALTER_PHYSICAL_EXTENSION_KEY.to_string(),
+                ColumnMetadata::encode_list(&physical_columns)
+                    .context(SerializeColumnMetadataSnafu)?,
+            );
+
+            Ok(())
         };
 
         result.map(|_| 0)
     }
 
+    /// Return the physical region id behind this logical region
     async fn alter_logical_region(
         &self,
         region_id: RegionId,
         request: RegionAlterRequest,
-    ) -> Result<()> {
+    ) -> Result<RegionId> {
         let physical_region_id = {
             let state = &self.state.read().unwrap();
             state.get_physical_region_id(region_id).with_context(|| {
@@ -55,7 +77,7 @@ impl MetricEngineInner {
 
         // only handle adding column
         let AlterKind::AddColumns { columns } = request.kind else {
-            return Ok(());
+            return Ok(physical_region_id);
         };
 
         let metadata_region_id = to_metadata_region_id(physical_region_id);
@@ -92,7 +114,7 @@ impl MetricEngineInner {
                 .await?;
         }
 
-        Ok(())
+        Ok(physical_region_id)
     }
 
     async fn alter_physical_region(
diff --git a/src/metric-engine/src/engine/create.rs b/src/metric-engine/src/engine/create.rs
index 8fad9f9dc8eb..b8b39a11ddf6 100644
--- a/src/metric-engine/src/engine/create.rs
+++ b/src/metric-engine/src/engine/create.rs
@@ -15,6 +15,7 @@
 use std::collections::{HashMap, HashSet};
 
 use api::v1::SemanticType;
+use common_error::ext::BoxedError;
 use common_telemetry::info;
 use common_time::Timestamp;
 use datatypes::data_type::ConcreteDataType;
@@ -25,11 +26,12 @@ use object_store::util::join_dir;
 use snafu::{ensure, OptionExt, ResultExt};
 use store_api::metadata::ColumnMetadata;
 use store_api::metric_engine_consts::{
-    DATA_REGION_SUBDIR, DATA_SCHEMA_TABLE_ID_COLUMN_NAME, DATA_SCHEMA_TSID_COLUMN_NAME,
-    LOGICAL_TABLE_METADATA_KEY, METADATA_REGION_SUBDIR, METADATA_SCHEMA_KEY_COLUMN_INDEX,
-    METADATA_SCHEMA_KEY_COLUMN_NAME, METADATA_SCHEMA_TIMESTAMP_COLUMN_INDEX,
-    METADATA_SCHEMA_TIMESTAMP_COLUMN_NAME, METADATA_SCHEMA_VALUE_COLUMN_INDEX,
-    METADATA_SCHEMA_VALUE_COLUMN_NAME, PHYSICAL_TABLE_METADATA_KEY,
+    ALTER_PHYSICAL_EXTENSION_KEY, DATA_REGION_SUBDIR, DATA_SCHEMA_TABLE_ID_COLUMN_NAME,
+    DATA_SCHEMA_TSID_COLUMN_NAME, LOGICAL_TABLE_METADATA_KEY, METADATA_REGION_SUBDIR,
+    METADATA_SCHEMA_KEY_COLUMN_INDEX, METADATA_SCHEMA_KEY_COLUMN_NAME,
+    METADATA_SCHEMA_TIMESTAMP_COLUMN_INDEX, METADATA_SCHEMA_TIMESTAMP_COLUMN_NAME,
+    METADATA_SCHEMA_VALUE_COLUMN_INDEX, METADATA_SCHEMA_VALUE_COLUMN_NAME,
+    PHYSICAL_TABLE_METADATA_KEY,
 };
 use store_api::region_engine::RegionEngine;
 use store_api::region_request::{AffectedRows, RegionCreateRequest, RegionRequest};
@@ -41,8 +43,9 @@ use crate::engine::options::{
 };
 use crate::engine::MetricEngineInner;
 use crate::error::{
-    ConflictRegionOptionSnafu, CreateMitoRegionSnafu, InternalColumnOccupiedSnafu,
-    MissingRegionOptionSnafu, ParseRegionIdSnafu, PhysicalRegionNotFoundSnafu, Result,
+    ColumnNotFoundSnafu, ConflictRegionOptionSnafu, CreateMitoRegionSnafu,
+    InternalColumnOccupiedSnafu, MissingRegionOptionSnafu, MitoReadOperationSnafu,
+    ParseRegionIdSnafu, PhysicalRegionNotFoundSnafu, Result, SerializeColumnMetadataSnafu,
 };
 use crate::metrics::{LOGICAL_REGION_COUNT, PHYSICAL_COLUMN_COUNT, PHYSICAL_REGION_COUNT};
 use crate::utils::{to_data_region_id, to_metadata_region_id};
@@ -53,13 +56,28 @@ impl MetricEngineInner {
         &self,
         region_id: RegionId,
         request: RegionCreateRequest,
+        extension_return_value: &mut HashMap<String, Vec<u8>>,
     ) -> Result<AffectedRows> {
         Self::verify_region_create_request(&request)?;
 
         let result = if request.options.contains_key(PHYSICAL_TABLE_METADATA_KEY) {
             self.create_physical_region(region_id, request).await
         } else if request.options.contains_key(LOGICAL_TABLE_METADATA_KEY) {
-            self.create_logical_region(region_id, request).await
+            let physical_region_id = self.create_logical_region(region_id, request).await?;
+
+            // Add physical table's column to extension map.
+            // It's ok to overwrite existing key, as the latter come schema is more up-to-date
+            let physical_columns = self
+                .data_region
+                .physical_columns(physical_region_id)
+                .await?;
+            extension_return_value.insert(
+                ALTER_PHYSICAL_EXTENSION_KEY.to_string(),
+                ColumnMetadata::encode_list(&physical_columns)
+                    .context(SerializeColumnMetadataSnafu)?,
+            );
+
+            Ok(())
         } else {
             MissingRegionOptionSnafu {}.fail()
         };
@@ -126,11 +144,16 @@ impl MetricEngineInner {
     /// This method will alter the data region to add columns if necessary.
     ///
     /// If the logical region to create already exists, this method will do nothing.
+    ///
+    /// `alter_request` is a hashmap that stores the alter requests that were executed
+    /// to the physical region.
+    ///
+    /// Return the physical region id of this logical region
     async fn create_logical_region(
         &self,
         logical_region_id: RegionId,
         request: RegionCreateRequest,
-    ) -> Result<()> {
+    ) -> Result<RegionId> {
         // transform IDs
         let physical_region_id_raw = request
             .options
@@ -151,11 +174,12 @@ impl MetricEngineInner {
             .await?
         {
             info!("Create a existing logical region {logical_region_id}. Skipped");
-            return Ok(());
+            return Ok(data_region_id);
         }
 
         // find new columns to add
         let mut new_columns = vec![];
+        let mut existing_columns = vec![];
         {
             let state = &self.state.read().unwrap();
             let physical_columns =
@@ -168,6 +192,8 @@ impl MetricEngineInner {
             for col in &request.column_metadatas {
                 if !physical_columns.contains(&col.column_schema.name) {
                     new_columns.push(col.clone());
+                } else {
+                    existing_columns.push(col.column_schema.name.clone());
                 }
             }
         }
@@ -188,9 +214,28 @@ impl MetricEngineInner {
         self.metadata_region
             .add_logical_region(metadata_region_id, logical_region_id)
             .await?;
-        for col in &request.column_metadatas {
+
+        // register existing physical column to this new logical region.
+        let physical_schema = self
+            .data_region
+            .physical_columns(data_region_id)
+            .await
+            .map_err(BoxedError::new)
+            .context(MitoReadOperationSnafu)?;
+        let physical_schema_map = physical_schema
+            .into_iter()
+            .map(|metadata| (metadata.column_schema.name.clone(), metadata))
+            .collect::<HashMap<_, _>>();
+        for col in &existing_columns {
+            let column_metadata = physical_schema_map
+                .get(col)
+                .with_context(|| ColumnNotFoundSnafu {
+                    name: col,
+                    region_id: physical_region_id,
+                })?
+                .clone();
             self.metadata_region
-                .add_column(metadata_region_id, logical_region_id, col)
+                .add_column(metadata_region_id, logical_region_id, &column_metadata)
                 .await?;
         }
 
@@ -203,19 +248,21 @@ impl MetricEngineInner {
         info!("Created new logical region {logical_region_id} on physical region {data_region_id}");
         LOGICAL_REGION_COUNT.inc();
 
-        Ok(())
+        Ok(data_region_id)
     }
 
+    /// Execute corresponding alter requests to mito region. New added columns' [ColumnMetadata] will be
+    /// cloned into `added_columns`.
     pub(crate) async fn add_columns_to_physical_data_region(
         &self,
         data_region_id: RegionId,
         metadata_region_id: RegionId,
         logical_region_id: RegionId,
-        new_columns: Vec<ColumnMetadata>,
+        mut new_columns: Vec<ColumnMetadata>,
     ) -> Result<()> {
         // alter data region
         self.data_region
-            .add_columns(data_region_id, new_columns.clone())
+            .add_columns(data_region_id, &mut new_columns)
             .await?;
 
         // register columns to metadata region
@@ -362,13 +409,13 @@ impl MetricEngineInner {
         // concat region dir
         data_region_request.region_dir = join_dir(&request.region_dir, DATA_REGION_SUBDIR);
 
-        // convert semantic type
+        // change nullability for tag columns
         data_region_request
             .column_metadatas
             .iter_mut()
             .for_each(|metadata| {
                 if metadata.semantic_type == SemanticType::Tag {
-                    metadata.semantic_type = SemanticType::Field;
+                    metadata.column_schema.set_nullable();
                 }
             });
 
diff --git a/src/metric-engine/src/engine/put.rs b/src/metric-engine/src/engine/put.rs
index 5ce2bf227ba4..72c2aeb18034 100644
--- a/src/metric-engine/src/engine/put.rs
+++ b/src/metric-engine/src/engine/put.rs
@@ -215,12 +215,12 @@ mod tests {
 
         // write data
         let logical_region_id = env.default_logical_region_id();
-        let count = env
+        let result = env
             .metric()
             .handle_request(logical_region_id, request)
             .await
             .unwrap();
-        assert_eq!(count, 5);
+        assert_eq!(result.affected_rows, 5);
 
         // read data from physical region
         let physical_region_id = env.default_physical_region_id();
@@ -287,11 +287,11 @@ mod tests {
         });
 
         // write data
-        let count = engine
+        let result = engine
             .handle_request(logical_region_id, request)
             .await
             .unwrap();
-        assert_eq!(100, count);
+        assert_eq!(100, result.affected_rows);
     }
 
     #[tokio::test]
diff --git a/src/metric-engine/src/engine/read.rs b/src/metric-engine/src/engine/read.rs
index 154a9a61b084..6093d41cd2be 100644
--- a/src/metric-engine/src/engine/read.rs
+++ b/src/metric-engine/src/engine/read.rs
@@ -143,6 +143,7 @@ impl MetricEngineInner {
             self.default_projection(physical_region_id, logical_region_id)
                 .await?
         };
+
         request.projection = Some(physical_projection);
 
         // add table filter
@@ -186,6 +187,7 @@ impl MetricEngineInner {
             .get_metadata(data_region_id)
             .await
             .context(MitoReadOperationSnafu)?;
+
         for name in projected_logical_names {
             // Safety: logical columns is a strict subset of physical columns
             physical_projection.push(physical_metadata.column_index_by_name(&name).unwrap());
@@ -301,7 +303,7 @@ mod test {
             .await
             .unwrap();
 
-        assert_eq!(scan_req.projection.unwrap(), vec![0, 1, 4, 8, 9, 10, 11]);
+        assert_eq!(scan_req.projection.unwrap(), vec![11, 10, 9, 8, 0, 1, 4]);
         assert_eq!(scan_req.filters.len(), 1);
         assert_eq!(
             scan_req.filters[0],
@@ -318,6 +320,6 @@ mod test {
             .transform_request(physical_region_id, logical_region_id, scan_req)
             .await
             .unwrap();
-        assert_eq!(scan_req.projection.unwrap(), vec![0, 1, 4, 8, 9, 10, 11]);
+        assert_eq!(scan_req.projection.unwrap(), vec![11, 10, 9, 8, 0, 1, 4]);
     }
 }
diff --git a/src/metric-engine/src/engine/region_metadata.rs b/src/metric-engine/src/engine/region_metadata.rs
index 150d1a324c2e..1fa33ec39da7 100644
--- a/src/metric-engine/src/engine/region_metadata.rs
+++ b/src/metric-engine/src/engine/region_metadata.rs
@@ -39,7 +39,8 @@ impl MetricEngineInner {
             .collect::<Vec<_>>();
 
         // sort columns on column id to ensure the order
-        logical_column_metadata.sort_unstable_by_key(|col| col.column_id);
+        logical_column_metadata
+            .sort_unstable_by(|c1, c2| c1.column_schema.name.cmp(&c2.column_schema.name));
 
         Ok(logical_column_metadata)
     }
diff --git a/src/metric-engine/src/error.rs b/src/metric-engine/src/error.rs
index aa4f35472c84..b2568947290c 100644
--- a/src/metric-engine/src/error.rs
+++ b/src/metric-engine/src/error.rs
@@ -19,6 +19,7 @@ use common_error::status_code::StatusCode;
 use common_macro::stack_trace_debug;
 use datatypes::prelude::ConcreteDataType;
 use snafu::{Location, Snafu};
+use store_api::region_request::RegionRequest;
 use store_api::storage::RegionId;
 
 #[derive(Snafu)]
@@ -71,6 +72,13 @@ pub enum Error {
         location: Location,
     },
 
+    #[snafu(display("Failed to serialize column metadata"))]
+    SerializeColumnMetadata {
+        #[snafu(source)]
+        error: serde_json::Error,
+        location: Location,
+    },
+
     #[snafu(display("Failed to decode base64 column value"))]
     DecodeColumnValue {
         #[snafu(source)]
@@ -155,6 +163,12 @@ pub enum Error {
         region_id: RegionId,
         location: Location,
     },
+
+    #[snafu(display("Unsupported region request: {}", request))]
+    UnsupportedRegionRequest {
+        request: RegionRequest,
+        location: Location,
+    },
 }
 
 pub type Result<T, E = Error> = std::result::Result<T, E>;
@@ -170,11 +184,14 @@ impl ErrorExt for Error {
             | ColumnTypeMismatch { .. }
             | PhysicalRegionBusy { .. } => StatusCode::InvalidArguments,
 
-            ForbiddenPhysicalAlter { .. } => StatusCode::Unsupported,
+            ForbiddenPhysicalAlter { .. } | UnsupportedRegionRequest { .. } => {
+                StatusCode::Unsupported
+            }
 
             MissingInternalColumn { .. }
             | DeserializeSemanticType { .. }
             | DeserializeColumnMetadata { .. }
+            | SerializeColumnMetadata { .. }
             | DecodeColumnValue { .. }
             | ParseRegionId { .. }
             | InvalidMetadata { .. } => StatusCode::Unexpected,
diff --git a/src/metric-engine/src/metadata_region.rs b/src/metric-engine/src/metadata_region.rs
index 918f7f1023d7..73ad6e9b3286 100644
--- a/src/metric-engine/src/metadata_region.rs
+++ b/src/metric-engine/src/metadata_region.rs
@@ -167,7 +167,7 @@ impl MetadataRegion {
 
     // TODO(ruihang): avoid using `get_all`
     /// Get all the columns of a given logical region.
-    /// Return a list of (column_name, semantic_type).
+    /// Return a list of (column_name, column_metadata).
     pub async fn logical_columns(
         &self,
         physical_region_id: RegionId,
diff --git a/src/mito2/Cargo.toml b/src/mito2/Cargo.toml
index 917d7d0b4156..ffe8c570351e 100644
--- a/src/mito2/Cargo.toml
+++ b/src/mito2/Cargo.toml
@@ -12,23 +12,18 @@ test = ["common-test-util", "log-store"]
 workspace = true
 
 [dependencies]
-anymap = "1.0.0-beta.2"
 api.workspace = true
 aquamarine.workspace = true
-arc-swap = "1.6"
 async-channel = "1.9"
 async-stream.workspace = true
 async-trait = "0.1"
 bytes.workspace = true
-chrono.workspace = true
 common-base.workspace = true
-common-catalog.workspace = true
 common-config.workspace = true
 common-datasource.workspace = true
 common-decimal.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
-common-procedure.workspace = true
 common-query.workspace = true
 common-recordbatch.workspace = true
 common-runtime.workspace = true
@@ -36,7 +31,6 @@ common-telemetry.workspace = true
 common-test-util = { workspace = true, optional = true }
 common-time.workspace = true
 common-wal.workspace = true
-dashmap.workspace = true
 datafusion.workspace = true
 datafusion-common.workspace = true
 datafusion-expr.workspace = true
diff --git a/src/mito2/src/engine.rs b/src/mito2/src/engine.rs
index 16a3bca5dc29..449f87dcf44a 100644
--- a/src/mito2/src/engine.rs
+++ b/src/mito2/src/engine.rs
@@ -57,7 +57,7 @@ use object_store::manager::ObjectStoreManagerRef;
 use snafu::{ensure, OptionExt, ResultExt};
 use store_api::logstore::LogStore;
 use store_api::metadata::RegionMetadataRef;
-use store_api::region_engine::{RegionEngine, RegionRole, SetReadonlyResponse};
+use store_api::region_engine::{RegionEngine, RegionHandleResult, RegionRole, SetReadonlyResponse};
 use store_api::region_request::{AffectedRows, RegionRequest};
 use store_api::storage::{RegionId, ScanRequest};
 use tokio::sync::oneshot;
@@ -290,10 +290,11 @@ impl RegionEngine for MitoEngine {
         &self,
         region_id: RegionId,
         request: RegionRequest,
-    ) -> Result<AffectedRows, BoxedError> {
+    ) -> Result<RegionHandleResult, BoxedError> {
         self.inner
             .handle_request(region_id, request)
             .await
+            .map(RegionHandleResult::new)
             .map_err(BoxedError::new)
     }
 
diff --git a/src/mito2/src/engine/basic_test.rs b/src/mito2/src/engine/basic_test.rs
index ca6f0c173e82..78cdb285450d 100644
--- a/src/mito2/src/engine/basic_test.rs
+++ b/src/mito2/src/engine/basic_test.rs
@@ -111,7 +111,7 @@ async fn test_region_replay() {
 
     let engine = env.reopen_engine(engine, MitoConfig::default()).await;
 
-    let rows = engine
+    let result = engine
         .handle_request(
             region_id,
             RegionRequest::Open(RegionOpenRequest {
@@ -123,7 +123,7 @@ async fn test_region_replay() {
         )
         .await
         .unwrap();
-    assert_eq!(0, rows);
+    assert_eq!(0, result.affected_rows);
 
     let request = ScanRequest::default();
     let stream = engine.handle_query(region_id, request).await.unwrap();
diff --git a/src/mito2/src/engine/compaction_test.rs b/src/mito2/src/engine/compaction_test.rs
index 42aba40cc03a..71b859cced3f 100644
--- a/src/mito2/src/engine/compaction_test.rs
+++ b/src/mito2/src/engine/compaction_test.rs
@@ -42,7 +42,7 @@ async fn put_and_flush(
     };
     put_rows(engine, region_id, rows).await;
 
-    let rows = engine
+    let result = engine
         .handle_request(
             region_id,
             RegionRequest::Flush(RegionFlushRequest {
@@ -51,7 +51,7 @@ async fn put_and_flush(
         )
         .await
         .unwrap();
-    assert_eq!(0, rows);
+    assert_eq!(0, result.affected_rows);
 }
 
 async fn delete_and_flush(
@@ -66,16 +66,16 @@ async fn delete_and_flush(
         rows: build_rows_for_key("a", rows.start, rows.end, 0),
     };
 
-    let rows_affected = engine
+    let result = engine
         .handle_request(
             region_id,
             RegionRequest::Delete(RegionDeleteRequest { rows }),
         )
         .await
         .unwrap();
-    assert_eq!(row_cnt, rows_affected);
+    assert_eq!(row_cnt, result.affected_rows);
 
-    let rows = engine
+    let result = engine
         .handle_request(
             region_id,
             RegionRequest::Flush(RegionFlushRequest {
@@ -84,7 +84,7 @@ async fn delete_and_flush(
         )
         .await
         .unwrap();
-    assert_eq!(0, rows);
+    assert_eq!(0, result.affected_rows);
 }
 
 async fn collect_stream_ts(stream: SendableRecordBatchStream) -> Vec<i64> {
@@ -127,11 +127,11 @@ async fn test_compaction_region() {
     delete_and_flush(&engine, region_id, &column_schemas, 15..30).await;
     put_and_flush(&engine, region_id, &column_schemas, 15..25).await;
 
-    let output = engine
+    let result = engine
         .handle_request(region_id, RegionRequest::Compact(RegionCompactRequest {}))
         .await
         .unwrap();
-    assert_eq!(output, 0);
+    assert_eq!(result.affected_rows, 0);
 
     let scanner = engine.scanner(region_id, ScanRequest::default()).unwrap();
     assert_eq!(
diff --git a/src/mito2/src/read.rs b/src/mito2/src/read.rs
index 9a9820b294e9..ac8e6cd3d82b 100644
--- a/src/mito2/src/read.rs
+++ b/src/mito2/src/read.rs
@@ -191,6 +191,9 @@ impl Batch {
     }
 
     /// Replaces the primary key of the batch.
+    ///
+    /// Notice that this [Batch] also contains a maybe-exist `pk_values`.
+    /// Be sure to update that field as well.
     pub fn set_primary_key(&mut self, primary_key: Vec<u8>) {
         self.primary_key = primary_key;
     }
diff --git a/src/mito2/src/read/compat.rs b/src/mito2/src/read/compat.rs
index 1efa75e45c7d..8c531655e44c 100644
--- a/src/mito2/src/read/compat.rs
+++ b/src/mito2/src/read/compat.rs
@@ -119,6 +119,14 @@ impl CompatPrimaryKey {
         )?;
 
         batch.set_primary_key(buffer);
+
+        // update cache
+        if let Some(pk_values) = &mut batch.pk_values {
+            for value in &self.values {
+                pk_values.push(value.clone());
+            }
+        }
+
         Ok(batch)
     }
 }
diff --git a/src/mito2/src/test_util.rs b/src/mito2/src/test_util.rs
index 73399494900d..9baa73649341 100644
--- a/src/mito2/src/test_util.rs
+++ b/src/mito2/src/test_util.rs
@@ -712,11 +712,11 @@ pub fn delete_rows_schema(request: &RegionCreateRequest) -> Vec<api::v1::ColumnS
 /// Put rows into the engine.
 pub async fn put_rows(engine: &MitoEngine, region_id: RegionId, rows: Rows) {
     let num_rows = rows.rows.len();
-    let rows_inserted = engine
+    let result = engine
         .handle_request(region_id, RegionRequest::Put(RegionPutRequest { rows }))
         .await
         .unwrap();
-    assert_eq!(num_rows, rows_inserted);
+    assert_eq!(num_rows, result.affected_rows);
 }
 
 /// Build rows to put for specific `key`.
@@ -758,26 +758,26 @@ pub fn build_delete_rows_for_key(key: &str, start: usize, end: usize) -> Vec<Row
 /// Delete rows from the engine.
 pub async fn delete_rows(engine: &MitoEngine, region_id: RegionId, rows: Rows) {
     let num_rows = rows.rows.len();
-    let rows_inserted = engine
+    let result = engine
         .handle_request(
             region_id,
             RegionRequest::Delete(RegionDeleteRequest { rows }),
         )
         .await
         .unwrap();
-    assert_eq!(num_rows, rows_inserted);
+    assert_eq!(num_rows, result.affected_rows);
 }
 
 /// Flush a region manually.
 pub async fn flush_region(engine: &MitoEngine, region_id: RegionId, row_group_size: Option<usize>) {
-    let rows = engine
+    let result = engine
         .handle_request(
             region_id,
             RegionRequest::Flush(RegionFlushRequest { row_group_size }),
         )
         .await
         .unwrap();
-    assert_eq!(0, rows);
+    assert_eq!(0, result.affected_rows);
 }
 
 /// Reopen a region.
diff --git a/src/object-store/Cargo.toml b/src/object-store/Cargo.toml
index 4f7169597e5a..1f26bbe5ef3a 100644
--- a/src/object-store/Cargo.toml
+++ b/src/object-store/Cargo.toml
@@ -10,9 +10,6 @@ workspace = true
 [dependencies]
 async-trait = "0.1"
 bytes.workspace = true
-common-error.workspace = true
-common-macro.workspace = true
-common-runtime.workspace = true
 common-telemetry.workspace = true
 futures.workspace = true
 lazy_static.workspace = true
@@ -20,13 +17,20 @@ md5 = "0.7"
 moka = { workspace = true, features = ["future"] }
 opendal = { version = "0.45", features = [
     "layers-tracing",
-] }
+    "rustls",
+    "services-azblob",
+    "services-fs",
+    "services-gcs",
+    "services-http",
+    "services-oss",
+    "services-s3",
+], default-features = false }
 prometheus.workspace = true
-snafu.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
 anyhow = "1.0"
 common-telemetry.workspace = true
 common-test-util.workspace = true
+opendal = { version = "0.45", features = ["services-memory"] }
 tokio.workspace = true
diff --git a/src/operator/Cargo.toml b/src/operator/Cargo.toml
index a09c505fd4b3..50d2103f9d82 100644
--- a/src/operator/Cargo.toml
+++ b/src/operator/Cargo.toml
@@ -13,7 +13,6 @@ workspace = true
 [dependencies]
 api.workspace = true
 async-trait = "0.1"
-auth.workspace = true
 catalog.workspace = true
 chrono.workspace = true
 client.workspace = true
@@ -39,14 +38,12 @@ futures = "0.3"
 futures-util.workspace = true
 lazy_static.workspace = true
 meta-client.workspace = true
-meter-core.workspace = true
 meter-macros.workspace = true
 object-store.workspace = true
 partition.workspace = true
 prometheus.workspace = true
 query.workspace = true
 regex.workspace = true
-serde.workspace = true
 serde_json.workspace = true
 servers.workspace = true
 session.workspace = true
@@ -54,7 +51,6 @@ snafu.workspace = true
 sql.workspace = true
 sqlparser.workspace = true
 store-api.workspace = true
-substrait.workspace = true
 table.workspace = true
 tokio.workspace = true
 tonic.workspace = true
diff --git a/src/operator/src/delete.rs b/src/operator/src/delete.rs
index 2a4737a79ad5..60e44cb7c694 100644
--- a/src/operator/src/delete.rs
+++ b/src/operator/src/delete.rs
@@ -144,7 +144,10 @@ impl Deleter {
             });
         let results = future::try_join_all(tasks).await.context(JoinTaskSnafu)?;
 
-        let affected_rows = results.into_iter().sum::<Result<AffectedRows>>()?;
+        let affected_rows = results
+            .into_iter()
+            .map(|resp| resp.map(|r| r.affected_rows))
+            .sum::<Result<AffectedRows>>()?;
         crate::metrics::DIST_DELETE_ROW_COUNT.inc_by(affected_rows as u64);
         Ok(affected_rows)
     }
diff --git a/src/operator/src/error.rs b/src/operator/src/error.rs
index 55b4c79238cb..731fbe288b3e 100644
--- a/src/operator/src/error.rs
+++ b/src/operator/src/error.rs
@@ -508,23 +508,20 @@ pub enum Error {
         location: Location,
     },
 
-    #[snafu(display(
-        "Do not support creating tables in multiple catalogs: {}",
-        catalog_names
-    ))]
-    CreateTableWithMultiCatalogs {
-        catalog_names: String,
+    #[snafu(display("Do not support {} in multiple catalogs", ddl_name))]
+    DdlWithMultiCatalogs {
+        ddl_name: String,
         location: Location,
     },
 
-    #[snafu(display("Do not support creating tables in multiple schemas: {}", schema_names))]
-    CreateTableWithMultiSchemas {
-        schema_names: String,
+    #[snafu(display("Do not support {} in multiple schemas", ddl_name))]
+    DdlWithMultiSchemas {
+        ddl_name: String,
         location: Location,
     },
 
-    #[snafu(display("Empty creating table expr"))]
-    EmptyCreateTableExpr { location: Location },
+    #[snafu(display("Empty {} expr", name))]
+    EmptyDdlExpr { name: String, location: Location },
 
     #[snafu(display("Failed to create logical tables: {}", reason))]
     CreateLogicalTables { reason: String, location: Location },
@@ -650,9 +647,9 @@ impl ErrorExt for Error {
 
             Error::ColumnDefaultValue { source, .. } => source.status_code(),
 
-            Error::CreateTableWithMultiCatalogs { .. }
-            | Error::CreateTableWithMultiSchemas { .. }
-            | Error::EmptyCreateTableExpr { .. }
+            Error::DdlWithMultiCatalogs { .. }
+            | Error::DdlWithMultiSchemas { .. }
+            | Error::EmptyDdlExpr { .. }
             | Error::InvalidPartitionRule { .. }
             | Error::ParseSqlValue { .. } => StatusCode::InvalidArguments,
 
diff --git a/src/operator/src/insert.rs b/src/operator/src/insert.rs
index 46fe574c3803..5460fe9a59b3 100644
--- a/src/operator/src/insert.rs
+++ b/src/operator/src/insert.rs
@@ -216,7 +216,10 @@ impl Inserter {
             });
         let results = future::try_join_all(tasks).await.context(JoinTaskSnafu)?;
 
-        let affected_rows = results.into_iter().sum::<Result<AffectedRows>>()?;
+        let affected_rows = results
+            .into_iter()
+            .map(|resp| resp.map(|r| r.affected_rows))
+            .sum::<Result<AffectedRows>>()?;
         crate::metrics::DIST_INGEST_ROW_COUNT.inc_by(affected_rows as u64);
         Ok(Output::new(
             OutputData::AffectedRows(affected_rows),
@@ -253,6 +256,7 @@ impl Inserter {
         statement_executor: &StatementExecutor,
     ) -> Result<()> {
         let mut create_tables = vec![];
+        let mut alter_tables = vec![];
         for req in &requests.inserts {
             let catalog = ctx.current_catalog();
             let schema = ctx.current_schema();
@@ -261,16 +265,19 @@ impl Inserter {
                 Some(table) => {
                     // TODO(jeremy): alter in batch? (from `handle_metric_row_inserts`)
                     validate_request_with_table(req, &table)?;
-                    self.alter_table_on_demand(req, table, ctx, statement_executor)
-                        .await?
+                    let alter_expr = self.get_alter_table_expr_on_demand(req, table, ctx)?;
+                    if let Some(alter_expr) = alter_expr {
+                        alter_tables.push(alter_expr);
+                    }
                 }
                 None => {
                     create_tables.push(req);
                 }
             }
         }
-        if !create_tables.is_empty() {
-            if let Some(on_physical_table) = on_physical_table {
+
+        if let Some(on_physical_table) = on_physical_table {
+            if !create_tables.is_empty() {
                 // Creates logical tables in batch.
                 self.create_logical_tables(
                     create_tables,
@@ -279,10 +286,19 @@ impl Inserter {
                     statement_executor,
                 )
                 .await?;
-            } else {
-                for req in create_tables {
-                    self.create_table(req, ctx, statement_executor).await?;
-                }
+            }
+            if !alter_tables.is_empty() {
+                // Alter logical tables in batch.
+                statement_executor
+                    .alter_logical_tables(alter_tables)
+                    .await?;
+            }
+        } else {
+            for req in create_tables {
+                self.create_table(req, ctx, statement_executor).await?;
+            }
+            for alter_expr in alter_tables.into_iter() {
+                statement_executor.alter_table_inner(alter_expr).await?;
             }
         }
 
@@ -361,13 +377,12 @@ impl Inserter {
             .context(CatalogSnafu)
     }
 
-    async fn alter_table_on_demand(
+    fn get_alter_table_expr_on_demand(
         &self,
         req: &RowInsertRequest,
         table: TableRef,
         ctx: &QueryContextRef,
-        statement_executor: &StatementExecutor,
-    ) -> Result<()> {
+    ) -> Result<Option<AlterExpr>> {
         let catalog_name = ctx.current_catalog();
         let schema_name = ctx.current_schema();
         let table_name = table.table_info().name.clone();
@@ -377,39 +392,15 @@ impl Inserter {
         let add_columns = extract_new_columns(&table.schema(), column_exprs)
             .context(FindNewColumnsOnInsertionSnafu)?;
         let Some(add_columns) = add_columns else {
-            return Ok(());
+            return Ok(None);
         };
 
-        info!(
-            "Adding new columns: {:?} to table: {}.{}.{}",
-            add_columns, catalog_name, schema_name, table_name
-        );
-
-        let alter_table_expr = AlterExpr {
+        Ok(Some(AlterExpr {
             catalog_name: catalog_name.to_string(),
             schema_name: schema_name.to_string(),
             table_name: table_name.to_string(),
             kind: Some(Kind::AddColumns(add_columns)),
-        };
-
-        let res = statement_executor.alter_table_inner(alter_table_expr).await;
-
-        match res {
-            Ok(_) => {
-                info!(
-                    "Successfully added new columns to table: {}.{}.{}",
-                    catalog_name, schema_name, table_name
-                );
-                Ok(())
-            }
-            Err(err) => {
-                error!(
-                    "Failed to add new columns to table: {}.{}.{}: {}",
-                    catalog_name, schema_name, table_name, err
-                );
-                Err(err)
-            }
-        }
+        }))
     }
 
     /// Create a table with schema from insert request.
diff --git a/src/operator/src/metrics.rs b/src/operator/src/metrics.rs
index 4069332b2c6a..6774b26decac 100644
--- a/src/operator/src/metrics.rs
+++ b/src/operator/src/metrics.rs
@@ -26,6 +26,11 @@ lazy_static! {
         "table operator create table"
     )
     .unwrap();
+    pub static ref DIST_ALTER_TABLES: Histogram = register_histogram!(
+        "greptime_table_operator_alter_tables",
+        "table operator alter table"
+    )
+    .unwrap();
     pub static ref DIST_INGEST_ROW_COUNT: IntCounter = register_int_counter!(
         "greptime_table_operator_ingest_rows",
         "table operator ingest rows"
diff --git a/src/operator/src/request.rs b/src/operator/src/request.rs
index a300da034c4d..3aba4dfd703f 100644
--- a/src/operator/src/request.rs
+++ b/src/operator/src/request.rs
@@ -181,7 +181,10 @@ impl Requester {
         });
         let results = future::try_join_all(tasks).await.context(JoinTaskSnafu)?;
 
-        let affected_rows = results.into_iter().sum::<Result<AffectedRows>>()?;
+        let affected_rows = results
+            .into_iter()
+            .map(|resp| resp.map(|r| r.affected_rows))
+            .sum::<Result<AffectedRows>>()?;
 
         Ok(affected_rows)
     }
diff --git a/src/operator/src/statement.rs b/src/operator/src/statement.rs
index 974f02c52acf..1a30c596ce8b 100644
--- a/src/operator/src/statement.rs
+++ b/src/operator/src/statement.rs
@@ -168,12 +168,13 @@ impl StatementExecutor {
                 let table_name = TableName::new(catalog, schema, table);
                 self.drop_table(table_name, stmt.drop_if_exists()).await
             }
-            Statement::DropDatabase(_stmt) => {
-                // TODO(weny): implement the drop database procedure
-                error::NotSupportedSnafu {
-                    feat: "Drop Database",
-                }
-                .fail()
+            Statement::DropDatabase(stmt) => {
+                self.drop_database(
+                    query_ctx.current_catalog().to_string(),
+                    format_raw_object_name(stmt.name()),
+                    stmt.drop_if_exists(),
+                )
+                .await
             }
             Statement::TruncateTable(stmt) => {
                 let (catalog, schema, table) =
@@ -359,6 +360,8 @@ fn to_copy_table_request(stmt: CopyTable, query_ctx: QueryContextRef) -> Result<
             .map_err(BoxedError::new)
             .context(ExternalSnafu)?;
 
+    let timestamp_range = timestamp_range_from_option_map(&with, &query_ctx)?;
+
     let pattern = with
         .get(common_datasource::file_format::FILE_PATTERN)
         .cloned();
@@ -372,8 +375,7 @@ fn to_copy_table_request(stmt: CopyTable, query_ctx: QueryContextRef) -> Result<
         connection: connection.map,
         pattern,
         direction,
-        // we copy the whole table by default.
-        timestamp_range: None,
+        timestamp_range,
     })
 }
 
@@ -386,16 +388,7 @@ fn to_copy_database_request(
     let (catalog_name, database_name) = idents_to_full_database_name(&arg.database_name, query_ctx)
         .map_err(BoxedError::new)
         .context(ExternalSnafu)?;
-
-    let start_timestamp = extract_timestamp(&arg.with, COPY_DATABASE_TIME_START_KEY, query_ctx)?;
-    let end_timestamp = extract_timestamp(&arg.with, COPY_DATABASE_TIME_END_KEY, query_ctx)?;
-
-    let time_range = match (start_timestamp, end_timestamp) {
-        (Some(start), Some(end)) => TimestampRange::new(start, end),
-        (Some(start), None) => Some(TimestampRange::from_start(start)),
-        (None, Some(end)) => Some(TimestampRange::until_end(end, false)), // exclusive end
-        (None, None) => None,
-    };
+    let time_range = timestamp_range_from_option_map(&arg.with, query_ctx)?;
 
     Ok(CopyDatabaseRequest {
         catalog_name,
@@ -407,6 +400,24 @@ fn to_copy_database_request(
     })
 }
 
+/// Extracts timestamp range from OptionMap with keys `start_time` and `end_time`.
+/// The timestamp ranges should be a valid timestamp string as defined in [Timestamp::from_str].
+/// The timezone used for conversion will respect that inside `query_ctx`.
+fn timestamp_range_from_option_map(
+    options: &OptionMap,
+    query_ctx: &QueryContextRef,
+) -> Result<Option<TimestampRange>> {
+    let start_timestamp = extract_timestamp(options, COPY_DATABASE_TIME_START_KEY, query_ctx)?;
+    let end_timestamp = extract_timestamp(options, COPY_DATABASE_TIME_END_KEY, query_ctx)?;
+    let time_range = match (start_timestamp, end_timestamp) {
+        (Some(start), Some(end)) => TimestampRange::new(start, end),
+        (Some(start), None) => Some(TimestampRange::from_start(start)),
+        (None, Some(end)) => Some(TimestampRange::until_end(end, false)), // exclusive end
+        (None, None) => None,
+    };
+    Ok(time_range)
+}
+
 /// Extracts timestamp from a [HashMap<String, String>] with given key.
 fn extract_timestamp(
     map: &OptionMap,
@@ -439,3 +450,44 @@ fn idents_to_full_database_name(
         .fail(),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::collections::HashMap;
+    use std::sync::Arc;
+
+    use common_time::{Timestamp, Timezone};
+    use session::context::QueryContextBuilder;
+    use sql::statements::OptionMap;
+
+    use crate::statement::copy_database::{
+        COPY_DATABASE_TIME_END_KEY, COPY_DATABASE_TIME_START_KEY,
+    };
+    use crate::statement::timestamp_range_from_option_map;
+
+    #[test]
+    fn test_timestamp_range_from_option_map() {
+        let query_ctx = QueryContextBuilder::default()
+            .timezone(Arc::new(Timezone::from_tz_string("Asia/Shanghai").unwrap()))
+            .build();
+        let map = OptionMap::from(
+            [
+                (
+                    COPY_DATABASE_TIME_START_KEY.to_string(),
+                    "2022-04-11 08:00:00".to_string(),
+                ),
+                (
+                    COPY_DATABASE_TIME_END_KEY.to_string(),
+                    "2022-04-11 16:00:00".to_string(),
+                ),
+            ]
+            .into_iter()
+            .collect::<HashMap<_, _>>(),
+        );
+        let range = timestamp_range_from_option_map(&map, &query_ctx)
+            .unwrap()
+            .unwrap();
+        assert_eq!(Timestamp::new_second(1649635200), range.start().unwrap());
+        assert_eq!(Timestamp::new_second(1649664000), range.end().unwrap());
+    }
+}
diff --git a/src/operator/src/statement/ddl.rs b/src/operator/src/statement/ddl.rs
index 6500b99c2987..49f1ef689528 100644
--- a/src/operator/src/statement/ddl.rs
+++ b/src/operator/src/statement/ddl.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 use std::sync::Arc;
 
 use api::helper::ColumnDataTypeWrapper;
@@ -48,6 +48,7 @@ use sql::statements::alter::AlterTable;
 use sql::statements::create::{CreateExternalTable, CreateTable, CreateTableLike, Partitions};
 use sql::statements::sql_value_to_value;
 use sqlparser::ast::{Expr, Ident, Value as ParserValue};
+use store_api::metric_engine_consts::{LOGICAL_TABLE_METADATA_KEY, METRIC_ENGINE_NAME};
 use table::dist_table::DistTable;
 use table::metadata::{self, RawTableInfo, RawTableMeta, TableId, TableInfo, TableType};
 use table::requests::{AlterKind, AlterTableRequest, TableOptions};
@@ -56,8 +57,8 @@ use table::TableRef;
 use super::StatementExecutor;
 use crate::error::{
     self, AlterExprToRequestSnafu, CatalogSnafu, ColumnDataTypeSnafu, ColumnNotFoundSnafu,
-    CreateLogicalTablesSnafu, CreateTableInfoSnafu, CreateTableWithMultiCatalogsSnafu,
-    CreateTableWithMultiSchemasSnafu, DeserializePartitionSnafu, EmptyCreateTableExprSnafu,
+    CreateLogicalTablesSnafu, CreateTableInfoSnafu, DdlWithMultiCatalogsSnafu,
+    DdlWithMultiSchemasSnafu, DeserializePartitionSnafu, EmptyDdlExprSnafu,
     InvalidPartitionColumnsSnafu, InvalidPartitionRuleSnafu, InvalidTableNameSnafu,
     ParseSqlValueSnafu, Result, SchemaNotFoundSnafu, TableAlreadyExistsSnafu,
     TableMetadataManagerSnafu, TableNotFoundSnafu, UnrecognizedTableOptionSnafu,
@@ -138,6 +139,22 @@ impl StatementExecutor {
         partitions: Option<Partitions>,
         query_ctx: &QueryContextRef,
     ) -> Result<TableRef> {
+        // Check if is creating logical table
+        if create_table.engine == METRIC_ENGINE_NAME
+            && create_table
+                .table_options
+                .contains_key(LOGICAL_TABLE_METADATA_KEY)
+        {
+            return self
+                .create_logical_tables(&[create_table.clone()])
+                .await?
+                .into_iter()
+                .next()
+                .context(error::UnexpectedSnafu {
+                    violated: "expected to create a logical table",
+                });
+        }
+
         let _timer = crate::metrics::DIST_CREATE_TABLE.start_timer();
         let schema = self
             .table_metadata_manager
@@ -225,20 +242,18 @@ impl StatementExecutor {
         create_table_exprs: &[CreateTableExpr],
     ) -> Result<Vec<TableRef>> {
         let _timer = crate::metrics::DIST_CREATE_TABLES.start_timer();
-        ensure!(!create_table_exprs.is_empty(), EmptyCreateTableExprSnafu);
+        ensure!(
+            !create_table_exprs.is_empty(),
+            EmptyDdlExprSnafu {
+                name: "create table"
+            }
+        );
         ensure!(
             create_table_exprs
                 .windows(2)
                 .all(|expr| expr[0].catalog_name == expr[1].catalog_name),
-            CreateTableWithMultiCatalogsSnafu {
-                catalog_names: create_table_exprs
-                    .iter()
-                    .map(|x| x.catalog_name.as_str())
-                    .collect::<HashSet<_>>()
-                    .into_iter()
-                    .collect::<Vec<_>>()
-                    .join(",")
-                    .to_string()
+            DdlWithMultiCatalogsSnafu {
+                ddl_name: "create tables"
             }
         );
         let catalog_name = create_table_exprs[0].catalog_name.to_string();
@@ -247,15 +262,8 @@ impl StatementExecutor {
             create_table_exprs
                 .windows(2)
                 .all(|expr| expr[0].schema_name == expr[1].schema_name),
-            CreateTableWithMultiSchemasSnafu {
-                schema_names: create_table_exprs
-                    .iter()
-                    .map(|x| x.schema_name.as_str())
-                    .collect::<HashSet<_>>()
-                    .into_iter()
-                    .collect::<Vec<_>>()
-                    .join(",")
-                    .to_string()
+            DdlWithMultiSchemasSnafu {
+                ddl_name: "create tables"
             }
         );
         let schema_name = create_table_exprs[0].schema_name.to_string();
@@ -312,6 +320,38 @@ impl StatementExecutor {
             .collect())
     }
 
+    #[tracing::instrument(skip_all)]
+    pub async fn alter_logical_tables(&self, alter_table_exprs: Vec<AlterExpr>) -> Result<Output> {
+        let _timer = crate::metrics::DIST_ALTER_TABLES.start_timer();
+        ensure!(
+            !alter_table_exprs.is_empty(),
+            EmptyDdlExprSnafu {
+                name: "alter table"
+            }
+        );
+        ensure!(
+            alter_table_exprs
+                .windows(2)
+                .all(|expr| expr[0].catalog_name == expr[1].catalog_name),
+            DdlWithMultiCatalogsSnafu {
+                ddl_name: "alter tables",
+            }
+        );
+        ensure!(
+            alter_table_exprs
+                .windows(2)
+                .all(|expr| expr[0].schema_name == expr[1].schema_name),
+            DdlWithMultiSchemasSnafu {
+                ddl_name: "alter tables",
+            }
+        );
+
+        self.alter_logical_tables_procedure(alter_table_exprs)
+            .await?;
+
+        Ok(Output::new_with_affected_rows(0))
+    }
+
     #[tracing::instrument(skip_all)]
     pub async fn drop_table(&self, table_name: TableName, drop_if_exists: bool) -> Result<Output> {
         if let Some(table) = self
@@ -352,6 +392,34 @@ impl StatementExecutor {
         }
     }
 
+    #[tracing::instrument(skip_all)]
+    pub async fn drop_database(
+        &self,
+        catalog: String,
+        schema: String,
+        drop_if_exists: bool,
+    ) -> Result<Output> {
+        if self
+            .catalog_manager
+            .schema_exists(&catalog, &schema)
+            .await
+            .context(CatalogSnafu)?
+        {
+            self.drop_database_procedure(catalog, schema, drop_if_exists)
+                .await?;
+
+            Ok(Output::new_with_affected_rows(0))
+        } else if drop_if_exists {
+            // DROP TABLE IF EXISTS meets table not found - ignored
+            Ok(Output::new_with_affected_rows(0))
+        } else {
+            Err(SchemaNotFoundSnafu {
+                schema_info: schema,
+            }
+            .into_error(snafu::NoneError))
+        }
+    }
+
     #[tracing::instrument(skip_all)]
     pub async fn truncate_table(&self, table_name: TableName) -> Result<Output> {
         let table = self
@@ -398,7 +466,7 @@ impl StatementExecutor {
 
         let _ = table_info
             .meta
-            .builder_with_alter_kind(table_name, &request.alter_kind)
+            .builder_with_alter_kind(table_name, &request.alter_kind, false)
             .context(error::TableSnafu)?
             .build()
             .context(error::BuildTableMetaSnafu { table_name })?;
@@ -419,26 +487,26 @@ impl StatementExecutor {
     #[tracing::instrument(skip_all)]
     pub async fn alter_table_inner(&self, expr: AlterExpr) -> Result<Output> {
         let catalog_name = if expr.catalog_name.is_empty() {
-            DEFAULT_CATALOG_NAME
+            DEFAULT_CATALOG_NAME.to_string()
         } else {
-            expr.catalog_name.as_str()
+            expr.catalog_name.clone()
         };
 
         let schema_name = if expr.schema_name.is_empty() {
-            DEFAULT_SCHEMA_NAME
+            DEFAULT_SCHEMA_NAME.to_string()
         } else {
-            expr.schema_name.as_str()
+            expr.schema_name.clone()
         };
 
-        let table_name = expr.table_name.as_str();
+        let table_name = expr.table_name.clone();
 
         let table = self
             .catalog_manager
-            .table(catalog_name, schema_name, table_name)
+            .table(&catalog_name, &schema_name, &table_name)
             .await
             .context(CatalogSnafu)?
             .with_context(|| TableNotFoundSnafu {
-                table_name: format_full_table_name(catalog_name, schema_name, table_name),
+                table_name: format_full_table_name(&catalog_name, &schema_name, &table_name),
             })?;
 
         let table_id = table.table_info().ident.table_id;
@@ -450,8 +518,54 @@ impl StatementExecutor {
             expr
         );
 
-        let req = SubmitDdlTaskRequest {
-            task: DdlTask::new_alter_table(expr.clone()),
+        let physical_table_id = self
+            .table_metadata_manager
+            .table_route_manager()
+            .get_physical_table_id(table_id)
+            .await
+            .context(TableMetadataManagerSnafu)?;
+
+        let (req, invalidate_keys) = if physical_table_id == table_id {
+            // This is physical table
+            let req = SubmitDdlTaskRequest {
+                task: DdlTask::new_alter_table(expr),
+            };
+
+            let invalidate_keys = vec![
+                CacheIdent::TableId(table_id),
+                CacheIdent::TableName(TableName::new(catalog_name, schema_name, table_name)),
+            ];
+
+            (req, invalidate_keys)
+        } else {
+            // This is logical table
+            let req = SubmitDdlTaskRequest {
+                task: DdlTask::new_alter_logical_tables(vec![expr]),
+            };
+
+            let mut invalidate_keys = vec![
+                CacheIdent::TableId(physical_table_id),
+                CacheIdent::TableId(table_id),
+                CacheIdent::TableName(TableName::new(catalog_name, schema_name, table_name)),
+            ];
+
+            let physical_table = self
+                .table_metadata_manager
+                .table_info_manager()
+                .get(physical_table_id)
+                .await
+                .context(TableMetadataManagerSnafu)?
+                .map(|x| x.into_inner());
+            if let Some(physical_table) = physical_table {
+                let physical_table_name = TableName::new(
+                    physical_table.table_info.catalog_name,
+                    physical_table.table_info.schema_name,
+                    physical_table.table_info.name,
+                );
+                invalidate_keys.push(CacheIdent::TableName(physical_table_name));
+            }
+
+            (req, invalidate_keys)
         };
 
         self.procedure_executor
@@ -461,13 +575,7 @@ impl StatementExecutor {
 
         // Invalidates local cache ASAP.
         self.cache_invalidator
-            .invalidate(
-                &Context::default(),
-                vec![
-                    CacheIdent::TableId(table_id),
-                    CacheIdent::TableName(TableName::new(catalog_name, schema_name, table_name)),
-                ],
-            )
+            .invalidate(&Context::default(), invalidate_keys)
             .await
             .context(error::InvalidateTableCacheSnafu)?;
 
@@ -506,6 +614,20 @@ impl StatementExecutor {
             .context(error::ExecuteDdlSnafu)
     }
 
+    async fn alter_logical_tables_procedure(
+        &self,
+        tables_data: Vec<AlterExpr>,
+    ) -> Result<SubmitDdlTaskResponse> {
+        let request = SubmitDdlTaskRequest {
+            task: DdlTask::new_alter_logical_tables(tables_data),
+        };
+
+        self.procedure_executor
+            .submit_ddl_task(&ExecutorContext::default(), request)
+            .await
+            .context(error::ExecuteDdlSnafu)
+    }
+
     async fn drop_table_procedure(
         &self,
         table_name: &TableName,
@@ -528,6 +650,22 @@ impl StatementExecutor {
             .context(error::ExecuteDdlSnafu)
     }
 
+    async fn drop_database_procedure(
+        &self,
+        catalog: String,
+        schema: String,
+        drop_if_exists: bool,
+    ) -> Result<SubmitDdlTaskResponse> {
+        let request = SubmitDdlTaskRequest {
+            task: DdlTask::new_drop_database(catalog, schema, drop_if_exists),
+        };
+
+        self.procedure_executor
+            .submit_ddl_task(&ExecutorContext::default(), request)
+            .await
+            .context(error::ExecuteDdlSnafu)
+    }
+
     async fn truncate_table_procedure(
         &self,
         table_name: &TableName,
diff --git a/src/partition/Cargo.toml b/src/partition/Cargo.toml
index dd735f591b2f..601f3143c7ff 100644
--- a/src/partition/Cargo.toml
+++ b/src/partition/Cargo.toml
@@ -10,21 +10,14 @@ workspace = true
 [dependencies]
 api.workspace = true
 async-trait = "0.1"
-common-catalog.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
 common-meta.workspace = true
 common-query.workspace = true
-common-telemetry.workspace = true
-datafusion.workspace = true
 datafusion-common.workspace = true
 datafusion-expr.workspace = true
 datatypes.workspace = true
 itertools.workspace = true
-lazy_static.workspace = true
-meta-client.workspace = true
-moka = { workspace = true, features = ["future"] }
-prometheus.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 snafu.workspace = true
diff --git a/src/partition/src/lib.rs b/src/partition/src/lib.rs
index 1d64951e10f4..647e7f63b854 100644
--- a/src/partition/src/lib.rs
+++ b/src/partition/src/lib.rs
@@ -18,7 +18,6 @@ pub mod columns;
 pub mod error;
 pub mod expr;
 pub mod manager;
-pub mod metrics;
 pub mod multi_dim;
 pub mod partition;
 pub mod range;
diff --git a/src/promql/src/extension_plan/series_divide.rs b/src/promql/src/extension_plan/series_divide.rs
index be41a2eed872..4abf8d87885a 100644
--- a/src/promql/src/extension_plan/series_divide.rs
+++ b/src/promql/src/extension_plan/series_divide.rs
@@ -255,23 +255,23 @@ impl Stream for SeriesDivideStream {
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         loop {
-            // It has to be cloned here, otherwise the later ready! will mess things up
-            if let Some(batch) = self.buffer.clone() {
-                let same_length = self.find_first_diff_row(&batch) + 1;
+            if let Some(batch) = self.buffer.as_ref() {
+                let same_length = self.find_first_diff_row(batch) + 1;
                 if same_length >= batch.num_rows() {
-                    let next_batch = match ready!(self.as_mut().fetch_next_batch(cx)) {
-                        Some(Ok(batch)) => batch,
-                        None => {
-                            self.buffer = None;
-                            self.num_series += 1;
-                            return Poll::Ready(Some(Ok(batch)));
-                        }
-                        error => return Poll::Ready(error),
-                    };
-                    let new_batch =
-                        compute::concat_batches(&batch.schema(), &[batch.clone(), next_batch])?;
-                    self.buffer = Some(new_batch);
-                    continue;
+                    let next_batch = ready!(self.as_mut().fetch_next_batch(cx)).transpose()?;
+                    // SAFETY: if-let guards the buffer is not None;
+                    //   and we cannot change the buffer at this point.
+                    let batch = self.buffer.take().expect("this batch must exist");
+                    if let Some(next_batch) = next_batch {
+                        self.buffer = Some(compute::concat_batches(
+                            &batch.schema(),
+                            &[batch, next_batch],
+                        )?);
+                        continue;
+                    } else {
+                        self.num_series += 1;
+                        return Poll::Ready(Some(Ok(batch)));
+                    }
                 } else {
                     let result_batch = batch.slice(0, same_length);
                     let remaining_batch = batch.slice(same_length, batch.num_rows() - same_length);
diff --git a/src/promql/src/functions/extrapolate_rate.rs b/src/promql/src/functions/extrapolate_rate.rs
index ea0c3f2a9563..7cba367145f3 100644
--- a/src/promql/src/functions/extrapolate_rate.rs
+++ b/src/promql/src/functions/extrapolate_rate.rs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // This file also contains some code from prometheus project.
+
 // Copyright 2015 The Prometheus Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -48,7 +49,7 @@ pub type Rate = ExtrapolatedRate<true, true>;
 pub type Increase = ExtrapolatedRate<true, false>;
 
 /// Part of the `extrapolatedRate` in Promql,
-/// from <https://github.com/prometheus/prometheus/blob/6bdecf377cea8e856509914f35234e948c4fcb80/promql/functions.go#L66>
+/// from <https://github.com/prometheus/prometheus/blob/v0.40.1/promql/functions.go#L66>
 #[derive(Debug)]
 pub struct ExtrapolatedRate<const IS_COUNTER: bool, const IS_RATE: bool> {
     /// Range duration in millisecond
diff --git a/src/query/Cargo.toml b/src/query/Cargo.toml
index 7b252d69107e..eb680b1a9bd8 100644
--- a/src/query/Cargo.toml
+++ b/src/query/Cargo.toml
@@ -18,7 +18,6 @@ async-stream.workspace = true
 async-trait = "0.1"
 catalog.workspace = true
 chrono.workspace = true
-client.workspace = true
 common-base.workspace = true
 common-catalog.workspace = true
 common-datasource.workspace = true
@@ -47,13 +46,10 @@ meter-core.workspace = true
 meter-macros.workspace = true
 object-store.workspace = true
 once_cell.workspace = true
-partition.workspace = true
 prometheus.workspace = true
 promql.workspace = true
 promql-parser = "0.1.1"
 regex.workspace = true
-serde.workspace = true
-serde_json.workspace = true
 session.workspace = true
 snafu.workspace = true
 sql.workspace = true
diff --git a/src/script/Cargo.toml b/src/script/Cargo.toml
index 81e22374861a..50dca7ccbb76 100644
--- a/src/script/Cargo.toml
+++ b/src/script/Cargo.toml
@@ -17,7 +17,6 @@ python = [
     "dep:rustpython-compiler",
     "dep:rustpython-compiler-core",
     "dep:rustpython-codegen",
-    "dep:rustpython-ast",
     "dep:rustpython-pylib",
     "dep:rustpython-stdlib",
     "dep:paste",
@@ -49,7 +48,6 @@ datafusion-expr = { workspace = true, optional = true }
 datafusion-physical-expr = { workspace = true, optional = true }
 datatypes.workspace = true
 futures.workspace = true
-futures-util.workspace = true
 lazy_static.workspace = true
 once_cell.workspace = true
 paste = { workspace = true, optional = true }
@@ -57,7 +55,6 @@ prometheus.workspace = true
 query.workspace = true
 # TODO(discord9): This is a forked and tweaked version of RustPython, please update it to newest original RustPython After RustPython support GC
 pyo3 = { version = "0.19", optional = true, features = ["abi3", "abi3-py37"] }
-rustpython-ast = { git = "https://github.com/discord9/RustPython", optional = true, rev = "9ed5137412" }
 rustpython-codegen = { git = "https://github.com/discord9/RustPython", optional = true, rev = "9ed5137412" }
 rustpython-compiler = { git = "https://github.com/discord9/RustPython", optional = true, rev = "9ed5137412" }
 rustpython-compiler-core = { git = "https://github.com/discord9/RustPython", optional = true, rev = "9ed5137412" }
@@ -74,7 +71,6 @@ servers.workspace = true
 session.workspace = true
 snafu.workspace = true
 sql.workspace = true
-store-api.workspace = true
 table.workspace = true
 tokio.workspace = true
 
diff --git a/src/servers/Cargo.toml b/src/servers/Cargo.toml
index 221ac3aa82ae..4a54a49b272b 100644
--- a/src/servers/Cargo.toml
+++ b/src/servers/Cargo.toml
@@ -32,7 +32,6 @@ common-base.workspace = true
 common-catalog.workspace = true
 common-error.workspace = true
 common-grpc.workspace = true
-common-grpc-expr.workspace = true
 common-macro.workspace = true
 common-mem-prof = { workspace = true, optional = true }
 common-meta.workspace = true
@@ -44,14 +43,11 @@ common-telemetry.workspace = true
 common-time.workspace = true
 datafusion.workspace = true
 datafusion-common.workspace = true
-datafusion-expr.workspace = true
 datatypes.workspace = true
 derive_builder.workspace = true
-digest = "0.10"
 futures = "0.3"
 hashbrown = "0.14"
 headers = "0.3"
-hex = { version = "0.4" }
 hostname = "0.3.1"
 http-body = "0.4"
 humantime-serde.workspace = true
@@ -91,7 +87,6 @@ secrecy = { version = "0.8", features = ["serde", "alloc"] }
 serde.workspace = true
 serde_json.workspace = true
 session.workspace = true
-sha1 = "0.10"
 snafu.workspace = true
 snap = "1"
 sql.workspace = true
diff --git a/src/servers/src/export_metrics.rs b/src/servers/src/export_metrics.rs
index 014f58e52678..3ec089db411b 100644
--- a/src/servers/src/export_metrics.rs
+++ b/src/servers/src/export_metrics.rs
@@ -29,7 +29,7 @@ use snafu::{ensure, ResultExt};
 use tokio::time::{self, Interval};
 
 use crate::error::{InvalidExportMetricsConfigSnafu, Result, SendPromRemoteRequestSnafu};
-use crate::prom_store::snappy_compress;
+use crate::prom_store::{snappy_compress, to_grpc_row_insert_requests};
 use crate::query_handler::PromStoreProtocolHandlerRef;
 
 /// Use to export the metrics generated by greptimedb, encoded to Prometheus [RemoteWrite format](https://prometheus.io/docs/concepts/remote_write_spec/),
@@ -256,8 +256,19 @@ pub async fn write_system_metric_by_handler(
             filter.as_ref(),
             Timestamp::current_millis().value(),
         );
-        if let Err(e) = handler.write(request, ctx.clone(), false).await {
+
+        let (requests, samples) = match to_grpc_row_insert_requests(&request) {
+            Ok((requests, samples)) => (requests, samples),
+            Err(e) => {
+                error!(e; "Failed to convert gathered metrics to RowInsertRequests");
+                continue;
+            }
+        };
+
+        if let Err(e) = handler.write(requests, ctx.clone(), false).await {
             error!("report export metrics by handler failed, error {}", e);
+        } else {
+            crate::metrics::PROM_STORE_REMOTE_WRITE_SAMPLES.inc_by(samples as u64);
         }
     }
 }
diff --git a/src/servers/src/http/prom_store.rs b/src/servers/src/http/prom_store.rs
index 514bf6d22c92..bf3f248eb005 100644
--- a/src/servers/src/http/prom_store.rs
+++ b/src/servers/src/http/prom_store.rs
@@ -14,7 +14,7 @@
 
 use std::sync::Arc;
 
-use api::prom_store::remote::{ReadRequest, WriteRequest};
+use api::prom_store::remote::ReadRequest;
 use api::v1::RowInsertRequests;
 use axum::extract::{Query, RawBody, State};
 use axum::http::{header, HeaderValue, StatusCode};
@@ -75,13 +75,14 @@ pub async fn route_write_without_metric_engine(
         .with_label_values(&[db.as_str()])
         .start_timer();
 
-    let request = decode_remote_write_request(body).await?;
+    let (request, samples) = decode_remote_write_request(body).await?;
     // reject if physical table is specified when metric engine is disabled
     if params.physical_table.is_some() {
         return UnexpectedPhysicalTableSnafu {}.fail();
     }
 
     let output = handler.write(request, query_ctx, false).await?;
+    crate::metrics::PROM_STORE_REMOTE_WRITE_SAMPLES.inc_by(samples as u64);
     Ok((
         StatusCode::NO_CONTENT,
         write_cost_header_map(output.meta.cost),
@@ -104,7 +105,7 @@ pub async fn remote_write(
         .with_label_values(&[db.as_str()])
         .start_timer();
 
-    let request = decode_remote_write_request_to_row_inserts(body).await?;
+    let (request, samples) = decode_remote_write_request_to_row_inserts(body).await?;
 
     if let Some(physical_table) = params.physical_table {
         let mut new_query_ctx = query_ctx.as_ref().clone();
@@ -112,7 +113,8 @@ pub async fn remote_write(
         query_ctx = Arc::new(new_query_ctx);
     }
 
-    let output = handler.write_fast(request, query_ctx, true).await?;
+    let output = handler.write(request, query_ctx, true).await?;
+    crate::metrics::PROM_STORE_REMOTE_WRITE_SAMPLES.inc_by(samples as u64);
     Ok((
         StatusCode::NO_CONTENT,
         write_cost_header_map(output.meta.cost),
@@ -159,7 +161,9 @@ pub async fn remote_read(
     handler.read(request, query_ctx).await
 }
 
-async fn decode_remote_write_request_to_row_inserts(body: Body) -> Result<RowInsertRequests> {
+async fn decode_remote_write_request_to_row_inserts(
+    body: Body,
+) -> Result<(RowInsertRequests, usize)> {
     let _timer = crate::metrics::METRIC_HTTP_PROM_STORE_DECODE_ELAPSED.start_timer();
     let body = hyper::body::to_bytes(body)
         .await
@@ -171,24 +175,22 @@ async fn decode_remote_write_request_to_row_inserts(body: Body) -> Result<RowIns
     request
         .merge(buf)
         .context(error::DecodePromRemoteRequestSnafu)?;
-    let (requests, samples) = request.as_row_insert_requests();
-    crate::metrics::METRIC_HTTP_PROM_STORE_DECODE_NUM_SERIES.observe(samples as f64);
-    Ok(requests)
+    Ok(request.as_row_insert_requests())
 }
 
-async fn decode_remote_write_request(body: Body) -> Result<WriteRequest> {
+async fn decode_remote_write_request(body: Body) -> Result<(RowInsertRequests, usize)> {
     let _timer = crate::metrics::METRIC_HTTP_PROM_STORE_DECODE_ELAPSED.start_timer();
     let body = hyper::body::to_bytes(body)
         .await
         .context(error::HyperSnafu)?;
 
-    let buf = snappy_decompress(&body[..])?;
-
-    let request = WriteRequest::decode(&buf[..]).context(error::DecodePromRemoteRequestSnafu)?;
-    crate::metrics::METRIC_HTTP_PROM_STORE_DECODE_NUM_SERIES
-        .observe(request.timeseries.len() as f64);
+    let buf = Bytes::from(snappy_decompress(&body[..])?);
 
-    Ok(request)
+    let mut request = PromWriteRequest::default();
+    request
+        .merge(buf)
+        .context(error::DecodePromRemoteRequestSnafu)?;
+    Ok(request.as_row_insert_requests())
 }
 
 async fn decode_remote_read_request(body: Body) -> Result<ReadRequest> {
diff --git a/src/servers/src/http/table_result.rs b/src/servers/src/http/table_result.rs
index e601213c08bb..a7fac46e89a7 100644
--- a/src/servers/src/http/table_result.rs
+++ b/src/servers/src/http/table_result.rs
@@ -135,7 +135,7 @@ impl IntoResponse for TableResponse {
         let mut resp = (
             [(
                 header::CONTENT_TYPE,
-                HeaderValue::from_static(mime::PLAIN.as_ref()),
+                HeaderValue::from_static(mime::TEXT_PLAIN_UTF_8.as_ref()),
             )],
             self.to_string(),
         )
diff --git a/src/servers/src/metrics.rs b/src/servers/src/metrics.rs
index 41d56702bc96..5fc63ba7d838 100644
--- a/src/servers/src/metrics.rs
+++ b/src/servers/src/metrics.rs
@@ -103,9 +103,10 @@ lazy_static! {
     /// Duration to convert prometheus write request to gRPC request.
     pub static ref METRIC_HTTP_PROM_STORE_CONVERT_ELAPSED: Histogram = METRIC_HTTP_PROM_STORE_CODEC_ELAPSED
         .with_label_values(&["convert"]);
-    pub static ref METRIC_HTTP_PROM_STORE_DECODE_NUM_SERIES: Histogram = register_histogram!(
-        "greptime_servers_http_prometheus_decode_num_series",
-        "servers http prometheus decode num series",
+        /// The samples count of Prometheus remote write.
+    pub static ref PROM_STORE_REMOTE_WRITE_SAMPLES: IntCounter = register_int_counter!(
+        "greptime_servers_prometheus_remote_write_samples",
+        "frontend prometheus remote write samples"
     )
     .unwrap();
     /// Http prometheus read duration per database.
diff --git a/src/servers/src/proto.rs b/src/servers/src/proto.rs
index 9ea907306c71..51b8fb05b63c 100644
--- a/src/servers/src/proto.rs
+++ b/src/servers/src/proto.rs
@@ -40,7 +40,10 @@ pub struct PromLabel {
 }
 
 impl Clear for PromLabel {
-    fn clear(&mut self) {}
+    fn clear(&mut self) {
+        self.name.clear();
+        self.value.clear();
+    }
 }
 
 impl PromLabel {
diff --git a/src/servers/src/query_handler.rs b/src/servers/src/query_handler.rs
index f68dc1d02e89..0430005aed7d 100644
--- a/src/servers/src/query_handler.rs
+++ b/src/servers/src/query_handler.rs
@@ -28,7 +28,7 @@ pub mod sql;
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use api::prom_store::remote::{ReadRequest, WriteRequest};
+use api::prom_store::remote::ReadRequest;
 use api::v1::RowInsertRequests;
 use async_trait::async_trait;
 use common_query::Output;
@@ -90,14 +90,6 @@ pub struct PromStoreResponse {
 pub trait PromStoreProtocolHandler {
     /// Handling prometheus remote write requests
     async fn write(
-        &self,
-        request: WriteRequest,
-        ctx: QueryContextRef,
-        with_metric_engine: bool,
-    ) -> Result<Output>;
-
-    /// Handling prometheus remote write requests
-    async fn write_fast(
         &self,
         request: RowInsertRequests,
         ctx: QueryContextRef,
diff --git a/src/servers/src/repeated_field.rs b/src/servers/src/repeated_field.rs
index 0e3baf16a576..8346427a3368 100644
--- a/src/servers/src/repeated_field.rs
+++ b/src/servers/src/repeated_field.rs
@@ -1,17 +1,3 @@
-// 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.
-
 // Copyright (c) 2019 Stepan Koltsov
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -32,8 +18,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 // OR OTHER DEALINGS IN THE SOFTWARE.
 
-/// ! The [Clear] trait and [RepeatedField] are taken from [rust-protobuf](https://github.com/stepancheg/rust-protobuf/tree/master/protobuf-examples/vs-prost)
-/// to leverage the pooling mechanism to avoid frequent heap allocation/deallocation when decoding deeply nested structs.
+// The [Clear] trait and [RepeatedField] are taken from [rust-protobuf](https://github.com/stepancheg/rust-protobuf/tree/master/protobuf-examples/vs-prost)
+// to leverage the pooling mechanism to avoid frequent heap allocation/deallocation when decoding deeply nested structs.
+
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::default::Default;
diff --git a/src/servers/tests/http/http_handler_test.rs b/src/servers/tests/http/http_handler_test.rs
index afcd44c26296..0f0c8966ca5d 100644
--- a/src/servers/tests/http/http_handler_test.rs
+++ b/src/servers/tests/http/http_handler_test.rs
@@ -46,7 +46,7 @@ async fn test_sql_not_provided() {
         script_handler: None,
     };
 
-    for format in ["greptimedb_v1", "influxdb_v1", "csv"] {
+    for format in ["greptimedb_v1", "influxdb_v1", "csv", "table"] {
         let query = http_handler::SqlQuery {
             db: None,
             sql: None,
@@ -82,7 +82,7 @@ async fn test_sql_output_rows() {
         script_handler: None,
     };
 
-    for format in ["greptimedb_v1", "influxdb_v1", "csv"] {
+    for format in ["greptimedb_v1", "influxdb_v1", "csv", "table"] {
         let query = create_query(format);
         let json = http_handler::sql(
             State(api_state.clone()),
@@ -154,6 +154,23 @@ async fn test_sql_output_rows() {
                     hyper::body::Bytes::from_static(b"4950\n"),
                 );
             }
+            HttpResponse::Table(resp) => {
+                use http_body::Body as HttpBody;
+                let mut resp = resp.into_response();
+                assert_eq!(
+                    resp.headers().get(header::CONTENT_TYPE),
+                    Some(HeaderValue::from_static(mime::TEXT_PLAIN_UTF_8.as_ref())).as_ref(),
+                );
+                assert_eq!(
+                    resp.body_mut().data().await.unwrap().unwrap(),
+                    hyper::body::Bytes::from(
+                        r#"┌─SUM(numbers.uint32s)─┐
+│ 4950                 │
+└──────────────────────┘
+"#
+                    ),
+                );
+            }
             _ => unreachable!(),
         }
     }
@@ -172,7 +189,7 @@ async fn test_sql_form() {
         script_handler: None,
     };
 
-    for format in ["greptimedb_v1", "influxdb_v1", "csv"] {
+    for format in ["greptimedb_v1", "influxdb_v1", "csv", "table"] {
         let form = create_form(format);
         let json = http_handler::sql(
             State(api_state.clone()),
@@ -244,6 +261,23 @@ async fn test_sql_form() {
                     hyper::body::Bytes::from_static(b"4950\n"),
                 );
             }
+            HttpResponse::Table(resp) => {
+                use http_body::Body as HttpBody;
+                let mut resp = resp.into_response();
+                assert_eq!(
+                    resp.headers().get(header::CONTENT_TYPE),
+                    Some(HeaderValue::from_static(mime::TEXT_PLAIN_UTF_8.as_ref())).as_ref(),
+                );
+                assert_eq!(
+                    resp.body_mut().data().await.unwrap().unwrap(),
+                    hyper::body::Bytes::from(
+                        r#"┌─SUM(numbers.uint32s)─┐
+│ 4950                 │
+└──────────────────────┘
+"#
+                    ),
+                );
+            }
             _ => unreachable!(),
         }
     }
diff --git a/src/servers/tests/http/prom_store_test.rs b/src/servers/tests/http/prom_store_test.rs
index 5d6b12bc9d1c..1a005fc0bd77 100644
--- a/src/servers/tests/http/prom_store_test.rs
+++ b/src/servers/tests/http/prom_store_test.rs
@@ -58,16 +58,7 @@ impl GrpcQueryHandler for DummyInstance {
 
 #[async_trait]
 impl PromStoreProtocolHandler for DummyInstance {
-    async fn write(&self, request: WriteRequest, ctx: QueryContextRef, _: bool) -> Result<Output> {
-        let _ = self
-            .tx
-            .send((ctx.current_schema().to_owned(), request.encode_to_vec()))
-            .await;
-
-        Ok(Output::new_with_affected_rows(0))
-    }
-
-    async fn write_fast(
+    async fn write(
         &self,
         _request: RowInsertRequests,
         _ctx: QueryContextRef,
diff --git a/src/session/Cargo.toml b/src/session/Cargo.toml
index 0f393962c7ad..85697d4ca7c9 100644
--- a/src/session/Cargo.toml
+++ b/src/session/Cargo.toml
@@ -15,8 +15,6 @@ api.workspace = true
 arc-swap = "1.5"
 auth.workspace = true
 common-catalog.workspace = true
-common-telemetry.workspace = true
 common-time.workspace = true
 derive_builder.workspace = true
-snafu.workspace = true
 sql.workspace = true
diff --git a/src/sql/Cargo.toml b/src/sql/Cargo.toml
index 8be9eef6696b..ce08faf9dcfa 100644
--- a/src/sql/Cargo.toml
+++ b/src/sql/Cargo.toml
@@ -26,7 +26,6 @@ datatypes.workspace = true
 hex = "0.4"
 itertools.workspace = true
 lazy_static.workspace = true
-once_cell.workspace = true
 regex.workspace = true
 snafu.workspace = true
 sqlparser.workspace = true
diff --git a/src/store-api/Cargo.toml b/src/store-api/Cargo.toml
index fc5f2b1690c4..2c9a42a9d8e4 100644
--- a/src/store-api/Cargo.toml
+++ b/src/store-api/Cargo.toml
@@ -11,13 +11,11 @@ workspace = true
 api.workspace = true
 aquamarine.workspace = true
 async-trait.workspace = true
-bytes.workspace = true
 common-base.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
 common-query.workspace = true
 common-recordbatch.workspace = true
-common-time.workspace = true
 common-wal.workspace = true
 datatypes.workspace = true
 derive_builder.workspace = true
diff --git a/src/store-api/src/metadata.rs b/src/store-api/src/metadata.rs
index 0ca91095148d..1c9c9700119d 100644
--- a/src/store-api/src/metadata.rs
+++ b/src/store-api/src/metadata.rs
@@ -95,6 +95,16 @@ impl ColumnMetadata {
             column_id,
         })
     }
+
+    /// Encodes a vector of `ColumnMetadata` into a JSON byte vector.
+    pub fn encode_list(columns: &[Self]) -> serde_json::Result<Vec<u8>> {
+        serde_json::to_vec(columns)
+    }
+
+    /// Decodes a JSON byte vector into a vector of `ColumnMetadata`.
+    pub fn decode_list(bytes: &[u8]) -> serde_json::Result<Vec<Self>> {
+        serde_json::from_slice(bytes)
+    }
 }
 
 #[cfg_attr(doc, aquamarine::aquamarine)]
diff --git a/src/store-api/src/metric_engine_consts.rs b/src/store-api/src/metric_engine_consts.rs
index d28e4d538aa3..1f0343f1b0d2 100644
--- a/src/store-api/src/metric_engine_consts.rs
+++ b/src/store-api/src/metric_engine_consts.rs
@@ -66,3 +66,7 @@ pub const PHYSICAL_TABLE_METADATA_KEY: &str = "physical_metric_table";
 /// ```
 /// And this key will be translated to corresponding physical **REGION** id in metasrv.
 pub const LOGICAL_TABLE_METADATA_KEY: &str = "on_physical_table";
+
+/// HashMap key to be used in the region server's extension response.
+/// Represent a list of column metadata that are added to physical table.
+pub const ALTER_PHYSICAL_EXTENSION_KEY: &str = "ALTER_PHYSICAL";
diff --git a/src/store-api/src/region_engine.rs b/src/store-api/src/region_engine.rs
index 3b9052a16a9d..8ec0d4a61104 100644
--- a/src/store-api/src/region_engine.rs
+++ b/src/store-api/src/region_engine.rs
@@ -15,6 +15,7 @@
 //! Region Engine's definition
 
 use std::any::Any;
+use std::collections::HashMap;
 use std::fmt::Display;
 use std::sync::Arc;
 
@@ -129,7 +130,7 @@ pub trait RegionEngine: Send + Sync {
         &self,
         region_id: RegionId,
         request: RegionRequest,
-    ) -> Result<AffectedRows, BoxedError>;
+    ) -> Result<RegionHandleResult, BoxedError>;
 
     /// Handles substrait query and return a stream of record batches
     async fn handle_query(
@@ -171,3 +172,20 @@ pub trait RegionEngine: Send + Sync {
 }
 
 pub type RegionEngineRef = Arc<dyn RegionEngine>;
+
+// TODO: reorganize the dependence to merge this struct with the
+// one in common_meta
+#[derive(Debug)]
+pub struct RegionHandleResult {
+    pub affected_rows: AffectedRows,
+    pub extension: HashMap<String, Vec<u8>>,
+}
+
+impl RegionHandleResult {
+    pub fn new(affected_rows: AffectedRows) -> Self {
+        Self {
+            affected_rows,
+            extension: Default::default(),
+        }
+    }
+}
diff --git a/src/table/Cargo.toml b/src/table/Cargo.toml
index 17e8d6532ba1..f3b8530441c7 100644
--- a/src/table/Cargo.toml
+++ b/src/table/Cargo.toml
@@ -11,7 +11,6 @@ testing = []
 workspace = true
 
 [dependencies]
-anymap = "1.0.0-beta.2"
 async-trait = "0.1"
 chrono.workspace = true
 common-base.workspace = true
@@ -19,7 +18,6 @@ common-catalog.workspace = true
 common-datasource.workspace = true
 common-error.workspace = true
 common-macro.workspace = true
-common-procedure.workspace = true
 common-query.workspace = true
 common-recordbatch.workspace = true
 common-telemetry.workspace = true
diff --git a/src/table/src/metadata.rs b/src/table/src/metadata.rs
index 628b7ce2c29c..4746a17bcf7b 100644
--- a/src/table/src/metadata.rs
+++ b/src/table/src/metadata.rs
@@ -188,9 +188,12 @@ impl TableMeta {
         &self,
         table_name: &str,
         alter_kind: &AlterKind,
+        add_if_not_exists: bool,
     ) -> Result<TableMetaBuilder> {
         match alter_kind {
-            AlterKind::AddColumns { columns } => self.add_columns(table_name, columns),
+            AlterKind::AddColumns { columns } => {
+                self.add_columns(table_name, columns, add_if_not_exists)
+            }
             AlterKind::DropColumns { names } => self.remove_columns(table_name, names),
             // No need to rebuild table meta when renaming tables.
             AlterKind::RenameTable { .. } => {
@@ -248,6 +251,7 @@ impl TableMeta {
         &self,
         table_name: &str,
         requests: &[AddColumnRequest],
+        add_if_not_exists: bool,
     ) -> Result<TableMetaBuilder> {
         let table_schema = &self.schema;
         let mut meta_builder = self.new_meta_builder();
@@ -255,7 +259,31 @@ impl TableMeta {
             self.primary_key_indices.iter().collect();
 
         let mut names = HashSet::with_capacity(requests.len());
-
+        let mut new_requests = Vec::with_capacity(requests.len());
+        let requests = if add_if_not_exists {
+            for col_to_add in requests {
+                if let Some(column_schema) =
+                    table_schema.column_schema_by_name(&col_to_add.column_schema.name)
+                {
+                    // If the column already exists, we should check if the type is the same.
+                    ensure!(
+                        column_schema.data_type == col_to_add.column_schema.data_type,
+                        error::InvalidAlterRequestSnafu {
+                            table: table_name,
+                            err: format!(
+                                "column {} already exists with different type",
+                                col_to_add.column_schema.name
+                            ),
+                        }
+                    );
+                } else {
+                    new_requests.push(col_to_add.clone());
+                }
+            }
+            &new_requests[..]
+        } else {
+            requests
+        };
         for col_to_add in requests {
             ensure!(
                 names.insert(&col_to_add.column_schema.name),
@@ -567,13 +595,19 @@ impl From<TableId> for TableIdent {
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct RawTableMeta {
     pub schema: RawSchema,
+    /// The indices of columns in primary key. Note that the index of timestamp column
+    /// is not included. Order matters to this array.
     pub primary_key_indices: Vec<usize>,
+    ///  The indices of columns in value. Order doesn't matter to this array.
     pub value_indices: Vec<usize>,
+    /// Engine type of this table. Usually in small case.
     pub engine: String,
+    /// Deprecated. See https://github.com/GreptimeTeam/greptimedb/issues/2982
     pub next_column_id: ColumnId,
     pub region_numbers: Vec<u32>,
     pub options: TableOptions,
     pub created_on: DateTime<Utc>,
+    /// Order doesn't matter to this array.
     #[serde(default)]
     pub partition_key_indices: Vec<usize>,
 }
@@ -624,6 +658,44 @@ pub struct RawTableInfo {
     pub table_type: TableType,
 }
 
+impl RawTableInfo {
+    /// Sort the columns in [RawTableInfo], logical tables require it.
+    pub fn sort_columns(&mut self) {
+        let column_schemas = &self.meta.schema.column_schemas;
+        let primary_keys = self
+            .meta
+            .primary_key_indices
+            .iter()
+            .map(|index| column_schemas[*index].name.clone())
+            .collect::<HashSet<_>>();
+
+        self.meta
+            .schema
+            .column_schemas
+            .sort_unstable_by(|a, b| a.name.cmp(&b.name));
+
+        // Compute new indices of sorted columns
+        let mut primary_key_indices = Vec::with_capacity(primary_keys.len());
+        let mut timestamp_index = None;
+        let mut value_indices =
+            Vec::with_capacity(self.meta.schema.column_schemas.len() - primary_keys.len() - 1);
+        for (index, column_schema) in self.meta.schema.column_schemas.iter().enumerate() {
+            if primary_keys.contains(&column_schema.name) {
+                primary_key_indices.push(index);
+            } else if column_schema.is_time_index() {
+                timestamp_index = Some(index);
+            } else {
+                value_indices.push(index);
+            }
+        }
+
+        // Overwrite table meta
+        self.meta.schema.timestamp_index = timestamp_index;
+        self.meta.primary_key_indices = primary_key_indices;
+        self.meta.value_indices = value_indices;
+    }
+}
+
 impl From<TableInfo> for RawTableInfo {
     fn from(info: TableInfo) -> RawTableInfo {
         RawTableInfo {
@@ -725,7 +797,7 @@ mod tests {
         };
 
         let builder = meta
-            .builder_with_alter_kind("my_table", &alter_kind)
+            .builder_with_alter_kind("my_table", &alter_kind, false)
             .unwrap();
         builder.build().unwrap()
     }
@@ -755,7 +827,7 @@ mod tests {
         };
 
         let builder = meta
-            .builder_with_alter_kind("my_table", &alter_kind)
+            .builder_with_alter_kind("my_table", &alter_kind, false)
             .unwrap();
         builder.build().unwrap()
     }
@@ -802,7 +874,7 @@ mod tests {
             names: vec![String::from("col2"), String::from("my_field")],
         };
         let new_meta = meta
-            .builder_with_alter_kind("my_table", &alter_kind)
+            .builder_with_alter_kind("my_table", &alter_kind, false)
             .unwrap()
             .build()
             .unwrap();
@@ -857,7 +929,7 @@ mod tests {
             names: vec![String::from("col3"), String::from("col1")],
         };
         let new_meta = meta
-            .builder_with_alter_kind("my_table", &alter_kind)
+            .builder_with_alter_kind("my_table", &alter_kind, false)
             .unwrap()
             .build()
             .unwrap();
@@ -897,7 +969,7 @@ mod tests {
         };
 
         let err = meta
-            .builder_with_alter_kind("my_table", &alter_kind)
+            .builder_with_alter_kind("my_table", &alter_kind, false)
             .err()
             .unwrap();
         assert_eq!(StatusCode::TableColumnExists, err.status_code());
@@ -927,7 +999,7 @@ mod tests {
         };
 
         let err = meta
-            .builder_with_alter_kind("my_table", &alter_kind)
+            .builder_with_alter_kind("my_table", &alter_kind, false)
             .err()
             .unwrap();
         assert_eq!(StatusCode::InvalidArguments, err.status_code());
@@ -949,7 +1021,7 @@ mod tests {
         };
 
         let err = meta
-            .builder_with_alter_kind("my_table", &alter_kind)
+            .builder_with_alter_kind("my_table", &alter_kind, false)
             .err()
             .unwrap();
         assert_eq!(StatusCode::TableColumnNotFound, err.status_code());
@@ -972,7 +1044,7 @@ mod tests {
         };
 
         let err = meta
-            .builder_with_alter_kind("my_table", &alter_kind)
+            .builder_with_alter_kind("my_table", &alter_kind, false)
             .err()
             .unwrap();
         assert_eq!(StatusCode::InvalidArguments, err.status_code());
@@ -983,7 +1055,7 @@ mod tests {
         };
 
         let err = meta
-            .builder_with_alter_kind("my_table", &alter_kind)
+            .builder_with_alter_kind("my_table", &alter_kind, false)
             .err()
             .unwrap();
         assert_eq!(StatusCode::InvalidArguments, err.status_code());
diff --git a/tests-integration/Cargo.toml b/tests-integration/Cargo.toml
index 1914fe720b64..1c95982f6181 100644
--- a/tests-integration/Cargo.toml
+++ b/tests-integration/Cargo.toml
@@ -45,18 +45,14 @@ mysql_async = { version = "0.33", default-features = false, features = [
     "default-rustls",
 ] }
 object-store.workspace = true
-once_cell.workspace = true
 operator.workspace = true
 query.workspace = true
-rand.workspace = true
 rstest = "0.17"
 rstest_reuse = "0.5"
 secrecy = "0.8"
-serde.workspace = true
 serde_json.workspace = true
 servers = { workspace = true, features = ["testing"] }
 session.workspace = true
-snafu.workspace = true
 sql.workspace = true
 sqlx = { version = "0.6", features = [
     "runtime-tokio-rustls",
diff --git a/tests-integration/src/cluster.rs b/tests-integration/src/cluster.rs
index 197d3dead15a..d427b2a8f27b 100644
--- a/tests-integration/src/cluster.rs
+++ b/tests-integration/src/cluster.rs
@@ -20,7 +20,7 @@ use std::time::Duration;
 use api::v1::meta::Role;
 use api::v1::region::region_server::RegionServer;
 use arrow_flight::flight_service_server::FlightServiceServer;
-use catalog::kvbackend::{CachedMetaKvBackendBuilder, MetaKvBackend};
+use catalog::kvbackend::{CachedMetaKvBackendBuilder, KvBackendCatalogManager, MetaKvBackend};
 use client::client_manager::DatanodeClients;
 use client::Client;
 use common_base::Plugins;
@@ -353,11 +353,12 @@ impl GreptimeDbClusterBuilder {
         let cached_meta_backend =
             Arc::new(CachedMetaKvBackendBuilder::new(meta_client.clone()).build());
 
+        let catalog_manager =
+            KvBackendCatalogManager::new(cached_meta_backend.clone(), cached_meta_backend.clone());
+
         let handlers_executor = HandlerGroupExecutor::new(vec![
             Arc::new(ParseMailboxMessageHandler),
-            Arc::new(InvalidateTableCacheHandler::new(
-                cached_meta_backend.clone(),
-            )),
+            Arc::new(InvalidateTableCacheHandler::new(catalog_manager.clone())),
         ]);
 
         let heartbeat_task = HeartbeatTask::new(
@@ -366,13 +367,17 @@ impl GreptimeDbClusterBuilder {
             Arc::new(handlers_executor),
         );
 
-        let instance =
-            FrontendBuilder::new(cached_meta_backend.clone(), datanode_clients, meta_client)
-                .with_cache_invalidator(cached_meta_backend)
-                .with_heartbeat_task(heartbeat_task)
-                .try_build()
-                .await
-                .unwrap();
+        let instance = FrontendBuilder::new(
+            cached_meta_backend.clone(),
+            catalog_manager.clone(),
+            datanode_clients,
+            meta_client,
+        )
+        .with_cache_invalidator(catalog_manager)
+        .with_heartbeat_task(heartbeat_task)
+        .try_build()
+        .await
+        .unwrap();
 
         Arc::new(instance)
     }
diff --git a/tests-integration/src/prom_store.rs b/tests-integration/src/prom_store.rs
index 4c0c7a4a530f..dd6d1b9b1059 100644
--- a/tests-integration/src/prom_store.rs
+++ b/tests-integration/src/prom_store.rs
@@ -25,6 +25,7 @@ mod tests {
     use prost::Message;
     use servers::http::prom_store::PHYSICAL_TABLE_PARAM;
     use servers::prom_store;
+    use servers::prom_store::to_grpc_row_insert_requests;
     use servers::query_handler::sql::SqlQueryHandler;
     use servers::query_handler::PromStoreProtocolHandler;
     use session::context::QueryContext;
@@ -107,8 +108,9 @@ mod tests {
         .unwrap()
         .is_ok());
 
+        let (row_inserts, _) = to_grpc_row_insert_requests(&write_request).unwrap();
         instance
-            .write(write_request, ctx.clone(), true)
+            .write(row_inserts, ctx.clone(), true)
             .await
             .unwrap();
 
@@ -193,14 +195,14 @@ mod tests {
                     name: prom_store::METRIC_NAME_LABEL.to_string(),
                     value: "metric3".to_string(),
                 },
-                Label {
-                    name: "idc".to_string(),
-                    value: "z002".to_string(),
-                },
                 Label {
                     name: "app".to_string(),
                     value: "biz".to_string(),
                 },
+                Label {
+                    name: "idc".to_string(),
+                    value: "z002".to_string(),
+                },
             ],
             timeseries.labels
         );
diff --git a/tests-integration/src/standalone.rs b/tests-integration/src/standalone.rs
index b0749c3a23f3..0c9a58284cca 100644
--- a/tests-integration/src/standalone.rs
+++ b/tests-integration/src/standalone.rs
@@ -14,6 +14,7 @@
 
 use std::sync::Arc;
 
+use catalog::kvbackend::KvBackendCatalogManager;
 use cmd::options::MixOptions;
 use common_base::Plugins;
 use common_catalog::consts::MIN_USER_TABLE_ID;
@@ -124,6 +125,9 @@ impl GreptimeDbStandaloneBuilder {
         let table_metadata_manager = Arc::new(TableMetadataManager::new(kv_backend.clone()));
         table_metadata_manager.init().await.unwrap();
 
+        let catalog_manager =
+            KvBackendCatalogManager::new(kv_backend.clone(), Arc::new(DummyCacheInvalidator));
+
         let datanode_manager = Arc::new(StandaloneDatanodeManager(datanode.region_server()));
 
         let table_id_sequence = Arc::new(
@@ -154,12 +158,17 @@ impl GreptimeDbStandaloneBuilder {
             .unwrap(),
         );
 
-        let instance =
-            FrontendBuilder::new(kv_backend.clone(), datanode_manager, ddl_task_executor)
-                .with_plugin(plugins)
-                .try_build()
-                .await
-                .unwrap();
+        let instance = FrontendBuilder::new(
+            kv_backend.clone(),
+            catalog_manager.clone(),
+            datanode_manager,
+            ddl_task_executor,
+        )
+        .with_plugin(plugins)
+        .with_cache_invalidator(catalog_manager)
+        .try_build()
+        .await
+        .unwrap();
 
         procedure_manager.start().await.unwrap();
         wal_options_allocator.start().await.unwrap();
diff --git a/tests-integration/tests/sql.rs b/tests-integration/tests/sql.rs
index 5b9e1e2f35f3..7cff590c39eb 100644
--- a/tests-integration/tests/sql.rs
+++ b/tests-integration/tests/sql.rs
@@ -197,6 +197,23 @@ pub async fn test_mysql_crud(store_type: StorageType) {
         assert_eq!(ret, 6);
     }
 
+    // parameter type mismatch
+    let query_re = sqlx::query("select i from demo where i = ?")
+        .bind("test")
+        .fetch_all(&pool)
+        .await;
+    assert!(query_re.is_err());
+    assert_eq!(
+        query_re
+            .err()
+            .unwrap()
+            .into_database_error()
+            .unwrap()
+            .downcast::<MySqlDatabaseError>()
+            .code(),
+        Some("22007")
+    );
+
     let _ = sqlx::query("delete from demo")
         .execute(&pool)
         .await
diff --git a/tests/cases/standalone/common/alter/alter_metric_table.result b/tests/cases/standalone/common/alter/alter_metric_table.result
new file mode 100644
index 000000000000..8ae541b71e07
--- /dev/null
+++ b/tests/cases/standalone/common/alter/alter_metric_table.result
@@ -0,0 +1,110 @@
+CREATE TABLE phy (ts timestamp time index, val double) engine=metric with ("physical_metric_table" = "");
+
+Affected Rows: 0
+
+SHOW TABLES;
+
++---------+
+| Tables  |
++---------+
+| numbers |
+| phy     |
++---------+
+
+CREATE TABLE t1 (ts timestamp time index, val double, host string primary key) engine = metric with ("on_physical_table" = "phy");
+
+Affected Rows: 0
+
+CREATE TABLE t2 (ts timestamp time index, job string primary key, val double) engine = metric with ("on_physical_table" = "phy");
+
+Affected Rows: 0
+
+DESC TABLE t1;
+
++--------+----------------------+-----+------+---------+---------------+
+| Column | Type                 | Key | Null | Default | Semantic Type |
++--------+----------------------+-----+------+---------+---------------+
+| host   | String               | PRI | YES  |         | TAG           |
+| ts     | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
+| val    | Float64              |     | YES  |         | FIELD         |
++--------+----------------------+-----+------+---------+---------------+
+
+DESC TABLE t2;
+
++--------+----------------------+-----+------+---------+---------------+
+| Column | Type                 | Key | Null | Default | Semantic Type |
++--------+----------------------+-----+------+---------+---------------+
+| job    | String               | PRI | YES  |         | TAG           |
+| ts     | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
+| val    | Float64              |     | YES  |         | FIELD         |
++--------+----------------------+-----+------+---------+---------------+
+
+DESC TABLE phy;
+
++------------+----------------------+-----+------+---------+---------------+
+| Column     | Type                 | Key | Null | Default | Semantic Type |
++------------+----------------------+-----+------+---------+---------------+
+| ts         | TimestampMillisecond |     | NO   |         | FIELD         |
+| val        | Float64              |     | YES  |         | FIELD         |
+| __table_id | UInt32               | PRI | NO   |         | TAG           |
+| __tsid     | UInt64               | PRI | NO   |         | TAG           |
+| host       | String               | PRI | YES  |         | TAG           |
+| job        | String               | PRI | YES  |         | TAG           |
++------------+----------------------+-----+------+---------+---------------+
+
+ALTER TABLE t1 ADD COLUMN k STRING PRIMARY KEY;
+
+Affected Rows: 0
+
+ALTER TABLE t2 ADD COLUMN k STRING PRIMARY KEY;
+
+Affected Rows: 0
+
+DESC TABLE t1;
+
++--------+----------------------+-----+------+---------+---------------+
+| Column | Type                 | Key | Null | Default | Semantic Type |
++--------+----------------------+-----+------+---------+---------------+
+| host   | String               | PRI | YES  |         | TAG           |
+| k      | String               | PRI | YES  |         | TAG           |
+| ts     | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
+| val    | Float64              |     | YES  |         | FIELD         |
++--------+----------------------+-----+------+---------+---------------+
+
+DESC TABLE t2;
+
++--------+----------------------+-----+------+---------+---------------+
+| Column | Type                 | Key | Null | Default | Semantic Type |
++--------+----------------------+-----+------+---------+---------------+
+| job    | String               | PRI | YES  |         | TAG           |
+| k      | String               | PRI | YES  |         | TAG           |
+| ts     | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
+| val    | Float64              |     | YES  |         | FIELD         |
++--------+----------------------+-----+------+---------+---------------+
+
+DESC TABLE phy;
+
++------------+----------------------+-----+------+---------+---------------+
+| Column     | Type                 | Key | Null | Default | Semantic Type |
++------------+----------------------+-----+------+---------+---------------+
+| ts         | TimestampMillisecond |     | NO   |         | FIELD         |
+| val        | Float64              |     | YES  |         | FIELD         |
+| __table_id | UInt32               | PRI | NO   |         | TAG           |
+| __tsid     | UInt64               | PRI | NO   |         | TAG           |
+| host       | String               | PRI | YES  |         | TAG           |
+| job        | String               | PRI | YES  |         | TAG           |
+| k          | String               | PRI | YES  |         | TAG           |
++------------+----------------------+-----+------+---------+---------------+
+
+DROP TABLE t1;
+
+Affected Rows: 0
+
+DROP TABLE t2;
+
+Affected Rows: 0
+
+DROP TABLE phy;
+
+Affected Rows: 0
+
diff --git a/tests/cases/standalone/common/alter/alter_metric_table.sql b/tests/cases/standalone/common/alter/alter_metric_table.sql
new file mode 100644
index 000000000000..579dd90c4896
--- /dev/null
+++ b/tests/cases/standalone/common/alter/alter_metric_table.sql
@@ -0,0 +1,29 @@
+CREATE TABLE phy (ts timestamp time index, val double) engine=metric with ("physical_metric_table" = "");
+
+SHOW TABLES;
+
+CREATE TABLE t1 (ts timestamp time index, val double, host string primary key) engine = metric with ("on_physical_table" = "phy");
+
+CREATE TABLE t2 (ts timestamp time index, job string primary key, val double) engine = metric with ("on_physical_table" = "phy");
+
+DESC TABLE t1;
+
+DESC TABLE t2;
+
+DESC TABLE phy;
+
+ALTER TABLE t1 ADD COLUMN k STRING PRIMARY KEY;
+
+ALTER TABLE t2 ADD COLUMN k STRING PRIMARY KEY;
+
+DESC TABLE t1;
+
+DESC TABLE t2;
+
+DESC TABLE phy;
+
+DROP TABLE t1;
+
+DROP TABLE t2;
+
+DROP TABLE phy;
diff --git a/tests/cases/standalone/common/alter/alter_table.result b/tests/cases/standalone/common/alter/alter_table.result
index 74e5c2399e8f..bd503fe866c8 100644
--- a/tests/cases/standalone/common/alter/alter_table.result
+++ b/tests/cases/standalone/common/alter/alter_table.result
@@ -1,4 +1,4 @@
-CREATE TABLE test_alt_table(i INTEGER, j TIMESTAMP TIME INDEX);
+CREATE TABLE test_alt_table(h INTEGER, i INTEGER, j TIMESTAMP TIME INDEX, PRIMARY KEY (h, i));
 
 Affected Rows: 0
 
@@ -7,11 +7,18 @@ DESC TABLE test_alt_table;
 +--------+----------------------+-----+------+---------+---------------+
 | Column | Type                 | Key | Null | Default | Semantic Type |
 +--------+----------------------+-----+------+---------+---------------+
-| i      | Int32                |     | YES  |         | FIELD         |
+| h      | Int32                | PRI | YES  |         | TAG           |
+| i      | Int32                | PRI | YES  |         | TAG           |
 | j      | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
 +--------+----------------------+-----+------+---------+---------------+
 
-ALTER TABLE test_alt_table ADD COLUMN k INTEGER;
+INSERT INTO test_alt_table VALUES (1, 1, 0), (2, 2, 1);
+
+Affected Rows: 2
+
+-- TODO: It may result in an error if `k` is with type INTEGER.
+-- Error: 3001(EngineExecuteQuery), Invalid argument error: column types must match schema types, expected Int32 but found Utf8 at column index 3
+ALTER TABLE test_alt_table ADD COLUMN k STRING PRIMARY KEY;
 
 Affected Rows: 0
 
@@ -20,11 +27,29 @@ DESC TABLE test_alt_table;
 +--------+----------------------+-----+------+---------+---------------+
 | Column | Type                 | Key | Null | Default | Semantic Type |
 +--------+----------------------+-----+------+---------+---------------+
-| i      | Int32                |     | YES  |         | FIELD         |
+| h      | Int32                | PRI | YES  |         | TAG           |
+| i      | Int32                | PRI | YES  |         | TAG           |
 | j      | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
-| k      | Int32                |     | YES  |         | FIELD         |
+| k      | String               | PRI | YES  |         | TAG           |
 +--------+----------------------+-----+------+---------+---------------+
 
+SELECT * FROM test_alt_table;
+
++---+---+-------------------------+---+
+| h | i | j                       | k |
++---+---+-------------------------+---+
+| 1 | 1 | 1970-01-01T00:00:00     |   |
+| 2 | 2 | 1970-01-01T00:00:00.001 |   |
++---+---+-------------------------+---+
+
+SELECT * FROM test_alt_table WHERE i = 1;
+
++---+---+---------------------+---+
+| h | i | j                   | k |
++---+---+---------------------+---+
+| 1 | 1 | 1970-01-01T00:00:00 |   |
++---+---+---------------------+---+
+
 -- SQLNESS ARG restart=true
 ALTER TABLE test_alt_table ADD COLUMN m INTEGER;
 
@@ -35,9 +60,10 @@ DESC TABLE test_alt_table;
 +--------+----------------------+-----+------+---------+---------------+
 | Column | Type                 | Key | Null | Default | Semantic Type |
 +--------+----------------------+-----+------+---------+---------------+
-| i      | Int32                |     | YES  |         | FIELD         |
+| h      | Int32                | PRI | YES  |         | TAG           |
+| i      | Int32                | PRI | YES  |         | TAG           |
 | j      | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
-| k      | Int32                |     | YES  |         | FIELD         |
+| k      | String               | PRI | YES  |         | TAG           |
 | m      | Int32                |     | YES  |         | FIELD         |
 +--------+----------------------+-----+------+---------+---------------+
 
diff --git a/tests/cases/standalone/common/alter/alter_table.sql b/tests/cases/standalone/common/alter/alter_table.sql
index f85a398d93ec..d77e66cc4570 100644
--- a/tests/cases/standalone/common/alter/alter_table.sql
+++ b/tests/cases/standalone/common/alter/alter_table.sql
@@ -1,11 +1,19 @@
-CREATE TABLE test_alt_table(i INTEGER, j TIMESTAMP TIME INDEX);
+CREATE TABLE test_alt_table(h INTEGER, i INTEGER, j TIMESTAMP TIME INDEX, PRIMARY KEY (h, i));
 
 DESC TABLE test_alt_table;
 
-ALTER TABLE test_alt_table ADD COLUMN k INTEGER;
+INSERT INTO test_alt_table VALUES (1, 1, 0), (2, 2, 1);
+
+-- TODO: It may result in an error if `k` is with type INTEGER.
+-- Error: 3001(EngineExecuteQuery), Invalid argument error: column types must match schema types, expected Int32 but found Utf8 at column index 3
+ALTER TABLE test_alt_table ADD COLUMN k STRING PRIMARY KEY;
 
 DESC TABLE test_alt_table;
 
+SELECT * FROM test_alt_table;
+
+SELECT * FROM test_alt_table WHERE i = 1;
+
 -- SQLNESS ARG restart=true
 ALTER TABLE test_alt_table ADD COLUMN m INTEGER;
 
diff --git a/tests/cases/standalone/common/catalog/schema.result b/tests/cases/standalone/common/catalog/schema.result
index 4c0a29be1f7f..600415d3122c 100644
--- a/tests/cases/standalone/common/catalog/schema.result
+++ b/tests/cases/standalone/common/catalog/schema.result
@@ -120,7 +120,7 @@ SHOW TABLES FROM public WHERE Tables = 'numbers';
 
 DROP SCHEMA test_public_schema;
 
-Error: 1001(Unsupported), Not supported: Drop Database
+Affected Rows: 0
 
 SELECT * FROM test_public_schema.hello;
 
diff --git a/tests/cases/standalone/common/copy/copy_to_fs.result b/tests/cases/standalone/common/copy/copy_to_fs.result
index 932067ee5788..f6bdc22a20d3 100644
--- a/tests/cases/standalone/common/copy/copy_to_fs.result
+++ b/tests/cases/standalone/common/copy/copy_to_fs.result
@@ -1,4 +1,4 @@
-CREATE TABLE demo(host string, cpu double, memory double, ts TIMESTAMP time index);
+CREATE TABLE demo(host string, cpu DOUBLE, memory DOUBLE, ts TIMESTAMP TIME INDEX);
 
 Affected Rows: 0
 
@@ -6,17 +6,17 @@ insert into demo(host, cpu, memory, ts) values ('host1', 66.6, 1024, 16552765570
 
 Affected Rows: 2
 
-Copy demo TO '/tmp/export/demo.parquet';
+COPY demo TO '/tmp/export/demo.parquet' WITH (start_time='2022-06-15 07:02:37', end_time='2022-06-15 07:02:38');
 
-Affected Rows: 2
+Affected Rows: 1
 
-Copy demo TO '/tmp/export/demo.csv' with (format='csv');
+COPY demo TO '/tmp/export/demo.csv' WITH (format='csv', start_time='2022-06-15 07:02:37', end_time='2022-06-15 07:02:38');
 
-Affected Rows: 2
+Affected Rows: 1
 
-Copy demo TO '/tmp/export/demo.json' with (format='json');
+COPY demo TO '/tmp/export/demo.json' WITH (format='json', start_time='2022-06-15 07:02:37', end_time='2022-06-15 07:02:38');
 
-Affected Rows: 2
+Affected Rows: 1
 
 drop table demo;
 
diff --git a/tests/cases/standalone/common/copy/copy_to_fs.sql b/tests/cases/standalone/common/copy/copy_to_fs.sql
index 2329dda7ca8a..d095c2d7957e 100644
--- a/tests/cases/standalone/common/copy/copy_to_fs.sql
+++ b/tests/cases/standalone/common/copy/copy_to_fs.sql
@@ -1,11 +1,11 @@
-CREATE TABLE demo(host string, cpu double, memory double, ts TIMESTAMP time index);
+CREATE TABLE demo(host string, cpu DOUBLE, memory DOUBLE, ts TIMESTAMP TIME INDEX);
 
 insert into demo(host, cpu, memory, ts) values ('host1', 66.6, 1024, 1655276557000), ('host2', 88.8,  333.3, 1655276558000);
 
-Copy demo TO '/tmp/export/demo.parquet';
+COPY demo TO '/tmp/export/demo.parquet' WITH (start_time='2022-06-15 07:02:37', end_time='2022-06-15 07:02:38');
 
-Copy demo TO '/tmp/export/demo.csv' with (format='csv');
+COPY demo TO '/tmp/export/demo.csv' WITH (format='csv', start_time='2022-06-15 07:02:37', end_time='2022-06-15 07:02:38');
 
-Copy demo TO '/tmp/export/demo.json' with (format='json');
+COPY demo TO '/tmp/export/demo.json' WITH (format='json', start_time='2022-06-15 07:02:37', end_time='2022-06-15 07:02:38');
 
 drop table demo;
diff --git a/tests/cases/standalone/common/create/create_database.result b/tests/cases/standalone/common/create/create_database.result
index 780aca34c32a..da409471c2bb 100644
--- a/tests/cases/standalone/common/create/create_database.result
+++ b/tests/cases/standalone/common/create/create_database.result
@@ -19,6 +19,5 @@ show databases;
 | illegal-database   |
 | information_schema |
 | public             |
-| test_public_schema |
 +--------------------+
 
diff --git a/tests/cases/standalone/common/create/create_metric_table.result b/tests/cases/standalone/common/create/create_metric_table.result
index 31a095c95ac6..0a153ec733fc 100644
--- a/tests/cases/standalone/common/create/create_metric_table.result
+++ b/tests/cases/standalone/common/create/create_metric_table.result
@@ -11,6 +11,15 @@ SHOW TABLES;
 | phy     |
 +---------+
 
+DESC TABLE phy;
+
++--------+----------------------+-----+------+---------+---------------+
+| Column | Type                 | Key | Null | Default | Semantic Type |
++--------+----------------------+-----+------+---------+---------------+
+| ts     | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
+| val    | Float64              |     | YES  |         | FIELD         |
++--------+----------------------+-----+------+---------+---------------+
+
 CREATE TABLE t1 (ts timestamp time index, val double, host string primary key) engine = metric with ("on_physical_table" = "phy");
 
 Affected Rows: 0
@@ -19,28 +28,37 @@ CREATE TABLE t2 (ts timestamp time index, job string primary key, val double) en
 
 Affected Rows: 0
 
-SELECT * FROM information_schema.tables WHERE engine = "metric" order by table_name;
+SELECT table_catalog, table_schema, table_name, table_type, engine FROM information_schema.tables WHERE engine = 'metric' order by table_name;
 
-Error: 3000(PlanQuery), Failed to plan SQL: No field named metric. Valid fields are information_schema.tables.table_catalog, information_schema.tables.table_schema, information_schema.tables.table_name, information_schema.tables.table_type, information_schema.tables.table_id, information_schema.tables.engine.
++---------------+--------------+------------+------------+--------+
+| table_catalog | table_schema | table_name | table_type | engine |
++---------------+--------------+------------+------------+--------+
+| greptime      | public       | phy        | BASE TABLE | metric |
+| greptime      | public       | t1         | BASE TABLE | metric |
+| greptime      | public       | t2         | BASE TABLE | metric |
++---------------+--------------+------------+------------+--------+
 
--- We currently don't maintains physical table's schema.
 DESC TABLE phy;
 
-+--------+----------------------+-----+------+---------+---------------+
-| Column | Type                 | Key | Null | Default | Semantic Type |
-+--------+----------------------+-----+------+---------+---------------+
-| ts     | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
-| val    | Float64              |     | YES  |         | FIELD         |
-+--------+----------------------+-----+------+---------+---------------+
++------------+----------------------+-----+------+---------+---------------+
+| Column     | Type                 | Key | Null | Default | Semantic Type |
++------------+----------------------+-----+------+---------+---------------+
+| ts         | TimestampMillisecond |     | NO   |         | FIELD         |
+| val        | Float64              |     | YES  |         | FIELD         |
+| __table_id | UInt32               | PRI | NO   |         | TAG           |
+| __tsid     | UInt64               | PRI | NO   |         | TAG           |
+| host       | String               | PRI | YES  |         | TAG           |
+| job        | String               | PRI | YES  |         | TAG           |
++------------+----------------------+-----+------+---------+---------------+
 
 DESC TABLE t1;
 
 +--------+----------------------+-----+------+---------+---------------+
 | Column | Type                 | Key | Null | Default | Semantic Type |
 +--------+----------------------+-----+------+---------+---------------+
+| host   | String               | PRI | YES  |         | TAG           |
 | ts     | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
 | val    | Float64              |     | YES  |         | FIELD         |
-| host   | String               | PRI | YES  |         | TAG           |
 +--------+----------------------+-----+------+---------+---------------+
 
 DESC TABLE t2;
@@ -48,8 +66,8 @@ DESC TABLE t2;
 +--------+----------------------+-----+------+---------+---------------+
 | Column | Type                 | Key | Null | Default | Semantic Type |
 +--------+----------------------+-----+------+---------+---------------+
-| ts     | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
 | job    | String               | PRI | YES  |         | TAG           |
+| ts     | TimestampMillisecond | PRI | NO   |         | TIMESTAMP     |
 | val    | Float64              |     | YES  |         | FIELD         |
 +--------+----------------------+-----+------+---------+---------------+
 
diff --git a/tests/cases/standalone/common/create/create_metric_table.sql b/tests/cases/standalone/common/create/create_metric_table.sql
index 3caf427d5a46..fcc41ff11541 100644
--- a/tests/cases/standalone/common/create/create_metric_table.sql
+++ b/tests/cases/standalone/common/create/create_metric_table.sql
@@ -2,13 +2,14 @@ CREATE TABLE phy (ts timestamp time index, val double) engine=metric with ("phys
 
 SHOW TABLES;
 
+DESC TABLE phy;
+
 CREATE TABLE t1 (ts timestamp time index, val double, host string primary key) engine = metric with ("on_physical_table" = "phy");
 
 CREATE TABLE t2 (ts timestamp time index, job string primary key, val double) engine = metric with ("on_physical_table" = "phy");
 
-SELECT * FROM information_schema.tables WHERE engine = "metric" order by table_name;
+SELECT table_catalog, table_schema, table_name, table_type, engine FROM information_schema.tables WHERE engine = 'metric' order by table_name;
 
--- We currently don't maintains physical table's schema.
 DESC TABLE phy;
 
 DESC TABLE t1;
diff --git a/tests/cases/standalone/common/insert/logical_metric_table.result b/tests/cases/standalone/common/insert/logical_metric_table.result
index 09ddac341c94..a6e958d4a008 100644
--- a/tests/cases/standalone/common/insert/logical_metric_table.result
+++ b/tests/cases/standalone/common/insert/logical_metric_table.result
@@ -6,18 +6,18 @@ CREATE TABLE t1 (ts timestamp time index, val double, host string primary key) e
 
 Affected Rows: 0
 
-INSERT INTO t1 VALUES (0, 0, 'host1'), (1, 1, 'host2');
+INSERT INTO t1 VALUES ('host1',0, 0), ('host2', 1, 1,);
 
 Affected Rows: 2
 
 SELECT * from t1;
 
-+-------------------------+-----+-------+
-| ts                      | val | host  |
-+-------------------------+-----+-------+
-| 1970-01-01T00:00:00.001 | 1.0 | host2 |
-| 1970-01-01T00:00:00     | 0.0 | host1 |
-+-------------------------+-----+-------+
++-------+-------------------------+-----+
+| host  | ts                      | val |
++-------+-------------------------+-----+
+| host2 | 1970-01-01T00:00:00.001 | 1.0 |
+| host1 | 1970-01-01T00:00:00     | 0.0 |
++-------+-------------------------+-----+
 
 CREATE TABLE t2 (ts timestamp time index, job string primary key, val double) engine = metric with ("on_physical_table" = "phy");
 
@@ -28,18 +28,18 @@ SELECT * from t2;
 ++
 ++
 
-INSERT INTO t2 VALUES (0, 'job1', 0), (1, 'job2', 1);
+INSERT INTO t2 VALUES ('job1', 0, 0), ('job2', 1, 1);
 
 Affected Rows: 2
 
 SELECT * from t2;
 
-+-------------------------+------+-----+
-| ts                      | job  | val |
-+-------------------------+------+-----+
-| 1970-01-01T00:00:00.001 | job2 | 1.0 |
-| 1970-01-01T00:00:00     | job1 | 0.0 |
-+-------------------------+------+-----+
++------+-------------------------+-----+
+| job  | ts                      | val |
++------+-------------------------+-----+
+| job2 | 1970-01-01T00:00:00.001 | 1.0 |
+| job1 | 1970-01-01T00:00:00     | 0.0 |
++------+-------------------------+-----+
 
 DROP TABLE t1;
 
@@ -49,6 +49,30 @@ DROP TABLE t2;
 
 Affected Rows: 0
 
+DESC TABLE phy;
+
++------------+----------------------+-----+------+---------+---------------+
+| Column     | Type                 | Key | Null | Default | Semantic Type |
++------------+----------------------+-----+------+---------+---------------+
+| ts         | TimestampMillisecond |     | NO   |         | FIELD         |
+| val        | Float64              |     | YES  |         | FIELD         |
+| __table_id | UInt32               | PRI | NO   |         | TAG           |
+| __tsid     | UInt64               | PRI | NO   |         | TAG           |
+| host       | String               | PRI | YES  |         | TAG           |
+| job        | String               | PRI | YES  |         | TAG           |
++------------+----------------------+-----+------+---------+---------------+
+
+SELECT ts, val, __tsid, host, job FROM phy;
+
++-------------------------+-----+----------------------+-------+------+
+| ts                      | val | __tsid               | host  | job  |
++-------------------------+-----+----------------------+-------+------+
+| 1970-01-01T00:00:00.001 | 1.0 | 1128149335081630826  | host2 |      |
+| 1970-01-01T00:00:00     | 0.0 | 18067404594631612786 | host1 |      |
+| 1970-01-01T00:00:00.001 | 1.0 | 2176048834144407834  |       | job2 |
+| 1970-01-01T00:00:00     | 0.0 | 15980333303142110493 |       | job1 |
++-------------------------+-----+----------------------+-------+------+
+
 DROP TABLE phy;
 
 Affected Rows: 0
diff --git a/tests/cases/standalone/common/insert/logical_metric_table.sql b/tests/cases/standalone/common/insert/logical_metric_table.sql
index fa2b6e0b6d7a..2157d687070a 100644
--- a/tests/cases/standalone/common/insert/logical_metric_table.sql
+++ b/tests/cases/standalone/common/insert/logical_metric_table.sql
@@ -2,7 +2,7 @@ CREATE TABLE phy (ts timestamp time index, val double) engine=metric with ("phys
 
 CREATE TABLE t1 (ts timestamp time index, val double, host string primary key) engine = metric with ("on_physical_table" = "phy");
 
-INSERT INTO t1 VALUES (0, 0, 'host1'), (1, 1, 'host2');
+INSERT INTO t1 VALUES ('host1',0, 0), ('host2', 1, 1,);
 
 SELECT * from t1;
 
@@ -10,7 +10,7 @@ CREATE TABLE t2 (ts timestamp time index, job string primary key, val double) en
 
 SELECT * from t2;
 
-INSERT INTO t2 VALUES (0, 'job1', 0), (1, 'job2', 1);
+INSERT INTO t2 VALUES ('job1', 0, 0), ('job2', 1, 1);
 
 SELECT * from t2;
 
@@ -18,4 +18,8 @@ DROP TABLE t1;
 
 DROP TABLE t2;
 
+DESC TABLE phy;
+
+SELECT ts, val, __tsid, host, job FROM phy;
+
 DROP TABLE phy;
diff --git a/tests/cases/standalone/common/show/show_databases_tables.result b/tests/cases/standalone/common/show/show_databases_tables.result
index 0417ffb85d26..ca5fb1df9d4d 100644
--- a/tests/cases/standalone/common/show/show_databases_tables.result
+++ b/tests/cases/standalone/common/show/show_databases_tables.result
@@ -7,7 +7,6 @@ show databases;
 | illegal-database      |
 | information_schema    |
 | public                |
-| test_public_schema    |
 | upper_case_table_name |
 +-----------------------+
 
diff --git a/tests/cases/standalone/common/system/information_schema.result b/tests/cases/standalone/common/system/information_schema.result
index 23764d8c2bd9..a6dec1d3bafc 100644
--- a/tests/cases/standalone/common/system/information_schema.result
+++ b/tests/cases/standalone/common/system/information_schema.result
@@ -447,7 +447,7 @@ Affected Rows: 0
 
 drop schema my_db;
 
-Error: 1001(Unsupported), Not supported: Drop Database
+Affected Rows: 0
 
 use information_schema;
 
@@ -456,11 +456,8 @@ Affected Rows: 0
 -- test query filter for key_column_usage --
 select * from KEY_COLUMN_USAGE where CONSTRAINT_NAME = 'TIME INDEX';
 
-+--------------------+-------------------+-----------------+---------------+--------------+------------+-------------+------------------+-------------------------------+-------------------------+-----------------------+------------------------+
-| constraint_catalog | constraint_schema | constraint_name | table_catalog | table_schema | table_name | column_name | ordinal_position | position_in_unique_constraint | referenced_table_schema | referenced_table_name | referenced_column_name |
-+--------------------+-------------------+-----------------+---------------+--------------+------------+-------------+------------------+-------------------------------+-------------------------+-----------------------+------------------------+
-| def                | my_db             | TIME INDEX      | def           | my_db        | foo        | ts          | 1                |                               |                         |                       |                        |
-+--------------------+-------------------+-----------------+---------------+--------------+------------+-------------+------------------+-------------------------------+-------------------------+-----------------------+------------------------+
+++
+++
 
 select * from KEY_COLUMN_USAGE where CONSTRAINT_NAME != 'TIME INDEX';
 
@@ -472,11 +469,8 @@ select * from KEY_COLUMN_USAGE where CONSTRAINT_NAME != 'TIME INDEX';
 
 select * from KEY_COLUMN_USAGE where CONSTRAINT_NAME LIKE '%INDEX';
 
-+--------------------+-------------------+-----------------+---------------+--------------+------------+-------------+------------------+-------------------------------+-------------------------+-----------------------+------------------------+
-| constraint_catalog | constraint_schema | constraint_name | table_catalog | table_schema | table_name | column_name | ordinal_position | position_in_unique_constraint | referenced_table_schema | referenced_table_name | referenced_column_name |
-+--------------------+-------------------+-----------------+---------------+--------------+------------+-------------+------------------+-------------------------------+-------------------------+-----------------------+------------------------+
-| def                | my_db             | TIME INDEX      | def           | my_db        | foo        | ts          | 1                |                               |                         |                       |                        |
-+--------------------+-------------------+-----------------+---------------+--------------+------------+-------------+------------------+-------------------------------+-------------------------+-----------------------+------------------------+
+++
+++
 
 select * from KEY_COLUMN_USAGE where CONSTRAINT_NAME NOT LIKE '%INDEX';
 
@@ -512,8 +506,6 @@ select * from schemata where catalog_name = 'greptime' and schema_name != 'publi
 | greptime     | greptime_private      | utf8                       | utf8_bin               |          |
 | greptime     | illegal-database      | utf8                       | utf8_bin               |          |
 | greptime     | information_schema    | utf8                       | utf8_bin               |          |
-| greptime     | my_db                 | utf8                       | utf8_bin               |          |
-| greptime     | test_public_schema    | utf8                       | utf8_bin               |          |
 | greptime     | upper_case_table_name | utf8                       | utf8_bin               |          |
 +--------------+-----------------------+----------------------------+------------------------+----------+
 
@@ -570,7 +562,6 @@ select * from key_column_usage;
 +--------------------+-------------------+-----------------+---------------+--------------+------------+-------------+------------------+-------------------------------+-------------------------+-----------------------+------------------------+
 | constraint_catalog | constraint_schema | constraint_name | table_catalog | table_schema | table_name | column_name | ordinal_position | position_in_unique_constraint | referenced_table_schema | referenced_table_name | referenced_column_name |
 +--------------------+-------------------+-----------------+---------------+--------------+------------+-------------+------------------+-------------------------------+-------------------------+-----------------------+------------------------+
-| def                | my_db             | TIME INDEX      | def           | my_db        | foo        | ts          | 1                |                               |                         |                       |                        |
 | def                | public            | PRIMARY         | def           | public       | numbers    | number      | 1                |                               |                         |                       |                        |
 +--------------------+-------------------+-----------------+---------------+--------------+------------+-------------+------------------+-------------------------------+-------------------------+-----------------------+------------------------+
 
@@ -684,7 +675,7 @@ DESC TABLE GREPTIME_REGION_PEERS;
 
 drop table my_db.foo;
 
-Affected Rows: 0
+Error: 4001(TableNotFound), Table not found: greptime.my_db.foo
 
 use public;
 
diff --git a/tests/runner/Cargo.toml b/tests/runner/Cargo.toml
index 10fdbfeda7a8..adf4df809302 100644
--- a/tests/runner/Cargo.toml
+++ b/tests/runner/Cargo.toml
@@ -11,9 +11,7 @@ workspace = true
 async-trait = "0.1"
 clap.workspace = true
 client.workspace = true
-common-base.workspace = true
 common-error.workspace = true
-common-grpc.workspace = true
 common-query.workspace = true
 common-recordbatch.workspace = true
 common-time.workspace = true
diff --git a/tests/runner/src/env.rs b/tests/runner/src/env.rs
index 0edf7e471e09..ea3e3e1bc10a 100644
--- a/tests/runner/src/env.rs
+++ b/tests/runner/src/env.rs
@@ -199,6 +199,8 @@ impl Env {
         };
         let log_file_name = self.data_home.join(log_file_name).display().to_string();
 
+        println!("{subcommand} log file at {log_file_name}");
+
         let log_file = OpenOptions::new()
             .create(true)
             .write(true)