feat: adds metrics, tracing and retry layer to object-store (#621)

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

.github/workflows/release.yml

@@ -2,6 +2,10 @@ on:
   push:
     tags:
       - "v*.*.*"
+  schedule:
+    # At 00:00 Everyday
+    # https://crontab.guru/every-day-at-midnight
+    - cron: '0 0 * * *'
   workflow_dispatch:
 
 name: Release
@@ -9,6 +13,9 @@ name: Release
 env:
   RUST_TOOLCHAIN: nightly-2022-07-14
 
+  # FIXME(zyy17): Would be better to use `gh release list -L 1 | cut -f 3` to get the latest release version tag, but for a long time, we will stay at 'v0.1.0-alpha-*'.
+  NIGHTLY_BUILD_VERSION_PREFIX: v0.1.0-alpha
+
 jobs:
   build:
     name: Build binary
@@ -106,8 +113,32 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v3
 
+      - name: Configure nightly build version # the version would be ${NIGHTLY_BUILD_VERSION_PREFIX}-YYYYMMDD-nightly, like v0.1.0-alpha-20221119-nightly.
+        shell: bash
+        if: github.event_name == 'schedule'
+        run: |
+          buildTime=`date "+%Y%m%d"`
+          NIGHTLY_VERSION=${{ env.NIGHTLY_BUILD_VERSION_PREFIX }}-$buildTime-nightly
+          echo "NIGHTLY_VERSION=${NIGHTLY_VERSION}" >> $GITHUB_ENV
+
+      - name: Create nightly git tag
+        if: github.event_name == 'schedule'
+        run: |
+          git tag ${{ env.NIGHTLY_VERSION }}
+
+      - name: Publish nightly release # configure the different release title and tags.
+        uses: softprops/action-gh-release@v1
+        if: github.event_name == 'schedule'
+        with:
+          name: "Release ${{ env.NIGHTLY_VERSION }}"
+          tag_name: ${{ env.NIGHTLY_VERSION }}
+          generate_release_notes: true
+          files: |
+            **/greptime-*
+
       - name: Publish release
         uses: softprops/action-gh-release@v1
+        if: github.event_name != 'schedule'
         with:
           name: "Release ${{ github.ref_name }}"
           files: |
@@ -145,12 +176,12 @@ jobs:
           tar xvf greptime-linux-arm64.tgz
           rm greptime-linux-arm64.tgz
 
-      - name: Login to GitHub Container Registry
+      - name: Login to UCloud Container Registry
         uses: docker/login-action@v2
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: uhub.service.ucloud.cn
+          username: ${{ secrets.UCLOUD_USERNAME }}
+          password: ${{ secrets.UCLOUD_PASSWORD }}
 
       - name: Login to Dockerhub
         uses: docker/login-action@v2
@@ -158,11 +189,20 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Configure nightly build image tag # the tag would be ${NIGHTLY_BUILD_VERSION_PREFIX}-YYYYMMDD-nightly
+        shell: bash
+        if: github.event_name == 'schedule'
+        run: |
+          buildTime=`date "+%Y%m%d"`
+          NIGHTLY_VERSION=${{ env.NIGHTLY_BUILD_VERSION_PREFIX }}-$buildTime-nightly
+          echo "IMAGE_TAG=${NIGHTLY_VERSION:1}" >> $GITHUB_ENV
+
       - name: Configure tag # If the release tag is v0.1.0, then the image version tag will be 0.1.0.
         shell: bash
+        if: github.event_name != 'schedule'
         run: |
           VERSION=${{ github.ref_name }}
-          echo "VERSION=${VERSION:1}" >> $GITHUB_ENV
+          echo "IMAGE_TAG=${VERSION:1}" >> $GITHUB_ENV
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -179,5 +219,6 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: |
             greptime/greptimedb:latest
-            greptime/greptimedb:${{ env.VERSION }}
-            ghcr.io/greptimeteam/greptimedb:${{ env.VERSION }}
+            greptime/greptimedb:${{ env.IMAGE_TAG }}
+            uhub.service.ucloud.cn/greptime/greptimedb:latest
+            uhub.service.ucloud.cn/greptime/greptimedb:${{ env.IMAGE_TAG }}

.gitignore

@@ -18,6 +18,7 @@ debug/
 
 # JetBrains IDE config directory
 .idea/
+*.iml
 
 # VSCode IDE config directory
 .vscode/

Cargo.lock

@@ -35,7 +35,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.7",
  "once_cell",
  "version_check",
 ]
@@ -161,6 +161,12 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.2"
@@ -498,7 +504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
 dependencies = [
  "futures-core",
- "getrandom",
+ "getrandom 0.2.7",
  "instant",
  "pin-project-lite",
  "rand 0.8.5",
@@ -507,9 +513,9 @@ dependencies = [
 
 [[package]]
 name = "backon"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62fde477410f4e8a92e2fd4b8536b16ad98270478211d1516cded50bad7208e"
+checksum = "6cd1a59bc091e593ee9ed62df4e4a07115e00a0e0a52fd7e0e04540773939b80"
 dependencies = [
  "futures",
  "pin-project",
@@ -571,6 +577,25 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bincode"
+version = "2.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bb50c5a2ef4b9b1e7ae73e3a73b52ea24b20312d629f9c4df28260b7ad2c3c4"
+dependencies = [
+ "bincode_derive",
+ "serde",
+]
+
+[[package]]
+name = "bincode_derive"
+version = "2.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a45a23389446d2dd25dc8e73a7a3b3c43522b630cac068927f0649d43d719d2"
+dependencies = [
+ "virtue",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.59.2"
@@ -626,6 +651,17 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "blake2b_simd"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.5.2",
+ "constant_time_eq",
+]
+
 [[package]]
 name = "blake3"
 version = "1.3.1"
@@ -633,7 +669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f"
 dependencies = [
  "arrayref",
- "arrayvec",
+ "arrayvec 0.7.2",
  "cc",
  "cfg-if",
  "constant_time_eq",
@@ -1026,7 +1062,7 @@ dependencies = [
  "common-base",
  "common-error",
  "common-grpc",
- "common-insert",
+ "common-grpc-expr",
  "common-query",
  "common-recordbatch",
  "common-time",
@@ -1076,8 +1112,10 @@ dependencies = [
  "datanode",
  "frontend",
  "futures",
+ "meta-client",
  "meta-srv",
  "serde",
+ "servers",
  "snafu",
  "tempdir",
  "tokio",
@@ -1095,6 +1133,18 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "comfy-table"
+version = "6.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1090f39f45786ec6dc6286f8ea9c75d0a7ef0a0d3cda674cef0c3af7b307fbc2"
+dependencies = [
+ "crossterm",
+ "strum 0.24.1",
+ "strum_macros 0.24.3",
+ "unicode-width",
+]
+
 [[package]]
 name = "common-base"
 version = "0.1.0"
@@ -1138,7 +1188,6 @@ name = "common-function"
 version = "0.1.0"
 dependencies = [
  "arc-swap",
- "arrow2",
  "chrono-tz",
  "common-error",
  "common-function-macro",
@@ -1175,7 +1224,6 @@ name = "common-grpc"
 version = "0.1.0"
 dependencies = [
  "api",
- "arrow2",
  "async-trait",
  "common-base",
  "common-error",
@@ -1194,12 +1242,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "common-insert"
+name = "common-grpc-expr"
 version = "0.1.0"
 dependencies = [
  "api",
  "async-trait",
  "common-base",
+ "common-catalog",
  "common-error",
  "common-query",
  "common-telemetry",
@@ -1213,7 +1262,6 @@ dependencies = [
 name = "common-query"
 version = "0.1.0"
 dependencies = [
- "arrow2",
  "async-trait",
  "common-base",
  "common-error",
@@ -1545,6 +1593,31 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "crossterm"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+dependencies = [
+ "bitflags",
+ "crossterm_winapi",
+ "libc",
+ "mio",
+ "parking_lot",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -1640,7 +1713,7 @@ dependencies = [
  "arrow2",
  "async-trait",
  "chrono",
- "comfy-table",
+ "comfy-table 5.0.1",
  "datafusion-common",
  "datafusion-expr",
  "datafusion-physical-expr",
@@ -1712,18 +1785,18 @@ name = "datanode"
 version = "0.1.0"
 dependencies = [
  "api",
- "arrow2",
  "async-trait",
  "axum 0.6.0-rc.2",
  "axum-macros",
  "axum-test-helper",
+ "backon",
  "catalog",
  "client",
  "common-base",
  "common-catalog",
  "common-error",
  "common-grpc",
- "common-insert",
+ "common-grpc-expr",
  "common-query",
  "common-recordbatch",
  "common-runtime",
@@ -1832,6 +1905,17 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "dirs"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
+dependencies = [
+ "libc",
+ "redox_users 0.3.5",
+ "winapi",
+]
+
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -1858,7 +1942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
 dependencies = [
  "libc",
- "redox_users",
+ "redox_users 0.4.3",
  "winapi",
 ]
 
@@ -1869,7 +1953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
  "libc",
- "redox_users",
+ "redox_users 0.4.3",
  "winapi",
 ]
 
@@ -2093,7 +2177,6 @@ name = "frontend"
 version = "0.1.0"
 dependencies = [
  "api",
- "arrow2",
  "async-stream",
  "async-trait",
  "catalog",
@@ -2103,7 +2186,7 @@ dependencies = [
  "common-catalog",
  "common-error",
  "common-grpc",
- "common-insert",
+ "common-grpc-expr",
  "common-query",
  "common-recordbatch",
  "common-runtime",
@@ -2337,6 +2420,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.7"
@@ -3013,12 +3107,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -3562,20 +3650,23 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "opendal"
-version = "0.17.4"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ac2fba66b4b574259a4e1c6a1b57b8e649682ed7da167c9cde120c1495f2cd"
+checksum = "63b17b778cf11d10fbaaae4a5a0f82d5c6f527f96a9e4843f4e2dd6cd0dbe580"
 dependencies = [
  "anyhow",
  "async-compat",
  "async-trait",
+ "backon",
  "base64",
+ "bincode 2.0.0-rc.2",
  "bytes",
  "flagset",
  "futures",
  "http",
  "log",
- "md5",
+ "md-5",
+ "metrics",
  "once_cell",
  "parking_lot",
  "percent-encoding",
@@ -3588,6 +3679,7 @@ dependencies = [
  "thiserror",
  "time 0.3.14",
  "tokio",
+ "tracing",
  "ureq",
 ]
 
@@ -3604,9 +3696,9 @@ dependencies = [
 
 [[package]]
 name = "opensrv-mysql"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bcb5fc2fda7e5e5f8478cd637285bbdd6196a9601e32293d0897e469a7dd020"
+checksum = "e4c24c12fd688cb5aa5b1a54c6ccb2e30fb9b5132debb0e89fcb432b3f73db8f"
 dependencies = [
  "async-trait",
  "byteorder",
@@ -3743,7 +3835,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "petgraph",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
  "thread-id",
  "windows-sys",
@@ -4140,6 +4232,17 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
+[[package]]
+name = "prettydiff"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b6176190f1637d46034820b82fbe758727ccb40da9c9fc2255d695eb05ea29c"
+dependencies = [
+ "ansi_term",
+ "prettytable-rs",
+ "structopt",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.1.19"
@@ -4150,6 +4253,20 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "prettytable-rs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e"
+dependencies = [
+ "atty",
+ "csv",
+ "encode_unicode",
+ "lazy_static",
+ "term",
+ "unicode-width",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "1.2.1"
@@ -4339,7 +4456,6 @@ version = "0.1.0"
 dependencies = [
  "approx_eq",
  "arc-swap",
- "arrow2",
  "async-trait",
  "catalog",
  "common-catalog",
@@ -4360,6 +4476,7 @@ dependencies = [
  "metrics",
  "num",
  "num-traits",
+ "once_cell",
  "paste",
  "rand 0.8.5",
  "serde",
@@ -4376,9 +4493,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e21a144a0ffb5fad7b464babcdab934a325ad69b7c0373bcfef5cbd9799ca9"
+checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd"
 dependencies = [
  "memchr",
  "serde",
@@ -4464,7 +4581,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.7",
 ]
 
 [[package]]
@@ -4525,6 +4642,12 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -4534,14 +4657,25 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_users"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
+dependencies = [
+ "getrandom 0.1.16",
+ "redox_syscall 0.1.57",
+ "rust-argon2",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom",
- "redox_syscall",
+ "getrandom 0.2.7",
+ "redox_syscall 0.2.16",
  "thiserror",
 ]
 
@@ -4582,15 +4716,15 @@ dependencies = [
 
 [[package]]
 name = "reqsign"
-version = "0.4.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6e28b79573bf9e503b514799a5533935fa63bec22d582d4d11cab1eab7a040d"
+checksum = "e22524be78041476bf8673f2720fa1000f34432b384d9ad5846b024569a4b150"
 dependencies = [
  "anyhow",
  "backon",
  "base64",
  "bytes",
- "dirs",
+ "dirs 4.0.0",
  "form_urlencoded",
  "hex",
  "hmac",
@@ -4698,6 +4832,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "rust-argon2"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
+dependencies = [
+ "base64",
+ "blake2b_simd",
+ "constant_time_eq",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "rust-ini"
 version = "0.18.0"
@@ -4714,7 +4860,7 @@ version = "1.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee9164faf726e4f3ece4978b25ca877ddc6802fa77f38cdccb32c7f805ecd70c"
 dependencies = [
- "arrayvec",
+ "arrayvec 0.7.2",
  "num-traits",
  "serde",
 ]
@@ -4810,7 +4956,7 @@ name = "rustpython-bytecode"
 version = "0.1.2"
 source = "git+https://github.com/RustPython/RustPython?rev=02a1d1d#02a1d1d7db57afbb78049599c2585cc7cd59e6d3"
 dependencies = [
- "bincode",
+ "bincode 1.3.3",
  "bitflags",
  "bstr",
  "itertools",
@@ -4942,7 +5088,7 @@ dependencies = [
  "crossbeam-utils",
  "exitcode",
  "flate2",
- "getrandom",
+ "getrandom 0.2.7",
  "half",
  "hex",
  "hexf-parse",
@@ -5351,6 +5497,27 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
+[[package]]
+name = "signal-hook"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+dependencies = [
+ "libc",
+ "mio",
+ "signal-hook",
+]
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.0"
@@ -5505,6 +5672,32 @@ dependencies = [
  "sqlparser",
 ]
 
+[[package]]
+name = "sqlness"
+version = "0.1.0"
+source = "git+https://github.com/ceresdb/sqlness.git#c077b17d73ab25460c152dc34e8f80f904522a57"
+dependencies = [
+ "async-trait",
+ "derive_builder",
+ "prettydiff",
+ "serde",
+ "thiserror",
+ "tokio",
+ "toml",
+ "walkdir",
+]
+
+[[package]]
+name = "sqlness-runner"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "client",
+ "comfy-table 6.1.2",
+ "sqlness",
+ "tokio",
+]
+
 [[package]]
 name = "sqlparser"
 version = "0.15.0"
@@ -5672,6 +5865,30 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "structopt"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
+dependencies = [
+ "clap 2.34.0",
+ "lazy_static",
+ "structopt-derive",
+]
+
+[[package]]
+name = "structopt-derive"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
+dependencies = [
+ "heck 0.3.3",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "strum"
 version = "0.23.0"
@@ -5839,11 +6056,22 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "remove_dir_all",
  "winapi",
 ]
 
+[[package]]
+name = "term"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
+dependencies = [
+ "byteorder",
+ "dirs 1.0.5",
+ "winapi",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.3"
@@ -5905,7 +6133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f"
 dependencies = [
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "winapi",
 ]
 
@@ -5972,6 +6200,7 @@ dependencies = [
  "itoa 1.0.3",
  "libc",
  "num_threads",
+ "serde",
  "time-macros",
 ]
 
@@ -6406,7 +6635,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
- "rand 0.8.5",
+ "rand 0.4.6",
  "static_assertions",
 ]
 
@@ -6583,7 +6812,6 @@ checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
 dependencies = [
  "base64",
  "chunked_transfer",
- "flate2",
  "log",
  "once_cell",
  "rustls",
@@ -6616,7 +6844,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.7",
 ]
 
 [[package]]
@@ -6643,6 +6871,12 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "virtue"
+version = "0.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b60dcd6a64dd45abf9bd426970c9843726da7fc08f44cd6fcebf68c21220a63"
+
 [[package]]
 name = "volatile"
 version = "0.3.0"
@@ -6676,6 +6910,12 @@ dependencies = [
  "try-lock",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
 [[package]]
 name = "wasi"
 version = "0.10.2+wasi-snapshot-preview1"

Cargo.toml

@@ -15,7 +15,7 @@ members = [
     "src/common/recordbatch",
     "src/common/runtime",
     "src/common/substrait",
-    "src/common/insert",
+    "src/common/grpc-expr",
     "src/common/telemetry",
     "src/common/time",
     "src/datanode",
@@ -33,6 +33,7 @@ members = [
     "src/store-api",
     "src/table",
     "src/mito",
+    "tests/runner",
 ]
 
 [profile.release]

README.md

@@ -53,8 +53,10 @@ To compile GreptimeDB from source, you'll need:
   install correct Rust version for you.
 - Protobuf: `protoc` is required for compiling `.proto` files. `protobuf` is
   available from major package manager on macos and linux distributions. You can
-  find an installation instructions
-  [here](https://grpc.io/docs/protoc-installation/).
+  find an installation instructions [here](https://grpc.io/docs/protoc-installation/).
+  **Note that `protoc` version needs to be >= 3.15** because we have used the `optional`
+  keyword. You can check it with `protoc --version`.
+  
 
 #### Build with Docker
 
@@ -114,7 +116,10 @@ about Kubernetes deployment, check our [docs](https://docs.greptime.com/).
 4. Query the data:
 
    ```SQL
-   mysql> SELECT * FROM monitor;
+   SELECT * FROM monitor;
+   ```
+
+   ```TEXT
    +-------+---------------------+------+--------+
    | host  | ts                  | cpu  | memory |
    +-------+---------------------+------+--------+
@@ -169,7 +174,7 @@ community, please check out:
 
 In addition, you may:
 
-- View our official [Blog](https://greptime.com/blog)
+- View our official [Blog](https://greptime.com/blogs/index)
 - Connect us with [Linkedin](https://www.linkedin.com/company/greptime/)
 - Follow us on [Twitter](https://twitter.com/greptime)
 
@@ -189,3 +194,4 @@ Please refer to [contribution guidelines](CONTRIBUTING.md) for more information.
 - GreptimeDB's query engine is powered by [Apache Arrow DataFusion](https://github.com/apache/arrow-datafusion).
 - [OpenDAL](https://github.com/datafuselabs/opendal) from [Datafuse Labs](https://github.com/datafuselabs) gives GreptimeDB a very general and elegant data access abstraction layer.
 - GreptimeDB’s meta service is based on [etcd](https://etcd.io/).
+- GreptimeDB uses [RustPython](https://github.com/RustPython/RustPython) for experimental embedded python scripting.

codecov.yml

@@ -7,3 +7,4 @@ coverage:
     patch: off
 ignore:
   - "**/error*.rs" # ignore all error.rs files
+  - "tests/runner/*.rs" # ignore integration test runner

config/datanode.example.toml

@@ -3,7 +3,7 @@ mode = 'distributed'
 rpc_addr = '127.0.0.1:3001'
 wal_dir = '/tmp/greptimedb/wal'
 rpc_runtime_size = 8
-mysql_addr = '127.0.0.1:3306'
+mysql_addr = '127.0.0.1:4406'
 mysql_runtime_size = 4
 
 [storage]
@@ -11,7 +11,7 @@ type = 'File'
 data_dir = '/tmp/greptimedb/data/'
 
 [meta_client_opts]
-metasrv_addr = '1.1.1.1:3002'
+metasrv_addrs = ['127.0.0.1:3002']
 timeout_millis = 3000
 connect_timeout_millis = 5000
 tcp_nodelay = false

config/frontend.example.toml

@@ -3,7 +3,7 @@ datanode_rpc_addr = '127.0.0.1:3001'
 http_addr = '127.0.0.1:4000'
 
 [meta_client_opts]
-metasrv_addr = '1.1.1.1:3002'
+metasrv_addrs = ['127.0.0.1:3002']
 timeout_millis = 3000
 connect_timeout_millis = 5000
 tcp_nodelay = false

config/standalone.example.toml

@@ -1,8 +1,6 @@
 node_id = 0
 mode = 'standalone'
 http_addr = '127.0.0.1:4000'
-datanode_mysql_addr = '127.0.0.1:3306'
-datanode_mysql_runtime_size = 4
 wal_dir = '/tmp/greptimedb/wal/'
 
 [storage]

docs/how-to/how-to-write-aggregate-function.md

@@ -55,7 +55,7 @@ The DataFusion basically execute aggregate like this:
 2. Call `update_batch` on each accumulator with partitioned data, to let you update your aggregate calculation.
 3. Call `state` to get each accumulator's internal state, the medial calculation result.
 4. Call `merge_batch` to merge all accumulator's internal state to one.
-5. Execute `evalute` on the chosen one to get the final calculation result.
+5. Execute `evaluate` on the chosen one to get the final calculation result.
 
 Once you know the meaning of each method, you can easily write your accumulator. You can refer to `Median` accumulator or `SUM` accumulator defined in  file `my_sum_udaf_example.rs` for more details.
 
@@ -63,7 +63,7 @@ Once you know the meaning of each method, you can easily write your accumulator.
 
 You can call `register_aggregate_function` method in query engine to register your aggregate function. To do that, you have to new an instance of struct `AggregateFunctionMeta`. The struct has three fields, first is the name of your aggregate function's name. The function name is case-sensitive due to DataFusion's restriction. We strongly recommend using lowercase for your name. If you have to use uppercase name, wrap your aggregate function with quotation marks. For example, if you define an aggregate function named "my_aggr", you can use "`SELECT MY_AGGR(x)`"; if you define "my_AGGR", you have to use "`SELECT "my_AGGR"(x)`".
 
-The second field is arg_counts ,the count of the arguments. Like accumulator `percentile`, caculating the p_number of the column. We need to input the value of column and the value of p to cacalate, and so the count of the arguments is two.
+The second field is arg_counts ,the count of the arguments. Like accumulator `percentile`, calculating the p_number of the column. We need to input the value of column and the value of p to cacalate, and so the count of the arguments is two.
 
 The third field is a function about how to create your accumulator creator that you defined in step 1 above. Create creator, that's a bit intertwined, but it is how we make DataFusion use a newly created aggregate function each time it executes a SQL, preventing the stored input types from affecting each other. The key detail can be starting looking at our `DfContextProviderAdapter` struct's `get_aggregate_meta` method.
 

src/api/greptime/v1/admin.proto

@@ -51,6 +51,7 @@ message AlterExpr {
   string table_name = 3;
   oneof kind {
     AddColumns add_columns = 4;
+    DropColumns drop_columns = 5;
   }
 }
 
@@ -58,11 +59,19 @@ message AddColumns {
   repeated AddColumn add_columns = 1;
 }
 
+message DropColumns {
+  repeated DropColumn drop_columns = 1;
+}
+
 message AddColumn {
   ColumnDef column_def = 1;
   bool is_key = 2;
 }
 
+message DropColumn {
+  string name = 1;
+}
+
 message CreateDatabaseExpr {
   //TODO(hl): maybe rename to schema_name?
   string database_name = 1;

src/api/greptime/v1/meta/heartbeat.proto

@@ -39,7 +39,7 @@ message NodeStat {
   uint64 wcus = 2;
   // Table number in this node
   uint64 table_num = 3;
-  // Regon number in this node
+  // Region number in this node
   uint64 region_num = 4;
 
   double cpu_usage = 5;

src/api/src/error.rs

@@ -33,6 +33,28 @@ pub enum Error {
         from: ConcreteDataType,
         backtrace: Backtrace,
     },
+
+    #[snafu(display(
+        "Failed to convert column default constraint, column: {}, source: {}",
+        column,
+        source
+    ))]
+    ConvertColumnDefaultConstraint {
+        column: String,
+        #[snafu(backtrace)]
+        source: datatypes::error::Error,
+    },
+
+    #[snafu(display(
+        "Invalid column default constraint, column: {}, source: {}",
+        column,
+        source
+    ))]
+    InvalidColumnDefaultConstraint {
+        column: String,
+        #[snafu(backtrace)]
+        source: datatypes::error::Error,
+    },
 }
 
 impl ErrorExt for Error {
@@ -40,6 +62,8 @@ impl ErrorExt for Error {
         match self {
             Error::UnknownColumnDataType { .. } => StatusCode::InvalidArguments,
             Error::IntoColumnDataType { .. } => StatusCode::Unexpected,
+            Error::ConvertColumnDefaultConstraint { source, .. }
+            | Error::InvalidColumnDefaultConstraint { source, .. } => source.status_code(),
         }
     }
     fn backtrace_opt(&self) -> Option<&Backtrace> {

src/api/src/v1.rs

@@ -21,4 +21,5 @@ pub mod codec {
     tonic::include_proto!("greptime.v1.codec");
 }
 
+mod column_def;
 pub mod meta;

src/api/src/v1/column_def.rs

@@ -0,0 +1,38 @@
+// Copyright 2022 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 datatypes::schema::{ColumnDefaultConstraint, ColumnSchema};
+use snafu::ResultExt;
+
+use crate::error::{self, Result};
+use crate::helper::ColumnDataTypeWrapper;
+use crate::v1::ColumnDef;
+
+impl ColumnDef {
+    pub fn try_as_column_schema(&self) -> Result<ColumnSchema> {
+        let data_type = ColumnDataTypeWrapper::try_new(self.datatype)?;
+
+        let constraint = match &self.default_constraint {
+            None => None,
+            Some(v) => Some(
+                ColumnDefaultConstraint::try_from(&v[..])
+                    .context(error::ConvertColumnDefaultConstraintSnafu { column: &self.name })?,
+            ),
+        };
+
+        ColumnSchema::new(&self.name, data_type.into(), self.is_nullable)
+            .with_default_constraint(constraint)
+            .context(error::InvalidColumnDefaultConstraintSnafu { column: &self.name })
+    }
+}

src/catalog/Cargo.toml

@@ -27,7 +27,7 @@ futures = "0.3"
 futures-util = "0.3"
 lazy_static = "1.4"
 meta-client = { path = "../meta-client" }
-opendal = "0.17"
+opendal = "0.20"
 regex = "1.6"
 serde = "1.0"
 serde_json = "1.0"
@@ -40,7 +40,7 @@ tokio = { version = "1.18", features = ["full"] }
 chrono = "0.4"
 log-store = { path = "../log-store" }
 object-store = { path = "../object-store" }
-opendal = "0.17"
+opendal = "0.20"
 storage = { path = "../storage" }
 mito = { path = "../mito" }
 tempdir = "0.3"

src/catalog/src/error.rs

@@ -185,8 +185,8 @@ pub enum Error {
         source: meta_client::error::Error,
     },
 
-    #[snafu(display("Invalid table schema in catalog, source: {:?}", source))]
-    InvalidSchemaInCatalog {
+    #[snafu(display("Invalid table info in catalog, source: {}", source))]
+    InvalidTableInfoInCatalog {
         #[snafu(backtrace)]
         source: datatypes::error::Error,
     },
@@ -233,7 +233,7 @@ impl ErrorExt for Error {
             Error::SystemCatalogTableScan { source } => source.status_code(),
             Error::SystemCatalogTableScanExec { source } => source.status_code(),
             Error::InvalidTableSchema { source, .. } => source.status_code(),
-            Error::InvalidSchemaInCatalog { .. } => StatusCode::Unexpected,
+            Error::InvalidTableInfoInCatalog { .. } => StatusCode::Unexpected,
             Error::Internal { source, .. } => source.status_code(),
         }
     }

src/catalog/src/local/manager.rs

@@ -241,6 +241,7 @@ impl LocalCatalogManager {
             schema_name: t.schema_name.clone(),
             table_name: t.table_name.clone(),
             table_id: t.table_id,
+            region_numbers: vec![0],
         };
 
         let option = self

src/catalog/src/remote/manager.rs

@@ -250,10 +250,7 @@ impl RemoteCatalogManager {
             let table_ref = self.open_or_create_table(&table_key, &table_value).await?;
             schema.register_table(table_key.table_name.to_string(), table_ref)?;
             info!("Registered table {}", &table_key.table_name);
-            if table_value.id > max_table_id {
-                info!("Max table id: {} -> {}", max_table_id, table_value.id);
-                max_table_id = table_value.id;
-            }
+            max_table_id = max_table_id.max(table_value.table_id());
             table_num += 1;
         }
         info!(
@@ -311,25 +308,33 @@ impl RemoteCatalogManager {
             ..
         } = table_key;
 
+        let table_id = table_value.table_id();
+
         let TableGlobalValue {
-            id,
-            meta,
+            table_info,
             regions_id_map,
             ..
         } = table_value;
 
+        // unwrap safety: checked in yielding this table when `iter_remote_tables`
+        let region_numbers = regions_id_map.get(&self.node_id).unwrap();
+
         let request = OpenTableRequest {
             catalog_name: catalog_name.clone(),
             schema_name: schema_name.clone(),
             table_name: table_name.clone(),
-            table_id: *id,
+            table_id,
+            region_numbers: region_numbers.clone(),
         };
         match self
             .engine
             .open_table(&context, request)
             .await
             .with_context(|_| OpenTableSnafu {
-                table_info: format!("{}.{}.{}, id:{}", catalog_name, schema_name, table_name, id,),
+                table_info: format!(
+                    "{}.{}.{}, id:{}",
+                    catalog_name, schema_name, table_name, table_id
+                ),
             })? {
             Some(table) => {
                 info!(
@@ -344,6 +349,7 @@ impl RemoteCatalogManager {
                     catalog_name, schema_name, table_name
                 );
 
+                let meta = &table_info.meta;
                 let schema = meta
                     .schema
                     .clone()
@@ -353,13 +359,13 @@ impl RemoteCatalogManager {
                         schema: meta.schema.clone(),
                     })?;
                 let req = CreateTableRequest {
-                    id: *id,
+                    id: table_id,
                     catalog_name: catalog_name.clone(),
                     schema_name: schema_name.clone(),
                     table_name: table_name.clone(),
                     desc: None,
                     schema: Arc::new(schema),
-                    region_numbers: regions_id_map.get(&self.node_id).unwrap().clone(), // this unwrap is safe because region_id_map is checked in `iter_remote_tables`
+                    region_numbers: region_numbers.clone(),
                     primary_key_indices: meta.primary_key_indices.clone(),
                     create_if_not_exists: true,
                     table_options: meta.options.clone(),
@@ -371,7 +377,7 @@ impl RemoteCatalogManager {
                     .context(CreateTableSnafu {
                         table_info: format!(
                             "{}.{}.{}, id:{}",
-                            &catalog_name, &schema_name, &table_name, id
+                            &catalog_name, &schema_name, &table_name, table_id
                         ),
                     })
             }

src/catalog/src/system.rs

@@ -87,6 +87,7 @@ impl SystemCatalogTable {
             schema_name: INFORMATION_SCHEMA_NAME.to_string(),
             table_name: SYSTEM_CATALOG_TABLE_NAME.to_string(),
             table_id: SYSTEM_CATALOG_TABLE_ID,
+            region_numbers: vec![0],
         };
         let schema = Arc::new(build_system_catalog_schema());
         let ctx = EngineContext::default();
@@ -134,7 +135,6 @@ impl SystemCatalogTable {
             .context(error::SystemCatalogTableScanSnafu)?;
         let stream = scan
             .execute(0, Arc::new(RuntimeEnv::default()))
-            .await
             .context(error::SystemCatalogTableScanExecSnafu)?;
         Ok(stream)
     }
@@ -384,7 +384,7 @@ mod tests {
     use super::*;
 
     #[test]
-    pub fn test_decode_catalog_enrty() {
+    pub fn test_decode_catalog_entry() {
         let entry = decode_system_catalog(
             Some(EntryType::Catalog as u8),
             Some("some_catalog".as_bytes()),

src/catalog/src/tables.rs

@@ -368,7 +368,6 @@ mod tests {
         let tables_stream = tables.scan(&None, &[], None).await.unwrap();
         let mut tables_stream = tables_stream
             .execute(0, Arc::new(RuntimeEnv::default()))
-            .await
             .unwrap();
 
         if let Some(t) = tables_stream.next().await {

src/client/Cargo.toml

@@ -13,7 +13,7 @@ common-error = { path = "../common/error" }
 common-grpc = { path = "../common/grpc" }
 common-query = { path = "../common/query" }
 common-recordbatch = { path = "../common/recordbatch" }
-common-insert = { path = "../common/insert" }
+common-grpc-expr = { path = "../common/grpc-expr" }
 common-time = { path = "../common/time" }
 datafusion = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", features = [
     "simd",

src/client/examples/insert.rs

@@ -43,7 +43,7 @@ async fn run() {
 
 fn insert_batches() -> Vec<Vec<u8>> {
     const SEMANTIC_TAG: i32 = 0;
-    const SEMANTIC_FEILD: i32 = 1;
+    const SEMANTIC_FIELD: i32 = 1;
     const SEMANTIC_TS: i32 = 2;
 
     let row_count = 4;
@@ -71,7 +71,7 @@ fn insert_batches() -> Vec<Vec<u8>> {
     };
     let cpu_column = Column {
         column_name: "cpu".to_string(),
-        semantic_type: SEMANTIC_FEILD,
+        semantic_type: SEMANTIC_FIELD,
         values: Some(cpu_vals),
         null_mask: vec![2],
         ..Default::default()
@@ -83,7 +83,7 @@ fn insert_batches() -> Vec<Vec<u8>> {
     };
     let mem_column = Column {
         column_name: "memory".to_string(),
-        semantic_type: SEMANTIC_FEILD,
+        semantic_type: SEMANTIC_FIELD,
         values: Some(mem_vals),
         null_mask: vec![4],
         ..Default::default()

src/client/src/database.rs

@@ -22,8 +22,8 @@ use api::v1::{
     SelectExpr,
 };
 use common_error::status_code::StatusCode;
-use common_grpc::{AsExcutionPlan, DefaultAsPlanImpl};
-use common_insert::column_to_vector;
+use common_grpc::{AsExecutionPlan, DefaultAsPlanImpl};
+use common_grpc_expr::column_to_vector;
 use common_query::Output;
 use common_recordbatch::{RecordBatch, RecordBatches};
 use datafusion::physical_plan::ExecutionPlan;

src/client/src/error.rs

@@ -103,7 +103,7 @@ pub enum Error {
     #[snafu(display("Failed to convert column to vector, source: {}", source))]
     ColumnToVector {
         #[snafu(backtrace)]
-        source: common_insert::error::Error,
+        source: common_grpc_expr::error::Error,
     },
 }
 

src/cmd/Cargo.toml

@@ -15,11 +15,13 @@ common-error = { path = "../common/error" }
 common-telemetry = { path = "../common/telemetry", features = [
     "deadlock_detection",
 ] }
+meta-client = { path = "../meta-client" }
 datanode = { path = "../datanode" }
 frontend = { path = "../frontend" }
 futures = "0.3"
 meta-srv = { path = "../meta-srv" }
 serde = "1.0"
+servers = {path = "../servers"}
 snafu = { version = "0.7", features = ["backtraces"] }
 tokio = { version = "1.18", features = ["full"] }
 toml = "0.5"

src/cmd/src/datanode.rs

@@ -14,8 +14,9 @@
 
 use clap::Parser;
 use common_telemetry::logging;
-use datanode::datanode::{Datanode, DatanodeOptions};
-use frontend::frontend::Mode;
+use datanode::datanode::{Datanode, DatanodeOptions, ObjectStoreConfig};
+use meta_client::MetaClientOpts;
+use servers::Mode;
 use snafu::ResultExt;
 
 use crate::error::{Error, MissingConfigSnafu, Result, StartDatanodeSnafu};
@@ -46,7 +47,7 @@ impl SubCommand {
     }
 }
 
-#[derive(Debug, Parser)]
+#[derive(Debug, Parser, Default)]
 struct StartCommand {
     #[clap(long)]
     node_id: Option<u64>,
@@ -58,6 +59,10 @@ struct StartCommand {
     metasrv_addr: Option<String>,
     #[clap(short, long)]
     config_file: Option<String>,
+    #[clap(long)]
+    data_dir: Option<String>,
+    #[clap(long)]
+    wal_dir: Option<String>,
 }
 
 impl StartCommand {
@@ -98,7 +103,13 @@ impl TryFrom<StartCommand> for DatanodeOptions {
         }
 
         if let Some(meta_addr) = cmd.metasrv_addr {
-            opts.meta_client_opts.metasrv_addr = meta_addr;
+            opts.meta_client_opts
+                .get_or_insert_with(MetaClientOpts::default)
+                .metasrv_addrs = meta_addr
+                .split(',')
+                .map(&str::trim)
+                .map(&str::to_string)
+                .collect::<_>();
             opts.mode = Mode::Distributed;
         }
 
@@ -108,6 +119,14 @@ impl TryFrom<StartCommand> for DatanodeOptions {
             }
             .fail();
         }
+
+        if let Some(data_dir) = cmd.data_dir {
+            opts.storage = ObjectStoreConfig::File { data_dir };
+        }
+
+        if let Some(wal_dir) = cmd.wal_dir {
+            opts.wal_dir = wal_dir;
+        }
         Ok(opts)
     }
 }
@@ -117,34 +136,35 @@ mod tests {
     use std::assert_matches::assert_matches;
 
     use datanode::datanode::ObjectStoreConfig;
-    use frontend::frontend::Mode;
+    use servers::Mode;
 
     use super::*;
 
     #[test]
     fn test_read_from_config_file() {
         let cmd = StartCommand {
-            node_id: None,
-            rpc_addr: None,
-            mysql_addr: None,
-            metasrv_addr: None,
             config_file: Some(format!(
                 "{}/../../config/datanode.example.toml",
                 std::env::current_dir().unwrap().as_path().to_str().unwrap()
             )),
+            ..Default::default()
         };
         let options: DatanodeOptions = cmd.try_into().unwrap();
         assert_eq!("127.0.0.1:3001".to_string(), options.rpc_addr);
         assert_eq!("/tmp/greptimedb/wal".to_string(), options.wal_dir);
-        assert_eq!("127.0.0.1:3306".to_string(), options.mysql_addr);
+        assert_eq!("127.0.0.1:4406".to_string(), options.mysql_addr);
         assert_eq!(4, options.mysql_runtime_size);
-        assert_eq!(
-            "1.1.1.1:3002".to_string(),
-            options.meta_client_opts.metasrv_addr
-        );
-        assert_eq!(5000, options.meta_client_opts.connect_timeout_millis);
-        assert_eq!(3000, options.meta_client_opts.timeout_millis);
-        assert!(!options.meta_client_opts.tcp_nodelay);
+        let MetaClientOpts {
+            metasrv_addrs: metasrv_addr,
+            timeout_millis,
+            connect_timeout_millis,
+            tcp_nodelay,
+        } = options.meta_client_opts.unwrap();
+
+        assert_eq!(vec!["127.0.0.1:3002".to_string()], metasrv_addr);
+        assert_eq!(5000, connect_timeout_millis);
+        assert_eq!(3000, timeout_millis);
+        assert!(!tcp_nodelay);
 
         match options.storage {
             ObjectStoreConfig::File { data_dir } => {
@@ -157,44 +177,30 @@ mod tests {
     fn test_try_from_cmd() {
         assert_eq!(
             Mode::Standalone,
-            DatanodeOptions::try_from(StartCommand {
-                node_id: None,
-                rpc_addr: None,
-                mysql_addr: None,
-                metasrv_addr: None,
-                config_file: None
-            })
-            .unwrap()
-            .mode
+            DatanodeOptions::try_from(StartCommand::default())
+                .unwrap()
+                .mode
         );
 
         let mode = DatanodeOptions::try_from(StartCommand {
             node_id: Some(42),
-            rpc_addr: None,
-            mysql_addr: None,
             metasrv_addr: Some("127.0.0.1:3002".to_string()),
-            config_file: None,
+            ..Default::default()
         })
         .unwrap()
         .mode;
         assert_matches!(mode, Mode::Distributed);
 
         assert!(DatanodeOptions::try_from(StartCommand {
-            node_id: None,
-            rpc_addr: None,
-            mysql_addr: None,
             metasrv_addr: Some("127.0.0.1:3002".to_string()),
-            config_file: None,
+            ..Default::default()
         })
         .is_err());
 
         // Providing node_id but leave metasrv_addr absent is ok since metasrv_addr has default value
         DatanodeOptions::try_from(StartCommand {
             node_id: Some(42),
-            rpc_addr: None,
-            mysql_addr: None,
-            metasrv_addr: None,
-            config_file: None,
+            ..Default::default()
         })
         .unwrap();
     }
@@ -202,17 +208,23 @@ mod tests {
     #[test]
     fn test_merge_config() {
         let dn_opts = DatanodeOptions::try_from(StartCommand {
-            node_id: None,
-            rpc_addr: None,
-            mysql_addr: None,
-            metasrv_addr: None,
             config_file: Some(format!(
                 "{}/../../config/datanode.example.toml",
                 std::env::current_dir().unwrap().as_path().to_str().unwrap()
             )),
+            ..Default::default()
         })
         .unwrap();
         assert_eq!(Some(42), dn_opts.node_id);
-        assert_eq!("1.1.1.1:3002", dn_opts.meta_client_opts.metasrv_addr);
+        let MetaClientOpts {
+            metasrv_addrs: metasrv_addr,
+            timeout_millis,
+            connect_timeout_millis,
+            tcp_nodelay,
+        } = dn_opts.meta_client_opts.unwrap();
+        assert_eq!(vec!["127.0.0.1:3002".to_string()], metasrv_addr);
+        assert_eq!(3000, timeout_millis);
+        assert_eq!(5000, connect_timeout_millis);
+        assert!(!tcp_nodelay);
     }
 }

src/cmd/src/error.rs

@@ -97,10 +97,7 @@ mod tests {
     #[test]
     fn test_start_node_error() {
         fn throw_datanode_error() -> StdResult<datanode::error::Error> {
-            datanode::error::MissingFieldSnafu {
-                field: "test_field",
-            }
-            .fail()
+            datanode::error::MissingNodeIdSnafu {}.fail()
         }
 
         let e = throw_datanode_error()

src/cmd/src/frontend.rs

@@ -13,13 +13,15 @@
 // limitations under the License.
 
 use clap::Parser;
-use frontend::frontend::{Frontend, FrontendOptions, Mode};
+use frontend::frontend::{Frontend, FrontendOptions};
 use frontend::grpc::GrpcOptions;
 use frontend::influxdb::InfluxdbOptions;
 use frontend::instance::Instance;
 use frontend::mysql::MysqlOptions;
 use frontend::opentsdb::OpentsdbOptions;
 use frontend::postgres::PostgresOptions;
+use meta_client::MetaClientOpts;
+use servers::Mode;
 use snafu::ResultExt;
 
 use crate::error::{self, Result};
@@ -124,13 +126,13 @@ impl TryFrom<StartCommand> for FrontendOptions {
             opts.influxdb_options = Some(InfluxdbOptions { enable });
         }
         if let Some(metasrv_addr) = cmd.metasrv_addr {
-            opts.metasrv_addr = Some(
-                metasrv_addr
-                    .split(',')
-                    .into_iter()
-                    .map(|x| x.trim().to_string())
-                    .collect::<Vec<String>>(),
-            );
+            opts.meta_client_opts
+                .get_or_insert_with(MetaClientOpts::default)
+                .metasrv_addrs = metasrv_addr
+                .split(',')
+                .map(&str::trim)
+                .map(&str::to_string)
+                .collect::<Vec<_>>();
             opts.mode = Mode::Distributed;
         }
         Ok(opts)

src/cmd/src/standalone.rs

@@ -16,7 +16,7 @@ use clap::Parser;
 use common_telemetry::info;
 use datanode::datanode::{Datanode, DatanodeOptions, ObjectStoreConfig};
 use datanode::instance::InstanceRef;
-use frontend::frontend::{Frontend, FrontendOptions, Mode};
+use frontend::frontend::{Frontend, FrontendOptions};
 use frontend::grpc::GrpcOptions;
 use frontend::influxdb::InfluxdbOptions;
 use frontend::instance::Instance as FeInstance;
@@ -25,6 +25,7 @@ use frontend::opentsdb::OpentsdbOptions;
 use frontend::postgres::PostgresOptions;
 use frontend::prometheus::PrometheusOptions;
 use serde::{Deserialize, Serialize};
+use servers::Mode;
 use snafu::ResultExt;
 use tokio::try_join;
 
@@ -70,8 +71,6 @@ pub struct StandaloneOptions {
     pub mode: Mode,
     pub wal_dir: String,
     pub storage: ObjectStoreConfig,
-    pub datanode_mysql_addr: String,
-    pub datanode_mysql_runtime_size: usize,
 }
 
 impl Default for StandaloneOptions {
@@ -87,8 +86,6 @@ impl Default for StandaloneOptions {
             mode: Mode::Standalone,
             wal_dir: "/tmp/greptimedb/wal".to_string(),
             storage: ObjectStoreConfig::default(),
-            datanode_mysql_addr: "127.0.0.1:3306".to_string(),
-            datanode_mysql_runtime_size: 4,
         }
     }
 }
@@ -105,7 +102,7 @@ impl StandaloneOptions {
             prometheus_options: self.prometheus_options,
             mode: self.mode,
             datanode_rpc_addr: "127.0.0.1:3001".to_string(),
-            metasrv_addr: None,
+            meta_client_opts: None,
         }
     }
 
@@ -113,8 +110,6 @@ impl StandaloneOptions {
         DatanodeOptions {
             wal_dir: self.wal_dir,
             storage: self.storage,
-            mysql_addr: self.datanode_mysql_addr,
-            mysql_runtime_size: self.datanode_mysql_runtime_size,
             ..Default::default()
         }
     }

src/common/base/src/bit_vec.rs

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use bitvec::prelude as bv;
+pub use bitvec::prelude;
 
 // `Lsb0` provides the best codegen for bit manipulation,
 // see https://github.com/bitvecto-rs/bitvec/blob/main/doc/order/Lsb0.md
-pub type BitVec = bv::BitVec<u8, bv::Lsb0>;
+pub type BitVec = prelude::BitVec<u8>;

src/common/base/src/lib.rs

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub mod bitset;
+pub mod bit_vec;
 pub mod buffer;
 pub mod bytes;
 
-pub use bitset::BitVec;
+pub use bit_vec::BitVec;

src/common/catalog/src/helper.rs

@@ -19,7 +19,7 @@ use lazy_static::lazy_static;
 use regex::Regex;
 use serde::{Deserialize, Serialize, Serializer};
 use snafu::{ensure, OptionExt, ResultExt};
-use table::metadata::{RawTableMeta, TableId, TableVersion};
+use table::metadata::{RawTableInfo, TableId, TableVersion};
 
 use crate::consts::{
     CATALOG_KEY_PREFIX, SCHEMA_KEY_PREFIX, TABLE_GLOBAL_KEY_PREFIX, TABLE_REGIONAL_KEY_PREFIX,
@@ -128,15 +128,18 @@ impl TableGlobalKey {
 /// table id, table meta(schema...), region id allocation across datanodes.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct TableGlobalValue {
-    /// Table id is the same across all datanodes.
-    pub id: TableId,
     /// Id of datanode that created the global table info kv. only for debugging.
     pub node_id: u64,
     // TODO(LFC): Maybe remove it?
     /// Allocation of region ids across all datanodes.
     pub regions_id_map: HashMap<u64, Vec<u32>>,
-    // TODO(LFC): Too much for assembling the table schema that DistTable needs, find another way.
-    pub meta: RawTableMeta,
+    pub table_info: RawTableInfo,
+}
+
+impl TableGlobalValue {
+    pub fn table_id(&self) -> TableId {
+        self.table_info.ident.table_id
+    }
 }
 
 /// Table regional info that varies between datanode, so it contains a `node_id` field.
@@ -279,6 +282,7 @@ define_catalog_value!(
 mod tests {
     use datatypes::prelude::ConcreteDataType;
     use datatypes::schema::{ColumnSchema, RawSchema, Schema};
+    use table::metadata::{RawTableMeta, TableIdent, TableType};
 
     use super::*;
 
@@ -339,11 +343,23 @@ mod tests {
             region_numbers: vec![1],
         };
 
+        let table_info = RawTableInfo {
+            ident: TableIdent {
+                table_id: 42,
+                version: 1,
+            },
+            name: "table_1".to_string(),
+            desc: Some("blah".to_string()),
+            catalog_name: "catalog_1".to_string(),
+            schema_name: "schema_1".to_string(),
+            meta,
+            table_type: TableType::Base,
+        };
+
         let value = TableGlobalValue {
-            id: 42,
             node_id: 0,
             regions_id_map: HashMap::from([(0, vec![1, 2, 3])]),
-            meta,
+            table_info,
         };
         let serialized = serde_json::to_string(&value).unwrap();
         let deserialized = TableGlobalValue::parse(&serialized).unwrap();

src/common/function/Cargo.toml

@@ -21,20 +21,6 @@ paste = "1.0"
 snafu = { version = "0.7", features = ["backtraces"] }
 statrs = "0.15"
 
-[dependencies.arrow]
-features = [
-    "io_csv",
-    "io_json",
-    "io_parquet",
-    "io_parquet_compression",
-    "io_ipc",
-    "ahash",
-    "compute",
-    "serde_types",
-]
-package = "arrow2"
-version = "0.10"
-
 [dev-dependencies]
 ron = "0.7"
 serde = { version = "1.0", features = ["derive"] }

src/common/function/src/scalars/numpy/interp.rs

@@ -14,9 +14,9 @@
 
 use std::sync::Arc;
 
-use arrow::array::PrimitiveArray;
-use arrow::compute::cast::primitive_to_primitive;
-use arrow::datatypes::DataType::Float64;
+use datatypes::arrow::array::PrimitiveArray;
+use datatypes::arrow::compute::cast::primitive_to_primitive;
+use datatypes::arrow::datatypes::DataType::Float64;
 use datatypes::data_type::DataType;
 use datatypes::prelude::ScalarVector;
 use datatypes::type_id::LogicalTypeId;

src/common/function/src/scalars/timestamp/from_unixtime.rs

@@ -17,11 +17,11 @@
 use std::fmt;
 use std::sync::Arc;
 
-use arrow::compute::arithmetics;
-use arrow::datatypes::DataType as ArrowDatatype;
-use arrow::scalar::PrimitiveScalar;
 use common_query::error::{IntoVectorSnafu, UnsupportedInputDataTypeSnafu};
 use common_query::prelude::{Signature, Volatility};
+use datatypes::arrow::compute::arithmetics;
+use datatypes::arrow::datatypes::DataType as ArrowDatatype;
+use datatypes::arrow::scalar::PrimitiveScalar;
 use datatypes::prelude::ConcreteDataType;
 use datatypes::vectors::{TimestampVector, VectorRef};
 use snafu::ResultExt;

src/common/grpc-expr/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "common-insert"
+name = "common-grpc-expr"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
@@ -11,6 +11,7 @@ common-base = { path = "../base" }
 common-error = { path = "../error" }
 common-telemetry = { path = "../telemetry" }
 common-time = { path = "../time" }
+common-catalog = { path = "../catalog" }
 common-query = { path = "../query" }
 datatypes = { path = "../../datatypes" }
 snafu = { version = "0.7", features = ["backtraces"] }

src/common/grpc-expr/src/alter.rs

@@ -0,0 +1,234 @@
+// Copyright 2022 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::sync::Arc;
+
+use api::v1::alter_expr::Kind;
+use api::v1::{AlterExpr, CreateExpr, DropColumns};
+use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
+use datatypes::schema::{ColumnSchema, SchemaBuilder, SchemaRef};
+use snafu::{ensure, OptionExt, ResultExt};
+use table::metadata::TableId;
+use table::requests::{AddColumnRequest, AlterKind, AlterTableRequest, CreateTableRequest};
+
+use crate::error::{
+    ColumnNotFoundSnafu, CreateSchemaSnafu, InvalidColumnDefSnafu, MissingFieldSnafu,
+    MissingTimestampColumnSnafu, Result,
+};
+
+/// Convert an [`AlterExpr`] to an optional [`AlterTableRequest`]
+pub fn alter_expr_to_request(expr: AlterExpr) -> Result<Option<AlterTableRequest>> {
+    match expr.kind {
+        Some(Kind::AddColumns(add_columns)) => {
+            let add_column_requests = add_columns
+                .add_columns
+                .into_iter()
+                .map(|ac| {
+                    let column_def = ac.column_def.context(MissingFieldSnafu {
+                        field: "column_def",
+                    })?;
+
+                    let schema =
+                        column_def
+                            .try_as_column_schema()
+                            .context(InvalidColumnDefSnafu {
+                                column: &column_def.name,
+                            })?;
+                    Ok(AddColumnRequest {
+                        column_schema: schema,
+                        is_key: ac.is_key,
+                    })
+                })
+                .collect::<Result<Vec<_>>>()?;
+
+            let alter_kind = AlterKind::AddColumns {
+                columns: add_column_requests,
+            };
+
+            let request = AlterTableRequest {
+                catalog_name: expr.catalog_name,
+                schema_name: expr.schema_name,
+                table_name: expr.table_name,
+                alter_kind,
+            };
+            Ok(Some(request))
+        }
+        Some(Kind::DropColumns(DropColumns { drop_columns })) => {
+            let alter_kind = AlterKind::DropColumns {
+                names: drop_columns.into_iter().map(|c| c.name).collect(),
+            };
+
+            let request = AlterTableRequest {
+                catalog_name: expr.catalog_name,
+                schema_name: expr.schema_name,
+                table_name: expr.table_name,
+                alter_kind,
+            };
+            Ok(Some(request))
+        }
+        None => Ok(None),
+    }
+}
+
+pub fn create_table_schema(expr: &CreateExpr) -> Result<SchemaRef> {
+    let column_schemas = expr
+        .column_defs
+        .iter()
+        .map(|x| {
+            x.try_as_column_schema()
+                .context(InvalidColumnDefSnafu { column: &x.name })
+        })
+        .collect::<Result<Vec<ColumnSchema>>>()?;
+
+    ensure!(
+        column_schemas
+            .iter()
+            .any(|column| column.name == expr.time_index),
+        MissingTimestampColumnSnafu {
+            msg: format!("CreateExpr: {:?}", expr)
+        }
+    );
+
+    let column_schemas = column_schemas
+        .into_iter()
+        .map(|column_schema| {
+            if column_schema.name == expr.time_index {
+                column_schema.with_time_index(true)
+            } else {
+                column_schema
+            }
+        })
+        .collect::<Vec<_>>();
+
+    Ok(Arc::new(
+        SchemaBuilder::try_from(column_schemas)
+            .context(CreateSchemaSnafu)?
+            .build()
+            .context(CreateSchemaSnafu)?,
+    ))
+}
+
+pub fn create_expr_to_request(table_id: TableId, expr: CreateExpr) -> Result<CreateTableRequest> {
+    let schema = create_table_schema(&expr)?;
+    let primary_key_indices = expr
+        .primary_keys
+        .iter()
+        .map(|key| {
+            schema
+                .column_index_by_name(key)
+                .context(ColumnNotFoundSnafu {
+                    column_name: key,
+                    table_name: &expr.table_name,
+                })
+        })
+        .collect::<Result<Vec<usize>>>()?;
+
+    let catalog_name = expr
+        .catalog_name
+        .unwrap_or_else(|| DEFAULT_CATALOG_NAME.to_string());
+    let schema_name = expr
+        .schema_name
+        .unwrap_or_else(|| DEFAULT_SCHEMA_NAME.to_string());
+
+    let region_ids = if expr.region_ids.is_empty() {
+        vec![0]
+    } else {
+        expr.region_ids
+    };
+
+    Ok(CreateTableRequest {
+        id: table_id,
+        catalog_name,
+        schema_name,
+        table_name: expr.table_name,
+        desc: expr.desc,
+        schema,
+        region_numbers: region_ids,
+        primary_key_indices,
+        create_if_not_exists: expr.create_if_not_exists,
+        table_options: expr.table_options,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use api::v1::{AddColumn, AddColumns, ColumnDataType, ColumnDef, DropColumn};
+    use datatypes::prelude::ConcreteDataType;
+
+    use super::*;
+
+    #[test]
+    fn test_alter_expr_to_request() {
+        let expr = AlterExpr {
+            catalog_name: None,
+            schema_name: None,
+            table_name: "monitor".to_string(),
+
+            kind: Some(Kind::AddColumns(AddColumns {
+                add_columns: vec![AddColumn {
+                    column_def: Some(ColumnDef {
+                        name: "mem_usage".to_string(),
+                        datatype: ColumnDataType::Float64 as i32,
+                        is_nullable: false,
+                        default_constraint: None,
+                    }),
+                    is_key: false,
+                }],
+            })),
+        };
+
+        let alter_request = alter_expr_to_request(expr).unwrap().unwrap();
+        assert_eq!(None, alter_request.catalog_name);
+        assert_eq!(None, alter_request.schema_name);
+        assert_eq!("monitor".to_string(), alter_request.table_name);
+        let add_column = match alter_request.alter_kind {
+            AlterKind::AddColumns { mut columns } => columns.pop().unwrap(),
+            _ => unreachable!(),
+        };
+
+        assert!(!add_column.is_key);
+        assert_eq!("mem_usage", add_column.column_schema.name);
+        assert_eq!(
+            ConcreteDataType::float64_datatype(),
+            add_column.column_schema.data_type
+        );
+    }
+
+    #[test]
+    fn test_drop_column_expr() {
+        let expr = AlterExpr {
+            catalog_name: Some("test_catalog".to_string()),
+            schema_name: Some("test_schema".to_string()),
+            table_name: "monitor".to_string(),
+
+            kind: Some(Kind::DropColumns(DropColumns {
+                drop_columns: vec![DropColumn {
+                    name: "mem_usage".to_string(),
+                }],
+            })),
+        };
+
+        let alter_request = alter_expr_to_request(expr).unwrap().unwrap();
+        assert_eq!(Some("test_catalog".to_string()), alter_request.catalog_name);
+        assert_eq!(Some("test_schema".to_string()), alter_request.schema_name);
+        assert_eq!("monitor".to_string(), alter_request.table_name);
+
+        let mut drop_names = match alter_request.alter_kind {
+            AlterKind::DropColumns { names } => names,
+            _ => unreachable!(),
+        };
+        assert_eq!(1, drop_names.len());
+        assert_eq!("mem_usage".to_string(), drop_names.pop().unwrap());
+    }
+}

src/common/grpc-expr/src/error.rs

@@ -22,7 +22,7 @@ use snafu::{Backtrace, ErrorCompat};
 #[derive(Debug, Snafu)]
 #[snafu(visibility(pub))]
 pub enum Error {
-    #[snafu(display("Column {} not found in table {}", column_name, table_name))]
+    #[snafu(display("Column `{}` not found in table `{}`", column_name, table_name))]
     ColumnNotFound {
         column_name: String,
         table_name: String,
@@ -57,8 +57,8 @@ pub enum Error {
         backtrace: Backtrace,
     },
 
-    #[snafu(display("Missing timestamp column in request"))]
-    MissingTimestampColumn { backtrace: Backtrace },
+    #[snafu(display("Missing timestamp column, msg: {}", msg))]
+    MissingTimestampColumn { msg: String, backtrace: Backtrace },
 
     #[snafu(display("Invalid column proto: {}", err_msg))]
     InvalidColumnProto {
@@ -70,6 +70,26 @@ pub enum Error {
         #[snafu(backtrace)]
         source: datatypes::error::Error,
     },
+
+    #[snafu(display("Missing required field in protobuf, field: {}", field))]
+    MissingField { field: String, backtrace: Backtrace },
+
+    #[snafu(display("Invalid column default constraint, source: {}", source))]
+    ColumnDefaultConstraint {
+        #[snafu(backtrace)]
+        source: datatypes::error::Error,
+    },
+
+    #[snafu(display(
+        "Invalid column proto definition, column: {}, source: {}",
+        column,
+        source
+    ))]
+    InvalidColumnDef {
+        column: String,
+        #[snafu(backtrace)]
+        source: api::error::Error,
+    },
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -87,6 +107,9 @@ impl ErrorExt for Error {
             | Error::MissingTimestampColumn { .. } => StatusCode::InvalidArguments,
             Error::InvalidColumnProto { .. } => StatusCode::InvalidArguments,
             Error::CreateVector { .. } => StatusCode::InvalidArguments,
+            Error::MissingField { .. } => StatusCode::InvalidArguments,
+            Error::ColumnDefaultConstraint { source, .. } => source.status_code(),
+            Error::InvalidColumnDef { source, .. } => source.status_code(),
         }
     }
     fn backtrace_opt(&self) -> Option<&Backtrace> {

src/common/grpc-expr/src/insert.rs

@@ -245,7 +245,10 @@ pub fn build_create_expr_from_insertion(
             }
         }
 
-        ensure!(timestamp_index != usize::MAX, MissingTimestampColumnSnafu);
+        ensure!(
+            timestamp_index != usize::MAX,
+            MissingTimestampColumnSnafu { msg: table_name }
+        );
         let timestamp_field_name = columns[timestamp_index].column_name.clone();
 
         let primary_keys = primary_key_indices

src/common/grpc-expr/src/lib.rs

@@ -1,3 +1,4 @@
+#![feature(assert_matches)]
 // Copyright 2022 Greptime Team
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+mod alter;
 pub mod error;
 mod insert;
+
+pub use alter::{alter_expr_to_request, create_expr_to_request, create_table_schema};
 pub use insert::{
     build_alter_table_request, build_create_expr_from_insertion, column_to_vector,
     find_new_columns, insert_batches, insertion_expr_to_request,

src/common/grpc/Cargo.toml

@@ -22,20 +22,6 @@ tokio = { version = "1.0", features = ["full"] }
 tonic = "0.8"
 tower = "0.4"
 
-[dependencies.arrow]
-package = "arrow2"
-version = "0.10"
-features = [
-    "io_csv",
-    "io_json",
-    "io_parquet",
-    "io_parquet_compression",
-    "io_ipc",
-    "ahash",
-    "compute",
-    "serde_types",
-]
-
 [dev-dependencies]
 criterion = "0.4"
 rand = "0.8"

src/common/grpc/src/lib.rs

@@ -20,4 +20,4 @@ pub mod writer;
 
 pub use error::Error;
 pub use physical::plan::{DefaultAsPlanImpl, MockExecution};
-pub use physical::AsExcutionPlan;
+pub use physical::AsExecutionPlan;

src/common/grpc/src/physical.rs

@@ -22,7 +22,7 @@ use datafusion::physical_plan::ExecutionPlan;
 
 pub type ExecutionPlanRef = Arc<dyn ExecutionPlan>;
 
-pub trait AsExcutionPlan {
+pub trait AsExecutionPlan {
     type Error: std::error::Error;
 
     fn try_into_physical_plan(&self) -> Result<ExecutionPlanRef, Self::Error>;

src/common/grpc/src/physical/plan.rs

@@ -18,8 +18,6 @@ use std::sync::Arc;
 
 use api::v1::codec::physical_plan_node::PhysicalPlanType;
 use api::v1::codec::{MockInputExecNode, PhysicalPlanNode, ProjectionExecNode};
-use arrow::array::{PrimitiveArray, Utf8Array};
-use arrow::datatypes::{DataType, Field, Schema};
 use async_trait::async_trait;
 use datafusion::execution::runtime_env::RuntimeEnv;
 use datafusion::field_util::SchemaExt;
@@ -29,19 +27,21 @@ use datafusion::physical_plan::{
     ExecutionPlan, PhysicalExpr, SendableRecordBatchStream, Statistics,
 };
 use datafusion::record_batch::RecordBatch;
+use datatypes::arrow::array::{PrimitiveArray, Utf8Array};
+use datatypes::arrow::datatypes::{DataType, Field, Schema, SchemaRef};
 use snafu::{OptionExt, ResultExt};
 
 use crate::error::{
     DecodePhysicalPlanNodeSnafu, EmptyPhysicalPlanSnafu, Error, MissingFieldSnafu,
     NewProjectionSnafu, UnsupportedDfPlanSnafu,
 };
-use crate::physical::{expr, AsExcutionPlan, ExecutionPlanRef};
+use crate::physical::{expr, AsExecutionPlan, ExecutionPlanRef};
 
 pub struct DefaultAsPlanImpl {
     pub bytes: Vec<u8>,
 }
 
-impl AsExcutionPlan for DefaultAsPlanImpl {
+impl AsExecutionPlan for DefaultAsPlanImpl {
     type Error = Error;
 
     // Vec<u8> -> PhysicalPlanNode -> ExecutionPlanRef
@@ -64,7 +64,7 @@ impl AsExcutionPlan for DefaultAsPlanImpl {
     }
 }
 
-impl AsExcutionPlan for PhysicalPlanNode {
+impl AsExecutionPlan for PhysicalPlanNode {
     type Error = Error;
 
     fn try_into_physical_plan(&self) -> Result<ExecutionPlanRef, Self::Error> {
@@ -162,11 +162,11 @@ impl ExecutionPlan for MockExecution {
         self
     }
 
-    fn schema(&self) -> arrow::datatypes::SchemaRef {
+    fn schema(&self) -> SchemaRef {
         let field1 = Field::new("id", DataType::UInt32, false);
         let field2 = Field::new("name", DataType::Utf8, false);
         let field3 = Field::new("age", DataType::UInt32, false);
-        Arc::new(arrow::datatypes::Schema::new(vec![field1, field2, field3]))
+        Arc::new(Schema::new(vec![field1, field2, field3]))
     }
 
     fn output_partitioning(&self) -> datafusion::physical_plan::Partitioning {
@@ -227,7 +227,7 @@ mod tests {
     use datafusion::physical_plan::projection::ProjectionExec;
 
     use crate::physical::plan::{DefaultAsPlanImpl, MockExecution};
-    use crate::physical::{AsExcutionPlan, ExecutionPlanRef};
+    use crate::physical::{AsExecutionPlan, ExecutionPlanRef};
 
     #[test]
     fn test_convert_df_projection_with_bytes() {
@@ -236,7 +236,7 @@ mod tests {
         let bytes = DefaultAsPlanImpl::try_from_physical_plan(projection_exec).unwrap();
         let exec = bytes.try_into_physical_plan().unwrap();
 
-        verify_df_porjection(exec);
+        verify_df_projection(exec);
     }
 
     #[test]
@@ -246,7 +246,7 @@ mod tests {
         let projection_node = PhysicalPlanNode::try_from_physical_plan(projection_exec).unwrap();
         let exec = projection_node.try_into_physical_plan().unwrap();
 
-        verify_df_porjection(exec);
+        verify_df_projection(exec);
     }
 
     fn mock_df_projection() -> Arc<ProjectionExec> {
@@ -264,7 +264,7 @@ mod tests {
         )
     }
 
-    fn verify_df_porjection(exec: ExecutionPlanRef) {
+    fn verify_df_projection(exec: ExecutionPlanRef) {
         let projection_exec = exec.as_any().downcast_ref::<ProjectionExec>().unwrap();
         let mock_input = projection_exec
             .input()

src/common/grpc/src/select.rs

@@ -19,12 +19,12 @@ use api::result::{build_err_result, ObjectResultBuilder};
 use api::v1::codec::SelectResult;
 use api::v1::column::{SemanticType, Values};
 use api::v1::{Column, ObjectResult};
-use arrow::array::{Array, BooleanArray, PrimitiveArray};
 use common_base::BitVec;
 use common_error::prelude::ErrorExt;
 use common_error::status_code::StatusCode;
 use common_query::Output;
 use common_recordbatch::{util, RecordBatches, SendableRecordBatchStream};
+use datatypes::arrow::array::{Array, BooleanArray, PrimitiveArray};
 use datatypes::arrow_array::{BinaryArray, StringArray};
 use datatypes::schema::SchemaRef;
 use snafu::{OptionExt, ResultExt};
@@ -136,7 +136,8 @@ pub fn null_mask(arrays: &Vec<Arc<dyn Array>>, row_count: usize) -> Vec<u8> {
 }
 
 macro_rules! convert_arrow_array_to_grpc_vals {
-    ($data_type: expr, $arrays: ident,  $(($Type: pat, $CastType: ty, $field: ident, $MapFunction: expr)), +) => {
+    ($data_type: expr, $arrays: ident,  $(($Type: pat, $CastType: ty, $field: ident, $MapFunction: expr)), +) => {{
+        use datatypes::arrow::datatypes::{DataType, TimeUnit};
         match $data_type {
             $(
                 $Type => {
@@ -155,7 +156,7 @@ macro_rules! convert_arrow_array_to_grpc_vals {
             )+
             _ => unimplemented!(),
         }
-    };
+    }};
 }
 
 pub fn values(arrays: &[Arc<dyn Array>]) -> Result<Values> {
@@ -164,7 +165,6 @@ pub fn values(arrays: &[Arc<dyn Array>]) -> Result<Values> {
     }
     let data_type = arrays[0].data_type();
 
-    use arrow::datatypes::DataType;
     convert_arrow_array_to_grpc_vals!(
         data_type, arrays,
 
@@ -192,7 +192,7 @@ pub fn values(arrays: &[Arc<dyn Array>]) -> Result<Values> {
         (DataType::Date32,        PrimitiveArray<i32>,    date_values,    |x| {*x as i32}),
         (DataType::Date64,        PrimitiveArray<i64>,    datetime_values,|x| {*x as i64}),
 
-        (DataType::Timestamp(arrow::datatypes::TimeUnit::Millisecond, _), PrimitiveArray<i64>, ts_millis_values, |x| {*x})
+        (DataType::Timestamp(TimeUnit::Millisecond, _), PrimitiveArray<i64>, ts_millis_values, |x| {*x})
     )
 }
 
@@ -200,11 +200,10 @@ pub fn values(arrays: &[Arc<dyn Array>]) -> Result<Values> {
 mod tests {
     use std::sync::Arc;
 
-    use arrow::array::{Array, BooleanArray, PrimitiveArray};
-    use arrow::datatypes::{DataType, Field};
     use common_recordbatch::{RecordBatch, RecordBatches};
     use datafusion::field_util::SchemaExt;
-    use datatypes::arrow::datatypes::Schema as ArrowSchema;
+    use datatypes::arrow::array::{Array, BooleanArray, PrimitiveArray};
+    use datatypes::arrow::datatypes::{DataType, Field, Schema as ArrowSchema};
     use datatypes::arrow_array::StringArray;
     use datatypes::schema::Schema;
     use datatypes::vectors::{UInt32Vector, VectorRef};

src/common/query/Cargo.toml

@@ -18,10 +18,6 @@ datatypes = { path = "../../datatypes" }
 snafu = { version = "0.7", features = ["backtraces"] }
 statrs = "0.15"
 
-[dependencies.arrow]
-package = "arrow2"
-version = "0.10"
-
 [dev-dependencies]
 common-base = { path = "../base" }
 tokio = { version = "1.0", features = ["full"] }

src/common/query/src/columnar_value.rs

@@ -80,7 +80,7 @@ impl From<ColumnarValue> for DfColumnarValue {
 mod tests {
     use std::sync::Arc;
 
-    use arrow::datatypes::DataType as ArrowDataType;
+    use datatypes::arrow::datatypes::DataType as ArrowDataType;
     use datatypes::vectors::BooleanVector;
 
     use super::*;

src/common/query/src/error.rs

@@ -14,9 +14,9 @@
 
 use std::any::Any;
 
-use arrow::datatypes::DataType as ArrowDatatype;
 use common_error::prelude::*;
 use datafusion_common::DataFusionError;
+use datatypes::arrow::datatypes::DataType as ArrowDatatype;
 use datatypes::error::Error as DataTypeError;
 use datatypes::prelude::ConcreteDataType;
 use statrs::StatsError;
@@ -180,7 +180,7 @@ impl From<BoxedError> for Error {
 
 #[cfg(test)]
 mod tests {
-    use arrow::error::ArrowError;
+    use datatypes::arrow::error::ArrowError;
     use snafu::GenerateImplicitData;
 
     use super::*;

src/common/query/src/function.rs

@@ -14,8 +14,8 @@
 
 use std::sync::Arc;
 
-use arrow::datatypes::DataType as ArrowDataType;
 use datafusion_expr::ReturnTypeFunction as DfReturnTypeFunction;
+use datatypes::arrow::datatypes::DataType as ArrowDataType;
 use datatypes::prelude::{ConcreteDataType, DataType};
 use datatypes::vectors::VectorRef;
 use snafu::ResultExt;

src/common/query/src/logical_plan/accumulator.rs

@@ -17,10 +17,10 @@
 use std::fmt::Debug;
 use std::sync::Arc;
 
-use arrow::array::ArrayRef;
 use common_time::timestamp::TimeUnit;
 use datafusion_common::Result as DfResult;
 use datafusion_expr::Accumulator as DfAccumulator;
+use datatypes::arrow::array::ArrayRef;
 use datatypes::prelude::*;
 use datatypes::value::ListValue;
 use datatypes::vectors::{Helper as VectorHelper, VectorRef};
@@ -266,9 +266,9 @@ fn try_convert_list_value(list: ListValue) -> Result<ScalarValue> {
 
 #[cfg(test)]
 mod tests {
-    use arrow::datatypes::DataType;
     use common_base::bytes::{Bytes, StringBytes};
     use datafusion_common::ScalarValue;
+    use datatypes::arrow::datatypes::DataType;
     use datatypes::value::{ListValue, OrderedFloat};
 
     use super::*;

src/common/query/src/logical_plan/mod.rs

@@ -72,12 +72,12 @@ pub fn create_aggregate_function(
 mod tests {
     use std::sync::Arc;
 
-    use arrow::array::BooleanArray;
-    use arrow::datatypes::DataType;
     use datafusion_expr::{
         ColumnarValue as DfColumnarValue, ScalarUDF as DfScalarUDF,
         TypeSignature as DfTypeSignature,
     };
+    use datatypes::arrow::array::BooleanArray;
+    use datatypes::arrow::datatypes::DataType;
     use datatypes::prelude::*;
     use datatypes::vectors::{BooleanVector, VectorRef};
 

src/common/query/src/logical_plan/udaf.rs

@@ -19,11 +19,11 @@
 use std::fmt::{self, Debug, Formatter};
 use std::sync::Arc;
 
-use arrow::datatypes::DataType as ArrowDataType;
 use datafusion_expr::{
     AccumulatorFunctionImplementation as DfAccumulatorFunctionImplementation,
     AggregateUDF as DfAggregateUdf, StateTypeFunction as DfStateTypeFunction,
 };
+use datatypes::arrow::datatypes::DataType as ArrowDataType;
 use datatypes::prelude::*;
 
 use crate::function::{

src/common/query/src/logical_plan/udf.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 //! Udf module contains foundational types that are used to represent UDFs.
-//! It's modifed from datafusion.
+//! It's modified from datafusion.
 use std::fmt;
 use std::fmt::{Debug, Formatter};
 use std::sync::Arc;

src/common/query/src/physical_plan.rs

@@ -17,7 +17,7 @@ use std::fmt::Debug;
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use common_recordbatch::adapter::{DfRecordBatchStreamAdapter, RecordBatchStreamAdapter};
+use common_recordbatch::adapter::{AsyncRecordBatchStreamAdapter, DfRecordBatchStreamAdapter};
 use common_recordbatch::{DfSendableRecordBatchStream, SendableRecordBatchStream};
 use datafusion::arrow::datatypes::SchemaRef as DfSchemaRef;
 use datafusion::error::Result as DfResult;
@@ -39,7 +39,6 @@ pub type PhysicalPlanRef = Arc<dyn PhysicalPlan>;
 /// creating the actual `async` [`SendableRecordBatchStream`]s
 /// of [`RecordBatch`] that incrementally compute the operator's
 /// output from its input partition.
-#[async_trait]
 pub trait PhysicalPlan: Debug + Send + Sync {
     /// Returns the physical plan as [`Any`](std::any::Any) so that it can be
     /// downcast to a specific implementation.
@@ -61,7 +60,7 @@ pub trait PhysicalPlan: Debug + Send + Sync {
     fn with_new_children(&self, children: Vec<PhysicalPlanRef>) -> Result<PhysicalPlanRef>;
 
     /// Creates an RecordBatch stream.
-    async fn execute(
+    fn execute(
         &self,
         partition: usize,
         runtime: Arc<RuntimeEnv>,
@@ -84,7 +83,6 @@ impl PhysicalPlanAdapter {
     }
 }
 
-#[async_trait]
 impl PhysicalPlan for PhysicalPlanAdapter {
     fn as_any(&self) -> &dyn Any {
         self
@@ -118,18 +116,15 @@ impl PhysicalPlan for PhysicalPlanAdapter {
         Ok(Arc::new(PhysicalPlanAdapter::new(self.schema(), plan)))
     }
 
-    async fn execute(
+    fn execute(
         &self,
         partition: usize,
         runtime: Arc<RuntimeEnv>,
     ) -> Result<SendableRecordBatchStream> {
-        let stream = self
-            .df_plan
-            .execute(partition, runtime)
-            .await
-            .context(error::DataFusionExecutionPlanSnafu)?;
-        let stream = RecordBatchStreamAdapter::try_new(stream)
-            .context(error::ConvertDfRecordBatchStreamSnafu)?;
+        let df_plan = self.df_plan.clone();
+        let stream = Box::pin(async move { df_plan.execute(partition, runtime).await });
+        let stream = AsyncRecordBatchStreamAdapter::new(self.schema(), stream);
+
         Ok(Box::pin(stream))
     }
 }
@@ -187,7 +182,7 @@ impl DfPhysicalPlan for DfPhysicalPlanAdapter {
         partition: usize,
         runtime: Arc<RuntimeEnv>,
     ) -> DfResult<DfSendableRecordBatchStream> {
-        let stream = self.0.execute(partition, runtime).await?;
+        let stream = self.0.execute(partition, runtime)?;
         Ok(Box::pin(DfRecordBatchStreamAdapter::new(stream)))
     }
 
@@ -199,7 +194,6 @@ impl DfPhysicalPlan for DfPhysicalPlanAdapter {
 
 #[cfg(test)]
 mod test {
-    use arrow::datatypes::{DataType, Field, Schema as ArrowSchema};
     use common_recordbatch::{RecordBatch, RecordBatches};
     use datafusion::arrow_print;
     use datafusion::datasource::TableProvider as DfTableProvider;
@@ -209,6 +203,7 @@ mod test {
     use datafusion::prelude::ExecutionContext;
     use datafusion_common::field_util::SchemaExt;
     use datafusion_expr::Expr;
+    use datatypes::arrow::datatypes::{DataType, Field, Schema as ArrowSchema};
     use datatypes::schema::Schema;
     use datatypes::vectors::Int32Vector;
 
@@ -250,7 +245,6 @@ mod test {
         schema: SchemaRef,
     }
 
-    #[async_trait]
     impl PhysicalPlan for MyExecutionPlan {
         fn as_any(&self) -> &dyn Any {
             self
@@ -272,7 +266,7 @@ mod test {
             unimplemented!()
         }
 
-        async fn execute(
+        fn execute(
             &self,
             _partition: usize,
             _runtime: Arc<RuntimeEnv>,

src/common/query/src/signature.rs

@@ -15,9 +15,9 @@
 //! Signature module contains foundational types that are used to represent signatures, types,
 //! and return types of functions.
 //! Copied and modified from datafusion.
-use arrow::datatypes::DataType as ArrowDataType;
 pub use datafusion::physical_plan::functions::Volatility;
 use datafusion_expr::{Signature as DfSignature, TypeSignature as DfTypeSignature};
+use datatypes::arrow::datatypes::DataType as ArrowDataType;
 use datatypes::data_type::DataType;
 use datatypes::prelude::ConcreteDataType;
 
@@ -53,7 +53,7 @@ pub struct Signature {
 }
 
 #[inline]
-fn concret_types_to_arrow_types(ts: Vec<ConcreteDataType>) -> Vec<ArrowDataType> {
+fn concrete_types_to_arrow_types(ts: Vec<ConcreteDataType>) -> Vec<ArrowDataType> {
     ts.iter().map(ConcreteDataType::as_arrow_type).collect()
 }
 
@@ -118,14 +118,14 @@ impl From<TypeSignature> for DfTypeSignature {
     fn from(type_signature: TypeSignature) -> DfTypeSignature {
         match type_signature {
             TypeSignature::Variadic(types) => {
-                DfTypeSignature::Variadic(concret_types_to_arrow_types(types))
+                DfTypeSignature::Variadic(concrete_types_to_arrow_types(types))
             }
             TypeSignature::VariadicEqual => DfTypeSignature::VariadicEqual,
             TypeSignature::Uniform(n, types) => {
-                DfTypeSignature::Uniform(n, concret_types_to_arrow_types(types))
+                DfTypeSignature::Uniform(n, concrete_types_to_arrow_types(types))
             }
             TypeSignature::Exact(types) => {
-                DfTypeSignature::Exact(concret_types_to_arrow_types(types))
+                DfTypeSignature::Exact(concrete_types_to_arrow_types(types))
             }
             TypeSignature::Any(n) => DfTypeSignature::Any(n),
             TypeSignature::OneOf(ts) => {
@@ -143,7 +143,7 @@ impl From<Signature> for DfSignature {
 
 #[cfg(test)]
 mod tests {
-    use arrow::datatypes::DataType;
+    use datatypes::arrow::datatypes::DataType;
 
     use super::*;
 

src/common/recordbatch/src/adapter.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
@@ -19,8 +20,10 @@ use std::task::{Context, Poll};
 use datafusion::arrow::datatypes::SchemaRef as DfSchemaRef;
 use datafusion::physical_plan::RecordBatchStream as DfRecordBatchStream;
 use datafusion_common::record_batch::RecordBatch as DfRecordBatch;
+use datafusion_common::DataFusionError;
 use datatypes::arrow::error::{ArrowError, Result as ArrowResult};
 use datatypes::schema::{Schema, SchemaRef};
+use futures::ready;
 use snafu::ResultExt;
 
 use crate::error::{self, Result};
@@ -28,6 +31,14 @@ use crate::{
     DfSendableRecordBatchStream, RecordBatch, RecordBatchStream, SendableRecordBatchStream, Stream,
 };
 
+type FutureStream = Pin<
+    Box<
+        dyn std::future::Future<
+                Output = std::result::Result<DfSendableRecordBatchStream, DataFusionError>,
+            > + Send,
+    >,
+>;
+
 /// Greptime SendableRecordBatchStream -> DataFusion RecordBatchStream
 pub struct DfRecordBatchStreamAdapter {
     stream: SendableRecordBatchStream,
@@ -104,3 +115,71 @@ impl Stream for RecordBatchStreamAdapter {
         self.stream.size_hint()
     }
 }
+
+enum AsyncRecordBatchStreamAdapterState {
+    Uninit(FutureStream),
+    Inited(std::result::Result<DfSendableRecordBatchStream, DataFusionError>),
+}
+
+pub struct AsyncRecordBatchStreamAdapter {
+    schema: SchemaRef,
+    state: AsyncRecordBatchStreamAdapterState,
+}
+
+impl AsyncRecordBatchStreamAdapter {
+    pub fn new(schema: SchemaRef, stream: FutureStream) -> Self {
+        Self {
+            schema,
+            state: AsyncRecordBatchStreamAdapterState::Uninit(stream),
+        }
+    }
+}
+
+impl RecordBatchStream for AsyncRecordBatchStreamAdapter {
+    fn schema(&self) -> SchemaRef {
+        self.schema.clone()
+    }
+}
+
+impl Stream for AsyncRecordBatchStreamAdapter {
+    type Item = Result<RecordBatch>;
+
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        loop {
+            match &mut self.state {
+                AsyncRecordBatchStreamAdapterState::Uninit(stream_future) => {
+                    self.state = AsyncRecordBatchStreamAdapterState::Inited(ready!(Pin::new(
+                        stream_future
+                    )
+                    .poll(cx)));
+                    continue;
+                }
+                AsyncRecordBatchStreamAdapterState::Inited(stream) => match stream {
+                    Ok(stream) => {
+                        return Poll::Ready(ready!(Pin::new(stream).poll_next(cx)).map(|df| {
+                            Ok(RecordBatch {
+                                schema: self.schema(),
+                                df_recordbatch: df.context(error::PollStreamSnafu)?,
+                            })
+                        }));
+                    }
+                    Err(e) => {
+                        return Poll::Ready(Some(
+                            error::CreateRecordBatchesSnafu {
+                                reason: format!("Read error {:?} from stream", e),
+                            }
+                            .fail()
+                            .map_err(|e| e.into()),
+                        ))
+                    }
+                },
+            }
+        }
+    }
+
+    // This is not supported for lazy stream.
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (0, None)
+    }
+}

src/common/recordbatch/src/lib.rs

@@ -21,6 +21,7 @@ use std::pin::Pin;
 use std::sync::Arc;
 
 use datafusion::arrow_print;
+use datafusion::physical_plan::memory::MemoryStream;
 pub use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::VectorRef;
 use datatypes::schema::{Schema, SchemaRef};
@@ -132,6 +133,19 @@ impl RecordBatches {
             index: 0,
         })
     }
+
+    pub fn into_df_stream(self) -> DfSendableRecordBatchStream {
+        let df_record_batches = self
+            .batches
+            .into_iter()
+            .map(|batch| batch.df_recordbatch)
+            .collect();
+        // unwrap safety: `MemoryStream::try_new` won't fail
+        Box::pin(
+            MemoryStream::try_new(df_record_batches, self.schema.arrow_schema().clone(), None)
+                .unwrap(),
+        )
+    }
 }
 
 pub struct SimpleRecordBatchStream {

src/common/substrait/src/df_logical.rs

@@ -178,14 +178,14 @@ impl DFLogicalSubstraitConvertor {
             })?;
         let adapter = Arc::new(DfTableProviderAdapter::new(table_ref));
 
-        // Get schema directly from the table, and compare it with the schema retrived from substrait proto.
+        // Get schema directly from the table, and compare it with the schema retrieved from substrait proto.
         let stored_schema = adapter.schema();
-        let retrived_schema = to_schema(read_rel.base_schema.unwrap_or_default())?;
-        let retrived_arrow_schema = retrived_schema.arrow_schema();
+        let retrieved_schema = to_schema(read_rel.base_schema.unwrap_or_default())?;
+        let retrieved_arrow_schema = retrieved_schema.arrow_schema();
         ensure!(
-            stored_schema.fields == retrived_arrow_schema.fields,
+            stored_schema.fields == retrieved_arrow_schema.fields,
             SchemaNotMatchSnafu {
-                substrait_schema: retrived_arrow_schema.clone(),
+                substrait_schema: retrieved_arrow_schema.clone(),
                 storage_schema: stored_schema
             }
         );

src/common/substrait/src/error.rs

@@ -81,7 +81,7 @@ pub enum Error {
         source: BoxedError,
     },
 
-    #[snafu(display("Table quering not found: {}", name))]
+    #[snafu(display("Table querying not found: {}", name))]
     TableNotFound { name: String, backtrace: Backtrace },
 
     #[snafu(display("Cannot convert plan doesn't belong to GreptimeDB"))]

src/common/substrait/src/types.rs

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Methods that perform convertion between Substrait's type ([Type](SType)) and GreptimeDB's type ([ConcreteDataType]).
+//! Methods that perform conversion between Substrait's type ([Type](SType)) and GreptimeDB's type ([ConcreteDataType]).
 //!
 //! Substrait use [type variation](https://substrait.io/types/type_variations/) to express different "logical types".
-//! Current we only have variations on integer types. Variation 0 (system prefered) are the same with base types, which
+//! Current we only have variations on integer types. Variation 0 (system preferred) are the same with base types, which
 //! are signed integer (i.e. I8 -> [i8]), and Variation 1 stands for unsigned integer (i.e. I8 -> [u8]).
 
 use datatypes::prelude::ConcreteDataType;

src/datanode/Cargo.toml

@@ -13,6 +13,7 @@ api = { path = "../api" }
 async-trait = "0.1"
 axum = "0.6.0-rc.2"
 axum-macros = "0.3.0-rc.1"
+backon = "0.2"
 catalog = { path = "../catalog" }
 common-base = { path = "../common/base" }
 common-catalog = { path = "../common/catalog" }
@@ -23,7 +24,7 @@ common-recordbatch = { path = "../common/recordbatch" }
 common-runtime = { path = "../common/runtime" }
 common-telemetry = { path = "../common/telemetry" }
 common-time = { path = "../common/time" }
-common-insert = { path = "../common/insert" }
+common-grpc-expr = { path = "../common/grpc-expr" }
 datafusion = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", features = [
   "simd",
 ] }
@@ -54,20 +55,6 @@ tower = { version = "0.4", features = ["full"] }
 tower-http = { version = "0.3", features = ["full"] }
 frontend = { path = "../frontend" }
 
-[dependencies.arrow]
-package = "arrow2"
-version = "0.10"
-features = [
-  "io_csv",
-  "io_json",
-  "io_parquet",
-  "io_parquet_compression",
-  "io_ipc",
-  "ahash",
-  "compute",
-  "serde_types",
-]
-
 [dev-dependencies]
 axum-test-helper = { git = "https://github.com/sunng87/axum-test-helper.git", branch = "patch-1" }
 client = { path = "../client" }
@@ -77,17 +64,3 @@ datafusion = { git = "https://github.com/apache/arrow-datafusion.git", branch =
 ] }
 datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2" }
 tempdir = "0.3"
-
-[dev-dependencies.arrow]
-package = "arrow2"
-version = "0.10"
-features = [
-  "io_csv",
-  "io_json",
-  "io_parquet",
-  "io_parquet_compression",
-  "io_ipc",
-  "ahash",
-  "compute",
-  "serde_types",
-]

src/datanode/src/datanode.rs

@@ -15,9 +15,9 @@
 use std::sync::Arc;
 
 use common_telemetry::info;
-use frontend::frontend::Mode;
 use meta_client::MetaClientOpts;
 use serde::{Deserialize, Serialize};
+use servers::Mode;
 
 use crate::error::Result;
 use crate::instance::{Instance, InstanceRef};
@@ -44,7 +44,7 @@ pub struct DatanodeOptions {
     pub rpc_runtime_size: usize,
     pub mysql_addr: String,
     pub mysql_runtime_size: usize,
-    pub meta_client_opts: MetaClientOpts,
+    pub meta_client_opts: Option<MetaClientOpts>,
     pub wal_dir: String,
     pub storage: ObjectStoreConfig,
     pub mode: Mode,
@@ -56,9 +56,9 @@ impl Default for DatanodeOptions {
             node_id: None,
             rpc_addr: "127.0.0.1:3001".to_string(),
             rpc_runtime_size: 8,
-            mysql_addr: "127.0.0.1:3306".to_string(),
+            mysql_addr: "127.0.0.1:4406".to_string(),
             mysql_runtime_size: 2,
-            meta_client_opts: MetaClientOpts::default(),
+            meta_client_opts: None,
             wal_dir: "/tmp/greptimedb/wal".to_string(),
             storage: ObjectStoreConfig::default(),
             mode: Mode::Standalone,

src/datanode/src/error.rs

@@ -82,9 +82,6 @@ pub enum Error {
         table_name: String,
     },
 
-    #[snafu(display("Missing required field in protobuf, field: {}", field))]
-    MissingField { field: String, backtrace: Backtrace },
-
     #[snafu(display("Missing timestamp column in request"))]
     MissingTimestampColumn { backtrace: Backtrace },
 
@@ -202,16 +199,16 @@ pub enum Error {
         source: common_grpc::Error,
     },
 
-    #[snafu(display("Column datatype error, source: {}", source))]
-    ColumnDataType {
+    #[snafu(display("Failed to convert alter expr to request: {}", source))]
+    AlterExprToRequest {
         #[snafu(backtrace)]
-        source: api::error::Error,
+        source: common_grpc_expr::error::Error,
     },
 
-    #[snafu(display("Invalid column default constraint, source: {}", source))]
-    ColumnDefaultConstraint {
+    #[snafu(display("Failed to convert create expr to request: {}", source))]
+    CreateExprToRequest {
         #[snafu(backtrace)]
-        source: datatypes::error::Error,
+        source: common_grpc_expr::error::Error,
     },
 
     #[snafu(display("Failed to parse SQL, source: {}", source))]
@@ -258,7 +255,7 @@ pub enum Error {
     #[snafu(display("Failed to insert data, source: {}", source))]
     InsertData {
         #[snafu(backtrace)]
-        source: common_insert::error::Error,
+        source: common_grpc_expr::error::Error,
     },
 
     #[snafu(display("Insert batch is empty"))]
@@ -283,6 +280,9 @@ pub enum Error {
 
     #[snafu(display("Missing node id option in distributed mode"))]
     MissingNodeId { backtrace: Backtrace },
+
+    #[snafu(display("Missing node id option in distributed mode"))]
+    MissingMetasrvOpts { backtrace: Backtrace },
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -308,8 +308,9 @@ impl ErrorExt for Error {
                 source.status_code()
             }
 
-            Error::ColumnDefaultConstraint { source, .. }
-            | Error::CreateSchema { source, .. }
+            Error::AlterExprToRequest { source, .. }
+            | Error::CreateExprToRequest { source, .. } => source.status_code(),
+            Error::CreateSchema { source, .. }
             | Error::ConvertSchema { source, .. }
             | Error::VectorComputation { source } => source.status_code(),
 
@@ -317,7 +318,6 @@ impl ErrorExt for Error {
             | Error::InvalidSql { .. }
             | Error::KeyColumnNotFound { .. }
             | Error::InvalidPrimaryKey { .. }
-            | Error::MissingField { .. }
             | Error::MissingTimestampColumn { .. }
             | Error::CatalogNotFound { .. }
             | Error::SchemaNotFound { .. }
@@ -334,7 +334,6 @@ impl ErrorExt for Error {
             | Error::RegisterSchema { .. }
             | Error::IntoPhysicalPlan { .. }
             | Error::UnsupportedExpr { .. }
-            | Error::ColumnDataType { .. }
             | Error::Catalog { .. } => StatusCode::Internal,
 
             Error::InitBackend { .. } => StatusCode::StorageUnavailable,
@@ -348,6 +347,7 @@ impl ErrorExt for Error {
             Error::TableIdProviderNotFound { .. } => StatusCode::Unsupported,
             Error::BumpTableId { source, .. } => source.status_code(),
             Error::MissingNodeId { .. } => StatusCode::InvalidArguments,
+            Error::MissingMetasrvOpts { .. } => StatusCode::InvalidArguments,
         }
     }
 

src/datanode/src/instance.rs

@@ -16,21 +16,22 @@ use std::sync::Arc;
 use std::time::Duration;
 use std::{fs, path};
 
+use backon::ExponentialBackoff;
 use catalog::remote::MetaKvBackend;
 use catalog::CatalogManagerRef;
 use common_grpc::channel_manager::{ChannelConfig, ChannelManager};
 use common_telemetry::logging::info;
-use frontend::frontend::Mode;
 use log_store::fs::config::LogConfig;
 use log_store::fs::log::LocalFileLogStore;
 use meta_client::client::{MetaClient, MetaClientBuilder};
 use meta_client::MetaClientOpts;
 use mito::config::EngineConfig as TableEngineConfig;
 use mito::engine::MitoEngine;
-use object_store::layers::LoggingLayer;
+use object_store::layers::{LoggingLayer, MetricsLayer, RetryLayer, TracingLayer};
 use object_store::services::fs::Builder;
 use object_store::{util, ObjectStore};
 use query::query_engine::{QueryEngineFactory, QueryEngineRef};
+use servers::Mode;
 use snafu::prelude::*;
 use storage::config::EngineConfig as StorageEngineConfig;
 use storage::EngineImpl;
@@ -38,7 +39,8 @@ use table::table::TableIdProviderRef;
 
 use crate::datanode::{DatanodeOptions, ObjectStoreConfig};
 use crate::error::{
-    self, CatalogSnafu, MetaClientInitSnafu, MissingNodeIdSnafu, NewCatalogSnafu, Result,
+    self, CatalogSnafu, MetaClientInitSnafu, MissingMetasrvOptsSnafu, MissingNodeIdSnafu,
+    NewCatalogSnafu, Result,
 };
 use crate::heartbeat::HeartbeatTask;
 use crate::script::ScriptExecutor;
@@ -76,7 +78,9 @@ impl Instance {
             Mode::Distributed => {
                 let meta_client = new_metasrv_client(
                     opts.node_id.context(MissingNodeIdSnafu)?,
-                    &opts.meta_client_opts,
+                    opts.meta_client_opts
+                        .as_ref()
+                        .context(MissingMetasrvOptsSnafu)?,
                 )
                 .await?;
                 Some(Arc::new(meta_client))
@@ -136,7 +140,11 @@ impl Instance {
         };
         Ok(Self {
             query_engine: query_engine.clone(),
-            sql_handler: SqlHandler::new(table_engine, catalog_manager.clone()),
+            sql_handler: SqlHandler::new(
+                table_engine,
+                catalog_manager.clone(),
+                query_engine.clone(),
+            ),
             catalog_manager,
             physical_planner: PhysicalPlanner::new(query_engine),
             script_executor,
@@ -182,7 +190,15 @@ pub(crate) async fn new_object_store(store_config: &ObjectStoreConfig) -> Result
         .build()
         .context(error::InitBackendSnafu { dir: &data_dir })?;
 
-    let object_store = ObjectStore::new(accessor).layer(LoggingLayer); // Add logging
+    let object_store = ObjectStore::new(accessor)
+        // Add retry
+        .layer(RetryLayer::new(ExponentialBackoff::default().with_jitter()))
+        // Add metrics
+        .layer(MetricsLayer)
+        // Add logging
+        .layer(LoggingLayer)
+        // Add tracing
+        .layer(TracingLayer);
 
     Ok(object_store)
 }
@@ -204,7 +220,7 @@ async fn new_metasrv_client(node_id: u64, meta_config: &MetaClientOpts) -> Resul
         .channel_manager(channel_manager)
         .build();
     meta_client
-        .start(&[&meta_config.metasrv_addr])
+        .start(&meta_config.metasrv_addrs)
         .await
         .context(MetaClientInitSnafu)?;
 

src/datanode/src/instance/grpc.rs

@@ -22,7 +22,7 @@ use common_catalog::consts::DEFAULT_CATALOG_NAME;
 use common_error::ext::ErrorExt;
 use common_error::status_code::StatusCode;
 use common_grpc::select::to_object_result;
-use common_insert::insertion_expr_to_request;
+use common_grpc_expr::insertion_expr_to_request;
 use common_query::Output;
 use query::plan::LogicalPlan;
 use servers::query_handler::{GrpcAdminHandler, GrpcQueryHandler};
@@ -56,7 +56,7 @@ impl Instance {
             .context(SchemaNotFoundSnafu { name: schema_name })?;
 
         let insert_batches =
-            common_insert::insert_batches(&values.values).context(InsertDataSnafu)?;
+            common_grpc_expr::insert_batches(&values.values).context(InsertDataSnafu)?;
 
         ensure!(!insert_batches.is_empty(), EmptyInsertBatchSnafu);
 

src/datanode/src/instance/sql.rs

@@ -115,6 +115,16 @@ impl Instance {
             Statement::ShowTables(stmt) => {
                 self.sql_handler.execute(SqlRequest::ShowTables(stmt)).await
             }
+            Statement::Explain(stmt) => {
+                self.sql_handler
+                    .execute(SqlRequest::Explain(Box::new(stmt)))
+                    .await
+            }
+            Statement::DescribeTable(stmt) => {
+                self.sql_handler
+                    .execute(SqlRequest::DescribeTable(stmt))
+                    .await
+            }
             Statement::ShowCreateTable(_stmt) => {
                 unimplemented!("SHOW CREATE TABLE is unimplemented yet");
             }

src/datanode/src/mock.rs

@@ -58,7 +58,11 @@ impl Instance {
         let factory = QueryEngineFactory::new(catalog_manager.clone());
         let query_engine = factory.query_engine();
 
-        let sql_handler = SqlHandler::new(mock_engine.clone(), catalog_manager.clone());
+        let sql_handler = SqlHandler::new(
+            mock_engine.clone(),
+            catalog_manager.clone(),
+            query_engine.clone(),
+        );
         let physical_planner = PhysicalPlanner::new(query_engine.clone());
         let script_executor = ScriptExecutor::new(catalog_manager.clone(), query_engine.clone())
             .await
@@ -123,7 +127,11 @@ impl Instance {
         );
         Ok(Self {
             query_engine: query_engine.clone(),
-            sql_handler: SqlHandler::new(table_engine, catalog_manager.clone()),
+            sql_handler: SqlHandler::new(
+                table_engine,
+                catalog_manager.clone(),
+                query_engine.clone(),
+            ),
             catalog_manager,
             physical_planner: PhysicalPlanner::new(query_engine),
             script_executor,

src/datanode/src/server.rs

@@ -17,11 +17,12 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 
 use common_runtime::Builder as RuntimeBuilder;
+use common_telemetry::tracing::log::info;
 use servers::grpc::GrpcServer;
 use servers::mysql::server::MysqlServer;
 use servers::server::Server;
+use servers::Mode;
 use snafu::ResultExt;
-use tokio::try_join;
 
 use crate::datanode::DatanodeOptions;
 use crate::error::{ParseAddrSnafu, Result, RuntimeResourceSnafu, StartServerSnafu};
@@ -32,7 +33,7 @@ pub mod grpc;
 /// All rpc services.
 pub struct Services {
     grpc_server: GrpcServer,
-    mysql_server: Box<dyn Server>,
+    mysql_server: Option<Box<dyn Server>>,
 }
 
 impl Services {
@@ -45,17 +46,29 @@ impl Services {
                 .context(RuntimeResourceSnafu)?,
         );
 
-        let mysql_io_runtime = Arc::new(
-            RuntimeBuilder::default()
-                .worker_threads(opts.mysql_runtime_size as usize)
-                .thread_name("mysql-io-handlers")
-                .build()
-                .context(RuntimeResourceSnafu)?,
-        );
+        let mysql_server = match opts.mode {
+            Mode::Standalone => {
+                info!("Disable MySQL server on datanode when running in standalone mode");
+                None
+            }
+            Mode::Distributed => {
+                let mysql_io_runtime = Arc::new(
+                    RuntimeBuilder::default()
+                        .worker_threads(opts.mysql_runtime_size as usize)
+                        .thread_name("mysql-io-handlers")
+                        .build()
+                        .context(RuntimeResourceSnafu)?,
+                );
+                Some(MysqlServer::create_server(
+                    instance.clone(),
+                    mysql_io_runtime,
+                ))
+            }
+        };
 
         Ok(Self {
-            grpc_server: GrpcServer::new(instance.clone(), instance.clone(), grpc_runtime),
-            mysql_server: MysqlServer::create_server(instance, mysql_io_runtime),
+            grpc_server: GrpcServer::new(instance.clone(), instance, grpc_runtime),
+            mysql_server,
         })
     }
 
@@ -63,15 +76,19 @@ impl Services {
         let grpc_addr: SocketAddr = opts.rpc_addr.parse().context(ParseAddrSnafu {
             addr: &opts.rpc_addr,
         })?;
-        let mysql_addr = &opts.mysql_addr;
-        let mysql_addr: SocketAddr = mysql_addr
-            .parse()
-            .context(ParseAddrSnafu { addr: mysql_addr })?;
-        try_join!(
-            self.grpc_server.start(grpc_addr),
-            self.mysql_server.start(mysql_addr),
-        )
-        .context(StartServerSnafu)?;
+
+        let mut res = vec![self.grpc_server.start(grpc_addr)];
+        if let Some(mysql_server) = &self.mysql_server {
+            let mysql_addr = &opts.mysql_addr;
+            let mysql_addr: SocketAddr = mysql_addr
+                .parse()
+                .context(ParseAddrSnafu { addr: mysql_addr })?;
+            res.push(mysql_server.start(mysql_addr));
+        };
+
+        futures::future::try_join_all(res)
+            .await
+            .context(StartServerSnafu)?;
         Ok(())
     }
 }

src/datanode/src/server/grpc/ddl.rs

@@ -12,25 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::sync::Arc;
-
-use api::helper::ColumnDataTypeWrapper;
 use api::result::AdminResultBuilder;
-use api::v1::alter_expr::Kind;
-use api::v1::{AdminResult, AlterExpr, ColumnDef, CreateExpr};
-use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
+use api::v1::{AdminResult, AlterExpr, CreateExpr};
 use common_error::prelude::{ErrorExt, StatusCode};
+use common_grpc_expr::{alter_expr_to_request, create_expr_to_request};
 use common_query::Output;
 use common_telemetry::{error, info};
-use datatypes::schema::{ColumnDefaultConstraint, ColumnSchema, SchemaBuilder, SchemaRef};
 use futures::TryFutureExt;
 use snafu::prelude::*;
-use table::metadata::TableId;
-use table::requests::{AddColumnRequest, AlterKind, AlterTableRequest, CreateTableRequest};
 
-use crate::error::{
-    self, BumpTableIdSnafu, ColumnDefaultConstraintSnafu, MissingFieldSnafu, Result,
-};
+use crate::error::{AlterExprToRequestSnafu, BumpTableIdSnafu, CreateExprToRequestSnafu};
 use crate::instance::Instance;
 use crate::sql::SqlRequest;
 
@@ -78,7 +69,7 @@ impl Instance {
             }
         };
 
-        let request = create_expr_to_request(table_id, expr).await;
+        let request = create_expr_to_request(table_id, expr).context(CreateExprToRequestSnafu);
         let result = futures::future::ready(request)
             .and_then(|request| self.sql_handler().execute(SqlRequest::CreateTable(request)))
             .await;
@@ -97,14 +88,17 @@ impl Instance {
     }
 
     pub(crate) async fn handle_alter(&self, expr: AlterExpr) -> AdminResult {
-        let request = match alter_expr_to_request(expr).transpose() {
-            Some(req) => req,
+        let request = match alter_expr_to_request(expr)
+            .context(AlterExprToRequestSnafu)
+            .transpose()
+        {
             None => {
                 return AdminResultBuilder::default()
                     .status_code(StatusCode::Success as u32)
                     .mutate_result(0, 0)
                     .build()
             }
+            Some(req) => req,
         };
 
         let result = futures::future::ready(request)
@@ -124,149 +118,25 @@ impl Instance {
     }
 }
 
-async fn create_expr_to_request(table_id: TableId, expr: CreateExpr) -> Result<CreateTableRequest> {
-    let schema = create_table_schema(&expr)?;
-    let primary_key_indices = expr
-        .primary_keys
-        .iter()
-        .map(|key| {
-            schema
-                .column_index_by_name(key)
-                .context(error::KeyColumnNotFoundSnafu { name: key })
-        })
-        .collect::<Result<Vec<usize>>>()?;
-
-    let catalog_name = expr
-        .catalog_name
-        .unwrap_or_else(|| DEFAULT_CATALOG_NAME.to_string());
-    let schema_name = expr
-        .schema_name
-        .unwrap_or_else(|| DEFAULT_SCHEMA_NAME.to_string());
-
-    let region_ids = if expr.region_ids.is_empty() {
-        vec![0]
-    } else {
-        expr.region_ids
-    };
-
-    Ok(CreateTableRequest {
-        id: table_id,
-        catalog_name,
-        schema_name,
-        table_name: expr.table_name,
-        desc: expr.desc,
-        schema,
-        region_numbers: region_ids,
-        primary_key_indices,
-        create_if_not_exists: expr.create_if_not_exists,
-        table_options: expr.table_options,
-    })
-}
-
-fn alter_expr_to_request(expr: AlterExpr) -> Result<Option<AlterTableRequest>> {
-    match expr.kind {
-        Some(Kind::AddColumns(add_columns)) => {
-            let mut add_column_requests = vec![];
-            for add_column_expr in add_columns.add_columns {
-                let column_def = add_column_expr.column_def.context(MissingFieldSnafu {
-                    field: "column_def",
-                })?;
-
-                let schema = create_column_schema(&column_def)?;
-                add_column_requests.push(AddColumnRequest {
-                    column_schema: schema,
-                    is_key: add_column_expr.is_key,
-                })
-            }
-
-            let alter_kind = AlterKind::AddColumns {
-                columns: add_column_requests,
-            };
-
-            let request = AlterTableRequest {
-                catalog_name: expr.catalog_name,
-                schema_name: expr.schema_name,
-                table_name: expr.table_name,
-                alter_kind,
-            };
-            Ok(Some(request))
-        }
-        None => Ok(None),
-    }
-}
-
-fn create_table_schema(expr: &CreateExpr) -> Result<SchemaRef> {
-    let column_schemas = expr
-        .column_defs
-        .iter()
-        .map(create_column_schema)
-        .collect::<Result<Vec<ColumnSchema>>>()?;
-
-    ensure!(
-        column_schemas
-            .iter()
-            .any(|column| column.name == expr.time_index),
-        error::KeyColumnNotFoundSnafu {
-            name: &expr.time_index,
-        }
-    );
-
-    let column_schemas = column_schemas
-        .into_iter()
-        .map(|column_schema| {
-            if column_schema.name == expr.time_index {
-                column_schema.with_time_index(true)
-            } else {
-                column_schema
-            }
-        })
-        .collect::<Vec<_>>();
-
-    Ok(Arc::new(
-        SchemaBuilder::try_from(column_schemas)
-            .context(error::CreateSchemaSnafu)?
-            .build()
-            .context(error::CreateSchemaSnafu)?,
-    ))
-}
-
-fn create_column_schema(column_def: &ColumnDef) -> Result<ColumnSchema> {
-    let data_type =
-        ColumnDataTypeWrapper::try_new(column_def.datatype).context(error::ColumnDataTypeSnafu)?;
-    let default_constraint = match &column_def.default_constraint {
-        None => None,
-        Some(v) => {
-            Some(ColumnDefaultConstraint::try_from(&v[..]).context(ColumnDefaultConstraintSnafu)?)
-        }
-    };
-    ColumnSchema::new(
-        column_def.name.clone(),
-        data_type.into(),
-        column_def.is_nullable,
-    )
-    .with_default_constraint(default_constraint)
-    .context(ColumnDefaultConstraintSnafu)
-}
-
 #[cfg(test)]
 mod tests {
+    use std::sync::Arc;
+
+    use api::v1::ColumnDef;
     use common_catalog::consts::MIN_USER_TABLE_ID;
+    use common_grpc_expr::create_table_schema;
     use datatypes::prelude::ConcreteDataType;
+    use datatypes::schema::{ColumnDefaultConstraint, ColumnSchema, SchemaBuilder, SchemaRef};
     use datatypes::value::Value;
 
     use super::*;
-    use crate::tests::test_util;
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_create_expr_to_request() {
         common_telemetry::init_default_ut_logging();
-        let (opts, _guard) = test_util::create_tmp_dir_and_datanode_opts("create_expr_to_request");
-        let instance = Instance::with_mock_meta_client(&opts).await.unwrap();
-        instance.start().await.unwrap();
-
         let expr = testing_create_expr();
-        let request = create_expr_to_request(1024, expr).await.unwrap();
-        assert_eq!(request.id, common_catalog::consts::MIN_USER_TABLE_ID);
+        let request = create_expr_to_request(1024, expr).unwrap();
+        assert_eq!(request.id, MIN_USER_TABLE_ID);
         assert_eq!(request.catalog_name, "greptime".to_string());
         assert_eq!(request.schema_name, "public".to_string());
         assert_eq!(request.table_name, "my-metrics");
@@ -277,12 +147,13 @@ mod tests {
 
         let mut expr = testing_create_expr();
         expr.primary_keys = vec!["host".to_string(), "not-exist-column".to_string()];
-        let result = create_expr_to_request(1025, expr).await;
-        assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .to_string()
-            .contains("Specified timestamp key or primary key column not found: not-exist-column"));
+        let result = create_expr_to_request(1025, expr);
+        let err_msg = result.unwrap_err().to_string();
+        assert!(
+            err_msg.contains("Column `not-exist-column` not found in table `my-metrics`"),
+            "{}",
+            err_msg
+        );
     }
 
     #[test]
@@ -293,11 +164,12 @@ mod tests {
 
         expr.time_index = "not-exist-column".to_string();
         let result = create_table_schema(&expr);
-        assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .to_string()
-            .contains("Specified timestamp key or primary key column not found: not-exist-column"));
+        let err_msg = result.unwrap_err().to_string();
+        assert!(
+            err_msg.contains("Missing timestamp column"),
+            "actual: {}",
+            err_msg
+        );
     }
 
     #[test]
@@ -308,12 +180,11 @@ mod tests {
             is_nullable: true,
             default_constraint: None,
         };
-        let result = create_column_schema(&column_def);
-        assert!(result.is_err());
-        assert_eq!(
-            result.unwrap_err().to_string(),
-            "Column datatype error, source: Unknown proto column datatype: 1024"
-        );
+        let result = column_def.try_as_column_schema();
+        assert!(matches!(
+            result.unwrap_err(),
+            api::error::Error::UnknownColumnDataType { .. }
+        ));
 
         let column_def = ColumnDef {
             name: "a".to_string(),
@@ -321,19 +192,19 @@ mod tests {
             is_nullable: true,
             default_constraint: None,
         };
-        let column_schema = create_column_schema(&column_def).unwrap();
+        let column_schema = column_def.try_as_column_schema().unwrap();
         assert_eq!(column_schema.name, "a");
         assert_eq!(column_schema.data_type, ConcreteDataType::string_datatype());
         assert!(column_schema.is_nullable());
 
-        let default_constraint = ColumnDefaultConstraint::Value(Value::from("defaut value"));
+        let default_constraint = ColumnDefaultConstraint::Value(Value::from("default value"));
         let column_def = ColumnDef {
             name: "a".to_string(),
             datatype: 12, // string
             is_nullable: true,
             default_constraint: Some(default_constraint.clone().try_into().unwrap()),
         };
-        let column_schema = create_column_schema(&column_def).unwrap();
+        let column_schema = column_def.try_as_column_schema().unwrap();
         assert_eq!(column_schema.name, "a");
         assert_eq!(column_schema.data_type, ConcreteDataType::string_datatype());
         assert!(column_schema.is_nullable());

src/datanode/src/server/grpc/plan.rs

@@ -14,7 +14,7 @@
 
 use std::sync::Arc;
 
-use common_grpc::{AsExcutionPlan, DefaultAsPlanImpl};
+use common_grpc::{AsExecutionPlan, DefaultAsPlanImpl};
 use common_query::physical_plan::{PhysicalPlanAdapter, PhysicalPlanRef};
 use common_query::Output;
 use datatypes::schema::Schema;

src/datanode/src/sql.rs

@@ -16,8 +16,11 @@
 
 use catalog::CatalogManagerRef;
 use common_query::Output;
-use query::sql::{show_databases, show_tables};
+use query::query_engine::QueryEngineRef;
+use query::sql::{describe_table, explain, show_databases, show_tables};
 use snafu::{OptionExt, ResultExt};
+use sql::statements::describe::DescribeTable;
+use sql::statements::explain::Explain;
 use sql::statements::show::{ShowDatabases, ShowTables};
 use table::engine::{EngineContext, TableEngineRef, TableReference};
 use table::requests::*;
@@ -37,19 +40,27 @@ pub enum SqlRequest {
     Alter(AlterTableRequest),
     ShowDatabases(ShowDatabases),
     ShowTables(ShowTables),
+    DescribeTable(DescribeTable),
+    Explain(Box<Explain>),
 }
 
 // Handler to execute SQL except query
 pub struct SqlHandler {
     table_engine: TableEngineRef,
     catalog_manager: CatalogManagerRef,
+    query_engine: QueryEngineRef,
 }
 
 impl SqlHandler {
-    pub fn new(table_engine: TableEngineRef, catalog_manager: CatalogManagerRef) -> Self {
+    pub fn new(
+        table_engine: TableEngineRef,
+        catalog_manager: CatalogManagerRef,
+        query_engine: QueryEngineRef,
+    ) -> Self {
         Self {
             table_engine,
             catalog_manager,
+            query_engine,
         }
     }
 
@@ -65,6 +76,12 @@ impl SqlHandler {
             SqlRequest::ShowTables(stmt) => {
                 show_tables(stmt, self.catalog_manager.clone()).context(error::ExecuteSqlSnafu)
             }
+            SqlRequest::DescribeTable(stmt) => {
+                describe_table(stmt, self.catalog_manager.clone()).context(error::ExecuteSqlSnafu)
+            }
+            SqlRequest::Explain(stmt) => explain(stmt, self.query_engine.clone())
+                .await
+                .context(error::ExecuteSqlSnafu),
         }
     }
 
@@ -211,7 +228,7 @@ mod tests {
         );
         let factory = QueryEngineFactory::new(catalog_list.clone());
         let query_engine = factory.query_engine();
-        let sql_handler = SqlHandler::new(table_engine, catalog_list);
+        let sql_handler = SqlHandler::new(table_engine, catalog_list, query_engine.clone());
 
         let stmt = match query_engine.sql_to_statement(sql).unwrap() {
             Statement::Insert(i) => i,

src/datanode/src/sql/alter.rs

@@ -72,6 +72,9 @@ impl SqlHandler {
                     is_key: false,
                 }],
             },
+            AlterTableOperation::DropColumn { name } => AlterKind::DropColumns {
+                names: vec![name.value.clone()],
+            },
         };
         Ok(AlterTableRequest {
             catalog_name: Some(catalog_name),

src/datanode/src/sql/create.rs

@@ -172,7 +172,7 @@ impl SqlHandler {
                     return ConstraintNotSupportedSnafu {
                         constraint: format!("{:?}", c),
                     }
-                    .fail()
+                    .fail();
                 }
             }
         }

src/datanode/src/tests/grpc_test.rs

@@ -30,10 +30,10 @@ use client::{Client, Database, ObjectResult};
 use common_catalog::consts::MIN_USER_TABLE_ID;
 use common_runtime::Builder as RuntimeBuilder;
 use frontend::frontend::FrontendOptions;
-use frontend::frontend::Mode::Standalone;
 use frontend::grpc::GrpcOptions;
 use servers::grpc::GrpcServer;
 use servers::server::Server;
+use servers::Mode;
 
 use crate::instance::Instance;
 use crate::tests::test_util::{self, TestGuard};
@@ -62,7 +62,7 @@ async fn setup_grpc_server(
 
     let fe_grpc_addr = format!("127.0.0.1:{}", frontend_port);
     let fe_opts = FrontendOptions {
-        mode: Standalone,
+        mode: Mode::Standalone,
         datanode_rpc_addr: datanode_grpc_addr.clone(),
         grpc_options: Some(GrpcOptions {
             addr: fe_grpc_addr.clone(),

src/datanode/src/tests/instance_test.rs

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use arrow::array::{Int64Array, UInt64Array, Utf8Array};
 use common_query::Output;
 use common_recordbatch::util;
 use datafusion::arrow_print;
 use datafusion_common::record_batch::RecordBatch as DfRecordBatch;
+use datatypes::arrow::array::{Int64Array, UInt64Array, Utf8Array};
 use datatypes::arrow_array::StringArray;
 use datatypes::prelude::ConcreteDataType;
 
@@ -179,8 +179,7 @@ async fn assert_query_result(instance: &Instance, sql: &str, ts: i64, host: &str
     }
 }
 
-#[tokio::test(flavor = "multi_thread")]
-async fn test_execute_insert() {
+async fn setup_test_instance() -> Instance {
     common_telemetry::init_default_ut_logging();
 
     let (opts, _guard) = test_util::create_tmp_dir_and_datanode_opts("execute_insert");
@@ -195,6 +194,12 @@ async fn test_execute_insert() {
     .await
     .unwrap();
 
+    instance
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_execute_insert() {
+    let instance = setup_test_instance().await;
     let output = instance
         .execute_sql(
             r#"insert into demo(host, cpu, memory, ts) values
@@ -479,6 +484,7 @@ async fn test_alter_table() {
         .await
         .unwrap();
 
+    // Add column
     let output = instance
         .execute_sql("alter table demo add my_tag string null")
         .await
@@ -498,7 +504,10 @@ async fn test_alter_table() {
         .unwrap();
     assert!(matches!(output, Output::AffectedRows(1)));
 
-    let output = instance.execute_sql("select * from demo").await.unwrap();
+    let output = instance
+        .execute_sql("select * from demo order by ts")
+        .await
+        .unwrap();
     let expected = vec![
         "+-------+-----+--------+---------------------+--------+",
         "| host  | cpu | memory | ts                  | my_tag |",
@@ -509,6 +518,51 @@ async fn test_alter_table() {
         "+-------+-----+--------+---------------------+--------+",
     ];
     check_output_stream(output, expected).await;
+
+    // Drop a column
+    let output = instance
+        .execute_sql("alter table demo drop column memory")
+        .await
+        .unwrap();
+    assert!(matches!(output, Output::AffectedRows(0)));
+
+    let output = instance
+        .execute_sql("select * from demo order by ts")
+        .await
+        .unwrap();
+    let expected = vec![
+        "+-------+-----+---------------------+--------+",
+        "| host  | cpu | ts                  | my_tag |",
+        "+-------+-----+---------------------+--------+",
+        "| host1 | 1.1 | 1970-01-01 00:00:01 |        |",
+        "| host2 | 2.2 | 1970-01-01 00:00:02 | hello  |",
+        "| host3 | 3.3 | 1970-01-01 00:00:03 |        |",
+        "+-------+-----+---------------------+--------+",
+    ];
+    check_output_stream(output, expected).await;
+
+    // insert a new row
+    let output = instance
+        .execute_sql("insert into demo(host, cpu, ts, my_tag) values ('host4', 400, 4000, 'world')")
+        .await
+        .unwrap();
+    assert!(matches!(output, Output::AffectedRows(1)));
+
+    let output = instance
+        .execute_sql("select * from demo order by ts")
+        .await
+        .unwrap();
+    let expected = vec![
+        "+-------+-----+---------------------+--------+",
+        "| host  | cpu | ts                  | my_tag |",
+        "+-------+-----+---------------------+--------+",
+        "| host1 | 1.1 | 1970-01-01 00:00:01 |        |",
+        "| host2 | 2.2 | 1970-01-01 00:00:02 | hello  |",
+        "| host3 | 3.3 | 1970-01-01 00:00:03 |        |",
+        "| host4 | 400 | 1970-01-01 00:00:04 | world  |",
+        "+-------+-----+---------------------+--------+",
+    ];
+    check_output_stream(output, expected).await;
 }
 
 async fn test_insert_with_default_value_for_type(type_name: &str) {

src/datanode/src/tests/test_util.rs

@@ -19,9 +19,10 @@ use catalog::CatalogManagerRef;
 use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, MIN_USER_TABLE_ID};
 use datatypes::data_type::ConcreteDataType;
 use datatypes::schema::{ColumnSchema, SchemaBuilder};
-use frontend::frontend::Mode;
 use mito::config::EngineConfig;
 use mito::table::test_util::{new_test_object_store, MockEngine, MockMitoEngine};
+use query::QueryEngineFactory;
+use servers::Mode;
 use snafu::ResultExt;
 use table::engine::{EngineContext, TableEngineRef};
 use table::requests::CreateTableRequest;
@@ -121,5 +122,9 @@ pub async fn create_mock_sql_handler() -> SqlHandler {
             .await
             .unwrap(),
     );
-    SqlHandler::new(mock_engine, catalog_manager)
+
+    let catalog_list = catalog::local::new_memory_catalog_list().unwrap();
+    let factory = QueryEngineFactory::new(catalog_list);
+
+    SqlHandler::new(mock_engine, catalog_manager, factory.query_engine())
 }

src/datatypes/src/arrow_array.rs

@@ -100,7 +100,9 @@ pub fn arrow_array_get(array: &dyn Array, idx: usize) -> Result<Value> {
 #[cfg(test)]
 mod test {
     use arrow::array::{
-        Int64Array as ArrowI64Array, MutableListArray, MutablePrimitiveArray, TryExtend, *,
+        BooleanArray, Float32Array, Float64Array, Int16Array, Int32Array, Int64Array, Int8Array,
+        MutableListArray, MutablePrimitiveArray, TryExtend, UInt16Array, UInt32Array, UInt64Array,
+        UInt8Array,
     };
     use arrow::buffer::Buffer;
     use arrow::datatypes::{DataType, TimeUnit as ArrowTimeUnit};
@@ -126,7 +128,7 @@ mod test {
         assert_eq!(Value::Int32(2), arrow_array_get(&array1, 1).unwrap());
         let array1 = UInt32Array::from_vec(vec![1, 2, 3, 4]);
         assert_eq!(Value::UInt32(2), arrow_array_get(&array1, 1).unwrap());
-        let array = ArrowI64Array::from_vec(vec![1, 2, 3, 4]);
+        let array = Int64Array::from_vec(vec![1, 2, 3, 4]);
         assert_eq!(Value::Int64(2), arrow_array_get(&array, 1).unwrap());
         let array1 = UInt64Array::from_vec(vec![1, 2, 3, 4]);
         assert_eq!(Value::UInt64(2), arrow_array_get(&array1, 1).unwrap());
@@ -159,7 +161,7 @@ mod test {
         );
         assert_eq!(Value::Null, arrow_array_get(&array3, 1).unwrap());
 
-        let vector = TimestampVector::new(ArrowI64Array::from_vec(vec![1, 2, 3, 4]));
+        let vector = TimestampVector::new(Int64Array::from_vec(vec![1, 2, 3, 4]));
         let array = vector.to_boxed_arrow_array();
         let value = arrow_array_get(&*array, 1).unwrap();
         assert_eq!(

src/datatypes/src/schema.rs

@@ -156,7 +156,7 @@ impl Schema {
     /// Create a schema from a vector of [ColumnSchema].
     ///
     /// # Panics
-    /// Panics when ColumnSchema's `default_constrait` can't be serialized into json.
+    /// Panics when ColumnSchema's `default_constraint` can't be serialized into json.
     pub fn new(column_schemas: Vec<ColumnSchema>) -> Schema {
         // Builder won't fail in this case
         SchemaBuilder::try_from(column_schemas)

src/datatypes/src/schema/constraint.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::fmt::{Display, Formatter};
 use std::sync::Arc;
 
 use common_time::util;
@@ -53,6 +54,15 @@ impl TryFrom<ColumnDefaultConstraint> for Vec<u8> {
     }
 }
 
+impl Display for ColumnDefaultConstraint {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ColumnDefaultConstraint::Function(expr) => write!(f, "{}", expr),
+            ColumnDefaultConstraint::Value(v) => write!(f, "{}", v),
+        }
+    }
+}
+
 impl ColumnDefaultConstraint {
     /// Returns a default null constraint.
     pub fn null_value() -> ColumnDefaultConstraint {

src/datatypes/src/value.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use std::cmp::Ordering;
+use std::fmt::{Display, Formatter};
 
 use common_base::bytes::{Bytes, StringBytes};
 use common_time::date::Date;
@@ -62,6 +63,47 @@ pub enum Value {
     List(ListValue),
 }
 
+impl Display for Value {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Value::Null => write!(f, "{}", self.data_type().name()),
+            Value::Boolean(v) => write!(f, "{}", v),
+            Value::UInt8(v) => write!(f, "{}", v),
+            Value::UInt16(v) => write!(f, "{}", v),
+            Value::UInt32(v) => write!(f, "{}", v),
+            Value::UInt64(v) => write!(f, "{}", v),
+            Value::Int8(v) => write!(f, "{}", v),
+            Value::Int16(v) => write!(f, "{}", v),
+            Value::Int32(v) => write!(f, "{}", v),
+            Value::Int64(v) => write!(f, "{}", v),
+            Value::Float32(v) => write!(f, "{}", v),
+            Value::Float64(v) => write!(f, "{}", v),
+            Value::String(v) => write!(f, "{}", v.as_utf8()),
+            Value::Binary(v) => {
+                let hex = v
+                    .iter()
+                    .map(|b| format!("{:02x}", b))
+                    .collect::<Vec<String>>()
+                    .join("");
+                write!(f, "{}", hex)
+            }
+            Value::Date(v) => write!(f, "{}", v),
+            Value::DateTime(v) => write!(f, "{}", v),
+            Value::Timestamp(v) => write!(f, "{}", v.to_iso8601_string()),
+            Value::List(v) => {
+                let default = Box::new(vec![]);
+                let items = v.items().as_ref().unwrap_or(&default);
+                let items = items
+                    .iter()
+                    .map(|i| i.to_string())
+                    .collect::<Vec<String>>()
+                    .join(", ");
+                write!(f, "{}[{}]", v.datatype.name(), items)
+            }
+        }
+    }
+}
+
 impl Value {
     /// Returns data type of the value.
     ///
@@ -624,6 +666,7 @@ impl<'a> PartialOrd for ListValueRef<'a> {
 #[cfg(test)]
 mod tests {
     use arrow::datatypes::DataType as ArrowDataType;
+    use num_traits::Float;
 
     use super::*;
 
@@ -1033,7 +1076,7 @@ mod tests {
         );
         assert_eq!(
             serde_json::Value::Number(5000i32.into()),
-            to_json(Value::Date(common_time::date::Date::new(5000)))
+            to_json(Value::Date(Date::new(5000)))
         );
         assert_eq!(
             serde_json::Value::Number(5000i64.into()),
@@ -1217,4 +1260,51 @@ mod tests {
         );
         assert_eq!(ValueRef::String(hello), ValueRef::from(hello));
     }
+
+    #[test]
+    fn test_display() {
+        assert_eq!(Value::Null.to_string(), "Null");
+        assert_eq!(Value::UInt8(8).to_string(), "8");
+        assert_eq!(Value::UInt16(16).to_string(), "16");
+        assert_eq!(Value::UInt32(32).to_string(), "32");
+        assert_eq!(Value::UInt64(64).to_string(), "64");
+        assert_eq!(Value::Int8(-8).to_string(), "-8");
+        assert_eq!(Value::Int16(-16).to_string(), "-16");
+        assert_eq!(Value::Int32(-32).to_string(), "-32");
+        assert_eq!(Value::Int64(-64).to_string(), "-64");
+        assert_eq!(Value::Float32((-32.123).into()).to_string(), "-32.123");
+        assert_eq!(Value::Float64((-64.123).into()).to_string(), "-64.123");
+        assert_eq!(Value::Float64(OrderedF64::infinity()).to_string(), "inf");
+        assert_eq!(Value::Float64(OrderedF64::nan()).to_string(), "NaN");
+        assert_eq!(Value::String(StringBytes::from("123")).to_string(), "123");
+        assert_eq!(
+            Value::Binary(Bytes::from(vec![1, 2, 3])).to_string(),
+            "010203"
+        );
+        assert_eq!(Value::Date(Date::new(0)).to_string(), "1970-01-01");
+        assert_eq!(
+            Value::DateTime(DateTime::new(0)).to_string(),
+            "1970-01-01 00:00:00"
+        );
+        assert_eq!(
+            Value::Timestamp(Timestamp::new(1000, TimeUnit::Millisecond)).to_string(),
+            "1970-01-01 00:00:01+0000"
+        );
+        assert_eq!(
+            Value::List(ListValue::new(
+                Some(Box::new(vec![Value::Int8(1), Value::Int8(2)])),
+                ConcreteDataType::int8_datatype(),
+            ))
+            .to_string(),
+            "Int8[1, 2]"
+        );
+        assert_eq!(
+            Value::List(ListValue::new(
+                Some(Box::new(vec![])),
+                ConcreteDataType::timestamp_datatype(TimeUnit::Millisecond),
+            ))
+            .to_string(),
+            "Timestamp[]"
+        );
+    }
 }

src/datatypes/src/vectors.rs

@@ -28,16 +28,6 @@ pub mod primitive;
 mod string;
 mod timestamp;
 
-pub mod all {
-    //! All vector types.
-    pub use crate::vectors::{
-        BinaryVector, BooleanVector, ConstantVector, DateTimeVector, DateVector, Float32Vector,
-        Float64Vector, Int16Vector, Int32Vector, Int64Vector, Int8Vector, ListVector, NullVector,
-        PrimitiveVector, StringVector, TimestampVector, UInt16Vector, UInt32Vector, UInt64Vector,
-        UInt8Vector,
-    };
-}
-
 use std::any::Any;
 use std::fmt::Debug;
 use std::sync::Arc;

src/datatypes/src/vectors/boolean.rs

@@ -18,8 +18,6 @@ use std::sync::Arc;
 
 use arrow::array::{Array, ArrayRef, BooleanArray, MutableArray, MutableBooleanArray};
 use arrow::bitmap::utils::{BitmapIter, ZipValidity};
-use arrow::bitmap::MutableBitmap;
-use arrow::datatypes::DataType as ArrowDataType;
 use snafu::{OptionExt, ResultExt};
 
 use crate::data_type::ConcreteDataType;
@@ -75,14 +73,6 @@ impl<Ptr: Borrow<Option<bool>>> FromIterator<Ptr> for BooleanVector {
     }
 }
 
-impl From<MutableBitmap> for BooleanVector {
-    fn from(bitmap: MutableBitmap) -> BooleanVector {
-        BooleanVector {
-            array: BooleanArray::new(ArrowDataType::Boolean, bitmap.into(), None),
-        }
-    }
-}
-
 impl Vector for BooleanVector {
     fn data_type(&self) -> ConcreteDataType {
         ConcreteDataType::boolean_datatype()
@@ -351,16 +341,4 @@ mod tests {
         let expect: VectorRef = Arc::new(BooleanVector::from_slice(&[true, false, true]));
         assert_eq!(expect, vector);
     }
-
-    #[test]
-    fn test_from_mutable_bitmap() {
-        let mut bitmap = MutableBitmap::new();
-        let values = [false, true, true, false, true];
-        for v in values {
-            bitmap.push(v);
-        }
-        let vector = BooleanVector::from(bitmap);
-        let expect = BooleanVector::from_slice(&values);
-        assert_eq!(expect, vector);
-    }
 }

src/datatypes/src/vectors/operations.rs

@@ -16,12 +16,14 @@ mod filter;
 mod find_unique;
 mod replicate;
 
-use arrow::bitmap::MutableBitmap;
+use common_base::BitVec;
 
 use crate::error::Result;
 use crate::types::PrimitiveElement;
-use crate::vectors::all::*;
-use crate::vectors::{Vector, VectorRef};
+use crate::vectors::{
+    BinaryVector, BooleanVector, ConstantVector, DateTimeVector, DateVector, ListVector,
+    NullVector, PrimitiveVector, StringVector, TimestampVector, Vector, VectorRef,
+};
 
 /// Vector compute operations.
 pub trait VectorOp {
@@ -48,7 +50,7 @@ pub trait VectorOp {
     /// Panics if
     /// - `selected.len() < self.len()`.
     /// - `prev_vector` and `self` have different data types.
-    fn find_unique(&self, selected: &mut MutableBitmap, prev_vector: Option<&dyn Vector>);
+    fn find_unique(&self, selected: &mut BitVec, prev_vector: Option<&dyn Vector>);
 
     /// Filters the vector, returns elements matching the `filter` (i.e. where the values are true).
     ///
@@ -63,7 +65,7 @@ macro_rules! impl_scalar_vector_op {
                 replicate::$replicate(self, offsets)
             }
 
-            fn find_unique(&self, selected: &mut MutableBitmap, prev_vector: Option<&dyn Vector>) {
+            fn find_unique(&self, selected: &mut BitVec, prev_vector: Option<&dyn Vector>) {
                 let prev_vector = prev_vector.map(|pv| pv.as_any().downcast_ref::<$VectorType>().unwrap());
                 find_unique::find_unique_scalar(self, selected, prev_vector);
             }
@@ -90,7 +92,7 @@ impl VectorOp for ConstantVector {
         replicate::replicate_constant(self, offsets)
     }
 
-    fn find_unique(&self, selected: &mut MutableBitmap, prev_vector: Option<&dyn Vector>) {
+    fn find_unique(&self, selected: &mut BitVec, prev_vector: Option<&dyn Vector>) {
         let prev_vector = prev_vector.and_then(|pv| pv.as_any().downcast_ref::<ConstantVector>());
         find_unique::find_unique_constant(self, selected, prev_vector);
     }
@@ -105,7 +107,7 @@ impl VectorOp for NullVector {
         replicate::replicate_null(self, offsets)
     }
 
-    fn find_unique(&self, selected: &mut MutableBitmap, prev_vector: Option<&dyn Vector>) {
+    fn find_unique(&self, selected: &mut BitVec, prev_vector: Option<&dyn Vector>) {
         let prev_vector = prev_vector.and_then(|pv| pv.as_any().downcast_ref::<NullVector>());
         find_unique::find_unique_null(self, selected, prev_vector);
     }
@@ -123,7 +125,7 @@ where
         replicate::replicate_primitive(self, offsets)
     }
 
-    fn find_unique(&self, selected: &mut MutableBitmap, prev_vector: Option<&dyn Vector>) {
+    fn find_unique(&self, selected: &mut BitVec, prev_vector: Option<&dyn Vector>) {
         let prev_vector =
             prev_vector.and_then(|pv| pv.as_any().downcast_ref::<PrimitiveVector<T>>());
         find_unique::find_unique_scalar(self, selected, prev_vector);

src/datatypes/src/vectors/operations/find_unique.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use arrow::bitmap::MutableBitmap;
+use common_base::BitVec;
 
 use crate::scalars::ScalarVector;
 use crate::vectors::{ConstantVector, NullVector, Vector};
@@ -22,7 +22,7 @@ use crate::vectors::{ConstantVector, NullVector, Vector};
 // in any other case.
 pub(crate) fn find_unique_scalar<'a, T: ScalarVector>(
     vector: &'a T,
-    selected: &'a mut MutableBitmap,
+    selected: &'a mut BitVec,
     prev_vector: Option<&'a T>,
 ) where
     T::RefItem<'a>: PartialEq,
@@ -44,7 +44,7 @@ pub(crate) fn find_unique_scalar<'a, T: ScalarVector>(
         }
     }
 
-    // Marks first element as selcted if it is different from previous element, otherwise
+    // Marks first element as selected if it is different from previous element, otherwise
     // keep selected bitmap unchanged.
     let is_first_not_duplicate = prev_vector
         .map(|pv| {
@@ -63,7 +63,7 @@ pub(crate) fn find_unique_scalar<'a, T: ScalarVector>(
 
 pub(crate) fn find_unique_null(
     vector: &NullVector,
-    selected: &mut MutableBitmap,
+    selected: &mut BitVec,
     prev_vector: Option<&NullVector>,
 ) {
     if vector.is_empty() {
@@ -78,7 +78,7 @@ pub(crate) fn find_unique_null(
 
 pub(crate) fn find_unique_constant(
     vector: &ConstantVector,
-    selected: &mut MutableBitmap,
+    selected: &mut BitVec,
     prev_vector: Option<&ConstantVector>,
 ) {
     if vector.is_empty() {
@@ -107,7 +107,7 @@ mod tests {
     use super::*;
     use crate::vectors::{Int32Vector, StringVector, VectorOp};
 
-    fn check_bitmap(expect: &[bool], selected: &MutableBitmap) {
+    fn check_bitmap(expect: &[bool], selected: &BitVec) {
         let actual = selected.iter().collect::<Vec<_>>();
         assert_eq!(expect, actual);
     }
@@ -124,7 +124,7 @@ mod tests {
         let input = Int32Vector::from_iter(input);
         let prev = prev.map(Int32Vector::from_slice);
 
-        let mut selected = MutableBitmap::from_len_zeroed(input.len());
+        let mut selected = BitVec::repeat(false, input.len());
         input.find_unique(&mut selected, prev.as_ref().map(|v| v as _));
 
         check_bitmap(expect, &selected);
@@ -164,7 +164,7 @@ mod tests {
         let prev = Int32Vector::from_slice(&[1]);
 
         let v1 = Int32Vector::from_slice(&[2, 3, 4]);
-        let mut selected = MutableBitmap::from_len_zeroed(v1.len());
+        let mut selected = BitVec::repeat(false, v1.len());
         v1.find_unique(&mut selected, Some(&prev));
 
         // Though element in v2 are the same as prev, but we should still keep them.
@@ -174,15 +174,8 @@ mod tests {
         check_bitmap(&[true, true, true], &selected);
     }
 
-    fn new_bitmap(bits: &[bool]) -> MutableBitmap {
-        let mut bitmap = MutableBitmap::from_len_zeroed(bits.len());
-        for (i, bit) in bits.iter().enumerate() {
-            if *bit {
-                bitmap.set(i, true);
-            }
-        }
-
-        bitmap
+    fn new_bitmap(bits: &[bool]) -> BitVec {
+        BitVec::from_iter(bits)
     }
 
     #[test]
@@ -222,7 +215,7 @@ mod tests {
 
     fn check_find_unique_null(len: usize) {
         let input = NullVector::new(len);
-        let mut selected = MutableBitmap::from_len_zeroed(input.len());
+        let mut selected = BitVec::repeat(false, input.len());
         input.find_unique(&mut selected, None);
 
         let mut expect = vec![false; len];
@@ -231,7 +224,7 @@ mod tests {
         }
         check_bitmap(&expect, &selected);
 
-        let mut selected = MutableBitmap::from_len_zeroed(input.len());
+        let mut selected = BitVec::repeat(false, input.len());
         let prev = Some(NullVector::new(1));
         input.find_unique(&mut selected, prev.as_ref().map(|v| v as _));
         let expect = vec![false; len];
@@ -273,7 +266,7 @@ mod tests {
 
     fn check_find_unique_constant(len: usize) {
         let input = ConstantVector::new(Arc::new(Int32Vector::from_slice(&[8])), len);
-        let mut selected = MutableBitmap::from_len_zeroed(len);
+        let mut selected = BitVec::repeat(false, len);
         input.find_unique(&mut selected, None);
 
         let mut expect = vec![false; len];
@@ -282,7 +275,7 @@ mod tests {
         }
         check_bitmap(&expect, &selected);
 
-        let mut selected = MutableBitmap::from_len_zeroed(len);
+        let mut selected = BitVec::repeat(false, len);
         let prev = Some(ConstantVector::new(
             Arc::new(Int32Vector::from_slice(&[8])),
             1,
@@ -340,7 +333,7 @@ mod tests {
     #[test]
     fn test_find_unique_string() {
         let input = StringVector::from_slice(&["a", "a", "b", "c"]);
-        let mut selected = MutableBitmap::from_len_zeroed(4);
+        let mut selected = BitVec::repeat(false, 4);
         input.find_unique(&mut selected, None);
         let expect = vec![true, false, true, true];
         check_bitmap(&expect, &selected);
@@ -352,7 +345,7 @@ mod tests {
             use $crate::vectors::$VectorType;
 
             let v = $VectorType::from_iterator([8, 8, 9, 10].into_iter().map($ValueType::$method));
-            let mut selected = MutableBitmap::from_len_zeroed(4);
+            let mut selected = BitVec::repeat(false, 4);
             v.find_unique(&mut selected, None);
             let expect = vec![true, false, true, true];
             check_bitmap(&expect, &selected);

src/frontend/Cargo.toml

@@ -20,7 +20,7 @@ common-catalog = { path = "../common/catalog" }
 common-runtime = { path = "../common/runtime" }
 common-telemetry = { path = "../common/telemetry" }
 common-time = { path = "../common/time" }
-common-insert = { path = "../common/insert" }
+common-grpc-expr = { path = "../common/grpc-expr" }
 datafusion = { git = "https://github.com/apache/arrow-datafusion.git", branch = "arrow2", features = [
     "simd",
 ] }
@@ -46,20 +46,6 @@ store-api = { path = "../store-api" }
 table = { path = "../table" }
 tokio = { version = "1.18", features = ["full"] }
 
-[dependencies.arrow]
-package = "arrow2"
-version = "0.10"
-features = [
-    "io_csv",
-    "io_json",
-    "io_parquet",
-    "io_parquet_compression",
-    "io_ipc",
-    "ahash",
-    "compute",
-    "serde_types",
-]
-
 [dev-dependencies]
 datanode = { path = "../datanode" }
 futures = "0.3"

src/frontend/src/catalog.rs

@@ -16,7 +16,7 @@ use std::any::Any;
 use std::collections::HashSet;
 use std::sync::Arc;
 
-use catalog::error::{InvalidCatalogValueSnafu, InvalidSchemaInCatalogSnafu};
+use catalog::error::{self as catalog_err, InvalidCatalogValueSnafu};
 use catalog::remote::{Kv, KvBackendRef};
 use catalog::{
     CatalogList, CatalogManager, CatalogProvider, CatalogProviderRef, RegisterSchemaRequest,
@@ -276,17 +276,16 @@ impl SchemaProvider for FrontendSchemaProvider {
                 let val = TableGlobalValue::parse(String::from_utf8_lossy(&res.1))
                     .context(InvalidCatalogValueSnafu)?;
 
-                let table = Arc::new(DistTable {
+                let table = Arc::new(DistTable::new(
                     table_name,
-                    schema: Arc::new(
-                        val.meta
-                            .schema
+                    Arc::new(
+                        val.table_info
                             .try_into()
-                            .context(InvalidSchemaInCatalogSnafu)?,
+                            .context(catalog_err::InvalidTableInfoInCatalogSnafu)?,
                     ),
                     table_routes,
                     datanode_clients,
-                });
+                ));
                 Ok(Some(table as _))
             })
         })

src/frontend/src/error.rs

@@ -65,6 +65,17 @@ pub enum Error {
         source: api::error::Error,
     },
 
+    #[snafu(display(
+        "Invalid column proto definition, column: {}, source: {}",
+        column,
+        source
+    ))]
+    InvalidColumnDef {
+        column: String,
+        #[snafu(backtrace)]
+        source: api::error::Error,
+    },
+
     #[snafu(display(
         "Failed to convert column default constraint, column: {}, source: {}",
         column_name,
@@ -266,25 +277,25 @@ pub enum Error {
     #[snafu(display("Failed to build CreateExpr on insertion: {}", source))]
     BuildCreateExprOnInsertion {
         #[snafu(backtrace)]
-        source: common_insert::error::Error,
+        source: common_grpc_expr::error::Error,
     },
 
     #[snafu(display("Failed to find new columns on insertion: {}", source))]
     FindNewColumnsOnInsertion {
         #[snafu(backtrace)]
-        source: common_insert::error::Error,
+        source: common_grpc_expr::error::Error,
     },
 
     #[snafu(display("Failed to deserialize insert batching: {}", source))]
     DeserializeInsertBatch {
         #[snafu(backtrace)]
-        source: common_insert::error::Error,
+        source: common_grpc_expr::error::Error,
     },
 
     #[snafu(display("Failed to deserialize insert batching: {}", source))]
     InsertBatchToRequest {
         #[snafu(backtrace)]
-        source: common_insert::error::Error,
+        source: common_grpc_expr::error::Error,
     },
 
     #[snafu(display("Failed to find catalog by name: {}", catalog_name))]
@@ -413,6 +424,18 @@ pub enum Error {
         #[snafu(backtrace)]
         source: common_recordbatch::error::Error,
     },
+
+    #[snafu(display("Missing meta_client_opts section in config"))]
+    MissingMetasrvOpts { backtrace: Backtrace },
+
+    #[snafu(display("Failed to convert AlterExpr to AlterRequest, source: {}", source))]
+    AlterExprToRequest {
+        #[snafu(backtrace)]
+        source: common_grpc_expr::error::Error,
+    },
+
+    #[snafu(display("Failed to find leaders when altering table, table: {}", table))]
+    LeaderNotFound { table: String, backtrace: Backtrace },
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -449,8 +472,11 @@ impl ErrorExt for Error {
             | Error::RequestDatanode { source }
             | Error::InvalidAdminResult { source } => source.status_code(),
 
-            Error::ColumnDataType { .. }
-            | Error::FindDatanode { .. }
+            Error::ColumnDataType { source } | Error::InvalidColumnDef { source, .. } => {
+                source.status_code()
+            }
+
+            Error::FindDatanode { .. }
             | Error::GetCache { .. }
             | Error::FindTableRoutes { .. }
             | Error::SerializeJson { .. }
@@ -496,6 +522,9 @@ impl ErrorExt for Error {
             Error::CollectRecordbatchStream { source } | Error::CreateRecordbatches { source } => {
                 source.status_code()
             }
+            Error::MissingMetasrvOpts { .. } => StatusCode::InvalidArguments,
+            Error::AlterExprToRequest { source, .. } => source.status_code(),
+            Error::LeaderNotFound { .. } => StatusCode::StorageUnavailable,
         }
     }
 

src/frontend/src/expr_factory.rs

@@ -61,7 +61,7 @@ impl CreateExprFactory for DefaultCreateExprFactory {
         batch: &[InsertBatch],
     ) -> Result<CreateExpr> {
         let table_id = None;
-        let create_expr = common_insert::build_create_expr_from_insertion(
+        let create_expr = common_grpc_expr::build_create_expr_from_insertion(
             catalog_name,
             schema_name,
             table_id,

src/frontend/src/frontend.rs

@@ -14,7 +14,9 @@
 
 use std::sync::Arc;
 
+use meta_client::MetaClientOpts;
 use serde::{Deserialize, Serialize};
+use servers::Mode;
 use snafu::prelude::*;
 
 use crate::error::{self, Result};
@@ -38,7 +40,7 @@ pub struct FrontendOptions {
     pub prometheus_options: Option<PrometheusOptions>,
     pub mode: Mode,
     pub datanode_rpc_addr: String,
-    pub metasrv_addr: Option<Vec<String>>,
+    pub meta_client_opts: Option<MetaClientOpts>,
 }
 
 impl Default for FrontendOptions {
@@ -53,7 +55,7 @@ impl Default for FrontendOptions {
             prometheus_options: Some(PrometheusOptions::default()),
             mode: Mode::Standalone,
             datanode_rpc_addr: "127.0.0.1:3001".to_string(),
-            metasrv_addr: None,
+            meta_client_opts: None,
         }
     }
 }
@@ -96,10 +98,3 @@ where
         Services::start(&self.opts, instance).await
     }
 }
-
-#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
-#[serde(rename_all = "lowercase")]
-pub enum Mode {
-    Standalone,
-    Distributed,
-}

src/frontend/src/instance.rs

@@ -43,15 +43,16 @@ use common_telemetry::{debug, error, info};
 use distributed::DistInstance;
 use meta_client::client::MetaClientBuilder;
 use meta_client::MetaClientOpts;
-use servers::error as server_error;
 use servers::query_handler::{
     GrpcAdminHandler, GrpcQueryHandler, InfluxdbLineProtocolHandler, OpentsdbProtocolHandler,
     PrometheusProtocolHandler, ScriptHandler, ScriptHandlerRef, SqlQueryHandler,
 };
+use servers::{error as server_error, Mode};
 use snafu::prelude::*;
 use sql::dialect::GenericDialect;
 use sql::parser::ParserContext;
 use sql::statements::create::Partitions;
+use sql::statements::explain::Explain;
 use sql::statements::insert::Insert;
 use sql::statements::statement::Statement;
 
@@ -60,10 +61,11 @@ use crate::datanode::DatanodeClients;
 use crate::error::{
     self, AlterTableOnInsertionSnafu, AlterTableSnafu, CatalogNotFoundSnafu, CatalogSnafu,
     CreateDatabaseSnafu, CreateTableSnafu, DeserializeInsertBatchSnafu,
-    FindNewColumnsOnInsertionSnafu, InsertSnafu, Result, SchemaNotFoundSnafu, SelectSnafu,
+    FindNewColumnsOnInsertionSnafu, InsertSnafu, MissingMetasrvOptsSnafu, Result,
+    SchemaNotFoundSnafu, SelectSnafu,
 };
 use crate::expr_factory::{CreateExprFactoryRef, DefaultCreateExprFactory};
-use crate::frontend::{FrontendOptions, Mode};
+use crate::frontend::FrontendOptions;
 use crate::sql::insert_to_request;
 use crate::table::route::TableRoutes;
 
@@ -129,10 +131,11 @@ impl Instance {
         instance.dist_instance = match &opts.mode {
             Mode::Standalone => None,
             Mode::Distributed => {
-                let metasrv_addr = opts
-                    .metasrv_addr
-                    .clone()
-                    .expect("Forgot to set metasrv_addr");
+                let metasrv_addr = &opts
+                    .meta_client_opts
+                    .as_ref()
+                    .context(MissingMetasrvOptsSnafu)?
+                    .metasrv_addrs;
                 info!(
                     "Creating Frontend instance in distributed mode with Meta server addr {:?}",
                     metasrv_addr
@@ -266,11 +269,26 @@ impl Instance {
 
     /// Handle alter expr
     pub async fn handle_alter(&self, expr: AlterExpr) -> Result<Output> {
-        self.admin(expr.schema_name.as_deref().unwrap_or(DEFAULT_SCHEMA_NAME))
-            .alter(expr)
-            .await
-            .and_then(admin_result_to_output)
-            .context(AlterTableSnafu)
+        match &self.dist_instance {
+            Some(dist_instance) => dist_instance.handle_alter_table(expr).await,
+            None => self
+                .admin(expr.schema_name.as_deref().unwrap_or(DEFAULT_SCHEMA_NAME))
+                .alter(expr)
+                .await
+                .and_then(admin_result_to_output)
+                .context(AlterTableSnafu),
+        }
+    }
+
+    /// Handle explain expr
+    pub async fn handle_explain(&self, sql: &str, explain_stmt: Explain) -> Result<Output> {
+        if let Some(dist_instance) = &self.dist_instance {
+            dist_instance
+                .handle_sql(sql, Statement::Explain(explain_stmt))
+                .await
+        } else {
+            Ok(Output::AffectedRows(0))
+        }
     }
 
     /// Handle batch inserts
@@ -331,8 +349,8 @@ impl Instance {
         region_number: u32,
         values: &insert_expr::Values,
     ) -> Result<Output> {
-        let insert_batches =
-            common_insert::insert_batches(&values.values).context(DeserializeInsertBatchSnafu)?;
+        let insert_batches = common_grpc_expr::insert_batches(&values.values)
+            .context(DeserializeInsertBatchSnafu)?;
         self.create_or_alter_table_on_demand(
             catalog_name,
             schema_name,
@@ -397,8 +415,9 @@ impl Instance {
             }
             Some(table) => {
                 let schema = table.schema();
-                if let Some(add_columns) = common_insert::find_new_columns(&schema, insert_batches)
-                    .context(FindNewColumnsOnInsertionSnafu)?
+                if let Some(add_columns) =
+                    common_grpc_expr::find_new_columns(&schema, insert_batches)
+                        .context(FindNewColumnsOnInsertionSnafu)?
                 {
                     info!(
                         "Find new columns {:?} on insertion, try to alter table: {}.{}.{}",
@@ -606,7 +625,9 @@ impl SqlQueryHandler for Instance {
                     .context(server_error::ExecuteQuerySnafu { query })
             }
 
-            Statement::ShowDatabases(_) | Statement::ShowTables(_) => self
+            Statement::ShowDatabases(_)
+            | Statement::ShowTables(_)
+            | Statement::DescribeTable(_) => self
                 .handle_select(Select::Sql(query.to_string()), stmt)
                 .await
                 .map_err(BoxedError::new)
@@ -630,8 +651,13 @@ impl SqlQueryHandler for Instance {
                 .await
                 .map_err(BoxedError::new)
                 .context(server_error::ExecuteQuerySnafu { query }),
+            Statement::Explain(explain_stmt) => self
+                .handle_explain(query, explain_stmt)
+                .await
+                .map_err(BoxedError::new)
+                .context(server_error::ExecuteQuerySnafu { query }),
             Statement::ShowCreateTable(_) => {
-                return server_error::NotSupportedSnafu { feat: query }.fail()
+                return server_error::NotSupportedSnafu { feat: query }.fail();
             }
         }
         .map_err(BoxedError::new)

src/frontend/src/instance/distributed.rs

@@ -16,7 +16,8 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use api::helper::ColumnDataTypeWrapper;
-use api::v1::{CreateDatabaseExpr, CreateExpr};
+use api::v1::{AlterExpr, CreateDatabaseExpr, CreateExpr};
+use catalog::CatalogList;
 use chrono::DateTime;
 use client::admin::{admin_result_to_output, Admin};
 use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
@@ -24,28 +25,30 @@ use common_catalog::{SchemaKey, SchemaValue, TableGlobalKey, TableGlobalValue};
 use common_query::Output;
 use common_telemetry::{debug, info};
 use datatypes::prelude::ConcreteDataType;
-use datatypes::schema::{ColumnDefaultConstraint, ColumnSchema, RawSchema};
+use datatypes::schema::RawSchema;
 use meta_client::client::MetaClient;
 use meta_client::rpc::{
     CreateRequest as MetaCreateRequest, Partition as MetaPartition, PutRequest, RouteResponse,
     TableName, TableRoute,
 };
-use query::sql::{show_databases, show_tables};
+use query::sql::{describe_table, explain, show_databases, show_tables};
 use query::{QueryEngineFactory, QueryEngineRef};
 use snafu::{ensure, OptionExt, ResultExt};
 use sql::statements::create::Partitions;
 use sql::statements::sql_value_to_value;
 use sql::statements::statement::Statement;
 use sqlparser::ast::Value as SqlValue;
-use table::metadata::RawTableMeta;
+use table::metadata::{RawTableInfo, RawTableMeta, TableIdent, TableType};
 
 use crate::catalog::FrontendCatalogManager;
 use crate::datanode::DatanodeClients;
 use crate::error::{
-    self, CatalogEntrySerdeSnafu, ColumnDataTypeSnafu, ConvertColumnDefaultConstraintSnafu,
-    PrimaryKeyNotFoundSnafu, RequestMetaSnafu, Result, StartMetaClientSnafu,
+    self, CatalogEntrySerdeSnafu, CatalogNotFoundSnafu, CatalogSnafu, ColumnDataTypeSnafu,
+    PrimaryKeyNotFoundSnafu, RequestMetaSnafu, Result, SchemaNotFoundSnafu, StartMetaClientSnafu,
+    TableNotFoundSnafu,
 };
 use crate::partitioning::{PartitionBound, PartitionDef};
+use crate::table::DistTable;
 
 #[derive(Clone)]
 pub(crate) struct DistInstance {
@@ -141,6 +144,11 @@ impl DistInstance {
                 .context(error::ExecuteSqlSnafu { sql }),
             Statement::ShowTables(stmt) => show_tables(stmt, self.catalog_manager.clone())
                 .context(error::ExecuteSqlSnafu { sql }),
+            Statement::DescribeTable(stmt) => describe_table(stmt, self.catalog_manager.clone())
+                .context(error::ExecuteSqlSnafu { sql }),
+            Statement::Explain(stmt) => explain(Box::new(stmt), self.query_engine.clone())
+                .await
+                .context(error::ExecuteSqlSnafu { sql }),
             _ => unreachable!(),
         }
     }
@@ -164,6 +172,34 @@ impl DistInstance {
         Ok(Output::AffectedRows(1))
     }
 
+    pub async fn handle_alter_table(&self, expr: AlterExpr) -> Result<Output> {
+        let catalog_name = expr.catalog_name.as_deref().unwrap_or(DEFAULT_CATALOG_NAME);
+        let schema_name = expr.schema_name.as_deref().unwrap_or(DEFAULT_SCHEMA_NAME);
+        let table_name = expr.table_name.as_str();
+        let table = self
+            .catalog_manager
+            .catalog(catalog_name)
+            .context(CatalogSnafu)?
+            .context(CatalogNotFoundSnafu { catalog_name })?
+            .schema(schema_name)
+            .context(CatalogSnafu)?
+            .context(SchemaNotFoundSnafu {
+                schema_info: format!("{}.{}", catalog_name, schema_name),
+            })?
+            .table(table_name)
+            .context(CatalogSnafu)?
+            .context(TableNotFoundSnafu {
+                table_name: format!("{}.{}.{}", catalog_name, schema_name, table_name),
+            })?;
+
+        let dist_table = table
+            .as_any()
+            .downcast_ref::<DistTable>()
+            .expect("Table impl must be DistTable in distributed mode");
+        dist_table.alter_by_expr(expr).await?;
+        Ok(Output::AffectedRows(0))
+    }
+
     async fn create_table_in_meta(
         &self,
         create_table: &CreateExpr,
@@ -227,17 +263,40 @@ fn create_table_global_value(
     let node_id = region_routes[0]
         .leader_peer
         .as_ref()
-        .context(error::FindLeaderPeerSnafu {
+        .with_context(|| error::FindLeaderPeerSnafu {
             region: region_routes[0].region.id,
             table_name: table_name.to_string(),
         })?
         .id;
 
+    let mut regions_id_map = HashMap::new();
+    for route in region_routes.iter() {
+        let node_id = route
+            .leader_peer
+            .as_ref()
+            .with_context(|| error::FindLeaderPeerSnafu {
+                region: route.region.id,
+                table_name: table_name.to_string(),
+            })?
+            .id;
+        regions_id_map
+            .entry(node_id)
+            .or_insert_with(Vec::new)
+            .push(route.region.id as u32);
+    }
+
     let mut column_schemas = Vec::with_capacity(create_table.column_defs.len());
     let mut column_name_to_index_map = HashMap::new();
 
     for (idx, column) in create_table.column_defs.iter().enumerate() {
-        column_schemas.push(create_column_schema(column)?);
+        let schema = column
+            .try_as_column_schema()
+            .context(error::InvalidColumnDefSnafu {
+                column: &column.name,
+            })?;
+        let schema = schema.with_time_index(column.name == create_table.time_index);
+
+        column_schemas.push(schema);
         column_name_to_index_map.insert(column.name.clone(), idx);
     }
 
@@ -274,34 +333,23 @@ fn create_table_global_value(
         created_on: DateTime::default(),
     };
 
-    Ok(TableGlobalValue {
-        id: table_route.table.id as u32,
-        node_id,
-        regions_id_map: HashMap::new(),
+    let table_info = RawTableInfo {
+        ident: TableIdent {
+            table_id: table_route.table.id as u32,
+            version: 0,
+        },
+        name: table_name.table_name.clone(),
+        desc: create_table.desc.clone(),
+        catalog_name: table_name.catalog_name.clone(),
+        schema_name: table_name.schema_name.clone(),
         meta,
-    })
-}
-
-// Remove this duplication in the future
-fn create_column_schema(column_def: &api::v1::ColumnDef) -> Result<ColumnSchema> {
-    let data_type =
-        ColumnDataTypeWrapper::try_new(column_def.datatype).context(error::ColumnDataTypeSnafu)?;
-    let default_constraint = match &column_def.default_constraint {
-        None => None,
-        Some(v) => Some(ColumnDefaultConstraint::try_from(&v[..]).context(
-            ConvertColumnDefaultConstraintSnafu {
-                column_name: &column_def.name,
-            },
-        )?),
+        table_type: TableType::Base,
     };
-    ColumnSchema::new(
-        column_def.name.clone(),
-        data_type.into(),
-        column_def.is_nullable,
-    )
-    .with_default_constraint(default_constraint)
-    .context(ConvertColumnDefaultConstraintSnafu {
-        column_name: &column_def.name,
+
+    Ok(TableGlobalValue {
+        node_id,
+        regions_id_map,
+        table_info,
     })
 }
 

src/frontend/src/instance/influxdb.rs

@@ -20,16 +20,15 @@ use api::v1::InsertExpr;
 use async_trait::async_trait;
 use common_catalog::consts::DEFAULT_CATALOG_NAME;
 use common_error::prelude::BoxedError;
-use common_insert::column_to_vector;
-use servers::error as server_error;
+use common_grpc_expr::column_to_vector;
 use servers::influxdb::InfluxdbRequest;
 use servers::query_handler::InfluxdbLineProtocolHandler;
+use servers::{error as server_error, Mode};
 use snafu::{OptionExt, ResultExt};
 use table::requests::InsertRequest;
 
 use crate::error;
 use crate::error::{DeserializeInsertBatchSnafu, InsertBatchToRequestSnafu, Result};
-use crate::frontend::Mode;
 use crate::instance::Instance;
 
 #[async_trait]
@@ -67,7 +66,7 @@ impl Instance {
         for insert in inserts {
             let self_clone = self.clone();
             let insert_batches = match &insert.expr.unwrap() {
-                Expr::Values(values) => common_insert::insert_batches(&values.values)
+                Expr::Values(values) => common_grpc_expr::insert_batches(&values.values)
                     .context(DeserializeInsertBatchSnafu)?,
                 Expr::Sql(_) => unreachable!(),
             };

src/frontend/src/instance/opentsdb.rs

@@ -14,13 +14,12 @@
 
 use async_trait::async_trait;
 use common_error::prelude::BoxedError;
-use servers::error as server_error;
 use servers::opentsdb::codec::DataPoint;
 use servers::query_handler::OpentsdbProtocolHandler;
+use servers::{error as server_error, Mode};
 use snafu::prelude::*;
 
 use crate::error::Result;
-use crate::frontend::Mode;
 use crate::instance::Instance;
 
 #[async_trait]

src/frontend/src/instance/prometheus.rs

@@ -24,9 +24,9 @@ use prost::Message;
 use servers::error::{self, Result as ServerResult};
 use servers::prometheus::{self, Metrics};
 use servers::query_handler::{PrometheusProtocolHandler, PrometheusResponse};
+use servers::Mode;
 use snafu::{OptionExt, ResultExt};
 
-use crate::frontend::Mode;
 use crate::instance::{parse_stmt, Instance};
 
 const SAMPLES_RESPONSE_TYPE: i32 = ResponseType::Samples as i32;

src/frontend/src/spliter.rs

@@ -32,7 +32,7 @@ pub struct WriteSpliter {
 }
 
 impl WriteSpliter {
-    pub fn with_patition_rule(rule: PartitionRuleRef<Error>) -> Self {
+    pub fn with_partition_rule(rule: PartitionRuleRef<Error>) -> Self {
         Self {
             partition_rule: rule,
         }
@@ -204,7 +204,7 @@ mod tests {
     fn test_writer_spliter() {
         let insert = mock_insert_request();
         let rule = Arc::new(MockPartitionRule) as PartitionRuleRef<Error>;
-        let spliter = WriteSpliter::with_patition_rule(rule);
+        let spliter = WriteSpliter::with_partition_rule(rule);
         let ret = spliter.split(insert).unwrap();
 
         assert_eq!(2, ret.len());
@@ -354,16 +354,16 @@ mod tests {
         let vectors = vec![v1, v2];
 
         let row_0_vals = partition_values(&vectors, 0);
-        let expeted: Vec<Value> = vec![true.into(), "host1".into()];
-        assert_eq!(expeted, row_0_vals);
+        let expected: Vec<Value> = vec![true.into(), "host1".into()];
+        assert_eq!(expected, row_0_vals);
 
         let row_1_vals = partition_values(&vectors, 1);
-        let expeted: Vec<Value> = vec![false.into(), Value::Null];
-        assert_eq!(expeted, row_1_vals);
+        let expected: Vec<Value> = vec![false.into(), Value::Null];
+        assert_eq!(expected, row_1_vals);
 
         let row_2_vals = partition_values(&vectors, 2);
-        let expeted: Vec<Value> = vec![true.into(), "host3".into()];
-        assert_eq!(expeted, row_2_vals);
+        let expected: Vec<Value> = vec![true.into(), "host3".into()];
+        assert_eq!(expected, row_2_vals);
     }
 
     fn mock_insert_request() -> InsertRequest {

src/frontend/src/table.rs

@@ -18,16 +18,23 @@ use std::any::Any;
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
+use api::v1::AlterExpr;
 use async_trait::async_trait;
+use client::admin::Admin;
 use client::Database;
-use common_error::prelude::BoxedError;
+use common_catalog::consts::DEFAULT_CATALOG_NAME;
 use common_query::error::Result as QueryResult;
 use common_query::logical_plan::Expr;
 use common_query::physical_plan::{PhysicalPlan, PhysicalPlanRef};
+use common_recordbatch::adapter::AsyncRecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatches, SendableRecordBatchStream};
+use common_telemetry::debug;
 use datafusion::execution::runtime_env::RuntimeEnv;
 use datafusion::logical_plan::Expr as DfExpr;
-use datafusion::physical_plan::Partitioning;
+use datafusion::physical_plan::{
+    Partitioning, SendableRecordBatchStream as DfSendableRecordBatchStream,
+};
+use datafusion_common::DataFusionError;
 use datatypes::prelude::Value;
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
 use meta_client::rpc::{Peer, TableName};
@@ -40,7 +47,7 @@ use table::Table;
 use tokio::sync::RwLock;
 
 use crate::datanode::DatanodeClients;
-use crate::error::{self, Error, Result};
+use crate::error::{self, Error, LeaderNotFoundSnafu, RequestDatanodeSnafu, Result};
 use crate::partitioning::columns::RangeColumnsPartitionRule;
 use crate::partitioning::range::RangePartitionRule;
 use crate::partitioning::{
@@ -55,10 +62,10 @@ pub(crate) mod scan;
 
 #[derive(Clone)]
 pub struct DistTable {
-    pub(crate) table_name: TableName,
-    pub(crate) schema: SchemaRef,
-    pub(crate) table_routes: Arc<TableRoutes>,
-    pub(crate) datanode_clients: Arc<DatanodeClients>,
+    table_name: TableName,
+    table_info: TableInfoRef,
+    table_routes: Arc<TableRoutes>,
+    datanode_clients: Arc<DatanodeClients>,
 }
 
 #[async_trait]
@@ -68,17 +75,17 @@ impl Table for DistTable {
     }
 
     fn schema(&self) -> SchemaRef {
-        self.schema.clone()
+        self.table_info.meta.schema.clone()
     }
 
     fn table_info(&self) -> TableInfoRef {
-        unimplemented!()
+        self.table_info.clone()
     }
 
     async fn insert(&self, request: InsertRequest) -> table::Result<usize> {
         let partition_rule = self.find_partition_rule().await.map_err(TableError::new)?;
 
-        let spliter = WriteSpliter::with_patition_rule(partition_rule);
+        let spliter = WriteSpliter::with_partition_rule(partition_rule);
         let inserts = spliter.split(request).map_err(TableError::new)?;
         let result = match self.dist_insert(inserts).await.map_err(TableError::new)? {
             client::ObjectResult::Select(_) => unreachable!(),
@@ -110,14 +117,14 @@ impl Table for DistTable {
             let datanode_instance = DatanodeInstance::new(Arc::new(self.clone()) as _, db);
 
             // TODO(LFC): Pass in "regions" when Datanode supports multi regions for a table.
-            partition_execs.push(PartitionExec {
+            partition_execs.push(Arc::new(PartitionExec {
                 table_name: self.table_name.clone(),
                 datanode_instance,
                 projection: projection.clone(),
                 filters: filters.to_vec(),
                 limit,
                 batches: Arc::new(RwLock::new(None)),
-            })
+            }));
         }
 
         let dist_scan = DistTableScan {
@@ -133,6 +140,20 @@ impl Table for DistTable {
 }
 
 impl DistTable {
+    pub(crate) fn new(
+        table_name: TableName,
+        table_info: TableInfoRef,
+        table_routes: Arc<TableRoutes>,
+        datanode_clients: Arc<DatanodeClients>,
+    ) -> Self {
+        Self {
+            table_name,
+            table_info,
+            table_routes,
+            datanode_clients,
+        }
+    }
+
     // TODO(LFC): Finding regions now seems less efficient, should be further looked into.
     fn find_regions(
         &self,
@@ -331,6 +352,36 @@ impl DistTable {
         };
         Ok(partition_rule)
     }
+
+    /// Define a `alter_by_expr` instead of impl [`Table::alter`] to avoid redundant conversion between  
+    /// [`table::requests::AlterTableRequest`] and [`AlterExpr`].
+    pub(crate) async fn alter_by_expr(&self, expr: AlterExpr) -> Result<()> {
+        let table_routes = self.table_routes.get_route(&self.table_name).await?;
+        let leaders = table_routes.find_leaders();
+        ensure!(
+            !leaders.is_empty(),
+            LeaderNotFoundSnafu {
+                table: format!(
+                    "{:?}.{:?}.{}",
+                    expr.catalog_name, expr.schema_name, expr.table_name
+                )
+            }
+        );
+        for datanode in leaders {
+            let admin = Admin::new(
+                DEFAULT_CATALOG_NAME,
+                self.datanode_clients.get_client(&datanode).await,
+            );
+            debug!("Sent alter table {:?} to {:?}", expr, admin);
+            let result = admin
+                .alter(expr.clone())
+                .await
+                .context(RequestDatanodeSnafu)?;
+            debug!("Alter table result: {:?}", result);
+            // TODO(hl): We should further check and track alter result in some global DDL task tracker
+        }
+        Ok(())
+    }
 }
 
 fn project_schema(table_schema: SchemaRef, projection: &Option<Vec<usize>>) -> SchemaRef {
@@ -371,10 +422,9 @@ fn reverse_operator(op: &Operator) -> Operator {
 #[derive(Debug)]
 struct DistTableScan {
     schema: SchemaRef,
-    partition_execs: Vec<PartitionExec>,
+    partition_execs: Vec<Arc<PartitionExec>>,
 }
 
-#[async_trait]
 impl PhysicalPlan for DistTableScan {
     fn as_any(&self) -> &dyn Any {
         self
@@ -396,14 +446,20 @@ impl PhysicalPlan for DistTableScan {
         unimplemented!()
     }
 
-    async fn execute(
+    fn execute(
         &self,
         partition: usize,
         _runtime: Arc<RuntimeEnv>,
     ) -> QueryResult<SendableRecordBatchStream> {
-        let exec = &self.partition_execs[partition];
-        exec.maybe_init().await.map_err(BoxedError::new)?;
-        Ok(exec.as_stream().await)
+        let exec = self.partition_execs[partition].clone();
+        let stream = Box::pin(async move {
+            exec.maybe_init()
+                .await
+                .map_err(|e| DataFusionError::External(Box::new(e)))?;
+            exec.as_stream().await
+        });
+        let stream = AsyncRecordBatchStreamAdapter::new(self.schema(), stream);
+        Ok(Box::pin(stream))
     }
 }
 
@@ -439,12 +495,13 @@ impl PartitionExec {
         Ok(())
     }
 
-    async fn as_stream(&self) -> SendableRecordBatchStream {
-        let batches = self.batches.read().await;
-        batches
-            .as_ref()
+    /// Notice: the record batch will be consumed.
+    async fn as_stream(&self) -> std::result::Result<DfSendableRecordBatchStream, DataFusionError> {
+        let mut batches = self.batches.write().await;
+        Ok(batches
+            .take()
             .expect("should have been initialized in \"maybe_init\"")
-            .as_stream()
+            .into_df_stream())
     }
 }
 
@@ -477,6 +534,7 @@ mod test {
     use sql::parser::ParserContext;
     use sql::statements::statement::Statement;
     use sqlparser::dialect::GenericDialect;
+    use table::metadata::{TableInfoBuilder, TableMetaBuilder};
     use table::TableRef;
     use tempdir::TempDir;
 
@@ -496,11 +554,22 @@ mod test {
             ColumnSchema::new("b", ConcreteDataType::string_datatype(), true),
         ];
         let schema = Arc::new(Schema::new(column_schemas.clone()));
+        let meta = TableMetaBuilder::default()
+            .schema(schema)
+            .primary_key_indices(vec![])
+            .next_column_id(1)
+            .build()
+            .unwrap();
+        let table_info = TableInfoBuilder::default()
+            .name(&table_name.table_name)
+            .meta(meta)
+            .build()
+            .unwrap();
 
         let table_routes = Arc::new(TableRoutes::new(Arc::new(MetaClient::default())));
         let table = DistTable {
             table_name: table_name.clone(),
-            schema,
+            table_info: Arc::new(table_info),
             table_routes: table_routes.clone(),
             datanode_clients: Arc::new(DatanodeClients::new()),
         };
@@ -733,7 +802,6 @@ mod test {
         for partition in 0..table_scan.output_partitioning().partition_count() {
             let result = table_scan
                 .execute(partition, Arc::new(RuntimeEnv::default()))
-                .await
                 .unwrap();
             let recordbatches = util::collect(result).await.unwrap();
 
@@ -862,9 +930,20 @@ mod test {
             insert_testing_data(&table_name, instance.clone(), numbers, start_ts).await;
         }
 
+        let meta = TableMetaBuilder::default()
+            .schema(schema)
+            .primary_key_indices(vec![])
+            .next_column_id(1)
+            .build()
+            .unwrap();
+        let table_info = TableInfoBuilder::default()
+            .name(&table_name.table_name)
+            .meta(meta)
+            .build()
+            .unwrap();
         DistTable {
             table_name,
-            schema,
+            table_info: Arc::new(table_info),
             table_routes,
             datanode_clients,
         }
@@ -968,9 +1047,21 @@ mod test {
             ConcreteDataType::int32_datatype(),
             true,
         )]));
+        let table_name = TableName::new("greptime", "public", "foo");
+        let meta = TableMetaBuilder::default()
+            .schema(schema)
+            .primary_key_indices(vec![])
+            .next_column_id(1)
+            .build()
+            .unwrap();
+        let table_info = TableInfoBuilder::default()
+            .name(&table_name.table_name)
+            .meta(meta)
+            .build()
+            .unwrap();
         let table = DistTable {
-            table_name: TableName::new("greptime", "public", "foo"),
-            schema,
+            table_name,
+            table_info: Arc::new(table_info),
             table_routes: Arc::new(TableRoutes::new(Arc::new(MetaClient::default()))),
             datanode_clients: Arc::new(DatanodeClients::new()),
         };

src/meta-client/src/lib.rs

@@ -23,7 +23,7 @@ pub mod rpc;
 // Options for meta client in datanode instance.
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct MetaClientOpts {
-    pub metasrv_addr: String,
+    pub metasrv_addrs: Vec<String>,
     pub timeout_millis: u64,
     pub connect_timeout_millis: u64,
     pub tcp_nodelay: bool,
@@ -32,7 +32,7 @@ pub struct MetaClientOpts {
 impl Default for MetaClientOpts {
     fn default() -> Self {
         Self {
-            metasrv_addr: "127.0.0.1:3002".to_string(),
+            metasrv_addrs: vec!["127.0.0.1:3002".to_string()],
             timeout_millis: 3_000u64,
             connect_timeout_millis: 5_000u64,
             tcp_nodelay: true,

src/meta-client/src/rpc/router.rs

@@ -186,7 +186,7 @@ impl TryFrom<PbTable> for Table {
         let table_name = t
             .table_name
             .context(error::RouteInfoCorruptedSnafu {
-                err_msg: "table name requied",
+                err_msg: "table name required",
             })?
             .into();
         Ok(Self {

src/meta-srv/src/service/heartbeat.rs

@@ -85,7 +85,7 @@ impl heartbeat_server::Heartbeat for MetaSrv {
 
                         match tx.send(Err(err)).await {
                             Ok(_) => (),
-                            Err(_err) => break, // response was droped
+                            Err(_err) => break, // response was dropped
                         }
                     }
                 }