fix: clippy errors

fix: Fix All The Tests! (#752 )
* fix: Fix several tests compile errors Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix: some compile errors in tests Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix: compile errors in frontend tests * fix: compile errors in frontend tests * test: Fix tests in api and common-query * test: Fix test in sql crate * fix: resolve substrait error Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * chore: add more test * test: Fix tests in servers * fix instance_test Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * test: Fix tests in tests-integration Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Co-authored-by: Lei, HUANG <mrsatangel@gmail.com> Co-authored-by: evenyag <realevenyag@gmail.com>
2025-12-24 15:09:59 +00:00 · 2022-12-15 18:12:05 +08:00 · 2022-12-15 17:47:14 +08:00 · 2022-12-15 15:29:35 +08:00 · 2022-12-15 14:20:35 +08:00 · 2022-12-14 18:30:16 +08:00
941 changed files with 25361 additions and 77190 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,15 +1,2 @@
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
-
-[alias]
-sqlness = "run --bin sqlness-runner --"
-
-
-[build]
-rustflags = [
-    # lints
-    # TODO: use lint configuration in cargo https://github.com/rust-lang/cargo/issues/5034
-    "-Wclippy::print_stdout",
-    "-Wclippy::print_stderr",
-    "-Wclippy::implicit_clone",
-]
--- a/.env.example
+++ b/.env.example
@@ -2,9 +2,3 @@
 GT_S3_BUCKET=S3 bucket
 GT_S3_ACCESS_KEY_ID=S3 access key id
 GT_S3_ACCESS_KEY=S3 secret access key
-GT_S3_ENDPOINT_URL=S3 endpoint url
-# Settings for oss test
-GT_OSS_BUCKET=OSS bucket
-GT_OSS_ACCESS_KEY_ID=OSS access key id
-GT_OSS_ACCESS_KEY=OSS access key
-GT_OSS_ENDPOINT=OSS endpoint
--- a/.github/pr-title-breaking-change-label-config.json
+++ b/.github/pr-title-breaking-change-label-config.json
@@ -1,13 +0,0 @@
-{
-    "LABEL": {
-        "name": "breaking change",
-        "color": "D93F0B"
-    },
-    "CHECKS": {
-        "regexp": "^(?:(?!!:).)*$",
-        "ignoreLabels": [
-            "ignore-title"
-        ],
-        "alwaysPassCI": true
-    }
-}
--- a/.github/pr-title-checker-config.json
+++ b/.github/pr-title-checker-config.json
@@ -1,12 +1,10 @@
 {
-    "LABEL": {
-        "name": "Invalid PR Title",
-        "color": "B60205"
-    },
-    "CHECKS": {
-        "regexp": "^(feat|fix|test|refactor|chore|style|docs|perf|build|ci|revert)(\\(.*\\))?\\!?:.*",
-        "ignoreLabels": [
-            "ignore-title"
-        ]
-    }
+  "LABEL": {
+    "name": "Invalid PR Title",
+    "color": "B60205"
+  },
+  "CHECKS": {
+    "regexp": "^(feat|fix|test|refactor|chore|style|docs|perf|build|ci|revert)(\\(.*\\))?:.*",
+    "ignoreLabels" : ["ignore-title"]
+  }
 }
--- a/.github/workflows/apidoc.yml
+++ b/.github/workflows/apidoc.yml
@@ -1,42 +0,0 @@
-on:
-  push:
-    branches:
-      - develop
-    paths-ignore:
-      - 'docs/**'
-      - 'config/**'
-      - '**.md'
-      - '.dockerignore'
-      - 'docker/**'
-      - '.gitignore'
-
-name: Build API docs
-
-env:
-  RUST_TOOLCHAIN: nightly-2023-02-26
-
-jobs:
-  apidoc:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: arduino/setup-protoc@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: ${{ env.RUST_TOOLCHAIN }}
-    - run: cargo doc --workspace --no-deps --document-private-items
-    - run: |
-        cat <<EOF > target/doc/index.html
-        <!DOCTYPE html>
-        <html>
-        <head>
-        <meta http-equiv="refresh" content="0; url='greptime/'" />
-        </head>
-        <body></body></html>
-        EOF
-    - name: Publish dist directory
-      uses: JamesIves/github-pages-deploy-action@v4
-      with:
-        folder: target/doc
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -0,0 +1,64 @@
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths-ignore:
+      - 'docs/**'
+      - 'config/**'
+      - '**.md'
+      - '.dockerignore'
+      - 'docker/**'
+      - '.gitignore'
+  push:
+    branches:
+      - "main"
+      - "develop"
+    paths-ignore:
+      - 'docs/**'
+      - 'config/**'
+      - '**.md'
+      - '.dockerignore'
+      - 'docker/**'
+      - '.gitignore'
+  workflow_dispatch:
+
+name: Code coverage
+
+env:
+  RUST_TOOLCHAIN: nightly-2022-07-14
+
+jobs:
+  coverage:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest-8-cores
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v3
+      - uses: arduino/setup-protoc@v1
+      - name: Install toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+          components: llvm-tools-preview
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+      - name: Install latest nextest release
+        uses: taiki-e/install-action@nextest
+      - name: Install cargo-llvm-cov
+        uses: taiki-e/install-action@cargo-llvm-cov
+      - name: Collect coverage data
+        run: cargo llvm-cov nextest --workspace --lcov --output-path lcov.info
+        env:
+          RUST_BACKTRACE: 1
+          CARGO_INCREMENTAL: 0
+          GT_S3_BUCKET: ${{ secrets.S3_BUCKET }}
+          GT_S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+          GT_S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          UNITTEST_LOG_DIR: "__unittest_logs"
+      - name: Codecov upload
+        uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./lcov.info
+          flags: rust
+          fail_ci_if_error: true
+          verbose: true
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -7,7 +7,6 @@ on:
      - '**.md'
      - '.dockerignore'
      - 'docker/**'
-      - '.gitignore'
  push:
    branches:
      - develop
@@ -24,15 +23,15 @@ on:
 name: CI

 env:
-  RUST_TOOLCHAIN: nightly-2023-02-26
+  RUST_TOOLCHAIN: nightly-2022-07-14

 jobs:
  typos:
    name: Spell Check with Typos
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      - uses: crate-ci/typos@v1.13.10
+      - uses: actions/checkout@v2
+      - uses: crate-ci/typos@v1.0.4

  check:
    name: Check
@@ -42,8 +41,6 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - uses: arduino/setup-protoc@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
      - uses: dtolnay/rust-toolchain@master
        with:
          toolchain: ${{ env.RUST_TOOLCHAIN }}
@@ -84,8 +81,6 @@ jobs:
  #         path: ./llvm
  #         key: llvm
  #     - uses: arduino/setup-protoc@v1
-  #       with:
-  #         repo-token: ${{ secrets.GITHUB_TOKEN }}
  #     - uses: KyleMayes/install-llvm-action@v1
  #       with:
  #         version: "14.0"
@@ -111,42 +106,6 @@ jobs:
  #         GT_S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
  #         UNITTEST_LOG_DIR: "__unittest_logs"

-  sqlness:
-    name: Sqlness Test
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest-8-cores
-    timeout-minutes: 60
-    needs: [clippy]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: arduino/setup-protoc@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-      - name: Run etcd
-        run: |
-          ETCD_VER=v3.5.7
-          DOWNLOAD_URL=https://github.com/etcd-io/etcd/releases/download
-          curl -L ${DOWNLOAD_URL}/${ETCD_VER}/etcd-${ETCD_VER}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz
-          mkdir -p /tmp/etcd-download
-          tar xzvf /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz -C /tmp/etcd-download --strip-components=1
-          rm -f /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz
-
-          sudo cp -a /tmp/etcd-download/etcd* /usr/local/bin/
-          nohup etcd >/tmp/etcd.log 2>&1 &
-      - name: Run sqlness
-        run: cargo sqlness && ls /tmp
-      - name: Upload sqlness logs
-        uses: actions/upload-artifact@v3
-        with:
-          name: sqlness-logs
-          path: /tmp/greptime-*.log
-          retention-days: 3
-
  fmt:
    name: Rustfmt
    if: github.event.pull_request.draft == false
@@ -155,8 +114,6 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - uses: arduino/setup-protoc@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
      - uses: dtolnay/rust-toolchain@master
        with:
          toolchain: ${{ env.RUST_TOOLCHAIN }}
@@ -174,8 +131,6 @@ jobs:
    steps:
      - uses: actions/checkout@v3
      - uses: arduino/setup-protoc@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
      - uses: dtolnay/rust-toolchain@master
        with:
          toolchain: ${{ env.RUST_TOOLCHAIN }}
@@ -183,53 +138,4 @@ jobs:
      - name: Rust Cache
        uses: Swatinem/rust-cache@v2
      - name: Run cargo clippy
-        run: cargo clippy --workspace --all-targets -- -D warnings
-
-  coverage:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest-8-cores
-    timeout-minutes: 60
-    needs: [clippy]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: arduino/setup-protoc@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: KyleMayes/install-llvm-action@v1
-        with:
-          version: "14.0"
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-          components: llvm-tools-preview
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-      - name: Install latest nextest release
-        uses: taiki-e/install-action@nextest
-      - name: Install Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      - name: Install PyArrow Package
-        run: pip install pyarrow
-      - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@cargo-llvm-cov
-      - name: Collect coverage data
-        run: cargo llvm-cov nextest --workspace --lcov --output-path lcov.info -F pyo3_backend
-        env:
-          CARGO_BUILD_RUSTFLAGS: "-C link-arg=-fuse-ld=lld"
-          RUST_BACKTRACE: 1
-          CARGO_INCREMENTAL: 0
-          GT_S3_BUCKET: ${{ secrets.S3_BUCKET }}
-          GT_S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
-          GT_S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
-          UNITTEST_LOG_DIR: "__unittest_logs"
-      - name: Codecov upload
-        uses: codecov/codecov-action@v2
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./lcov.info
-          flags: rust
-          fail_ci_if_error: false
-          verbose: true
+        run: cargo clippy --workspace --all-targets -- -D warnings -D clippy::print_stdout -D clippy::print_stderr
--- a/.github/workflows/doc-issue.yml
+++ b/.github/workflows/doc-issue.yml
@@ -1,4 +1,4 @@
-name: Create Issue in downstream repos
+name: Create Issue in docs repo on doc related changes

 on:
  issues:
@@ -23,17 +23,3 @@ jobs:
          body: |
            A document change request is generated from
            ${{ github.event.issue.html_url || github.event.pull_request.html_url }}
-  cloud_issue:
-    if: github.event.label.name == 'cloud followup required'
-    runs-on: ubuntu-latest
-    steps:
-      - name: create an issue in cloud repo
-        uses: dacbd/create-issue-action@main
-        with:
-          owner: GreptimeTeam
-          repo: greptimedb-cloud
-          token: ${{ secrets.DOCS_REPO_TOKEN }}
-          title: Followup changes in ${{ github.event.issue.title || github.event.pull_request.title }}
-          body: |
-            A followup request is generated from
-            ${{ github.event.issue.html_url || github.event.pull_request.html_url }}
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,55 +0,0 @@
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-    paths:
-      - 'docs/**'
-      - 'config/**'
-      - '**.md'
-      - '.dockerignore'
-      - 'docker/**'
-      - '.gitignore'
-  push:
-    branches:
-      - develop
-      - main
-    paths:
-      - 'docs/**'
-      - 'config/**'
-      - '**.md'
-      - '.dockerignore'
-      - 'docker/**'
-      - '.gitignore'
-  workflow_dispatch:
-
-name: CI
-
-# To pass the required status check, see:
-# https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
-
-jobs:
-  check:
-    name: Check
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-      - run: 'echo "No action required"'
-
-  fmt:
-    name: Rustfmt
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-      - run: 'echo "No action required"'
-
-  clippy:
-    name: Clippy
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-      - run: 'echo "No action required"'
-
-  coverage:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-      - run: 'echo "No action required"'
--- a/.github/workflows/license.yaml
+++ b/.github/workflows/license.yaml
@@ -13,4 +13,4 @@ jobs:
    steps:
    - uses: actions/checkout@v2
    - name: Check License Header
-      uses: apache/skywalking-eyes/header@df70871af1a8109c9a5b1dc824faaf65246c5236
+      uses: apache/skywalking-eyes/header@main
--- a/.github/workflows/pr-title-checker.yml
+++ b/.github/workflows/pr-title-checker.yml
@@ -18,12 +18,3 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          pass_on_octokit_error: false
          configuration_path: ".github/pr-title-checker-config.json"
-  breaking:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: thehanimo/pr-title-checker@v1.3.4
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          pass_on_octokit_error: false
-          configuration_path: ".github/pr-title-breaking-change-label-config.json"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,22 +5,18 @@ on:
  schedule:
    # At 00:00 on Monday.
    - cron: '0 0 * * 1'
-  # Mannually trigger only builds binaries.
  workflow_dispatch:

 name: Release

 env:
-  RUST_TOOLCHAIN: nightly-2023-02-26
+  RUST_TOOLCHAIN: nightly-2022-07-14

-  SCHEDULED_BUILD_VERSION_PREFIX: v0.2.0
+  # 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-*'.
+  SCHEDULED_BUILD_VERSION_PREFIX: v0.1.0-alpha

-  SCHEDULED_PERIOD: nightly
-
-  CARGO_PROFILE: nightly
-
-  ## FIXME(zyy17): Enable it after the tests are stabled.
-  DISABLE_RUN_TESTS: true
+  # In the future, we can change SCHEDULED_PERIOD to nightly.
+  SCHEDULED_PERIOD: weekly

 jobs:
  build:
@@ -30,48 +26,18 @@ jobs:
        # The file format is greptime-<os>-<arch>
        include:
          - arch: x86_64-unknown-linux-gnu
-            os: ubuntu-2004-16-cores
+            os: ubuntu-latest-16-cores
            file: greptime-linux-amd64
-            continue-on-error: false
-            opts: "-F servers/dashboard"
          - arch: aarch64-unknown-linux-gnu
-            os: ubuntu-2004-16-cores
+            os: ubuntu-latest-16-cores
            file: greptime-linux-arm64
-            continue-on-error: false
-            opts: "-F servers/dashboard"
          - arch: aarch64-apple-darwin
            os: macos-latest
            file: greptime-darwin-arm64
-            continue-on-error: false
-            opts: "-F servers/dashboard"
          - arch: x86_64-apple-darwin
            os: macos-latest
            file: greptime-darwin-amd64
-            continue-on-error: false
-            opts: "-F servers/dashboard"
-          - arch: x86_64-unknown-linux-gnu
-            os: ubuntu-2004-16-cores
-            file: greptime-linux-amd64-pyo3
-            continue-on-error: false
-            opts: "-F pyo3_backend,servers/dashboard"
-          - arch: aarch64-unknown-linux-gnu
-            os: ubuntu-2004-16-cores
-            file: greptime-linux-arm64-pyo3
-            continue-on-error: false
-            opts: "-F pyo3_backend,servers/dashboard"
-          - arch: aarch64-apple-darwin
-            os: macos-latest
-            file: greptime-darwin-arm64-pyo3
-            continue-on-error: false
-            opts: "-F pyo3_backend,servers/dashboard"
-          - arch: x86_64-apple-darwin
-            os: macos-latest
-            file: greptime-darwin-amd64-pyo3
-            continue-on-error: false
-            opts: "-F pyo3_backend,servers/dashboard"
    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.continue-on-error }}
-    if: github.repository == 'GreptimeTeam/greptimedb'
    steps:
      - name: Checkout sources
        uses: actions/checkout@v3
@@ -101,37 +67,11 @@ jobs:
        run: |
          brew install protobuf

-      - name: Install etcd for linux
-        if: contains(matrix.arch, 'linux') && endsWith(matrix.arch, '-gnu')
-        run: |
-          ETCD_VER=v3.5.7
-          DOWNLOAD_URL=https://github.com/etcd-io/etcd/releases/download
-          curl -L ${DOWNLOAD_URL}/${ETCD_VER}/etcd-${ETCD_VER}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz
-          mkdir -p /tmp/etcd-download
-          tar xzvf /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz -C /tmp/etcd-download --strip-components=1
-          rm -f /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz
-
-          sudo cp -a /tmp/etcd-download/etcd* /usr/local/bin/
-          nohup etcd >/tmp/etcd.log 2>&1 &
-
-      - name: Install etcd for macos
-        if: contains(matrix.arch, 'darwin')
-        run: |
-          brew install etcd
-          brew services start etcd
-
      - name: Install dependencies for linux
        if: contains(matrix.arch, 'linux') && endsWith(matrix.arch, '-gnu')
        run: |
          sudo apt-get -y update
-          sudo apt-get -y install libssl-dev pkg-config g++-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu wget
-
-      # FIXME(zyy17): Should we specify the version of python when building binary for darwin?
-      - name: Compile Python 3.10.10 from source for linux
-        if: contains(matrix.arch, 'linux') && contains(matrix.opts, 'pyo3_backend')
-        run: |
-          sudo chmod +x ./docker/aarch64/compile-python.sh
-          sudo ./docker/aarch64/compile-python.sh ${{ matrix.arch }}
+          sudo apt-get -y install libssl-dev pkg-config g++-aarch64-linux-gnu gcc-aarch64-linux-gnu

      - name: Install rust toolchain
        uses: dtolnay/rust-toolchain@master
@@ -142,61 +82,13 @@ jobs:
      - name: Output package versions
        run: protoc --version ; cargo version ; rustc --version ; gcc --version ; g++ --version

-      - name: Run tests
-        if: env.DISABLE_RUN_TESTS == 'false'
-        run: make unit-test integration-test sqlness-test
-
-      - name: Run cargo build with pyo3 for aarch64-linux
-        if: contains(matrix.arch, 'aarch64-unknown-linux-gnu') && contains(matrix.opts, 'pyo3_backend')
-        run: |
-          # TODO(zyy17): We should make PYO3_CROSS_LIB_DIR configurable.
-          export PYTHON_INSTALL_PATH_AMD64=${PWD}/python-3.10.10/amd64
-          export LD_LIBRARY_PATH=$PYTHON_INSTALL_PATH_AMD64/lib:$LD_LIBRARY_PATH
-          export LIBRARY_PATH=$PYTHON_INSTALL_PATH_AMD64/lib:$LIBRARY_PATH
-          export PATH=$PYTHON_INSTALL_PATH_AMD64/bin:$PATH
-
-          export PYO3_CROSS_LIB_DIR=${PWD}/python-3.10.10/aarch64
-          echo "PYO3_CROSS_LIB_DIR: $PYO3_CROSS_LIB_DIR"
-          alias python=$PYTHON_INSTALL_PATH_AMD64/bin/python3
-          alias pip=$PYTHON_INSTALL_PATH_AMD64/bin/python3-pip
-
-          cargo build --profile ${{ env.CARGO_PROFILE }} --locked --target ${{ matrix.arch }} ${{ matrix.opts }}
-
-      - name: Run cargo build with pyo3 for amd64-linux
-        if: contains(matrix.arch, 'x86_64-unknown-linux-gnu') && contains(matrix.opts, 'pyo3_backend')
-        run: |
-          export PYTHON_INSTALL_PATH_AMD64=${PWD}/python-3.10.10/amd64
-          export LD_LIBRARY_PATH=$PYTHON_INSTALL_PATH_AMD64/lib:$LD_LIBRARY_PATH
-          export LIBRARY_PATH=$PYTHON_INSTALL_PATH_AMD64/lib:$LIBRARY_PATH
-          export PATH=$PYTHON_INSTALL_PATH_AMD64/bin:$PATH
-
-          echo "implementation=CPython" >> pyo3.config
-          echo "version=3.10" >> pyo3.config
-          echo "implementation=CPython" >> pyo3.config
-          echo "shared=true" >> pyo3.config
-          echo "abi3=true" >> pyo3.config
-          echo "lib_name=python3.10" >> pyo3.config
-          echo "lib_dir=$PYTHON_INSTALL_PATH_AMD64/lib" >> pyo3.config
-          echo "executable=$PYTHON_INSTALL_PATH_AMD64/bin/python3" >> pyo3.config
-          echo "pointer_width=64" >> pyo3.config
-          echo "build_flags=" >> pyo3.config
-          echo "suppress_build_script_link_lines=false" >> pyo3.config
-
-          cat pyo3.config
-          export PYO3_CONFIG_FILE=${PWD}/pyo3.config
-          alias python=$PYTHON_INSTALL_PATH_AMD64/bin/python3
-          alias pip=$PYTHON_INSTALL_PATH_AMD64/bin/python3-pip
-
-          cargo build --profile ${{ env.CARGO_PROFILE }} --locked --target ${{ matrix.arch }} ${{ matrix.opts }}
-
      - name: Run cargo build
-        if: contains(matrix.arch, 'darwin') || contains(matrix.opts, 'pyo3_backend') == false
-        run: cargo build --profile ${{ env.CARGO_PROFILE }} --locked --target ${{ matrix.arch }} ${{ matrix.opts }}
+        run: cargo build ${{ matrix.opts }} --release --locked --target ${{ matrix.arch }}

      - name: Calculate checksum and rename binary
        shell: bash
        run: |
-          cd target/${{ matrix.arch }}/${{ env.CARGO_PROFILE }}
+          cd target/${{ matrix.arch }}/release
          chmod +x greptime
          tar -zcvf ${{ matrix.file }}.tgz greptime
          echo $(shasum -a 256 ${{ matrix.file }}.tgz | cut -f1 -d' ') > ${{ matrix.file }}.sha256sum
@@ -205,23 +97,94 @@ jobs:
        uses: actions/upload-artifact@v3
        with:
          name: ${{ matrix.file }}
-          path: target/${{ matrix.arch }}/${{ env.CARGO_PROFILE }}/${{ matrix.file }}.tgz
+          path: target/${{ matrix.arch }}/release/${{ matrix.file }}.tgz

      - name: Upload checksum of artifacts
        uses: actions/upload-artifact@v3
        with:
          name: ${{ matrix.file }}.sha256sum
-          path: target/${{ matrix.arch }}/${{ env.CARGO_PROFILE }}/${{ matrix.file }}.sha256sum
+          path: target/${{ matrix.arch }}/release/${{ matrix.file }}.sha256sum
+  release:
+    name: Release artifacts
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+
+      - name: Configure scheduled build version # the version would be ${SCHEDULED_BUILD_VERSION_PREFIX}-YYYYMMDD-${SCHEDULED_PERIOD}, like v0.1.0-alpha-20221119-weekly.
+        shell: bash
+        if: github.event_name == 'schedule'
+        run: |
+          buildTime=`date "+%Y%m%d"`
+          SCHEDULED_BUILD_VERSION=${{ env.SCHEDULED_BUILD_VERSION_PREFIX }}-$buildTime-${{ env.SCHEDULED_PERIOD }}
+          echo "SCHEDULED_BUILD_VERSION=${SCHEDULED_BUILD_VERSION}" >> $GITHUB_ENV
+
+      - name: Create scheduled build git tag
+        if: github.event_name == 'schedule'
+        run: |
+          git tag ${{ env.SCHEDULED_BUILD_VERSION }}
+
+      - name: Publish scheduled release # configure the different release title and tags.
+        uses: softprops/action-gh-release@v1
+        if: github.event_name == 'schedule'
+        with:
+          name: "Release ${{ env.SCHEDULED_BUILD_VERSION }}"
+          tag_name: ${{ env.SCHEDULED_BUILD_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: |
+            **/greptime-*

  docker:
    name: Build docker image
    needs: [build]
    runs-on: ubuntu-latest
-    if: github.repository == 'GreptimeTeam/greptimedb' && github.event_name != 'workflow_dispatch'
    steps:
      - name: Checkout sources
        uses: actions/checkout@v3

+      - name: Download amd64 binary
+        uses: actions/download-artifact@v3
+        with:
+          name: greptime-linux-amd64
+          path: amd64
+
+      - name: Unzip the amd64 artifacts
+        run: |
+          cd amd64
+          tar xvf greptime-linux-amd64.tgz
+          rm greptime-linux-amd64.tgz
+
+      - name: Download arm64 binary
+        uses: actions/download-artifact@v3
+        with:
+          name: greptime-linux-arm64
+          path: arm64
+
+      - name: Unzip the arm64 artifacts
+        run: |
+          cd arm64
+          tar xvf greptime-linux-arm64.tgz
+          rm greptime-linux-arm64.tgz
+
+      - name: Login to UCloud Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: uhub.service.ucloud.cn
+          username: ${{ secrets.UCLOUD_USERNAME }}
+          password: ${{ secrets.UCLOUD_PASSWORD }}
+
      - name: Login to Dockerhub
        uses: docker/login-action@v2
        with:
@@ -249,95 +212,15 @@ jobs:
      - name: Set up buildx
        uses: docker/setup-buildx-action@v2

-      - name: Download amd64 binary
-        uses: actions/download-artifact@v3
-        with:
-          name: greptime-linux-amd64-pyo3
-          path: amd64
-
-      - name: Unzip the amd64 artifacts
-        run: |
-          tar xvf amd64/greptime-linux-amd64-pyo3.tgz -C amd64/ && rm amd64/greptime-linux-amd64-pyo3.tgz
-          cp -r amd64 docker/ci
-
-      - name: Download arm64 binary
-        id: download-arm64
-        uses: actions/download-artifact@v3
-        with:
-          name: greptime-linux-arm64-pyo3
-          path: arm64
-
-      - name: Unzip the arm64 artifacts
-        id: unzip-arm64
-        if: success() || steps.download-arm64.conclusion == 'success'
-        run: |
-          tar xvf arm64/greptime-linux-arm64-pyo3.tgz -C arm64/ && rm arm64/greptime-linux-arm64-pyo3.tgz
-          cp -r arm64 docker/ci
-
-      - name: Build and push all
+      - name: Build and push
        uses: docker/build-push-action@v3
-        if: success() || steps.unzip-arm64.conclusion == 'success' # Build and push all platform if unzip-arm64 succeeds
        with:
-          context: ./docker/ci/
+          context: .
          file: ./docker/ci/Dockerfile
          push: true
          platforms: linux/amd64,linux/arm64
          tags: |
            greptime/greptimedb:latest
            greptime/greptimedb:${{ env.IMAGE_TAG }}
-
-      - name: Build and push amd64 only
-        uses: docker/build-push-action@v3
-        if: success() || steps.download-arm64.conclusion == 'failure' # Only build and push amd64 platform if download-arm64 fails
-        with:
-          context: ./docker/ci/
-          file: ./docker/ci/Dockerfile
-          push: true
-          platforms: linux/amd64
-          tags: |
-            greptime/greptimedb:latest
-            greptime/greptimedb:${{ env.IMAGE_TAG }}
-
-  release:
-    name: Release artifacts
-    # Release artifacts only when all the artifacts are built successfully.
-    needs: [build,docker]
-    runs-on: ubuntu-latest
-    if: github.repository == 'GreptimeTeam/greptimedb' && github.event_name != 'workflow_dispatch'
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v3
-
-      - name: Configure scheduled build version # the version would be ${SCHEDULED_BUILD_VERSION_PREFIX}-${SCHEDULED_PERIOD}-YYYYMMDD, like v0.2.0-nigthly-20230313.
-        shell: bash
-        if: github.event_name == 'schedule'
-        run: |
-          buildTime=`date "+%Y%m%d"`
-          SCHEDULED_BUILD_VERSION=${{ env.SCHEDULED_BUILD_VERSION_PREFIX }}-${{ env.SCHEDULED_PERIOD }}-$buildTime
-          echo "SCHEDULED_BUILD_VERSION=${SCHEDULED_BUILD_VERSION}" >> $GITHUB_ENV
-
-      - name: Create scheduled build git tag
-        if: github.event_name == 'schedule'
-        run: |
-          git tag ${{ env.SCHEDULED_BUILD_VERSION }}
-
-      - name: Publish scheduled release # configure the different release title and tags.
-        uses: softprops/action-gh-release@v1
-        if: github.event_name == 'schedule'
-        with:
-          name: "Release ${{ env.SCHEDULED_BUILD_VERSION }}"
-          tag_name: ${{ env.SCHEDULED_BUILD_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: |
-            **/greptime-*
+            uhub.service.ucloud.cn/greptime/greptimedb:latest
+            uhub.service.ucloud.cn/greptime/greptimedb:${{ env.IMAGE_TAG }}
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,3 @@ benchmarks/data

 # dotenv
 .env
-
-# dashboard files
-!/src/servers/dashboard/VERSION
-/src/servers/dashboard/*
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,11 +5,11 @@ repos:
    -    id: conventional-pre-commit
         stages: [commit-msg]

-# -   repo: https://github.com/DevinR528/cargo-sort
-#     rev: e6a795bc6b2c0958f9ef52af4863bbd7cc17238f
-#     hooks:
-#     -    id: cargo-sort
-#          args: ["--workspace"]
+-   repo: https://github.com/DevinR528/cargo-sort
+    rev: e6a795bc6b2c0958f9ef52af4863bbd7cc17238f
+    hooks:
+    -    id: cargo-sort
+         args: ["--workspace"]

 -   repo: https://github.com/doublify/pre-commit-rust
    rev: v1.0
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Welcome 👋
+# Welcome!

 Thanks a lot for considering contributing to GreptimeDB. We believe people like you would make GreptimeDB a great product. We intend to build a community where individuals can have open talks, show respect for one another, and speak with true ❤️. Meanwhile, we are to keep transparency and make your effort count here.

@@ -50,33 +50,34 @@ GreptimeDB uses the [Apache 2.0 license](https://github.com/GreptimeTeam/greptim

 - To ensure that community is free and confident in its ability to use your contributions, please sign the Contributor License Agreement (CLA) which will be incorporated in the pull request process.
 - Make sure all your codes are formatted and follow the [coding style](https://pingcap.github.io/style-guide/rust/).
- Make sure all unit tests are passed (using `cargo test --workspace` or [nextest](https://nexte.st/index.html) `cargo nextest run`).
- Make sure all clippy warnings are fixed (you can check it locally by running `cargo clippy --workspace --all-targets -- -D warnings`).
+- Make sure all unit tests are passed.
+- Make sure all clippy warnings are fixed (you can check it locally by running `cargo clippy --workspace --all-targets -- -D warnings -D clippy::print_stdout -D clippy::print_stderr`).

 #### `pre-commit` Hooks
-
 You could setup the [`pre-commit`](https://pre-commit.com/#plugins) hooks to run these checks on every commit automatically.

 1. Install `pre-commit`
-
-        pip install pre-commit
-
-    or
-
-        brew install pre-commit
+```
+$ pip install pre-commit
+```
+or
+```
+$ brew install pre-commit
+```

 2. Install the `pre-commit` hooks
+```
+$ pre-commit install
+pre-commit installed at .git/hooks/pre-commit

-        $ pre-commit install
-        pre-commit installed at .git/hooks/pre-commit
+$ pre-commit install --hook-type commit-msg
+pre-commit installed at .git/hooks/commit-msg

-        $ pre-commit install --hook-type commit-msg
-        pre-commit installed at .git/hooks/commit-msg
+$ pre-commit install --hook-type pre-push
+pre-commit installed at .git/hooks/pre-pus
+```

-        $ pre-commit install --hook-type pre-push
-        pre-commit installed at .git/hooks/pre-push
-
-Now, `pre-commit` will run automatically on `git commit`.
+now `pre-commit` will run automatically on `git commit`.

 ### Title

@@ -101,12 +102,10 @@ of what you were trying to do and what went wrong. You can also reach for help i
 ## Community

 The core team will be thrilled if you participate in any way you like. When you are stuck, try ask for help by filing an issue, with a detailed description of what you were trying to do and what went wrong. If you have any questions or if you would like to get involved in our community, please check out:
-
 - [GreptimeDB Community Slack](https://greptime.com/slack)
 - [GreptimeDB Github Discussions](https://github.com/GreptimeTeam/greptimedb/discussions)

 Also, see some extra GreptimeDB content:
-
 - [GreptimeDB Docs](https://greptime.com/docs)
 - [Learn GreptimeDB](https://greptime.com/products/db)
 - [Greptime Inc. Website](https://greptime.com)
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,31 +7,25 @@ members = [
    "src/cmd",
    "src/common/base",
    "src/common/catalog",
-    "src/common/datasource",
    "src/common/error",
    "src/common/function",
    "src/common/function-macro",
    "src/common/grpc",
    "src/common/grpc-expr",
-    "src/common/mem-prof",
-    "src/common/procedure",
    "src/common/query",
    "src/common/recordbatch",
    "src/common/runtime",
    "src/common/substrait",
    "src/common/telemetry",
-    "src/common/test-util",
    "src/common/time",
    "src/datanode",
    "src/datatypes",
-    "src/file-table-engine",
    "src/frontend",
    "src/log-store",
    "src/meta-client",
    "src/meta-srv",
    "src/mito",
    "src/object-store",
-    "src/partition",
    "src/promql",
    "src/query",
    "src/script",
@@ -41,52 +35,9 @@ members = [
    "src/storage",
    "src/store-api",
    "src/table",
-    "src/table-procedure",
    "tests-integration",
    "tests/runner",
 ]

-[workspace.package]
-version = "0.2.0"
-edition = "2021"
-license = "Apache-2.0"
-
-[workspace.dependencies]
-arrow = { version = "37.0" }
-arrow-array = "37.0"
-arrow-flight = "37.0"
-arrow-schema = { version = "37.0", features = ["serde"] }
-async-stream = "0.3"
-async-trait = "0.1"
-chrono = { version = "0.4", features = ["serde"] }
-datafusion = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" }
-datafusion-common = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" }
-datafusion-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" }
-datafusion-optimizer = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" }
-datafusion-physical-expr = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" }
-datafusion-sql = { git = "https://github.com/apache/arrow-datafusion.git", rev = "74a778ca6016a853a3c3add3fa8c6f12f4fe4561" }
-futures = "0.3"
-futures-util = "0.3"
-parquet = "37.0"
-paste = "1.0"
-prost = "0.11"
-rand = "0.8"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-snafu = { version = "0.7", features = ["backtraces"] }
-sqlparser = "0.33"
-tempfile = "3"
-tokio = { version = "1.24.2", features = ["full"] }
-tokio-util = { version = "0.7", features = ["io-util"] }
-tonic = { version = "0.9", features = ["tls"] }
-uuid = { version = "1", features = ["serde", "v4", "fast-rng"] }
-
 [profile.release]
 debug = true
-
-[profile.nightly]
-inherits = "release"
-strip = true
-lto = "thin"
-debug = false
-incremental = false
--- a/12
+++ b/12
@@ -19,14 +19,6 @@ clean: ## Clean the project.
 fmt: ## Format all the Rust code.
 	cargo fmt --all

-.PHONY: fmt-toml
-fmt-toml: ## Format all TOML files.
-	taplo format --option "indent_string=    "
-
-.PHONY: check-toml
-check-toml: ## Check all TOML files.
-	taplo format --check --option "indent_string=    "
-
 .PHONY: docker-image
 docker-image: ## Build docker image.
 	docker build --network host -f docker/Dockerfile -t ${IMAGE_REGISTRY}:${IMAGE_TAG} .
@@ -43,7 +35,7 @@ integration-test: ## Run integation test.

 .PHONY: sqlness-test
 sqlness-test: ## Run sqlness test.
-	cargo sqlness
+	cargo run --bin sqlness-runner

 .PHONY: check
 check: ## Cargo check all the targets.
@@ -51,7 +43,7 @@ check: ## Cargo check all the targets.

 .PHONY: clippy
 clippy: ## Check clippy rules.
-	cargo clippy --workspace --all-targets -- -D warnings
+	cargo clippy --workspace --all-targets -- -D warnings -D clippy::print_stdout -D clippy::print_stderr

 .PHONY: fmt-check
 fmt-check: ## Check code format.
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 <p align="center">
  <picture>
-    <source media="(prefers-color-scheme: light)" srcset="https://cdn.jsdelivr.net/gh/GreptimeTeam/greptimedb@develop/docs/logo-text-padding.png">
-    <source media="(prefers-color-scheme: dark)" srcset="https://cdn.jsdelivr.net/gh/GreptimeTeam/greptimedb@develop/docs/logo-text-padding-dark.png">
-    <img alt="GreptimeDB Logo" src="https://cdn.jsdelivr.net/gh/GreptimeTeam/greptimedb@develop/docs/logo-text-padding.png" width="400px">
+    <source media="(prefers-color-scheme: light)" srcset="/docs/logo-text-padding.png">
+    <source media="(prefers-color-scheme: dark)" srcset="/docs/logo-text-padding-dark.png">
+    <img alt="GreptimeDB Logo" src="/docs/logo-text-padding.png" width="400px">
  </picture>
 </p>


 <h3 align="center">
-    The next-generation hybrid time-series/analytics processing database in the cloud
+    The next-generation hybrid timeseries/analytics processing database in the cloud
 </h3>

 <p align="center">
@@ -23,8 +23,6 @@
    <a href="https://twitter.com/greptime"><img src="https://img.shields.io/badge/twitter-follow_us-1d9bf0.svg"></a>
    &nbsp;
    <a href="https://www.linkedin.com/company/greptime/"><img src="https://img.shields.io/badge/linkedin-connect_with_us-0a66c2.svg"></a>
-    &nbsp;
-    <a href="https://greptime.com/slack"><img src="https://img.shields.io/badge/slack-GreptimeDB-0abd59?logo=slack" alt="slack" /></a>
 </p>

 ## What is GreptimeDB
@@ -38,11 +36,11 @@ Our core developers have been building time-series data platform
 for years. Based on their best-practices, GreptimeDB is born to give you:

 - A standalone binary that scales to highly-available distributed cluster, providing a transparent experience for cluster users
- Optimized columnar layout for handling time-series data; compacted, compressed, and stored on various storage backends
- Flexible indexes, tackling high cardinality issues down
+- Optimized columnar layout for handling time-series data; compacted, compressed, stored on various storage backends
+- Flexible index options, tackling high cardinality issues down
 - Distributed, parallel query execution, leveraging elastic computing resource
 - Native SQL, and Python scripting for advanced analytical scenarios
- Widely adopted database protocols and APIs, native PromQL supports
+- Widely adopted database protocols and APIs
 - Extensible table engine architecture for extensive workloads

 ## Quick Start
@@ -63,12 +61,6 @@ To compile GreptimeDB from source, you'll need:
  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`.
- python3-dev or python3-devel(Optional feature, only needed if you want to run scripts
-  in CPython, and also need to enable `pyo3_backend` feature when compiling(by `cargo run -F pyo3_backend` or add `pyo3_backend` to src/script/Cargo.toml 's `features.default` like `default = ["python", "pyo3_backend]`)): this install a Python shared library required for running Python
-  scripting engine(In CPython Mode). This is available as `python3-dev` on
-  ubuntu, you can install it with `sudo apt install python3-dev`, or
-  `python3-devel` on RPM based distributions (e.g. Fedora, Red Hat, SuSE). Mac's
-  `Python3` package should have this shared library by default. More detail for compiling with PyO3 can be found in [PyO3](https://pyo3.rs/v0.18.1/building_and_distribution#configuring-the-python-version)'s documentation.

 #### Build with Docker

@@ -149,9 +141,9 @@ You can always cleanup test database by removing `/tmp/greptimedb`.
 ### Installation

 - [Pre-built Binaries](https://github.com/GreptimeTeam/greptimedb/releases):
-  For Linux and macOS, you can easily download pre-built binaries that are ready to use. In most cases, downloading the version without PyO3 is sufficient. However, if you plan to run scripts in CPython (and use Python packages like NumPy and Pandas), you will need to download the version with PyO3 and install a Python with the same version as the Python in the PyO3 version. We recommend using virtualenv for the installation process to manage multiple Python versions.
- [Docker Images](https://hub.docker.com/r/greptime/greptimedb)(**recommended**): pre-built
-  Docker images, this is the easiest way to try GreptimeDB. By default it runs CPython script with `pyo3_backend` enabled.
+  downloadable pre-built binaries for Linux and MacOS
+- [Docker Images](https://hub.docker.com/r/greptime/greptimedb): pre-built
+  Docker images
 - [`gtctl`](https://github.com/GreptimeTeam/gtctl): the command-line tool for
  Kubernetes deployment

@@ -160,10 +152,6 @@ You can always cleanup test database by removing `/tmp/greptimedb`.
 - GreptimeDB [User Guide](https://docs.greptime.com/user-guide/concepts.html)
 - GreptimeDB [Developer
  Guide](https://docs.greptime.com/developer-guide/overview.html)
- GreptimeDB [internal code document](https://greptimedb.rs)
-
-### Dashboard
- [The dashboard UI for GreptimeDB](https://github.com/GreptimeTeam/dashboard)

 ### SDK

@@ -181,7 +169,7 @@ For future plans, check out [GreptimeDB roadmap](https://github.com/GreptimeTeam

 ## Community

-Our core team is thrilled to see you participate in any ways you like. When you are stuck, try to
+Our core team is thrilled too see you participate in any ways you like. When you are stuck, try to
 ask for help by filling an issue with a detailed description of what you were trying to do
 and what went wrong. If you have any questions or if you would like to get involved in our
 community, please check out:
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,19 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| >= v0.1.0 | :white_check_mark: |
-| < v0.1.0   | :x:                |
-
-## Reporting a Vulnerability
-
-We place great importance on the security of GreptimeDB code, software, 
-and cloud platform. If you come across a security vulnerability in GreptimeDB, 
-we kindly request that you inform us immediately. We will thoroughly investigate
-all valid reports and make every effort to resolve the issue promptly.
-
-To report any issues or vulnerabilities, please email us at info@greptime.com, rather than 
-posting publicly on GitHub. Be sure to provide us with the version identifier as well as details
-on how the vulnerability can be exploited.
--- a/benchmarks/Cargo.toml
+++ b/benchmarks/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "benchmarks"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
+version = "0.1.0"
+edition = "2021"
+license = "Apache-2.0"

 [dependencies]
-arrow.workspace = true
+arrow = "26.0.0"
 clap = { version = "4.0", features = ["derive"] }
 client = { path = "../src/client" }
 indicatif = "0.17.1"
 itertools = "0.10.5"
-parquet.workspace = true
-tokio.workspace = true
+parquet = "26.0.0"
+tokio = { version = "1.21", features = ["full"] }
--- a/benchmarks/src/bin/nyc-taxi.rs
+++ b/benchmarks/src/bin/nyc-taxi.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -15,23 +15,26 @@
 //! Use the taxi trip records from New York City dataset to bench. You can download the dataset from
 //! [here](https://www1.nyc.gov/site/tlc/about/tlc-trip-record-data.page).

+#![feature(once_cell)]
 #![allow(clippy::print_stdout)]

 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::time::Instant;

-use arrow::array::{ArrayRef, PrimitiveArray, StringArray, TimestampMicrosecondArray};
+use arrow::array::{ArrayRef, PrimitiveArray, StringArray, TimestampNanosecondArray};
 use arrow::datatypes::{DataType, Float64Type, Int64Type};
 use arrow::record_batch::RecordBatch;
 use clap::Parser;
+use client::admin::Admin;
 use client::api::v1::column::Values;
-use client::api::v1::{Column, ColumnDataType, ColumnDef, CreateTableExpr, InsertRequest};
-use client::{Client, Database, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
+use client::api::v1::{Column, ColumnDataType, ColumnDef, CreateExpr, InsertExpr};
+use client::{Client, Database, Select};
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
 use tokio::task::JoinSet;

+const DATABASE_NAME: &str = "greptime";
 const CATALOG_NAME: &str = "greptime";
 const SCHEMA_NAME: &str = "public";
 const TABLE_NAME: &str = "nyc_taxi";
@@ -61,7 +64,7 @@ struct Args {
    #[arg(long = "skip-read")]
    skip_read: bool,

-    #[arg(short, long, default_value_t = String::from("127.0.0.1:4001"))]
+    #[arg(short, long, default_value_t = String::from("127.0.0.1:3001"))]
    endpoint: String,
 }

@@ -91,30 +94,31 @@ async fn write_data(
        .unwrap();
    let progress_bar = mpb.add(ProgressBar::new(row_num as _));
    progress_bar.set_style(pb_style);
-    progress_bar.set_message(format!("{path:?}"));
+    progress_bar.set_message(format!("{:?}", path));

    let mut total_rpc_elapsed_ms = 0;

    for record_batch in record_batch_reader {
        let record_batch = record_batch.unwrap();
-        if !is_record_batch_full(&record_batch) {
-            continue;
-        }
        let (columns, row_count) = convert_record_batch(record_batch);
-        let request = InsertRequest {
+        let insert_expr = InsertExpr {
+            schema_name: "public".to_string(),
            table_name: TABLE_NAME.to_string(),
            region_number: 0,
            columns,
            row_count,
        };
        let now = Instant::now();
-        db.insert(request).await.unwrap();
+        db.insert(insert_expr).await.unwrap();
        let elapsed = now.elapsed();
        total_rpc_elapsed_ms += elapsed.as_millis();
        progress_bar.inc(row_count as _);
    }

-    progress_bar.finish_with_message(format!("file {path:?} done in {total_rpc_elapsed_ms}ms",));
+    progress_bar.finish_with_message(format!(
+        "file {:?} done in {}ms",
+        path, total_rpc_elapsed_ms
+    ));
    total_rpc_elapsed_ms
 }

@@ -125,17 +129,11 @@ fn convert_record_batch(record_batch: RecordBatch) -> (Vec<Column>, u32) {
    let mut columns = vec![];

    for (array, field) in record_batch.columns().iter().zip(fields.iter()) {
-        let (values, datatype) = build_values(array);
-
+        let values = build_values(array);
        let column = Column {
-            column_name: field.name().clone(),
+            column_name: field.name().to_owned(),
            values: Some(values),
-            null_mask: array
-                .to_data()
-                .nulls()
-                .map(|bitmap| bitmap.buffer().as_slice().to_vec())
-                .unwrap_or_default(),
-            datatype: datatype.into(),
+            null_mask: vec![],
            // datatype and semantic_type are set to default
            ..Default::default()
        };
@@ -145,7 +143,7 @@ fn convert_record_batch(record_batch: RecordBatch) -> (Vec<Column>, u32) {
    (columns, row_count as _)
 }

-fn build_values(column: &ArrayRef) -> (Values, ColumnDataType) {
+fn build_values(column: &ArrayRef) -> Values {
    match column.data_type() {
        DataType::Int64 => {
            let array = column
@@ -153,13 +151,10 @@ fn build_values(column: &ArrayRef) -> (Values, ColumnDataType) {
                .downcast_ref::<PrimitiveArray<Int64Type>>()
                .unwrap();
            let values = array.values();
-            (
-                Values {
-                    i64_values: values.to_vec(),
-                    ..Default::default()
-                },
-                ColumnDataType::Int64,
-            )
+            Values {
+                i64_values: values.to_vec(),
+                ..Default::default()
+            }
        }
        DataType::Float64 => {
            let array = column
@@ -167,38 +162,29 @@ fn build_values(column: &ArrayRef) -> (Values, ColumnDataType) {
                .downcast_ref::<PrimitiveArray<Float64Type>>()
                .unwrap();
            let values = array.values();
-            (
-                Values {
-                    f64_values: values.to_vec(),
-                    ..Default::default()
-                },
-                ColumnDataType::Float64,
-            )
+            Values {
+                f64_values: values.to_vec(),
+                ..Default::default()
+            }
        }
        DataType::Timestamp(_, _) => {
            let array = column
                .as_any()
-                .downcast_ref::<TimestampMicrosecondArray>()
+                .downcast_ref::<TimestampNanosecondArray>()
                .unwrap();
            let values = array.values();
-            (
-                Values {
-                    ts_microsecond_values: values.to_vec(),
-                    ..Default::default()
-                },
-                ColumnDataType::TimestampMicrosecond,
-            )
+            Values {
+                i64_values: values.to_vec(),
+                ..Default::default()
+            }
        }
        DataType::Utf8 => {
            let array = column.as_any().downcast_ref::<StringArray>().unwrap();
            let values = array.iter().filter_map(|s| s.map(String::from)).collect();
-            (
-                Values {
-                    string_values: values,
-                    ..Default::default()
-                },
-                ColumnDataType::String,
-            )
+            Values {
+                string_values: values,
+                ..Default::default()
+            }
        }
        DataType::Null
        | DataType::Boolean
@@ -225,139 +211,134 @@ fn build_values(column: &ArrayRef) -> (Values, ColumnDataType) {
        | DataType::FixedSizeList(_, _)
        | DataType::LargeList(_)
        | DataType::Struct(_)
-        | DataType::Union(_, _)
+        | DataType::Union(_, _, _)
        | DataType::Dictionary(_, _)
        | DataType::Decimal128(_, _)
        | DataType::Decimal256(_, _)
-        | DataType::RunEndEncoded(_, _)
        | DataType::Map(_, _) => todo!(),
    }
 }

-fn is_record_batch_full(batch: &RecordBatch) -> bool {
-    batch.columns().iter().all(|col| col.null_count() == 0)
-}
-
-fn create_table_expr() -> CreateTableExpr {
-    CreateTableExpr {
-        catalog_name: CATALOG_NAME.to_string(),
-        schema_name: SCHEMA_NAME.to_string(),
+fn create_table_expr() -> CreateExpr {
+    CreateExpr {
+        catalog_name: Some(CATALOG_NAME.to_string()),
+        schema_name: Some(SCHEMA_NAME.to_string()),
        table_name: TABLE_NAME.to_string(),
-        desc: "".to_string(),
+        desc: None,
        column_defs: vec![
            ColumnDef {
                name: "VendorID".to_string(),
                datatype: ColumnDataType::Int64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "tpep_pickup_datetime".to_string(),
-                datatype: ColumnDataType::TimestampMicrosecond as i32,
+                datatype: ColumnDataType::Int64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "tpep_dropoff_datetime".to_string(),
-                datatype: ColumnDataType::TimestampMicrosecond as i32,
+                datatype: ColumnDataType::Int64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "passenger_count".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "trip_distance".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "RatecodeID".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "store_and_fwd_flag".to_string(),
                datatype: ColumnDataType::String as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "PULocationID".to_string(),
                datatype: ColumnDataType::Int64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "DOLocationID".to_string(),
                datatype: ColumnDataType::Int64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "payment_type".to_string(),
                datatype: ColumnDataType::Int64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "fare_amount".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "extra".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "mta_tax".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "tip_amount".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "tolls_amount".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "improvement_surcharge".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "total_amount".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "congestion_surcharge".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "airport_fee".to_string(),
                datatype: ColumnDataType::Float64 as i32,
                is_nullable: true,
-                default_constraint: vec![],
+                default_constraint: None,
            },
        ],
        time_index: "tpep_pickup_datetime".to_string(),
@@ -365,8 +346,7 @@ fn create_table_expr() -> CreateTableExpr {
        create_if_not_exists: false,
        table_options: Default::default(),
        region_ids: vec![0],
-        table_id: None,
-        engine: "mito".to_string(),
+        table_id: Some(0),
    }
 }

@@ -375,23 +355,25 @@ fn query_set() -> HashMap<String, String> {

    ret.insert(
        "count_all".to_string(),
-        format!("SELECT COUNT(*) FROM {TABLE_NAME};"),
+        format!("SELECT COUNT(*) FROM {};", TABLE_NAME),
    );

    ret.insert(
        "fare_amt_by_passenger".to_string(),
-        format!("SELECT passenger_count, MIN(fare_amount), MAX(fare_amount), SUM(fare_amount) FROM {TABLE_NAME} GROUP BY passenger_count")
+        format!("SELECT passenger_count, MIN(fare_amount), MAX(fare_amount), SUM(fare_amount) FROM {} GROUP BY passenger_count",TABLE_NAME)
    );

    ret
 }

-async fn do_write(args: &Args, db: &Database) {
+async fn do_write(args: &Args, client: &Client) {
+    let admin = Admin::new("admin", client.clone());
+
    let mut file_list = get_file_list(args.path.clone().expect("Specify data path in argument"));
    let mut write_jobs = JoinSet::new();

-    let create_table_result = db.create(create_table_expr()).await;
-    println!("Create table result: {create_table_result:?}");
+    let create_table_result = admin.create(create_table_expr()).await;
+    println!("Create table result: {:?}", create_table_result);

    let progress_bar_style = ProgressStyle::with_template(
        "[{elapsed_precise}] {bar:60.cyan/blue} {pos:>7}/{len:7} {msg}",
@@ -405,7 +387,7 @@ async fn do_write(args: &Args, db: &Database) {
    let batch_size = args.batch_size;
    for _ in 0..args.thread_num {
        if let Some(path) = file_list.pop() {
-            let db = db.clone();
+            let db = Database::new(DATABASE_NAME, client.clone());
            let mpb = multi_progress_bar.clone();
            let pb_style = progress_bar_style.clone();
            write_jobs.spawn(async move { write_data(batch_size, &db, path, mpb, pb_style).await });
@@ -414,7 +396,7 @@ async fn do_write(args: &Args, db: &Database) {
    while write_jobs.join_next().await.is_some() {
        file_progress.inc(1);
        if let Some(path) = file_list.pop() {
-            let db = db.clone();
+            let db = Database::new(DATABASE_NAME, client.clone());
            let mpb = multi_progress_bar.clone();
            let pb_style = progress_bar_style.clone();
            write_jobs.spawn(async move { write_data(batch_size, &db, path, mpb, pb_style).await });
@@ -424,10 +406,10 @@ async fn do_write(args: &Args, db: &Database) {

 async fn do_query(num_iter: usize, db: &Database) {
    for (query_name, query) in query_set() {
-        println!("Running query: {query}");
+        println!("Running query: {}", query);
        for i in 0..num_iter {
            let now = Instant::now();
-            let _res = db.sql(&query).await.unwrap();
+            let _res = db.select(Select::Sql(query.clone())).await.unwrap();
            let elapsed = now.elapsed();
            println!(
                "query {}, iteration {}: {}ms",
@@ -449,13 +431,13 @@ fn main() {
        .unwrap()
        .block_on(async {
            let client = Client::with_urls(vec![&args.endpoint]);
-            let db = Database::new(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, client);

            if !args.skip_write {
-                do_write(&args, &db).await;
+                do_write(&args, &client).await;
            }

            if !args.skip_read {
+                let db = Database::new(DATABASE_NAME, client.clone());
                do_query(args.iter_num, &db).await;
            }
        })
--- a/codecov.yml
+++ b/codecov.yml
@@ -8,5 +8,3 @@ coverage:
 ignore:
  - "**/error*.rs" # ignore all error.rs files
  - "tests/runner/*.rs" # ignore integration test runner
-comment:                  # this is a top-level key
-  layout: "diff"
--- a/config/datanode.example.toml
+++ b/config/datanode.example.toml
@@ -1,60 +1,18 @@
-# Node running mode, see `standalone.example.toml`.
-mode = "distributed"
-# Whether to use in-memory catalog, see `standalone.example.toml`.
-enable_memory_catalog = false
-# The datanode identifier, should be unique.
 node_id = 42
-# gRPC server address, "127.0.0.1:3001" by default.
-rpc_addr = "127.0.0.1:3001"
-# Hostname of this node.
-rpc_hostname = "127.0.0.1"
-# The number of gRPC server worker threads, 8 by default.
+mode = 'distributed'
+rpc_addr = '127.0.0.1:3001'
+wal_dir = '/tmp/greptimedb/wal'
 rpc_runtime_size = 8
+mysql_addr = '127.0.0.1:4406'
+mysql_runtime_size = 4
+enable_memory_catalog = false

-# Metasrv client options.
-[meta_client_options]
-# Metasrv address list.
-metasrv_addrs = ["127.0.0.1:3002"]
-# Operation timeout in milliseconds, 3000 by default.
-timeout_millis = 3000
-# Connect server timeout in milliseconds, 5000 by default.
-connect_timeout_millis = 5000
-# `TCP_NODELAY` option for accepted connections, true by default.
-tcp_nodelay = true
-
-# WAL options, see `standalone.example.toml`.
-[wal]
-dir = "/tmp/greptimedb/wal"
-file_size = "1GB"
-purge_threshold = "50GB"
-purge_interval = "10m"
-read_batch_size = 128
-sync_write = false
-
-# Storage options, see `standalone.example.toml`.
 [storage]
-type = "File"
-data_dir = "/tmp/greptimedb/data/"
+type = 'File'
+data_dir = '/tmp/greptimedb/data/'

-# Compaction options, see `standalone.example.toml`.
-[storage.compaction]
-max_inflight_tasks = 4
-max_files_in_level0 = 8
-max_purge_tasks = 32
-
-# Storage manifest options
-[storage.manifest]
-# Region checkpoint actions margin.
-# Create a checkpoint every <checkpoint_margin> actions.
-checkpoint_margin = 10
-# Region manifest logs and checkpoints gc execution duration
-gc_duration = '30s'
-# Whether to try creating a manifest checkpoint on region opening
-checkpoint_on_startup = false
-
-# Procedure storage options, see `standalone.example.toml`.
-# [procedure.store]
-# type = "File"
-# data_dir = "/tmp/greptimedb/procedure/"
-# max_retry_times = 3
-# retry_delay = "500ms"
+[meta_client_opts]
+metasrv_addrs = ['127.0.0.1:3002']
+timeout_millis = 3000
+connect_timeout_millis = 5000
+tcp_nodelay = false
--- a/config/frontend.example.toml
+++ b/config/frontend.example.toml
@@ -1,58 +1,12 @@
-# Node running mode, see `standalone.example.toml`.
-mode = "distributed"
+mode = 'distributed'
+datanode_rpc_addr = '127.0.0.1:3001'

-# HTTP server options, see `standalone.example.toml`.
 [http_options]
-addr = "127.0.0.1:4000"
+addr = '127.0.0.1:4000'
 timeout = "30s"

-# gRPC server options, see `standalone.example.toml`.
-[grpc_options]
-addr = "127.0.0.1:4001"
-runtime_size = 8
-
-# MySQL server options, see `standalone.example.toml`.
-[mysql_options]
-addr = "127.0.0.1:4002"
-runtime_size = 2
-
-# MySQL server TLS options, see `standalone.example.toml`.
-[mysql_options.tls]
-mode = "disable"
-cert_path = ""
-key_path = ""
-
-# PostgresSQL server options, see `standalone.example.toml`.
-[postgres_options]
-addr = "127.0.0.1:4003"
-runtime_size = 2
-
-# PostgresSQL server TLS options, see `standalone.example.toml`.
-[postgres_options.tls]
-mode = "disable"
-cert_path = ""
-key_path = ""
-
-# OpenTSDB protocol options, see `standalone.example.toml`.
-[opentsdb_options]
-addr = "127.0.0.1:4242"
-runtime_size = 2
-
-# InfluxDB protocol options, see `standalone.example.toml`.
-[influxdb_options]
-enable = true
-
-# Prometheus protocol options, see `standalone.example.toml`.
-[prometheus_options]
-enable = true
-
-# Prometheus protocol options, see `standalone.example.toml`.
-[prom_options]
-addr = "127.0.0.1:4004"
-
-# Metasrv client options, see `datanode.example.toml`.
-[meta_client_options]
-metasrv_addrs = ["127.0.0.1:3002"]
+[meta_client_opts]
+metasrv_addrs = ['127.0.0.1:3002']
 timeout_millis = 3000
 connect_timeout_millis = 5000
-tcp_nodelay = true
+tcp_nodelay = false
--- a/config/metasrv.example.toml
+++ b/config/metasrv.example.toml
@@ -1,15 +1,4 @@
-# The bind address of metasrv, "127.0.0.1:3002" by default.
-bind_addr = "127.0.0.1:3002"
-# The communication server address for frontend and datanode to connect to metasrv,  "127.0.0.1:3002" by default for localhost.
-server_addr = "127.0.0.1:3002"
-# Etcd server address, "127.0.0.1:2379" by default.
-store_addr = "127.0.0.1:2379"
-# Datanode lease in seconds, 15 seconds by default.
+bind_addr = '127.0.0.1:3002'
+server_addr = '127.0.0.1:3002'
+store_addr = '127.0.0.1:2379'
 datanode_lease_secs = 15
-# Datanode selector type.
-# - "LeaseBased" (default value).
-# - "LoadBased"
-# For details, please see "https://docs.greptime.com/developer-guide/meta/selector".
-selector = "LeaseBased"
-# Store data in memory, false by default.
-use_memory_store = false
--- a/config/standalone.example.toml
+++ b/config/standalone.example.toml
@@ -1,130 +1,36 @@
-# Node running mode, "standalone" or "distributed".
-mode = "standalone"
-# Whether to use in-memory catalog, `false` by default.
+node_id = 0
+mode = 'standalone'
+wal_dir = '/tmp/greptimedb/wal/'
 enable_memory_catalog = false

-# HTTP server options.
 [http_options]
-# Server address, "127.0.0.1:4000" by default.
-addr = "127.0.0.1:4000"
-# HTTP request timeout, 30s by default.
+addr = '127.0.0.1:4000'
 timeout = "30s"

-# gRPC server options.
+[storage]
+type = 'File'
+data_dir = '/tmp/greptimedb/data/'
+
 [grpc_options]
-# Server address, "127.0.0.1:4001" by default.
-addr = "127.0.0.1:4001"
-# The number of server worker threads, 8 by default.
+addr = '127.0.0.1:4001'
 runtime_size = 8

-# MySQL server options.
 [mysql_options]
-# Server address, "127.0.0.1:4002" by default.
-addr = "127.0.0.1:4002"
-# The number of server worker threads, 2 by default.
+addr = '127.0.0.1:4002'
 runtime_size = 2

-# MySQL server TLS options.
-[mysql_options.tls]
-# TLS mode, refer to https://www.postgresql.org/docs/current/libpq-ssl.html
-# - "disable" (default value)
-# - "prefer"
-# - "require"
-# - "verify-ca"
-# - "verify-full"
-mode = "disable"
-# Certificate file path.
-cert_path = ""
-# Private key file path.
-key_path = ""
-
-# PostgresSQL server options.
-[postgres_options]
-# Server address, "127.0.0.1:4003" by default.
-addr = "127.0.0.1:4003"
-# The number of server worker threads, 2 by default.
-runtime_size = 2
-
-# PostgresSQL server TLS options, see `[mysql_options.tls]` section.
-[postgres_options.tls]
-# TLS mode.
-mode = "disable"
-# certificate file path.
-cert_path = ""
-# private key file path.
-key_path = ""
-
-# OpenTSDB protocol options.
-[opentsdb_options]
-# OpenTSDB telnet API server address, "127.0.0.1:4242" by default.
-addr = "127.0.0.1:4242"
-# The number of server worker threads, 2 by default.
-runtime_size = 2
-
-# InfluxDB protocol options.
 [influxdb_options]
-# Whether to enable InfluxDB protocol in HTTP API, true by default.
 enable = true

-# Prometheus protocol options.
+[opentsdb_options]
+addr = '127.0.0.1:4242'
+enable = true
+runtime_size = 2
+
 [prometheus_options]
-# Whether to enable Prometheus remote write and read in HTTP API, true by default.
 enable = true

-# Prom protocol options.
-[prom_options]
-# Prometheus API server address, "127.0.0.1:4004" by default.
-addr = "127.0.0.1:4004"
-
-# WAL options.
-[wal]
-# WAL data directory.
-dir = "/tmp/greptimedb/wal"
-# WAL file size in bytes.
-file_size = "1GB"
-# WAL purge threshold in bytes.
-purge_threshold = "50GB"
-# WAL purge interval in seconds.
-purge_interval = "10m"
-# WAL read batch size.
-read_batch_size = 128
-# Whether to sync log file after every write.
-sync_write = false
-
-# Storage options.
-[storage]
-# Storage type.
-type = "File"
-# Data directory, "/tmp/greptimedb/data" by default.
-data_dir = "/tmp/greptimedb/data/"
-
-# Compaction options.
-[storage.compaction]
-# Max task number that can concurrently run.
-max_inflight_tasks = 4
-# Max files in level 0 to trigger compaction.
-max_files_in_level0 = 8
-# Max task number for SST purge task after compaction.
-max_purge_tasks = 32
-
-# Storage manifest options
-[storage.manifest]
-# Region checkpoint actions margin.
-# Create a checkpoint every <checkpoint_margin> actions.
-checkpoint_margin = 10
-# Region manifest logs and checkpoints gc execution duration
-gc_duration = '30s'
-# Whether to try creating a manifest checkpoint on region opening
-checkpoint_on_startup = false
-
-# Procedure storage options.
-# Uncomment to enable.
-# [procedure.store]
-# # Storage type.
-# type = "File"
-# # Procedure data path.
-# data_dir = "/tmp/greptimedb/procedure/"
-# # Procedure max retry time.
-# max_retry_times = 3
-# # Initial retry delay of procedures, increases exponentially
-# retry_delay = "500ms"
+[postgres_options]
+addr = '127.0.0.1:4003'
+runtime_size = 2
+check_pwd = false
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -9,10 +9,7 @@ RUN apt-get update && apt-get install -y \
    protobuf-compiler \
    curl \
    build-essential \
-    pkg-config \
-    python3 \
-    python3-dev \
-    && pip install pyarrow
+    pkg-config

 # Install Rust.
 SHELL ["/bin/bash", "-c"]
@@ -27,8 +24,6 @@ RUN cargo build --release
 # TODO(zyy17): Maybe should use the more secure container image.
 FROM ubuntu:22.04 as base

-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install ca-certificates
-
 WORKDIR /greptime
 COPY --from=builder /greptimedb/target/release/greptime /greptime/bin/
 ENV PATH /greptime/bin/:$PATH
--- a/docker/aarch64/Dockerfile
+++ b/docker/aarch64/Dockerfile
@@ -1,57 +0,0 @@
-FROM ubuntu:22.04 as builder
-
-ENV LANG en_US.utf8
-WORKDIR /greptimedb
-
-# Install dependencies.
-RUN apt-get update && apt-get install -y \
-    libssl-dev \
-    protobuf-compiler \
-    curl \
-    build-essential \
-    pkg-config \
-    wget
-
-# Install Rust.
-SHELL ["/bin/bash", "-c"]
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain none -y
-ENV PATH /root/.cargo/bin/:$PATH
-
-# Install cross platform toolchain
-RUN apt-get -y update && \
-    apt-get -y install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu && \
-    apt-get install binutils-aarch64-linux-gnu
-
-COPY ./docker/aarch64/compile-python.sh ./docker/aarch64/
-RUN chmod +x ./docker/aarch64/compile-python.sh && \
-    ./docker/aarch64/compile-python.sh
-
-COPY ./rust-toolchain.toml .
-# Install rustup target for cross compiling.
-RUN rustup target add aarch64-unknown-linux-gnu
-COPY . .
-# Update dependency, using separate `RUN` to separate cache
-RUN cargo fetch
-
-# This three env var is set in script, so I set it manually in dockerfile.
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/
-ENV LIBRARY_PATH=$LIBRARY_PATH:/usr/local/lib/
-ENV PY_INSTALL_PATH=/greptimedb/python_arm64_build
-
-# Set the environment variable for cross compiling and compile it
-# cross compiled python is `python3` in path, but pyo3 need `python` in path so alias it
-# Build the project in release mode.
-RUN export PYO3_CROSS_LIB_DIR=$PY_INSTALL_PATH/lib && \ 
-    alias python=python3 && \
-    cargo build --target aarch64-unknown-linux-gnu --release -F pyo3_backend
-
-# Exporting the binary to the clean image
-FROM ubuntu:22.04 as base
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install ca-certificates
-
-WORKDIR /greptime
-COPY --from=builder /greptimedb/target/aarch64-unknown-linux-gnu/release/greptime /greptime/bin/
-ENV PATH /greptime/bin/:$PATH
-
-ENTRYPOINT ["greptime"]
--- a/docker/aarch64/compile-python.sh
+++ b/docker/aarch64/compile-python.sh
@@ -1,87 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# this script will download Python source code, compile it, and install it to /usr/local/lib
-# then use this python to compile cross-compiled python for aarch64
-ARCH=$1
-PYTHON_VERSION=3.10.10
-PYTHON_SOURCE_DIR=Python-${PYTHON_VERSION}
-PYTHON_INSTALL_PATH_AMD64=${PWD}/python-${PYTHON_VERSION}/amd64
-PYTHON_INSTALL_PATH_AARCH64=${PWD}/python-${PYTHON_VERSION}/aarch64
-
-function download_python_source_code() {
-  wget https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz
-  tar -xvf Python-$PYTHON_VERSION.tgz
-}
-
-function compile_for_amd64_platform() {
-  mkdir -p "$PYTHON_INSTALL_PATH_AMD64"
-
-  echo "Compiling for amd64 platform..."
-
-  ./configure \
-    --prefix="$PYTHON_INSTALL_PATH_AMD64" \
-    --enable-shared \
-    ac_cv_pthread_is_default=no ac_cv_pthread=yes ac_cv_cxx_thread=yes \
-    ac_cv_have_long_long_format=yes \
-    --disable-ipv6 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no
-
-  make
-  make install
-}
-
-# explain Python compile options here a bit:s
-# --enable-shared: enable building a shared Python library (default is no) but we do need it for calling from rust
-# CC, CXX, AR, LD, RANLIB: set the compiler, archiver, linker, and ranlib programs to use
-# build: the machine you are building on, host: the machine you will run the compiled program on
-# --with-system-ffi: build _ctypes module using an installed ffi library, see Doc/library/ctypes.rst, not used in here TODO: could remove
-# ac_cv_pthread_is_default=no ac_cv_pthread=yes ac_cv_cxx_thread=yes:
-# allow cross-compiled python to have -pthread set for CXX, see https://github.com/python/cpython/pull/22525
-# ac_cv_have_long_long_format=yes: target platform supports long long type
-# disable-ipv6: disable ipv6 support, we don't need it in here
-# ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no: disable pty support, we don't need it in here
-function compile_for_aarch64_platform() {
-  export LD_LIBRARY_PATH=$PYTHON_INSTALL_PATH_AMD64/lib:$LD_LIBRARY_PATH
-  export LIBRARY_PATH=$PYTHON_INSTALL_PATH_AMD64/lib:$LIBRARY_PATH
-  export PATH=$PYTHON_INSTALL_PATH_AMD64/bin:$PATH
-
-  mkdir -p "$PYTHON_INSTALL_PATH_AARCH64"
-
-  echo "Compiling for aarch64 platform..."
-  echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-  echo "LIBRARY_PATH: $LIBRARY_PATH"
-  echo "PATH: $PATH"
-
-  ./configure --build=x86_64-linux-gnu --host=aarch64-linux-gnu \
-    --prefix="$PYTHON_INSTALL_PATH_AARCH64" --enable-optimizations \
-    CC=aarch64-linux-gnu-gcc \
-    CXX=aarch64-linux-gnu-g++ \
-    AR=aarch64-linux-gnu-ar \
-    LD=aarch64-linux-gnu-ld \
-    RANLIB=aarch64-linux-gnu-ranlib \
-    --enable-shared \
-    ac_cv_pthread_is_default=no ac_cv_pthread=yes ac_cv_cxx_thread=yes \
-    ac_cv_have_long_long_format=yes \
-    --disable-ipv6 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no
-
-  make
-  make altinstall
-}
-
-# Main script starts here.
-download_python_source_code
-
-# Enter the python source code directory.
-cd $PYTHON_SOURCE_DIR || exit 1
-
-# Build local python first, then build cross-compiled python.
-compile_for_amd64_platform
-
-# Clean the build directory.
-make clean && make distclean
-
-# Cross compile python for aarch64.
-if [ "$ARCH" = "aarch64-unknown-linux-gnu" ]; then
-  compile_for_aarch64_platform
-fi
--- a/docker/ci/Dockerfile
+++ b/docker/ci/Dockerfile
@@ -1,15 +1,5 @@
 FROM ubuntu:22.04

-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    ca-certificates \
-    python3.10 \
-    python3.10-dev \
-    python3-pip
-
-COPY requirements.txt /etc/greptime/requirements.txt
-
-RUN python3 -m pip install -r /etc/greptime/requirements.txt
-
 ARG TARGETARCH

 ADD $TARGETARCH/greptime /greptime/bin/
--- a/docker/ci/requirements.txt
+++ b/docker/ci/requirements.txt
@@ -1,5 +0,0 @@
-numpy>=1.24.2
-pandas>=1.5.3
-pyarrow>=11.0.0
-requests>=2.28.2
-scipy>=1.10.1
--- a/docs/how-to/how-to-implement-sql-statement.md
+++ b/docs/how-to/how-to-implement-sql-statement.md
@@ -1,74 +0,0 @@
-This document introduces how to implement SQL statements in GreptimeDB.
-
-The execution entry point for SQL statements locates at Frontend Instance. You can see it has
-implemented `SqlQueryHandler`:
-
-```rust
-impl SqlQueryHandler for Instance {
-    type Error = Error;
-
-    async fn do_query(&self, query: &str, query_ctx: QueryContextRef) -> Vec<Result<Output>> {
-        // ...
-    }
-}
-```
-
-Normally, when a SQL query arrives at GreptimeDB, the `do_query` method will be called. After some parsing work, the SQL
-will be feed into `StatementExecutor`:
-
-```rust
-// in Frontend Instance:
-self.statement_executor.execute_sql(stmt, query_ctx).await
-```
-
-That's where we handle our SQL statements. You can just create a new match arm for your statement there, then the
-statement is implemented for both GreptimeDB Standalone and Cluster. You can see how `DESCRIBE TABLE` is implemented as
-an example.
-
-Now, what if the statements should be handled differently for GreptimeDB Standalone and Cluster? You can see there's
-a `SqlStatementExecutor` field in `StatementExecutor`. Each GreptimeDB Standalone and Cluster has its own implementation
-of `SqlStatementExecutor`. If you are going to implement the statements differently in the two mode (
-like `CREATE TABLE`), you have to implement them in their own `SqlStatementExecutor`s.
-
-Summarize as the diagram below:
-
-```text
-                             SQL query                            
-                                |                                
-                                v                                
-                  +---------------------------+                  
-                  | SqlQueryHandler::do_query |                  
-                  +---------------------------+                  
-                                |                                
-                                | SQL parsing                    
-                                v                                
-               +--------------------------------+                
-               | StatementExecutor::execute_sql |                
-               +--------------------------------+                
-                                |                                
-                                | SQL execution                    
-                                v                                
-               +----------------------------------+                
-               | commonly handled statements like |
-               | "plan_exec" for selection or     |
-               +----------------------------------+                
-                       |                |                        
-        For Standalone |                | For Cluster          
-                       v                v                        
-+---------------------------+      +---------------------------+ 
-| SqlStatementExecutor impl |      | SqlStatementExecutor impl | 
-| in Datanode Instance      |      | in Frontend DistInstance  | 
-+---------------------------+      +---------------------------+ 
-```
-
-Note that some SQL statements can be executed in our QueryEngine, in the form of `LogicalPlan`. You can follow the
-invocation path down to the `QueryEngine` implementation from `StatementExecutor::plan_exec`. For now, there's only
-one `DatafusionQueryEngine` for both GreptimeDB Standalone and Cluster. That lone query engine works for both modes is
-because GreptimeDB read/write data through `Table` trait, and each mode has its own `Table` implementation.
-
-We don't have any bias towards whether statements should be handled in query engine or `StatementExecutor`. You can
-implement one kind of statement in both places. For example, `Insert` with selection is handled in query engine, because
-we can easily do the query part there. However, `Insert` without selection is not, for the cost of parsing statement
-to `LogicalPlan` is not neglectable. So generally if the SQL query is simple enough, you can handle it
-in `StatementExecutor`; otherwise if it is complex or has some part of selection, it should be parsed to `LogicalPlan`
-and handled in query engine.  
--- a/docs/rfcs/2022-12-20-promql-in-rust/example.png
+++ b/docs/rfcs/2022-12-20-promql-in-rust/example.png
--- a/docs/rfcs/2022-12-20-promql-in-rust/instant-and-vector.png
+++ b/docs/rfcs/2022-12-20-promql-in-rust/instant-and-vector.png
--- a/docs/rfcs/2022-12-20-promql-in-rust/matrix-from-array.png
+++ b/docs/rfcs/2022-12-20-promql-in-rust/matrix-from-array.png
--- a/docs/rfcs/2022-12-20-promql-in-rust/range-vector-with-matrix.png
+++ b/docs/rfcs/2022-12-20-promql-in-rust/range-vector-with-matrix.png
--- a/docs/rfcs/2022-12-20-promql-in-rust/rfc.md
+++ b/docs/rfcs/2022-12-20-promql-in-rust/rfc.md
@@ -1,175 +0,0 @@
---
-Feature Name: "promql-in-rust"
-Tracking Issue: https://github.com/GreptimeTeam/greptimedb/issues/596
-Date: 2022-12-20
-Author: "Ruihang Xia <waynestxia@gmail.com>"
---
-
-Rewrite PromQL in Rust
----------------------
-
-# Summary
-A Rust native implementation of PromQL, for GreptimeDB.
-
-# Motivation
-Prometheus and its query language PromQL prevails in the cloud-native observability area, which is an important scenario for time series database like GreptimeDB. We already have support for its remote read and write protocols. Users can now integrate GreptimeDB as the storage backend to existing Prometheus deployment, but cannot run PromQL query directly on GreptimeDB like SQL.
-
-This RFC proposes to add support for PromQL. Because it was created in Go, we can't use the existing code easily. For interoperability, performance and extendability, porting its logic to Rust is a good choice.
-
-# Details
-
-## Overview
-One of the goals is to make use of our existing basic operators, execution model and runtime to reduce the work. So the entire proposal is built on top of Apache Arrow DataFusion. The rewrote PromQL logic is manifested as `Expr` or `Execution Plan` in DataFusion. And both the intermediate data structure and the result is in the format of `Arrow`'s `RecordBatch`.
-
-The following sections are organized in a top-down manner. Starts with evaluation procedure. Then introduces the building blocks of our new PromQL operation. Follows by an explanation of data model. And end with an example logic plan.
-
-*This RFC is heavily related to Prometheus and PromQL. It won't repeat some basic concepts of them.*
-
-## Evaluation
-
-The original implementation is like an interpreter of parsed PromQL AST. It has two characteristics: (1) Operations are evaluated in place after they are parsed to AST. And some key parameters are separated from the AST because they do not present in the query, but come from other places like another field in the HTTP payload. (2) calculation is performed per timestamp. You can see this pattern many times:
-```go
-for ts := ev.startTimestamp; ts <= ev.endTimestamp; ts += ev.interval {}
-```
-
-These bring out two differences in the proposed implementation. First, to make it more general and clear, the evaluation procedure is reorganized into serval phases (and is the same as DataFusion's). And second, data are evaluated by time series (corresponding to "columnar calculation", if think timestamp as row number).
-
-```
-                                      Logic
-   Query             AST              Plan
- ─────────► Parser ───────► Logical ────────► Physical ────┐
-                            Planner           Planner      │
-                                                           │
- ◄───────────────────────────── Executor  ◄────────────────┘
-        Evaluation Result                     Execution
-                                                Plan
-```
-
- Parser 
-
-    Provided by [`promql-parser`](https://github.com/GreptimeTeam/promql-parser) crate. Same as the original implementation.
-
- Logical Planner
-
-    Generates a logical plan with all the needed parameters. It should accept something like `EvalStmt` in Go's implementation, which contains query time range, evaluation interval and lookback range.
-
-    Another important thing done here is assembling the logic plan, with all the operations baked into logically. Like what's the filter and time range to read, how the data then flows through a selector into a binary operation, etc. Or what's the output schema of every single step. The generated logic plan is deterministic without variables, and can be `EXPLAIN`ed clearly.
-
- Physical Planner
-
-    This step converts a logic plan into evaluatable execution plan. There are not many special things like the previous step. Except when a query is going to be executed distributedly. In this case, a logic plan will be divided into serval parts and sent to serval nodes. One physical planner only sees its own part.
-
- Executor
-
-    As its name shows, this step calculates data to result. And all new calculation logic, the implementation of PromQL in rust, is placed here. And the rewrote functions are using `RecordBatch` and `Array` from `Arrow` as the intermediate data structure.
-
-    Each "batch" contains only data from single time series. This is from the underlying storage implementation. Though it's not a requirement of this RFC, having this property can simplify some functions.
-    
-    Another thing to mention is the rewrote functions don't aware of timestamp or value columns, they are defined only based on the input data types. For example, `increase()` function in PromQL calculates the unbiased delta of data, its implementation here only does this single thing. Let's compare the signature of two implementations:
-
-    - Go
-        ```go
-        func funcIncrease(vals []parser.Value, args parser.Expressions) Vector {}
-        ```
-    - Rust
-        ```rust
-        fn prom_increase(input: Array) -> Array {}
-        ```
-
-    Some unimportant parameters are omitted. The original Go version only writes the logic for `Point`'s value, either float or histogram. But the proposed rewritten one accepts a generic `Array` as input, which can be any type that suits, from `i8` to `u64` to `TimestampNanosecond`.
-
-## Plan and Expression
-
-They are structures to express logic from PromQL. The proposed implementation is built on top of DataFusion, thus our plan and expression are in form of `ExtensionPlan` and `ScalarUDF`. The only difference between them in this context is the return type: plan returns a record batch while expression returns a single column.
-
-This RFC proposes to add four new plans, they are fundamental building blocks that mainly handle data selection logic in PromQL, for the following calculation expressions. 
-
- `SeriesNormalize`
-
-    Sort data inside one series on the timestamp column, and bias "offset" if has. This plan usually comes after `TableScan` (or `TableScan` and `Filter`) plan.
-
- `VectorManipulator` and `MatrixManipulator`
-
-    Corresponding to `InstantSelector` and `RangeSelector`. We don't calculate timestamp by timestamp, thus use "vector" instead of "instant", this image shows the difference. And "matrix" is another name for "range vector", for not confused with our "vector". The following section will detail how they are implemented using Arrow.
-
-    ![instant_and_vector](instant-and-vector.png)
-
-    Due to "interval" parameter in PromQL, data after "selector" (or "manipulator" here) are usually shorter than input. And we have to modify the entire record batch to shorten both timestamp, value and tag columns. So they are formed as plan.
-
- `PromAggregator`
-
-    The carrier of aggregator expressions. This should not be very different from the DataFusion built-in `Aggregate` plan, except PromQL can use "group without" to do reverse selection.
-
-PromQL has around 70 expressions and functions. But luckily we can reuse lots of them from DataFusion. Like unary expression, binary expression and aggregator. We only need to implement those PromQL-specific expressions, like `rate` or `percentile`. The following table lists some typical functions in PromQL, and their signature in the proposed implementation. Other function should be the same.
-
-| Name               	| In Param(s)                                          	| Out Param(s) 	| Explain            	|
-|--------------------	|------------------------------------------------------	|--------------	|--------------------	|
-| instant_delta      	| Matrix T                                             	| Array T      	| idelta in PromQL   	|
-| increase           	| Matrix T                                             	| Array T      	| increase in PromQL 	|
-| extrapolate_factor 	| - Matrix T<br>- Array Timestamp<br>- Array Timestamp 	| Array T      	| *                   	|
-
-*: *`extrapolate_factor` is one of the "dark sides" in PromQL. In short it's a translation of this [paragraph](https://github.com/prometheus/prometheus/blob/0372e259baf014bbade3134fd79bcdfd8cbdef2c/promql/functions.go#L134-L159)*
-
-To reuse those common calculation logic, we can break them into serval expressions, and assemble in the logic planning phase. Like `rate()` in PromQL can be represented as `increase / extrapolate_factor`.
-
-## Data Model
-
-This part explains how data is represented. Following the data model in GreptimeDB, all the data are stored as table, with tag columns, timestamp column and value column. Table to record batch is very straightforward. So an instant vector can be thought of as a row (though as said before, we don't use instant vectors) in the table. Given four basic types in PromQL: scalar, string, instant vector and range vector, only the last "range vector" need some tricks to adapt our columnar calculation.
-
-Range vector is some sort of matrix, it's consisted of small one-dimension vectors, with each being an input of range function. And, applying range function to a range vector can be thought of kind of convolution.
-
-![range-vector-with-matrix](range-vector-with-matrix.png)
-
-(Left is an illustration of range vector. Notice the Y-axis has no meaning, it's just put different pieces separately. The right side is an imagined "matrix" as range function. Multiplying the left side to it can get a one-dimension "matrix" with four elements. That's the evaluation result of a range vector.)
-
-To adapt this range vector to record batch, it should be represented by a column. This RFC proposes to use `DictionaryArray` from Arrow to represent range vector, or `Matrix`. This is "misusing" `DictionaryArray` to ship some additional information about an array. Because the range vector is sliding over one series, we only need to know the `offset` and `length` of each slides to reconstruct the matrix from an array:
-
-![matrix-from-array](matrix-from-array.png)
-
-The length is not fixed, it depends on the input's timestamp. An PoC implementation of `Matrix` and `increase()` can be found in [this repo](https://github.com/waynexia/corroding-prometheus).
-
-## Example
-
-The logic plan of PromQL query
-```promql
-# start: 2022-12-20T10:00:00
-# end: 2022-12-21T10:00:00
-# interval: 1m
-# lookback: 30s
-sum (rate(request_duration[5m])) by (idc)
-```
-looks like
-
-<!-- title: 'PromAggregator: \naggr = sum, column = idc'
-operator: prom
-inputs:
- title: 'Matrix Manipulator: \ninterval = 1m, range = 5m, expr = div(increase(value), extrapolate_factor(timestamp))'
-  operator: prom
-  inputs:
-  - title: 'Series Normalize: \noffset = 0'
-    operator: prom
-    inputs:
-    - title: 'Filter: \ntimestamp > 2022-12-20T10:00:00 && timestamp < 2022-12-21T10:00:00'
-      operator: filter
-      inputs:
-      - title: 'Table Scan: \ntable = request_duration, timestamp > 2022-12-20T10:00:00 && timestamp < 2022-12-21T10:00:00'
-        operator: scan -->
-
-![example](example.png)
-
-# Drawbacks
-
-Human-being is always error-prone. It's harder to endeavor to rewrite from the ground and requires more attention to ensure correctness, than translate line-by-line. And, since the evaluator's architecture are different, it might be painful to catch up with PromQL's breaking update (if any) in the future.
-
-Misusing Arrow's DictionaryVector as Matrix is another point. This hack needs some `unsafe` function call to bypass Arrow's check. And though Arrow's API is stable, this is still an undocumented behavior.
-
-# Alternatives
-
-There are a few alternatives we've considered:
- Wrap the existing PromQL's implementation via FFI, and import it to GreptimeDB.
- Translate its evaluator engine line-by-line, rather than rewrite one.
- Integrate the Prometheus server into GreptimeDB via RPC, making it a detached execution engine for PromQL.
-
-The first and second options are making a separate execution engine in GreptimeDB, they may alleviate the pain during rewriting, but will have negative impacts to afterward evolve like resource management. And introduce another deploy component in the last option will bring a complex deploy architecture.
-
-And all of them are more or less redundant in data transportation that affects performance and resources. The proposed built-in executing procedure is also easy to integrate and expose to the existing SQL interface GreptimeDB currently provides. Some concepts in PromQL like sliding windows (range vector in PromQL) are very convenient and ergonomic in analyzing series data. This makes it not only a PromQL evaluator, but also an enhancement to our query system.
--- a/docs/rfcs/2023-01-03-procedure-framework.md
+++ b/docs/rfcs/2023-01-03-procedure-framework.md
@@ -1,151 +0,0 @@
---
-Feature Name: "procedure-framework"
-Tracking Issue: https://github.com/GreptimeTeam/greptimedb/issues/286
-Date: 2023-01-03
-Author: "Yingwen <realevenyag@gmail.com>"
---
-
-Procedure Framework
----------------------
-
-# Summary
-A framework for executing operations in a fault-tolerant manner.
-
-# Motivation
-Some operations in GreptimeDB require multiple steps to implement. For example, creating a table needs:
-1. Check whether the table exists
-2. Create the table in the table engine
-  1. Create a region for the table in the storage engine
-  2. Persist the metadata of the table to the table manifest
-3. Add the table to the catalog manager
-
-If the node dies or restarts in the middle of creating a table, it could leave the system in an inconsistent state. The procedure framework, inspired by [Apache HBase's ProcedureV2 framework](https://github.com/apache/hbase/blob/bfc9fc9605de638785435e404430a9408b99a8d0/src/main/asciidoc/_chapters/pv2.adoc) and [Apache Accumulo’s FATE framework](https://accumulo.apache.org/docs/2.x/administration/fate), aims to provide a unified way to implement multi-step operations that is tolerant to failure.
-
-# Details
-## Overview
-The procedure framework consists of the following primary components:
- A `Procedure` represents an operation or a set of operations to be performed step-by-step
- `ProcedureManager`, the runtime to run `Procedures`. It executes the submitted procedures, stores procedures' states to the `ProcedureStore` and restores procedures from `ProcedureStore` while the database restarts.
- `ProcedureStore` is a storage layer for persisting the procedure state
-
-
-## Procedures
-The `ProcedureManager` keeps calling `Procedure::execute()` until the Procedure is done, so the operation of the Procedure should be [idempotent](https://developer.mozilla.org/en-US/docs/Glossary/Idempotent): it needs to be able to undo or replay a partial execution of itself.
-
-```rust
-trait Procedure {
-    fn execute(&mut self, ctx: &Context) -> Result<Status>;
-
-    fn dump(&self) -> Result<String>;
-
-    fn rollback(&self) -> Result<()>;
-
-    // other methods...
-}
-```
-
-The `Status` is an enum that has the following variants:
-```rust
-enum Status {
-    Executing {
-        persist: bool,
-    },
-    Suspended {
-        subprocedures: Vec<ProcedureWithId>,
-        persist: bool,
-    },
-    Done,
-}
-```
-
-A call to `execute()` can result in the following possibilities:
- `Ok(Status::Done)`: we are done
- `Ok(Status::Executing { .. })`: there are remaining steps to do
- `Ok(Status::Suspend { sub_procedure, .. })`: execution is suspended and can be resumed later after the sub-procedure is done.
- `Err(e)`: error occurs during execution and the procedure is unable to proceed anymore.
-
-Users need to assign a unique `ProcedureId` to the procedure and the procedure can get this id via the `Context`. The `ProcedureId` is typically a UUID.
-
-```rust
-struct Context {
-    id: ProcedureId,
-    // other fields ...
-}
-```
-
-The `ProcedureManager` calls `Procedure::dump()` to serialize the internal state of the procedure and writes to the `ProcedureStore`. The `Status` has a field `persist` to tell the `ProcedureManager` whether it needs persistence.
-
-## Sub-procedures
-A procedure may need to create some sub-procedures to process its subtasks. For example, creating a distributed table with multiple regions (partitions) needs to set up the regions in each node, thus the parent procedure should instantiate a sub-procedure for each region. The `ProcedureManager` makes sure that the parent procedure does not proceed till all sub-procedures are successfully finished.
-
-The procedure can submit sub-procedures to the `ProcedureManager` by returning `Status::Suspended`. It needs to assign a procedure id to each procedure manually so it can track the status of the sub-procedures.
-```rust
-struct ProcedureWithId {
-    id: ProcedureId,
-    procedure: BoxedProcedure,
-}
-```
-
-## ProcedureStore
-We might need to provide two different ProcedureStore implementations:
- In standalone mode, it stores data on the local disk.
- In distributed mode, it stores data on the meta server or the object store service.
-
-These implementations should share the same storage structure. They store each procedure's state in a unique path based on the procedure id:
-
-```
-Sample paths:
-
-/procedures/{PROCEDURE_ID}/000001.step
-/procedures/{PROCEDURE_ID}/000002.step
-/procedures/{PROCEDURE_ID}/000003.commit
-```
-
-`ProcedureStore` behaves like a WAL. Before performing each step, the `ProcedureManager` can write the procedure's current state to the ProcedureStore, which stores the state in the `.step` file. The `000001` in the path is a monotonic increasing sequence of the step. After the procedure is done, the `ProcedureManager` puts a `.commit` file to indicate the procedure is finished (committed).
-
-The `ProcedureManager` can remove the procedure's files once the procedure is done, but it needs to leave the `.commit` as the last file to remove in case of failure during removal.
-
-## ProcedureManager
-`ProcedureManager` executes procedures submitted to it.
-
-```rust
-trait ProcedureManager {
-    fn register_loader(&self, name: &str, loader: BoxedProcedureLoader) -> Result<()>;
-
-    async fn submit(&self, procedure: ProcedureWithId) -> Result<()>;
-}
-```
-
-It supports the following operations:
- Register a `ProcedureLoader` by the type name of the `Procedure`.
- Submit a `Procedure` to the manager and execute it.
-
-When `ProcedureManager` starts, it loads procedures from the `ProcedureStore` and restores the procedures by the `ProcedureLoader`. The manager stores the type name from `Procedure::type_name()` with the data from `Procedure::dump()` in the `.step` file and uses the type name to find a `ProcedureLoader` to recover the procedure from its data.
-
-```rust
-type BoxedProcedureLoader = Box<dyn Fn(&str) -> Result<BoxedProcedure> + Send>;
-```
-
-## Rollback
-The rollback step is supposed to clean up the resources created during the execute() step. When a procedure has failed, the `ProcedureManager` puts a `rollback` file and calls the `Procedure::rollback()` method.
-
-
-```text
-/procedures/{PROCEDURE_ID}/000001.step
-/procedures/{PROCEDURE_ID}/000002.rollback
-```
-
-Rollback is complicated to implement so some procedures might not support rollback or only provide a best-efforts approach.
-
-## Locking
-The `ProcedureManager` can provide a locking mechanism that gives a procedure read/write access to a database object such as a table so other procedures are unable to modify the same table while the current one is executing.
-
-# Drawbacks
-The `Procedure` framework introduces additional complexity and overhead to our database.
- To execute a `Procedure`, we need to write to the `ProcedureStore` multiple times, which may slow down the server
- We need to rewrite the logic of creating/dropping/altering a table using the procedure framework
-
-# Alternatives
-Another approach is to tolerate failure during execution and allow users to retry the operation until it succeeds. But we still need to:
- Make each step idempotent
- Record the status in some place to check whether we are done
--- a/docs/rfcs/2023-02-01-table-compaction.md
+++ b/docs/rfcs/2023-02-01-table-compaction.md
@@ -1,92 +0,0 @@
---
-Feature Name: "table-compaction"
-Tracking Issue: https://github.com/GreptimeTeam/greptimedb/issues/930
-Date: 2023-02-01
-Author: "Lei, HUANG <mrsatangel@gmail.com>"
---
-
-# Table Compaction
-
--- 
-
-## Background
-
-GreptimeDB uses an LSM-tree based storage engine that flushes memtables to SSTs for persistence. 
-But currently it only supports level 0. SST files in level 0 does not guarantee to contain only rows with disjoint time ranges. 
-That is to say, different SST files in level 0 may contain overlapped timestamps. 
-The consequence is, in order to retrieve rows in some time range, all files need to be scanned, which brings a lot of IO overhead.
-
-Also, just like other LSMT engines, delete/update to existing primary keys are converted to new rows with delete/update mark and appended to SSTs on flushing. 
-We need to merge the operations to same primary keys so that we don't have to go through all SST files to find the final state of these primary keys.  
-
-## Goal
-
-Implement a compaction framework to: 
- maintain SSTs in timestamp order to accelerate queries with timestamp condition;
- merge rows with same primary key;
- purge expired SSTs;
- accommodate other tasks like data rollup/indexing.
-
-
-## Overview
-
-Table compaction involves following components:
- Compaction scheduler: run compaction tasks, limit the consumed resources;
- Compaction strategy: find the SSTs to compact and determine the output files of compaction.
- Compaction task: read the rows from input SSTs and write to the output files.
-
-## Implementation
-
-### Compaction scheduler
-
-`CompactionScheduler` is an executor that continuously polls and executes compaction request from a task queue. 
-
-```rust
-#[async_trait]
-pub trait CompactionScheduler {
-    /// Schedules a compaction task.
-    async fn schedule(&self, task: CompactionRequest) -> Result<()>;
-
-    /// Stops compaction scheduler.
-    async fn stop(&self) -> Result<()>;
-}
-```
-
-
-
-### Compaction triggering
-
-Currently, we can check whether to compact tables when memtable is flushed to SST.
-
-https://github.com/GreptimeTeam/greptimedb/blob/4015dd80752e1e6aaa3d7cacc3203cb67ed9be6d/src/storage/src/flush.rs#L245
-
-
-### Compaction strategy
-
-`CompactionStrategy` defines how to pick SSTs in all levels for compaction.   
-
-```rust
-pub trait CompactionStrategy {
-    fn pick(
-        &self,
-        ctx: CompactionContext,
-        levels: &LevelMetas,
-    ) -> Result<CompactionTask>;
-}
-```
-
-The most suitable compaction strategy for time-series scenario would be 
-a hybrid strategy that combines time window compaction with size-tired compaction, just like [Cassandra](https://cassandra.apache.org/doc/latest/cassandra/operating/compaction/twcs.html) and [ScyllaDB](https://docs.scylladb.com/stable/architecture/compaction/compaction-strategies.html#time-window-compaction-strategy-twcs) does.
-
-We can first group SSTs in level n into buckets according to some predefined time window. Within that window, 
-SSTs are compacted in a size-tired manner (find SSTs with similar size and compact them to level n+1). 
-SSTs from different time windows are neven compacted together.
-That strategy guarantees SSTs in each level are mainly sorted in timestamp order which boosts queries with 
-explicit timestamp condition, while size-tired compaction minimizes the impact to foreground writes. 
-
-### Alternatives
-
-Currently, GreptimeDB's storage engine [only support two levels](https://github.com/GreptimeTeam/greptimedb/blob/43aefc5d74dfa73b7819cae77b7eb546d8534a41/src/storage/src/sst.rs#L32).
-For level 0, we can start with a simple time-window based leveled compaction, which reads from all SSTs in level 0, 
-align them to time windows with a fixed duration, merge them with SSTs in level 1 within the same time window 
-to ensure there is only one sorted run in level 1.
--- a/docs/rfcs/2023-03-08-region-fault-tolerance.md
+++ b/docs/rfcs/2023-03-08-region-fault-tolerance.md
@@ -1,196 +0,0 @@
---
-Feature Name: "Fault Tolerance for Region"
-Tracking Issue: https://github.com/GreptimeTeam/greptimedb/issues/1126
-Date: 2023-03-08
-Author: "Luo Fucong <luofucong@greptime.com>"
---
-
-Fault Tolerance for Region
----------------------
-
-# Summary
-
-This RFC proposes a method to achieve fault tolerance for regions in GreptimeDB's distributed mode. Or, put it in another way, achieving region high availability("HA") for GreptimeDB cluster. 
-
-In this RFC, we mainly describe two aspects of region HA: how region availability is detected, and what recovery process is need to be taken. We also discuss some alternatives and future work.
-
-When this feature is done, our users could expect a GreptimeDB cluster that can always handle their requests to regions, despite some requests may failed during the region failover. The optimization to reduce the MTTR(Mean Time To Recovery) is not a concern of this RPC, and is left for future work.
-
-# Motivation
-
-Fault tolerance for regions is a critical feature for our clients to use the GreptimeDB cluster confidently. High availability for users to interact with their stored data is a "must have" for any TSDB products, that include our GreptimeDB cluster.
-
-# Details
-
-## Background
-
-Some backgrounds about region in distributed mode:
-
- A table is logically split into multiple regions. Each region stores a part of non-overlapping table data.
- Regions are distributed in Datanodes, the mappings are not static, are assigned and governed by Metasrv.
- In distributed mode, client requests are scoped in regions. To be more specific, when a request that needs to scan multiple regions arrived in Frontend, Frontend splits the request into multiple sub-requests, each of which scans one region only, and submits them to Datanodes that hold corresponding regions. 
-
-In conclusion, as long as regions remain available, and regions could regain availability when failures do occur, the overall region HA could be achieved. With this in mind, let's see how region failures are detected first. 
-
-## Failure Detection
-
-We detect region failures in Metasrv, and do it both passively and actively. Passively means that Metasrv do not fire some "are you healthy" requests to regions. Instead, we carry region healthy information in the heartbeat requests that are submit to Metasrv by Datanodes. 
-
-Datanode already carries its regions stats in the heartbeat request (the non-relevant fields are omitted):
-
-```protobuf
-message HeartbeatRequest {
-  ...
-  // Region stats on this node
-  repeated RegionStat region_stats = 6;
-  ...
-}
-
-message RegionStat {
-  uint64 region_id = 1;
-  TableName table_name = 2;
-  ...
-}
-```
-
-For the sake of simplicity, we don't add another field `bool available = 3` to the `RegionStat` message; instead, if the region were unavailable in the view of the Datanode that contains it, the Datanode just not includes the `RegionStat` of it in the heartbeat request. Or, if the Datanode itself is not unavailable, the heartbeat request is not submitted, effectively the same with not carrying the `RegionStat`.
-
-> The heartbeat interval is now hardcoded to five seconds.
-
-Metasrv gathers the heartbeat requests, extracts the `RegionStat`s, and treat them as region heartbeat. In this way, Metasrv maintains all regions healthy information. If some region's heartbeats were not received in a period of time, Metasrv speculates the region might be unavailable. To make the decision whether a region is failed or not, Metasrv uses a failure detection algorithm called the "[Phi φ Accrual Failure Detection](https://medium.com/@arpitbhayani/phi-%CF%86-accrual-failure-detection-79c21ce53a7a)". Basically, the algorithm calculates a value called "phi" to represent the possibility of a region's unavailability, based on the historical heartbeats' arrived rate. Once the "phi" is above some pre-defined threshold, Metasrv knows the region is failed.
-
-> This algorithm has been widely adopted in some well known products, like Akka and Cassandra.
-
-When Metasrv decides some region is failed from heartbeats, it's not the final decision. Here comes the "actively" detection. Before Metasrv decides to do region failover, it actively invokes the healthy check interface of the Datanode that the failure region resides. Only this healthy check is failed does Metasrv actually start doing failover upon the region.
-
-To conclude, the failure detection pseudo-codes are like this:
-
-```rust
-// in Metasrv:
-fn failure_detection() {
-    loop {
-        // passive detection
-        let failed_regions = all_regions.iter().filter(|r| r.estimated_failure_possibility() > config.phi).collect();
-
-        // find the datanodes that contains the failed regions
-        let datanodes_and_regions = find_region_resides_datanodes(failed_regions);
-
-        // active detection  
-        for (datanode, regions) in datanodes_and_regions {
-            if !datanode.is_healthy(regions) {
-                do_failover(datanode, regions);
-            }
-        }
-
-        sleep(config.detect_interval);
-    }
-}
-```
-
-Some design considerations:
-
- Why active detecting while we have passively detection? Because it could be happened that the network is singly connectable sometimes (especially in the complex Cloud environment), then the Datanode's heartbeats cannot reach Metasrv, while Metasrv could request Datanode. Active detecting avoid this false positive situation.
- Why the detection works on region instead of Datanode? Because we might face the possibility that only part of the regions in the Datanode are not available, not ALL regions. Especially the situation that Datanodes are used by multiple tenants. If this is the case, it's better to do failover upon the designated regions instead of the whole regions that reside on the Datanode. All in all, we want a more subtle control over region failover. 
-
-So we detect some regions are not available. How to regain the availability back?
-
-## Region Failover
-
-Region Failover largely relies on remote WAL, aka "[Bunshin](https://github.com/GreptimeTeam/bunshin)". I'm not including any of the details of it in this RFC, let's just assume we already have it.
-
-In general, region failover is fairly simple. Once Metasrv decides to do failover upon some regions, it first chooses one or more Datanodes to hold the failed region. This can be done easily, as the Metasrv already has the whole picture of Datanodes: it knows which Datanode has the minimum regions, what Datanode historically had the lowest CPU usage and IO rate, and how the Datanodes are assigned to tenants, among other information that can all help the Metasrv choose the most suitable Datanodes. Let's call these chosen Datanodes as "candidates".
-
-> The strategy to choose the most suitable candidates required careful design, but it's another RFC.
-
-Then, Metasrv sets the states of these failed regions as "passive". We should add a field to `Region`:
-
-```protobuf
-message Region {
-  uint64 id = 1;
-  string name = 2;
-  Partition partition = 3;
-  
-  message State {
-    Active,
-    Passive,
-  }
-  State state = 4;
-  
-  map<string, string> attrs = 100;
-}
-```
-
-Here `Region` is used in message `RegionRoute`, which indicates how the write request is split among regions. When a region is set as "passive", Frontend knows the write to it should be rejected at the moment (the region read is not blocked, however).
-
-> Making a region "passive" here is effectively blocking the write to it. It's ok in the failover situation, the region is failed anyway. However, when dealing with active maintenance operations, region state requires more refined design. But that's another story. 
-
-Third, Metasrv fires the "close region" requests to the failed Datanodes, and fires the "open region" requests to those candidates. "Close region" requests might be failed due to the unavailability of Datanodes, but that's fine, it's just a best-effort attempt to reduce the chance of any in-flight writes got handled unintentionally after the region is set as "passive". The "open region" requests must have succeeded though. Datanodes open regions from remote WAL.
-
-> Currently the "close region" is undefined in Datanode. It could be a local cache clean up of region data or other resources tidy up.
-
-Finally, when a candidate successfully opens its region, it calls back to Metasrv, indicating it is ready to handle region. "call back" here is backed by its heartbeat to Metasrv. Metasrv updates the region's state to "active", so as to let Frontend lifts the restrictions of region writes (again, the read part of region is untouched).
-
-All the above steps should be managed by remote procedure framework. It's another implementation challenge in the region failover feature. (One is the remote WAL of course.)
-
-A picture is worth a 1000 words:
-
-```text
-                                    +-------------------------+                                        
-                                    | Metasrv detects region  |                                        
-                                    | failure                 |                                        
-                                    +-------------------------+                                        
-                                                 |                                                     
-                                                 v                                                     
-                                    +----------------------------+                                        
-                                    | Metasrv chooses candidates |                                        
-                                    | to hold failed regions     |                                        
-                                    +----------------------------+                                        
-                                                 |                                                     
-                                                 v                                                     
-                                    +-------------------------+       +-------------------------+      
-                                    | Metasrv "passive" the   |------>| Frontend rejects writes |      
-                                    | failed regions          |       | to "passive" regions    |      
-                                    +-------------------------+       +-------------------------+      
-                                                 |                                                     
-                                                 v                                                     
-+--------------------------+        +---------------------------+                                        
-| Candidate Datanodes open |<-------| Metasrv fires "close" and |                                        
-| regions from remote WAL  |        | "open" region requests    |                                        
-+--------------------------+        +---------------------------+                                        
-             |                                                                                         
-             |                                                                                         
-             |                      +-------------------------+       +-------------------------+      
-             +--------------------->| Metasrv "active" the    |------>| Frontend lifts write    |      
-                                    | failed regions          |       | restriction to regions  |      
-                                    +-------------------------+       +-------------------------+      
-                                                 |                                                     
-                                                 v                                                     
-                                    +-------------------------+                                        
-                                    | Region failover done,   |                                        
-                                    | HA regain               |                                        
-                                    +-------------------------+                                        
-```
-
-# Alternatives
-
-## The "Neon" Way
-
-Remote WAL raises a problem that could harm the write throughput of GreptimeDB cluster: each write request has to do at least two remote call, one is from Frontend to Datanode, and one is from Datanode to remote WAL. What if we do it the "[Neon](https://github.com/neondatabase/neon)" way, making remote WAL sits in between the Frontend and Datanode, couldn't that improve our write throughput? It could, though there're some consistency issues like "read-your-writes" to solve.
-
-However, the main concerns we don't adopt this method are two-fold:
-
-1. Remote WAL is planned to be quorum based, it can be efficiently written;
-2. More importantly, we are planning to make the remote WAL an option that users could choose not to enable it (at the cost of some reliability reduction).
-
-## No WAL, Replication instead
-
-This method replicates region across Datanodes directly, like the common way in shared-nothing database. Were the main region failed, a standby region in the replicate group is elected as new "main" and take the read/write requests. The main concern to this method is the incompatibility to our current architecture and code structure. It requires a major redesign, but gains no significant advantage over the remote WAL method. 
-
-However, the replication does have its own advantage that we can learn from to optimize this failover procedure.
-
-# Future Work
-
-Some optimizations we could take:
-
- To reduce the MTTR, we could make Metasrv chooses the candidate to each region at normal time. The candidate does some preparation works to reduce the open region time, effectively accelerate the failover procedure.
- We can adopt the replication method, to the degree that region replicas are used as the fast catch-up candidates. The data difference among replicas is minor, region failover does not need to load or exchange too much data, greatly reduced the region failover time.
--- a/docs/rfcs/2023-03-29-file-external-table/external-table-engine-overview.png
+++ b/docs/rfcs/2023-03-29-file-external-table/external-table-engine-overview.png
--- a/docs/rfcs/2023-03-29-file-external-table/external-table-engine-way-2.png
+++ b/docs/rfcs/2023-03-29-file-external-table/external-table-engine-way-2.png
--- a/docs/rfcs/2023-03-29-file-external-table/rfc.md
+++ b/docs/rfcs/2023-03-29-file-external-table/rfc.md
@@ -1,174 +0,0 @@
---
-Feature Name: "File external table"
-Tracking Issue: https://github.com/GreptimeTeam/greptimedb/issues/1041
-Date: 2023-03-08
-Author: "Xu Wenkang <wenymedia@gmail.com>"
---
-
-File external table
-
---
-
-# Summary
-
-Allows users to perform SQL queries on files
-
-# Motivation
-
-User data may already exist in other storages, i.g., file systems/s3, etc. in CSV, parquet, JSON format, etc. We can provide users the ability to perform SQL queries on these files.
-
-
-# Details
-
-## Overview
-
-The file external table providers users ability to perform SQL queries on these files.
-
-For example, a user has a CSV file on the local file system `/var/data/city.csv`:
-
-```
-Rank , Name , State , 2023 Population , 2020 Census , Annual Change , Density (mi²)
-1 , New York City , New York , 8,992,908 , 8,804,190 , 0.7% , 29,938
-2 , Los Angeles , California , 3,930,586 , 3,898,747 , 0.27% , 8,382
-3 , Chicago , Illinois , 2,761,625 , 2,746,388 , 0.18% , 12,146
-.....
-```
-
-Then user can create a file external table with:
-
-```sql
-CREATE EXTERNAL TABLE city with(location='/var/data/city.csv', format="CSV", field_delimiter = ',', record_delimiter = '\n', skip_header = 1);
-```
-
-Then query the external table with:
-
-```bash
-MySQL> select * from city;
-```
-
-| Rank | Name          | State      | 2023 Population | 2020 Census | Annual Change | Density (mi²) |
-| :--- | :------------ | :--------- | :-------------- | :---------- | :------------ | :------------ |
-| 1    | New York City | New York   | 8,992,908       | 8,804,190   | 0.7%          | 29,938        |
-| 2    | Los Angeles   | California | 3,930,586       | 3,898,747   | 0.27%         | 8,382         |
-| 3    | Chicago       | Illinois   | 2,761,625       | 2,746,388   | 0.18%         | 12,146        |
-
-Drop the external table, if needs with:
-
-```sql
-DROP EXTERNAL TABLE city
-```
-
-
-### Syntax
-
-```
-CREATE EXTERNAL [<database>.]<table_name>
-[
- (
-    <col_name> <col_type> [NULL | NOT NULL] [COMMENT "<comment>"]
- )
-]
-[ WITH
- (
-     LOCATION = 'url'
-   [,FIELD_DELIMITER =  'delimiter' ]
-   [,RECORD_DELIMITER =  'delimiter' ]
-   [,SKIP_HEADER =  '<number>' ]
-   [,FORMAT =  { csv | json | parquet } ]
-   [,PATTERN = '<regex_pattern>' ]
-   [,ENDPOINT = '<uri>' ]
-   [,ACCESS_KEY_ID = '<key_id>' ]
-   [,SECRET_ACCESS_KEY = '<access_key>' ]
-   [,SESSION_TOKEN = '<token>' ]
-   [,REGION = '<region>' ]
-   [,ENABLE_VIRTUAL_HOST_STYLE = '<boolean>']
-   ..
- )
-]
-```
-
-### Supported File Format
-
-The external file table supports multiple formats; We divide formats into row format and columnar format.
-
-Row formats:
-
- CSV, JSON
-
-Columnar formats:
-
- Parquet
-
-Some of these formats support filter pushdown, and others don't. If users use very large files, that format doesn't support pushdown, which might consume a lot of IO for scanning full files and cause a long running query.
-
-### File Table Engine
-
-![overview](external-table-engine-overview.png)
-
-We implement a file table engine that creates an external table by accepting user-specified file paths and treating all records as immutable.
-
-1. File Format Decoder: decode files to the `RecordBatch` stream.
-2. File Table Engine: implement the `TableProvider` trait, store necessary metadata in memory, and provide scan ability.
-
-Our implementation is better for small files. For large files(i.g., a GB-level CSV file), suggests our users import data to the database.
-
-## Drawbacks
-
- Some formats don't support filter pushdown
- Hard to support indexing
-
-## Life cycle
-
-### Register a table
-
-1. Write metadata to manifest.
-2. Create the table via file table engine.
-3. Register table to `CatalogProvider` and register table to `SystemCatalog`(persist tables to disk).
-
-### Deregister a table (Drop a table)
-
-1. Fetch the target table info (figure out table engine type).
-2. Deregister the target table in `CatalogProvider` and `SystemCatalog`.
-3. Find the target table engine.
-4. Drop the target table.
-
-### Recover a table when restarting
-
-1. Collect tables name and engine type info.
-2. Find the target tables in different engines.
-3. Open and register tables.
-
-# Alternatives
-
-## Using DataFusion API
-
-We can use datafusion API to register a file table:
-
-```rust
-let ctx = SessionContext::new();
-
-ctx.register_csv("example", "tests/data/example.csv", CsvReadOptions::new()).await?;
-
-// create a plan
-let df = ctx.sql("SELECT a, MIN(b) FROM example WHERE a <= b GROUP BY a LIMIT 100").await?;
-```
-
-### Drawbacks
-
-The DataFusion implements its own `Object Store` abstraction and supports parsing the partitioned directories, which can push down the filter and skips some directories. However, this makes it impossible to use our's `LruCacheLayer`(The parsing of the partitioned directories required paths as input). If we want to manage memory entirely, we should implement our own `TableProvider` or `Table`.
-
- Impossible to use `CacheLayer`
-
-## Introduce an intermediate representation layer
-
-![overview](external-table-engine-way-2.png)
-
-We convert all files into `parquet` as an intermediate representation. Then we only need to implement a `parquet` file table engine, and we already have a similar one. Also, it supports limited filter pushdown via the `parquet` row group stats.
-
-### Drawbacks
-
- Computing overhead
- Storage overhead
-
-
-
--- a/1
+++ b/1
@@ -0,0 +1 @@
+nightly-2022-07-14
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +0,0 @@
-[toolchain]
-channel = "nightly-2023-02-26"
--- a/scripts/fetch-dashboard-assets.sh
+++ b/scripts/fetch-dashboard-assets.sh
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-
-# This script is used to download built dashboard assets from the "GreptimeTeam/dashboard" repository.
-
-set -e
-
-declare -r SCRIPT_DIR=$(cd $(dirname ${0}) >/dev/null 2>&1 && pwd)
-declare -r ROOT_DIR=$(dirname ${SCRIPT_DIR})
-declare -r STATIC_DIR="$ROOT_DIR/src/servers/dashboard"
-
-RELEASE_VERSION="$(cat $STATIC_DIR/VERSION)"
-
-# Download the SHA256 checksum attached to the release. To verify the integrity
-# of the download, this checksum will be used to check the download tar file
-# containing the built dashboard assets.
-curl -Ls https://github.com/GreptimeTeam/dashboard/releases/download/$RELEASE_VERSION/sha256.txt --output sha256.txt
-
-# Download the tar file containing the built dashboard assets.
-curl -L https://github.com/GreptimeTeam/dashboard/releases/download/$RELEASE_VERSION/build.tar.gz --output build.tar.gz
-
-# Verify the checksums match; exit if they don't.
-case "$(uname -s)" in
-    FreeBSD | Darwin)
-        echo "$(cat sha256.txt)" | shasum --algorithm 256 --check \
-            || { echo "Checksums did not match for downloaded dashboard assets!"; exit 1; } ;;
-    Linux)
-        echo "$(cat sha256.txt)" | sha256sum --check -- \
-            || { echo "Checksums did not match for downloaded dashboard assets!"; exit 1; } ;;
-    *)
-        echo "The '$(uname -s)' operating system is not supported as a build host for the dashboard" >&2
-        exit 1
-esac
-
-# Extract the assets and clean up.
-tar -xzf build.tar.gz -C "$STATIC_DIR"
-rm sha256.txt
-rm build.tar.gz
-
-echo "Successfully download dashboard assets to $STATIC_DIR"
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -59,5 +59,5 @@ if [ -n "${OS_TYPE}" ] && [ -n "${ARCH_TYPE}" ]; then
        wget "https://github.com/${GITHUB_ORG}/${GITHUB_REPO}/releases/download/${VERSION}/${BIN}-${OS_TYPE}-${ARCH_TYPE}.tgz"
    fi

-    tar xvf ${BIN}-${OS_TYPE}-${ARCH_TYPE}.tgz && rm ${BIN}-${OS_TYPE}-${ARCH_TYPE}.tgz && echo "Run './${BIN} --help' to get started"
+    tar xvf ${BIN}-${OS_TYPE}-${ARCH_TYPE}.tgz && rm ${BIN}-${OS_TYPE}-${ARCH_TYPE}.tgz && echo "Run '${BIN} --help' to get started"
 fi
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@@ -1,19 +1,18 @@
 [package]
 name = "api"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
+version = "0.1.0"
+edition = "2021"
+license = "Apache-2.0"
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-arrow-flight.workspace = true
 common-base = { path = "../common/base" }
 common-error = { path = "../common/error" }
 common-time = { path = "../common/time" }
 datatypes = { path = "../datatypes" }
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "0bebe5f69c91cdfbce85cb8f45f9fcd28185261c" }
-prost.workspace = true
+prost = "0.11"
 snafu = { version = "0.7", features = ["backtraces"] }
-tonic.workspace = true
+tonic = "0.8"

 [build-dependencies]
-tonic-build = "0.9"
+tonic-build = "0.8"
--- a/src/api/build.rs
+++ b/src/api/build.rs
@@ -0,0 +1,34 @@
+// 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::path::PathBuf;
+
+fn main() {
+    let default_out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
+    tonic_build::configure()
+        .file_descriptor_set_path(default_out_dir.join("greptime_fd.bin"))
+        .compile(
+            &[
+                "greptime/v1/select.proto",
+                "greptime/v1/greptime.proto",
+                "greptime/v1/meta/common.proto",
+                "greptime/v1/meta/heartbeat.proto",
+                "greptime/v1/meta/route.proto",
+                "greptime/v1/meta/store.proto",
+                "prometheus/remote/remote.proto",
+            ],
+            &["."],
+        )
+        .expect("compile proto");
+}
--- a/src/api/greptime/v1/admin.proto
+++ b/src/api/greptime/v1/admin.proto
@@ -0,0 +1,85 @@
+syntax = "proto3";
+
+package greptime.v1;
+
+import "greptime/v1/column.proto";
+import "greptime/v1/common.proto";
+
+message AdminRequest {
+  string name = 1;
+  repeated AdminExpr exprs = 2;
+}
+
+message AdminResponse {
+  repeated AdminResult results = 1;
+}
+
+message AdminExpr {
+  ExprHeader header = 1;
+  oneof expr {
+    CreateExpr create = 2;
+    AlterExpr alter = 3;
+    CreateDatabaseExpr create_database = 4;
+    DropTableExpr drop_table = 5;
+  }
+}
+
+message AdminResult {
+  ResultHeader header = 1;
+  oneof result {
+    MutateResult mutate = 2;
+  }
+}
+
+// TODO(hl): rename to CreateTableExpr
+message CreateExpr {
+  optional string catalog_name = 1;
+  optional string schema_name = 2;
+  string table_name = 3;
+  optional string desc = 4;
+  repeated ColumnDef column_defs = 5;
+  string time_index = 6;
+  repeated string primary_keys = 7;
+  bool create_if_not_exists = 8;
+  map<string, string> table_options = 9;
+  optional uint32 table_id = 10;
+  repeated uint32 region_ids = 11;
+}
+
+message AlterExpr {
+  optional string catalog_name = 1;
+  optional string schema_name = 2;
+  string table_name = 3;
+  oneof kind {
+    AddColumns add_columns = 4;
+    DropColumns drop_columns = 5;
+  }
+}
+
+message DropTableExpr {
+  string catalog_name = 1;
+  string schema_name = 2;
+  string table_name = 3;
+}
+
+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;
+}
--- a/src/api/greptime/v1/column.proto
+++ b/src/api/greptime/v1/column.proto
@@ -0,0 +1,85 @@
+syntax = "proto3";
+
+package greptime.v1;
+
+message Column {
+  string column_name = 1;
+
+  enum SemanticType {
+    TAG = 0;
+    FIELD = 1;
+    TIMESTAMP = 2;
+  }
+  SemanticType semantic_type = 2;
+
+  message Values {
+    repeated int32 i8_values = 1;
+    repeated int32 i16_values = 2;
+    repeated int32 i32_values = 3;
+    repeated int64 i64_values = 4;
+
+    repeated uint32 u8_values = 5;
+    repeated uint32 u16_values = 6;
+    repeated uint32 u32_values = 7;
+    repeated uint64 u64_values = 8;
+
+    repeated float f32_values = 9;
+    repeated double f64_values = 10;
+
+    repeated bool bool_values = 11;
+    repeated bytes binary_values = 12;
+    repeated string string_values = 13;
+
+    repeated int32 date_values = 14;
+    repeated int64 datetime_values = 15;
+    repeated int64 ts_second_values = 16;
+    repeated int64 ts_millisecond_values = 17;
+    repeated int64 ts_microsecond_values = 18;
+    repeated int64 ts_nanosecond_values = 19;
+  }
+  // The array of non-null values in this column.
+  //
+  // For example: suppose there is a column "foo" that contains some int32 values (1, 2, 3, 4, 5, null, 7, 8, 9, null);
+  //   column:
+  //     column_name: foo
+  //     semantic_type: Tag
+  //     values: 1, 2, 3, 4, 5, 7, 8, 9
+  //     null_masks: 00100000 00000010
+  Values values = 3;
+
+  // Mask maps the positions of null values.
+  // If a bit in null_mask is 1, it indicates that the column value at that position is null.
+  bytes null_mask = 4;
+
+  // Helpful in creating vector from column.
+  ColumnDataType datatype = 5;
+}
+
+message ColumnDef {
+  string name = 1;
+  ColumnDataType datatype = 2;
+  bool is_nullable = 3;
+  optional bytes default_constraint = 4;
+}
+
+enum ColumnDataType {
+  BOOLEAN = 0;
+  INT8 = 1;
+  INT16 = 2;
+  INT32 = 3;
+  INT64 = 4;
+  UINT8 = 5;
+  UINT16 = 6;
+  UINT32 = 7;
+  UINT64 = 8;
+  FLOAT32 = 9;
+  FLOAT64 = 10;
+  BINARY = 11;
+  STRING = 12;
+  DATE = 13;
+  DATETIME = 14;
+  TIMESTAMP_SECOND = 15;
+  TIMESTAMP_MILLISECOND = 16;
+  TIMESTAMP_MICROSECOND = 17;
+  TIMESTAMP_NANOSECOND = 18;
+}
--- a/src/api/greptime/v1/common.proto
+++ b/src/api/greptime/v1/common.proto
@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package greptime.v1;
+
+message RequestHeader {
+  string tenant = 1;
+}
+
+message ExprHeader {
+  uint32 version = 1;
+}
+
+message ResultHeader {
+  uint32 version = 1;
+  uint32 code = 2;
+  string err_msg = 3;
+}
+
+message MutateResult {
+  uint32 success = 1;
+  uint32 failure = 2;
+}
--- a/src/api/greptime/v1/database.proto
+++ b/src/api/greptime/v1/database.proto
@@ -0,0 +1,66 @@
+syntax = "proto3";
+
+package greptime.v1;
+
+import "greptime/v1/column.proto";
+import "greptime/v1/common.proto";
+
+message DatabaseRequest {
+  string name = 1;
+  repeated ObjectExpr exprs = 2;
+}
+
+message DatabaseResponse {
+  repeated ObjectResult results = 1;
+}
+
+message ObjectExpr {
+  ExprHeader header = 1;
+  oneof expr {
+    InsertExpr insert = 2;
+    SelectExpr select = 3;
+    UpdateExpr update = 4;
+    DeleteExpr delete = 5;
+  }
+}
+
+// TODO(fys): Only support sql now, and will support promql etc in the future
+message SelectExpr {
+  oneof expr {
+    string sql = 1;
+    bytes logical_plan = 2;
+  }
+}
+
+message InsertExpr {
+  string schema_name = 1;
+  string table_name = 2;
+
+  // Data is represented here.
+  repeated Column columns = 3;
+
+  // The row_count of all columns, which include null and non-null values.
+  //
+  // Note: the row_count of all columns in a InsertExpr must be same.
+  uint32 row_count = 4;
+
+  // The region number of current insert request.
+  uint32 region_number = 5;
+}
+
+// TODO(jiachun)
+message UpdateExpr {}
+// TODO(jiachun)
+message DeleteExpr {}
+
+message ObjectResult {
+  ResultHeader header = 1;
+  oneof result {
+    SelectResult select = 2;
+    MutateResult mutate = 3;
+  }
+}
+
+message SelectResult {
+  bytes raw_data = 1;
+}
--- a/src/api/greptime/v1/greptime.proto
+++ b/src/api/greptime/v1/greptime.proto
@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package greptime.v1;
+
+import "greptime/v1/admin.proto";
+import "greptime/v1/common.proto";
+import "greptime/v1/database.proto";
+
+service Greptime {
+  rpc Batch(BatchRequest) returns (BatchResponse) {}
+}
+
+message BatchRequest {
+  RequestHeader header = 1;
+  repeated AdminRequest admins = 2;
+  repeated DatabaseRequest databases = 3;
+}
+
+message BatchResponse {
+  repeated AdminResponse admins = 1;
+  repeated DatabaseResponse databases = 2;
+}
--- a/src/api/greptime/v1/meta/common.proto
+++ b/src/api/greptime/v1/meta/common.proto
@@ -0,0 +1,48 @@
+syntax = "proto3";
+
+package greptime.v1.meta;
+
+message RequestHeader {
+  uint64 protocol_version = 1;
+  // cluster_id is the ID of the cluster which be sent to.
+  uint64 cluster_id = 2;
+  // member_id is the ID of the sender server.
+  uint64 member_id = 3;
+}
+
+message ResponseHeader {
+  uint64 protocol_version = 1;
+  // cluster_id is the ID of the cluster which sent the response.
+  uint64 cluster_id = 2;
+  Error error = 3;
+}
+
+message Error {
+  int32 code = 1;
+  string err_msg = 2;
+}
+
+message Peer {
+  uint64 id = 1;
+  string addr = 2;
+}
+
+message TableName {
+  string catalog_name = 1;
+  string schema_name = 2;
+  string table_name = 3;
+}
+
+message TimeInterval {
+  // The unix timestamp in millis of the start of this period.
+  uint64 start_timestamp_millis = 1;
+  // The unix timestamp in millis of the end of this period.
+  uint64 end_timestamp_millis = 2;
+}
+
+message KeyValue {
+  // key is the key in bytes. An empty key is not allowed.
+  bytes key = 1;
+  // value is the value held by the key, in bytes.
+  bytes value = 2;
+}
--- a/src/api/greptime/v1/meta/heartbeat.proto
+++ b/src/api/greptime/v1/meta/heartbeat.proto
@@ -0,0 +1,92 @@
+syntax = "proto3";
+
+package greptime.v1.meta;
+
+import "greptime/v1/meta/common.proto";
+
+service Heartbeat {
+  // Heartbeat, there may be many contents of the heartbeat, such as:
+  // 1. Metadata to be registered to meta server and discoverable by other nodes.
+  // 2. Some performance metrics, such as Load, CPU usage, etc.
+  // 3. The number of computing tasks being executed.
+  rpc Heartbeat(stream HeartbeatRequest) returns (stream HeartbeatResponse) {}
+
+  // Ask leader's endpoint.
+  rpc AskLeader(AskLeaderRequest) returns (AskLeaderResponse) {}
+}
+
+message HeartbeatRequest {
+  RequestHeader header = 1;
+
+  // Self peer
+  Peer peer = 2;
+  // Leader node
+  bool is_leader = 3;
+  // Actually reported time interval
+  TimeInterval report_interval = 4;
+  // Node stat
+  NodeStat node_stat = 5;
+  // Region stats in this node
+  repeated RegionStat region_stats = 6;
+  // Follower nodes and stats, empty on follower nodes
+  repeated ReplicaStat replica_stats = 7;
+}
+
+message NodeStat {
+  // The read capacity units during this period
+  uint64 rcus = 1;
+  // The write capacity units during this period
+  uint64 wcus = 2;
+  // Table number in this node
+  uint64 table_num = 3;
+  // Region number in this node
+  uint64 region_num = 4;
+
+  double cpu_usage = 5;
+  double load = 6;
+  // Read disk I/O in the node
+  double read_io_rate = 7;
+  // Write disk I/O in the node
+  double write_io_rate = 8;
+
+  // Others
+  map<string, string> attrs = 100;
+}
+
+message RegionStat {
+  uint64 region_id = 1;
+  TableName table_name = 2;
+  // The read capacity units during this period
+  uint64 rcus = 3;
+  // The write capacity units during this period
+  uint64 wcus = 4;
+  // Approximate region size
+  uint64 approximate_size = 5;
+  // Approximate number of rows
+  uint64 approximate_rows = 6;
+
+  // Others
+  map<string, string> attrs = 100;
+}
+
+message ReplicaStat {
+  Peer peer = 1;
+  bool in_sync = 2;
+  bool is_learner = 3;
+}
+
+message HeartbeatResponse {
+  ResponseHeader header = 1;
+
+  repeated bytes payload = 2;
+}
+
+message AskLeaderRequest {
+  RequestHeader header = 1;
+}
+
+message AskLeaderResponse {
+  ResponseHeader header = 1;
+
+  Peer leader = 2;
+}
--- a/src/api/greptime/v1/meta/route.proto
+++ b/src/api/greptime/v1/meta/route.proto
@@ -0,0 +1,98 @@
+syntax = "proto3";
+
+package greptime.v1.meta;
+
+import "greptime/v1/meta/common.proto";
+
+service Router {
+  rpc Create(CreateRequest) returns (RouteResponse) {}
+
+  // Fetch routing information for tables. The smallest unit is the complete
+  // routing information(all regions) of a table.
+  // 
+  // ```text
+  // table_1
+  //    table_name
+  //    table_schema
+  //    regions
+  //      region_1
+  //        leader_peer
+  //        follower_peer_1, follower_peer_2
+  //      region_2
+  //        leader_peer
+  //        follower_peer_1, follower_peer_2, follower_peer_3
+  //      region_xxx
+  // table_2
+  //    ...
+  // ```
+  //
+  rpc Route(RouteRequest) returns (RouteResponse) {}
+
+  rpc Delete(DeleteRequest) returns (RouteResponse) {}
+}
+
+message CreateRequest {
+  RequestHeader header = 1;
+
+  TableName table_name = 2;
+  repeated Partition partitions = 3;
+}
+
+message RouteRequest {
+  RequestHeader header = 1;
+
+  repeated TableName table_names = 2;
+}
+
+message DeleteRequest {
+  RequestHeader header = 1;
+
+  TableName table_name = 2; 
+}
+
+message RouteResponse {
+  ResponseHeader header = 1;
+
+  repeated Peer peers = 2;
+  repeated TableRoute table_routes = 3;
+}
+
+message TableRoute {
+  Table table = 1;
+  repeated RegionRoute region_routes = 2;
+}
+
+message RegionRoute {
+  Region region = 1;
+  // single leader node for write task
+  uint64 leader_peer_index = 2;
+  // multiple follower nodes for read task
+  repeated uint64 follower_peer_indexes = 3;
+}
+
+message Table {
+  uint64 id = 1;
+  TableName table_name = 2;
+  bytes table_schema = 3;
+}
+
+message Region {
+  // TODO(LFC): Maybe use message RegionNumber?
+  uint64 id = 1;
+  string name = 2;
+  Partition partition = 3;
+  
+  map<string, string> attrs = 100;
+}
+
+// PARTITION `region_name` VALUES LESS THAN (value_list)
+message Partition {
+  repeated bytes column_list = 1;
+  repeated bytes value_list = 2;
+}
+
+// This message is only for saving into store.
+message TableRouteValue {
+  repeated Peer peers = 1; 
+  TableRoute table_route = 2;
+}
--- a/src/api/greptime/v1/meta/store.proto
+++ b/src/api/greptime/v1/meta/store.proto
@@ -0,0 +1,159 @@
+syntax = "proto3";
+
+package greptime.v1.meta;
+
+import "greptime/v1/meta/common.proto";
+
+service Store {
+  // Range gets the keys in the range from the key-value store.
+  rpc Range(RangeRequest) returns (RangeResponse);
+
+  // Put puts the given key into the key-value store.
+  rpc Put(PutRequest) returns (PutResponse);
+
+  // BatchPut atomically puts the given keys into the key-value store.
+  rpc BatchPut(BatchPutRequest) returns (BatchPutResponse);
+
+  // CompareAndPut atomically puts the value to the given updated
+  // value if the current value == the expected value.
+  rpc CompareAndPut(CompareAndPutRequest) returns (CompareAndPutResponse);
+
+  // DeleteRange deletes the given range from the key-value store.
+  rpc DeleteRange(DeleteRangeRequest) returns (DeleteRangeResponse);
+
+  // MoveValue atomically renames the key to the given updated key.
+  rpc MoveValue(MoveValueRequest) returns (MoveValueResponse);
+}
+
+message RangeRequest {
+  RequestHeader header = 1;
+
+  // key is the first key for the range, If range_end is not given, the
+  // request only looks up key.
+  bytes key = 2;
+  // range_end is the upper bound on the requested range [key, range_end).
+  // If range_end is '\0', the range is all keys >= key.
+  // If range_end is key plus one (e.g., "aa"+1 == "ab", "a\xff"+1 == "b"),
+  // then the range request gets all keys prefixed with key.
+  // If both key and range_end are '\0', then the range request returns all
+  // keys.
+  bytes range_end = 3;
+  // limit is a limit on the number of keys returned for the request. When
+  // limit is set to 0, it is treated as no limit.
+  int64 limit = 4;
+  // keys_only when set returns only the keys and not the values.
+  bool keys_only = 5;
+}
+
+message RangeResponse {
+  ResponseHeader header = 1;
+  
+  // kvs is the list of key-value pairs matched by the range request.
+  repeated KeyValue kvs = 2;
+  // more indicates if there are more keys to return in the requested range.
+  bool more = 3;
+}
+
+message PutRequest {
+  RequestHeader header = 1;
+
+  // key is the key, in bytes, to put into the key-value store.
+  bytes key = 2;
+  // value is the value, in bytes, to associate with the key in the
+  // key-value store.
+  bytes value = 3;
+  // If prev_kv is set, gets the previous key-value pair before changing it.
+  // The previous key-value pair will be returned in the put response.
+  bool prev_kv = 4;
+}
+
+message PutResponse {
+  ResponseHeader header = 1;
+
+  // If prev_kv is set in the request, the previous key-value pair will be
+  // returned.
+  KeyValue prev_kv = 2;
+}
+
+message BatchPutRequest {
+  RequestHeader header = 1;
+
+  repeated KeyValue kvs = 2;
+  // If prev_kv is set, gets the previous key-value pairs before changing it.
+  // The previous key-value pairs will be returned in the batch put response.
+  bool prev_kv = 3;
+}
+
+message BatchPutResponse {
+  ResponseHeader header = 1;
+
+  // If prev_kv is set in the request, the previous key-value pairs will be
+  // returned.
+  repeated KeyValue prev_kvs = 2;
+}
+
+message CompareAndPutRequest {
+  RequestHeader header = 1;
+
+  // key is the key, in bytes, to put into the key-value store.
+  bytes key = 2;
+  // expect is the previous value, in bytes
+  bytes expect = 3;
+  // value is the value, in bytes, to associate with the key in the
+  // key-value store.
+  bytes value = 4; 
+}
+
+message CompareAndPutResponse {
+  ResponseHeader header = 1;
+
+  bool success = 2;
+  KeyValue prev_kv = 3;
+}
+
+message DeleteRangeRequest {
+  RequestHeader header = 1;
+
+  // key is the first key to delete in the range.
+  bytes key = 2;
+  // range_end is the key following the last key to delete for the range
+  // [key, range_end).
+  // If range_end is not given, the range is defined to contain only the key
+  // argument.
+  // If range_end is one bit larger than the given key, then the range is all
+  // the keys with the prefix (the given key).
+  // If range_end is '\0', the range is all keys greater than or equal to the
+  // key argument.
+  bytes range_end = 3;
+  // If prev_kv is set, gets the previous key-value pairs before deleting it.
+  // The previous key-value pairs will be returned in the delete response.
+  bool prev_kv = 4;
+}
+
+message DeleteRangeResponse {
+  ResponseHeader header = 1;
+
+  // deleted is the number of keys deleted by the delete range request.
+  int64 deleted = 2;
+  // If prev_kv is set in the request, the previous key-value pairs will be
+  // returned.
+  repeated KeyValue prev_kvs = 3;
+}
+
+message MoveValueRequest {
+  RequestHeader header = 1;
+
+  // If from_key dose not exist, return the value of to_key (if it exists).
+  // If from_key exists, move the value of from_key to to_key (i.e. rename),
+  // and return the value.
+  bytes from_key = 2;
+  bytes to_key = 3;
+}
+
+message MoveValueResponse {
+  ResponseHeader header = 1;
+
+  // If from_key dose not exist, return the value of to_key (if it exists).
+  // If from_key exists, return the value of from_key.
+  KeyValue kv = 2;
+}
--- a/src/api/greptime/v1/select.proto
+++ b/src/api/greptime/v1/select.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package greptime.v1.codec;
+
+import "greptime/v1/column.proto";
+
+message SelectResult {
+  repeated Column columns = 1;
+  uint32 row_count = 2;
+}
--- a/src/api/prometheus/remote/remote.proto
+++ b/src/api/prometheus/remote/remote.proto
@@ -0,0 +1,85 @@
+// Copyright 2016 Prometheus 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.
+
+syntax = "proto3";
+package prometheus;
+
+option go_package = "prompb";
+
+import "prometheus/remote/types.proto";
+
+message WriteRequest {
+  repeated prometheus.TimeSeries timeseries = 1;
+  // Cortex uses this field to determine the source of the write request.
+  // We reserve it to avoid any compatibility issues.
+  reserved  2;
+  repeated prometheus.MetricMetadata metadata = 3;
+}
+
+// ReadRequest represents a remote read request.
+message ReadRequest {
+  repeated Query queries = 1;
+
+  enum ResponseType {
+    // Server will return a single ReadResponse message with matched series that includes list of raw samples.
+    // It's recommended to use streamed response types instead.
+    //
+    // Response headers:
+    // Content-Type: "application/x-protobuf"
+    // Content-Encoding: "snappy"
+    SAMPLES = 0;
+    // Server will stream a delimited ChunkedReadResponse message that contains XOR encoded chunks for a single series.
+    // Each message is following varint size and fixed size bigendian uint32 for CRC32 Castagnoli checksum.
+    //
+    // Response headers:
+    // Content-Type: "application/x-streamed-protobuf; proto=prometheus.ChunkedReadResponse"
+    // Content-Encoding: ""
+    STREAMED_XOR_CHUNKS = 1;
+  }
+
+  // accepted_response_types allows negotiating the content type of the response.
+  //
+  // Response types are taken from the list in the FIFO order. If no response type in `accepted_response_types` is
+  // implemented by server, error is returned.
+  // For request that do not contain `accepted_response_types` field the SAMPLES response type will be used.
+  repeated ResponseType accepted_response_types = 2;
+}
+
+// ReadResponse is a response when response_type equals SAMPLES.
+message ReadResponse {
+  // In same order as the request's queries.
+  repeated QueryResult results = 1;
+}
+
+message Query {
+  int64 start_timestamp_ms = 1;
+  int64 end_timestamp_ms = 2;
+  repeated prometheus.LabelMatcher matchers = 3;
+  prometheus.ReadHints hints = 4;
+}
+
+message QueryResult {
+  // Samples within a time series must be ordered by time.
+  repeated prometheus.TimeSeries timeseries = 1;
+}
+
+// ChunkedReadResponse is a response when response_type equals STREAMED_XOR_CHUNKS.
+// We strictly stream full series after series, optionally split by time. This means that a single frame can contain
+// partition of the single series, but once a new series is started to be streamed it means that no more chunks will
+// be sent for previous one. Series are returned sorted in the same way TSDB block are internally.
+message ChunkedReadResponse {
+  repeated prometheus.ChunkedSeries chunked_series = 1;
+
+  // query_index represents an index of the query from ReadRequest.queries these chunks relates to.
+  int64 query_index = 2;
+}
--- a/src/api/prometheus/remote/types.proto
+++ b/src/api/prometheus/remote/types.proto
@@ -0,0 +1,117 @@
+// Copyright 2017 Prometheus 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.
+
+syntax = "proto3";
+package prometheus;
+
+option go_package = "prompb";
+
+message MetricMetadata {
+  enum MetricType {
+    UNKNOWN        = 0;
+    COUNTER        = 1;
+    GAUGE          = 2;
+    HISTOGRAM      = 3;
+    GAUGEHISTOGRAM = 4;
+    SUMMARY        = 5;
+    INFO           = 6;
+    STATESET       = 7;
+  }
+
+  // Represents the metric type, these match the set from Prometheus.
+  // Refer to model/textparse/interface.go for details.
+  MetricType type = 1;
+  string metric_family_name = 2;
+  string help = 4;
+  string unit = 5;
+}
+
+message Sample {
+  double value    = 1;
+  // timestamp is in ms format, see model/timestamp/timestamp.go for
+  // conversion from time.Time to Prometheus timestamp.
+  int64 timestamp = 2;
+}
+
+message Exemplar {
+  // Optional, can be empty.
+  repeated Label labels = 1;
+  double value = 2;
+  // timestamp is in ms format, see model/timestamp/timestamp.go for
+  // conversion from time.Time to Prometheus timestamp.
+  int64 timestamp = 3;
+}
+
+// TimeSeries represents samples and labels for a single time series.
+message TimeSeries {
+  // For a timeseries to be valid, and for the samples and exemplars
+  // to be ingested by the remote system properly, the labels field is required.
+  repeated Label labels   = 1;
+  repeated Sample samples = 2;
+  repeated Exemplar exemplars = 3;
+}
+
+message Label {
+  string name  = 1;
+  string value = 2;
+}
+
+message Labels {
+  repeated Label labels = 1;
+}
+
+// Matcher specifies a rule, which can match or set of labels or not.
+message LabelMatcher {
+  enum Type {
+    EQ  = 0;
+    NEQ = 1;
+    RE  = 2;
+    NRE = 3;
+  }
+  Type type    = 1;
+  string name  = 2;
+  string value = 3;
+}
+
+message ReadHints {
+  int64 step_ms = 1;  // Query step size in milliseconds.
+  string func = 2;    // String representation of surrounding function or aggregation.
+  int64 start_ms = 3; // Start time in milliseconds.
+  int64 end_ms = 4;   // End time in milliseconds.
+  repeated string grouping = 5; // List of label names used in aggregation.
+  bool by = 6; // Indicate whether it is without or by.
+  int64 range_ms = 7; // Range vector selector range in milliseconds.
+}
+
+// Chunk represents a TSDB chunk.
+// Time range [min, max] is inclusive.
+message Chunk {
+  int64 min_time_ms = 1;
+  int64 max_time_ms = 2;
+
+  // We require this to match chunkenc.Encoding.
+  enum Encoding {
+    UNKNOWN = 0;
+    XOR     = 1;
+  }
+  Encoding type  = 3;
+  bytes data     = 4;
+}
+
+// ChunkedSeries represents single, encoded time series.
+message ChunkedSeries {
+  // Labels should be sorted.
+  repeated Label labels = 1;
+  // Chunks will be in start time order and may overlap.
+  repeated Chunk chunks = 2;
+}
--- a/src/api/src/error.rs
+++ b/src/api/src/error.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -18,7 +18,7 @@ use common_error::ext::ErrorExt;
 use common_error::prelude::StatusCode;
 use datatypes::prelude::ConcreteDataType;
 use snafu::prelude::*;
-use snafu::Location;
+use snafu::{Backtrace, ErrorCompat};

 pub type Result<T> = std::result::Result<T, Error>;

@@ -26,12 +26,12 @@ pub type Result<T> = std::result::Result<T, Error>;
 #[snafu(visibility(pub))]
 pub enum Error {
    #[snafu(display("Unknown proto column datatype: {}", datatype))]
-    UnknownColumnDataType { datatype: i32, location: Location },
+    UnknownColumnDataType { datatype: i32, backtrace: Backtrace },

    #[snafu(display("Failed to create column datatype from {:?}", from))]
    IntoColumnDataType {
        from: ConcreteDataType,
-        location: Location,
+        backtrace: Backtrace,
    },

    #[snafu(display(
@@ -66,6 +66,9 @@ impl ErrorExt for Error {
            | Error::InvalidColumnDefaultConstraint { source, .. } => source.status_code(),
        }
    }
+    fn backtrace_opt(&self) -> Option<&Backtrace> {
+        ErrorCompat::backtrace(self)
+    }

    fn as_any(&self) -> &dyn Any {
        self
--- a/src/api/src/helper.rs
+++ b/src/api/src/helper.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -97,9 +97,7 @@ impl TryFrom<ConcreteDataType> for ColumnDataTypeWrapper {
                TimestampType::Microsecond(_) => ColumnDataType::TimestampMicrosecond,
                TimestampType::Nanosecond(_) => ColumnDataType::TimestampNanosecond,
            },
-            ConcreteDataType::Null(_)
-            | ConcreteDataType::List(_)
-            | ConcreteDataType::Dictionary(_) => {
+            ConcreteDataType::Null(_) | ConcreteDataType::List(_) => {
                return error::IntoColumnDataTypeSnafu { from: datatype }.fail()
            }
        });
@@ -107,121 +105,125 @@ impl TryFrom<ConcreteDataType> for ColumnDataTypeWrapper {
    }
 }

-pub fn values_with_capacity(datatype: ColumnDataType, capacity: usize) -> Values {
-    match datatype {
-        ColumnDataType::Boolean => Values {
-            bool_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Int8 => Values {
-            i8_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Int16 => Values {
-            i16_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Int32 => Values {
-            i32_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Int64 => Values {
-            i64_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Uint8 => Values {
-            u8_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Uint16 => Values {
-            u16_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Uint32 => Values {
-            u32_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Uint64 => Values {
-            u64_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Float32 => Values {
-            f32_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Float64 => Values {
-            f64_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Binary => Values {
-            binary_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::String => Values {
-            string_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Date => Values {
-            date_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::Datetime => Values {
-            datetime_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::TimestampSecond => Values {
-            ts_second_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::TimestampMillisecond => Values {
-            ts_millisecond_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::TimestampMicrosecond => Values {
-            ts_microsecond_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
-        ColumnDataType::TimestampNanosecond => Values {
-            ts_nanosecond_values: Vec::with_capacity(capacity),
-            ..Default::default()
-        },
+impl Values {
+    pub fn with_capacity(datatype: ColumnDataType, capacity: usize) -> Self {
+        match datatype {
+            ColumnDataType::Boolean => Values {
+                bool_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Int8 => Values {
+                i8_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Int16 => Values {
+                i16_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Int32 => Values {
+                i32_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Int64 => Values {
+                i64_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Uint8 => Values {
+                u8_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Uint16 => Values {
+                u16_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Uint32 => Values {
+                u32_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Uint64 => Values {
+                u64_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Float32 => Values {
+                f32_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Float64 => Values {
+                f64_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Binary => Values {
+                binary_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::String => Values {
+                string_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Date => Values {
+                date_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::Datetime => Values {
+                datetime_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::TimestampSecond => Values {
+                ts_second_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::TimestampMillisecond => Values {
+                ts_millisecond_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::TimestampMicrosecond => Values {
+                ts_microsecond_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+            ColumnDataType::TimestampNanosecond => Values {
+                ts_nanosecond_values: Vec::with_capacity(capacity),
+                ..Default::default()
+            },
+        }
    }
 }

-// The type of vals must be same.
-pub fn push_vals(column: &mut Column, origin_count: usize, vector: VectorRef) {
-    let values = column.values.get_or_insert_with(Values::default);
-    let mut null_mask = BitVec::from_slice(&column.null_mask);
-    let len = vector.len();
-    null_mask.reserve_exact(origin_count + len);
-    null_mask.extend(BitVec::repeat(false, len));
+impl Column {
+    // The type of vals must be same.
+    pub fn push_vals(&mut self, origin_count: usize, vector: VectorRef) {
+        let values = self.values.get_or_insert_with(Values::default);
+        let mut null_mask = BitVec::from_slice(&self.null_mask);
+        let len = vector.len();
+        null_mask.reserve_exact(origin_count + len);
+        null_mask.extend(BitVec::repeat(false, len));

-    (0..len).for_each(|idx| match vector.get(idx) {
-        Value::Null => null_mask.set(idx + origin_count, true),
-        Value::Boolean(val) => values.bool_values.push(val),
-        Value::UInt8(val) => values.u8_values.push(val.into()),
-        Value::UInt16(val) => values.u16_values.push(val.into()),
-        Value::UInt32(val) => values.u32_values.push(val),
-        Value::UInt64(val) => values.u64_values.push(val),
-        Value::Int8(val) => values.i8_values.push(val.into()),
-        Value::Int16(val) => values.i16_values.push(val.into()),
-        Value::Int32(val) => values.i32_values.push(val),
-        Value::Int64(val) => values.i64_values.push(val),
-        Value::Float32(val) => values.f32_values.push(*val),
-        Value::Float64(val) => values.f64_values.push(*val),
-        Value::String(val) => values.string_values.push(val.as_utf8().to_string()),
-        Value::Binary(val) => values.binary_values.push(val.to_vec()),
-        Value::Date(val) => values.date_values.push(val.val()),
-        Value::DateTime(val) => values.datetime_values.push(val.val()),
-        Value::Timestamp(val) => match val.unit() {
-            TimeUnit::Second => values.ts_second_values.push(val.value()),
-            TimeUnit::Millisecond => values.ts_millisecond_values.push(val.value()),
-            TimeUnit::Microsecond => values.ts_microsecond_values.push(val.value()),
-            TimeUnit::Nanosecond => values.ts_nanosecond_values.push(val.value()),
-        },
-        Value::List(_) => unreachable!(),
-    });
-    column.null_mask = null_mask.into_vec();
+        (0..len).into_iter().for_each(|idx| match vector.get(idx) {
+            Value::Null => null_mask.set(idx + origin_count, true),
+            Value::Boolean(val) => values.bool_values.push(val),
+            Value::UInt8(val) => values.u8_values.push(val.into()),
+            Value::UInt16(val) => values.u16_values.push(val.into()),
+            Value::UInt32(val) => values.u32_values.push(val),
+            Value::UInt64(val) => values.u64_values.push(val),
+            Value::Int8(val) => values.i8_values.push(val.into()),
+            Value::Int16(val) => values.i16_values.push(val.into()),
+            Value::Int32(val) => values.i32_values.push(val),
+            Value::Int64(val) => values.i64_values.push(val),
+            Value::Float32(val) => values.f32_values.push(*val),
+            Value::Float64(val) => values.f64_values.push(*val),
+            Value::String(val) => values.string_values.push(val.as_utf8().to_string()),
+            Value::Binary(val) => values.binary_values.push(val.to_vec()),
+            Value::Date(val) => values.date_values.push(val.val()),
+            Value::DateTime(val) => values.datetime_values.push(val.val()),
+            Value::Timestamp(val) => match val.unit() {
+                TimeUnit::Second => values.ts_second_values.push(val.value()),
+                TimeUnit::Millisecond => values.ts_millisecond_values.push(val.value()),
+                TimeUnit::Microsecond => values.ts_microsecond_values.push(val.value()),
+                TimeUnit::Nanosecond => values.ts_nanosecond_values.push(val.value()),
+            },
+            Value::List(_) => unreachable!(),
+        });
+        self.null_mask = null_mask.into_vec();
+    }
 }

 #[cfg(test)]
@@ -237,59 +239,59 @@ mod tests {

    #[test]
    fn test_values_with_capacity() {
-        let values = values_with_capacity(ColumnDataType::Int8, 2);
+        let values = Values::with_capacity(ColumnDataType::Int8, 2);
        let values = values.i8_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Int32, 2);
+        let values = Values::with_capacity(ColumnDataType::Int32, 2);
        let values = values.i32_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Int64, 2);
+        let values = Values::with_capacity(ColumnDataType::Int64, 2);
        let values = values.i64_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Uint8, 2);
+        let values = Values::with_capacity(ColumnDataType::Uint8, 2);
        let values = values.u8_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Uint32, 2);
+        let values = Values::with_capacity(ColumnDataType::Uint32, 2);
        let values = values.u32_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Uint64, 2);
+        let values = Values::with_capacity(ColumnDataType::Uint64, 2);
        let values = values.u64_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Float32, 2);
+        let values = Values::with_capacity(ColumnDataType::Float32, 2);
        let values = values.f32_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Float64, 2);
+        let values = Values::with_capacity(ColumnDataType::Float64, 2);
        let values = values.f64_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Binary, 2);
+        let values = Values::with_capacity(ColumnDataType::Binary, 2);
        let values = values.binary_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Boolean, 2);
+        let values = Values::with_capacity(ColumnDataType::Boolean, 2);
        let values = values.bool_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::String, 2);
+        let values = Values::with_capacity(ColumnDataType::String, 2);
        let values = values.string_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Date, 2);
+        let values = Values::with_capacity(ColumnDataType::Date, 2);
        let values = values.date_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::Datetime, 2);
+        let values = Values::with_capacity(ColumnDataType::Datetime, 2);
        let values = values.datetime_values;
        assert_eq!(2, values.capacity());

-        let values = values_with_capacity(ColumnDataType::TimestampMillisecond, 2);
+        let values = Values::with_capacity(ColumnDataType::TimestampMillisecond, 2);
        let values = values.ts_millisecond_values;
        assert_eq!(2, values.capacity());
    }
@@ -460,28 +462,28 @@ mod tests {
        };

        let vector = Arc::new(TimestampNanosecondVector::from_vec(vec![1, 2, 3]));
-        push_vals(&mut column, 3, vector);
+        column.push_vals(3, vector);
        assert_eq!(
            vec![1, 2, 3],
            column.values.as_ref().unwrap().ts_nanosecond_values
        );

        let vector = Arc::new(TimestampMillisecondVector::from_vec(vec![4, 5, 6]));
-        push_vals(&mut column, 3, vector);
+        column.push_vals(3, vector);
        assert_eq!(
            vec![4, 5, 6],
            column.values.as_ref().unwrap().ts_millisecond_values
        );

        let vector = Arc::new(TimestampMicrosecondVector::from_vec(vec![7, 8, 9]));
-        push_vals(&mut column, 3, vector);
+        column.push_vals(3, vector);
        assert_eq!(
            vec![7, 8, 9],
            column.values.as_ref().unwrap().ts_microsecond_values
        );

        let vector = Arc::new(TimestampSecondVector::from_vec(vec![10, 11, 12]));
-        push_vals(&mut column, 3, vector);
+        column.push_vals(3, vector);
        assert_eq!(
            vec![10, 11, 12],
            column.values.as_ref().unwrap().ts_second_values
@@ -505,7 +507,7 @@ mod tests {
        let row_count = 4;

        let vector = Arc::new(BooleanVector::from(vec![Some(true), None, Some(false)]));
-        push_vals(&mut column, row_count, vector);
+        column.push_vals(row_count, vector);
        // Some(false), None, Some(true), Some(true), Some(true), None, Some(false)
        let bool_values = column.values.unwrap().bool_values;
        assert_eq!(vec![false, true, true, true, false], bool_values);
--- a/src/api/src/lib.rs
+++ b/src/api/src/lib.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -14,13 +14,9 @@

 pub mod error;
 pub mod helper;
-
-pub mod prometheus {
-    pub mod remote {
-        pub use greptime_proto::prometheus::remote::*;
-    }
-}
-
+pub mod prometheus;
+pub mod result;
+pub mod serde;
 pub mod v1;

 pub use prost::DecodeError;
--- a/src/api/src/prometheus.rs
+++ b/src/api/src/prometheus.rs
@@ -0,0 +1,19 @@
+// 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.
+
+#![allow(clippy::derive_partial_eq_without_eq)]
+
+pub mod remote {
+    tonic::include_proto!("prometheus");
+}
--- a/src/api/src/result.rs
+++ b/src/api/src/result.rs
@@ -0,0 +1,203 @@
+// 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 common_error::prelude::ErrorExt;
+
+use crate::v1::codec::SelectResult;
+use crate::v1::{
+    admin_result, object_result, AdminResult, MutateResult, ObjectResult, ResultHeader,
+    SelectResult as SelectResultRaw,
+};
+
+pub const PROTOCOL_VERSION: u32 = 1;
+
+pub type Success = u32;
+pub type Failure = u32;
+
+#[derive(Default)]
+pub struct ObjectResultBuilder {
+    version: u32,
+    code: u32,
+    err_msg: Option<String>,
+    result: Option<Body>,
+}
+
+pub enum Body {
+    Mutate((Success, Failure)),
+    Select(SelectResult),
+}
+
+impl ObjectResultBuilder {
+    pub fn new() -> Self {
+        Self {
+            version: PROTOCOL_VERSION,
+            ..Default::default()
+        }
+    }
+
+    #[allow(dead_code)]
+    pub fn version(mut self, version: u32) -> Self {
+        self.version = version;
+        self
+    }
+
+    pub fn status_code(mut self, code: u32) -> Self {
+        self.code = code;
+        self
+    }
+
+    pub fn err_msg(mut self, err_msg: String) -> Self {
+        self.err_msg = Some(err_msg);
+        self
+    }
+
+    pub fn mutate_result(mut self, success: u32, failure: u32) -> Self {
+        self.result = Some(Body::Mutate((success, failure)));
+        self
+    }
+
+    pub fn select_result(mut self, select_result: SelectResult) -> Self {
+        self.result = Some(Body::Select(select_result));
+        self
+    }
+
+    pub fn build(self) -> ObjectResult {
+        let header = Some(ResultHeader {
+            version: self.version,
+            code: self.code,
+            err_msg: self.err_msg.unwrap_or_default(),
+        });
+
+        let result = match self.result {
+            Some(Body::Mutate((success, failure))) => {
+                Some(object_result::Result::Mutate(MutateResult {
+                    success,
+                    failure,
+                }))
+            }
+            Some(Body::Select(select)) => Some(object_result::Result::Select(SelectResultRaw {
+                raw_data: select.into(),
+            })),
+            None => None,
+        };
+
+        ObjectResult { header, result }
+    }
+}
+
+pub fn build_err_result(err: &impl ErrorExt) -> ObjectResult {
+    ObjectResultBuilder::new()
+        .status_code(err.status_code() as u32)
+        .err_msg(err.to_string())
+        .build()
+}
+
+#[derive(Debug)]
+pub struct AdminResultBuilder {
+    version: u32,
+    code: u32,
+    err_msg: Option<String>,
+    mutate: Option<(Success, Failure)>,
+}
+
+impl AdminResultBuilder {
+    pub fn status_code(mut self, code: u32) -> Self {
+        self.code = code;
+        self
+    }
+
+    pub fn err_msg(mut self, err_msg: String) -> Self {
+        self.err_msg = Some(err_msg);
+        self
+    }
+
+    pub fn mutate_result(mut self, success: u32, failure: u32) -> Self {
+        self.mutate = Some((success, failure));
+        self
+    }
+
+    pub fn build(self) -> AdminResult {
+        let header = Some(ResultHeader {
+            version: self.version,
+            code: self.code,
+            err_msg: self.err_msg.unwrap_or_default(),
+        });
+
+        let result = if let Some((success, failure)) = self.mutate {
+            Some(admin_result::Result::Mutate(MutateResult {
+                success,
+                failure,
+            }))
+        } else {
+            None
+        };
+
+        AdminResult { header, result }
+    }
+}
+
+impl Default for AdminResultBuilder {
+    fn default() -> Self {
+        Self {
+            version: PROTOCOL_VERSION,
+            code: 0,
+            err_msg: None,
+            mutate: None,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use common_error::status_code::StatusCode;
+
+    use super::*;
+    use crate::error::UnknownColumnDataTypeSnafu;
+    use crate::v1::{object_result, MutateResult};
+
+    #[test]
+    fn test_object_result_builder() {
+        let obj_result = ObjectResultBuilder::new()
+            .version(101)
+            .status_code(500)
+            .err_msg("Failed to read this file!".to_string())
+            .mutate_result(100, 20)
+            .build();
+        let header = obj_result.header.unwrap();
+        assert_eq!(101, header.version);
+        assert_eq!(500, header.code);
+        assert_eq!("Failed to read this file!", header.err_msg);
+
+        let result = obj_result.result.unwrap();
+        assert_eq!(
+            object_result::Result::Mutate(MutateResult {
+                success: 100,
+                failure: 20,
+            }),
+            result
+        );
+    }
+
+    #[test]
+    fn test_build_err_result() {
+        let err = UnknownColumnDataTypeSnafu { datatype: 1 }.build();
+        let err_result = build_err_result(&err);
+        let header = err_result.header.unwrap();
+        let result = err_result.result;
+
+        assert_eq!(PROTOCOL_VERSION, header.version);
+        assert_eq!(StatusCode::InvalidArguments as u32, header.code);
+        assert!(result.is_none());
+    }
+}
--- a/src/api/src/serde.rs
+++ b/src/api/src/serde.rs
@@ -0,0 +1,115 @@
+// 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.
+
+pub use prost::DecodeError;
+use prost::Message;
+
+use crate::v1::codec::SelectResult;
+use crate::v1::meta::TableRouteValue;
+
+macro_rules! impl_convert_with_bytes {
+    ($data_type: ty) => {
+        impl From<$data_type> for Vec<u8> {
+            fn from(entity: $data_type) -> Self {
+                entity.encode_to_vec()
+            }
+        }
+
+        impl TryFrom<&[u8]> for $data_type {
+            type Error = DecodeError;
+
+            fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+                <$data_type>::decode(value.as_ref())
+            }
+        }
+    };
+}
+
+impl_convert_with_bytes!(SelectResult);
+impl_convert_with_bytes!(TableRouteValue);
+
+#[cfg(test)]
+mod tests {
+    use std::ops::Deref;
+
+    use crate::v1::codec::*;
+    use crate::v1::{column, Column};
+
+    const SEMANTIC_TAG: i32 = 0;
+
+    #[test]
+    fn test_convert_select_result() {
+        let select_result = mock_select_result();
+
+        let bytes: Vec<u8> = select_result.into();
+        let result: SelectResult = bytes.deref().try_into().unwrap();
+
+        assert_eq!(8, result.row_count);
+        assert_eq!(1, result.columns.len());
+
+        let column = &result.columns[0];
+        assert_eq!("foo", column.column_name);
+        assert_eq!(SEMANTIC_TAG, column.semantic_type);
+        assert_eq!(vec![1], column.null_mask);
+        assert_eq!(
+            vec![2, 3, 4, 5, 6, 7, 8],
+            column.values.as_ref().unwrap().i32_values
+        );
+    }
+
+    #[should_panic]
+    #[test]
+    fn test_convert_select_result_wrong() {
+        let select_result = mock_select_result();
+
+        let mut bytes: Vec<u8> = select_result.into();
+
+        // modify some bytes
+        bytes[0] = 0b1;
+        bytes[1] = 0b1;
+
+        let result: SelectResult = bytes.deref().try_into().unwrap();
+
+        assert_eq!(8, result.row_count);
+        assert_eq!(1, result.columns.len());
+
+        let column = &result.columns[0];
+        assert_eq!("foo", column.column_name);
+        assert_eq!(SEMANTIC_TAG, column.semantic_type);
+        assert_eq!(vec![1], column.null_mask);
+        assert_eq!(
+            vec![2, 3, 4, 5, 6, 7, 8],
+            column.values.as_ref().unwrap().i32_values
+        );
+    }
+
+    fn mock_select_result() -> SelectResult {
+        let values = column::Values {
+            i32_values: vec![2, 3, 4, 5, 6, 7, 8],
+            ..Default::default()
+        };
+        let null_mask = vec![1];
+        let column = Column {
+            column_name: "foo".to_string(),
+            semantic_type: SEMANTIC_TAG,
+            values: Some(values),
+            null_mask,
+            ..Default::default()
+        };
+        SelectResult {
+            columns: vec![column],
+            row_count: 8,
+        }
+    }
+}
--- a/src/api/src/v1.rs
+++ b/src/api/src/v1.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -12,10 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-pub mod column_def;
+#![allow(clippy::derive_partial_eq_without_eq)]
+tonic::include_proto!("greptime.v1");

-pub mod meta {
-    pub use greptime_proto::v1::meta::*;
+pub const GREPTIME_FD_SET: &[u8] = tonic::include_file_descriptor_set!("greptime_fd");
+
+pub mod codec {
+    tonic::include_proto!("greptime.v1.codec");
 }

-pub use greptime_proto::v1::*;
+mod column_def;
+pub mod meta;
--- a/src/api/src/v1/column_def.rs
+++ b/src/api/src/v1/column_def.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -19,24 +19,20 @@ use crate::error::{self, Result};
 use crate::helper::ColumnDataTypeWrapper;
 use crate::v1::ColumnDef;

-pub fn try_as_column_schema(column_def: &ColumnDef) -> Result<ColumnSchema> {
-    let data_type = ColumnDataTypeWrapper::try_new(column_def.datatype)?;
+impl ColumnDef {
+    pub fn try_as_column_schema(&self) -> Result<ColumnSchema> {
+        let data_type = ColumnDataTypeWrapper::try_new(self.datatype)?;

-    let constraint = if column_def.default_constraint.is_empty() {
-        None
-    } else {
-        Some(
-            ColumnDefaultConstraint::try_from(column_def.default_constraint.as_slice()).context(
-                error::ConvertColumnDefaultConstraintSnafu {
-                    column: &column_def.name,
-                },
-            )?,
-        )
-    };
+        let constraint = match &self.default_constraint {
+            None => None,
+            Some(v) => Some(
+                ColumnDefaultConstraint::try_from(&v[..])
+                    .context(error::ConvertColumnDefaultConstraintSnafu { column: &self.name })?,
+            ),
+        };

-    ColumnSchema::new(&column_def.name, data_type.into(), column_def.is_nullable)
-        .with_default_constraint(constraint)
-        .context(error::InvalidColumnDefaultConstraintSnafu {
-            column: &column_def.name,
-        })
+        ColumnSchema::new(&self.name, data_type.into(), self.is_nullable)
+            .with_default_constraint(constraint)
+            .context(error::InvalidColumnDefaultConstraintSnafu { column: &self.name })
+    }
 }
--- a/src/api/src/v1/meta.rs
+++ b/src/api/src/v1/meta.rs
@@ -0,0 +1,209 @@
+// 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.
+
+tonic::include_proto!("greptime.v1.meta");
+
+use std::collections::HashMap;
+use std::hash::{Hash, Hasher};
+
+pub const PROTOCOL_VERSION: u64 = 1;
+
+#[derive(Default)]
+pub struct PeerDict {
+    peers: HashMap<Peer, usize>,
+    index: usize,
+}
+
+impl PeerDict {
+    pub fn get_or_insert(&mut self, peer: Peer) -> usize {
+        let index = self.peers.entry(peer).or_insert_with(|| {
+            let v = self.index;
+            self.index += 1;
+            v
+        });
+
+        *index
+    }
+
+    pub fn into_peers(self) -> Vec<Peer> {
+        let mut array = vec![Peer::default(); self.index];
+        for (p, i) in self.peers {
+            array[i] = p;
+        }
+        array
+    }
+}
+
+#[allow(clippy::derive_hash_xor_eq)]
+impl Hash for Peer {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.id.hash(state);
+        self.addr.hash(state);
+    }
+}
+
+impl Eq for Peer {}
+
+impl RequestHeader {
+    #[inline]
+    pub fn new((cluster_id, member_id): (u64, u64)) -> Self {
+        Self {
+            protocol_version: PROTOCOL_VERSION,
+            cluster_id,
+            member_id,
+        }
+    }
+}
+
+impl ResponseHeader {
+    #[inline]
+    pub fn success(cluster_id: u64) -> Self {
+        Self {
+            protocol_version: PROTOCOL_VERSION,
+            cluster_id,
+            ..Default::default()
+        }
+    }
+
+    #[inline]
+    pub fn failed(cluster_id: u64, error: Error) -> Self {
+        Self {
+            protocol_version: PROTOCOL_VERSION,
+            cluster_id,
+            error: Some(error),
+        }
+    }
+
+    #[inline]
+    pub fn is_not_leader(&self) -> bool {
+        if let Some(error) = &self.error {
+            if error.code == ErrorCode::NotLeader as i32 {
+                return true;
+            }
+        }
+        false
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ErrorCode {
+    NoActiveDatanodes = 1,
+    NotLeader = 2,
+}
+
+impl Error {
+    #[inline]
+    pub fn no_active_datanodes() -> Self {
+        Self {
+            code: ErrorCode::NoActiveDatanodes as i32,
+            err_msg: "No active datanodes".to_string(),
+        }
+    }
+
+    #[inline]
+    pub fn is_not_leader() -> Self {
+        Self {
+            code: ErrorCode::NotLeader as i32,
+            err_msg: "Current server is not leader".to_string(),
+        }
+    }
+}
+
+impl HeartbeatResponse {
+    #[inline]
+    pub fn is_not_leader(&self) -> bool {
+        if let Some(header) = &self.header {
+            return header.is_not_leader();
+        }
+        false
+    }
+}
+
+macro_rules! gen_set_header {
+    ($req: ty) => {
+        impl $req {
+            #[inline]
+            pub fn set_header(&mut self, (cluster_id, member_id): (u64, u64)) {
+                self.header = Some(RequestHeader::new((cluster_id, member_id)));
+            }
+        }
+    };
+}
+
+gen_set_header!(HeartbeatRequest);
+gen_set_header!(RouteRequest);
+gen_set_header!(CreateRequest);
+gen_set_header!(RangeRequest);
+gen_set_header!(DeleteRequest);
+gen_set_header!(PutRequest);
+gen_set_header!(BatchPutRequest);
+gen_set_header!(CompareAndPutRequest);
+gen_set_header!(DeleteRangeRequest);
+gen_set_header!(MoveValueRequest);
+
+#[cfg(test)]
+mod tests {
+    use std::vec;
+
+    use super::*;
+
+    #[test]
+    fn test_peer_dict() {
+        let mut dict = PeerDict::default();
+
+        dict.get_or_insert(Peer {
+            id: 1,
+            addr: "111".to_string(),
+        });
+        dict.get_or_insert(Peer {
+            id: 2,
+            addr: "222".to_string(),
+        });
+        dict.get_or_insert(Peer {
+            id: 1,
+            addr: "111".to_string(),
+        });
+        dict.get_or_insert(Peer {
+            id: 1,
+            addr: "111".to_string(),
+        });
+        dict.get_or_insert(Peer {
+            id: 1,
+            addr: "111".to_string(),
+        });
+        dict.get_or_insert(Peer {
+            id: 1,
+            addr: "111".to_string(),
+        });
+        dict.get_or_insert(Peer {
+            id: 2,
+            addr: "222".to_string(),
+        });
+
+        assert_eq!(2, dict.index);
+        assert_eq!(
+            vec![
+                Peer {
+                    id: 1,
+                    addr: "111".to_string(),
+                },
+                Peer {
+                    id: 2,
+                    addr: "222".to_string(),
+                }
+            ],
+            dict.into_peers()
+        );
+    }
+}
--- a/src/catalog/Cargo.toml
+++ b/src/catalog/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "catalog"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
+version = "0.1.0"
+edition = "2021"
+license = "Apache-2.0"
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
 api = { path = "../api" }
 arc-swap = "1.0"
-arrow-schema.workspace = true
-async-stream.workspace = true
+async-stream = "0.3"
 async-trait = "0.1"
 backoff = { version = "0.4", features = ["tokio"] }
 common-catalog = { path = "../common/catalog" }
@@ -19,28 +19,25 @@ common-recordbatch = { path = "../common/recordbatch" }
 common-runtime = { path = "../common/runtime" }
 common-telemetry = { path = "../common/telemetry" }
 common-time = { path = "../common/time" }
-dashmap = "5.4"
-datafusion.workspace = true
+datafusion = "14.0.0"
 datatypes = { path = "../datatypes" }
 futures = "0.3"
-futures-util.workspace = true
+futures-util = "0.3"
 lazy_static = "1.4"
 meta-client = { path = "../meta-client" }
-parking_lot = "0.12"
 regex = "1.6"
 serde = "1.0"
 serde_json = "1.0"
-session = { path = "../session" }
 snafu = { version = "0.7", features = ["backtraces"] }
 storage = { path = "../storage" }
 table = { path = "../table" }
-tokio.workspace = true
+tokio = { version = "1.18", features = ["full"] }

 [dev-dependencies]
-common-test-util = { path = "../common/test-util" }
-chrono.workspace = true
+chrono = "0.4"
 log-store = { path = "../log-store" }
 mito = { path = "../mito", features = ["test"] }
 object-store = { path = "../object-store" }
 storage = { path = "../storage" }
-tokio.workspace = true
+tempdir = "0.3"
+tokio = { version = "1.0", features = ["full"] }
--- a/src/catalog/src/error.rs
+++ b/src/catalog/src/error.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -13,15 +13,13 @@
 // limitations under the License.

 use std::any::Any;
-use std::fmt::Debug;

 use common_error::ext::{BoxedError, ErrorExt};
 use common_error::prelude::{Snafu, StatusCode};
 use datafusion::error::DataFusionError;
 use datatypes::prelude::ConcreteDataType;
-use snafu::Location;
-
-use crate::DeregisterTableRequest;
+use datatypes::schema::RawSchema;
+use snafu::{Backtrace, ErrorCompat};

 #[derive(Debug, Snafu)]
 #[snafu(visibility(pub))]
@@ -50,7 +48,7 @@ pub enum Error {
    },

    #[snafu(display("System catalog is not valid: {}", msg))]
-    SystemCatalog { msg: String, location: Location },
+    SystemCatalog { msg: String, backtrace: Backtrace },

    #[snafu(display(
        "System catalog table type mismatch, expected: binary, found: {:?}",
@@ -58,68 +56,63 @@ pub enum Error {
    ))]
    SystemCatalogTypeMismatch {
        data_type: ConcreteDataType,
-        location: Location,
+        backtrace: Backtrace,
    },

    #[snafu(display("Invalid system catalog entry type: {:?}", entry_type))]
    InvalidEntryType {
        entry_type: Option<u8>,
-        location: Location,
+        backtrace: Backtrace,
    },

    #[snafu(display("Invalid system catalog key: {:?}", key))]
    InvalidKey {
        key: Option<String>,
-        location: Location,
+        backtrace: Backtrace,
    },

    #[snafu(display("Catalog value is not present"))]
-    EmptyValue { location: Location },
+    EmptyValue { backtrace: Backtrace },

    #[snafu(display("Failed to deserialize value, source: {}", source))]
    ValueDeserialize {
        source: serde_json::error::Error,
-        location: Location,
-    },
-
-    #[snafu(display("Table engine not found: {}, source: {}", engine_name, source))]
-    TableEngineNotFound {
-        engine_name: String,
-        #[snafu(backtrace)]
-        source: table::error::Error,
+        backtrace: Backtrace,
    },

    #[snafu(display("Cannot find catalog by name: {}", catalog_name))]
    CatalogNotFound {
        catalog_name: String,
-        location: Location,
+        backtrace: Backtrace,
    },

-    #[snafu(display("Cannot find schema {} in catalog {}", schema, catalog))]
+    #[snafu(display("Cannot find schema, schema info: {}", schema_info))]
    SchemaNotFound {
-        catalog: String,
-        schema: String,
-        location: Location,
+        schema_info: String,
+        backtrace: Backtrace,
    },

    #[snafu(display("Table `{}` already exists", table))]
-    TableExists { table: String, location: Location },
-
-    #[snafu(display("Table `{}` not exist", table))]
-    TableNotExist { table: String, location: Location },
+    TableExists { table: String, backtrace: Backtrace },

    #[snafu(display("Schema {} already exists", schema))]
-    SchemaExists { schema: String, location: Location },
+    SchemaExists {
+        schema: String,
+        backtrace: Backtrace,
+    },
+
+    #[snafu(display("Failed to register table"))]
+    RegisterTable {
+        #[snafu(backtrace)]
+        source: BoxedError,
+    },

    #[snafu(display("Operation {} not implemented yet", operation))]
    Unimplemented {
        operation: String,
-        location: Location,
+        backtrace: Backtrace,
    },

-    #[snafu(display("Operation {} not supported", op))]
-    NotSupported { op: String, location: Location },
-
    #[snafu(display("Failed to open table, table info: {}, source: {}", table_info, source))]
    OpenTable {
        table_info: String,
@@ -130,7 +123,7 @@ pub enum Error {
    #[snafu(display("Table not found while opening table, table info: {}", table_info))]
    TableNotFound {
        table_info: String,
-        location: Location,
+        backtrace: Backtrace,
    },

    #[snafu(display("Failed to read system catalog table records"))]
@@ -139,12 +132,6 @@ pub enum Error {
        source: common_recordbatch::error::Error,
    },

-    #[snafu(display("Failed to create recordbatch, source: {}", source))]
-    CreateRecordBatch {
-        #[snafu(backtrace)]
-        source: common_recordbatch::error::Error,
-    },
-
    #[snafu(display(
        "Failed to insert table creation record to system catalog, source: {}",
        source
@@ -154,19 +141,8 @@ pub enum Error {
        source: table::error::Error,
    },

-    #[snafu(display(
-        "Failed to deregister table, request: {:?}, source: {}",
-        request,
-        source
-    ))]
-    DeregisterTable {
-        request: DeregisterTableRequest,
-        #[snafu(backtrace)]
-        source: table::error::Error,
-    },
-
    #[snafu(display("Illegal catalog manager state: {}", msg))]
-    IllegalManagerState { location: Location, msg: String },
+    IllegalManagerState { backtrace: Backtrace, msg: String },

    #[snafu(display("Failed to scan system catalog table, source: {}", source))]
    SystemCatalogTableScan {
@@ -174,16 +150,17 @@ pub enum Error {
        source: table::error::Error,
    },

-    #[snafu(display("Failure during SchemaProvider operation, source: {}", source))]
-    SchemaProviderOperation {
+    #[snafu(display(
+        "Invalid table schema in catalog entry, table:{}, schema: {:?}, source: {}",
+        table_info,
+        schema,
+        source
+    ))]
+    InvalidTableSchema {
+        table_info: String,
+        schema: RawSchema,
        #[snafu(backtrace)]
-        source: BoxedError,
-    },
-
-    #[snafu(display("{source}"))]
-    Internal {
-        #[snafu(backtrace)]
-        source: BoxedError,
+        source: datatypes::error::Error,
    },

    #[snafu(display("Failed to execute system catalog table scan, source: {}", source))]
@@ -197,6 +174,15 @@ pub enum Error {
        source: common_catalog::error::Error,
    },

+    #[snafu(display("IO error occurred while fetching catalog info, source: {}", source))]
+    Io {
+        backtrace: Backtrace,
+        source: std::io::Error,
+    },
+
+    #[snafu(display("Local and remote catalog data are inconsistent, msg: {}", msg))]
+    CatalogStateInconsistent { msg: String, backtrace: Backtrace },
+
    #[snafu(display("Failed to perform metasrv operation, source: {}", source))]
    MetaSrv {
        #[snafu(backtrace)]
@@ -209,44 +195,10 @@ pub enum Error {
        source: datatypes::error::Error,
    },

-    #[snafu(display("Failed to serialize or deserialize catalog entry: {}", source))]
-    CatalogEntrySerde {
+    #[snafu(display("Catalog internal error: {}", source))]
+    Internal {
        #[snafu(backtrace)]
-        source: common_catalog::error::Error,
-    },
-
-    #[snafu(display("Illegal access to catalog: {} and schema: {}", catalog, schema))]
-    QueryAccessDenied { catalog: String, schema: String },
-
-    #[snafu(display(
-        "Failed to get region stats, catalog: {}, schema: {}, table: {}, source: {}",
-        catalog,
-        schema,
-        table,
-        source
-    ))]
-    RegionStats {
-        catalog: String,
-        schema: String,
-        table: String,
-        #[snafu(backtrace)]
-        source: table::error::Error,
-    },
-
-    #[snafu(display("Invalid system table definition: {err_msg}"))]
-    InvalidSystemTableDef { err_msg: String, location: Location },
-
-    #[snafu(display("{}: {}", msg, source))]
-    Datafusion {
-        msg: String,
-        source: DataFusionError,
-        location: Location,
-    },
-
-    #[snafu(display("Table schema mismatch, source: {}", source))]
-    TableSchemaMismatch {
-        #[snafu(backtrace)]
-        source: table::error::Error,
+        source: BoxedError,
    },
 }

@@ -261,50 +213,43 @@ impl ErrorExt for Error {
            | Error::IllegalManagerState { .. }
            | Error::CatalogNotFound { .. }
            | Error::InvalidEntryType { .. }
-            | Error::InvalidSystemTableDef { .. } => StatusCode::Unexpected,
+            | Error::CatalogStateInconsistent { .. } => StatusCode::Unexpected,

            Error::SystemCatalog { .. }
            | Error::EmptyValue { .. }
-            | Error::ValueDeserialize { .. } => StatusCode::StorageUnavailable,
+            | Error::ValueDeserialize { .. }
+            | Error::Io { .. } => StatusCode::StorageUnavailable,

-            Error::SystemCatalogTypeMismatch { .. } => StatusCode::Internal,
+            Error::RegisterTable { .. } | Error::SystemCatalogTypeMismatch { .. } => {
+                StatusCode::Internal
+            }

-            Error::ReadSystemCatalog { source, .. } | Error::CreateRecordBatch { source } => {
-                source.status_code()
-            }
-            Error::InvalidCatalogValue { source, .. } | Error::CatalogEntrySerde { source } => {
-                source.status_code()
-            }
+            Error::ReadSystemCatalog { source, .. } => source.status_code(),
+            Error::InvalidCatalogValue { source, .. } => source.status_code(),

            Error::TableExists { .. } => StatusCode::TableAlreadyExists,
-            Error::TableNotExist { .. } => StatusCode::TableNotFound,
-            Error::SchemaExists { .. } | Error::TableEngineNotFound { .. } => {
-                StatusCode::InvalidArguments
-            }
+            Error::SchemaExists { .. } => StatusCode::InvalidArguments,

            Error::OpenSystemCatalog { source, .. }
            | Error::CreateSystemCatalog { source, .. }
            | Error::InsertCatalogRecord { source, .. }
            | Error::OpenTable { source, .. }
-            | Error::CreateTable { source, .. }
-            | Error::DeregisterTable { source, .. }
-            | Error::RegionStats { source, .. }
-            | Error::TableSchemaMismatch { source } => source.status_code(),
-
+            | Error::CreateTable { source, .. } => source.status_code(),
            Error::MetaSrv { source, .. } => source.status_code(),
            Error::SystemCatalogTableScan { source } => source.status_code(),
            Error::SystemCatalogTableScanExec { source } => source.status_code(),
-            Error::InvalidTableInfoInCatalog { source } => source.status_code(),
-            Error::SchemaProviderOperation { source } | Error::Internal { source } => {
-                source.status_code()
-            }
+            Error::InvalidTableSchema { source, .. } => source.status_code(),
+            Error::InvalidTableInfoInCatalog { .. } => StatusCode::Unexpected,
+            Error::Internal { source, .. } => source.status_code(),

-            Error::Unimplemented { .. } | Error::NotSupported { .. } => StatusCode::Unsupported,
-            Error::QueryAccessDenied { .. } => StatusCode::AccessDenied,
-            Error::Datafusion { .. } => StatusCode::EngineExecuteQuery,
+            Error::Unimplemented { .. } => StatusCode::Unsupported,
        }
    }

+    fn backtrace_opt(&self) -> Option<&Backtrace> {
+        ErrorCompat::backtrace(self)
+    }
+
    fn as_any(&self) -> &dyn Any {
        self
    }
@@ -318,6 +263,7 @@ impl From<Error> for DataFusionError {

 #[cfg(test)]
 mod tests {
+    use common_error::mock::MockError;
    use snafu::GenerateImplicitData;

    use super::*;
@@ -328,7 +274,7 @@ mod tests {
            StatusCode::TableAlreadyExists,
            Error::TableExists {
                table: "some_table".to_string(),
-                location: Location::generate(),
+                backtrace: Backtrace::generate(),
            }
            .status_code()
        );
@@ -338,11 +284,27 @@ mod tests {
            InvalidKeySnafu { key: None }.build().status_code()
        );

+        assert_eq!(
+            StatusCode::StorageUnavailable,
+            Error::OpenSystemCatalog {
+                source: table::error::Error::new(MockError::new(StatusCode::StorageUnavailable))
+            }
+            .status_code()
+        );
+
+        assert_eq!(
+            StatusCode::StorageUnavailable,
+            Error::CreateSystemCatalog {
+                source: table::error::Error::new(MockError::new(StatusCode::StorageUnavailable))
+            }
+            .status_code()
+        );
+
        assert_eq!(
            StatusCode::StorageUnavailable,
            Error::SystemCatalog {
                msg: "".to_string(),
-                location: Location::generate(),
+                backtrace: Backtrace::generate(),
            }
            .status_code()
        );
@@ -351,7 +313,7 @@ mod tests {
            StatusCode::Internal,
            Error::SystemCatalogTypeMismatch {
                data_type: ConcreteDataType::binary_datatype(),
-                location: Location::generate(),
+                backtrace: Backtrace::generate(),
            }
            .status_code()
        );
@@ -365,7 +327,7 @@ mod tests {
    pub fn test_errors_to_datafusion_error() {
        let e: DataFusionError = Error::TableExists {
            table: "test_table".to_string(),
-            location: Location::generate(),
+            backtrace: Backtrace::generate(),
        }
        .into();
        match e {
--- a/src/catalog/src/helper.rs
+++ b/src/catalog/src/helper.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -24,47 +24,57 @@ use serde::{Deserialize, Serialize, Serializer};
 use snafu::{ensure, OptionExt, ResultExt};
 use table::metadata::{RawTableInfo, TableId, TableVersion};

-pub const CATALOG_KEY_PREFIX: &str = "__c";
-pub const SCHEMA_KEY_PREFIX: &str = "__s";
-pub const TABLE_GLOBAL_KEY_PREFIX: &str = "__tg";
-pub const TABLE_REGIONAL_KEY_PREFIX: &str = "__tr";
+const CATALOG_KEY_PREFIX: &str = "__c";
+const SCHEMA_KEY_PREFIX: &str = "__s";
+const TABLE_GLOBAL_KEY_PREFIX: &str = "__tg";
+const TABLE_REGIONAL_KEY_PREFIX: &str = "__tr";

 const ALPHANUMERICS_NAME_PATTERN: &str = "[a-zA-Z_][a-zA-Z0-9_]*";

 lazy_static! {
    static ref CATALOG_KEY_PATTERN: Regex = Regex::new(&format!(
-        "^{CATALOG_KEY_PREFIX}-({ALPHANUMERICS_NAME_PATTERN})$"
+        "^{}-({})$",
+        CATALOG_KEY_PREFIX, ALPHANUMERICS_NAME_PATTERN
    ))
    .unwrap();
 }

 lazy_static! {
    static ref SCHEMA_KEY_PATTERN: Regex = Regex::new(&format!(
-        "^{SCHEMA_KEY_PREFIX}-({ALPHANUMERICS_NAME_PATTERN})-({ALPHANUMERICS_NAME_PATTERN})$"
+        "^{}-({})-({})$",
+        SCHEMA_KEY_PREFIX, ALPHANUMERICS_NAME_PATTERN, ALPHANUMERICS_NAME_PATTERN
    ))
    .unwrap();
 }

 lazy_static! {
    static ref TABLE_GLOBAL_KEY_PATTERN: Regex = Regex::new(&format!(
-        "^{TABLE_GLOBAL_KEY_PREFIX}-({ALPHANUMERICS_NAME_PATTERN})-({ALPHANUMERICS_NAME_PATTERN})-({ALPHANUMERICS_NAME_PATTERN})$"
+        "^{}-({})-({})-({})$",
+        TABLE_GLOBAL_KEY_PREFIX,
+        ALPHANUMERICS_NAME_PATTERN,
+        ALPHANUMERICS_NAME_PATTERN,
+        ALPHANUMERICS_NAME_PATTERN
    ))
    .unwrap();
 }

 lazy_static! {
    static ref TABLE_REGIONAL_KEY_PATTERN: Regex = Regex::new(&format!(
-        "^{TABLE_REGIONAL_KEY_PREFIX}-({ALPHANUMERICS_NAME_PATTERN})-({ALPHANUMERICS_NAME_PATTERN})-({ALPHANUMERICS_NAME_PATTERN})-([0-9]+)$"
+        "^{}-({})-({})-({})-([0-9]+)$",
+        TABLE_REGIONAL_KEY_PREFIX,
+        ALPHANUMERICS_NAME_PATTERN,
+        ALPHANUMERICS_NAME_PATTERN,
+        ALPHANUMERICS_NAME_PATTERN
    ))
    .unwrap();
 }

 pub fn build_catalog_prefix() -> String {
-    format!("{CATALOG_KEY_PREFIX}-")
+    format!("{}-", CATALOG_KEY_PREFIX)
 }

 pub fn build_schema_prefix(catalog_name: impl AsRef<str>) -> String {
-    format!("{SCHEMA_KEY_PREFIX}-{}-", catalog_name.as_ref())
+    format!("{}-{}-", SCHEMA_KEY_PREFIX, catalog_name.as_ref())
 }

 pub fn build_table_global_prefix(
@@ -72,7 +82,8 @@ pub fn build_table_global_prefix(
    schema_name: impl AsRef<str>,
 ) -> String {
    format!(
-        "{TABLE_GLOBAL_KEY_PREFIX}-{}-{}-",
+        "{}-{}-{}-",
+        TABLE_GLOBAL_KEY_PREFIX,
        catalog_name.as_ref(),
        schema_name.as_ref()
    )
@@ -91,7 +102,6 @@ pub fn build_table_regional_prefix(
 }

 /// Table global info has only one key across all datanodes so it does not have `node_id` field.
-#[derive(Clone)]
 pub struct TableGlobalKey {
    pub catalog_name: String,
    pub schema_name: String,
@@ -132,6 +142,7 @@ impl TableGlobalKey {
 pub struct TableGlobalValue {
    /// 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>>,
    pub table_info: RawTableInfo,
@@ -367,13 +378,7 @@ mod tests {
            table_info,
        };
        let serialized = serde_json::to_string(&value).unwrap();
-        let deserialized = TableGlobalValue::parse(serialized).unwrap();
+        let deserialized = TableGlobalValue::parse(&serialized).unwrap();
        assert_eq!(value, deserialized);
    }
-
-    #[test]
-    fn test_table_global_value_compatibility() {
-        let s = r#"{"node_id":1,"regions_id_map":{"1":[0]},"table_info":{"ident":{"table_id":1098,"version":1},"name":"container_cpu_limit","desc":"Created on insertion","catalog_name":"greptime","schema_name":"dd","meta":{"schema":{"column_schemas":[{"name":"container_id","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"container_name","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"docker_image","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"host","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"image_name","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"image_tag","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"interval","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"runtime","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"short_image","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"type","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"dd_value","data_type":{"Float64":{}},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"ts","data_type":{"Timestamp":{"Millisecond":null}},"is_nullable":false,"is_time_index":true,"default_constraint":null,"metadata":{"greptime:time_index":"true"}},{"name":"git.repository_url","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}}],"timestamp_index":11,"version":1},"primary_key_indices":[0,1,2,3,4,5,6,7,8,9,12],"value_indices":[10,11],"engine":"mito","next_column_id":12,"region_numbers":[],"engine_options":{},"options":{},"created_on":"1970-01-01T00:00:00Z"},"table_type":"Base"}}"#;
-        TableGlobalValue::parse(s).unwrap();
-    }
 }
--- a/src/catalog/src/information_schema.rs
+++ b/src/catalog/src/information_schema.rs
@@ -1,80 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-mod tables;
-
-use std::any::Any;
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use datafusion::datasource::streaming::{PartitionStream, StreamingTable};
-use snafu::ResultExt;
-use table::table::adapter::TableAdapter;
-use table::TableRef;
-
-use crate::error::{DatafusionSnafu, Result, TableSchemaMismatchSnafu};
-use crate::information_schema::tables::InformationSchemaTables;
-use crate::{CatalogProviderRef, SchemaProvider};
-
-const TABLES: &str = "tables";
-
-pub(crate) struct InformationSchemaProvider {
-    catalog_name: String,
-    catalog_provider: CatalogProviderRef,
-}
-
-impl InformationSchemaProvider {
-    pub(crate) fn new(catalog_name: String, catalog_provider: CatalogProviderRef) -> Self {
-        Self {
-            catalog_name,
-            catalog_provider,
-        }
-    }
-}
-
-#[async_trait]
-impl SchemaProvider for InformationSchemaProvider {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn table_names(&self) -> Result<Vec<String>> {
-        Ok(vec![TABLES.to_string()])
-    }
-
-    async fn table(&self, name: &str) -> Result<Option<TableRef>> {
-        let table = if name.eq_ignore_ascii_case(TABLES) {
-            Arc::new(InformationSchemaTables::new(
-                self.catalog_name.clone(),
-                self.catalog_provider.clone(),
-            ))
-        } else {
-            return Ok(None);
-        };
-
-        let table = Arc::new(
-            StreamingTable::try_new(table.schema().clone(), vec![table]).with_context(|_| {
-                DatafusionSnafu {
-                    msg: format!("Failed to get InformationSchema table '{name}'"),
-                }
-            })?,
-        );
-        let table = TableAdapter::new(table).context(TableSchemaMismatchSnafu)?;
-        Ok(Some(Arc::new(table)))
-    }
-
-    fn table_exist(&self, name: &str) -> Result<bool> {
-        Ok(matches!(name.to_ascii_lowercase().as_str(), TABLES))
-    }
-}
--- a/src/catalog/src/information_schema/tables.rs
+++ b/src/catalog/src/information_schema/tables.rs
@@ -1,165 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::sync::Arc;
-
-use arrow_schema::SchemaRef as ArrowSchemaRef;
-use common_catalog::consts::INFORMATION_SCHEMA_NAME;
-use common_query::physical_plan::TaskContext;
-use common_recordbatch::RecordBatch;
-use datafusion::datasource::streaming::PartitionStream as DfPartitionStream;
-use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
-use datatypes::prelude::{ConcreteDataType, ScalarVectorBuilder, VectorRef};
-use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
-use datatypes::vectors::StringVectorBuilder;
-use snafu::ResultExt;
-use table::metadata::TableType;
-
-use crate::error::{CreateRecordBatchSnafu, Result};
-use crate::information_schema::TABLES;
-use crate::CatalogProviderRef;
-
-pub(super) struct InformationSchemaTables {
-    schema: SchemaRef,
-    catalog_name: String,
-    catalog_provider: CatalogProviderRef,
-}
-
-impl InformationSchemaTables {
-    pub(super) fn new(catalog_name: String, catalog_provider: CatalogProviderRef) -> Self {
-        let schema = Arc::new(Schema::new(vec![
-            ColumnSchema::new("table_catalog", ConcreteDataType::string_datatype(), false),
-            ColumnSchema::new("table_schema", ConcreteDataType::string_datatype(), false),
-            ColumnSchema::new("table_name", ConcreteDataType::string_datatype(), false),
-            ColumnSchema::new("table_type", ConcreteDataType::string_datatype(), false),
-        ]));
-        Self {
-            schema,
-            catalog_name,
-            catalog_provider,
-        }
-    }
-
-    fn builder(&self) -> InformationSchemaTablesBuilder {
-        InformationSchemaTablesBuilder::new(
-            self.schema.clone(),
-            self.catalog_name.clone(),
-            self.catalog_provider.clone(),
-        )
-    }
-}
-
-/// Builds the `information_schema.TABLE` table row by row
-///
-/// Columns are based on <https://www.postgresql.org/docs/current/infoschema-columns.html>
-struct InformationSchemaTablesBuilder {
-    schema: SchemaRef,
-    catalog_name: String,
-    catalog_provider: CatalogProviderRef,
-
-    catalog_names: StringVectorBuilder,
-    schema_names: StringVectorBuilder,
-    table_names: StringVectorBuilder,
-    table_types: StringVectorBuilder,
-}
-
-impl InformationSchemaTablesBuilder {
-    fn new(schema: SchemaRef, catalog_name: String, catalog_provider: CatalogProviderRef) -> Self {
-        Self {
-            schema,
-            catalog_name,
-            catalog_provider,
-            catalog_names: StringVectorBuilder::with_capacity(42),
-            schema_names: StringVectorBuilder::with_capacity(42),
-            table_names: StringVectorBuilder::with_capacity(42),
-            table_types: StringVectorBuilder::with_capacity(42),
-        }
-    }
-
-    /// Construct the `information_schema.tables` virtual table
-    async fn make_tables(&mut self) -> Result<RecordBatch> {
-        let catalog_name = self.catalog_name.clone();
-
-        for schema_name in self.catalog_provider.schema_names()? {
-            if schema_name == INFORMATION_SCHEMA_NAME {
-                continue;
-            }
-
-            let Some(schema) = self.catalog_provider.schema(&schema_name)? else { continue };
-            for table_name in schema.table_names()? {
-                let Some(table) = schema.table(&table_name).await? else { continue };
-                self.add_table(&catalog_name, &schema_name, &table_name, table.table_type());
-            }
-        }
-
-        // Add a final list for the information schema tables themselves
-        self.add_table(
-            &catalog_name,
-            INFORMATION_SCHEMA_NAME,
-            TABLES,
-            TableType::View,
-        );
-
-        self.finish()
-    }
-
-    fn add_table(
-        &mut self,
-        catalog_name: &str,
-        schema_name: &str,
-        table_name: &str,
-        table_type: TableType,
-    ) {
-        self.catalog_names.push(Some(catalog_name));
-        self.schema_names.push(Some(schema_name));
-        self.table_names.push(Some(table_name));
-        self.table_types.push(Some(match table_type {
-            TableType::Base => "BASE TABLE",
-            TableType::View => "VIEW",
-            TableType::Temporary => "LOCAL TEMPORARY",
-        }));
-    }
-
-    fn finish(&mut self) -> Result<RecordBatch> {
-        let columns: Vec<VectorRef> = vec![
-            Arc::new(self.catalog_names.finish()),
-            Arc::new(self.schema_names.finish()),
-            Arc::new(self.table_names.finish()),
-            Arc::new(self.table_types.finish()),
-        ];
-        RecordBatch::new(self.schema.clone(), columns).context(CreateRecordBatchSnafu)
-    }
-}
-
-impl DfPartitionStream for InformationSchemaTables {
-    fn schema(&self) -> &ArrowSchemaRef {
-        self.schema.arrow_schema()
-    }
-
-    fn execute(&self, _: Arc<TaskContext>) -> DfSendableRecordBatchStream {
-        let schema = self.schema().clone();
-        let mut builder = self.builder();
-        Box::pin(DfRecordBatchStreamAdapter::new(
-            schema,
-            futures::stream::once(async move {
-                builder
-                    .make_tables()
-                    .await
-                    .map(|x| x.into_df_record_batch())
-                    .map_err(Into::into)
-            }),
-        ))
-    }
-}
--- a/src/catalog/src/lib.rs
+++ b/src/catalog/src/lib.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -18,8 +18,7 @@ use std::any::Any;
 use std::fmt::{Debug, Formatter};
 use std::sync::Arc;

-use api::v1::meta::{RegionStat, TableName};
-use common_telemetry::{info, warn};
+use common_telemetry::info;
 use snafu::ResultExt;
 use table::engine::{EngineContext, TableEngineRef};
 use table::metadata::TableId;
@@ -29,15 +28,12 @@ use table::TableRef;
 use crate::error::{CreateTableSnafu, Result};
 pub use crate::schema::{SchemaProvider, SchemaProviderRef};

-pub mod datafusion;
 pub mod error;
 pub mod helper;
-pub(crate) mod information_schema;
 pub mod local;
 pub mod remote;
 pub mod schema;
 pub mod system;
-pub mod table_source;
 pub mod tables;

 /// Represent a list of named catalogs
@@ -101,9 +97,6 @@ pub trait CatalogManager: CatalogList {
    /// schema registered.
    async fn register_schema(&self, request: RegisterSchemaRequest) -> Result<bool>;

-    /// Rename a table to [RenameTableRequest::new_table_name], returns whether the table is renamed.
-    async fn rename_table(&self, request: RenameTableRequest) -> Result<bool>;
-
    /// Register a system table, should be called before starting the manager.
    async fn register_system_table(&self, request: RegisterSystemTableRequest)
        -> error::Result<()>;
@@ -111,12 +104,7 @@ pub trait CatalogManager: CatalogList {
    fn schema(&self, catalog: &str, schema: &str) -> Result<Option<SchemaProviderRef>>;

    /// Returns the table by catalog, schema and table name.
-    async fn table(
-        &self,
-        catalog: &str,
-        schema: &str,
-        table_name: &str,
-    ) -> Result<Option<TableRef>>;
+    fn table(&self, catalog: &str, schema: &str, table_name: &str) -> Result<Option<TableRef>>;
 }

 pub type CatalogManagerRef = Arc<dyn CatalogManager>;
@@ -154,16 +142,7 @@ impl Debug for RegisterTableRequest {
    }
 }

-#[derive(Debug, Clone)]
-pub struct RenameTableRequest {
-    pub catalog: String,
-    pub schema: String,
-    pub table_name: String,
-    pub new_table_name: String,
-    pub table_id: TableId,
-}
-
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct DeregisterTableRequest {
    pub catalog: String,
    pub schema: String,
@@ -176,6 +155,11 @@ pub struct RegisterSchemaRequest {
    pub schema: String,
 }

+/// Formats table fully-qualified name
+pub fn format_full_table_name(catalog: &str, schema: &str, table: &str) -> String {
+    format!("{}.{}.{}", catalog, schema, table)
+}
+
 pub trait CatalogProviderFactory {
    fn create(&self, catalog_name: String) -> CatalogProviderRef;
 }
@@ -195,18 +179,16 @@ pub(crate) async fn handle_system_table_request<'a, M: CatalogManager>(
        let table_name = &req.create_table_request.table_name;
        let table_id = req.create_table_request.id;

-        let table = manager.table(catalog_name, schema_name, table_name).await?;
-        let table = if let Some(table) = table {
+        let table = if let Some(table) = manager.table(catalog_name, schema_name, table_name)? {
            table
        } else {
            let table = engine
                .create_table(&EngineContext::default(), req.create_table_request.clone())
                .await
                .with_context(|_| CreateTableSnafu {
-                    table_info: common_catalog::format_full_table_name(
-                        catalog_name,
-                        schema_name,
-                        table_name,
+                    table_info: format!(
+                        "{}.{}.{}, id: {}",
+                        catalog_name, schema_name, table_name, table_id,
                    ),
                })?;
            manager
@@ -218,7 +200,7 @@ pub(crate) async fn handle_system_table_request<'a, M: CatalogManager>(
                    table: table.clone(),
                })
                .await?;
-            info!("Created and registered system table: {table_name}");
+            info!("Created and registered system table: {}", table_name);
            table
        };
        if let Some(hook) = req.open_hook {
@@ -227,53 +209,3 @@ pub(crate) async fn handle_system_table_request<'a, M: CatalogManager>(
    }
    Ok(())
 }
-
-/// The stat of regions in the datanode node.
-/// The number of regions can be got from len of vec.
-///
-/// Ignores any errors occurred during iterating regions. The intention of this method is to
-/// collect region stats that will be carried in Datanode's heartbeat to Metasrv, so it's a
-/// "try our best" job.
-pub async fn datanode_stat(catalog_manager: &CatalogManagerRef) -> (u64, Vec<RegionStat>) {
-    let mut region_number: u64 = 0;
-    let mut region_stats = Vec::new();
-
-    let Ok(catalog_names) = catalog_manager.catalog_names() else { return (region_number, region_stats) };
-    for catalog_name in catalog_names {
-        let Ok(Some(catalog)) = catalog_manager.catalog(&catalog_name) else { continue };
-
-        let Ok(schema_names) = catalog.schema_names() else { continue };
-        for schema_name in schema_names {
-            let Ok(Some(schema)) = catalog.schema(&schema_name) else { continue };
-
-            let Ok(table_names) = schema.table_names() else { continue };
-            for table_name in table_names {
-                let Ok(Some(table)) = schema.table(&table_name).await else { continue };
-
-                let region_numbers = &table.table_info().meta.region_numbers;
-                region_number += region_numbers.len() as u64;
-
-                match table.region_stats() {
-                    Ok(stats) => {
-                        let stats = stats.into_iter().map(|stat| RegionStat {
-                            region_id: stat.region_id,
-                            table_name: Some(TableName {
-                                catalog_name: catalog_name.clone(),
-                                schema_name: schema_name.clone(),
-                                table_name: table_name.clone(),
-                            }),
-                            approximate_bytes: stat.disk_usage_bytes as i64,
-                            ..Default::default()
-                        });
-
-                        region_stats.extend(stats);
-                    }
-                    Err(e) => {
-                        warn!("Failed to get region status, err: {:?}", e);
-                    }
-                };
-            }
-        }
-    }
-    (region_number, region_stats)
-}
--- a/src/catalog/src/local.rs
+++ b/src/catalog/src/local.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
--- a/src/catalog/src/local/manager.rs
+++ b/src/catalog/src/local/manager.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -18,17 +18,15 @@ use std::sync::Arc;

 use common_catalog::consts::{
    DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, INFORMATION_SCHEMA_NAME, MIN_USER_TABLE_ID,
-    MITO_ENGINE, SYSTEM_CATALOG_NAME, SYSTEM_CATALOG_TABLE_NAME,
+    SYSTEM_CATALOG_NAME, SYSTEM_CATALOG_TABLE_NAME,
 };
-use common_catalog::format_full_table_name;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use common_telemetry::{error, info};
 use datatypes::prelude::ScalarVector;
 use datatypes::vectors::{BinaryVector, UInt8Vector};
 use futures_util::lock::Mutex;
 use snafu::{ensure, OptionExt, ResultExt};
-use table::engine::manager::TableEngineManagerRef;
-use table::engine::EngineContext;
+use table::engine::{EngineContext, TableEngineRef};
 use table::metadata::TableId;
 use table::requests::OpenTableRequest;
 use table::table::numbers::NumbersTable;
@@ -36,10 +34,9 @@ use table::table::TableIdProvider;
 use table::TableRef;

 use crate::error::{
-    self, CatalogNotFoundSnafu, IllegalManagerStateSnafu, OpenTableSnafu, ReadSystemCatalogSnafu,
-    Result, SchemaExistsSnafu, SchemaNotFoundSnafu, SystemCatalogSnafu,
-    SystemCatalogTypeMismatchSnafu, TableEngineNotFoundSnafu, TableExistsSnafu, TableNotExistSnafu,
-    TableNotFoundSnafu,
+    CatalogNotFoundSnafu, IllegalManagerStateSnafu, OpenTableSnafu, ReadSystemCatalogSnafu, Result,
+    SchemaExistsSnafu, SchemaNotFoundSnafu, SystemCatalogSnafu, SystemCatalogTypeMismatchSnafu,
+    TableExistsSnafu, TableNotFoundSnafu, UnimplementedSnafu,
 };
 use crate::local::memory::{MemoryCatalogManager, MemoryCatalogProvider, MemorySchemaProvider};
 use crate::system::{
@@ -48,16 +45,16 @@ use crate::system::{
 };
 use crate::tables::SystemCatalog;
 use crate::{
-    handle_system_table_request, CatalogList, CatalogManager, CatalogProvider, CatalogProviderRef,
-    DeregisterTableRequest, RegisterSchemaRequest, RegisterSystemTableRequest,
-    RegisterTableRequest, RenameTableRequest, SchemaProvider, SchemaProviderRef,
+    format_full_table_name, handle_system_table_request, CatalogList, CatalogManager,
+    CatalogProvider, CatalogProviderRef, DeregisterTableRequest, RegisterSchemaRequest,
+    RegisterSystemTableRequest, RegisterTableRequest, SchemaProvider, SchemaProviderRef,
 };

 /// A `CatalogManager` consists of a system catalog and a bunch of user catalogs.
 pub struct LocalCatalogManager {
    system: Arc<SystemCatalog>,
    catalogs: Arc<MemoryCatalogManager>,
-    engine_manager: TableEngineManagerRef,
+    engine: TableEngineRef,
    next_table_id: AtomicU32,
    init_lock: Mutex<bool>,
    register_lock: Mutex<()>,
@@ -65,20 +62,19 @@ pub struct LocalCatalogManager {
 }

 impl LocalCatalogManager {
-    /// Create a new [CatalogManager] with given user catalogs and mito engine
-    pub async fn try_new(engine_manager: TableEngineManagerRef) -> Result<Self> {
-        let engine = engine_manager
-            .engine(MITO_ENGINE)
-            .context(TableEngineNotFoundSnafu {
-                engine_name: MITO_ENGINE,
-            })?;
+    /// Create a new [CatalogManager] with given user catalogs and table engine
+    pub async fn try_new(engine: TableEngineRef) -> Result<Self> {
        let table = SystemCatalogTable::new(engine.clone()).await?;
        let memory_catalog_list = crate::local::memory::new_memory_catalog_list()?;
-        let system_catalog = Arc::new(SystemCatalog::new(table));
+        let system_catalog = Arc::new(SystemCatalog::new(
+            table,
+            memory_catalog_list.clone(),
+            engine.clone(),
+        ));
        Ok(Self {
            system: system_catalog,
            catalogs: memory_catalog_list,
-            engine_manager,
+            engine,
            next_table_id: AtomicU32::new(MIN_USER_TABLE_ID),
            init_lock: Mutex::new(false),
            register_lock: Mutex::new(()),
@@ -103,14 +99,7 @@ impl LocalCatalogManager {

        // Processing system table hooks
        let mut sys_table_requests = self.system_table_requests.lock().await;
-        let engine = self
-            .engine_manager
-            .engine(MITO_ENGINE)
-            .context(TableEngineNotFoundSnafu {
-                engine_name: MITO_ENGINE,
-            })?;
-
-        handle_system_table_request(self, engine, &mut sys_table_requests).await?;
+        handle_system_table_request(self, self.engine.clone(), &mut sys_table_requests).await?;
        Ok(())
    }

@@ -252,8 +241,7 @@ impl LocalCatalogManager {
        let schema = catalog
            .schema(&t.schema_name)?
            .context(SchemaNotFoundSnafu {
-                catalog: &t.catalog_name,
-                schema: &t.schema_name,
+                schema_info: format!("{}.{}", &t.catalog_name, &t.schema_name),
            })?;

        let context = EngineContext {};
@@ -262,15 +250,11 @@ impl LocalCatalogManager {
            schema_name: t.schema_name.clone(),
            table_name: t.table_name.clone(),
            table_id: t.table_id,
+            region_numbers: vec![0],
        };
-        let engine = self
-            .engine_manager
-            .engine(&t.engine)
-            .context(TableEngineNotFoundSnafu {
-                engine_name: &t.engine,
-            })?;

-        let option = engine
+        let option = self
+            .engine
            .open_table(&context, request)
            .await
            .with_context(|_| OpenTableSnafu {
@@ -305,7 +289,9 @@ impl CatalogList for LocalCatalogManager {
    }

    fn catalog_names(&self) -> Result<Vec<String>> {
-        self.catalogs.catalog_names()
+        let mut res = self.catalogs.catalog_names()?;
+        res.push(SYSTEM_CATALOG_NAME.to_string());
+        Ok(res)
    }

    fn catalog(&self, name: &str) -> Result<Option<CatalogProviderRef>> {
@@ -352,13 +338,12 @@ impl CatalogManager for LocalCatalogManager {
        let schema = catalog
            .schema(schema_name)?
            .with_context(|| SchemaNotFoundSnafu {
-                catalog: catalog_name,
-                schema: schema_name,
+                schema_info: format!("{}.{}", catalog_name, schema_name),
            })?;

        {
            let _lock = self.register_lock.lock().await;
-            if let Some(existing) = schema.table(&request.table_name).await? {
+            if let Some(existing) = schema.table(&request.table_name)? {
                if existing.table_info().ident.table_id != request.table_id {
                    error!(
                        "Unexpected table register request: {:?}, existing: {:?}",
@@ -377,7 +362,6 @@ impl CatalogManager for LocalCatalogManager {
                // Try to register table with same table id, just ignore.
                Ok(false)
            } else {
-                let engine = request.table.table_info().meta.engine.to_string();
                // table does not exist
                self.system
                    .register_table(
@@ -385,7 +369,6 @@ impl CatalogManager for LocalCatalogManager {
                        schema_name.clone(),
                        request.table_name.clone(),
                        request.table_id,
-                        engine,
                    )
                    .await?;
                schema.register_table(request.table_name, request.table)?;
@@ -394,94 +377,11 @@ impl CatalogManager for LocalCatalogManager {
        }
    }

-    async fn rename_table(&self, request: RenameTableRequest) -> Result<bool> {
-        let started = self.init_lock.lock().await;
-
-        ensure!(
-            *started,
-            IllegalManagerStateSnafu {
-                msg: "Catalog manager not started",
-            }
-        );
-
-        let catalog_name = &request.catalog;
-        let schema_name = &request.schema;
-
-        let catalog = self
-            .catalogs
-            .catalog(catalog_name)?
-            .context(CatalogNotFoundSnafu { catalog_name })?;
-
-        let schema = catalog
-            .schema(schema_name)?
-            .with_context(|| SchemaNotFoundSnafu {
-                catalog: catalog_name,
-                schema: schema_name,
-            })?;
-
-        let _lock = self.register_lock.lock().await;
-        ensure!(
-            !schema.table_exist(&request.new_table_name)?,
-            TableExistsSnafu {
-                table: &request.new_table_name
-            }
-        );
-        let old_table = schema
-            .table(&request.table_name)
-            .await?
-            .context(TableNotExistSnafu {
-                table: &request.table_name,
-            })?;
-
-        let engine = old_table.table_info().meta.engine.to_string();
-        // rename table in system catalog
-        self.system
-            .register_table(
-                catalog_name.clone(),
-                schema_name.clone(),
-                request.new_table_name.clone(),
-                request.table_id,
-                engine,
-            )
-            .await?;
-
-        let renamed = schema
-            .rename_table(&request.table_name, request.new_table_name.clone())
-            .is_ok();
-        Ok(renamed)
-    }
-
-    async fn deregister_table(&self, request: DeregisterTableRequest) -> Result<bool> {
-        {
-            let started = *self.init_lock.lock().await;
-            ensure!(started, IllegalManagerStateSnafu { msg: "not started" });
-        }
-
-        {
-            let _ = self.register_lock.lock().await;
-
-            let DeregisterTableRequest {
-                catalog,
-                schema,
-                table_name,
-            } = &request;
-            let table_id = self
-                .catalogs
-                .table(catalog, schema, table_name)
-                .await?
-                .with_context(|| error::TableNotExistSnafu {
-                    table: format_full_table_name(catalog, schema, table_name),
-                })?
-                .table_info()
-                .ident
-                .table_id;
-
-            if !self.system.deregister_table(&request, table_id).await? {
-                return Ok(false);
-            }
-
-            self.catalogs.deregister_table(request).await
+    async fn deregister_table(&self, _request: DeregisterTableRequest) -> Result<bool> {
+        UnimplementedSnafu {
+            operation: "deregister table",
        }
+        .fail()
    }

    async fn register_schema(&self, request: RegisterSchemaRequest) -> Result<bool> {
@@ -539,7 +439,7 @@ impl CatalogManager for LocalCatalogManager {
            .schema(schema)
    }

-    async fn table(
+    fn table(
        &self,
        catalog_name: &str,
        schema_name: &str,
@@ -552,10 +452,9 @@ impl CatalogManager for LocalCatalogManager {
        let schema = catalog
            .schema(schema_name)?
            .with_context(|| SchemaNotFoundSnafu {
-                catalog: catalog_name,
-                schema: schema_name,
+                schema_info: format!("{}.{}", catalog_name, schema_name),
            })?;
-        schema.table(table_name).await
+        schema.table(table_name)
    }
 }

@@ -563,8 +462,6 @@ impl CatalogManager for LocalCatalogManager {
 mod tests {
    use std::assert_matches::assert_matches;

-    use mito::engine::MITO_ENGINE;
-
    use super::*;
    use crate::system::{CatalogEntry, SchemaEntry};

@@ -576,7 +473,6 @@ mod tests {
                schema_name: "S1".to_string(),
                table_name: "T1".to_string(),
                table_id: 1,
-                engine: MITO_ENGINE.to_string(),
            }),
            Entry::Catalog(CatalogEntry {
                catalog_name: "C2".to_string(),
@@ -597,7 +493,6 @@ mod tests {
                schema_name: "S1".to_string(),
                table_name: "T2".to_string(),
                table_id: 2,
-                engine: MITO_ENGINE.to_string(),
            }),
        ];
        let res = LocalCatalogManager::sort_entries(vec);
--- a/src/catalog/src/local/memory.rs
+++ b/src/catalog/src/local/memory.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -18,22 +18,18 @@ use std::collections::HashMap;
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::{Arc, RwLock};

-use async_trait::async_trait;
 use common_catalog::consts::MIN_USER_TABLE_ID;
 use common_telemetry::error;
-use snafu::{ensure, OptionExt};
+use snafu::OptionExt;
 use table::metadata::TableId;
 use table::table::TableIdProvider;
 use table::TableRef;

-use crate::error::{
-    self, CatalogNotFoundSnafu, Result, SchemaNotFoundSnafu, TableExistsSnafu, TableNotFoundSnafu,
-};
+use crate::error::{CatalogNotFoundSnafu, Result, SchemaNotFoundSnafu, TableExistsSnafu};
 use crate::schema::SchemaProvider;
 use crate::{
    CatalogList, CatalogManager, CatalogProvider, CatalogProviderRef, DeregisterTableRequest,
-    RegisterSchemaRequest, RegisterSystemTableRequest, RegisterTableRequest, RenameTableRequest,
-    SchemaProviderRef,
+    RegisterSchemaRequest, RegisterSystemTableRequest, RegisterTableRequest, SchemaProviderRef,
 };

 /// Simple in-memory list of catalogs
@@ -85,33 +81,13 @@ impl CatalogManager for MemoryCatalogManager {
        let schema = catalog
            .schema(&request.schema)?
            .with_context(|| SchemaNotFoundSnafu {
-                catalog: &request.catalog,
-                schema: &request.schema,
+                schema_info: format!("{}.{}", &request.catalog, &request.schema),
            })?;
        schema
            .register_table(request.table_name, request.table)
            .map(|v| v.is_none())
    }

-    async fn rename_table(&self, request: RenameTableRequest) -> Result<bool> {
-        let catalogs = self.catalogs.write().unwrap();
-        let catalog = catalogs
-            .get(&request.catalog)
-            .context(CatalogNotFoundSnafu {
-                catalog_name: &request.catalog,
-            })?
-            .clone();
-        let schema = catalog
-            .schema(&request.schema)?
-            .with_context(|| SchemaNotFoundSnafu {
-                catalog: &request.catalog,
-                schema: &request.schema,
-            })?;
-        Ok(schema
-            .rename_table(&request.table_name, request.new_table_name)
-            .is_ok())
-    }
-
    async fn deregister_table(&self, request: DeregisterTableRequest) -> Result<bool> {
        let catalogs = self.catalogs.write().unwrap();
        let catalog = catalogs
@@ -123,8 +99,7 @@ impl CatalogManager for MemoryCatalogManager {
        let schema = catalog
            .schema(&request.schema)?
            .with_context(|| SchemaNotFoundSnafu {
-                catalog: &request.catalog,
-                schema: &request.schema,
+                schema_info: format!("{}.{}", &request.catalog, &request.schema),
            })?;
        schema
            .deregister_table(&request.table_name)
@@ -156,20 +131,16 @@ impl CatalogManager for MemoryCatalogManager {
        }
    }

-    async fn table(
-        &self,
-        catalog: &str,
-        schema: &str,
-        table_name: &str,
-    ) -> Result<Option<TableRef>> {
-        let catalog = {
-            let c = self.catalogs.read().unwrap();
-            let Some(c) = c.get(catalog) else { return Ok(None) };
+    fn table(&self, catalog: &str, schema: &str, table_name: &str) -> Result<Option<TableRef>> {
+        let c = self.catalogs.read().unwrap();
+        let catalog = if let Some(c) = c.get(catalog) {
            c.clone()
+        } else {
+            return Ok(None);
        };
        match catalog.schema(schema)? {
            None => Ok(None),
-            Some(s) => s.table(table_name).await,
+            Some(s) => s.table(table_name),
        }
    }
 }
@@ -255,10 +226,6 @@ impl CatalogProvider for MemoryCatalogProvider {
        schema: SchemaProviderRef,
    ) -> Result<Option<SchemaProviderRef>> {
        let mut schemas = self.schemas.write().unwrap();
-        ensure!(
-            !schemas.contains_key(&name),
-            error::SchemaExistsSnafu { schema: &name }
-        );
        Ok(schemas.insert(name, schema))
    }

@@ -288,7 +255,6 @@ impl Default for MemorySchemaProvider {
    }
 }

-#[async_trait]
 impl SchemaProvider for MemorySchemaProvider {
    fn as_any(&self) -> &dyn Any {
        self
@@ -299,7 +265,7 @@ impl SchemaProvider for MemorySchemaProvider {
        Ok(tables.keys().cloned().collect())
    }

-    async fn table(&self, name: &str) -> Result<Option<TableRef>> {
+    fn table(&self, name: &str) -> Result<Option<TableRef>> {
        let tables = self.tables.read().unwrap();
        Ok(tables.get(name).cloned())
    }
@@ -322,24 +288,6 @@ impl SchemaProvider for MemorySchemaProvider {
        }
    }

-    fn rename_table(&self, name: &str, new_name: String) -> Result<TableRef> {
-        let mut tables = self.tables.write().unwrap();
-        let Some(table) = tables.remove(name) else {
-            return TableNotFoundSnafu {
-                table_info: name.to_string(),
-            }
-                .fail()?;
-        };
-        let e = match tables.entry(new_name) {
-            Entry::Vacant(e) => e,
-            Entry::Occupied(e) => {
-                return TableExistsSnafu { table: e.key() }.fail();
-            }
-        };
-        e.insert(table.clone());
-        Ok(table)
-    }
-
    fn deregister_table(&self, name: &str) -> Result<Option<TableRef>> {
        let mut tables = self.tables.write().unwrap();
        Ok(tables.remove(name))
@@ -365,8 +313,8 @@ mod tests {

    use super::*;

-    #[tokio::test]
-    async fn test_new_memory_catalog_list() {
+    #[test]
+    fn test_new_memory_catalog_list() {
        let catalog_list = new_memory_catalog_list().unwrap();
        let default_catalog = catalog_list.catalog(DEFAULT_CATALOG_NAME).unwrap().unwrap();

@@ -379,9 +327,9 @@ mod tests {
            .register_table("numbers".to_string(), Arc::new(NumbersTable::default()))
            .unwrap();

-        let table = default_schema.table("numbers").await.unwrap();
+        let table = default_schema.table("numbers").unwrap();
        assert!(table.is_some());
-        assert!(default_schema.table("not_exists").await.unwrap().is_none());
+        assert!(default_schema.table("not_exists").unwrap().is_none());
    }

    #[tokio::test]
@@ -400,89 +348,10 @@ mod tests {
        let other_table = NumbersTable::new(12);
        let result = provider.register_table(table_name.to_string(), Arc::new(other_table));
        let err = result.err().unwrap();
+        assert!(err.backtrace_opt().is_some());
        assert_eq!(StatusCode::TableAlreadyExists, err.status_code());
    }

-    #[tokio::test]
-    async fn test_mem_provider_rename_table() {
-        let provider = MemorySchemaProvider::new();
-        let table_name = "num";
-        assert!(!provider.table_exist(table_name).unwrap());
-        let test_table: TableRef = Arc::new(NumbersTable::default());
-        // register test table
-        assert!(provider
-            .register_table(table_name.to_string(), test_table.clone())
-            .unwrap()
-            .is_none());
-        assert!(provider.table_exist(table_name).unwrap());
-
-        // rename test table
-        let new_table_name = "numbers";
-        provider
-            .rename_table(table_name, new_table_name.to_string())
-            .unwrap();
-
-        // test old table name not exist
-        assert!(!provider.table_exist(table_name).unwrap());
-        assert!(provider.deregister_table(table_name).unwrap().is_none());
-
-        // test new table name exists
-        assert!(provider.table_exist(new_table_name).unwrap());
-        let registered_table = provider.table(new_table_name).await.unwrap().unwrap();
-        assert_eq!(
-            registered_table.table_info().ident.table_id,
-            test_table.table_info().ident.table_id
-        );
-
-        let other_table = Arc::new(NumbersTable::new(2));
-        let result = provider.register_table(new_table_name.to_string(), other_table);
-        let err = result.err().unwrap();
-        assert_eq!(StatusCode::TableAlreadyExists, err.status_code());
-    }
-
-    #[tokio::test]
-    async fn test_catalog_rename_table() {
-        let catalog = MemoryCatalogManager::default();
-        let schema = catalog
-            .schema(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME)
-            .unwrap()
-            .unwrap();
-
-        // register table
-        let table_name = "num";
-        let table_id = 2333;
-        let table: TableRef = Arc::new(NumbersTable::new(table_id));
-        let register_table_req = RegisterTableRequest {
-            catalog: DEFAULT_CATALOG_NAME.to_string(),
-            schema: DEFAULT_SCHEMA_NAME.to_string(),
-            table_name: table_name.to_string(),
-            table_id,
-            table,
-        };
-        assert!(catalog.register_table(register_table_req).await.unwrap());
-        assert!(schema.table_exist(table_name).unwrap());
-
-        // rename table
-        let new_table_name = "numbers_new";
-        let rename_table_req = RenameTableRequest {
-            catalog: DEFAULT_CATALOG_NAME.to_string(),
-            schema: DEFAULT_SCHEMA_NAME.to_string(),
-            table_name: table_name.to_string(),
-            new_table_name: new_table_name.to_string(),
-            table_id,
-        };
-        assert!(catalog.rename_table(rename_table_req).await.unwrap());
-        assert!(!schema.table_exist(table_name).unwrap());
-        assert!(schema.table_exist(new_table_name).unwrap());
-
-        let registered_table = catalog
-            .table(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, new_table_name)
-            .await
-            .unwrap()
-            .unwrap();
-        assert_eq!(registered_table.table_info().ident.table_id, table_id);
-    }
-
    #[test]
    pub fn test_register_if_absent() {
        let list = MemoryCatalogManager::default();
--- a/src/catalog/src/remote.rs
+++ b/src/catalog/src/remote.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
--- a/src/catalog/src/remote/client.rs
+++ b/src/catalog/src/remote/client.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
--- a/src/catalog/src/remote/manager.rs
+++ b/src/catalog/src/remote/manager.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -13,62 +13,58 @@
 // limitations under the License.

 use std::any::Any;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 use std::pin::Pin;
 use std::sync::Arc;

 use arc_swap::ArcSwap;
 use async_stream::stream;
-use async_trait::async_trait;
-use common_catalog::consts::{
-    DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, MIN_USER_TABLE_ID, MITO_ENGINE,
-};
-use common_telemetry::{debug, error, info};
-use dashmap::DashMap;
+use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, MIN_USER_TABLE_ID};
+use common_telemetry::{debug, info};
 use futures::Stream;
 use futures_util::StreamExt;
-use parking_lot::RwLock;
 use snafu::{OptionExt, ResultExt};
-use table::engine::manager::TableEngineManagerRef;
-use table::engine::EngineContext;
+use table::engine::{EngineContext, TableEngineRef};
 use table::metadata::TableId;
 use table::requests::{CreateTableRequest, OpenTableRequest};
+use table::table::numbers::NumbersTable;
 use table::TableRef;
 use tokio::sync::Mutex;

 use crate::error::{
-    CatalogNotFoundSnafu, CreateTableSnafu, InvalidCatalogValueSnafu, OpenTableSnafu, Result,
-    SchemaNotFoundSnafu, TableEngineNotFoundSnafu, TableExistsSnafu, UnimplementedSnafu,
+    CatalogNotFoundSnafu, CreateTableSnafu, InvalidCatalogValueSnafu, InvalidTableSchemaSnafu,
+    OpenTableSnafu, Result, SchemaNotFoundSnafu, TableExistsSnafu, UnimplementedSnafu,
 };
 use crate::helper::{
    build_catalog_prefix, build_schema_prefix, build_table_global_prefix, CatalogKey, CatalogValue,
    SchemaKey, SchemaValue, TableGlobalKey, TableGlobalValue, TableRegionalKey, TableRegionalValue,
-    CATALOG_KEY_PREFIX,
 };
 use crate::remote::{Kv, KvBackendRef};
 use crate::{
    handle_system_table_request, CatalogList, CatalogManager, CatalogProvider, CatalogProviderRef,
    DeregisterTableRequest, RegisterSchemaRequest, RegisterSystemTableRequest,
-    RegisterTableRequest, RenameTableRequest, SchemaProvider, SchemaProviderRef,
+    RegisterTableRequest, SchemaProvider, SchemaProviderRef,
 };

 /// Catalog manager based on metasrv.
 pub struct RemoteCatalogManager {
    node_id: u64,
    backend: KvBackendRef,
-    catalogs: Arc<RwLock<DashMap<String, CatalogProviderRef>>>,
-    engine_manager: TableEngineManagerRef,
+    catalogs: Arc<ArcSwap<HashMap<String, CatalogProviderRef>>>,
+    engine: TableEngineRef,
    system_table_requests: Mutex<Vec<RegisterSystemTableRequest>>,
+    mutex: Arc<Mutex<()>>,
 }

 impl RemoteCatalogManager {
-    pub fn new(engine_manager: TableEngineManagerRef, node_id: u64, backend: KvBackendRef) -> Self {
+    pub fn new(engine: TableEngineRef, node_id: u64, backend: KvBackendRef) -> Self {
        Self {
-            engine_manager,
+            engine,
            node_id,
            backend,
            catalogs: Default::default(),
            system_table_requests: Default::default(),
+            mutex: Default::default(),
        }
    }

@@ -112,13 +108,9 @@ impl RemoteCatalogManager {
                    debug!("Ignoring non-catalog key: {}", String::from_utf8_lossy(&k));
                    continue;
                }
-
-                let catalog_key = String::from_utf8_lossy(&k);
-                if let Ok(key) = CatalogKey::parse(&catalog_key) {
-                    yield Ok(key)
-                } else {
-                    error!("Invalid catalog key: {:?}", catalog_key);
-                }
+                let key = CatalogKey::parse(&String::from_utf8_lossy(&k))
+                    .context(InvalidCatalogValueSnafu)?;
+                yield Ok(key)
            }
        }))
    }
@@ -188,9 +180,7 @@ impl RemoteCatalogManager {
        let max_table_id = MIN_USER_TABLE_ID - 1;

        // initiate default catalog and schema
-        let default_catalog = self
-            .create_catalog_and_schema(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME)
-            .await?;
+        let default_catalog = self.initiate_default_catalog().await?;
        res.insert(DEFAULT_CATALOG_NAME.to_string(), default_catalog);
        info!("Default catalog and schema registered");

@@ -270,19 +260,13 @@ impl RemoteCatalogManager {
        Ok(())
    }

-    pub async fn create_catalog_and_schema(
-        &self,
-        catalog_name: &str,
-        schema_name: &str,
-    ) -> Result<CatalogProviderRef> {
-        let schema_provider = self.new_schema_provider(catalog_name, schema_name);
-
-        let catalog_provider = self.new_catalog_provider(catalog_name);
-        catalog_provider.register_schema(schema_name.to_string(), schema_provider.clone())?;
-
+    async fn initiate_default_catalog(&self) -> Result<CatalogProviderRef> {
+        let default_catalog = self.new_catalog_provider(DEFAULT_CATALOG_NAME);
+        let default_schema = self.new_schema_provider(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME);
+        default_catalog.register_schema(DEFAULT_SCHEMA_NAME.to_string(), default_schema.clone())?;
        let schema_key = SchemaKey {
-            catalog_name: catalog_name.to_string(),
-            schema_name: schema_name.to_string(),
+            schema_name: DEFAULT_SCHEMA_NAME.to_string(),
+            catalog_name: DEFAULT_CATALOG_NAME.to_string(),
        }
        .to_string();
        self.backend
@@ -293,10 +277,10 @@ impl RemoteCatalogManager {
                    .context(InvalidCatalogValueSnafu)?,
            )
            .await?;
-        info!("Created schema '{schema_key}'");
+        info!("Registered default schema");

        let catalog_key = CatalogKey {
-            catalog_name: catalog_name.to_string(),
+            catalog_name: DEFAULT_CATALOG_NAME.to_string(),
        }
        .to_string();
        self.backend
@@ -307,8 +291,8 @@ impl RemoteCatalogManager {
                    .context(InvalidCatalogValueSnafu)?,
            )
            .await?;
-        info!("Created catalog '{catalog_key}");
-        Ok(catalog_provider)
+        info!("Registered default catalog");
+        Ok(default_catalog)
    }

    async fn open_or_create_table(
@@ -340,18 +324,17 @@ impl RemoteCatalogManager {
            schema_name: schema_name.clone(),
            table_name: table_name.clone(),
            table_id,
+            region_numbers: region_numbers.clone(),
        };
-        let engine = self
-            .engine_manager
-            .engine(&table_info.meta.engine)
-            .context(TableEngineNotFoundSnafu {
-                engine_name: &table_info.meta.engine,
-            })?;
-        match engine
+        match self
+            .engine
            .open_table(&context, request)
            .await
            .with_context(|_| OpenTableSnafu {
-                table_info: format!("{catalog_name}.{schema_name}.{table_name}, id:{table_id}"),
+                table_info: format!(
+                    "{}.{}.{}, id:{}",
+                    catalog_name, schema_name, table_name, table_id
+                ),
            })? {
            Some(table) => {
                info!(
@@ -367,21 +350,28 @@ impl RemoteCatalogManager {
                );

                let meta = &table_info.meta;
+                let schema = meta
+                    .schema
+                    .clone()
+                    .try_into()
+                    .context(InvalidTableSchemaSnafu {
+                        table_info: format!("{}.{}.{}", catalog_name, schema_name, table_name,),
+                        schema: meta.schema.clone(),
+                    })?;
                let req = CreateTableRequest {
                    id: table_id,
                    catalog_name: catalog_name.clone(),
                    schema_name: schema_name.clone(),
                    table_name: table_name.clone(),
                    desc: None,
-                    schema: meta.schema.clone(),
+                    schema: Arc::new(schema),
                    region_numbers: region_numbers.clone(),
                    primary_key_indices: meta.primary_key_indices.clone(),
                    create_if_not_exists: true,
                    table_options: meta.options.clone(),
-                    engine: engine.name().to_string(),
                };

-                engine
+                self.engine
                    .create_table(&context, req)
                    .await
                    .context(CreateTableSnafu {
@@ -403,25 +393,21 @@ impl CatalogManager for RemoteCatalogManager {
            "Initialized catalogs: {:?}",
            catalogs.keys().cloned().collect::<Vec<_>>()
        );
-
-        {
-            let self_catalogs = self.catalogs.read();
-            catalogs.into_iter().for_each(|(k, v)| {
-                self_catalogs.insert(k, v);
-            });
-        }
-
+        self.catalogs.store(Arc::new(catalogs));
        info!("Max table id allocated: {}", max_table_id);

        let mut system_table_requests = self.system_table_requests.lock().await;
-        let engine = self
-            .engine_manager
-            .engine(MITO_ENGINE)
-            .context(TableEngineNotFoundSnafu {
-                engine_name: MITO_ENGINE,
-            })?;
-        handle_system_table_request(self, engine, &mut system_table_requests).await?;
+        handle_system_table_request(self, self.engine.clone(), &mut system_table_requests).await?;
        info!("All system table opened");
+
+        self.catalog(DEFAULT_CATALOG_NAME)
+            .unwrap()
+            .unwrap()
+            .schema(DEFAULT_SCHEMA_NAME)
+            .unwrap()
+            .unwrap()
+            .register_table("numbers".to_string(), Arc::new(NumbersTable::default()))
+            .unwrap();
        Ok(())
    }

@@ -435,8 +421,7 @@ impl CatalogManager for RemoteCatalogManager {
            catalog_provider
                .schema(&schema_name)?
                .with_context(|| SchemaNotFoundSnafu {
-                    catalog: &catalog_name,
-                    schema: &schema_name,
+                    schema_info: format!("{}.{}", &catalog_name, &schema_name),
                })?;
        if schema_provider.table_exist(&request.table_name)? {
            return TableExistsSnafu {
@@ -448,18 +433,11 @@ impl CatalogManager for RemoteCatalogManager {
        Ok(true)
    }

-    async fn deregister_table(&self, request: DeregisterTableRequest) -> Result<bool> {
-        let catalog_name = &request.catalog;
-        let schema_name = &request.schema;
-        let schema = self
-            .schema(catalog_name, schema_name)?
-            .context(SchemaNotFoundSnafu {
-                catalog: catalog_name,
-                schema: schema_name,
-            })?;
-
-        let result = schema.deregister_table(&request.table_name)?;
-        Ok(result.is_none())
+    async fn deregister_table(&self, _request: DeregisterTableRequest) -> Result<bool> {
+        UnimplementedSnafu {
+            operation: "deregister table",
+        }
+        .fail()
    }

    async fn register_schema(&self, request: RegisterSchemaRequest) -> Result<bool> {
@@ -473,13 +451,6 @@ impl CatalogManager for RemoteCatalogManager {
        Ok(true)
    }

-    async fn rename_table(&self, _request: RenameTableRequest) -> Result<bool> {
-        UnimplementedSnafu {
-            operation: "rename table",
-        }
-        .fail()
-    }
-
    async fn register_system_table(&self, request: RegisterSystemTableRequest) -> Result<()> {
        let mut requests = self.system_table_requests.lock().await;
        requests.push(request);
@@ -494,7 +465,7 @@ impl CatalogManager for RemoteCatalogManager {
            .schema(schema)
    }

-    async fn table(
+    fn table(
        &self,
        catalog_name: &str,
        schema_name: &str,
@@ -506,10 +477,9 @@ impl CatalogManager for RemoteCatalogManager {
        let schema = catalog
            .schema(schema_name)?
            .with_context(|| SchemaNotFoundSnafu {
-                catalog: catalog_name,
-                schema: schema_name,
+                schema_info: format!("{}.{}", catalog_name, schema_name),
            })?;
-        schema.table(table_name).await
+        schema.table(table_name)
    }
 }

@@ -525,10 +495,12 @@ impl CatalogList for RemoteCatalogManager {
    ) -> Result<Option<CatalogProviderRef>> {
        let key = self.build_catalog_key(&name).to_string();
        let backend = self.backend.clone();
+        let mutex = self.mutex.clone();
        let catalogs = self.catalogs.clone();

        std::thread::spawn(|| {
            common_runtime::block_on_write(async move {
+                let _guard = mutex.lock().await;
                backend
                    .set(
                        key.as_bytes(),
@@ -537,10 +509,11 @@ impl CatalogList for RemoteCatalogManager {
                            .context(InvalidCatalogValueSnafu)?,
                    )
                    .await?;
-
-                let catalogs = catalogs.read();
-                let prev = catalogs.insert(name, catalog.clone());
-
+                let prev_catalogs = catalogs.load();
+                let mut new_catalogs = HashMap::with_capacity(prev_catalogs.len() + 1);
+                new_catalogs.clone_from(&prev_catalogs);
+                let prev = new_catalogs.insert(name, catalog);
+                catalogs.store(Arc::new(new_catalogs));
                Ok(prev)
            })
        })
@@ -550,65 +523,12 @@ impl CatalogList for RemoteCatalogManager {

    /// List all catalogs from metasrv
    fn catalog_names(&self) -> Result<Vec<String>> {
-        let catalogs = self.catalogs.read();
-        Ok(catalogs.iter().map(|k| k.key().to_string()).collect())
+        Ok(self.catalogs.load().keys().cloned().collect::<Vec<_>>())
    }

    /// Read catalog info of given name from metasrv.
    fn catalog(&self, name: &str) -> Result<Option<CatalogProviderRef>> {
-        {
-            let catalogs = self.catalogs.read();
-            let catalog = catalogs.get(name);
-
-            if let Some(catalog) = catalog {
-                return Ok(Some(catalog.clone()));
-            }
-        }
-
-        let catalogs = self.catalogs.write();
-
-        let catalog = catalogs.get(name);
-        if let Some(catalog) = catalog {
-            return Ok(Some(catalog.clone()));
-        }
-
-        // It's for lack of incremental catalog syncing between datanode and meta. Here we fetch catalog
-        // from meta on demand. This can be removed when incremental catalog syncing is done in datanode.
-
-        let backend = self.backend.clone();
-
-        let catalogs_from_meta: HashSet<String> = std::thread::spawn(|| {
-            common_runtime::block_on_read(async move {
-                let mut stream = backend.range(CATALOG_KEY_PREFIX.as_bytes());
-                let mut catalogs = HashSet::new();
-
-                while let Some(catalog) = stream.next().await {
-                    if let Ok(catalog) = catalog {
-                        let catalog_key = String::from_utf8_lossy(&catalog.0);
-
-                        if let Ok(key) = CatalogKey::parse(&catalog_key) {
-                            catalogs.insert(key.catalog_name);
-                        }
-                    }
-                }
-
-                catalogs
-            })
-        })
-        .join()
-        .unwrap();
-
-        catalogs.retain(|catalog_name, _| catalogs_from_meta.get(catalog_name).is_some());
-
-        for catalog in catalogs_from_meta {
-            catalogs
-                .entry(catalog.clone())
-                .or_insert(self.new_catalog_provider(&catalog));
-        }
-
-        let catalog = catalogs.get(name);
-
-        Ok(catalog.as_deref().cloned())
+        Ok(self.catalogs.load().get(name).cloned())
    }
 }

@@ -768,7 +688,6 @@ impl RemoteSchemaProvider {
    }
 }

-#[async_trait]
 impl SchemaProvider for RemoteSchemaProvider {
    fn as_any(&self) -> &dyn Any {
        self
@@ -778,7 +697,7 @@ impl SchemaProvider for RemoteSchemaProvider {
        Ok(self.tables.load().keys().cloned().collect::<Vec<_>>())
    }

-    async fn table(&self, name: &str) -> Result<Option<TableRef>> {
+    fn table(&self, name: &str) -> Result<Option<TableRef>> {
        Ok(self.tables.load().get(name).cloned())
    }

@@ -821,13 +740,6 @@ impl SchemaProvider for RemoteSchemaProvider {
        prev
    }

-    fn rename_table(&self, _name: &str, _new_name: String) -> Result<TableRef> {
-        UnimplementedSnafu {
-            operation: "rename table",
-        }
-        .fail()
-    }
-
    fn deregister_table(&self, name: &str) -> Result<Option<TableRef>> {
        let table_name = name.to_string();
        let table_key = self.build_regional_table_key(&table_name).to_string();
--- a/src/catalog/src/schema.rs
+++ b/src/catalog/src/schema.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -15,13 +15,11 @@
 use std::any::Any;
 use std::sync::Arc;

-use async_trait::async_trait;
 use table::TableRef;

-use crate::error::{NotSupportedSnafu, Result};
+use crate::error::Result;

 /// Represents a schema, comprising a number of named tables.
-#[async_trait]
 pub trait SchemaProvider: Sync + Send {
    /// Returns the schema provider as [`Any`](std::any::Any)
    /// so that it can be downcast to a specific implementation.
@@ -31,34 +29,15 @@ pub trait SchemaProvider: Sync + Send {
    fn table_names(&self) -> Result<Vec<String>>;

    /// Retrieves a specific table from the schema by name, provided it exists.
-    async fn table(&self, name: &str) -> Result<Option<TableRef>>;
+    fn table(&self, name: &str) -> Result<Option<TableRef>>;

    /// If supported by the implementation, adds a new table to this schema.
    /// If a table of the same name existed before, it returns "Table already exists" error.
-    fn register_table(&self, name: String, _table: TableRef) -> Result<Option<TableRef>> {
-        NotSupportedSnafu {
-            op: format!("register_table({name}, <table>)"),
-        }
-        .fail()
-    }
-
-    /// If supported by the implementation, renames an existing table from this schema and returns it.
-    /// If no table of that name exists, returns "Table not found" error.
-    fn rename_table(&self, name: &str, new_name: String) -> Result<TableRef> {
-        NotSupportedSnafu {
-            op: format!("rename_table({name}, {new_name})"),
-        }
-        .fail()
-    }
+    fn register_table(&self, name: String, table: TableRef) -> Result<Option<TableRef>>;

    /// If supported by the implementation, removes an existing table from this schema and returns it.
    /// If no table of that name exists, returns Ok(None).
-    fn deregister_table(&self, name: &str) -> Result<Option<TableRef>> {
-        NotSupportedSnafu {
-            op: format!("deregister_table({name})"),
-        }
-        .fail()
-    }
+    fn deregister_table(&self, name: &str) -> Result<Option<TableRef>>;

    /// If supported by the implementation, checks the table exist in the schema provider or not.
    /// If no matched table in the schema provider, return false.
--- a/src/catalog/src/system.rs
+++ b/src/catalog/src/system.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -17,37 +17,37 @@ use std::collections::HashMap;
 use std::sync::Arc;

 use common_catalog::consts::{
-    DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, INFORMATION_SCHEMA_NAME, MITO_ENGINE,
-    SYSTEM_CATALOG_NAME, SYSTEM_CATALOG_TABLE_ID, SYSTEM_CATALOG_TABLE_NAME,
+    DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, INFORMATION_SCHEMA_NAME, SYSTEM_CATALOG_NAME,
+    SYSTEM_CATALOG_TABLE_ID, SYSTEM_CATALOG_TABLE_NAME,
 };
 use common_query::logical_plan::Expr;
 use common_query::physical_plan::{PhysicalPlanRef, SessionContext};
 use common_recordbatch::SendableRecordBatchStream;
 use common_telemetry::debug;
 use common_time::util;
-use datatypes::prelude::{ConcreteDataType, ScalarVector, VectorRef};
-use datatypes::schema::{ColumnSchema, RawSchema, SchemaRef};
+use datatypes::prelude::{ConcreteDataType, ScalarVector};
+use datatypes::schema::{ColumnSchema, Schema, SchemaBuilder, SchemaRef};
 use datatypes::vectors::{BinaryVector, TimestampMillisecondVector, UInt8Vector};
 use serde::{Deserialize, Serialize};
 use snafu::{ensure, OptionExt, ResultExt};
 use table::engine::{EngineContext, TableEngineRef};
 use table::metadata::{TableId, TableInfoRef};
-use table::requests::{
-    CreateTableRequest, DeleteRequest, InsertRequest, OpenTableRequest, TableOptions,
-};
+use table::requests::{CreateTableRequest, InsertRequest, OpenTableRequest};
 use table::{Table, TableRef};

 use crate::error::{
    self, CreateSystemCatalogSnafu, EmptyValueSnafu, Error, InvalidEntryTypeSnafu, InvalidKeySnafu,
    OpenSystemCatalogSnafu, Result, ValueDeserializeSnafu,
 };
-use crate::DeregisterTableRequest;

 pub const ENTRY_TYPE_INDEX: usize = 0;
 pub const KEY_INDEX: usize = 1;
 pub const VALUE_INDEX: usize = 3;

-pub struct SystemCatalogTable(TableRef);
+pub struct SystemCatalogTable {
+    table_info: TableInfoRef,
+    pub table: TableRef,
+}

 #[async_trait::async_trait]
 impl Table for SystemCatalogTable {
@@ -56,29 +56,25 @@ impl Table for SystemCatalogTable {
    }

    fn schema(&self) -> SchemaRef {
-        self.0.schema()
+        self.table_info.meta.schema.clone()
    }

    async fn scan(
        &self,
-        projection: Option<&Vec<usize>>,
-        filters: &[Expr],
-        limit: Option<usize>,
+        _projection: &Option<Vec<usize>>,
+        _filters: &[Expr],
+        _limit: Option<usize>,
    ) -> table::Result<PhysicalPlanRef> {
-        self.0.scan(projection, filters, limit).await
+        panic!("System catalog table does not support scan!")
    }

    /// Insert values into table.
    async fn insert(&self, request: InsertRequest) -> table::error::Result<usize> {
-        self.0.insert(request).await
+        self.table.insert(request).await
    }

    fn table_info(&self) -> TableInfoRef {
-        self.0.table_info()
-    }
-
-    async fn delete(&self, request: DeleteRequest) -> table::Result<usize> {
-        self.0.delete(request).await
+        self.table_info.clone()
    }
 }

@@ -89,8 +85,9 @@ 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 = build_system_catalog_schema();
+        let schema = Arc::new(build_system_catalog_schema());
        let ctx = EngineContext::default();

        if let Some(table) = engine
@@ -98,7 +95,10 @@ impl SystemCatalogTable {
            .await
            .context(OpenSystemCatalogSnafu)?
        {
-            Ok(Self(table))
+            Ok(Self {
+                table_info: table.table_info(),
+                table,
+            })
        } else {
            // system catalog table is not yet created, try to create
            let request = CreateTableRequest {
@@ -107,19 +107,19 @@ impl SystemCatalogTable {
                schema_name: INFORMATION_SCHEMA_NAME.to_string(),
                table_name: SYSTEM_CATALOG_TABLE_NAME.to_string(),
                desc: Some("System catalog table".to_string()),
-                schema,
+                schema: schema.clone(),
                region_numbers: vec![0],
                primary_key_indices: vec![ENTRY_TYPE_INDEX, KEY_INDEX],
                create_if_not_exists: true,
-                table_options: TableOptions::default(),
-                engine: engine.name().to_string(),
+                table_options: HashMap::new(),
            };

            let table = engine
                .create_table(&ctx, request)
                .await
                .context(CreateSystemCatalogSnafu)?;
-            Ok(Self(table))
+            let table_info = table.table_info();
+            Ok(Self { table, table_info })
        }
    }

@@ -128,7 +128,8 @@ impl SystemCatalogTable {
        let full_projection = None;
        let ctx = SessionContext::new();
        let scan = self
-            .scan(full_projection, &[], None)
+            .table
+            .scan(&full_projection, &[], None)
            .await
            .context(error::SystemCatalogTableScanSnafu)?;
        let stream = scan
@@ -146,7 +147,7 @@ impl SystemCatalogTable {
 /// - value: JSON-encoded value of entry's metadata.
 /// - gmt_created: create time of this metadata.
 /// - gmt_modified: last updated time of this metadata.
-fn build_system_catalog_schema() -> RawSchema {
+fn build_system_catalog_schema() -> Schema {
    let cols = vec![
        ColumnSchema::new(
            "entry_type".to_string(),
@@ -181,62 +182,22 @@ fn build_system_catalog_schema() -> RawSchema {
        ),
    ];

-    RawSchema::new(cols)
+    // The schema of this table must be valid.
+    SchemaBuilder::try_from(cols).unwrap().build().unwrap()
 }

-/// Formats key string for table entry in system catalog
-#[inline]
-pub fn format_table_entry_key(catalog: &str, schema: &str, table_id: TableId) -> String {
-    format!("{catalog}.{schema}.{table_id}")
-}
-
-pub fn build_table_insert_request(
-    catalog: String,
-    schema: String,
-    table_name: String,
-    table_id: TableId,
-    engine: String,
-) -> InsertRequest {
-    let entry_key = format_table_entry_key(&catalog, &schema, table_id);
+pub fn build_table_insert_request(full_table_name: String, table_id: TableId) -> InsertRequest {
    build_insert_request(
        EntryType::Table,
-        entry_key.as_bytes(),
-        serde_json::to_string(&TableEntryValue { table_name, engine })
+        full_table_name.as_bytes(),
+        serde_json::to_string(&TableEntryValue { table_id })
            .unwrap()
            .as_bytes(),
    )
 }

-pub(crate) fn build_table_deletion_request(
-    request: &DeregisterTableRequest,
-    table_id: TableId,
-) -> DeleteRequest {
-    let table_key = format_table_entry_key(&request.catalog, &request.schema, table_id);
-    DeleteRequest {
-        key_column_values: build_primary_key_columns(EntryType::Table, table_key.as_bytes()),
-    }
-}
-
-fn build_primary_key_columns(entry_type: EntryType, key: &[u8]) -> HashMap<String, VectorRef> {
-    let mut m = HashMap::with_capacity(3);
-    m.insert(
-        "entry_type".to_string(),
-        Arc::new(UInt8Vector::from_slice([entry_type as u8])) as _,
-    );
-    m.insert(
-        "key".to_string(),
-        Arc::new(BinaryVector::from_slice(&[key])) as _,
-    );
-    // Timestamp in key part is intentionally left to 0
-    m.insert(
-        "timestamp".to_string(),
-        Arc::new(TimestampMillisecondVector::from_slice([0])) as _,
-    );
-    m
-}
-
 pub fn build_schema_insert_request(catalog_name: String, schema_name: String) -> InsertRequest {
-    let full_schema_name = format!("{catalog_name}.{schema_name}");
+    let full_schema_name = format!("{}.{}", catalog_name, schema_name);
    build_insert_request(
        EntryType::Schema,
        full_schema_name.as_bytes(),
@@ -247,10 +208,22 @@ pub fn build_schema_insert_request(catalog_name: String, schema_name: String) ->
 }

 pub fn build_insert_request(entry_type: EntryType, key: &[u8], value: &[u8]) -> InsertRequest {
-    let primary_key_columns = build_primary_key_columns(entry_type, key);
-
    let mut columns_values = HashMap::with_capacity(6);
-    columns_values.extend(primary_key_columns.into_iter());
+    columns_values.insert(
+        "entry_type".to_string(),
+        Arc::new(UInt8Vector::from_slice(&[entry_type as u8])) as _,
+    );
+
+    columns_values.insert(
+        "key".to_string(),
+        Arc::new(BinaryVector::from_slice(&[key])) as _,
+    );
+
+    // Timestamp in key part is intentionally left to 0
+    columns_values.insert(
+        "timestamp".to_string(),
+        Arc::new(TimestampMillisecondVector::from_slice(&[0])) as _,
+    );

    columns_values.insert(
        "value".to_string(),
@@ -260,12 +233,12 @@ pub fn build_insert_request(entry_type: EntryType, key: &[u8], value: &[u8]) ->
    let now = util::current_time_millis();
    columns_values.insert(
        "gmt_created".to_string(),
-        Arc::new(TimestampMillisecondVector::from_slice([now])) as _,
+        Arc::new(TimestampMillisecondVector::from_slice(&[now])) as _,
    );

    columns_values.insert(
        "gmt_modified".to_string(),
-        Arc::new(TimestampMillisecondVector::from_slice([now])) as _,
+        Arc::new(TimestampMillisecondVector::from_slice(&[now])) as _,
    );

    InsertRequest {
@@ -273,7 +246,6 @@ pub fn build_insert_request(entry_type: EntryType, key: &[u8], value: &[u8]) ->
        schema_name: DEFAULT_SCHEMA_NAME.to_string(),
        table_name: SYSTEM_CATALOG_TABLE_NAME.to_string(),
        columns_values,
-        region_number: 0, // system catalog table has only one region
    }
 }

@@ -313,8 +285,8 @@ pub fn decode_system_catalog(
        }

        EntryType::Table => {
-            // As for table entry, the key is a string with format: `<catalog_name>.<schema_name>.<table_id>`
-            // and the value is a JSON string with format: `{"table_name": <table_name>}`
+            // As for table entry, the key is a string with format: `<catalog_name>.<schema_name>.<table_name>`
+            // and the value is a JSON string with format: `{"table_id": <table_id>}`
            let table_parts = key.split('.').collect::<Vec<_>>();
            ensure!(
                table_parts.len() >= 3,
@@ -326,13 +298,11 @@ pub fn decode_system_catalog(
            debug!("Table meta value: {}", String::from_utf8_lossy(value));
            let table_meta: TableEntryValue =
                serde_json::from_slice(value).context(ValueDeserializeSnafu)?;
-            let table_id = table_parts[2].parse::<TableId>().unwrap();
            Ok(Entry::Table(TableEntry {
                catalog_name: table_parts[0].to_string(),
                schema_name: table_parts[1].to_string(),
-                table_name: table_meta.table_name,
-                table_id,
-                engine: table_meta.engine,
+                table_name: table_parts[2].to_string(),
+                table_id: table_meta.table_id,
            }))
        }
    }
@@ -388,35 +358,24 @@ pub struct TableEntry {
    pub schema_name: String,
    pub table_name: String,
    pub table_id: TableId,
-    pub engine: String,
 }

 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct TableEntryValue {
-    pub table_name: String,
-
-    #[serde(default = "mito_engine")]
-    pub engine: String,
-}
-
-fn mito_engine() -> String {
-    MITO_ENGINE.to_string()
+    pub table_id: TableId,
 }

 #[cfg(test)]
 mod tests {
-    use common_recordbatch::RecordBatches;
-    use common_test_util::temp_dir::{create_temp_dir, TempDir};
-    use datatypes::value::Value;
-    use log_store::NoopLogStore;
+    use log_store::fs::noop::NoopLogStore;
    use mito::config::EngineConfig;
-    use mito::engine::{MitoEngine, MITO_ENGINE};
+    use mito::engine::MitoEngine;
    use object_store::ObjectStore;
-    use storage::compaction::noop::NoopCompactionScheduler;
    use storage::config::EngineConfig as StorageEngineConfig;
    use storage::EngineImpl;
    use table::metadata::TableType;
    use table::metadata::TableType::Base;
+    use tempdir::TempDir;

    use super::*;

@@ -431,7 +390,7 @@ mod tests {
        if let Entry::Catalog(e) = entry {
            assert_eq!("some_catalog", e.catalog_name);
        } else {
-            panic!("Unexpected type: {entry:?}");
+            panic!("Unexpected type: {:?}", entry);
        }
    }

@@ -448,7 +407,7 @@ mod tests {
            assert_eq!("some_catalog", e.catalog_name);
            assert_eq!("some_schema", e.schema_name);
        } else {
-            panic!("Unexpected type: {entry:?}");
+            panic!("Unexpected type: {:?}", entry);
        }
    }

@@ -456,8 +415,8 @@ mod tests {
    pub fn test_decode_table() {
        let entry = decode_system_catalog(
            Some(EntryType::Table as u8),
-            Some("some_catalog.some_schema.42".as_bytes()),
-            Some("{\"table_name\":\"some_table\"}".as_bytes()),
+            Some("some_catalog.some_schema.some_table".as_bytes()),
+            Some("{\"table_id\":42}".as_bytes()),
        )
        .unwrap();

@@ -467,7 +426,7 @@ mod tests {
            assert_eq!("some_table", e.table_name);
            assert_eq!(42, e.table_id);
        } else {
-            panic!("Unexpected type: {entry:?}");
+            panic!("Unexpected type: {:?}", entry);
        }
    }

@@ -476,7 +435,7 @@ mod tests {
    pub fn test_decode_mismatch() {
        decode_system_catalog(
            Some(EntryType::Table as u8),
-            Some("some_catalog.some_schema.42".as_bytes()),
+            Some("some_catalog.some_schema.some_table".as_bytes()),
            None,
        )
        .unwrap();
@@ -491,19 +450,19 @@ mod tests {
    }

    pub async fn prepare_table_engine() -> (TempDir, TableEngineRef) {
-        let dir = create_temp_dir("system-table-test");
+        let dir = TempDir::new("system-table-test").unwrap();
        let store_dir = dir.path().to_string_lossy();
-        let mut builder = object_store::services::Fs::default();
-        builder.root(&store_dir);
-        let object_store = ObjectStore::new(builder).unwrap().finish();
-        let noop_compaction_scheduler = Arc::new(NoopCompactionScheduler::default());
+        let accessor = object_store::backend::fs::Builder::default()
+            .root(&store_dir)
+            .build()
+            .unwrap();
+        let object_store = ObjectStore::new(accessor);
        let table_engine = Arc::new(MitoEngine::new(
            EngineConfig::default(),
            EngineImpl::new(
                StorageEngineConfig::default(),
                Arc::new(NoopLogStore::default()),
                object_store.clone(),
-                noop_compaction_scheduler,
            ),
            object_store,
        ));
@@ -528,55 +487,4 @@ mod tests {
        assert_eq!(SYSTEM_CATALOG_NAME, info.catalog_name);
        assert_eq!(INFORMATION_SCHEMA_NAME, info.schema_name);
    }
-
-    #[tokio::test]
-    async fn test_system_catalog_table_records() {
-        let (_, table_engine) = prepare_table_engine().await;
-        let catalog_table = SystemCatalogTable::new(table_engine).await.unwrap();
-
-        let table_insertion = build_table_insert_request(
-            DEFAULT_CATALOG_NAME.to_string(),
-            DEFAULT_SCHEMA_NAME.to_string(),
-            "my_table".to_string(),
-            1,
-            MITO_ENGINE.to_string(),
-        );
-        let result = catalog_table.insert(table_insertion).await.unwrap();
-        assert_eq!(result, 1);
-
-        let records = catalog_table.records().await.unwrap();
-        let mut batches = RecordBatches::try_collect(records).await.unwrap().take();
-        assert_eq!(batches.len(), 1);
-        let batch = batches.remove(0);
-        assert_eq!(batch.num_rows(), 1);
-
-        let row = batch.rows().next().unwrap();
-        let Value::UInt8(entry_type) = row[0] else { unreachable!() };
-        let Value::Binary(key) = row[1].clone() else { unreachable!() };
-        let Value::Binary(value) = row[3].clone() else { unreachable!() };
-        let entry = decode_system_catalog(Some(entry_type), Some(&*key), Some(&*value)).unwrap();
-        let expected = Entry::Table(TableEntry {
-            catalog_name: DEFAULT_CATALOG_NAME.to_string(),
-            schema_name: DEFAULT_SCHEMA_NAME.to_string(),
-            table_name: "my_table".to_string(),
-            table_id: 1,
-            engine: MITO_ENGINE.to_string(),
-        });
-        assert_eq!(entry, expected);
-
-        let table_deletion = build_table_deletion_request(
-            &DeregisterTableRequest {
-                catalog: DEFAULT_CATALOG_NAME.to_string(),
-                schema: DEFAULT_SCHEMA_NAME.to_string(),
-                table_name: "my_table".to_string(),
-            },
-            1,
-        );
-        let result = catalog_table.delete(table_deletion).await.unwrap();
-        assert_eq!(result, 1);
-
-        let records = catalog_table.records().await.unwrap();
-        let batches = RecordBatches::try_collect(records).await.unwrap().take();
-        assert_eq!(batches.len(), 0);
-    }
 }
--- a/src/catalog/src/table_source.rs
+++ b/src/catalog/src/table_source.rs
@@ -1,190 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use common_catalog::consts::INFORMATION_SCHEMA_NAME;
-use common_catalog::format_full_table_name;
-use datafusion::common::{ResolvedTableReference, TableReference};
-use datafusion::datasource::provider_as_source;
-use datafusion::logical_expr::TableSource;
-use session::context::QueryContext;
-use snafu::{ensure, OptionExt};
-use table::table::adapter::DfTableProviderAdapter;
-
-use crate::error::{
-    CatalogNotFoundSnafu, QueryAccessDeniedSnafu, Result, SchemaNotFoundSnafu, TableNotExistSnafu,
-};
-use crate::information_schema::InformationSchemaProvider;
-use crate::CatalogListRef;
-
-pub struct DfTableSourceProvider {
-    catalog_list: CatalogListRef,
-    resolved_tables: HashMap<String, Arc<dyn TableSource>>,
-    disallow_cross_schema_query: bool,
-    default_catalog: String,
-    default_schema: String,
-}
-
-impl DfTableSourceProvider {
-    pub fn new(
-        catalog_list: CatalogListRef,
-        disallow_cross_schema_query: bool,
-        query_ctx: &QueryContext,
-    ) -> Self {
-        Self {
-            catalog_list,
-            disallow_cross_schema_query,
-            resolved_tables: HashMap::new(),
-            default_catalog: query_ctx.current_catalog(),
-            default_schema: query_ctx.current_schema(),
-        }
-    }
-
-    pub fn resolve_table_ref<'a>(
-        &'a self,
-        table_ref: TableReference<'a>,
-    ) -> Result<ResolvedTableReference<'a>> {
-        if self.disallow_cross_schema_query {
-            match &table_ref {
-                TableReference::Bare { .. } => (),
-                TableReference::Partial { schema, .. } => {
-                    ensure!(
-                        schema.as_ref() == self.default_schema,
-                        QueryAccessDeniedSnafu {
-                            catalog: &self.default_catalog,
-                            schema: schema.as_ref(),
-                        }
-                    );
-                }
-                TableReference::Full {
-                    catalog, schema, ..
-                } => {
-                    ensure!(
-                        catalog.as_ref() == self.default_catalog
-                            && schema.as_ref() == self.default_schema,
-                        QueryAccessDeniedSnafu {
-                            catalog: catalog.as_ref(),
-                            schema: schema.as_ref()
-                        }
-                    );
-                }
-            };
-        }
-
-        Ok(table_ref.resolve(&self.default_catalog, &self.default_schema))
-    }
-
-    pub async fn resolve_table(
-        &mut self,
-        table_ref: TableReference<'_>,
-    ) -> Result<Arc<dyn TableSource>> {
-        let table_ref = self.resolve_table_ref(table_ref)?;
-
-        let resolved_name = table_ref.to_string();
-        if let Some(table) = self.resolved_tables.get(&resolved_name) {
-            return Ok(table.clone());
-        }
-
-        let catalog_name = table_ref.catalog.as_ref();
-        let schema_name = table_ref.schema.as_ref();
-        let table_name = table_ref.table.as_ref();
-
-        let schema = if schema_name != INFORMATION_SCHEMA_NAME {
-            let catalog = self
-                .catalog_list
-                .catalog(catalog_name)?
-                .context(CatalogNotFoundSnafu { catalog_name })?;
-            catalog.schema(schema_name)?.context(SchemaNotFoundSnafu {
-                catalog: catalog_name,
-                schema: schema_name,
-            })?
-        } else {
-            let catalog_provider = self
-                .catalog_list
-                .catalog(catalog_name)?
-                .context(CatalogNotFoundSnafu { catalog_name })?;
-            Arc::new(InformationSchemaProvider::new(
-                catalog_name.to_string(),
-                catalog_provider,
-            ))
-        };
-        let table = schema
-            .table(table_name)
-            .await?
-            .with_context(|| TableNotExistSnafu {
-                table: format_full_table_name(catalog_name, schema_name, table_name),
-            })?;
-
-        let table = DfTableProviderAdapter::new(table);
-        let table = provider_as_source(Arc::new(table));
-        self.resolved_tables.insert(resolved_name, table.clone());
-        Ok(table)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::borrow::Cow;
-
-    use session::context::QueryContext;
-
-    use super::*;
-    use crate::local::MemoryCatalogManager;
-
-    #[test]
-    fn test_validate_table_ref() {
-        let query_ctx = &QueryContext::with("greptime", "public");
-
-        let table_provider =
-            DfTableSourceProvider::new(Arc::new(MemoryCatalogManager::default()), true, query_ctx);
-
-        let table_ref = TableReference::Bare {
-            table: Cow::Borrowed("table_name"),
-        };
-        let result = table_provider.resolve_table_ref(table_ref);
-        assert!(result.is_ok());
-
-        let table_ref = TableReference::Partial {
-            schema: Cow::Borrowed("public"),
-            table: Cow::Borrowed("table_name"),
-        };
-        let result = table_provider.resolve_table_ref(table_ref);
-        assert!(result.is_ok());
-
-        let table_ref = TableReference::Partial {
-            schema: Cow::Borrowed("wrong_schema"),
-            table: Cow::Borrowed("table_name"),
-        };
-        let result = table_provider.resolve_table_ref(table_ref);
-        assert!(result.is_err());
-
-        let table_ref = TableReference::Full {
-            catalog: Cow::Borrowed("greptime"),
-            schema: Cow::Borrowed("public"),
-            table: Cow::Borrowed("table_name"),
-        };
-        let result = table_provider.resolve_table_ref(table_ref);
-        assert!(result.is_ok());
-
-        let table_ref = TableReference::Full {
-            catalog: Cow::Borrowed("wrong_catalog"),
-            schema: Cow::Borrowed("public"),
-            table: Cow::Borrowed("table_name"),
-        };
-        let result = table_provider.resolve_table_ref(table_ref);
-        assert!(result.is_err());
-    }
-}
--- a/src/catalog/src/tables.rs
+++ b/src/catalog/src/tables.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -15,45 +15,231 @@
 // The `tables` table in system catalog keeps a record of all tables created by user.

 use std::any::Any;
+use std::pin::Pin;
 use std::sync::Arc;
+use std::task::{Context, Poll};

-use async_trait::async_trait;
+use async_stream::stream;
 use common_catalog::consts::{INFORMATION_SCHEMA_NAME, SYSTEM_CATALOG_TABLE_NAME};
+use common_error::ext::BoxedError;
+use common_query::logical_plan::Expr;
+use common_query::physical_plan::PhysicalPlanRef;
+use common_recordbatch::error::Result as RecordBatchResult;
+use common_recordbatch::{RecordBatch, RecordBatchStream};
+use datatypes::prelude::{ConcreteDataType, DataType};
+use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
+use datatypes::value::ValueRef;
+use datatypes::vectors::VectorRef;
+use futures::Stream;
 use snafu::ResultExt;
-use table::metadata::TableId;
+use table::engine::TableEngineRef;
+use table::error::TablesRecordBatchSnafu;
+use table::metadata::{TableId, TableInfoRef};
+use table::table::scan::SimpleTableScan;
 use table::{Table, TableRef};

-use crate::error::{self, Error, InsertCatalogRecordSnafu, Result as CatalogResult};
-use crate::system::{
-    build_schema_insert_request, build_table_deletion_request, build_table_insert_request,
-    SystemCatalogTable,
+use crate::error::{Error, InsertCatalogRecordSnafu};
+use crate::system::{build_schema_insert_request, build_table_insert_request, SystemCatalogTable};
+use crate::{
+    format_full_table_name, CatalogListRef, CatalogProvider, SchemaProvider, SchemaProviderRef,
 };
-use crate::{CatalogProvider, DeregisterTableRequest, SchemaProvider, SchemaProviderRef};
+
+/// Tables holds all tables created by user.
+pub struct Tables {
+    schema: SchemaRef,
+    catalogs: CatalogListRef,
+    engine_name: String,
+}
+
+impl Tables {
+    pub fn new(catalogs: CatalogListRef, engine_name: String) -> Self {
+        Self {
+            schema: Arc::new(build_schema_for_tables()),
+            catalogs,
+            engine_name,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl Table for Tables {
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn schema(&self) -> SchemaRef {
+        self.schema.clone()
+    }
+
+    fn table_info(&self) -> TableInfoRef {
+        unreachable!("Tables does not support table_info method")
+    }
+
+    async fn scan(
+        &self,
+        _projection: &Option<Vec<usize>>,
+        _filters: &[Expr],
+        _limit: Option<usize>,
+    ) -> table::error::Result<PhysicalPlanRef> {
+        let catalogs = self.catalogs.clone();
+        let schema_ref = self.schema.clone();
+        let engine_name = self.engine_name.clone();
+
+        let stream = stream!({
+            for catalog_name in catalogs
+                .catalog_names()
+                .map_err(BoxedError::new)
+                .context(TablesRecordBatchSnafu)?
+            {
+                let catalog = catalogs
+                    .catalog(&catalog_name)
+                    .map_err(BoxedError::new)
+                    .context(TablesRecordBatchSnafu)?
+                    .unwrap();
+                for schema_name in catalog
+                    .schema_names()
+                    .map_err(BoxedError::new)
+                    .context(TablesRecordBatchSnafu)?
+                {
+                    let mut tables_in_schema = Vec::with_capacity(
+                        catalog
+                            .schema_names()
+                            .map_err(BoxedError::new)
+                            .context(TablesRecordBatchSnafu)?
+                            .len(),
+                    );
+                    let schema = catalog
+                        .schema(&schema_name)
+                        .map_err(BoxedError::new)
+                        .context(TablesRecordBatchSnafu)?
+                        .unwrap();
+                    for table_name in schema
+                        .table_names()
+                        .map_err(BoxedError::new)
+                        .context(TablesRecordBatchSnafu)?
+                    {
+                        tables_in_schema.push(table_name);
+                    }
+
+                    let vec = tables_to_record_batch(
+                        &catalog_name,
+                        &schema_name,
+                        tables_in_schema,
+                        &engine_name,
+                    );
+                    let record_batch_res = RecordBatch::new(schema_ref.clone(), vec);
+                    yield record_batch_res;
+                }
+            }
+        });
+
+        let stream = Box::pin(TablesRecordBatchStream {
+            schema: self.schema.clone(),
+            stream: Box::pin(stream),
+        });
+        Ok(Arc::new(SimpleTableScan::new(stream)))
+    }
+}
+
+/// Convert tables info to `RecordBatch`.
+fn tables_to_record_batch(
+    catalog_name: &str,
+    schema_name: &str,
+    table_names: Vec<String>,
+    engine: &str,
+) -> Vec<VectorRef> {
+    let mut catalog_vec =
+        ConcreteDataType::string_datatype().create_mutable_vector(table_names.len());
+    let mut schema_vec =
+        ConcreteDataType::string_datatype().create_mutable_vector(table_names.len());
+    let mut table_name_vec =
+        ConcreteDataType::string_datatype().create_mutable_vector(table_names.len());
+    let mut engine_vec =
+        ConcreteDataType::string_datatype().create_mutable_vector(table_names.len());
+
+    for table_name in table_names {
+        // Safety: All these vectors are string type.
+        catalog_vec
+            .push_value_ref(ValueRef::String(catalog_name))
+            .unwrap();
+        schema_vec
+            .push_value_ref(ValueRef::String(schema_name))
+            .unwrap();
+        table_name_vec
+            .push_value_ref(ValueRef::String(&table_name))
+            .unwrap();
+        engine_vec.push_value_ref(ValueRef::String(engine)).unwrap();
+    }
+
+    vec![
+        catalog_vec.to_vector(),
+        schema_vec.to_vector(),
+        table_name_vec.to_vector(),
+        engine_vec.to_vector(),
+    ]
+}
+
+pub struct TablesRecordBatchStream {
+    schema: SchemaRef,
+    stream: Pin<Box<dyn Stream<Item = RecordBatchResult<RecordBatch>> + Send>>,
+}
+
+impl Stream for TablesRecordBatchStream {
+    type Item = RecordBatchResult<RecordBatch>;
+
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        Pin::new(&mut self.stream).poll_next(cx)
+    }
+}
+
+impl RecordBatchStream for TablesRecordBatchStream {
+    fn schema(&self) -> SchemaRef {
+        self.schema.clone()
+    }
+}

 pub struct InformationSchema {
+    pub tables: Arc<Tables>,
    pub system: Arc<SystemCatalogTable>,
 }

-#[async_trait]
 impl SchemaProvider for InformationSchema {
    fn as_any(&self) -> &dyn Any {
        self
    }

    fn table_names(&self) -> Result<Vec<String>, Error> {
-        Ok(vec![SYSTEM_CATALOG_TABLE_NAME.to_string()])
+        Ok(vec![
+            "tables".to_string(),
+            SYSTEM_CATALOG_TABLE_NAME.to_string(),
+        ])
    }

-    async fn table(&self, name: &str) -> Result<Option<TableRef>, Error> {
-        if name.eq_ignore_ascii_case(SYSTEM_CATALOG_TABLE_NAME) {
+    fn table(&self, name: &str) -> Result<Option<TableRef>, Error> {
+        if name.eq_ignore_ascii_case("tables") {
+            Ok(Some(self.tables.clone()))
+        } else if name.eq_ignore_ascii_case(SYSTEM_CATALOG_TABLE_NAME) {
            Ok(Some(self.system.clone()))
        } else {
            Ok(None)
        }
    }

+    fn register_table(
+        &self,
+        _name: String,
+        _table: TableRef,
+    ) -> crate::error::Result<Option<TableRef>> {
+        panic!("System catalog & schema does not support register table")
+    }
+
+    fn deregister_table(&self, _name: &str) -> crate::error::Result<Option<TableRef>> {
+        panic!("System catalog & schema does not support deregister table")
+    }
+
    fn table_exist(&self, name: &str) -> Result<bool, Error> {
-        Ok(name.eq_ignore_ascii_case(SYSTEM_CATALOG_TABLE_NAME))
+        Ok(name.eq_ignore_ascii_case("tables")
+            || name.eq_ignore_ascii_case(SYSTEM_CATALOG_TABLE_NAME))
    }
 }

@@ -62,8 +248,13 @@ pub struct SystemCatalog {
 }

 impl SystemCatalog {
-    pub(crate) fn new(system: SystemCatalogTable) -> Self {
+    pub fn new(
+        system: SystemCatalogTable,
+        catalogs: CatalogListRef,
+        engine: TableEngineRef,
+    ) -> Self {
        let schema = InformationSchema {
+            tables: Arc::new(Tables::new(catalogs, engine.name().to_string())),
            system: Arc::new(system),
        };
        Self {
@@ -77,9 +268,9 @@ impl SystemCatalog {
        schema: String,
        table_name: String,
        table_id: TableId,
-        engine: String,
    ) -> crate::error::Result<usize> {
-        let request = build_table_insert_request(catalog, schema, table_name, table_id, engine);
+        let full_table_name = format_full_table_name(&catalog, &schema, &table_name);
+        let request = build_table_insert_request(full_table_name, table_id);
        self.information_schema
            .system
            .insert(request)
@@ -87,21 +278,6 @@ impl SystemCatalog {
            .context(InsertCatalogRecordSnafu)
    }

-    pub(crate) async fn deregister_table(
-        &self,
-        request: &DeregisterTableRequest,
-        table_id: TableId,
-    ) -> CatalogResult<bool> {
-        self.information_schema
-            .system
-            .delete(build_table_deletion_request(request, table_id))
-            .await
-            .map(|x| x == 1)
-            .with_context(|_| error::DeregisterTableSnafu {
-                request: request.clone(),
-            })
-    }
-
    pub async fn register_schema(
        &self,
        catalog: String,
@@ -141,3 +317,104 @@ impl CatalogProvider for SystemCatalog {
        }
    }
 }
+
+fn build_schema_for_tables() -> Schema {
+    let cols = vec![
+        ColumnSchema::new(
+            "catalog".to_string(),
+            ConcreteDataType::string_datatype(),
+            false,
+        ),
+        ColumnSchema::new(
+            "schema".to_string(),
+            ConcreteDataType::string_datatype(),
+            false,
+        ),
+        ColumnSchema::new(
+            "table_name".to_string(),
+            ConcreteDataType::string_datatype(),
+            false,
+        ),
+        ColumnSchema::new(
+            "engine".to_string(),
+            ConcreteDataType::string_datatype(),
+            false,
+        ),
+    ];
+    Schema::new(cols)
+}
+
+#[cfg(test)]
+mod tests {
+    use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
+    use common_query::physical_plan::SessionContext;
+    use futures_util::StreamExt;
+    use table::table::numbers::NumbersTable;
+
+    use super::*;
+    use crate::local::memory::new_memory_catalog_list;
+    use crate::CatalogList;
+
+    #[tokio::test]
+    async fn test_tables() {
+        let catalog_list = new_memory_catalog_list().unwrap();
+        let schema = catalog_list
+            .catalog(DEFAULT_CATALOG_NAME)
+            .unwrap()
+            .unwrap()
+            .schema(DEFAULT_SCHEMA_NAME)
+            .unwrap()
+            .unwrap();
+        schema
+            .register_table("test_table".to_string(), Arc::new(NumbersTable::default()))
+            .unwrap();
+
+        let tables = Tables::new(catalog_list, "test_engine".to_string());
+        let tables_stream = tables.scan(&None, &[], None).await.unwrap();
+        let session_ctx = SessionContext::new();
+        let mut tables_stream = tables_stream.execute(0, session_ctx.task_ctx()).unwrap();
+
+        if let Some(t) = tables_stream.next().await {
+            let batch = t.unwrap();
+            assert_eq!(1, batch.num_rows());
+            assert_eq!(4, batch.num_columns());
+            assert_eq!(
+                ConcreteDataType::string_datatype(),
+                batch.column(0).data_type()
+            );
+            assert_eq!(
+                ConcreteDataType::string_datatype(),
+                batch.column(1).data_type()
+            );
+            assert_eq!(
+                ConcreteDataType::string_datatype(),
+                batch.column(2).data_type()
+            );
+            assert_eq!(
+                ConcreteDataType::string_datatype(),
+                batch.column(3).data_type()
+            );
+            assert_eq!(
+                "greptime",
+                batch.column(0).get_ref(0).as_string().unwrap().unwrap()
+            );
+
+            assert_eq!(
+                "public",
+                batch.column(1).get_ref(0).as_string().unwrap().unwrap()
+            );
+
+            assert_eq!(
+                "test_table",
+                batch.column(2).get_ref(0).as_string().unwrap().unwrap()
+            );
+
+            assert_eq!(
+                "test_engine",
+                batch.column(3).get_ref(0).as_string().unwrap().unwrap()
+            );
+        } else {
+            panic!("Record batch should not be empty!")
+        }
+    }
+}
--- a/src/catalog/tests/local_catalog_tests.rs
+++ b/src/catalog/tests/local_catalog_tests.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -17,11 +17,10 @@ mod tests {
    use std::sync::Arc;

    use catalog::local::LocalCatalogManager;
-    use catalog::{CatalogManager, RegisterTableRequest, RenameTableRequest};
+    use catalog::{CatalogManager, RegisterTableRequest};
    use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
    use common_telemetry::{error, info};
    use mito::config::EngineConfig;
-    use table::engine::manager::MemoryTableEngineManager;
    use table::table::numbers::NumbersTable;
    use table::TableRef;
    use tokio::sync::Mutex;
@@ -34,51 +33,11 @@ mod tests {
            mito::table::test_util::MockEngine::default(),
            object_store,
        ));
-        let engine_manager = Arc::new(MemoryTableEngineManager::new(mock_engine.clone()));
-        let catalog_manager = LocalCatalogManager::try_new(engine_manager).await.unwrap();
+        let catalog_manager = LocalCatalogManager::try_new(mock_engine).await.unwrap();
        catalog_manager.start().await?;
        Ok(catalog_manager)
    }

-    #[tokio::test]
-    async fn test_rename_table() {
-        common_telemetry::init_default_ut_logging();
-        let catalog_manager = create_local_catalog_manager().await.unwrap();
-        // register table
-        let table_name = "test_table";
-        let table_id = 42;
-        let table = Arc::new(NumbersTable::new(table_id));
-        let request = RegisterTableRequest {
-            catalog: DEFAULT_CATALOG_NAME.to_string(),
-            schema: DEFAULT_SCHEMA_NAME.to_string(),
-            table_name: table_name.to_string(),
-            table_id,
-            table: table.clone(),
-        };
-        assert!(catalog_manager.register_table(request).await.unwrap());
-
-        // rename table
-        let new_table_name = "table_t";
-        let rename_table_req = RenameTableRequest {
-            catalog: DEFAULT_CATALOG_NAME.to_string(),
-            schema: DEFAULT_SCHEMA_NAME.to_string(),
-            table_name: table_name.to_string(),
-            new_table_name: new_table_name.to_string(),
-            table_id,
-        };
-        assert!(catalog_manager
-            .rename_table(rename_table_req)
-            .await
-            .unwrap());
-
-        let registered_table = catalog_manager
-            .table(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, new_table_name)
-            .await
-            .unwrap()
-            .unwrap();
-        assert_eq!(registered_table.table_info().ident.table_id, table_id);
-    }
-
    #[tokio::test]
    async fn test_duplicate_register() {
        let catalog_manager = create_local_catalog_manager().await.unwrap();
@@ -110,7 +69,8 @@ mod tests {
        assert!(
            err.to_string()
                .contains("Table `greptime.public.test_table` already exists"),
-            "Actual error message: {err}",
+            "Actual error message: {}",
+            err
        );
    }

@@ -161,7 +121,6 @@ mod tests {
            let table = guard.as_ref().unwrap();
            let table_registered = catalog_manager
                .table(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, "test_table")
-                .await
                .unwrap()
                .unwrap();
            assert_eq!(
--- a/src/catalog/tests/mock.rs
+++ b/src/catalog/tests/mock.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -147,7 +147,6 @@ impl TableEngine for MockTableEngine {
        let table_id = TableId::from_str(
            request
                .table_options
-                .extra_options
                .get("table_id")
                .unwrap_or(&default_table_id),
        )
@@ -190,10 +189,10 @@ impl TableEngine for MockTableEngine {
        unimplemented!()
    }

-    fn get_table(
+    fn get_table<'a>(
        &self,
        _ctx: &EngineContext,
-        table_ref: &TableReference,
+        table_ref: &'a TableReference,
    ) -> table::Result<Option<TableRef>> {
        futures::executor::block_on(async {
            Ok(self
@@ -205,7 +204,7 @@ impl TableEngine for MockTableEngine {
        })
    }

-    fn table_exists(&self, _ctx: &EngineContext, table_ref: &TableReference) -> bool {
+    fn table_exists<'a>(&self, _ctx: &EngineContext, table_ref: &'a TableReference) -> bool {
        futures::executor::block_on(async {
            self.tables
                .read()
@@ -221,8 +220,4 @@ impl TableEngine for MockTableEngine {
    ) -> table::Result<bool> {
        unimplemented!()
    }
-
-    async fn close(&self) -> table::Result<()> {
-        Ok(())
-    }
 }
--- a/src/catalog/tests/remote_catalog_tests.rs
+++ b/src/catalog/tests/remote_catalog_tests.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -27,10 +27,9 @@ mod tests {
        KvBackend, KvBackendRef, RemoteCatalogManager, RemoteCatalogProvider, RemoteSchemaProvider,
    };
    use catalog::{CatalogList, CatalogManager, RegisterTableRequest};
-    use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, MITO_ENGINE};
-    use datatypes::schema::RawSchema;
+    use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
+    use datatypes::schema::Schema;
    use futures_util::StreamExt;
-    use table::engine::manager::MemoryTableEngineManager;
    use table::engine::{EngineContext, TableEngineRef};
    use table::requests::CreateTableRequest;

@@ -81,11 +80,8 @@ mod tests {
    ) -> (KvBackendRef, TableEngineRef, Arc<RemoteCatalogManager>) {
        let backend = Arc::new(MockKvBackend::default()) as KvBackendRef;
        let table_engine = Arc::new(MockTableEngine::default());
-        let engine_manager = Arc::new(MemoryTableEngineManager::alias(
-            MITO_ENGINE.to_string(),
-            table_engine.clone(),
-        ));
-        let catalog_manager = RemoteCatalogManager::new(engine_manager, node_id, backend.clone());
+        let catalog_manager =
+            RemoteCatalogManager::new(table_engine.clone(), node_id, backend.clone());
        catalog_manager.start().await.unwrap();
        (backend, table_engine, Arc::new(catalog_manager))
    }
@@ -120,7 +116,7 @@ mod tests {
        let schema_name = "nonexistent_schema".to_string();
        let table_name = "fail_table".to_string();
        // this schema has no effect
-        let table_schema = RawSchema::new(vec![]);
+        let table_schema = Arc::new(Schema::new(vec![]));
        let table = table_engine
            .create_table(
                &EngineContext {},
@@ -130,12 +126,11 @@ mod tests {
                    schema_name: schema_name.clone(),
                    table_name: table_name.clone(),
                    desc: None,
-                    schema: table_schema,
+                    schema: table_schema.clone(),
                    region_numbers: vec![0],
                    primary_key_indices: vec![],
                    create_if_not_exists: false,
                    table_options: Default::default(),
-                    engine: MITO_ENGINE.to_string(),
                },
            )
            .await
@@ -173,6 +168,7 @@ mod tests {
            .schema(DEFAULT_SCHEMA_NAME)
            .unwrap()
            .unwrap();
+        assert_eq!(vec!["numbers"], default_schema.table_names().unwrap());

        // register a new table with an nonexistent catalog
        let catalog_name = DEFAULT_CATALOG_NAME.to_string();
@@ -180,7 +176,7 @@ mod tests {
        let table_name = "test_table".to_string();
        let table_id = 1;
        // this schema has no effect
-        let table_schema = RawSchema::new(vec![]);
+        let table_schema = Arc::new(Schema::new(vec![]));
        let table = table_engine
            .create_table(
                &EngineContext {},
@@ -190,12 +186,11 @@ mod tests {
                    schema_name: schema_name.clone(),
                    table_name: table_name.clone(),
                    desc: None,
-                    schema: table_schema,
+                    schema: table_schema.clone(),
                    region_numbers: vec![0],
                    primary_key_indices: vec![],
                    create_if_not_exists: false,
                    table_options: Default::default(),
-                    engine: MITO_ENGINE.to_string(),
                },
            )
            .await
@@ -208,7 +203,14 @@ mod tests {
            table,
        };
        assert!(catalog_manager.register_table(reg_req).await.unwrap());
-        assert_eq!(vec![table_name], default_schema.table_names().unwrap());
+        assert_eq!(
+            HashSet::from([table_name, "numbers".to_string()]),
+            default_schema
+                .table_names()
+                .unwrap()
+                .into_iter()
+                .collect::<HashSet<_>>()
+        );
    }

    #[tokio::test]
@@ -244,12 +246,11 @@ mod tests {
                    schema_name: schema_name.clone(),
                    table_name: "".to_string(),
                    desc: None,
-                    schema: RawSchema::new(vec![]),
+                    schema: Arc::new(Schema::new(vec![])),
                    region_numbers: vec![0],
                    primary_key_indices: vec![],
                    create_if_not_exists: false,
                    table_options: Default::default(),
-                    engine: MITO_ENGINE.to_string(),
                },
            )
            .await
--- a/src/client/Cargo.toml
+++ b/src/client/Cargo.toml
@@ -1,40 +1,40 @@
 [package]
 name = "client"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
+version = "0.1.0"
+edition = "2021"
+license = "Apache-2.0"
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
 api = { path = "../api" }
-arrow-flight.workspace = true
-async-stream.workspace = true
+async-stream = "0.3"
 common-base = { path = "../common/base" }
-common-catalog = { path = "../common/catalog" }
 common-error = { path = "../common/error" }
 common-grpc = { path = "../common/grpc" }
 common-grpc-expr = { path = "../common/grpc-expr" }
 common-query = { path = "../common/query" }
 common-recordbatch = { path = "../common/recordbatch" }
 common-time = { path = "../common/time" }
-common-telemetry = { path = "../common/telemetry" }
-datafusion.workspace = true
+datafusion = "14.0.0"
 datatypes = { path = "../datatypes" }
 enum_dispatch = "0.3"
-futures-util.workspace = true
 parking_lot = "0.12"
-prost.workspace = true
-rand.workspace = true
-snafu.workspace = true
-tonic.workspace = true
+rand = "0.8"
+snafu = { version = "0.7", features = ["backtraces"] }
+tonic = "0.8"

 [dev-dependencies]
 datanode = { path = "../datanode" }
 substrait = { path = "../common/substrait" }
-tokio.workspace = true
+tokio = { version = "1.0", features = ["full"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-prost.workspace = true
+
+# TODO(ruihang): upgrade to 0.11 once substrait-rs supports it.
+[dev-dependencies.prost_09]
+package = "prost"
+version = "0.9"

 [dev-dependencies.substrait_proto]
 package = "substrait"
-version = "0.4"
+version = "0.2"
--- a/src/client/examples/insert.rs
+++ b/src/client/examples/insert.rs
@@ -0,0 +1,106 @@
+// 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 api::v1::*;
+use client::{Client, Database};
+
+fn main() {
+    tracing::subscriber::set_global_default(tracing_subscriber::FmtSubscriber::builder().finish())
+        .unwrap();
+
+    run();
+}
+
+#[tokio::main]
+async fn run() {
+    let client = Client::with_urls(vec!["127.0.0.1:3001"]);
+    let db = Database::new("greptime", client);
+
+    let (columns, row_count) = insert_data();
+
+    let expr = InsertExpr {
+        schema_name: "public".to_string(),
+        table_name: "demo".to_string(),
+        region_number: 0,
+        columns,
+        row_count,
+    };
+    db.insert(expr).await.unwrap();
+}
+
+fn insert_data() -> (Vec<Column>, u32) {
+    const SEMANTIC_TAG: i32 = 0;
+    const SEMANTIC_FIELD: i32 = 1;
+    const SEMANTIC_TS: i32 = 2;
+
+    let row_count = 4;
+
+    let host_vals = column::Values {
+        string_values: vec![
+            "host1".to_string(),
+            "host2".to_string(),
+            "host3".to_string(),
+            "host4".to_string(),
+        ],
+        ..Default::default()
+    };
+    let host_column = Column {
+        column_name: "host".to_string(),
+        semantic_type: SEMANTIC_TAG,
+        values: Some(host_vals),
+        null_mask: vec![0],
+        ..Default::default()
+    };
+
+    let cpu_vals = column::Values {
+        f64_values: vec![0.31, 0.41, 0.2],
+        ..Default::default()
+    };
+    let cpu_column = Column {
+        column_name: "cpu".to_string(),
+        semantic_type: SEMANTIC_FIELD,
+        values: Some(cpu_vals),
+        null_mask: vec![2],
+        ..Default::default()
+    };
+
+    let mem_vals = column::Values {
+        f64_values: vec![0.1, 0.2, 0.3],
+        ..Default::default()
+    };
+    let mem_column = Column {
+        column_name: "memory".to_string(),
+        semantic_type: SEMANTIC_FIELD,
+        values: Some(mem_vals),
+        null_mask: vec![4],
+        ..Default::default()
+    };
+
+    let ts_vals = column::Values {
+        i64_values: vec![100, 101, 102, 103],
+        ..Default::default()
+    };
+    let ts_column = Column {
+        column_name: "ts".to_string(),
+        semantic_type: SEMANTIC_TS,
+        values: Some(ts_vals),
+        null_mask: vec![0],
+        ..Default::default()
+    };
+
+    (
+        vec![host_column, cpu_column, mem_column, ts_column],
+        row_count,
+    )
+}
--- a/src/client/examples/logical.rs
+++ b/src/client/examples/logical.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use api::v1::{ColumnDataType, ColumnDef, CreateTableExpr, TableId};
+use api::v1::{ColumnDataType, ColumnDef, CreateExpr};
+use client::admin::Admin;
 use client::{Client, Database};
-use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, MITO_ENGINE};
-use prost::Message;
-use substrait_proto::proto::plan_rel::RelType as PlanRelType;
-use substrait_proto::proto::read_rel::{NamedTable, ReadType};
-use substrait_proto::proto::rel::RelType;
-use substrait_proto::proto::{PlanRel, ReadRel, Rel};
+use prost_09::Message;
+use substrait_proto::protobuf::plan_rel::RelType as PlanRelType;
+use substrait_proto::protobuf::read_rel::{NamedTable, ReadType};
+use substrait_proto::protobuf::rel::RelType;
+use substrait_proto::protobuf::{PlanRel, ReadRel, Rel};
 use tracing::{event, Level};

 fn main() {
@@ -33,46 +33,46 @@ fn main() {
 async fn run() {
    let client = Client::with_urls(vec!["127.0.0.1:3001"]);

-    let create_table_expr = CreateTableExpr {
-        catalog_name: "greptime".to_string(),
-        schema_name: "public".to_string(),
+    let create_table_expr = CreateExpr {
+        catalog_name: Some("greptime".to_string()),
+        schema_name: Some("public".to_string()),
        table_name: "test_logical_dist_exec".to_string(),
-        desc: "".to_string(),
+        desc: None,
        column_defs: vec![
            ColumnDef {
                name: "timestamp".to_string(),
                datatype: ColumnDataType::TimestampMillisecond as i32,
                is_nullable: false,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "key".to_string(),
                datatype: ColumnDataType::Uint64 as i32,
                is_nullable: false,
-                default_constraint: vec![],
+                default_constraint: None,
            },
            ColumnDef {
                name: "value".to_string(),
                datatype: ColumnDataType::Uint64 as i32,
                is_nullable: false,
-                default_constraint: vec![],
+                default_constraint: None,
            },
        ],
        time_index: "timestamp".to_string(),
        primary_keys: vec!["key".to_string()],
        create_if_not_exists: false,
        table_options: Default::default(),
-        table_id: Some(TableId { id: 1024 }),
+        table_id: Some(1024),
        region_ids: vec![0],
-        engine: MITO_ENGINE.to_string(),
    };

-    let db = Database::new(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, client);
-    let result = db.create(create_table_expr).await.unwrap();
+    let admin = Admin::new("create table", client.clone());
+    let result = admin.create(create_table_expr).await.unwrap();
    event!(Level::INFO, "create table result: {:#?}", result);

    let logical = mock_logical_plan();
    event!(Level::INFO, "plan size: {:#?}", logical.len());
+    let db = Database::new("greptime", client);
    let result = db.logical_plan(logical).await.unwrap();

    event!(Level::INFO, "result: {:#?}", result);
@@ -90,8 +90,12 @@ fn mock_logical_plan() -> Vec<u8> {
    let read_type = ReadType::NamedTable(named_table);

    let read_rel = ReadRel {
+        common: None,
+        base_schema: None,
+        filter: None,
+        projection: None,
+        advanced_extension: None,
        read_type: Some(read_type),
-        ..Default::default()
    };

    let mut buf = vec![];
--- a/src/client/examples/select.rs
+++ b/src/client/examples/select.rs
@@ -0,0 +1,34 @@
+// 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 client::{Client, Database, Select};
+use tracing::{event, Level};
+
+fn main() {
+    tracing::subscriber::set_global_default(tracing_subscriber::FmtSubscriber::builder().finish())
+        .unwrap();
+
+    run();
+}
+
+#[tokio::main]
+async fn run() {
+    let client = Client::with_urls(vec!["127.0.0.1:3001"]);
+    let db = Database::new("greptime", client);
+
+    let sql = Select::Sql("select * from demo".to_string());
+    let result = db.select(sql).await.unwrap();
+
+    event!(Level::INFO, "result: {:#?}", result);
+}
--- a/src/client/src/admin.rs
+++ b/src/client/src/admin.rs
@@ -0,0 +1,137 @@
+// 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 api::v1::*;
+use common_error::prelude::StatusCode;
+use common_query::Output;
+use snafu::prelude::*;
+
+use crate::database::PROTOCOL_VERSION;
+use crate::{error, Client, Result};
+
+#[derive(Clone, Debug)]
+pub struct Admin {
+    name: String,
+    client: Client,
+}
+
+impl Admin {
+    pub fn new(name: impl Into<String>, client: Client) -> Self {
+        Self {
+            name: name.into(),
+            client,
+        }
+    }
+
+    pub async fn create(&self, expr: CreateExpr) -> Result<AdminResult> {
+        let header = ExprHeader {
+            version: PROTOCOL_VERSION,
+        };
+        let expr = AdminExpr {
+            header: Some(header),
+            expr: Some(admin_expr::Expr::Create(expr)),
+        };
+        self.do_request(expr).await
+    }
+
+    pub async fn do_request(&self, expr: AdminExpr) -> Result<AdminResult> {
+        // `remove(0)` is safe because of `do_requests`'s invariants.
+        Ok(self.do_requests(vec![expr]).await?.remove(0))
+    }
+
+    pub async fn alter(&self, expr: AlterExpr) -> Result<AdminResult> {
+        let header = ExprHeader {
+            version: PROTOCOL_VERSION,
+        };
+        let expr = AdminExpr {
+            header: Some(header),
+            expr: Some(admin_expr::Expr::Alter(expr)),
+        };
+        self.do_request(expr).await
+    }
+
+    pub async fn drop_table(&self, expr: DropTableExpr) -> Result<AdminResult> {
+        let header = ExprHeader {
+            version: PROTOCOL_VERSION,
+        };
+        let expr = AdminExpr {
+            header: Some(header),
+            expr: Some(admin_expr::Expr::DropTable(expr)),
+        };
+
+        self.do_request(expr).await
+    }
+
+    /// Invariants: the lengths of input vec (`Vec<AdminExpr>`) and output vec (`Vec<AdminResult>`) are equal.
+    async fn do_requests(&self, exprs: Vec<AdminExpr>) -> Result<Vec<AdminResult>> {
+        let expr_count = exprs.len();
+        let req = AdminRequest {
+            name: self.name.clone(),
+            exprs,
+        };
+
+        let resp = self.client.admin(req).await?;
+
+        let results = resp.results;
+        ensure!(
+            results.len() == expr_count,
+            error::MissingResultSnafu {
+                name: "admin_results",
+                expected: expr_count,
+                actual: results.len(),
+            }
+        );
+        Ok(results)
+    }
+
+    pub async fn create_database(&self, expr: CreateDatabaseExpr) -> Result<AdminResult> {
+        let header = ExprHeader {
+            version: PROTOCOL_VERSION,
+        };
+        let expr = AdminExpr {
+            header: Some(header),
+            expr: Some(admin_expr::Expr::CreateDatabase(expr)),
+        };
+        Ok(self.do_requests(vec![expr]).await?.remove(0))
+    }
+}
+
+pub fn admin_result_to_output(admin_result: AdminResult) -> Result<Output> {
+    let header = admin_result.header.context(error::MissingHeaderSnafu)?;
+    if !StatusCode::is_success(header.code) {
+        return error::DatanodeSnafu {
+            code: header.code,
+            msg: header.err_msg,
+        }
+        .fail();
+    }
+
+    let result = admin_result.result.context(error::MissingResultSnafu {
+        name: "result".to_string(),
+        expected: 1_usize,
+        actual: 0_usize,
+    })?;
+    let output = match result {
+        admin_result::Result::Mutate(mutate) => {
+            if mutate.failure != 0 {
+                return error::MutateFailureSnafu {
+                    failure: mutate.failure,
+                }
+                .fail();
+            }
+            Output::AffectedRows(mutate.success as usize)
+        }
+    };
+    Ok(output)
+}
--- a/src/client/src/client.rs
+++ b/src/client/src/client.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -14,10 +14,8 @@

 use std::sync::Arc;

-use api::v1::greptime_database_client::GreptimeDatabaseClient;
-use api::v1::health_check_client::HealthCheckClient;
-use api::v1::HealthCheckRequest;
-use arrow_flight::flight_service_client::FlightServiceClient;
+use api::v1::greptime_client::GreptimeClient;
+use api::v1::*;
 use common_grpc::channel_manager::ChannelManager;
 use parking_lot::RwLock;
 use snafu::{OptionExt, ResultExt};
@@ -26,25 +24,6 @@ use tonic::transport::Channel;
 use crate::load_balance::{LoadBalance, Loadbalancer};
 use crate::{error, Result};

-pub(crate) struct DatabaseClient {
-    pub(crate) inner: GreptimeDatabaseClient<Channel>,
-}
-
-pub(crate) struct FlightClient {
-    addr: String,
-    client: FlightServiceClient<Channel>,
-}
-
-impl FlightClient {
-    pub(crate) fn addr(&self) -> &str {
-        &self.addr
-    }
-
-    pub(crate) fn mut_inner(&mut self) -> &mut FlightServiceClient<Channel> {
-        &mut self.client
-    }
-}
-
 #[derive(Clone, Debug, Default)]
 pub struct Client {
    inner: Arc<Inner>,
@@ -125,42 +104,57 @@ impl Client {
        self.inner.set_peers(urls);
    }

-    fn find_channel(&self) -> Result<(String, Channel)> {
-        let addr = self
+    pub async fn admin(&self, req: AdminRequest) -> Result<AdminResponse> {
+        let req = BatchRequest {
+            admins: vec![req],
+            ..Default::default()
+        };
+
+        let mut res = self.batch(req).await?;
+        res.admins.pop().context(error::MissingResultSnafu {
+            name: "admins",
+            expected: 1_usize,
+            actual: 0_usize,
+        })
+    }
+
+    pub async fn database(&self, req: DatabaseRequest) -> Result<DatabaseResponse> {
+        let req = BatchRequest {
+            databases: vec![req],
+            ..Default::default()
+        };
+
+        let mut res = self.batch(req).await?;
+        res.databases.pop().context(error::MissingResultSnafu {
+            name: "database",
+            expected: 1_usize,
+            actual: 0_usize,
+        })
+    }
+
+    pub async fn batch(&self, req: BatchRequest) -> Result<BatchResponse> {
+        let peer = self
            .inner
            .get_peer()
            .context(error::IllegalGrpcClientStateSnafu {
                err_msg: "No available peer found",
            })?;
+        let mut client = self.make_client(&peer)?;
+        let result = client
+            .batch(req)
+            .await
+            .context(error::TonicStatusSnafu { addr: peer })?;
+        Ok(result.into_inner())
+    }

+    fn make_client(&self, addr: impl AsRef<str>) -> Result<GreptimeClient<Channel>> {
+        let addr = addr.as_ref();
        let channel = self
            .inner
            .channel_manager
-            .get(&addr)
-            .context(error::CreateChannelSnafu { addr: &addr })?;
-        Ok((addr, channel))
-    }
-
-    pub(crate) fn make_flight_client(&self) -> Result<FlightClient> {
-        let (addr, channel) = self.find_channel()?;
-        Ok(FlightClient {
-            addr,
-            client: FlightServiceClient::new(channel),
-        })
-    }
-
-    pub(crate) fn make_database_client(&self) -> Result<DatabaseClient> {
-        let (_, channel) = self.find_channel()?;
-        Ok(DatabaseClient {
-            inner: GreptimeDatabaseClient::new(channel),
-        })
-    }
-
-    pub async fn health_check(&self) -> Result<()> {
-        let (_, channel) = self.find_channel()?;
-        let mut client = HealthCheckClient::new(channel);
-        client.health_check(HealthCheckRequest {}).await?;
-        Ok(())
+            .get(addr)
+            .context(error::CreateChannelSnafu { addr })?;
+        Ok(GreptimeClient::new(channel))
    }
 }

--- a/src/client/src/database.rs
+++ b/src/client/src/database.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -12,274 +12,236 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use api::v1::auth_header::AuthScheme;
-use api::v1::ddl_request::Expr as DdlExpr;
-use api::v1::greptime_request::Request;
-use api::v1::query_request::Query;
-use api::v1::{
-    greptime_response, AffectedRows, AlterExpr, AuthHeader, CreateTableExpr, DdlRequest,
-    DropTableExpr, FlushTableExpr, GreptimeRequest, InsertRequest, PromRangeQuery, QueryRequest,
-    RequestHeader,
-};
-use arrow_flight::{FlightData, Ticket};
-use common_error::prelude::*;
-use common_grpc::flight::{flight_messages_to_recordbatches, FlightDecoder, FlightMessage};
-use common_query::Output;
-use common_telemetry::logging;
-use futures_util::{TryFutureExt, TryStreamExt};
-use prost::Message;
-use snafu::{ensure, ResultExt};
+use std::sync::Arc;

-use crate::error::{
-    ConvertFlightDataSnafu, IllegalDatabaseResponseSnafu, IllegalFlightMessagesSnafu,
+use api::v1::codec::SelectResult as GrpcSelectResult;
+use api::v1::column::SemanticType;
+use api::v1::{
+    object_expr, object_result, select_expr, DatabaseRequest, ExprHeader, InsertExpr,
+    MutateResult as GrpcMutateResult, ObjectExpr, ObjectResult as GrpcObjectResult, SelectExpr,
 };
+use common_error::status_code::StatusCode;
+use common_grpc_expr::column_to_vector;
+use common_query::Output;
+use common_recordbatch::{RecordBatch, RecordBatches};
+use datatypes::prelude::*;
+use datatypes::schema::{ColumnSchema, Schema};
+use snafu::{ensure, OptionExt, ResultExt};
+
+use crate::error::{ColumnToVectorSnafu, ConvertSchemaSnafu, DatanodeSnafu, DecodeSelectSnafu};
 use crate::{error, Client, Result};

-#[derive(Clone, Debug, Default)]
-pub struct Database {
-    // The "catalog" and "schema" to be used in processing the requests at the server side.
-    // They are the "hint" or "context", just like how the "database" in "USE" statement is treated in MySQL.
-    // They will be carried in the request header.
-    catalog: String,
-    schema: String,
-    // The dbname follows naming rule as out mysql, postgres and http
-    // protocol. The server treat dbname in priority of catalog/schema.
-    dbname: String,
+pub const PROTOCOL_VERSION: u32 = 1;

+#[derive(Clone, Debug)]
+pub struct Database {
+    name: String,
    client: Client,
-    ctx: FlightContext,
 }

 impl Database {
-    /// Create database service client using catalog and schema
-    pub fn new(catalog: impl Into<String>, schema: impl Into<String>, client: Client) -> Self {
+    pub fn new(name: impl Into<String>, client: Client) -> Self {
        Self {
-            catalog: catalog.into(),
-            schema: schema.into(),
+            name: name.into(),
            client,
-            ..Default::default()
        }
    }

-    /// Create database service client using dbname.
-    ///
-    /// This API is designed for external usage. `dbname` is:
-    ///
-    /// - the name of database when using GreptimeDB standalone or cluster
-    /// - the name provided by GreptimeCloud or other multi-tenant GreptimeDB
-    /// environment
-    pub fn new_with_dbname(dbname: impl Into<String>, client: Client) -> Self {
-        Self {
-            dbname: dbname.into(),
-            client,
-            ..Default::default()
-        }
+    pub fn name(&self) -> &str {
+        &self.name
    }

-    pub fn catalog(&self) -> &String {
-        &self.catalog
-    }
-
-    pub fn set_catalog(&mut self, catalog: impl Into<String>) {
-        self.catalog = catalog.into();
-    }
-
-    pub fn schema(&self) -> &String {
-        &self.schema
-    }
-
-    pub fn set_schema(&mut self, schema: impl Into<String>) {
-        self.schema = schema.into();
-    }
-
-    pub fn dbname(&self) -> &String {
-        &self.dbname
-    }
-
-    pub fn set_dbname(&mut self, dbname: impl Into<String>) {
-        self.dbname = dbname.into();
-    }
-
-    pub fn set_auth(&mut self, auth: AuthScheme) {
-        self.ctx.auth_header = Some(AuthHeader {
-            auth_scheme: Some(auth),
-        });
-    }
-
-    pub async fn insert(&self, request: InsertRequest) -> Result<u32> {
-        let mut client = self.client.make_database_client()?.inner;
-        let request = GreptimeRequest {
-            header: Some(RequestHeader {
-                catalog: self.catalog.clone(),
-                schema: self.schema.clone(),
-                authorization: self.ctx.auth_header.clone(),
-                dbname: self.dbname.clone(),
-            }),
-            request: Some(Request::Insert(request)),
+    pub async fn insert(&self, insert: InsertExpr) -> Result<ObjectResult> {
+        let header = ExprHeader {
+            version: PROTOCOL_VERSION,
        };
-        let response = client
-            .handle(request)
-            .await?
-            .into_inner()
-            .response
-            .context(IllegalDatabaseResponseSnafu {
-                err_msg: "GreptimeResponse is empty",
-            })?;
-        let greptime_response::Response::AffectedRows(AffectedRows { value }) = response;
-        Ok(value)
-    }
-
-    pub async fn sql(&self, sql: &str) -> Result<Output> {
-        self.do_get(Request::Query(QueryRequest {
-            query: Some(Query::Sql(sql.to_string())),
-        }))
-        .await
-    }
-
-    pub async fn logical_plan(&self, logical_plan: Vec<u8>) -> Result<Output> {
-        self.do_get(Request::Query(QueryRequest {
-            query: Some(Query::LogicalPlan(logical_plan)),
-        }))
-        .await
-    }
-
-    pub async fn prom_range_query(
-        &self,
-        promql: &str,
-        start: &str,
-        end: &str,
-        step: &str,
-    ) -> Result<Output> {
-        self.do_get(Request::Query(QueryRequest {
-            query: Some(Query::PromRangeQuery(PromRangeQuery {
-                query: promql.to_string(),
-                start: start.to_string(),
-                end: end.to_string(),
-                step: step.to_string(),
-            })),
-        }))
-        .await
-    }
-
-    pub async fn create(&self, expr: CreateTableExpr) -> Result<Output> {
-        self.do_get(Request::Ddl(DdlRequest {
-            expr: Some(DdlExpr::CreateTable(expr)),
-        }))
-        .await
-    }
-
-    pub async fn alter(&self, expr: AlterExpr) -> Result<Output> {
-        self.do_get(Request::Ddl(DdlRequest {
-            expr: Some(DdlExpr::Alter(expr)),
-        }))
-        .await
-    }
-
-    pub async fn drop_table(&self, expr: DropTableExpr) -> Result<Output> {
-        self.do_get(Request::Ddl(DdlRequest {
-            expr: Some(DdlExpr::DropTable(expr)),
-        }))
-        .await
-    }
-
-    pub async fn flush_table(&self, expr: FlushTableExpr) -> Result<Output> {
-        self.do_get(Request::Ddl(DdlRequest {
-            expr: Some(DdlExpr::FlushTable(expr)),
-        }))
-        .await
-    }
-
-    async fn do_get(&self, request: Request) -> Result<Output> {
-        let request = GreptimeRequest {
-            header: Some(RequestHeader {
-                catalog: self.catalog.clone(),
-                schema: self.schema.clone(),
-                authorization: self.ctx.auth_header.clone(),
-                dbname: self.dbname.clone(),
-            }),
-            request: Some(request),
+        let expr = ObjectExpr {
+            header: Some(header),
+            expr: Some(object_expr::Expr::Insert(insert)),
        };
-        let request = Ticket {
-            ticket: request.encode_to_vec().into(),
+        self.object(expr).await?.try_into()
+    }
+
+    pub async fn batch_insert(&self, insert_exprs: Vec<InsertExpr>) -> Result<Vec<ObjectResult>> {
+        let header = ExprHeader {
+            version: PROTOCOL_VERSION,
        };
-
-        let mut client = self.client.make_flight_client()?;
-
-        // TODO(LFC): Streaming get flight data.
-        let flight_data: Vec<FlightData> = client
-            .mut_inner()
-            .do_get(request)
-            .and_then(|response| response.into_inner().try_collect())
-            .await
-            .map_err(|e| {
-                let tonic_code = e.code();
-                let e: error::Error = e.into();
-                let code = e.status_code();
-                let msg = e.to_string();
-                error::ServerSnafu { code, msg }
-                    .fail::<()>()
-                    .map_err(BoxedError::new)
-                    .context(error::FlightGetSnafu {
-                        tonic_code,
-                        addr: client.addr(),
-                    })
-                    .map_err(|error| {
-                        logging::error!(
-                            "Failed to do Flight get, addr: {}, code: {}, source: {}",
-                            client.addr(),
-                            tonic_code,
-                            error
-                        );
-                        error
-                    })
-                    .unwrap_err()
-            })?;
-
-        let decoder = &mut FlightDecoder::default();
-        let flight_messages = flight_data
+        let obj_exprs = insert_exprs
            .into_iter()
-            .map(|x| decoder.try_decode(x).context(ConvertFlightDataSnafu))
-            .collect::<Result<Vec<_>>>()?;
+            .map(|expr| ObjectExpr {
+                header: Some(header.clone()),
+                expr: Some(object_expr::Expr::Insert(expr)),
+            })
+            .collect();
+        self.objects(obj_exprs)
+            .await?
+            .into_iter()
+            .map(|result| result.try_into())
+            .collect()
+    }

-        let output = if let Some(FlightMessage::AffectedRows(rows)) = flight_messages.get(0) {
-            ensure!(
-                flight_messages.len() == 1,
-                IllegalFlightMessagesSnafu {
-                    reason: "Expect 'AffectedRows' Flight messages to be one and only!"
+    pub async fn select(&self, expr: Select) -> Result<ObjectResult> {
+        let select_expr = match expr {
+            Select::Sql(sql) => SelectExpr {
+                expr: Some(select_expr::Expr::Sql(sql)),
+            },
+        };
+        self.do_select(select_expr).await
+    }
+
+    pub async fn logical_plan(&self, logical_plan: Vec<u8>) -> Result<ObjectResult> {
+        let select_expr = SelectExpr {
+            expr: Some(select_expr::Expr::LogicalPlan(logical_plan)),
+        };
+        self.do_select(select_expr).await
+    }
+
+    async fn do_select(&self, select_expr: SelectExpr) -> Result<ObjectResult> {
+        let header = ExprHeader {
+            version: PROTOCOL_VERSION,
+        };
+
+        let expr = ObjectExpr {
+            header: Some(header),
+            expr: Some(object_expr::Expr::Select(select_expr)),
+        };
+
+        let obj_result = self.object(expr).await?;
+        obj_result.try_into()
+    }
+
+    pub async fn object(&self, expr: ObjectExpr) -> Result<GrpcObjectResult> {
+        let res = self.objects(vec![expr]).await?.pop().unwrap();
+        Ok(res)
+    }
+
+    async fn objects(&self, exprs: Vec<ObjectExpr>) -> Result<Vec<GrpcObjectResult>> {
+        let expr_count = exprs.len();
+        let req = DatabaseRequest {
+            name: self.name.clone(),
+            exprs,
+        };
+
+        let res = self.client.database(req).await?;
+        let res = res.results;
+
+        ensure!(
+            res.len() == expr_count,
+            error::MissingResultSnafu {
+                name: "object_results",
+                expected: expr_count,
+                actual: res.len(),
+            }
+        );
+
+        Ok(res)
+    }
+}
+
+#[derive(Debug)]
+pub enum ObjectResult {
+    Select(GrpcSelectResult),
+    Mutate(GrpcMutateResult),
+}
+
+impl TryFrom<api::v1::ObjectResult> for ObjectResult {
+    type Error = error::Error;
+
+    fn try_from(object_result: api::v1::ObjectResult) -> std::result::Result<Self, Self::Error> {
+        let header = object_result.header.context(error::MissingHeaderSnafu)?;
+        if !StatusCode::is_success(header.code) {
+            return DatanodeSnafu {
+                code: header.code,
+                msg: header.err_msg,
+            }
+            .fail();
+        }
+
+        let obj_result = object_result.result.context(error::MissingResultSnafu {
+            name: "result".to_string(),
+            expected: 1_usize,
+            actual: 0_usize,
+        })?;
+        Ok(match obj_result {
+            object_result::Result::Select(select) => {
+                let result = (*select.raw_data).try_into().context(DecodeSelectSnafu)?;
+                ObjectResult::Select(result)
+            }
+            object_result::Result::Mutate(mutate) => ObjectResult::Mutate(mutate),
+        })
+    }
+}
+
+pub enum Select {
+    Sql(String),
+}
+
+impl TryFrom<ObjectResult> for Output {
+    type Error = error::Error;
+
+    fn try_from(value: ObjectResult) -> Result<Self> {
+        let output = match value {
+            ObjectResult::Select(select) => {
+                let vectors = select
+                    .columns
+                    .iter()
+                    .map(|column| {
+                        column_to_vector(column, select.row_count).context(ColumnToVectorSnafu)
+                    })
+                    .collect::<Result<Vec<VectorRef>>>()?;
+
+                let column_schemas = select
+                    .columns
+                    .iter()
+                    .zip(vectors.iter())
+                    .map(|(column, vector)| {
+                        let datatype = vector.data_type();
+                        // nullable or not, does not affect the output
+                        let mut column_schema =
+                            ColumnSchema::new(&column.column_name, datatype, true);
+                        if column.semantic_type == SemanticType::Timestamp as i32 {
+                            column_schema = column_schema.with_time_index(true);
+                        }
+                        column_schema
+                    })
+                    .collect::<Vec<ColumnSchema>>();
+
+                let schema = Arc::new(Schema::try_new(column_schemas).context(ConvertSchemaSnafu)?);
+                let recordbatches = if vectors.is_empty() {
+                    RecordBatches::try_new(schema, vec![])
+                } else {
+                    RecordBatch::new(schema, vectors)
+                        .and_then(|batch| RecordBatches::try_new(batch.schema.clone(), vec![batch]))
                }
-            );
-            Output::AffectedRows(*rows)
-        } else {
-            let recordbatches = flight_messages_to_recordbatches(flight_messages)
-                .context(ConvertFlightDataSnafu)?;
-            Output::RecordBatches(recordbatches)
+                .context(error::CreateRecordBatchesSnafu)?;
+                Output::RecordBatches(recordbatches)
+            }
+            ObjectResult::Mutate(mutate) => {
+                if mutate.failure != 0 {
+                    return error::MutateFailureSnafu {
+                        failure: mutate.failure,
+                    }
+                    .fail();
+                }
+                Output::AffectedRows(mutate.success as usize)
+            }
        };
        Ok(output)
    }
 }

-#[derive(Default, Debug, Clone)]
-pub struct FlightContext {
-    auth_header: Option<AuthHeader>,
-}
-
 #[cfg(test)]
 mod tests {
-    use std::sync::Arc;
-
    use api::helper::ColumnDataTypeWrapper;
-    use api::v1::auth_header::AuthScheme;
-    use api::v1::{AuthHeader, Basic, Column};
+    use api::v1::Column;
    use common_grpc::select::{null_mask, values};
-    use common_grpc_expr::column_to_vector;
-    use datatypes::prelude::{Vector, VectorRef};
    use datatypes::vectors::{
        BinaryVector, BooleanVector, DateTimeVector, DateVector, Float32Vector, Float64Vector,
        Int16Vector, Int32Vector, Int64Vector, Int8Vector, StringVector, UInt16Vector,
        UInt32Vector, UInt64Vector, UInt8Vector,
    };

-    use crate::database::FlightContext;
+    use super::*;

    #[test]
    fn test_column_to_vector() {
@@ -364,26 +326,4 @@ mod tests {
            datatype: wrapper.datatype() as i32,
        }
    }
-
-    #[test]
-    fn test_flight_ctx() {
-        let mut ctx = FlightContext::default();
-        assert!(ctx.auth_header.is_none());
-
-        let basic = AuthScheme::Basic(Basic {
-            username: "u".to_string(),
-            password: "p".to_string(),
-        });
-
-        ctx.auth_header = Some(AuthHeader {
-            auth_scheme: Some(basic),
-        });
-
-        assert!(matches!(
-            ctx.auth_header,
-            Some(AuthHeader {
-                auth_scheme: Some(AuthScheme::Basic(_)),
-            })
-        ))
-    }
 }
--- a/src/client/src/error.rs
+++ b/src/client/src/error.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -13,42 +13,81 @@
 // limitations under the License.

 use std::any::Any;
-use std::str::FromStr;
+use std::sync::Arc;

+use api::serde::DecodeError;
 use common_error::prelude::*;
-use snafu::Location;
-use tonic::{Code, Status};
+use datafusion::physical_plan::ExecutionPlan;

 #[derive(Debug, Snafu)]
 #[snafu(visibility(pub))]
 pub enum Error {
-    #[snafu(display("Illegal Flight messages, reason: {}", reason))]
-    IllegalFlightMessages { reason: String, location: Location },
-
-    #[snafu(display("Failed to do Flight get, code: {}, source: {}", tonic_code, source))]
-    FlightGet {
-        addr: String,
-        tonic_code: Code,
-        source: BoxedError,
+    #[snafu(display("Connect failed to {}, source: {}", url, source))]
+    ConnectFailed {
+        url: String,
+        source: tonic::transport::Error,
+        backtrace: Backtrace,
    },

-    #[snafu(display("Failed to convert FlightData, source: {}", source))]
-    ConvertFlightData {
+    #[snafu(display("Missing {}, expected {}, actual {}", name, expected, actual))]
+    MissingResult {
+        name: String,
+        expected: usize,
+        actual: usize,
+    },
+
+    #[snafu(display("Missing result header"))]
+    MissingHeader,
+
+    #[snafu(display("Tonic internal error, addr: {}, source: {}", addr, source))]
+    TonicStatus {
+        addr: String,
+        source: tonic::Status,
+        backtrace: Backtrace,
+    },
+
+    #[snafu(display("Fail to decode select result, source: {}", source))]
+    DecodeSelect { source: DecodeError },
+
+    #[snafu(display("Error occurred on the data node, code: {}, msg: {}", code, msg))]
+    Datanode { code: u32, msg: String },
+
+    #[snafu(display("Failed to encode physical plan: {:?}, source: {}", physical, source))]
+    EncodePhysical {
+        physical: Arc<dyn ExecutionPlan>,
        #[snafu(backtrace)]
        source: common_grpc::Error,
    },

+    #[snafu(display("Mutate result has failure {}", failure))]
+    MutateFailure { failure: u32, backtrace: Backtrace },
+
    #[snafu(display("Column datatype error, source: {}", source))]
    ColumnDataType {
        #[snafu(backtrace)]
        source: api::error::Error,
    },

+    #[snafu(display("Failed to create RecordBatches, source: {}", source))]
+    CreateRecordBatches {
+        #[snafu(backtrace)]
+        source: common_recordbatch::error::Error,
+    },
+
    #[snafu(display("Illegal GRPC client state: {}", err_msg))]
-    IllegalGrpcClientState { err_msg: String, location: Location },
+    IllegalGrpcClientState {
+        err_msg: String,
+        backtrace: Backtrace,
+    },

    #[snafu(display("Missing required field in protobuf, field: {}", field))]
-    MissingField { field: String, location: Location },
+    MissingField { field: String, backtrace: Backtrace },
+
+    #[snafu(display("Failed to convert schema, source: {}", source))]
+    ConvertSchema {
+        #[snafu(backtrace)]
+        source: datatypes::error::Error,
+    },

    #[snafu(display(
        "Failed to create gRPC channel, peer address: {}, source: {}",
@@ -61,12 +100,11 @@ pub enum Error {
        source: common_grpc::error::Error,
    },

-    // Server error carried in Tonic Status's metadata.
-    #[snafu(display("{}", msg))]
-    Server { code: StatusCode, msg: String },
-
-    #[snafu(display("Illegal Database response: {err_msg}"))]
-    IllegalDatabaseResponse { err_msg: String },
+    #[snafu(display("Failed to convert column to vector, source: {}", source))]
+    ColumnToVector {
+        #[snafu(backtrace)]
+        source: common_grpc_expr::error::Error,
+    },
 }

 pub type Result<T> = std::result::Result<T, Error>;
@@ -74,39 +112,29 @@ pub type Result<T> = std::result::Result<T, Error>;
 impl ErrorExt for Error {
    fn status_code(&self) -> StatusCode {
        match self {
-            Error::IllegalFlightMessages { .. }
+            Error::ConnectFailed { .. }
+            | Error::MissingResult { .. }
+            | Error::MissingHeader { .. }
+            | Error::TonicStatus { .. }
+            | Error::DecodeSelect { .. }
+            | Error::Datanode { .. }
+            | Error::EncodePhysical { .. }
+            | Error::MutateFailure { .. }
            | Error::ColumnDataType { .. }
-            | Error::MissingField { .. }
-            | Error::IllegalDatabaseResponse { .. } => StatusCode::Internal,
-
-            Error::Server { code, .. } => *code,
-            Error::FlightGet { source, .. } => source.status_code(),
-            Error::CreateChannel { source, .. } | Error::ConvertFlightData { source } => {
-                source.status_code()
-            }
+            | Error::MissingField { .. } => StatusCode::Internal,
+            Error::ConvertSchema { source } => source.status_code(),
+            Error::CreateRecordBatches { source } => source.status_code(),
+            Error::CreateChannel { source, .. } => source.status_code(),
            Error::IllegalGrpcClientState { .. } => StatusCode::Unexpected,
+            Error::ColumnToVector { source, .. } => source.status_code(),
        }
    }

+    fn backtrace_opt(&self) -> Option<&Backtrace> {
+        ErrorCompat::backtrace(self)
+    }
+
    fn as_any(&self) -> &dyn Any {
        self
    }
 }
-
-impl From<Status> for Error {
-    fn from(e: Status) -> Self {
-        fn get_metadata_value(e: &Status, key: &str) -> Option<String> {
-            e.metadata()
-                .get(key)
-                .and_then(|v| String::from_utf8(v.as_bytes().to_vec()).ok())
-        }
-
-        let code = get_metadata_value(&e, INNER_ERROR_CODE)
-            .and_then(|s| StatusCode::from_str(&s).ok())
-            .unwrap_or(StatusCode::Unknown);
-
-        let msg = get_metadata_value(&e, INNER_ERROR_MSG).unwrap_or(e.to_string());
-
-        Self::Server { code, msg }
-    }
-}
--- a/src/client/src/lib.rs
+++ b/src/client/src/lib.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+pub mod admin;
 mod client;
 mod database;
 mod error;
 pub mod load_balance;

 pub use api;
-pub use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};

 pub use self::client::Client;
-pub use self::database::Database;
+pub use self::database::{Database, ObjectResult, Select};
 pub use self::error::{Error, Result};
--- a/src/client/src/load_balance.rs
+++ b/src/client/src/load_balance.rs
@@ -1,10 +1,10 @@
-// Copyright 2023 Greptime Team
+// 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
+// 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,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lei, HUANG	a8630cdb38	fix: clippy errors	2022-12-15 18:12:05 +08:00
Ruihang Xia	0f3dcc1b38	fix: Fix All The Tests! (#752 ) * fix: Fix several tests compile errors Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix: some compile errors in tests Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix: compile errors in frontend tests * fix: compile errors in frontend tests * test: Fix tests in api and common-query * test: Fix test in sql crate * fix: resolve substrait error Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * chore: add more test * test: Fix tests in servers * fix instance_test Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * test: Fix tests in tests-integration Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Co-authored-by: Lei, HUANG <mrsatangel@gmail.com> Co-authored-by: evenyag <realevenyag@gmail.com>	2022-12-15 17:47:14 +08:00
evenyag	7c696dae08	Merge branch 'develop' into replace-arrow2	2022-12-15 15:29:35 +08:00
Yingwen	142dee41d6	fix: Fix compiler errors in script crate (#749 ) * fix: Fix compiler errors in state.rs * fix: fix compiler errors in state * feat: upgrade sqlparser to 0.26 * fix: fix datafusion engine compiler errors * fix: Fix some tests in query crate * fix: Fix all warnings in tests * feat: Remove `Type` from timestamp's type name * fix: fix query tests Now datafusion already supports median, so this commit also remove the median function * style: Fix clippy * feat: Remove RecordBatch::pretty_print * chore: Address CR comments * feat: Add column_by_name to RecordBatch * feat: modify select_from_rb * feat: Fix some compiler errors in vector.rs * feat: Fix more compiler errors in vector.rs * fix: fix table.rs Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix: Fix compiler errors in coprocessor * fix: Fix some compiler errors * fix: Fix compiler errors in script * chore: Remove unused imports and format code * test: disable interval tests * test: Fix test_compile_execute test * style: Fix clippy * feat: Support interval * feat: Add RecordBatch::columns and fix clippy Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Co-authored-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-15 14:20:35 +08:00
Lei, HUANG	ce6d1cb7d1	fix: frontend compile errors (#747 ) fix: fix compile errors in frontend	2022-12-14 18:30:16 +08:00
Yingwen	dbb3034ecb	fix: Fix compiler errors in query crate (#746 ) * fix: Fix compiler errors in state.rs * fix: fix compiler errors in state * feat: upgrade sqlparser to 0.26 * fix: fix datafusion engine compiler errors * fix: Fix some tests in query crate * fix: Fix all warnings in tests * feat: Remove `Type` from timestamp's type name * fix: fix query tests Now datafusion already supports median, so this commit also remove the median function * style: Fix clippy * feat: Remove RecordBatch::pretty_print * chore: Address CR comments * Update src/query/src/query_engine/state.rs Co-authored-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-14 17:42:07 +08:00
Lei, HUANG	652d59a643	fix: remove unwrap	2022-12-13 17:51:14 +08:00
Lei, HUANG	fa971c6513	fix: errors in optimzer	2022-12-13 17:44:37 +08:00
evenyag	36c929e1a7	fix: Fix imports in optimizer.rs	2022-12-13 17:27:44 +08:00
Ruihang Xia	a712382fba	Merge pull request #745 * fix nyc-taxi and util * Merge branch 'replace-arrow2' into fix-others * fix substrait * fix warnings and error in test	2022-12-13 16:59:28 +08:00
Yingwen	4b644aa482	fix: Fix compiler errors in catalog and mito crates (#742 ) * fix: Fix compiler errors in mito * fix: Fix compiler errors in catalog crate * style: Fix clippy * chore: Fix use	2022-12-13 15:53:55 +08:00
Lei, HUANG	4defde055c	feat: upgrade storage crate to arrow and parquet offcial impl (#738 ) * fix: compile erros * fix: parquet reader and writer * fix: parquet reader and writer * fix: WriteBatch IPC encode/decode * fix: clippy errors in storage subcrate * chore: remove suspicious unwrap * fix: some cr comments * fix: CR comments * fix: CR comments	2022-12-13 11:58:50 +08:00
Ruihang Xia	95b2d8654f	fix: pre-cast to avoid tremendous match arms (#734 ) Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-09 17:20:03 +08:00
Ruihang Xia	42fdc7251a	fix: Fix common grpc expr (#730 ) * fix compile errors Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * rename fn names Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix styles Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix wranings in common-time Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-09 14:24:04 +08:00
Ruihang Xia	d0892bf0b7	fix: Fix compile error in server subcrate (#727 ) * fix: Fix compile error in server subcrate Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * remove unused type alias Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * explicitly panic Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * Update src/storage/src/sst/parquet.rs Co-authored-by: Yingwen <realevenyag@gmail.com> Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Co-authored-by: Yingwen <realevenyag@gmail.com>	2022-12-08 20:27:53 +08:00
Ruihang Xia	fff530cb50	fix common record batch Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-08 17:58:53 +08:00
Yingwen	b936d8b18a	fix: Fix common::grpc compiler errors (#722 ) * fix: Fix common::grpc compiler errors This commit refactors RecordBatch and holds vectors in the RecordBatch struct, so we don't need to cast the array to vector when doing serialization or iterating the batch. Now we use the vector API instead of the arrow API in grpc crate. * chore: Address CR comments	2022-12-08 17:51:20 +08:00
Lei, HUANG	1bde1ba399	fix: row group pruning (#725 ) * fix: row group pruning * chore: use macro to simplify stats implemetation * fxi: CR comments * fix: row group metadata length mismatch * fix: simplify code	2022-12-08 17:44:04 +08:00
Ruihang Xia	3687bc7346	fix: Fix tests and clippy for common-function subcrate (#726 ) * further fixing Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix all compile errors in common function Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix tests Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix clippy Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * revert test changes Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-08 17:01:54 +08:00
Ruihang Xia	587bdc9800	fix: fix other compile error in common-function (#719 ) * further fixing Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix all compile errors in common function Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-08 11:38:07 +08:00
Yingwen	58c26def6b	fix: fix argmin/percentile/clip/interp/scipy_stats_norm_pdf errors (#718 ) fix: fix argmin/percentile/clip/interp/scipy_stats_norm_pdf compiler errors	2022-12-07 19:55:07 +08:00
Ruihang Xia	6f3baf96b0	fix: fix compile error for mean/polyval/pow/interp ops (#717 ) * fix: fix compile error for mean/polyval/pow/interp ops Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * simplify type bounds Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-07 16:38:43 +08:00
Yingwen	a898f846d1	fix: Fix compiler errors in argmax/rate/median/norm_cdf (#716 ) * fix: Fix compiler errors in argmax/rate/median/norm_cdf * chore: Address CR comments	2022-12-07 15:28:27 +08:00
Ruihang Xia	a562199455	Revert "fix: fix compile error for mean/polyval/pow/interp ops" This reverts commit `fb0b4eb826`.	2022-12-07 15:13:58 +08:00
Ruihang Xia	fb0b4eb826	fix: fix compile error for mean/polyval/pow/interp ops Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-07 15:12:28 +08:00
Yingwen	2ba99259e1	feat: Implements diff accumulator using WrapperType (#715 ) * feat: Remove usage of opaque error from common::recordbatch * feat: Remove opaque error from common::query * feat: Fix diff compiler errors Now common_function just use common_query's Error and Result. Adds a LargestType associated type to LogicalPrimitiveType to get the largest type a logical primitive type can cast to. * feat: Remove LargestType from NativeType trait * chore: Update comments * feat: Restrict Scalar::RefType of WrapperType to itself Add trait bound `for<'a> Scalar<RefType<'a> = Self>` to WrapperType * chore: Address CR comments * chore: Format codes	2022-12-07 11:13:24 +08:00
Ruihang Xia	551cde23b1	Merge branch 'dev' into replace-arrow2	2022-12-07 10:50:27 +08:00
Yingwen	653906d4fa	fix: Fix common::query compiler errors (#713 ) * feat: Move conversion to ScalarValue to value.rs * fix: Fix common::query compiler errors This commit also make InnerError pub(crate)	2022-12-06 16:45:54 +08:00
Ruihang Xia	829ff491c4	fix: common-query subcrate (#712 ) * fix: record batch adapter Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix error enum Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-06 16:32:52 +08:00
Yingwen	b32438e78c	feat: Fix some compiler errors in common::query (#710 ) * feat: Fix some compiler errors in common::query * feat: test_collect use vectors api	2022-12-06 15:32:12 +08:00
Lei, HUANG	0ccb8b4302	chore: delete datatypes based on arrow2	2022-12-06 15:01:57 +08:00
Lei, HUANG	b48ae21b71	fix: api crate (#708 ) * fix: rename ConcreteDataType::timestamp_millis_type to ConcreteDataType::timestamp_millisecond_type. fix other warnings regarding timestamp * fix: revert changes in datatypes2 * fix: helper	2022-12-06 14:56:59 +08:00
evenyag	3c0adb00f3	feat: Fix recordbatch test compiling issue	2022-12-06 12:03:06 +08:00
evenyag	8c66b7d000	feat: Fix common::recordbatch compiler errors	2022-12-06 11:55:19 +08:00
evenyag	99371fd31b	chore: sort Cargo.toml	2022-12-06 11:39:15 +08:00
evenyag	fe505fecfd	feat: Make recordbatch compile	2022-12-06 11:38:59 +08:00
evenyag	cc1ec26416	feat: Switch to datatypes2	2022-12-05 20:30:47 +08:00
Ruihang Xia	504059a699	chore: fix wrong merge commit Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-12-05 20:11:22 +08:00
Ruihang Xia	7151deb4ed	Merge branch 'dev' into replace-arrow2	2022-12-05 20:10:37 +08:00
Ruihang Xia	d0686f9c19	Merge branch 'replace-arrow2' of github.com:GreptimeTeam/greptimedb into replace-arrow2	2022-11-21 17:43:40 +08:00
Ruihang Xia	221f3e9d2e	Merge branch 'dev' into replace-arrow2	2022-11-21 17:42:15 +08:00
evenyag	61c4a3691a	chore: update dep of binary vector	2022-11-21 15:55:07 +08:00
evenyag	d7626fd6af	feat: arrow_array switch to arrow	2022-11-21 15:39:41 +08:00
Ruihang Xia	e3201a4705	chore: replace one last datafusion dep Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-11-21 14:29:59 +08:00
Ruihang Xia	571a84d91b	chore: kick off. change datafusion/arrow/parquet to target version Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2022-11-21 14:19:39 +08:00