ci: upload .pdb files too

.github/actions/build-images/action.yml

@@ -41,8 +41,8 @@ runs:
         image-name: ${{ inputs.image-name }}
         image-tag: ${{ inputs.version }}
         docker-file: docker/ci/ubuntu/Dockerfile
-        amd64-artifact-name: greptime-linux-amd64-${{ inputs.version }}
-        arm64-artifact-name: greptime-linux-arm64-${{ inputs.version }}
+        amd64-artifact-name: greptime-linux-amd64-pyo3-${{ inputs.version }}
+        arm64-artifact-name: greptime-linux-arm64-pyo3-${{ inputs.version }}
         platforms: linux/amd64,linux/arm64
         push-latest-tag: ${{ inputs.push-latest-tag }}
 

.github/actions/build-linux-artifacts/action.yml

@@ -48,12 +48,24 @@ runs:
         path: /tmp/greptime-*.log
         retention-days: 3
 
-    - name: Build greptime
+    - name: Build standard greptime
+      uses: ./.github/actions/build-greptime-binary
+      with:
+        base-image: ubuntu
+        features: pyo3_backend,servers/dashboard
+        cargo-profile: ${{ inputs.cargo-profile }}
+        artifacts-dir: greptime-linux-${{ inputs.arch }}-pyo3-${{ inputs.version }}
+        version: ${{ inputs.version }}
+        working-dir: ${{ inputs.working-dir }}
+        image-registry: ${{ inputs.image-registry }}
+        image-namespace: ${{ inputs.image-namespace }}
+
+    - name: Build greptime without pyo3
       if: ${{ inputs.dev-mode == 'false' }}
       uses: ./.github/actions/build-greptime-binary
       with:
         base-image: ubuntu
-        features: servers/dashboard,pg_kvbackend
+        features: servers/dashboard
         cargo-profile: ${{ inputs.cargo-profile }}
         artifacts-dir: greptime-linux-${{ inputs.arch }}-${{ inputs.version }}
         version: ${{ inputs.version }}
@@ -71,7 +83,7 @@ runs:
       if: ${{ inputs.arch == 'amd64' && inputs.dev-mode == 'false' }} # Builds greptime for centos if the host machine is amd64.
       with:
         base-image: centos
-        features: servers/dashboard,pg_kvbackend
+        features: servers/dashboard
         cargo-profile: ${{ inputs.cargo-profile }}
         artifacts-dir: greptime-linux-${{ inputs.arch }}-centos-${{ inputs.version }}
         version: ${{ inputs.version }}

.github/actions/build-windows-artifacts/action.yml

@@ -33,6 +33,15 @@ runs:
     - name: Rust Cache
       uses: Swatinem/rust-cache@v2
 
+    - name: Install Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.10"
+
+    - name: Install PyArrow Package
+      shell: pwsh
+      run: pip install pyarrow numpy
+
     - name: Install WSL distribution
       uses: Vampire/setup-wsl@v2
       with:

.github/actions/publish-github-release/action.yml

@@ -9,8 +9,8 @@ runs:
   steps:
     # Download artifacts from previous jobs, the artifacts will be downloaded to:
     # ${WORKING_DIR}
-    #   |- greptime-darwin-amd64-v0.5.0/greptime-darwin-amd64-v0.5.0.tar.gz
-    #   |- greptime-darwin-amd64-v0.5.0.sha256sum/greptime-darwin-amd64-v0.5.0.sha256sum
+    #   |- greptime-darwin-amd64-pyo3-v0.5.0/greptime-darwin-amd64-pyo3-v0.5.0.tar.gz
+    #   |- greptime-darwin-amd64-pyo3-v0.5.0.sha256sum/greptime-darwin-amd64-pyo3-v0.5.0.sha256sum
     #   |- greptime-darwin-amd64-v0.5.0/greptime-darwin-amd64-v0.5.0.tar.gz
     #   |- greptime-darwin-amd64-v0.5.0.sha256sum/greptime-darwin-amd64-v0.5.0.sha256sum
     #   ...

.github/actions/upload-artifacts/action.yml

@@ -30,9 +30,9 @@ runs:
         done
 
     # The compressed artifacts will use the following layout:
-    # greptime-linux-amd64-v0.3.0sha256sum
-    # greptime-linux-amd64-v0.3.0.tar.gz
-    #   greptime-linux-amd64-v0.3.0
+    # greptime-linux-amd64-pyo3-v0.3.0sha256sum
+    # greptime-linux-amd64-pyo3-v0.3.0.tar.gz
+    #   greptime-linux-amd64-pyo3-v0.3.0
     #   └── greptime
     - name: Compress artifacts and calculate checksum
       working-directory: ${{ inputs.working-dir }}

.github/scripts/upload-artifacts-to-s3.sh

@@ -27,11 +27,11 @@ function upload_artifacts() {
   # ├── latest-version.txt
   # ├── latest-nightly-version.txt
   # ├── v0.1.0
-  # │   ├── greptime-darwin-amd64-v0.1.0.sha256sum
-  # │   └── greptime-darwin-amd64-v0.1.0.tar.gz
+  # │   ├── greptime-darwin-amd64-pyo3-v0.1.0.sha256sum
+  # │   └── greptime-darwin-amd64-pyo3-v0.1.0.tar.gz
   # └── v0.2.0
-  #    ├── greptime-darwin-amd64-v0.2.0.sha256sum
-  #    └── greptime-darwin-amd64-v0.2.0.tar.gz
+  #    ├── greptime-darwin-amd64-pyo3-v0.2.0.sha256sum
+  #    └── greptime-darwin-amd64-pyo3-v0.2.0.tar.gz
   find "$ARTIFACTS_DIR" -type f \( -name "*.tar.gz" -o -name "*.sha256sum" \) | while IFS= read -r file; do
     aws s3 cp \
       "$file" "s3://$AWS_S3_BUCKET/$RELEASE_DIRS/$VERSION/$(basename "$file")"

.github/workflows/develop.yml

@@ -10,6 +10,17 @@ on:
       - 'docker/**'
       - '.gitignore'
       - 'grafana/**'
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'docs/**'
+      - 'config/**'
+      - '**.md'
+      - '.dockerignore'
+      - 'docker/**'
+      - '.gitignore'
+      - 'grafana/**'
   workflow_dispatch:
 
 name: CI
@@ -51,12 +62,12 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions-rust-lang/setup-rust-toolchain@v1
-      # - name: Rust Cache
-      #   uses: Swatinem/rust-cache@v2
-      #   with:
-      #     # Shares across multiple jobs
-      #     # Shares with `Clippy` job
-      #     shared-key: "check-lint"
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          # Shares across multiple jobs
+          # Shares with `Clippy` job
+          shared-key: "check-lint"
       - name: Run cargo check
         run: cargo check --locked --workspace --all-targets
 
@@ -67,13 +78,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
-      # - name: Rust Cache
-      #   uses: Swatinem/rust-cache@v2
-      #   with:
-      #     # Shares across multiple jobs
-      #     shared-key: "check-toml"
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          # Shares across multiple jobs
+          shared-key: "check-toml"
       - name: Install taplo
-        run: cargo +stable install taplo-cli --version ^0.9 --locked --force
+        run: cargo +stable install taplo-cli --version ^0.9 --locked
       - name: Run taplo
         run: taplo format --check
 
@@ -96,11 +107,11 @@ jobs:
           shared-key: "build-binaries"
       - name: Install cargo-gc-bin
         shell: bash
-        run: cargo install cargo-gc-bin --force
+        run: cargo install cargo-gc-bin
       - name: Build greptime binaries
         shell: bash
         # `cargo gc` will invoke `cargo build` with specified args
-        run: cargo gc -- --bin greptime --bin sqlness-runner --features pg_kvbackend
+        run: cargo gc -- --bin greptime --bin sqlness-runner
       - name: Pack greptime binaries
         shell: bash
         run: |
@@ -142,17 +153,17 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions-rust-lang/setup-rust-toolchain@v1
-      # - name: Rust Cache
-      #   uses: Swatinem/rust-cache@v2
-      #   with:
-      #     # Shares across multiple jobs
-      #     shared-key: "fuzz-test-targets"
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          # Shares across multiple jobs
+          shared-key: "fuzz-test-targets"
       - name: Set Rust Fuzz
         shell: bash
         run: |
           sudo apt-get install -y libfuzzer-14-dev
           rustup install nightly
-          cargo +nightly install cargo-fuzz cargo-gc-bin --force
+          cargo +nightly install cargo-fuzz cargo-gc-bin
       - name: Download pre-built binaries
         uses: actions/download-artifact@v4
         with:
@@ -200,16 +211,16 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions-rust-lang/setup-rust-toolchain@v1
-      # - name: Rust Cache
-      #   uses: Swatinem/rust-cache@v2
-      #   with:
-      #     # Shares across multiple jobs
-      #     shared-key: "fuzz-test-targets"
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          # Shares across multiple jobs
+          shared-key: "fuzz-test-targets"
       - name: Set Rust Fuzz
         shell: bash
         run: |
           sudo apt update && sudo apt install -y libfuzzer-14-dev
-          cargo install cargo-fuzz cargo-gc-bin --force
+          cargo install cargo-fuzz cargo-gc-bin
       - name: Download pre-built binariy
         uses: actions/download-artifact@v4
         with:
@@ -257,11 +268,11 @@ jobs:
           shared-key: "build-greptime-ci"
       - name: Install cargo-gc-bin
         shell: bash
-        run: cargo install cargo-gc-bin --force
+        run: cargo install cargo-gc-bin
       - name: Build greptime bianry
         shell: bash
         # `cargo gc` will invoke `cargo build` with specified args
-        run: cargo gc --profile ci -- --bin greptime --features pg_kvbackend
+        run: cargo gc --profile ci -- --bin greptime
       - name: Pack greptime binary
         shell: bash
         run: |
@@ -317,17 +328,17 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions-rust-lang/setup-rust-toolchain@v1
-      # - name: Rust Cache
-      #   uses: Swatinem/rust-cache@v2
-      #   with:
-      #     # Shares across multiple jobs
-      #     shared-key: "fuzz-test-targets"
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          # Shares across multiple jobs
+          shared-key: "fuzz-test-targets"
       - name: Set Rust Fuzz
         shell: bash
         run: |
           sudo apt-get install -y libfuzzer-14-dev
           rustup install nightly
-          cargo +nightly install cargo-fuzz cargo-gc-bin --force
+          cargo +nightly install cargo-fuzz cargo-gc-bin
       # Downloads ci image
       - name: Download pre-built binariy
         uses: actions/download-artifact@v4
@@ -466,17 +477,17 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions-rust-lang/setup-rust-toolchain@v1
-      # - name: Rust Cache
-      #   uses: Swatinem/rust-cache@v2
-      #   with:
-      #     # Shares across multiple jobs
-      #     shared-key: "fuzz-test-targets"
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          # Shares across multiple jobs
+          shared-key: "fuzz-test-targets"
       - name: Set Rust Fuzz
         shell: bash
         run: |
           sudo apt-get install -y libfuzzer-14-dev
           rustup install nightly
-          cargo +nightly install cargo-fuzz cargo-gc-bin --force
+          cargo +nightly install cargo-fuzz cargo-gc-bin
       # Downloads ci image
       - name: Download pre-built binariy
         uses: actions/download-artifact@v4
@@ -573,16 +584,13 @@ jobs:
           - name: "Remote WAL"
             opts: "-w kafka -k 127.0.0.1:9092"
             kafka: true
-          - name: "Pg Kvbackend"
-            opts: "--setup-pg"
-            kafka: false
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
       - if: matrix.mode.kafka
         name: Setup kafka server
-        working-directory: tests-integration/fixtures
-        run: docker compose up -d --wait kafka
+        working-directory: tests-integration/fixtures/kafka
+        run: docker compose -f docker-compose-standalone.yml up -d --wait
       - name: Download pre-built binaries
         uses: actions/download-artifact@v4
         with:
@@ -612,11 +620,11 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: rustfmt
-      # - name: Rust Cache
-      #   uses: Swatinem/rust-cache@v2
-      #   with:
-      #     # Shares across multiple jobs
-      #     shared-key: "check-rust-fmt"
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          # Shares across multiple jobs
+          shared-key: "check-rust-fmt"
       - name: Check format
         run: make fmt-check
 
@@ -641,52 +649,57 @@ jobs:
       - name: Run cargo clippy
         run: make clippy
 
-  conflict-check:
-    name: Check for conflict
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Merge Conflict Finder
-        uses: olivernybroe/action-conflict-finder@v4.0
-
   coverage:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04-8-cores
     timeout-minutes: 60
-    needs:  [conflict-check, clippy, fmt]
     steps:
       - uses: actions/checkout@v4
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: rui314/setup-mold@v1
+      - uses: KyleMayes/install-llvm-action@v1
+        with:
+          version: "14.0"
       - name: Install toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          components: llvm-tools
-          cache: false
+          components: llvm-tools-preview
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
         with:
           # Shares cross multiple jobs
           shared-key: "coverage-test"
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-      # Disabled temporarily to see performance
-      # - name: Docker Cache
-      #   uses: ScribeMD/docker-cache@0.5.0
-      #   with:
-      #     key: docker-${{ runner.os }}-coverage
+      - name: Docker Cache
+        uses: ScribeMD/docker-cache@0.3.7
+        with:
+          key: docker-${{ runner.os }}-coverage
       - 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: Setup external services
-        working-directory: tests-integration/fixtures
-        run: docker compose up -d --wait
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: Install PyArrow Package
+        run: pip install pyarrow numpy
+      - name: Setup etcd server
+        working-directory: tests-integration/fixtures/etcd
+        run: docker compose -f docker-compose-standalone.yml up -d --wait
+      - name: Setup kafka server
+        working-directory: tests-integration/fixtures/kafka
+        run: docker compose -f docker-compose-standalone.yml up -d --wait
+      - name: Setup minio
+        working-directory: tests-integration/fixtures/minio
+        run: docker compose -f docker-compose-standalone.yml up -d --wait
+      - name: Setup postgres server
+        working-directory: tests-integration/fixtures/postgres
+        run: docker compose -f docker-compose-standalone.yml up -d --wait
       - name: Run nextest cases
-        run: cargo llvm-cov nextest --workspace --lcov --output-path lcov.info -F dashboard -F pg_kvbackend
+        run: cargo llvm-cov nextest --workspace --lcov --output-path lcov.info -F pyo3_backend -F dashboard
         env:
-          CARGO_BUILD_RUSTFLAGS: "-C link-arg=-fuse-ld=mold"
+          CARGO_BUILD_RUSTFLAGS: "-C link-arg=-fuse-ld=lld"
           RUST_BACKTRACE: 1
           CARGO_INCREMENTAL: 0
           GT_S3_BUCKET: ${{ vars.AWS_CI_TEST_BUCKET }}

.github/workflows/nightly-ci.yml

@@ -1,6 +1,6 @@
 on:
   schedule:
-    - cron: "0 23 * * 1-4"
+    - cron: "0 23 * * 1-5"
   workflow_dispatch:
 
 name: Nightly CI
@@ -91,12 +91,18 @@ jobs:
         uses: Swatinem/rust-cache@v2
       - name: Install Cargo Nextest
         uses: taiki-e/install-action@nextest
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      - name: Install PyArrow Package
+        run: pip install pyarrow numpy
       - name: Install WSL distribution
         uses: Vampire/setup-wsl@v2
         with:
           distribution: Ubuntu-22.04
       - name: Running tests
-        run: cargo nextest run -F dashboard
+        run: cargo nextest run -F pyo3_backend,dashboard
         env:
           CARGO_BUILD_RUSTFLAGS: "-C linker=lld-link"
           RUST_BACKTRACE: 1
@@ -108,53 +114,7 @@ jobs:
           GT_S3_REGION: ${{ vars.AWS_CI_TEST_BUCKET_REGION }}
           UNITTEST_LOG_DIR: "__unittest_logs"
 
-  ## this is designed for generating cache that usable for pull requests
-  test-on-linux:
-    name: Run tests on Linux
-    if: ${{ github.repository == 'GreptimeTeam/greptimedb' }}
-    runs-on: ubuntu-20.04-8-cores
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v4
-      - uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: rui314/setup-mold@v1
-      - name: Install Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          # Shares cross multiple jobs
-          shared-key: "coverage-test"
-      - name: Install Cargo Nextest
-        uses: taiki-e/install-action@nextest
-      - name: Setup external services
-        working-directory: tests-integration/fixtures
-        run: docker compose up -d --wait
-      - name: Running tests
-        run: cargo nextest run -F dashboard -F pg_kvbackend
-        env:
-          CARGO_BUILD_RUSTFLAGS: "-C link-arg=-fuse-ld=mold"
-          RUST_BACKTRACE: 1
-          CARGO_INCREMENTAL: 0
-          GT_S3_BUCKET: ${{ vars.AWS_CI_TEST_BUCKET }}
-          GT_S3_ACCESS_KEY_ID: ${{ secrets.AWS_CI_TEST_ACCESS_KEY_ID }}
-          GT_S3_ACCESS_KEY: ${{ secrets.AWS_CI_TEST_SECRET_ACCESS_KEY }}
-          GT_S3_REGION: ${{ vars.AWS_CI_TEST_BUCKET_REGION }}
-          GT_MINIO_BUCKET: greptime
-          GT_MINIO_ACCESS_KEY_ID: superpower_ci_user
-          GT_MINIO_ACCESS_KEY: superpower_password
-          GT_MINIO_REGION: us-west-2
-          GT_MINIO_ENDPOINT_URL: http://127.0.0.1:9000
-          GT_ETCD_ENDPOINTS: http://127.0.0.1:2379
-          GT_POSTGRES_ENDPOINTS: postgres://greptimedb:admin@127.0.0.1:5432/postgres
-          GT_KAFKA_ENDPOINTS: 127.0.0.1:9092
-          GT_KAFKA_SASL_ENDPOINTS: 127.0.0.1:9093
-          UNITTEST_LOG_DIR: "__unittest_logs"
-
   cleanbuild-linux-nix:
-    name: Run clean build on Linux
     runs-on: ubuntu-latest-8-cores
     timeout-minutes: 60
     steps:

.github/workflows/release.yml

@@ -222,10 +222,18 @@ jobs:
             arch: aarch64-apple-darwin
             features: servers/dashboard
             artifacts-dir-prefix: greptime-darwin-arm64
+          - os: ${{ needs.allocate-runners.outputs.macos-runner }}
+            arch: aarch64-apple-darwin
+            features: pyo3_backend,servers/dashboard
+            artifacts-dir-prefix: greptime-darwin-arm64-pyo3
           - os: ${{ needs.allocate-runners.outputs.macos-runner }}
             features: servers/dashboard
             arch: x86_64-apple-darwin
             artifacts-dir-prefix: greptime-darwin-amd64
+          - os: ${{ needs.allocate-runners.outputs.macos-runner }}
+            features: pyo3_backend,servers/dashboard
+            arch: x86_64-apple-darwin
+            artifacts-dir-prefix: greptime-darwin-amd64-pyo3
     runs-on: ${{ matrix.os }}
     outputs:
       build-macos-result: ${{ steps.set-build-macos-result.outputs.build-macos-result }}
@@ -263,6 +271,10 @@ jobs:
             arch: x86_64-pc-windows-msvc
             features: servers/dashboard
             artifacts-dir-prefix: greptime-windows-amd64
+          - os: ${{ needs.allocate-runners.outputs.windows-runner }}
+            arch: x86_64-pc-windows-msvc
+            features: pyo3_backend,servers/dashboard
+            artifacts-dir-prefix: greptime-windows-amd64-pyo3
     runs-on: ${{ matrix.os }}
     outputs:
       build-windows-result: ${{ steps.set-build-windows-result.outputs.build-windows-result }}

Cargo.toml

@@ -55,6 +55,7 @@ members = [
     "src/promql",
     "src/puffin",
     "src/query",
+    "src/script",
     "src/servers",
     "src/session",
     "src/sql",
@@ -78,6 +79,8 @@ clippy.dbg_macro = "warn"
 clippy.implicit_clone = "warn"
 clippy.readonly_write_lock = "allow"
 rust.unknown_lints = "deny"
+# Remove this after https://github.com/PyO3/pyo3/issues/4094
+rust.non_local_definitions = "allow"
 rust.unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
 
 [workspace.dependencies]
@@ -96,7 +99,6 @@ arrow-schema = { version = "51.0", features = ["serde"] }
 async-stream = "0.3"
 async-trait = "0.1"
 axum = { version = "0.6", features = ["headers"] }
-backon = "1"
 base64 = "0.21"
 bigdecimal = "0.4.2"
 bitflags = "2.4.1"
@@ -116,27 +118,22 @@ datafusion-physical-expr = { git = "https://github.com/waynexia/arrow-datafusion
 datafusion-physical-plan = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "7823ef2f63663907edab46af0d51359900f608d6" }
 datafusion-sql = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "7823ef2f63663907edab46af0d51359900f608d6" }
 datafusion-substrait = { git = "https://github.com/waynexia/arrow-datafusion.git", rev = "7823ef2f63663907edab46af0d51359900f608d6" }
-deadpool = "0.10"
-deadpool-postgres = "0.12"
 derive_builder = "0.12"
 dotenv = "0.15"
 etcd-client = "0.13"
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "43ddd8dea69f4df0fe2e8b5cdc0044d2cfa35908" }
+greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "a875e976441188028353f7274a46a7e6e065c5d4" }
 hex = "0.4"
-http = "0.2"
 humantime = "2.1"
 humantime-serde = "1.1"
 itertools = "0.10"
 jsonb = { git = "https://github.com/databendlabs/jsonb.git", rev = "8c8d2fc294a39f3ff08909d60f718639cfba3875", default-features = false }
 lazy_static = "1.4"
-local-ip-address = "0.6"
 meter-core = { git = "https://github.com/GreptimeTeam/greptime-meter.git", rev = "a10facb353b41460eeb98578868ebf19c2084fac" }
 mockall = "0.11.4"
 moka = "0.12"
-nalgebra = "0.33"
 notify = "6.1"
 num_cpus = "1.16"
 once_cell = "1.18"
@@ -180,17 +177,15 @@ similar-asserts = "1.6.0"
 smallvec = { version = "1", features = ["serde"] }
 snafu = "0.8"
 sysinfo = "0.30"
-
-rustls = { version = "0.23.20", default-features = false } # override by patch, see [patch.crates-io]
+# on branch v0.44.x
 sqlparser = { git = "https://github.com/GreptimeTeam/sqlparser-rs.git", rev = "54a267ac89c09b11c0c88934690530807185d3e7", features = [
     "visitor",
     "serde",
-] } # on branch v0.44.x
+] }
 strum = { version = "0.25", features = ["derive"] }
 tempfile = "3"
 tokio = { version = "1.40", features = ["full"] }
 tokio-postgres = "0.7"
-tokio-rustls = { version = "0.26.0", default-features = false } # override by patch, see [patch.crates-io]
 tokio-stream = "0.1"
 tokio-util = { version = "0.7", features = ["io-util", "compat"] }
 toml = "0.8.8"
@@ -257,6 +252,7 @@ plugins = { path = "src/plugins" }
 promql = { path = "src/promql" }
 puffin = { path = "src/puffin" }
 query = { path = "src/query" }
+script = { path = "src/script" }
 servers = { path = "src/servers" }
 session = { path = "src/session" }
 sql = { path = "src/sql" }
@@ -266,9 +262,9 @@ table = { path = "src/table" }
 
 [patch.crates-io]
 # change all rustls dependencies to use our fork to default to `ring` to make it "just work"
-hyper-rustls = { git = "https://github.com/GreptimeTeam/hyper-rustls", rev = "a951e03" } # version = "0.27.5" with ring patch
-rustls = { git = "https://github.com/GreptimeTeam/rustls", rev = "34fd0c6" }             # version = "0.23.20" with ring patch
-tokio-rustls = { git = "https://github.com/GreptimeTeam/tokio-rustls", rev = "4604ca6" } # version = "0.26.0" with ring patch
+hyper-rustls = { git = "https://github.com/GreptimeTeam/hyper-rustls" }
+rustls = { git = "https://github.com/GreptimeTeam/rustls" }
+tokio-rustls = { git = "https://github.com/GreptimeTeam/tokio-rustls" }
 # This is commented, since we are not using aws-lc-sys, if we need to use it, we need to uncomment this line or use a release after this commit, or it wouldn't compile with gcc < 8.1
 # see https://github.com/aws/aws-lc-rs/pull/526
 # aws-lc-sys = { git ="https://github.com/aws/aws-lc-rs", rev = "556558441e3494af4b156ae95ebc07ebc2fd38aa" }

README.md

@@ -138,8 +138,7 @@ Check the prerequisite:
 
 * [Rust toolchain](https://www.rust-lang.org/tools/install) (nightly)
 * [Protobuf compiler](https://grpc.io/docs/protoc-installation/) (>= 3.15)
-* C/C++ building essentials, including `gcc`/`g++`/`autoconf` and glibc library (eg. `libc6-dev` on Ubuntu and `glibc-devel` on Fedora)
-* Python toolchain (optional): Required only if using some test scripts.
+* Python toolchain (optional): Required only if built with PyO3 backend. More details for compiling with PyO3 can be found in its [documentation](https://pyo3.rs/v0.18.1/building_and_distribution#configuring-the-python-version).
 
 Build GreptimeDB binary:
 
@@ -229,3 +228,4 @@ Special thanks to all the contributors who have propelled GreptimeDB forward. Fo
 - GreptimeDB's query engine is powered by [Apache Arrow DataFusion™](https://arrow.apache.org/datafusion/).
 - [Apache OpenDAL™](https://opendal.apache.org) gives GreptimeDB a very general and elegant data access abstraction layer.
 - GreptimeDB's meta service is based on [etcd](https://etcd.io/).
+- GreptimeDB uses [RustPython](https://github.com/RustPython/RustPython) for experimental embedded python scripting.

config/config.md

@@ -18,7 +18,6 @@
 | `init_regions_parallelism` | Integer | `16` | Parallelism of initializing regions. |
 | `max_concurrent_queries` | Integer | `0` | The maximum current queries allowed to be executed. Zero means unlimited. |
 | `enable_telemetry` | Bool | `true` | Enable telemetry to collect anonymous usage data. Enabled by default. |
-| `max_in_flight_write_bytes` | String | Unset | The maximum in-flight write bytes. |
 | `runtime` | -- | -- | The runtime options. |
 | `runtime.global_rt_size` | Integer | `8` | The number of threads to execute the runtime for global read operations. |
 | `runtime.compact_rt_size` | Integer | `4` | The number of threads to execute the runtime for global write operations. |
@@ -94,7 +93,7 @@
 | `storage` | -- | -- | The data storage options. |
 | `storage.data_home` | String | `/tmp/greptimedb/` | The working home directory. |
 | `storage.type` | String | `File` | The storage type used to store the data.<br/>- `File`: the data is stored in the local file system.<br/>- `S3`: the data is stored in the S3 object storage.<br/>- `Gcs`: the data is stored in the Google Cloud Storage.<br/>- `Azblob`: the data is stored in the Azure Blob Storage.<br/>- `Oss`: the data is stored in the Aliyun OSS. |
-| `storage.cache_path` | String | Unset | Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.<br/>A local file directory, defaults to `{data_home}`. An empty string means disabling. |
+| `storage.cache_path` | String | Unset | Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.<br/>A local file directory, defaults to `{data_home}/object_cache/read`. An empty string means disabling. |
 | `storage.cache_capacity` | String | Unset | The local file cache capacity in bytes. If your disk space is sufficient, it is recommended to set it larger. |
 | `storage.bucket` | String | Unset | The S3 bucket name.<br/>**It's only used when the storage type is `S3`, `Oss` and `Gcs`**. |
 | `storage.root` | String | Unset | The S3 data will be stored in the specified prefix, for example, `s3://${bucket}/${root}`.<br/>**It's only used when the storage type is `S3`, `Oss` and `Azblob`**. |
@@ -132,10 +131,10 @@
 | `region_engine.mito.vector_cache_size` | String | Auto | Cache size for vectors and arrow arrays. Setting it to 0 to disable the cache.<br/>If not set, it's default to 1/16 of OS memory with a max limitation of 512MB. |
 | `region_engine.mito.page_cache_size` | String | Auto | Cache size for pages of SST row groups. Setting it to 0 to disable the cache.<br/>If not set, it's default to 1/8 of OS memory. |
 | `region_engine.mito.selector_result_cache_size` | String | Auto | Cache size for time series selector (e.g. `last_value()`). Setting it to 0 to disable the cache.<br/>If not set, it's default to 1/16 of OS memory with a max limitation of 512MB. |
-| `region_engine.mito.enable_write_cache` | Bool | `false` | Whether to enable the write cache, it's enabled by default when using object storage. It is recommended to enable it when using object storage for better performance. |
-| `region_engine.mito.write_cache_path` | String | `""` | File system path for write cache, defaults to `{data_home}`. |
-| `region_engine.mito.write_cache_size` | String | `5GiB` | Capacity for write cache. If your disk space is sufficient, it is recommended to set it larger. |
-| `region_engine.mito.write_cache_ttl` | String | Unset | TTL for write cache. |
+| `region_engine.mito.enable_experimental_write_cache` | Bool | `false` | Whether to enable the experimental write cache, it's enabled by default when using object storage. It is recommended to enable it when using object storage for better performance. |
+| `region_engine.mito.experimental_write_cache_path` | String | `""` | File system path for write cache, defaults to `{data_home}/object_cache/write`. |
+| `region_engine.mito.experimental_write_cache_size` | String | `5GiB` | Capacity for write cache. If your disk space is sufficient, it is recommended to set it larger. |
+| `region_engine.mito.experimental_write_cache_ttl` | String | Unset | TTL for write cache. |
 | `region_engine.mito.sst_write_buffer_size` | String | `8MB` | Buffer size for SST writing. |
 | `region_engine.mito.parallel_scan_channel_size` | Integer | `32` | Capacity of the channel to send data from parallel scan tasks to the main task. |
 | `region_engine.mito.allow_stale_entries` | Bool | `false` | Whether to allow stale WAL entries read during replay. |
@@ -151,17 +150,12 @@
 | `region_engine.mito.inverted_index.intermediate_path` | String | `""` | Deprecated, use `region_engine.mito.index.aux_path` instead. |
 | `region_engine.mito.inverted_index.metadata_cache_size` | String | `64MiB` | Cache size for inverted index metadata. |
 | `region_engine.mito.inverted_index.content_cache_size` | String | `128MiB` | Cache size for inverted index content. |
-| `region_engine.mito.inverted_index.content_cache_page_size` | String | `64KiB` | Page size for inverted index content cache. |
+| `region_engine.mito.inverted_index.content_cache_page_size` | String | `8MiB` | Page size for inverted index content cache. |
 | `region_engine.mito.fulltext_index` | -- | -- | The options for full-text index in Mito engine. |
 | `region_engine.mito.fulltext_index.create_on_flush` | String | `auto` | Whether to create the index on flush.<br/>- `auto`: automatically (default)<br/>- `disable`: never |
 | `region_engine.mito.fulltext_index.create_on_compaction` | String | `auto` | Whether to create the index on compaction.<br/>- `auto`: automatically (default)<br/>- `disable`: never |
 | `region_engine.mito.fulltext_index.apply_on_query` | String | `auto` | Whether to apply the index on query<br/>- `auto`: automatically (default)<br/>- `disable`: never |
 | `region_engine.mito.fulltext_index.mem_threshold_on_create` | String | `auto` | Memory threshold for index creation.<br/>- `auto`: automatically determine the threshold based on the system memory size (default)<br/>- `unlimited`: no memory limit<br/>- `[size]` e.g. `64MB`: fixed memory threshold |
-| `region_engine.mito.bloom_filter_index` | -- | -- | The options for bloom filter in Mito engine. |
-| `region_engine.mito.bloom_filter_index.create_on_flush` | String | `auto` | Whether to create the bloom filter on flush.<br/>- `auto`: automatically (default)<br/>- `disable`: never |
-| `region_engine.mito.bloom_filter_index.create_on_compaction` | String | `auto` | Whether to create the bloom filter on compaction.<br/>- `auto`: automatically (default)<br/>- `disable`: never |
-| `region_engine.mito.bloom_filter_index.apply_on_query` | String | `auto` | Whether to apply the bloom filter on query<br/>- `auto`: automatically (default)<br/>- `disable`: never |
-| `region_engine.mito.bloom_filter_index.mem_threshold_on_create` | String | `auto` | Memory threshold for bloom filter creation.<br/>- `auto`: automatically determine the threshold based on the system memory size (default)<br/>- `unlimited`: no memory limit<br/>- `[size]` e.g. `64MB`: fixed memory threshold |
 | `region_engine.mito.memtable` | -- | -- | -- |
 | `region_engine.mito.memtable.type` | String | `time_series` | Memtable type.<br/>- `time_series`: time-series memtable<br/>- `partition_tree`: partition tree memtable (experimental) |
 | `region_engine.mito.memtable.index_max_keys_per_shard` | Integer | `8192` | The max number of keys in one shard.<br/>Only available for `partition_tree` memtable. |
@@ -201,7 +195,6 @@
 | Key | Type | Default | Descriptions |
 | --- | -----| ------- | ----------- |
 | `default_timezone` | String | Unset | The default timezone of the server. |
-| `max_in_flight_write_bytes` | String | Unset | The maximum in-flight write bytes. |
 | `runtime` | -- | -- | The runtime options. |
 | `runtime.global_rt_size` | Integer | `8` | The number of threads to execute the runtime for global read operations. |
 | `runtime.compact_rt_size` | Integer | `4` | The number of threads to execute the runtime for global write operations. |
@@ -214,7 +207,7 @@
 | `http.body_limit` | String | `64MB` | HTTP request body limit.<br/>The following units are supported: `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`.<br/>Set to 0 to disable limit. |
 | `grpc` | -- | -- | The gRPC server options. |
 | `grpc.addr` | String | `127.0.0.1:4001` | The address to bind the gRPC server. |
-| `grpc.hostname` | String | `127.0.0.1:4001` | The hostname advertised to the metasrv,<br/>and used for connections from outside the host |
+| `grpc.hostname` | String | `127.0.0.1` | The hostname advertised to the metasrv,<br/>and used for connections from outside the host |
 | `grpc.runtime_size` | Integer | `8` | The number of server worker threads. |
 | `grpc.tls` | -- | -- | gRPC server TLS options, see `mysql.tls` section. |
 | `grpc.tls.mode` | String | `disable` | TLS mode. |
@@ -293,11 +286,9 @@
 | `data_home` | String | `/tmp/metasrv/` | The working home directory. |
 | `bind_addr` | String | `127.0.0.1:3002` | The bind address of metasrv. |
 | `server_addr` | String | `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. |
-| `store_addrs` | Array | -- | Store server address default to etcd store.<br/>For postgres store, the format is:<br/>"password=password dbname=postgres user=postgres host=localhost port=5432"<br/>For etcd store, the format is:<br/>"127.0.0.1:2379" |
+| `store_addrs` | Array | -- | Store server address default to etcd store. |
 | `store_key_prefix` | String | `""` | If it's not empty, the metasrv will store all data with this key prefix. |
-| `backend` | String | `etcd_store` | The datastore for meta server.<br/>Available values:<br/>- `etcd_store` (default value)<br/>- `memory_store`<br/>- `postgres_store` |
-| `meta_table_name` | String | `greptime_metakv` | Table name in RDS to store metadata. Effect when using a RDS kvbackend.<br/>**Only used when backend is `postgres_store`.** |
-| `meta_election_lock_id` | Integer | `1` | Advisory lock id in PostgreSQL for election. Effect when using PostgreSQL as kvbackend<br/>Only used when backend is `postgres_store`. |
+| `backend` | String | `EtcdStore` | The datastore for meta server. |
 | `selector` | String | `round_robin` | Datanode selector type.<br/>- `round_robin` (default value)<br/>- `lease_based`<br/>- `load_based`<br/>For details, please see "https://docs.greptime.com/developer-guide/metasrv/selector". |
 | `use_memory_store` | Bool | `false` | Store data in memory. |
 | `enable_region_failover` | Bool | `false` | Whether to enable region failover.<br/>This feature is only available on GreptimeDB running on cluster mode and<br/>- Using Remote WAL<br/>- Using shared storage (e.g., s3). |
@@ -380,7 +371,7 @@
 | `http.body_limit` | String | `64MB` | HTTP request body limit.<br/>The following units are supported: `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`.<br/>Set to 0 to disable limit. |
 | `grpc` | -- | -- | The gRPC server options. |
 | `grpc.addr` | String | `127.0.0.1:3001` | The address to bind the gRPC server. |
-| `grpc.hostname` | String | `127.0.0.1:3001` | The hostname advertised to the metasrv,<br/>and used for connections from outside the host |
+| `grpc.hostname` | String | `127.0.0.1` | The hostname advertised to the metasrv,<br/>and used for connections from outside the host |
 | `grpc.runtime_size` | Integer | `8` | The number of server worker threads. |
 | `grpc.max_recv_message_size` | String | `512MB` | The maximum receive message size for gRPC server. |
 | `grpc.max_send_message_size` | String | `512MB` | The maximum send message size for gRPC server. |
@@ -430,7 +421,7 @@
 | `storage` | -- | -- | The data storage options. |
 | `storage.data_home` | String | `/tmp/greptimedb/` | The working home directory. |
 | `storage.type` | String | `File` | The storage type used to store the data.<br/>- `File`: the data is stored in the local file system.<br/>- `S3`: the data is stored in the S3 object storage.<br/>- `Gcs`: the data is stored in the Google Cloud Storage.<br/>- `Azblob`: the data is stored in the Azure Blob Storage.<br/>- `Oss`: the data is stored in the Aliyun OSS. |
-| `storage.cache_path` | String | Unset | Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.<br/>A local file directory, defaults to `{data_home}`. An empty string means disabling. |
+| `storage.cache_path` | String | Unset | Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.<br/>A local file directory, defaults to `{data_home}/object_cache/read`. An empty string means disabling. |
 | `storage.cache_capacity` | String | Unset | The local file cache capacity in bytes. If your disk space is sufficient, it is recommended to set it larger. |
 | `storage.bucket` | String | Unset | The S3 bucket name.<br/>**It's only used when the storage type is `S3`, `Oss` and `Gcs`**. |
 | `storage.root` | String | Unset | The S3 data will be stored in the specified prefix, for example, `s3://${bucket}/${root}`.<br/>**It's only used when the storage type is `S3`, `Oss` and `Azblob`**. |
@@ -468,10 +459,10 @@
 | `region_engine.mito.vector_cache_size` | String | Auto | Cache size for vectors and arrow arrays. Setting it to 0 to disable the cache.<br/>If not set, it's default to 1/16 of OS memory with a max limitation of 512MB. |
 | `region_engine.mito.page_cache_size` | String | Auto | Cache size for pages of SST row groups. Setting it to 0 to disable the cache.<br/>If not set, it's default to 1/8 of OS memory. |
 | `region_engine.mito.selector_result_cache_size` | String | Auto | Cache size for time series selector (e.g. `last_value()`). Setting it to 0 to disable the cache.<br/>If not set, it's default to 1/16 of OS memory with a max limitation of 512MB. |
-| `region_engine.mito.enable_write_cache` | Bool | `false` | Whether to enable the write cache, it's enabled by default when using object storage. It is recommended to enable it when using object storage for better performance. |
-| `region_engine.mito.write_cache_path` | String | `""` | File system path for write cache, defaults to `{data_home}`. |
-| `region_engine.mito.write_cache_size` | String | `5GiB` | Capacity for write cache. If your disk space is sufficient, it is recommended to set it larger. |
-| `region_engine.mito.write_cache_ttl` | String | Unset | TTL for write cache. |
+| `region_engine.mito.enable_experimental_write_cache` | Bool | `false` | Whether to enable the experimental write cache, it's enabled by default when using object storage. It is recommended to enable it when using object storage for better performance. |
+| `region_engine.mito.experimental_write_cache_path` | String | `""` | File system path for write cache, defaults to `{data_home}/object_cache/write`. |
+| `region_engine.mito.experimental_write_cache_size` | String | `5GiB` | Capacity for write cache. If your disk space is sufficient, it is recommended to set it larger. |
+| `region_engine.mito.experimental_write_cache_ttl` | String | Unset | TTL for write cache. |
 | `region_engine.mito.sst_write_buffer_size` | String | `8MB` | Buffer size for SST writing. |
 | `region_engine.mito.parallel_scan_channel_size` | Integer | `32` | Capacity of the channel to send data from parallel scan tasks to the main task. |
 | `region_engine.mito.allow_stale_entries` | Bool | `false` | Whether to allow stale WAL entries read during replay. |
@@ -487,17 +478,12 @@
 | `region_engine.mito.inverted_index.intermediate_path` | String | `""` | Deprecated, use `region_engine.mito.index.aux_path` instead. |
 | `region_engine.mito.inverted_index.metadata_cache_size` | String | `64MiB` | Cache size for inverted index metadata. |
 | `region_engine.mito.inverted_index.content_cache_size` | String | `128MiB` | Cache size for inverted index content. |
-| `region_engine.mito.inverted_index.content_cache_page_size` | String | `64KiB` | Page size for inverted index content cache. |
+| `region_engine.mito.inverted_index.content_cache_page_size` | String | `8MiB` | Page size for inverted index content cache. |
 | `region_engine.mito.fulltext_index` | -- | -- | The options for full-text index in Mito engine. |
 | `region_engine.mito.fulltext_index.create_on_flush` | String | `auto` | Whether to create the index on flush.<br/>- `auto`: automatically (default)<br/>- `disable`: never |
 | `region_engine.mito.fulltext_index.create_on_compaction` | String | `auto` | Whether to create the index on compaction.<br/>- `auto`: automatically (default)<br/>- `disable`: never |
 | `region_engine.mito.fulltext_index.apply_on_query` | String | `auto` | Whether to apply the index on query<br/>- `auto`: automatically (default)<br/>- `disable`: never |
 | `region_engine.mito.fulltext_index.mem_threshold_on_create` | String | `auto` | Memory threshold for index creation.<br/>- `auto`: automatically determine the threshold based on the system memory size (default)<br/>- `unlimited`: no memory limit<br/>- `[size]` e.g. `64MB`: fixed memory threshold |
-| `region_engine.mito.bloom_filter_index` | -- | -- | The options for bloom filter index in Mito engine. |
-| `region_engine.mito.bloom_filter_index.create_on_flush` | String | `auto` | Whether to create the index on flush.<br/>- `auto`: automatically (default)<br/>- `disable`: never |
-| `region_engine.mito.bloom_filter_index.create_on_compaction` | String | `auto` | Whether to create the index on compaction.<br/>- `auto`: automatically (default)<br/>- `disable`: never |
-| `region_engine.mito.bloom_filter_index.apply_on_query` | String | `auto` | Whether to apply the index on query<br/>- `auto`: automatically (default)<br/>- `disable`: never |
-| `region_engine.mito.bloom_filter_index.mem_threshold_on_create` | String | `auto` | Memory threshold for the index creation.<br/>- `auto`: automatically determine the threshold based on the system memory size (default)<br/>- `unlimited`: no memory limit<br/>- `[size]` e.g. `64MB`: fixed memory threshold |
 | `region_engine.mito.memtable` | -- | -- | -- |
 | `region_engine.mito.memtable.type` | String | `time_series` | Memtable type.<br/>- `time_series`: time-series memtable<br/>- `partition_tree`: partition tree memtable (experimental) |
 | `region_engine.mito.memtable.index_max_keys_per_shard` | Integer | `8192` | The max number of keys in one shard.<br/>Only available for `partition_tree` memtable. |

config/datanode.example.toml

@@ -59,7 +59,7 @@ body_limit = "64MB"
 addr = "127.0.0.1:3001"
 ## The hostname advertised to the metasrv,
 ## and used for connections from outside the host
-hostname = "127.0.0.1:3001"
+hostname = "127.0.0.1"
 ## The number of server worker threads.
 runtime_size = 8
 ## The maximum receive message size for gRPC server.
@@ -294,7 +294,7 @@ data_home = "/tmp/greptimedb/"
 type = "File"
 
 ## Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.
-## A local file directory, defaults to `{data_home}`. An empty string means disabling.
+## A local file directory, defaults to `{data_home}/object_cache/read`. An empty string means disabling.
 ## @toml2docs:none-default
 #+ cache_path = ""
 
@@ -475,18 +475,18 @@ auto_flush_interval = "1h"
 ## @toml2docs:none-default="Auto"
 #+ selector_result_cache_size = "512MB"
 
-## Whether to enable the write cache, it's enabled by default when using object storage. It is recommended to enable it when using object storage for better performance.
-enable_write_cache = false
+## Whether to enable the experimental write cache, it's enabled by default when using object storage. It is recommended to enable it when using object storage for better performance.
+enable_experimental_write_cache = false
 
-## File system path for write cache, defaults to `{data_home}`.
-write_cache_path = ""
+## File system path for write cache, defaults to `{data_home}/object_cache/write`.
+experimental_write_cache_path = ""
 
 ## Capacity for write cache. If your disk space is sufficient, it is recommended to set it larger.
-write_cache_size = "5GiB"
+experimental_write_cache_size = "5GiB"
 
 ## TTL for write cache.
 ## @toml2docs:none-default
-write_cache_ttl = "8h"
+experimental_write_cache_ttl = "8h"
 
 ## Buffer size for SST writing.
 sst_write_buffer_size = "8MB"
@@ -550,7 +550,7 @@ metadata_cache_size = "64MiB"
 content_cache_size = "128MiB"
 
 ## Page size for inverted index content cache.
-content_cache_page_size = "64KiB"
+content_cache_page_size = "8MiB"
 
 ## The options for full-text index in Mito engine.
 [region_engine.mito.fulltext_index]
@@ -576,30 +576,6 @@ apply_on_query = "auto"
 ## - `[size]` e.g. `64MB`: fixed memory threshold
 mem_threshold_on_create = "auto"
 
-## The options for bloom filter index in Mito engine.
-[region_engine.mito.bloom_filter_index]
-
-## Whether to create the index on flush.
-## - `auto`: automatically (default)
-## - `disable`: never
-create_on_flush = "auto"
-
-## Whether to create the index on compaction.
-## - `auto`: automatically (default)
-## - `disable`: never
-create_on_compaction = "auto"
-
-## Whether to apply the index on query
-## - `auto`: automatically (default)
-## - `disable`: never
-apply_on_query = "auto"
-
-## Memory threshold for the index creation.
-## - `auto`: automatically determine the threshold based on the system memory size (default)
-## - `unlimited`: no memory limit
-## - `[size]` e.g. `64MB`: fixed memory threshold
-mem_threshold_on_create = "auto"
-
 [region_engine.mito.memtable]
 ## Memtable type.
 ## - `time_series`: time-series memtable

config/frontend.example.toml

@@ -2,10 +2,6 @@
 ## @toml2docs:none-default
 default_timezone = "UTC"
 
-## The maximum in-flight write bytes.
-## @toml2docs:none-default
-#+ max_in_flight_write_bytes = "500MB"
-
 ## The runtime options.
 #+ [runtime]
 ## The number of threads to execute the runtime for global read operations.
@@ -38,7 +34,7 @@ body_limit = "64MB"
 addr = "127.0.0.1:4001"
 ## The hostname advertised to the metasrv,
 ## and used for connections from outside the host
-hostname = "127.0.0.1:4001"
+hostname = "127.0.0.1"
 ## The number of server worker threads.
 runtime_size = 8
 

config/metasrv.example.toml

@@ -8,29 +8,13 @@ bind_addr = "127.0.0.1:3002"
 server_addr = "127.0.0.1:3002"
 
 ## Store server address default to etcd store.
-## For postgres store, the format is:
-## "password=password dbname=postgres user=postgres host=localhost port=5432"
-## For etcd store, the format is:
-## "127.0.0.1:2379"
 store_addrs = ["127.0.0.1:2379"]
 
 ## If it's not empty, the metasrv will store all data with this key prefix.
 store_key_prefix = ""
 
 ## The datastore for meta server.
-## Available values:
-## - `etcd_store` (default value)
-## - `memory_store`
-## - `postgres_store`
-backend = "etcd_store"
-
-## Table name in RDS to store metadata. Effect when using a RDS kvbackend.
-## **Only used when backend is `postgres_store`.**
-meta_table_name = "greptime_metakv"
-
-## Advisory lock id in PostgreSQL for election. Effect when using PostgreSQL as kvbackend
-## Only used when backend is `postgres_store`.
-meta_election_lock_id = 1
+backend = "EtcdStore"
 
 ## Datanode selector type.
 ## - `round_robin` (default value)

config/standalone.example.toml

@@ -18,10 +18,6 @@ max_concurrent_queries = 0
 ## Enable telemetry to collect anonymous usage data. Enabled by default.
 #+ enable_telemetry = true
 
-## The maximum in-flight write bytes.
-## @toml2docs:none-default
-#+ max_in_flight_write_bytes = "500MB"
-
 ## The runtime options.
 #+ [runtime]
 ## The number of threads to execute the runtime for global read operations.
@@ -337,7 +333,7 @@ data_home = "/tmp/greptimedb/"
 type = "File"
 
 ## Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.
-## A local file directory, defaults to `{data_home}`. An empty string means disabling.
+## A local file directory, defaults to `{data_home}/object_cache/read`. An empty string means disabling.
 ## @toml2docs:none-default
 #+ cache_path = ""
 
@@ -518,18 +514,18 @@ auto_flush_interval = "1h"
 ## @toml2docs:none-default="Auto"
 #+ selector_result_cache_size = "512MB"
 
-## Whether to enable the write cache, it's enabled by default when using object storage. It is recommended to enable it when using object storage for better performance.
-enable_write_cache = false
+## Whether to enable the experimental write cache, it's enabled by default when using object storage. It is recommended to enable it when using object storage for better performance.
+enable_experimental_write_cache = false
 
-## File system path for write cache, defaults to `{data_home}`.
-write_cache_path = ""
+## File system path for write cache, defaults to `{data_home}/object_cache/write`.
+experimental_write_cache_path = ""
 
 ## Capacity for write cache. If your disk space is sufficient, it is recommended to set it larger.
-write_cache_size = "5GiB"
+experimental_write_cache_size = "5GiB"
 
 ## TTL for write cache.
 ## @toml2docs:none-default
-write_cache_ttl = "8h"
+experimental_write_cache_ttl = "8h"
 
 ## Buffer size for SST writing.
 sst_write_buffer_size = "8MB"
@@ -593,7 +589,7 @@ metadata_cache_size = "64MiB"
 content_cache_size = "128MiB"
 
 ## Page size for inverted index content cache.
-content_cache_page_size = "64KiB"
+content_cache_page_size = "8MiB"
 
 ## The options for full-text index in Mito engine.
 [region_engine.mito.fulltext_index]
@@ -619,30 +615,6 @@ apply_on_query = "auto"
 ## - `[size]` e.g. `64MB`: fixed memory threshold
 mem_threshold_on_create = "auto"
 
-## The options for bloom filter in Mito engine.
-[region_engine.mito.bloom_filter_index]
-
-## Whether to create the bloom filter on flush.
-## - `auto`: automatically (default)
-## - `disable`: never
-create_on_flush = "auto"
-
-## Whether to create the bloom filter on compaction.
-## - `auto`: automatically (default)
-## - `disable`: never
-create_on_compaction = "auto"
-
-## Whether to apply the bloom filter on query
-## - `auto`: automatically (default)
-## - `disable`: never
-apply_on_query = "auto"
-
-## Memory threshold for bloom filter creation.
-## - `auto`: automatically determine the threshold based on the system memory size (default)
-## - `unlimited`: no memory limit
-## - `[size]` e.g. `64MB`: fixed memory threshold
-mem_threshold_on_create = "auto"
-
 [region_engine.mito.memtable]
 ## Memtable type.
 ## - `time_series`: time-series memtable

docker/buildx/centos/Dockerfile

@@ -13,6 +13,8 @@ RUN yum install -y epel-release  \
     openssl \
     openssl-devel  \
     centos-release-scl  \
+    rh-python38  \
+    rh-python38-python-devel \
     which
 
 # Install protoc
@@ -22,7 +24,7 @@ RUN unzip protoc-3.15.8-linux-x86_64.zip -d /usr/local/
 # 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 /usr/local/bin:/root/.cargo/bin/:$PATH
+ENV PATH /opt/rh/rh-python38/root/usr/bin:/usr/local/bin:/root/.cargo/bin/:$PATH
 
 # Build the project in release mode.
 RUN --mount=target=.,rw \
@@ -41,6 +43,8 @@ RUN yum install -y epel-release \
     openssl \
     openssl-devel  \
     centos-release-scl  \
+    rh-python38  \
+    rh-python38-python-devel \
     which
 
 WORKDIR /greptime

docker/buildx/ubuntu/Dockerfile

@@ -7,8 +7,10 @@ ARG OUTPUT_DIR
 ENV LANG en_US.utf8
 WORKDIR /greptimedb
 
+# Add PPA for Python 3.10.
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common
+    DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common && \
+    add-apt-repository ppa:deadsnakes/ppa -y
 
 # Install dependencies.
 RUN --mount=type=cache,target=/var/cache/apt \
@@ -18,7 +20,10 @@ RUN --mount=type=cache,target=/var/cache/apt \
     curl \
     git \
     build-essential \
-    pkg-config
+    pkg-config \
+    python3.10 \
+    python3.10-dev \
+    python3-pip
 
 # Install Rust.
 SHELL ["/bin/bash", "-c"]
@@ -41,8 +46,15 @@ ARG OUTPUT_DIR
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get \
     -y install ca-certificates \
+    python3.10 \
+    python3.10-dev \
+    python3-pip \
     curl
 
+COPY ./docker/python/requirements.txt /etc/greptime/requirements.txt
+
+RUN python3 -m pip install -r /etc/greptime/requirements.txt
+
 WORKDIR /greptime
 COPY --from=builder /out/target/${OUTPUT_DIR}/greptime /greptime/bin/
 ENV PATH /greptime/bin/:$PATH

docker/ci/centos/Dockerfile

@@ -7,7 +7,9 @@ RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
 RUN yum install -y epel-release \
     openssl \
     openssl-devel  \
-    centos-release-scl
+    centos-release-scl  \
+    rh-python38  \
+    rh-python38-python-devel
 
 ARG TARGETARCH
 

docker/ci/ubuntu/Dockerfile

@@ -8,8 +8,15 @@ ARG TARGET_BIN=greptime
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     ca-certificates \
+    python3.10 \
+    python3.10-dev \
+    python3-pip \
     curl
 
+COPY $DOCKER_BUILD_ROOT/docker/python/requirements.txt /etc/greptime/requirements.txt
+
+RUN python3 -m pip install -r /etc/greptime/requirements.txt
+
 ARG TARGETARCH
 
 ADD $TARGETARCH/$TARGET_BIN /greptime/bin/

docker/dev-builder/android/Dockerfile

@@ -13,7 +13,12 @@ RUN apt-get update && apt-get install -y \
     curl \
     git \
     build-essential \
-    pkg-config
+    pkg-config \
+    python3 \
+    python3-dev \
+    python3-pip \
+    && pip3 install --upgrade pip \
+    && pip3 install pyarrow
 
 # Trust workdir
 RUN git config --global --add safe.directory /greptimedb

docker/dev-builder/centos/Dockerfile

@@ -12,6 +12,8 @@ RUN yum install -y epel-release  \
     openssl \
     openssl-devel  \
     centos-release-scl  \
+    rh-python38  \
+    rh-python38-python-devel \
     which
 
 # Install protoc
@@ -21,7 +23,7 @@ RUN unzip protoc-3.15.8-linux-x86_64.zip -d /usr/local/
 # 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 /usr/local/bin:/root/.cargo/bin/:$PATH
+ENV PATH /opt/rh/rh-python38/root/usr/bin:/usr/local/bin:/root/.cargo/bin/:$PATH
 
 # Install Rust toolchains.
 ARG RUST_TOOLCHAIN

docker/dev-builder/ubuntu/Dockerfile

@@ -6,8 +6,11 @@ ARG DOCKER_BUILD_ROOT=.
 ENV LANG en_US.utf8
 WORKDIR /greptimedb
 
+# Add PPA for Python 3.10.
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common
+    DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common && \
+    add-apt-repository ppa:deadsnakes/ppa -y
+
 # Install dependencies.
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     libssl-dev \
@@ -17,7 +20,9 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     ca-certificates \
     git \
     build-essential \
-    pkg-config
+    pkg-config \
+    python3.10 \
+    python3.10-dev
 
 ARG TARGETPLATFORM
 RUN echo "target platform: $TARGETPLATFORM"
@@ -33,6 +38,21 @@ fi
 RUN mv protoc3/bin/* /usr/local/bin/
 RUN mv protoc3/include/* /usr/local/include/
 
+# https://github.com/GreptimeTeam/greptimedb/actions/runs/10935485852/job/30357457188#step:3:7106
+# `aws-lc-sys` require gcc >= 10.3.0 to work, hence alias to use gcc-10
+RUN apt-get remove -y gcc-9 g++-9 cpp-9 && \
+    apt-get install -y gcc-10 g++-10 cpp-10 make cmake && \
+    ln -sf /usr/bin/gcc-10 /usr/bin/gcc && ln -sf /usr/bin/g++-10 /usr/bin/g++ && \
+    ln -sf /usr/bin/gcc-10 /usr/bin/cc && \
+    ln -sf /usr/bin/g++-10 /usr/bin/cpp && ln -sf /usr/bin/g++-10 /usr/bin/c++ && \
+    cc --version && gcc --version && g++ --version && cpp --version && c++ --version
+
+# Remove Python 3.8 and install pip.
+RUN apt-get -y purge python3.8 && \
+    apt-get -y autoremove && \
+    ln -s /usr/bin/python3.10 /usr/bin/python3 && \
+    curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10
+
 # Silence all `safe.directory` warnings, to avoid the "detect dubious repository" error when building with submodules.
 # Disabling the safe directory check here won't pose extra security issues, because in our usage for this dev build
 # image, we use it solely on our own environment (that github action's VM, or ECS created dynamically by ourselves),
@@ -45,6 +65,10 @@ RUN mv protoc3/include/* /usr/local/include/
 # it can be a different user that have prepared the submodules.
 RUN git config --global --add safe.directory '*'
 
+# Install Python dependencies.
+COPY $DOCKER_BUILD_ROOT/docker/python/requirements.txt /etc/greptime/requirements.txt
+RUN python3 -m pip install -r /etc/greptime/requirements.txt
+
 # 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

docker/python/requirements.txt

@@ -0,0 +1,5 @@
+numpy>=1.24.2
+pandas>=1.5.3
+pyarrow>=11.0.0
+requests>=2.28.2
+scipy>=1.10.1

grafana/greptimedb-cluster.json

@@ -5296,7 +5296,7 @@
             "uid": "${metrics}"
           },
           "editorMode": "code",
-          "expr": "sum by(pod, scheme, operation) (rate(opendal_operation_duration_seconds_count{pod=~\"$datanode\"}[$__rate_interval]))",
+          "expr": "sum by(pod, scheme, operation) (rate(opendal_requests_total{pod=~\"$datanode\"}[$__rate_interval]))",
           "instant": false,
           "legendFormat": "[{{pod}}]-[{{scheme}}]-[{{operation}}]-qps",
           "range": true,
@@ -5392,7 +5392,7 @@
             "uid": "${metrics}"
           },
           "editorMode": "code",
-          "expr": "sum by(pod, scheme) (rate(opendal_operation_duration_seconds_count{pod=~\"$datanode\", operation=\"read\"}[$__rate_interval]))",
+          "expr": "sum by(pod, scheme) (rate(opendal_requests_duration_seconds_count{pod=~\"$datanode\", operation=\"read\"}[$__rate_interval]))",
           "instant": false,
           "legendFormat": "[{{pod}}]-[{{scheme}}]-qps",
           "range": true,
@@ -5488,7 +5488,7 @@
             "uid": "${metrics}"
           },
           "editorMode": "code",
-          "expr": "histogram_quantile(0.99, sum by(pod, le, scheme) (rate(opendal_operation_duration_seconds_bucket{pod=~\"$datanode\",operation=\"read\"}[$__rate_interval])))",
+          "expr": "histogram_quantile(0.99, sum by(pod, le, scheme) (rate(opendal_requests_duration_seconds_bucket{pod=~\"$datanode\",operation=\"read\"}[$__rate_interval])))",
           "instant": false,
           "legendFormat": "[{{pod}}]-{{scheme}}-p99",
           "range": true,
@@ -5584,7 +5584,7 @@
             "uid": "${metrics}"
           },
           "editorMode": "code",
-          "expr": "sum by(pod, scheme) (rate(opendal_operation_duration_seconds_count{pod=~\"$datanode\", operation=\"write\"}[$__rate_interval]))",
+          "expr": "sum by(pod, scheme) (rate(opendal_requests_duration_seconds_count{pod=~\"$datanode\", operation=\"write\"}[$__rate_interval]))",
           "instant": false,
           "legendFormat": "[{{pod}}]-[{{scheme}}]-qps",
           "range": true,
@@ -5680,7 +5680,7 @@
             "uid": "${metrics}"
           },
           "editorMode": "code",
-          "expr": "histogram_quantile(0.99, sum by(pod, le, scheme) (rate(opendal_operation_duration_seconds_bucket{pod=~\"$datanode\", operation=\"write\"}[$__rate_interval])))",
+          "expr": "histogram_quantile(0.99, sum by(pod, le, scheme) (rate(opendal_requests_duration_seconds_bucket{pod=~\"$datanode\", operation=\"write\"}[$__rate_interval])))",
           "instant": false,
           "legendFormat": "[{{pod}}]-[{{scheme}}]-p99",
           "range": true,
@@ -5776,7 +5776,7 @@
             "uid": "${metrics}"
           },
           "editorMode": "code",
-          "expr": "sum by(pod, scheme) (rate(opendal_operation_duration_seconds_count{pod=~\"$datanode\", operation=\"list\"}[$__rate_interval]))",
+          "expr": "sum by(pod, scheme) (rate(opendal_requests_duration_seconds_count{pod=~\"$datanode\", operation=\"list\"}[$__rate_interval]))",
           "instant": false,
           "interval": "",
           "legendFormat": "[{{pod}}]-[{{scheme}}]-qps",
@@ -5873,7 +5873,7 @@
             "uid": "${metrics}"
           },
           "editorMode": "code",
-          "expr": "histogram_quantile(0.99, sum by(pod, le, scheme) (rate(opendal_operation_duration_seconds_bucket{pod=~\"$datanode\", operation=\"list\"}[$__rate_interval])))",
+          "expr": "histogram_quantile(0.99, sum by(pod, le, scheme) (rate(opendal_requests_duration_seconds_bucket{pod=~\"$datanode\", operation=\"list\"}[$__rate_interval])))",
           "instant": false,
           "interval": "",
           "legendFormat": "[{{pod}}]-[{{scheme}}]-p99",
@@ -5970,7 +5970,7 @@
             "uid": "${metrics}"
           },
           "editorMode": "code",
-          "expr": "sum by(pod, scheme, operation) (rate(opendal_operation_duration_seconds_count{pod=~\"$datanode\",operation!~\"read|write|list|stat\"}[$__rate_interval]))",
+          "expr": "sum by(pod, scheme, operation) (rate(opendal_requests_duration_seconds_count{pod=~\"$datanode\",operation!~\"read|write|list|stat\"}[$__rate_interval]))",
           "instant": false,
           "legendFormat": "[{{pod}}]-[{{scheme}}]-[{{operation}}]-qps",
           "range": true,
@@ -6066,7 +6066,7 @@
             "uid": "${metrics}"
           },
           "editorMode": "code",
-          "expr": "histogram_quantile(0.99, sum by(pod, le, scheme, operation) (rate(opendal_operation_duration_seconds_bucket{pod=~\"$datanode\", operation!~\"read|write|list\"}[$__rate_interval])))",
+          "expr": "histogram_quantile(0.99, sum by(pod, le, scheme, operation) (rate(opendal_requests_duration_seconds_bucket{pod=~\"$datanode\", operation!~\"read|write|list\"}[$__rate_interval])))",
           "instant": false,
           "legendFormat": "[{{pod}}]-[{{scheme}}]-[{{operation}}]-p99",
           "range": true,
@@ -6298,6 +6298,6 @@
   "timezone": "",
   "title": "GreptimeDB Cluster Metrics",
   "uid": "ce3q6xwn3xa0wa",
-  "version": 2,
+  "version": 1,
   "weekStart": ""
-}
+}

scripts/check-snafu.py

@@ -14,7 +14,6 @@
 
 import os
 import re
-from multiprocessing import Pool
 
 
 def find_rust_files(directory):
@@ -34,11 +33,13 @@ def extract_branch_names(file_content):
     return pattern.findall(file_content)
 
 
-def check_snafu_in_files(branch_name, rust_files_content):
+def check_snafu_in_files(branch_name, rust_files):
     branch_name_snafu = f"{branch_name}Snafu"
-    for content in rust_files_content.values():
-        if branch_name_snafu in content:
-            return True
+    for rust_file in rust_files:
+        with open(rust_file, "r") as file:
+            content = file.read()
+            if branch_name_snafu in content:
+                return True
     return False
 
 
@@ -48,24 +49,21 @@ def main():
 
     for error_file in error_files:
         with open(error_file, "r") as file:
-            branch_names.extend(extract_branch_names(file.read()))
+            content = file.read()
+            branch_names.extend(extract_branch_names(content))
 
-    # Read all rust files into memory once
-    rust_files_content = {}
-    for rust_file in other_rust_files:
-        with open(rust_file, "r") as file:
-            rust_files_content[rust_file] = file.read()
-
-    with Pool() as pool:
-        results = pool.starmap(
-            check_snafu_in_files, [(bn, rust_files_content) for bn in branch_names]
-        )
-    unused_snafu = [bn for bn, found in zip(branch_names, results) if not found]
+    unused_snafu = [
+        branch_name
+        for branch_name in branch_names
+        if not check_snafu_in_files(branch_name, other_rust_files)
+    ]
 
     if unused_snafu:
         print("Unused error variants:")
         for name in unused_snafu:
             print(name)
+
+    if unused_snafu:
         raise SystemExit(1)
 
 

shell.nix

@@ -1,5 +1,5 @@
 let
-  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.11";
+  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-unstable";
   fenix = import (fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz") {};
   pkgs = import nixpkgs { config = {}; overlays = []; };
 in
@@ -17,12 +17,10 @@ pkgs.mkShell rec {
     })
     cargo-nextest
     taplo
-    curl
   ];
 
   buildInputs = with pkgs; [
     libgit2
-    libz
   ];
 
   LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;

src/catalog/src/error.rs

@@ -122,6 +122,13 @@ pub enum Error {
         source: BoxedError,
     },
 
+    #[snafu(display("Failed to re-compile script due to internal error"))]
+    CompileScriptInternal {
+        #[snafu(implicit)]
+        location: Location,
+        source: BoxedError,
+    },
+
     #[snafu(display("Failed to create table, table info: {}", table_info))]
     CreateTable {
         table_info: String,
@@ -336,7 +343,9 @@ impl ErrorExt for Error {
             Error::DecodePlan { source, .. } => source.status_code(),
             Error::InvalidTableInfoInCatalog { source, .. } => source.status_code(),
 
-            Error::Internal { source, .. } => source.status_code(),
+            Error::CompileScriptInternal { source, .. } | Error::Internal { source, .. } => {
+                source.status_code()
+            }
 
             Error::QueryAccessDenied { .. } => StatusCode::AccessDenied,
             Error::Datafusion { error, .. } => datafusion_status_code::<Self>(error, None),

src/catalog/src/system_schema/information_schema/key_column_usage.rs

@@ -58,8 +58,6 @@ pub(crate) const TIME_INDEX_CONSTRAINT_NAME: &str = "TIME INDEX";
 pub(crate) const INVERTED_INDEX_CONSTRAINT_NAME: &str = "INVERTED INDEX";
 /// Fulltext index constraint name
 pub(crate) const FULLTEXT_INDEX_CONSTRAINT_NAME: &str = "FULLTEXT INDEX";
-/// Skipping index constraint name
-pub(crate) const SKIPPING_INDEX_CONSTRAINT_NAME: &str = "SKIPPING INDEX";
 
 /// The virtual table implementation for `information_schema.KEY_COLUMN_USAGE`.
 pub(super) struct InformationSchemaKeyColumnUsage {
@@ -227,12 +225,6 @@ impl InformationSchemaKeyColumnUsageBuilder {
                 let keys = &table_info.meta.primary_key_indices;
                 let schema = table.schema();
 
-                // For compatibility, use primary key columns as inverted index columns.
-                let pk_as_inverted_index = !schema
-                    .column_schemas()
-                    .iter()
-                    .any(|c| c.has_inverted_index_key());
-
                 for (idx, column) in schema.column_schemas().iter().enumerate() {
                     let mut constraints = vec![];
                     if column.is_time_index() {
@@ -250,20 +242,14 @@ impl InformationSchemaKeyColumnUsageBuilder {
                     // TODO(dimbtp): foreign key constraint not supported yet
                     if keys.contains(&idx) {
                         constraints.push(PRI_CONSTRAINT_NAME);
-
-                        if pk_as_inverted_index {
-                            constraints.push(INVERTED_INDEX_CONSTRAINT_NAME);
-                        }
                     }
                     if column.is_inverted_indexed() {
                         constraints.push(INVERTED_INDEX_CONSTRAINT_NAME);
                     }
-                    if column.is_fulltext_indexed() {
+
+                    if column.has_fulltext_index_key() {
                         constraints.push(FULLTEXT_INDEX_CONSTRAINT_NAME);
                     }
-                    if column.is_skipping_indexed() {
-                        constraints.push(SKIPPING_INDEX_CONSTRAINT_NAME);
-                    }
 
                     if !constraints.is_empty() {
                         let aggregated_constraints = constraints.join(", ");

src/cli/Cargo.toml

@@ -4,9 +4,6 @@ version.workspace = true
 edition.workspace = true
 license.workspace = true
 
-[features]
-pg_kvbackend = ["common-meta/pg_kvbackend"]
-
 [lints]
 workspace = true
 
@@ -18,7 +15,7 @@ cache.workspace = true
 catalog.workspace = true
 chrono.workspace = true
 clap.workspace = true
-client = { workspace = true, features = ["testing"] }
+client.workspace = true
 common-base.workspace = true
 common-catalog.workspace = true
 common-config.workspace = true
@@ -59,6 +56,8 @@ tokio.workspace = true
 tracing-appender.workspace = true
 
 [dev-dependencies]
+client = { workspace = true, features = ["testing"] }
+common-test-util.workspace = true
 common-version.workspace = true
 serde.workspace = true
 tempfile.workspace = true

src/cli/src/bench.rs

@@ -22,9 +22,6 @@ use clap::Parser;
 use common_error::ext::BoxedError;
 use common_meta::key::{TableMetadataManager, TableMetadataManagerRef};
 use common_meta::kv_backend::etcd::EtcdStore;
-use common_meta::kv_backend::memory::MemoryKvBackend;
-#[cfg(feature = "pg_kvbackend")]
-use common_meta::kv_backend::postgres::PgStore;
 use common_meta::peer::Peer;
 use common_meta::rpc::router::{Region, RegionRoute};
 use common_telemetry::info;
@@ -58,34 +55,18 @@ where
 #[derive(Debug, Default, Parser)]
 pub struct BenchTableMetadataCommand {
     #[clap(long)]
-    etcd_addr: Option<String>,
-    #[cfg(feature = "pg_kvbackend")]
-    #[clap(long)]
-    postgres_addr: Option<String>,
+    etcd_addr: String,
     #[clap(long)]
     count: u32,
 }
 
 impl BenchTableMetadataCommand {
     pub async fn build(&self) -> std::result::Result<Box<dyn Tool>, BoxedError> {
-        let kv_backend = if let Some(etcd_addr) = &self.etcd_addr {
-            info!("Using etcd as kv backend");
-            EtcdStore::with_endpoints([etcd_addr], 128).await.unwrap()
-        } else {
-            Arc::new(MemoryKvBackend::new())
-        };
+        let etcd_store = EtcdStore::with_endpoints([&self.etcd_addr], 128)
+            .await
+            .unwrap();
 
-        #[cfg(feature = "pg_kvbackend")]
-        let kv_backend = if let Some(postgres_addr) = &self.postgres_addr {
-            info!("Using postgres as kv backend");
-            PgStore::with_url(postgres_addr, "greptime_metakv", 128)
-                .await
-                .unwrap()
-        } else {
-            kv_backend
-        };
-
-        let table_metadata_manager = Arc::new(TableMetadataManager::new(kv_backend));
+        let table_metadata_manager = Arc::new(TableMetadataManager::new(etcd_store));
 
         let tool = BenchTableMetadata {
             table_metadata_manager,

src/cmd/Cargo.toml

@@ -10,8 +10,9 @@ name = "greptime"
 path = "src/bin/greptime.rs"
 
 [features]
-default = ["servers/pprof", "servers/mem-prof"]
+default = ["python", "servers/pprof", "servers/mem-prof"]
 tokio-console = ["common-telemetry/tokio-console"]
+python = ["frontend/python"]
 
 [lints]
 workspace = true

src/cmd/src/datanode.rs

@@ -62,11 +62,6 @@ impl Instance {
     pub fn datanode(&self) -> &Datanode {
         &self.datanode
     }
-
-    /// allow customizing datanode for downstream projects
-    pub fn datanode_mut(&mut self) -> &mut Datanode {
-        &mut self.datanode
-    }
 }
 
 #[async_trait]
@@ -276,8 +271,7 @@ impl StartCommand {
         info!("Datanode options: {:#?}", opts);
 
         let plugin_opts = opts.plugins;
-        let mut opts = opts.component;
-        opts.grpc.detect_hostname();
+        let opts = opts.component;
         let mut plugins = Plugins::new();
         plugins::setup_datanode_plugins(&mut plugins, &plugin_opts, &opts)
             .await

src/cmd/src/flownode.rs

@@ -66,11 +66,6 @@ impl Instance {
     pub fn flownode(&self) -> &FlownodeInstance {
         &self.flownode
     }
-
-    /// allow customizing flownode for downstream projects
-    pub fn flownode_mut(&mut self) -> &mut FlownodeInstance {
-        &mut self.flownode
-    }
 }
 
 #[async_trait::async_trait]
@@ -222,8 +217,7 @@ impl StartCommand {
         info!("Flownode start command: {:#?}", self);
         info!("Flownode options: {:#?}", opts);
 
-        let mut opts = opts.component;
-        opts.grpc.detect_hostname();
+        let opts = opts.component;
 
         // TODO(discord9): make it not optionale after cluster id is required
         let cluster_id = opts.cluster_id.unwrap_or(0);

src/cmd/src/frontend.rs

@@ -268,8 +268,7 @@ impl StartCommand {
         info!("Frontend options: {:#?}", opts);
 
         let plugin_opts = opts.plugins;
-        let mut opts = opts.component;
-        opts.grpc.detect_hostname();
+        let opts = opts.component;
         let mut plugins = Plugins::new();
         plugins::setup_frontend_plugins(&mut plugins, &plugin_opts, &opts)
             .await

src/cmd/src/metasrv.rs

@@ -249,6 +249,8 @@ impl StartCommand {
 
         if let Some(backend) = &self.backend {
             opts.backend.clone_from(backend);
+        } else {
+            opts.backend = BackendImpl::default()
         }
 
         // Disable dashboard in metasrv.
@@ -272,8 +274,7 @@ impl StartCommand {
         info!("Metasrv options: {:#?}", opts);
 
         let plugin_opts = opts.plugins;
-        let mut opts = opts.component;
-        opts.detect_server_addr();
+        let opts = opts.component;
         let mut plugins = Plugins::new();
         plugins::setup_metasrv_plugins(&mut plugins, &plugin_opts, &opts)
             .await

src/cmd/src/standalone.rs

@@ -22,7 +22,6 @@ use catalog::information_schema::InformationExtension;
 use catalog::kvbackend::KvBackendCatalogManager;
 use clap::Parser;
 use client::api::v1::meta::RegionRole;
-use common_base::readable_size::ReadableSize;
 use common_base::Plugins;
 use common_catalog::consts::{MIN_USER_FLOW_ID, MIN_USER_TABLE_ID};
 use common_config::{metadata_store_dir, Configurable, KvBackendConfig};
@@ -153,7 +152,6 @@ pub struct StandaloneOptions {
     pub tracing: TracingOptions,
     pub init_regions_in_background: bool,
     pub init_regions_parallelism: usize,
-    pub max_in_flight_write_bytes: Option<ReadableSize>,
 }
 
 impl Default for StandaloneOptions {
@@ -183,7 +181,6 @@ impl Default for StandaloneOptions {
             tracing: TracingOptions::default(),
             init_regions_in_background: false,
             init_regions_parallelism: 16,
-            max_in_flight_write_bytes: None,
         }
     }
 }
@@ -221,7 +218,6 @@ impl StandaloneOptions {
             user_provider: cloned_opts.user_provider,
             // Handle the export metrics task run by standalone to frontend for execution
             export_metrics: cloned_opts.export_metrics,
-            max_in_flight_write_bytes: cloned_opts.max_in_flight_write_bytes,
             ..Default::default()
         }
     }
@@ -461,8 +457,7 @@ impl StartCommand {
 
         let mut plugins = Plugins::new();
         let plugin_opts = opts.plugins;
-        let mut opts = opts.component;
-        opts.grpc.detect_hostname();
+        let opts = opts.component;
         let fe_opts = opts.frontend_options();
         let dn_opts = opts.datanode_options();
 

src/cmd/tests/load_config_test.rs

@@ -69,7 +69,7 @@ fn test_load_datanode_example_config() {
             region_engine: vec![
                 RegionEngineConfig::Mito(MitoConfig {
                     auto_flush_interval: Duration::from_secs(3600),
-                    write_cache_ttl: Some(Duration::from_secs(60 * 60 * 8)),
+                    experimental_write_cache_ttl: Some(Duration::from_secs(60 * 60 * 8)),
                     ..Default::default()
                 }),
                 RegionEngineConfig::File(EngineConfig {}),
@@ -85,9 +85,7 @@ fn test_load_datanode_example_config() {
                 remote_write: Some(Default::default()),
                 ..Default::default()
             },
-            grpc: GrpcOptions::default()
-                .with_addr("127.0.0.1:3001")
-                .with_hostname("127.0.0.1:3001"),
+            grpc: GrpcOptions::default().with_addr("127.0.0.1:3001"),
             rpc_addr: Some("127.0.0.1:3001".to_string()),
             rpc_hostname: Some("127.0.0.1".to_string()),
             rpc_runtime_size: Some(8),
@@ -139,7 +137,6 @@ fn test_load_frontend_example_config() {
                 remote_write: Some(Default::default()),
                 ..Default::default()
             },
-            grpc: GrpcOptions::default().with_hostname("127.0.0.1:4001"),
             ..Default::default()
         },
         ..Default::default()
@@ -157,7 +154,6 @@ fn test_load_metasrv_example_config() {
         component: MetasrvOptions {
             selector: SelectorType::default(),
             data_home: "/tmp/metasrv/".to_string(),
-            server_addr: "127.0.0.1:3002".to_string(),
             logging: LoggingOptions {
                 dir: "/tmp/greptimedb/logs".to_string(),
                 level: Some("info".to_string()),
@@ -207,7 +203,7 @@ fn test_load_standalone_example_config() {
             region_engine: vec![
                 RegionEngineConfig::Mito(MitoConfig {
                     auto_flush_interval: Duration::from_secs(3600),
-                    write_cache_ttl: Some(Duration::from_secs(60 * 60 * 8)),
+                    experimental_write_cache_ttl: Some(Duration::from_secs(60 * 60 * 8)),
                     ..Default::default()
                 }),
                 RegionEngineConfig::File(EngineConfig {}),

src/common/base/Cargo.toml

@@ -4,9 +4,6 @@ version.workspace = true
 edition.workspace = true
 license.workspace = true
 
-[features]
-testing = []
-
 [lints]
 workspace = true
 

src/common/base/src/range_read.rs

@@ -17,7 +17,6 @@ use std::io;
 use std::ops::Range;
 use std::path::Path;
 use std::pin::Pin;
-use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Arc;
 use std::task::{Context, Poll};
 
@@ -34,22 +33,19 @@ pub struct Metadata {
     pub content_length: u64,
 }
 
-/// `SizeAwareRangeReader` is a `RangeReader` that supports setting a file size hint.
-pub trait SizeAwareRangeReader: RangeReader {
+/// `RangeReader` reads a range of bytes from a source.
+#[async_trait]
+pub trait RangeReader: Send + Unpin {
     /// Sets the file size hint for the reader.
     ///
     /// It's used to optimize the reading process by reducing the number of remote requests.
     fn with_file_size_hint(&mut self, file_size_hint: u64);
-}
 
-/// `RangeReader` reads a range of bytes from a source.
-#[async_trait]
-pub trait RangeReader: Sync + Send + Unpin {
     /// Returns the metadata of the source.
-    async fn metadata(&self) -> io::Result<Metadata>;
+    async fn metadata(&mut self) -> io::Result<Metadata>;
 
     /// Reads the bytes in the given range.
-    async fn read(&self, range: Range<u64>) -> io::Result<Bytes>;
+    async fn read(&mut self, range: Range<u64>) -> io::Result<Bytes>;
 
     /// Reads the bytes in the given range into the buffer.
     ///
@@ -57,14 +53,18 @@ pub trait RangeReader: Sync + Send + Unpin {
     /// - If the buffer is insufficient to hold the bytes, it will either:
     ///   - Allocate additional space (e.g., for `Vec<u8>`)
     ///   - Panic (e.g., for `&mut [u8]`)
-    async fn read_into(&self, range: Range<u64>, buf: &mut (impl BufMut + Send)) -> io::Result<()> {
+    async fn read_into(
+        &mut self,
+        range: Range<u64>,
+        buf: &mut (impl BufMut + Send),
+    ) -> io::Result<()> {
         let bytes = self.read(range).await?;
         buf.put_slice(&bytes);
         Ok(())
     }
 
     /// Reads the bytes in the given ranges.
-    async fn read_vec(&self, ranges: &[Range<u64>]) -> io::Result<Vec<Bytes>> {
+    async fn read_vec(&mut self, ranges: &[Range<u64>]) -> io::Result<Vec<Bytes>> {
         let mut result = Vec::with_capacity(ranges.len());
         for range in ranges {
             result.push(self.read(range.clone()).await?);
@@ -74,20 +74,25 @@ pub trait RangeReader: Sync + Send + Unpin {
 }
 
 #[async_trait]
-impl<R: ?Sized + RangeReader> RangeReader for &R {
-    async fn metadata(&self) -> io::Result<Metadata> {
+impl<R: ?Sized + RangeReader> RangeReader for &mut R {
+    fn with_file_size_hint(&mut self, file_size_hint: u64) {
+        (*self).with_file_size_hint(file_size_hint)
+    }
+
+    async fn metadata(&mut self) -> io::Result<Metadata> {
         (*self).metadata().await
     }
-
-    async fn read(&self, range: Range<u64>) -> io::Result<Bytes> {
+    async fn read(&mut self, range: Range<u64>) -> io::Result<Bytes> {
         (*self).read(range).await
     }
-
-    async fn read_into(&self, range: Range<u64>, buf: &mut (impl BufMut + Send)) -> io::Result<()> {
+    async fn read_into(
+        &mut self,
+        range: Range<u64>,
+        buf: &mut (impl BufMut + Send),
+    ) -> io::Result<()> {
         (*self).read_into(range, buf).await
     }
-
-    async fn read_vec(&self, ranges: &[Range<u64>]) -> io::Result<Vec<Bytes>> {
+    async fn read_vec(&mut self, ranges: &[Range<u64>]) -> io::Result<Vec<Bytes>> {
         (*self).read_vec(ranges).await
     }
 }
@@ -115,7 +120,7 @@ pub struct AsyncReadAdapter<R> {
 
 impl<R: RangeReader + 'static> AsyncReadAdapter<R> {
     pub async fn new(inner: R) -> io::Result<Self> {
-        let inner = inner;
+        let mut inner = inner;
         let metadata = inner.metadata().await?;
         Ok(AsyncReadAdapter {
             inner: Arc::new(Mutex::new(inner)),
@@ -155,7 +160,7 @@ impl<R: RangeReader + 'static> AsyncRead for AsyncReadAdapter<R> {
             let range = *this.position..(*this.position + size);
             let inner = this.inner.clone();
             let fut = async move {
-                let inner = inner.lock().await;
+                let mut inner = inner.lock().await;
                 inner.read(range).await
             };
 
@@ -190,24 +195,27 @@ impl<R: RangeReader + 'static> AsyncRead for AsyncReadAdapter<R> {
 
 #[async_trait]
 impl RangeReader for Vec<u8> {
-    async fn metadata(&self) -> io::Result<Metadata> {
+    fn with_file_size_hint(&mut self, _file_size_hint: u64) {
+        // do nothing
+    }
+
+    async fn metadata(&mut self) -> io::Result<Metadata> {
         Ok(Metadata {
             content_length: self.len() as u64,
         })
     }
 
-    async fn read(&self, range: Range<u64>) -> io::Result<Bytes> {
+    async fn read(&mut self, range: Range<u64>) -> io::Result<Bytes> {
         let bytes = Bytes::copy_from_slice(&self[range.start as usize..range.end as usize]);
         Ok(bytes)
     }
 }
 
-// TODO(weny): considers replacing `tokio::fs::File` with opendal reader.
 /// `FileReader` is a `RangeReader` for reading a file.
 pub struct FileReader {
     content_length: u64,
-    position: AtomicU64,
-    file: Mutex<tokio::fs::File>,
+    position: u64,
+    file: tokio::fs::File,
 }
 
 impl FileReader {
@@ -217,37 +225,32 @@ impl FileReader {
         let metadata = file.metadata().await?;
         Ok(FileReader {
             content_length: metadata.len(),
-            position: AtomicU64::new(0),
-            file: Mutex::new(file),
+            position: 0,
+            file,
         })
     }
 }
 
-#[cfg(any(test, feature = "testing"))]
-impl SizeAwareRangeReader for FileReader {
-    fn with_file_size_hint(&mut self, _file_size_hint: u64) {
-        // do nothing
-    }
-}
-
 #[async_trait]
 impl RangeReader for FileReader {
-    async fn metadata(&self) -> io::Result<Metadata> {
+    fn with_file_size_hint(&mut self, _file_size_hint: u64) {
+        // do nothing
+    }
+
+    async fn metadata(&mut self) -> io::Result<Metadata> {
         Ok(Metadata {
             content_length: self.content_length,
         })
     }
 
-    async fn read(&self, mut range: Range<u64>) -> io::Result<Bytes> {
-        let mut file = self.file.lock().await;
-
-        if range.start != self.position.load(Ordering::Relaxed) {
-            file.seek(io::SeekFrom::Start(range.start)).await?;
-            self.position.store(range.start, Ordering::Relaxed);
+    async fn read(&mut self, mut range: Range<u64>) -> io::Result<Bytes> {
+        if range.start != self.position {
+            self.file.seek(io::SeekFrom::Start(range.start)).await?;
+            self.position = range.start;
         }
 
         range.end = range.end.min(self.content_length);
-        if range.end <= self.position.load(Ordering::Relaxed) {
+        if range.end <= self.position {
             return Err(io::Error::new(
                 io::ErrorKind::UnexpectedEof,
                 "Start of range is out of bounds",
@@ -256,8 +259,8 @@ impl RangeReader for FileReader {
 
         let mut buf = vec![0; (range.end - range.start) as usize];
 
-        file.read_exact(&mut buf).await?;
-        self.position.store(range.end, Ordering::Relaxed);
+        self.file.read_exact(&mut buf).await?;
+        self.position = range.end;
 
         Ok(Bytes::from(buf))
     }
@@ -298,7 +301,7 @@ mod tests {
         let data = b"hello world";
         tokio::fs::write(path, data).await.unwrap();
 
-        let reader = FileReader::new(path).await.unwrap();
+        let mut reader = FileReader::new(path).await.unwrap();
         let metadata = reader.metadata().await.unwrap();
         assert_eq!(metadata.content_length, data.len() as u64);
 

src/common/datasource/tests/orc/write.py

@@ -35,23 +35,10 @@ data = {
     "bigint_other": [5, -5, 1, 5, 5],
     "utf8_increase": ["a", "bb", "ccc", "dddd", "eeeee"],
     "utf8_decrease": ["eeeee", "dddd", "ccc", "bb", "a"],
-    "timestamp_simple": [
-        datetime.datetime(2023, 4, 1, 20, 15, 30, 2000),
-        datetime.datetime.fromtimestamp(int("1629617204525777000") / 1000000000),
-        datetime.datetime(2023, 1, 1),
-        datetime.datetime(2023, 2, 1),
-        datetime.datetime(2023, 3, 1),
-    ],
-    "date_simple": [
-        datetime.date(2023, 4, 1),
-        datetime.date(2023, 3, 1),
-        datetime.date(2023, 1, 1),
-        datetime.date(2023, 2, 1),
-        datetime.date(2023, 3, 1),
-    ],
+    "timestamp_simple": [datetime.datetime(2023, 4, 1, 20, 15, 30, 2000), datetime.datetime.fromtimestamp(int('1629617204525777000')/1000000000), datetime.datetime(2023, 1, 1), datetime.datetime(2023, 2, 1), datetime.datetime(2023, 3, 1)],
+    "date_simple": [datetime.date(2023, 4, 1), datetime.date(2023, 3, 1), datetime.date(2023, 1, 1), datetime.date(2023, 2, 1), datetime.date(2023, 3, 1)]
 }
 
-
 def infer_schema(data):
     schema = "struct<"
     for key, value in data.items():
@@ -69,7 +56,7 @@ def infer_schema(data):
         elif key.startswith("date"):
             dt = "date"
         else:
-            print(key, value, dt)
+            print(key,value,dt)
             raise NotImplementedError
         if key.startswith("double"):
             dt = "double"
@@ -81,6 +68,7 @@ def infer_schema(data):
     return schema
 
 
+
 def _write(
     schema: str,
     data,

src/common/error/Cargo.toml

@@ -8,7 +8,6 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-http.workspace = true
 snafu.workspace = true
 strum.workspace = true
 tonic.workspace = true

src/common/error/src/lib.rs

@@ -18,30 +18,9 @@ pub mod ext;
 pub mod mock;
 pub mod status_code;
 
-use http::{HeaderMap, HeaderValue};
 pub use snafu;
 
 // HACK - these headers are here for shared in gRPC services. For common HTTP headers,
 // please define in `src/servers/src/http/header.rs`.
 pub const GREPTIME_DB_HEADER_ERROR_CODE: &str = "x-greptime-err-code";
 pub const GREPTIME_DB_HEADER_ERROR_MSG: &str = "x-greptime-err-msg";
-
-/// Create a http header map from error code and message.
-/// using `GREPTIME_DB_HEADER_ERROR_CODE` and `GREPTIME_DB_HEADER_ERROR_MSG` as keys.
-pub fn from_err_code_msg_to_header(code: u32, msg: &str) -> HeaderMap {
-    let mut header = HeaderMap::new();
-
-    let msg = HeaderValue::from_str(msg).unwrap_or_else(|_| {
-        HeaderValue::from_bytes(
-            &msg.as_bytes()
-                .iter()
-                .flat_map(|b| std::ascii::escape_default(*b))
-                .collect::<Vec<u8>>(),
-        )
-        .expect("Already escaped string should be valid ascii")
-    });
-
-    header.insert(GREPTIME_DB_HEADER_ERROR_CODE, code.into());
-    header.insert(GREPTIME_DB_HEADER_ERROR_MSG, msg);
-    header
-}

src/common/function/Cargo.toml

@@ -33,7 +33,7 @@ geo-types = { version = "0.7", optional = true }
 geohash = { version = "0.13", optional = true }
 h3o = { version = "0.6", optional = true }
 jsonb.workspace = true
-nalgebra.workspace = true
+nalgebra = "0.33"
 num = "0.4"
 num-traits = "0.2"
 once_cell.workspace = true

src/common/function/src/scalars/aggregate.rs

@@ -32,8 +32,6 @@ pub use scipy_stats_norm_cdf::ScipyStatsNormCdfAccumulatorCreator;
 pub use scipy_stats_norm_pdf::ScipyStatsNormPdfAccumulatorCreator;
 
 use crate::function_registry::FunctionRegistry;
-use crate::scalars::vector::product::VectorProductCreator;
-use crate::scalars::vector::sum::VectorSumCreator;
 
 /// A function creates `AggregateFunctionCreator`.
 /// "Aggregator" *is* AggregatorFunction. Since the later one is long, we named an short alias for it.
@@ -93,8 +91,6 @@ impl AggregateFunctions {
         register_aggr_func!("argmin", 1, ArgminAccumulatorCreator);
         register_aggr_func!("scipystatsnormcdf", 2, ScipyStatsNormCdfAccumulatorCreator);
         register_aggr_func!("scipystatsnormpdf", 2, ScipyStatsNormPdfAccumulatorCreator);
-        register_aggr_func!("vec_sum", 1, VectorSumCreator);
-        register_aggr_func!("vec_product", 1, VectorProductCreator);
 
         #[cfg(feature = "geo")]
         register_aggr_func!(

src/common/function/src/scalars/vector.rs

@@ -14,17 +14,9 @@
 
 mod convert;
 mod distance;
-mod elem_product;
-mod elem_sum;
-pub mod impl_conv;
-pub(crate) mod product;
+pub(crate) mod impl_conv;
 mod scalar_add;
 mod scalar_mul;
-mod sub;
-pub(crate) mod sum;
-mod vector_div;
-mod vector_mul;
-mod vector_norm;
 
 use std::sync::Arc;
 
@@ -46,13 +38,5 @@ impl VectorFunction {
         // scalar calculation
         registry.register(Arc::new(scalar_add::ScalarAddFunction));
         registry.register(Arc::new(scalar_mul::ScalarMulFunction));
-
-        // vector calculation
-        registry.register(Arc::new(vector_mul::VectorMulFunction));
-        registry.register(Arc::new(vector_norm::VectorNormFunction));
-        registry.register(Arc::new(vector_div::VectorDivFunction));
-        registry.register(Arc::new(sub::SubFunction));
-        registry.register(Arc::new(elem_sum::ElemSumFunction));
-        registry.register(Arc::new(elem_product::ElemProductFunction));
     }
 }

src/common/function/src/scalars/vector/elem_product.rs

@@ -1,142 +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::borrow::Cow;
-use std::fmt::Display;
-
-use common_query::error::InvalidFuncArgsSnafu;
-use common_query::prelude::{Signature, TypeSignature, Volatility};
-use datatypes::prelude::ConcreteDataType;
-use datatypes::scalars::ScalarVectorBuilder;
-use datatypes::vectors::{Float32VectorBuilder, MutableVector, VectorRef};
-use nalgebra::DVectorView;
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-use crate::scalars::vector::impl_conv::{as_veclit, as_veclit_if_const};
-
-const NAME: &str = "vec_elem_product";
-
-/// Multiplies all elements of the vector, returns a scalar.
-///
-/// # Example
-///
-/// ```sql
-/// SELECT vec_elem_product(parse_vec('[1.0, 2.0, 3.0, 4.0]'));
-///
-// +-----------------------------------------------------------+
-// | vec_elem_product(parse_vec(Utf8("[1.0, 2.0, 3.0, 4.0]"))) |
-// +-----------------------------------------------------------+
-// | 24.0                                                      |
-// +-----------------------------------------------------------+
-/// ``````
-#[derive(Debug, Clone, Default)]
-pub struct ElemProductFunction;
-
-impl Function for ElemProductFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(
-        &self,
-        _input_types: &[ConcreteDataType],
-    ) -> common_query::error::Result<ConcreteDataType> {
-        Ok(ConcreteDataType::float32_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![ConcreteDataType::string_datatype()]),
-                TypeSignature::Exact(vec![ConcreteDataType::binary_datatype()]),
-            ],
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(
-        &self,
-        _func_ctx: FunctionContext,
-        columns: &[VectorRef],
-    ) -> common_query::error::Result<VectorRef> {
-        ensure!(
-            columns.len() == 1,
-            InvalidFuncArgsSnafu {
-                err_msg: format!(
-                    "The length of the args is not correct, expect exactly one, have: {}",
-                    columns.len()
-                )
-            }
-        );
-        let arg0 = &columns[0];
-
-        let len = arg0.len();
-        let mut result = Float32VectorBuilder::with_capacity(len);
-        if len == 0 {
-            return Ok(result.to_vector());
-        }
-
-        let arg0_const = as_veclit_if_const(arg0)?;
-
-        for i in 0..len {
-            let arg0 = match arg0_const.as_ref() {
-                Some(arg0) => Some(Cow::Borrowed(arg0.as_ref())),
-                None => as_veclit(arg0.get_ref(i))?,
-            };
-            let Some(arg0) = arg0 else {
-                result.push_null();
-                continue;
-            };
-            result.push(Some(DVectorView::from_slice(&arg0, arg0.len()).product()));
-        }
-
-        Ok(result.to_vector())
-    }
-}
-
-impl Display for ElemProductFunction {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datatypes::vectors::StringVector;
-
-    use super::*;
-    use crate::function::FunctionContext;
-
-    #[test]
-    fn test_elem_product() {
-        let func = ElemProductFunction;
-
-        let input0 = Arc::new(StringVector::from(vec![
-            Some("[1.0,2.0,3.0]".to_string()),
-            Some("[4.0,5.0,6.0]".to_string()),
-            None,
-        ]));
-
-        let result = func.eval(FunctionContext::default(), &[input0]).unwrap();
-
-        let result = result.as_ref();
-        assert_eq!(result.len(), 3);
-        assert_eq!(result.get_ref(0).as_f32().unwrap(), Some(6.0));
-        assert_eq!(result.get_ref(1).as_f32().unwrap(), Some(120.0));
-        assert_eq!(result.get_ref(2).as_f32().unwrap(), None);
-    }
-}

src/common/function/src/scalars/vector/elem_sum.rs

@@ -1,129 +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::borrow::Cow;
-use std::fmt::Display;
-
-use common_query::error::InvalidFuncArgsSnafu;
-use common_query::prelude::{Signature, TypeSignature, Volatility};
-use datatypes::prelude::ConcreteDataType;
-use datatypes::scalars::ScalarVectorBuilder;
-use datatypes::vectors::{Float32VectorBuilder, MutableVector, VectorRef};
-use nalgebra::DVectorView;
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-use crate::scalars::vector::impl_conv::{as_veclit, as_veclit_if_const};
-
-const NAME: &str = "vec_elem_sum";
-
-#[derive(Debug, Clone, Default)]
-pub struct ElemSumFunction;
-
-impl Function for ElemSumFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(
-        &self,
-        _input_types: &[ConcreteDataType],
-    ) -> common_query::error::Result<ConcreteDataType> {
-        Ok(ConcreteDataType::float32_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![ConcreteDataType::string_datatype()]),
-                TypeSignature::Exact(vec![ConcreteDataType::binary_datatype()]),
-            ],
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(
-        &self,
-        _func_ctx: FunctionContext,
-        columns: &[VectorRef],
-    ) -> common_query::error::Result<VectorRef> {
-        ensure!(
-            columns.len() == 1,
-            InvalidFuncArgsSnafu {
-                err_msg: format!(
-                    "The length of the args is not correct, expect exactly one, have: {}",
-                    columns.len()
-                )
-            }
-        );
-        let arg0 = &columns[0];
-
-        let len = arg0.len();
-        let mut result = Float32VectorBuilder::with_capacity(len);
-        if len == 0 {
-            return Ok(result.to_vector());
-        }
-
-        let arg0_const = as_veclit_if_const(arg0)?;
-
-        for i in 0..len {
-            let arg0 = match arg0_const.as_ref() {
-                Some(arg0) => Some(Cow::Borrowed(arg0.as_ref())),
-                None => as_veclit(arg0.get_ref(i))?,
-            };
-            let Some(arg0) = arg0 else {
-                result.push_null();
-                continue;
-            };
-            result.push(Some(DVectorView::from_slice(&arg0, arg0.len()).sum()));
-        }
-
-        Ok(result.to_vector())
-    }
-}
-
-impl Display for ElemSumFunction {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datatypes::vectors::StringVector;
-
-    use super::*;
-    use crate::function::FunctionContext;
-
-    #[test]
-    fn test_elem_sum() {
-        let func = ElemSumFunction;
-
-        let input0 = Arc::new(StringVector::from(vec![
-            Some("[1.0,2.0,3.0]".to_string()),
-            Some("[4.0,5.0,6.0]".to_string()),
-            None,
-        ]));
-
-        let result = func.eval(FunctionContext::default(), &[input0]).unwrap();
-
-        let result = result.as_ref();
-        assert_eq!(result.len(), 3);
-        assert_eq!(result.get_ref(0).as_f32().unwrap(), Some(6.0));
-        assert_eq!(result.get_ref(1).as_f32().unwrap(), Some(15.0));
-        assert_eq!(result.get_ref(2).as_f32().unwrap(), None);
-    }
-}

src/common/function/src/scalars/vector/product.rs

@@ -1,211 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::sync::Arc;
-
-use common_macro::{as_aggr_func_creator, AggrFuncTypeStore};
-use common_query::error::{CreateAccumulatorSnafu, Error, InvalidFuncArgsSnafu};
-use common_query::logical_plan::{Accumulator, AggregateFunctionCreator};
-use common_query::prelude::AccumulatorCreatorFunction;
-use datatypes::prelude::{ConcreteDataType, Value, *};
-use datatypes::vectors::VectorRef;
-use nalgebra::{Const, DVectorView, Dyn, OVector};
-use snafu::ensure;
-
-use crate::scalars::vector::impl_conv::{as_veclit, as_veclit_if_const, veclit_to_binlit};
-
-/// Aggregates by multiplying elements across the same dimension, returns a vector.
-#[derive(Debug, Default)]
-pub struct VectorProduct {
-    product: Option<OVector<f32, Dyn>>,
-    has_null: bool,
-}
-
-#[as_aggr_func_creator]
-#[derive(Debug, Default, AggrFuncTypeStore)]
-pub struct VectorProductCreator {}
-
-impl AggregateFunctionCreator for VectorProductCreator {
-    fn creator(&self) -> AccumulatorCreatorFunction {
-        let creator: AccumulatorCreatorFunction = Arc::new(move |types: &[ConcreteDataType]| {
-            ensure!(
-                types.len() == 1,
-                InvalidFuncArgsSnafu {
-                    err_msg: format!(
-                        "The length of the args is not correct, expect exactly one, have: {}",
-                        types.len()
-                    )
-                }
-            );
-            let input_type = &types[0];
-            match input_type {
-                ConcreteDataType::String(_) | ConcreteDataType::Binary(_) => {
-                    Ok(Box::new(VectorProduct::default()))
-                }
-                _ => {
-                    let err_msg = format!(
-                        "\"VEC_PRODUCT\" aggregate function not support data type {:?}",
-                        input_type.logical_type_id(),
-                    );
-                    CreateAccumulatorSnafu { err_msg }.fail()?
-                }
-            }
-        });
-        creator
-    }
-
-    fn output_type(&self) -> common_query::error::Result<ConcreteDataType> {
-        Ok(ConcreteDataType::binary_datatype())
-    }
-
-    fn state_types(&self) -> common_query::error::Result<Vec<ConcreteDataType>> {
-        Ok(vec![self.output_type()?])
-    }
-}
-
-impl VectorProduct {
-    fn inner(&mut self, len: usize) -> &mut OVector<f32, Dyn> {
-        self.product.get_or_insert_with(|| {
-            OVector::from_iterator_generic(Dyn(len), Const::<1>, (0..len).map(|_| 1.0))
-        })
-    }
-
-    fn update(&mut self, values: &[VectorRef], is_update: bool) -> Result<(), Error> {
-        if values.is_empty() || self.has_null {
-            return Ok(());
-        };
-        let column = &values[0];
-        let len = column.len();
-
-        match as_veclit_if_const(column)? {
-            Some(column) => {
-                let vec_column = DVectorView::from_slice(&column, column.len()).scale(len as f32);
-                *self.inner(vec_column.len()) =
-                    (*self.inner(vec_column.len())).component_mul(&vec_column);
-            }
-            None => {
-                for i in 0..len {
-                    let Some(arg0) = as_veclit(column.get_ref(i))? else {
-                        if is_update {
-                            self.has_null = true;
-                            self.product = None;
-                        }
-                        return Ok(());
-                    };
-                    let vec_column = DVectorView::from_slice(&arg0, arg0.len());
-                    *self.inner(vec_column.len()) =
-                        (*self.inner(vec_column.len())).component_mul(&vec_column);
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-impl Accumulator for VectorProduct {
-    fn state(&self) -> common_query::error::Result<Vec<Value>> {
-        self.evaluate().map(|v| vec![v])
-    }
-
-    fn update_batch(&mut self, values: &[VectorRef]) -> common_query::error::Result<()> {
-        self.update(values, true)
-    }
-
-    fn merge_batch(&mut self, states: &[VectorRef]) -> common_query::error::Result<()> {
-        self.update(states, false)
-    }
-
-    fn evaluate(&self) -> common_query::error::Result<Value> {
-        match &self.product {
-            None => Ok(Value::Null),
-            Some(vector) => {
-                let v = vector.as_slice();
-                Ok(Value::from(veclit_to_binlit(v)))
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datatypes::vectors::{ConstantVector, StringVector};
-
-    use super::*;
-
-    #[test]
-    fn test_update_batch() {
-        // test update empty batch, expect not updating anything
-        let mut vec_product = VectorProduct::default();
-        vec_product.update_batch(&[]).unwrap();
-        assert!(vec_product.product.is_none());
-        assert!(!vec_product.has_null);
-        assert_eq!(Value::Null, vec_product.evaluate().unwrap());
-
-        // test update one not-null value
-        let mut vec_product = VectorProduct::default();
-        let v: Vec<VectorRef> = vec![Arc::new(StringVector::from(vec![Some(
-            "[1.0,2.0,3.0]".to_string(),
-        )]))];
-        vec_product.update_batch(&v).unwrap();
-        assert_eq!(
-            Value::from(veclit_to_binlit(&[1.0, 2.0, 3.0])),
-            vec_product.evaluate().unwrap()
-        );
-
-        // test update one null value
-        let mut vec_product = VectorProduct::default();
-        let v: Vec<VectorRef> = vec![Arc::new(StringVector::from(vec![Option::<String>::None]))];
-        vec_product.update_batch(&v).unwrap();
-        assert_eq!(Value::Null, vec_product.evaluate().unwrap());
-
-        // test update no null-value batch
-        let mut vec_product = VectorProduct::default();
-        let v: Vec<VectorRef> = vec![Arc::new(StringVector::from(vec![
-            Some("[1.0,2.0,3.0]".to_string()),
-            Some("[4.0,5.0,6.0]".to_string()),
-            Some("[7.0,8.0,9.0]".to_string()),
-        ]))];
-        vec_product.update_batch(&v).unwrap();
-        assert_eq!(
-            Value::from(veclit_to_binlit(&[28.0, 80.0, 162.0])),
-            vec_product.evaluate().unwrap()
-        );
-
-        // test update null-value batch
-        let mut vec_product = VectorProduct::default();
-        let v: Vec<VectorRef> = vec![Arc::new(StringVector::from(vec![
-            Some("[1.0,2.0,3.0]".to_string()),
-            None,
-            Some("[7.0,8.0,9.0]".to_string()),
-        ]))];
-        vec_product.update_batch(&v).unwrap();
-        assert_eq!(Value::Null, vec_product.evaluate().unwrap());
-
-        // test update with constant vector
-        let mut vec_product = VectorProduct::default();
-        let v: Vec<VectorRef> = vec![Arc::new(ConstantVector::new(
-            Arc::new(StringVector::from_vec(vec!["[1.0,2.0,3.0]".to_string()])),
-            4,
-        ))];
-
-        vec_product.update_batch(&v).unwrap();
-
-        assert_eq!(
-            Value::from(veclit_to_binlit(&[4.0, 8.0, 12.0])),
-            vec_product.evaluate().unwrap()
-        );
-    }
-}

src/common/function/src/scalars/vector/sub.rs

@@ -1,223 +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::borrow::Cow;
-use std::fmt::Display;
-
-use common_query::error::InvalidFuncArgsSnafu;
-use common_query::prelude::Signature;
-use datatypes::prelude::ConcreteDataType;
-use datatypes::scalars::ScalarVectorBuilder;
-use datatypes::vectors::{BinaryVectorBuilder, MutableVector, VectorRef};
-use nalgebra::DVectorView;
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-use crate::helper;
-use crate::scalars::vector::impl_conv::{as_veclit, as_veclit_if_const, veclit_to_binlit};
-
-const NAME: &str = "vec_sub";
-
-/// Subtracts corresponding elements of two vectors, returns a vector.
-///
-/// # Example
-///
-/// ```sql
-/// SELECT vec_to_string(vec_sub("[1.0, 1.0]", "[1.0, 2.0]")) as result;
-///
-/// +---------------------------------------------------------------+
-/// | vec_to_string(vec_sub(Utf8("[1.0, 1.0]"),Utf8("[1.0, 2.0]"))) |
-/// +---------------------------------------------------------------+
-/// | [0,-1]                                                        |
-/// +---------------------------------------------------------------+
-///
-/// -- Negative scalar to simulate subtraction
-/// SELECT vec_to_string(vec_sub('[-1.0, -1.0]', '[1.0, 2.0]'));
-///
-/// +-----------------------------------------------------------------+
-/// | vec_to_string(vec_sub(Utf8("[-1.0, -1.0]"),Utf8("[1.0, 2.0]"))) |
-/// +-----------------------------------------------------------------+
-/// | [-2,-3]                                                         |
-/// +-----------------------------------------------------------------+
-///
-#[derive(Debug, Clone, Default)]
-pub struct SubFunction;
-
-impl Function for SubFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(
-        &self,
-        _input_types: &[ConcreteDataType],
-    ) -> common_query::error::Result<ConcreteDataType> {
-        Ok(ConcreteDataType::binary_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        helper::one_of_sigs2(
-            vec![
-                ConcreteDataType::string_datatype(),
-                ConcreteDataType::binary_datatype(),
-            ],
-            vec![
-                ConcreteDataType::string_datatype(),
-                ConcreteDataType::binary_datatype(),
-            ],
-        )
-    }
-
-    fn eval(
-        &self,
-        _func_ctx: FunctionContext,
-        columns: &[VectorRef],
-    ) -> common_query::error::Result<VectorRef> {
-        ensure!(
-            columns.len() == 2,
-            InvalidFuncArgsSnafu {
-                err_msg: format!(
-                    "The length of the args is not correct, expect exactly two, have: {}",
-                    columns.len()
-                )
-            }
-        );
-        let arg0 = &columns[0];
-        let arg1 = &columns[1];
-
-        ensure!(
-            arg0.len() == arg1.len(),
-            InvalidFuncArgsSnafu {
-                err_msg: format!(
-                    "The lengths of the vector are not aligned, args 0: {}, args 1: {}",
-                    arg0.len(),
-                    arg1.len(),
-                )
-            }
-        );
-
-        let len = arg0.len();
-        let mut result = BinaryVectorBuilder::with_capacity(len);
-        if len == 0 {
-            return Ok(result.to_vector());
-        }
-
-        let arg0_const = as_veclit_if_const(arg0)?;
-        let arg1_const = as_veclit_if_const(arg1)?;
-
-        for i in 0..len {
-            let arg0 = match arg0_const.as_ref() {
-                Some(arg0) => Some(Cow::Borrowed(arg0.as_ref())),
-                None => as_veclit(arg0.get_ref(i))?,
-            };
-            let arg1 = match arg1_const.as_ref() {
-                Some(arg1) => Some(Cow::Borrowed(arg1.as_ref())),
-                None => as_veclit(arg1.get_ref(i))?,
-            };
-            let (Some(arg0), Some(arg1)) = (arg0, arg1) else {
-                result.push_null();
-                continue;
-            };
-            let vec0 = DVectorView::from_slice(&arg0, arg0.len());
-            let vec1 = DVectorView::from_slice(&arg1, arg1.len());
-
-            let vec_res = vec0 - vec1;
-            let veclit = vec_res.as_slice();
-            let binlit = veclit_to_binlit(veclit);
-            result.push(Some(&binlit));
-        }
-
-        Ok(result.to_vector())
-    }
-}
-
-impl Display for SubFunction {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use common_query::error::Error;
-    use datatypes::vectors::StringVector;
-
-    use super::*;
-
-    #[test]
-    fn test_sub() {
-        let func = SubFunction;
-
-        let input0 = Arc::new(StringVector::from(vec![
-            Some("[1.0,2.0,3.0]".to_string()),
-            Some("[4.0,5.0,6.0]".to_string()),
-            None,
-            Some("[2.0,3.0,3.0]".to_string()),
-        ]));
-        let input1 = Arc::new(StringVector::from(vec![
-            Some("[1.0,1.0,1.0]".to_string()),
-            Some("[6.0,5.0,4.0]".to_string()),
-            Some("[3.0,2.0,2.0]".to_string()),
-            None,
-        ]));
-
-        let result = func
-            .eval(FunctionContext::default(), &[input0, input1])
-            .unwrap();
-
-        let result = result.as_ref();
-        assert_eq!(result.len(), 4);
-        assert_eq!(
-            result.get_ref(0).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[0.0, 1.0, 2.0]).as_slice())
-        );
-        assert_eq!(
-            result.get_ref(1).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[-2.0, 0.0, 2.0]).as_slice())
-        );
-        assert!(result.get_ref(2).is_null());
-        assert!(result.get_ref(3).is_null());
-    }
-
-    #[test]
-    fn test_sub_error() {
-        let func = SubFunction;
-
-        let input0 = Arc::new(StringVector::from(vec![
-            Some("[1.0,2.0,3.0]".to_string()),
-            Some("[4.0,5.0,6.0]".to_string()),
-            None,
-            Some("[2.0,3.0,3.0]".to_string()),
-        ]));
-        let input1 = Arc::new(StringVector::from(vec![
-            Some("[1.0,1.0,1.0]".to_string()),
-            Some("[6.0,5.0,4.0]".to_string()),
-            Some("[3.0,2.0,2.0]".to_string()),
-        ]));
-
-        let result = func.eval(FunctionContext::default(), &[input0, input1]);
-
-        match result {
-            Err(Error::InvalidFuncArgs { err_msg, .. }) => {
-                assert_eq!(
-                    err_msg,
-                    "The lengths of the vector are not aligned, args 0: 4, args 1: 3"
-                )
-            }
-            _ => unreachable!(),
-        }
-    }
-}

src/common/function/src/scalars/vector/sum.rs

@@ -1,202 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::sync::Arc;
-
-use common_macro::{as_aggr_func_creator, AggrFuncTypeStore};
-use common_query::error::{CreateAccumulatorSnafu, Error, InvalidFuncArgsSnafu};
-use common_query::logical_plan::{Accumulator, AggregateFunctionCreator};
-use common_query::prelude::AccumulatorCreatorFunction;
-use datatypes::prelude::{ConcreteDataType, Value, *};
-use datatypes::vectors::VectorRef;
-use nalgebra::{Const, DVectorView, Dyn, OVector};
-use snafu::ensure;
-
-use crate::scalars::vector::impl_conv::{as_veclit, as_veclit_if_const, veclit_to_binlit};
-
-#[derive(Debug, Default)]
-pub struct VectorSum {
-    sum: Option<OVector<f32, Dyn>>,
-    has_null: bool,
-}
-
-#[as_aggr_func_creator]
-#[derive(Debug, Default, AggrFuncTypeStore)]
-pub struct VectorSumCreator {}
-
-impl AggregateFunctionCreator for VectorSumCreator {
-    fn creator(&self) -> AccumulatorCreatorFunction {
-        let creator: AccumulatorCreatorFunction = Arc::new(move |types: &[ConcreteDataType]| {
-            ensure!(
-                types.len() == 1,
-                InvalidFuncArgsSnafu {
-                    err_msg: format!(
-                        "The length of the args is not correct, expect exactly one, have: {}",
-                        types.len()
-                    )
-                }
-            );
-            let input_type = &types[0];
-            match input_type {
-                ConcreteDataType::String(_) | ConcreteDataType::Binary(_) => {
-                    Ok(Box::new(VectorSum::default()))
-                }
-                _ => {
-                    let err_msg = format!(
-                        "\"VEC_SUM\" aggregate function not support data type {:?}",
-                        input_type.logical_type_id(),
-                    );
-                    CreateAccumulatorSnafu { err_msg }.fail()?
-                }
-            }
-        });
-        creator
-    }
-
-    fn output_type(&self) -> common_query::error::Result<ConcreteDataType> {
-        Ok(ConcreteDataType::binary_datatype())
-    }
-
-    fn state_types(&self) -> common_query::error::Result<Vec<ConcreteDataType>> {
-        Ok(vec![self.output_type()?])
-    }
-}
-
-impl VectorSum {
-    fn inner(&mut self, len: usize) -> &mut OVector<f32, Dyn> {
-        self.sum
-            .get_or_insert_with(|| OVector::zeros_generic(Dyn(len), Const::<1>))
-    }
-
-    fn update(&mut self, values: &[VectorRef], is_update: bool) -> Result<(), Error> {
-        if values.is_empty() || self.has_null {
-            return Ok(());
-        };
-        let column = &values[0];
-        let len = column.len();
-
-        match as_veclit_if_const(column)? {
-            Some(column) => {
-                let vec_column = DVectorView::from_slice(&column, column.len()).scale(len as f32);
-                *self.inner(vec_column.len()) += vec_column;
-            }
-            None => {
-                for i in 0..len {
-                    let Some(arg0) = as_veclit(column.get_ref(i))? else {
-                        if is_update {
-                            self.has_null = true;
-                            self.sum = None;
-                        }
-                        return Ok(());
-                    };
-                    let vec_column = DVectorView::from_slice(&arg0, arg0.len());
-                    *self.inner(vec_column.len()) += vec_column;
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-impl Accumulator for VectorSum {
-    fn state(&self) -> common_query::error::Result<Vec<Value>> {
-        self.evaluate().map(|v| vec![v])
-    }
-
-    fn update_batch(&mut self, values: &[VectorRef]) -> common_query::error::Result<()> {
-        self.update(values, true)
-    }
-
-    fn merge_batch(&mut self, states: &[VectorRef]) -> common_query::error::Result<()> {
-        self.update(states, false)
-    }
-
-    fn evaluate(&self) -> common_query::error::Result<Value> {
-        match &self.sum {
-            None => Ok(Value::Null),
-            Some(vector) => Ok(Value::from(veclit_to_binlit(vector.as_slice()))),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datatypes::vectors::{ConstantVector, StringVector};
-
-    use super::*;
-
-    #[test]
-    fn test_update_batch() {
-        // test update empty batch, expect not updating anything
-        let mut vec_sum = VectorSum::default();
-        vec_sum.update_batch(&[]).unwrap();
-        assert!(vec_sum.sum.is_none());
-        assert!(!vec_sum.has_null);
-        assert_eq!(Value::Null, vec_sum.evaluate().unwrap());
-
-        // test update one not-null value
-        let mut vec_sum = VectorSum::default();
-        let v: Vec<VectorRef> = vec![Arc::new(StringVector::from(vec![Some(
-            "[1.0,2.0,3.0]".to_string(),
-        )]))];
-        vec_sum.update_batch(&v).unwrap();
-        assert_eq!(
-            Value::from(veclit_to_binlit(&[1.0, 2.0, 3.0])),
-            vec_sum.evaluate().unwrap()
-        );
-
-        // test update one null value
-        let mut vec_sum = VectorSum::default();
-        let v: Vec<VectorRef> = vec![Arc::new(StringVector::from(vec![Option::<String>::None]))];
-        vec_sum.update_batch(&v).unwrap();
-        assert_eq!(Value::Null, vec_sum.evaluate().unwrap());
-
-        // test update no null-value batch
-        let mut vec_sum = VectorSum::default();
-        let v: Vec<VectorRef> = vec![Arc::new(StringVector::from(vec![
-            Some("[1.0,2.0,3.0]".to_string()),
-            Some("[4.0,5.0,6.0]".to_string()),
-            Some("[7.0,8.0,9.0]".to_string()),
-        ]))];
-        vec_sum.update_batch(&v).unwrap();
-        assert_eq!(
-            Value::from(veclit_to_binlit(&[12.0, 15.0, 18.0])),
-            vec_sum.evaluate().unwrap()
-        );
-
-        // test update null-value batch
-        let mut vec_sum = VectorSum::default();
-        let v: Vec<VectorRef> = vec![Arc::new(StringVector::from(vec![
-            Some("[1.0,2.0,3.0]".to_string()),
-            None,
-            Some("[7.0,8.0,9.0]".to_string()),
-        ]))];
-        vec_sum.update_batch(&v).unwrap();
-        assert_eq!(Value::Null, vec_sum.evaluate().unwrap());
-
-        // test update with constant vector
-        let mut vec_sum = VectorSum::default();
-        let v: Vec<VectorRef> = vec![Arc::new(ConstantVector::new(
-            Arc::new(StringVector::from_vec(vec!["[1.0,2.0,3.0]".to_string()])),
-            4,
-        ))];
-        vec_sum.update_batch(&v).unwrap();
-        assert_eq!(
-            Value::from(veclit_to_binlit(&[4.0, 8.0, 12.0])),
-            vec_sum.evaluate().unwrap()
-        );
-    }
-}

src/common/function/src/scalars/vector/vector_div.rs

@@ -1,218 +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::borrow::Cow;
-use std::fmt::Display;
-
-use common_query::error::{InvalidFuncArgsSnafu, Result};
-use common_query::prelude::Signature;
-use datatypes::prelude::ConcreteDataType;
-use datatypes::scalars::ScalarVectorBuilder;
-use datatypes::vectors::{BinaryVectorBuilder, MutableVector, VectorRef};
-use nalgebra::DVectorView;
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-use crate::helper;
-use crate::scalars::vector::impl_conv::{as_veclit, as_veclit_if_const, veclit_to_binlit};
-
-const NAME: &str = "vec_div";
-
-/// Divides corresponding elements of two vectors.
-///
-/// # Example
-///
-/// ```sql
-/// SELECT vec_to_string(vec_div("[2, 4, 6]", "[2, 2, 2]")) as result;
-///
-/// +---------+
-/// | result  |
-/// +---------+
-/// | [1,2,3] |
-/// +---------+
-///
-/// ```
-#[derive(Debug, Clone, Default)]
-pub struct VectorDivFunction;
-
-impl Function for VectorDivFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::binary_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        helper::one_of_sigs2(
-            vec![
-                ConcreteDataType::string_datatype(),
-                ConcreteDataType::binary_datatype(),
-            ],
-            vec![
-                ConcreteDataType::string_datatype(),
-                ConcreteDataType::binary_datatype(),
-            ],
-        )
-    }
-
-    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 2,
-            InvalidFuncArgsSnafu {
-                err_msg: format!(
-                    "The length of the args is not correct, expect exactly two, have: {}",
-                    columns.len()
-                ),
-            }
-        );
-
-        let arg0 = &columns[0];
-        let arg1 = &columns[1];
-
-        let len = arg0.len();
-        let mut result = BinaryVectorBuilder::with_capacity(len);
-        if len == 0 {
-            return Ok(result.to_vector());
-        }
-
-        let arg0_const = as_veclit_if_const(arg0)?;
-        let arg1_const = as_veclit_if_const(arg1)?;
-
-        for i in 0..len {
-            let arg0 = match arg0_const.as_ref() {
-                Some(arg0) => Some(Cow::Borrowed(arg0.as_ref())),
-                None => as_veclit(arg0.get_ref(i))?,
-            };
-
-            let arg1 = match arg1_const.as_ref() {
-                Some(arg1) => Some(Cow::Borrowed(arg1.as_ref())),
-                None => as_veclit(arg1.get_ref(i))?,
-            };
-
-            if let (Some(arg0), Some(arg1)) = (arg0, arg1) {
-                ensure!(
-                    arg0.len() == arg1.len(),
-                    InvalidFuncArgsSnafu {
-                        err_msg: format!(
-                            "The length of the vectors must match for division, have: {} vs {}",
-                            arg0.len(),
-                            arg1.len()
-                        ),
-                    }
-                );
-                let vec0 = DVectorView::from_slice(&arg0, arg0.len());
-                let vec1 = DVectorView::from_slice(&arg1, arg1.len());
-                let vec_res = vec0.component_div(&vec1);
-
-                let veclit = vec_res.as_slice();
-                let binlit = veclit_to_binlit(veclit);
-                result.push(Some(&binlit));
-            } else {
-                result.push_null();
-            }
-        }
-
-        Ok(result.to_vector())
-    }
-}
-
-impl Display for VectorDivFunction {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use common_query::error;
-    use datatypes::vectors::StringVector;
-
-    use super::*;
-
-    #[test]
-    fn test_vector_mul() {
-        let func = VectorDivFunction;
-
-        let vec0 = vec![1.0, 2.0, 3.0];
-        let vec1 = vec![1.0, 1.0];
-        let (len0, len1) = (vec0.len(), vec1.len());
-        let input0 = Arc::new(StringVector::from(vec![Some(format!("{vec0:?}"))]));
-        let input1 = Arc::new(StringVector::from(vec![Some(format!("{vec1:?}"))]));
-
-        let err = func
-            .eval(FunctionContext::default(), &[input0, input1])
-            .unwrap_err();
-
-        match err {
-            error::Error::InvalidFuncArgs { err_msg, .. } => {
-                assert_eq!(
-                    err_msg,
-                    format!(
-                        "The length of the vectors must match for division, have: {} vs {}",
-                        len0, len1
-                    )
-                )
-            }
-            _ => unreachable!(),
-        }
-
-        let input0 = Arc::new(StringVector::from(vec![
-            Some("[1.0,2.0,3.0]".to_string()),
-            Some("[8.0,10.0,12.0]".to_string()),
-            Some("[7.0,8.0,9.0]".to_string()),
-            None,
-        ]));
-
-        let input1 = Arc::new(StringVector::from(vec![
-            Some("[1.0,1.0,1.0]".to_string()),
-            Some("[2.0,2.0,2.0]".to_string()),
-            None,
-            Some("[3.0,3.0,3.0]".to_string()),
-        ]));
-
-        let result = func
-            .eval(FunctionContext::default(), &[input0, input1])
-            .unwrap();
-
-        let result = result.as_ref();
-        assert_eq!(result.len(), 4);
-        assert_eq!(
-            result.get_ref(0).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[1.0, 2.0, 3.0]).as_slice())
-        );
-        assert_eq!(
-            result.get_ref(1).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[4.0, 5.0, 6.0]).as_slice())
-        );
-        assert!(result.get_ref(2).is_null());
-        assert!(result.get_ref(3).is_null());
-
-        let input0 = Arc::new(StringVector::from(vec![Some("[1.0,-2.0]".to_string())]));
-        let input1 = Arc::new(StringVector::from(vec![Some("[0.0,0.0]".to_string())]));
-
-        let result = func
-            .eval(FunctionContext::default(), &[input0, input1])
-            .unwrap();
-
-        let result = result.as_ref();
-        assert_eq!(
-            result.get_ref(0).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[f64::INFINITY as f32, f64::NEG_INFINITY as f32]).as_slice())
-        );
-    }
-}

src/common/function/src/scalars/vector/vector_mul.rs

@@ -1,205 +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::borrow::Cow;
-use std::fmt::Display;
-
-use common_query::error::{InvalidFuncArgsSnafu, Result};
-use common_query::prelude::Signature;
-use datatypes::prelude::ConcreteDataType;
-use datatypes::scalars::ScalarVectorBuilder;
-use datatypes::vectors::{BinaryVectorBuilder, MutableVector, VectorRef};
-use nalgebra::DVectorView;
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-use crate::helper;
-use crate::scalars::vector::impl_conv::{as_veclit, as_veclit_if_const, veclit_to_binlit};
-
-const NAME: &str = "vec_mul";
-
-/// Multiplies corresponding elements of two vectors.
-///
-/// # Example
-///
-/// ```sql
-/// SELECT vec_to_string(vec_mul("[1, 2, 3]", "[1, 2, 3]")) as result;
-///
-/// +---------+
-/// | result  |
-/// +---------+
-/// | [1,4,9] |
-/// +---------+
-///
-/// ```
-#[derive(Debug, Clone, Default)]
-pub struct VectorMulFunction;
-
-impl Function for VectorMulFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::binary_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        helper::one_of_sigs2(
-            vec![
-                ConcreteDataType::string_datatype(),
-                ConcreteDataType::binary_datatype(),
-            ],
-            vec![
-                ConcreteDataType::string_datatype(),
-                ConcreteDataType::binary_datatype(),
-            ],
-        )
-    }
-
-    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 2,
-            InvalidFuncArgsSnafu {
-                err_msg: format!(
-                    "The length of the args is not correct, expect exactly two, have: {}",
-                    columns.len()
-                ),
-            }
-        );
-
-        let arg0 = &columns[0];
-        let arg1 = &columns[1];
-
-        let len = arg0.len();
-        let mut result = BinaryVectorBuilder::with_capacity(len);
-        if len == 0 {
-            return Ok(result.to_vector());
-        }
-
-        let arg0_const = as_veclit_if_const(arg0)?;
-        let arg1_const = as_veclit_if_const(arg1)?;
-
-        for i in 0..len {
-            let arg0 = match arg0_const.as_ref() {
-                Some(arg0) => Some(Cow::Borrowed(arg0.as_ref())),
-                None => as_veclit(arg0.get_ref(i))?,
-            };
-
-            let arg1 = match arg1_const.as_ref() {
-                Some(arg1) => Some(Cow::Borrowed(arg1.as_ref())),
-                None => as_veclit(arg1.get_ref(i))?,
-            };
-
-            if let (Some(arg0), Some(arg1)) = (arg0, arg1) {
-                ensure!(
-                    arg0.len() == arg1.len(),
-                    InvalidFuncArgsSnafu {
-                        err_msg: format!(
-                            "The length of the vectors must match for multiplying, have: {} vs {}",
-                            arg0.len(),
-                            arg1.len()
-                        ),
-                    }
-                );
-                let vec0 = DVectorView::from_slice(&arg0, arg0.len());
-                let vec1 = DVectorView::from_slice(&arg1, arg1.len());
-                let vec_res = vec1.component_mul(&vec0);
-
-                let veclit = vec_res.as_slice();
-                let binlit = veclit_to_binlit(veclit);
-                result.push(Some(&binlit));
-            } else {
-                result.push_null();
-            }
-        }
-
-        Ok(result.to_vector())
-    }
-}
-
-impl Display for VectorMulFunction {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use common_query::error;
-    use datatypes::vectors::StringVector;
-
-    use super::*;
-
-    #[test]
-    fn test_vector_mul() {
-        let func = VectorMulFunction;
-
-        let vec0 = vec![1.0, 2.0, 3.0];
-        let vec1 = vec![1.0, 1.0];
-        let (len0, len1) = (vec0.len(), vec1.len());
-        let input0 = Arc::new(StringVector::from(vec![Some(format!("{vec0:?}"))]));
-        let input1 = Arc::new(StringVector::from(vec![Some(format!("{vec1:?}"))]));
-
-        let err = func
-            .eval(FunctionContext::default(), &[input0, input1])
-            .unwrap_err();
-
-        match err {
-            error::Error::InvalidFuncArgs { err_msg, .. } => {
-                assert_eq!(
-                    err_msg,
-                    format!(
-                        "The length of the vectors must match for multiplying, have: {} vs {}",
-                        len0, len1
-                    )
-                )
-            }
-            _ => unreachable!(),
-        }
-
-        let input0 = Arc::new(StringVector::from(vec![
-            Some("[1.0,2.0,3.0]".to_string()),
-            Some("[8.0,10.0,12.0]".to_string()),
-            Some("[7.0,8.0,9.0]".to_string()),
-            None,
-        ]));
-
-        let input1 = Arc::new(StringVector::from(vec![
-            Some("[1.0,1.0,1.0]".to_string()),
-            Some("[2.0,2.0,2.0]".to_string()),
-            None,
-            Some("[3.0,3.0,3.0]".to_string()),
-        ]));
-
-        let result = func
-            .eval(FunctionContext::default(), &[input0, input1])
-            .unwrap();
-
-        let result = result.as_ref();
-        assert_eq!(result.len(), 4);
-        assert_eq!(
-            result.get_ref(0).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[1.0, 2.0, 3.0]).as_slice())
-        );
-        assert_eq!(
-            result.get_ref(1).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[16.0, 20.0, 24.0]).as_slice())
-        );
-        assert!(result.get_ref(2).is_null());
-        assert!(result.get_ref(3).is_null());
-    }
-}

src/common/function/src/scalars/vector/vector_norm.rs

@@ -1,168 +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::borrow::Cow;
-use std::fmt::Display;
-
-use common_query::error::{InvalidFuncArgsSnafu, Result};
-use common_query::prelude::{Signature, TypeSignature, Volatility};
-use datatypes::prelude::ConcreteDataType;
-use datatypes::scalars::ScalarVectorBuilder;
-use datatypes::vectors::{BinaryVectorBuilder, MutableVector, VectorRef};
-use nalgebra::DVectorView;
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-use crate::scalars::vector::impl_conv::{as_veclit, as_veclit_if_const, veclit_to_binlit};
-
-const NAME: &str = "vec_norm";
-
-/// Normalizes the vector to length 1, returns a vector.
-/// This's equivalent to `VECTOR_SCALAR_MUL(1/SQRT(VECTOR_ELEM_SUM(VECTOR_MUL(v, v))), v)`.
-///
-/// # Example
-///
-/// ```sql
-/// SELECT vec_to_string(vec_norm('[7.0, 8.0, 9.0]'));
-///
-/// +--------------------------------------------------+
-/// | vec_to_string(vec_norm(Utf8("[7.0, 8.0, 9.0]"))) |
-/// +--------------------------------------------------+
-/// | [0.013888889,0.015873017,0.017857144]            |
-/// +--------------------------------------------------+
-///
-/// ```
-#[derive(Debug, Clone, Default)]
-pub struct VectorNormFunction;
-
-impl Function for VectorNormFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::binary_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![ConcreteDataType::string_datatype()]),
-                TypeSignature::Exact(vec![ConcreteDataType::binary_datatype()]),
-            ],
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(
-        &self,
-        _func_ctx: FunctionContext,
-        columns: &[VectorRef],
-    ) -> common_query::error::Result<VectorRef> {
-        ensure!(
-            columns.len() == 1,
-            InvalidFuncArgsSnafu {
-                err_msg: format!(
-                    "The length of the args is not correct, expect exactly one, have: {}",
-                    columns.len()
-                )
-            }
-        );
-        let arg0 = &columns[0];
-
-        let len = arg0.len();
-        let mut result = BinaryVectorBuilder::with_capacity(len);
-        if len == 0 {
-            return Ok(result.to_vector());
-        }
-
-        let arg0_const = as_veclit_if_const(arg0)?;
-
-        for i in 0..len {
-            let arg0 = match arg0_const.as_ref() {
-                Some(arg0) => Some(Cow::Borrowed(arg0.as_ref())),
-                None => as_veclit(arg0.get_ref(i))?,
-            };
-            let Some(arg0) = arg0 else {
-                result.push_null();
-                continue;
-            };
-
-            let vec0 = DVectorView::from_slice(&arg0, arg0.len());
-            let vec1 = DVectorView::from_slice(&arg0, arg0.len());
-            let vec2scalar = vec1.component_mul(&vec0);
-            let scalar_var = vec2scalar.sum().sqrt();
-
-            let vec = DVectorView::from_slice(&arg0, arg0.len());
-            // Use unscale to avoid division by zero and keep more precision as possible
-            let vec_res = vec.unscale(scalar_var);
-
-            let veclit = vec_res.as_slice();
-            let binlit = veclit_to_binlit(veclit);
-            result.push(Some(&binlit));
-        }
-
-        Ok(result.to_vector())
-    }
-}
-
-impl Display for VectorNormFunction {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datatypes::vectors::StringVector;
-
-    use super::*;
-
-    #[test]
-    fn test_vec_norm() {
-        let func = VectorNormFunction;
-
-        let input0 = Arc::new(StringVector::from(vec![
-            Some("[0.0,2.0,3.0]".to_string()),
-            Some("[1.0,2.0,3.0]".to_string()),
-            Some("[7.0,8.0,9.0]".to_string()),
-            Some("[7.0,-8.0,9.0]".to_string()),
-            None,
-        ]));
-
-        let result = func.eval(FunctionContext::default(), &[input0]).unwrap();
-
-        let result = result.as_ref();
-        assert_eq!(result.len(), 5);
-        assert_eq!(
-            result.get_ref(0).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[0.0, 0.5547002, 0.8320503]).as_slice())
-        );
-        assert_eq!(
-            result.get_ref(1).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[0.26726124, 0.5345225, 0.8017837]).as_slice())
-        );
-        assert_eq!(
-            result.get_ref(2).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[0.5025707, 0.5743665, 0.64616233]).as_slice())
-        );
-        assert_eq!(
-            result.get_ref(3).as_binary().unwrap(),
-            Some(veclit_to_binlit(&[0.5025707, -0.5743665, 0.64616233]).as_slice())
-        );
-        assert!(result.get_ref(4).is_null());
-    }
-}

src/common/function/src/system.rs

@@ -22,7 +22,7 @@ mod version;
 use std::sync::Arc;
 
 use build::BuildFunction;
-use database::{CurrentSchemaFunction, DatabaseFunction, SessionUserFunction};
+use database::{CurrentSchemaFunction, DatabaseFunction};
 use pg_catalog::PGCatalogFunction;
 use procedure_state::ProcedureStateFunction;
 use timezone::TimezoneFunction;
@@ -36,9 +36,8 @@ impl SystemFunction {
     pub fn register(registry: &FunctionRegistry) {
         registry.register(Arc::new(BuildFunction));
         registry.register(Arc::new(VersionFunction));
-        registry.register(Arc::new(CurrentSchemaFunction));
         registry.register(Arc::new(DatabaseFunction));
-        registry.register(Arc::new(SessionUserFunction));
+        registry.register(Arc::new(CurrentSchemaFunction));
         registry.register(Arc::new(TimezoneFunction));
         registry.register_async(Arc::new(ProcedureStateFunction));
         PGCatalogFunction::register(registry);

src/common/function/src/system/database.rs

@@ -28,11 +28,9 @@ pub struct DatabaseFunction;
 
 #[derive(Clone, Debug, Default)]
 pub struct CurrentSchemaFunction;
-pub struct SessionUserFunction;
 
 const DATABASE_FUNCTION_NAME: &str = "database";
 const CURRENT_SCHEMA_FUNCTION_NAME: &str = "current_schema";
-const SESSION_USER_FUNCTION_NAME: &str = "session_user";
 
 impl Function for DatabaseFunction {
     fn name(&self) -> &str {
@@ -74,26 +72,6 @@ impl Function for CurrentSchemaFunction {
     }
 }
 
-impl Function for SessionUserFunction {
-    fn name(&self) -> &str {
-        SESSION_USER_FUNCTION_NAME
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::string_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::uniform(0, vec![], Volatility::Immutable)
-    }
-
-    fn eval(&self, func_ctx: FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
-        let user = func_ctx.query_ctx.current_user();
-
-        Ok(Arc::new(StringVector::from_slice(&[user.username()])) as _)
-    }
-}
-
 impl fmt::Display for DatabaseFunction {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "DATABASE")
@@ -106,12 +84,6 @@ impl fmt::Display for CurrentSchemaFunction {
     }
 }
 
-impl fmt::Display for SessionUserFunction {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "SESSION_USER")
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use std::sync::Arc;

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

@@ -60,7 +60,6 @@ pub fn alter_expr_to_request(table_id: TableId, expr: AlterTableExpr) -> Result<
                         column_schema: schema,
                         is_key: column_def.semantic_type == SemanticType::Tag as i32,
                         location: parse_location(ac.location)?,
-                        add_if_not_exists: ac.add_if_not_exists,
                     })
                 })
                 .collect::<Result<Vec<_>>>()?;
@@ -221,7 +220,6 @@ mod tests {
                         ..Default::default()
                     }),
                     location: None,
-                    add_if_not_exists: true,
                 }],
             })),
         };
@@ -242,7 +240,6 @@ mod tests {
             add_column.column_schema.data_type
         );
         assert_eq!(None, add_column.location);
-        assert!(add_column.add_if_not_exists);
     }
 
     #[test]
@@ -268,7 +265,6 @@ mod tests {
                             location_type: LocationType::First.into(),
                             after_column_name: String::default(),
                         }),
-                        add_if_not_exists: false,
                     },
                     AddColumn {
                         column_def: Some(ColumnDef {
@@ -284,7 +280,6 @@ mod tests {
                             location_type: LocationType::After.into(),
                             after_column_name: "ts".to_string(),
                         }),
-                        add_if_not_exists: true,
                     },
                 ],
             })),
@@ -313,7 +308,6 @@ mod tests {
             }),
             add_column.location
         );
-        assert!(add_column.add_if_not_exists);
 
         let add_column = add_columns.pop().unwrap();
         assert!(!add_column.is_key);
@@ -323,7 +317,6 @@ mod tests {
             add_column.column_schema.data_type
         );
         assert_eq!(Some(AddColumnLocation::First), add_column.location);
-        assert!(!add_column.add_if_not_exists);
     }
 
     #[test]

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

@@ -299,7 +299,6 @@ mod tests {
                 .unwrap()
             )
         );
-        assert!(host_column.add_if_not_exists);
 
         let memory_column = &add_columns.add_columns[1];
         assert_eq!(
@@ -312,7 +311,6 @@ mod tests {
                 .unwrap()
             )
         );
-        assert!(host_column.add_if_not_exists);
 
         let time_column = &add_columns.add_columns[2];
         assert_eq!(
@@ -325,7 +323,6 @@ mod tests {
                 .unwrap()
             )
         );
-        assert!(host_column.add_if_not_exists);
 
         let interval_column = &add_columns.add_columns[3];
         assert_eq!(
@@ -338,7 +335,6 @@ mod tests {
                 .unwrap()
             )
         );
-        assert!(host_column.add_if_not_exists);
 
         let decimal_column = &add_columns.add_columns[4];
         assert_eq!(
@@ -356,7 +352,6 @@ mod tests {
                 .unwrap()
             )
         );
-        assert!(host_column.add_if_not_exists);
     }
 
     #[test]

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

@@ -192,9 +192,6 @@ pub fn build_create_table_expr(
     Ok(expr)
 }
 
-/// Find columns that are not present in the schema and return them as `AddColumns`
-/// for adding columns automatically.
-/// It always sets `add_if_not_exists` to `true` for now.
 pub fn extract_new_columns(
     schema: &Schema,
     column_exprs: Vec<ColumnExpr>,
@@ -216,7 +213,6 @@ pub fn extract_new_columns(
             AddColumn {
                 column_def,
                 location: None,
-                add_if_not_exists: true,
             }
         })
         .collect::<Vec<_>>();

src/common/meta/Cargo.toml

@@ -6,7 +6,7 @@ license.workspace = true
 
 [features]
 testing = []
-pg_kvbackend = ["dep:tokio-postgres", "dep:backon"]
+pg_kvbackend = ["dep:tokio-postgres"]
 
 [lints]
 workspace = true
@@ -17,7 +17,6 @@ api.workspace = true
 async-recursion = "1.0"
 async-stream = "0.3"
 async-trait.workspace = true
-backon = { workspace = true, optional = true }
 base64.workspace = true
 bytes.workspace = true
 chrono.workspace = true
@@ -36,8 +35,6 @@ common-wal.workspace = true
 datafusion-common.workspace = true
 datafusion-expr.workspace = true
 datatypes.workspace = true
-deadpool.workspace = true
-deadpool-postgres.workspace = true
 derive_builder.workspace = true
 etcd-client.workspace = true
 futures.workspace = true

src/common/meta/src/ddl/alter_logical_tables/update_metadata.rs

@@ -105,7 +105,7 @@ impl AlterLogicalTablesProcedure {
                 .context(ConvertAlterTableRequestSnafu)?;
         let new_meta = table_info
             .meta
-            .builder_with_alter_kind(table_ref.table, &request.alter_kind)
+            .builder_with_alter_kind(table_ref.table, &request.alter_kind, true)
             .context(error::TableSnafu)?
             .build()
             .with_context(|_| error::BuildTableMetaSnafu {

src/common/meta/src/ddl/alter_table.rs

@@ -28,13 +28,13 @@ use common_procedure::error::{FromJsonSnafu, Result as ProcedureResult, ToJsonSn
 use common_procedure::{
     Context as ProcedureContext, Error as ProcedureError, LockKey, Procedure, Status, StringKey,
 };
-use common_telemetry::{debug, error, info};
+use common_telemetry::{debug, info};
 use futures::future;
 use serde::{Deserialize, Serialize};
 use snafu::ResultExt;
 use store_api::storage::RegionId;
 use strum::AsRefStr;
-use table::metadata::{RawTableInfo, TableId, TableInfo};
+use table::metadata::{RawTableInfo, TableId};
 use table::table_reference::TableReference;
 
 use crate::cache_invalidator::Context;
@@ -51,14 +51,10 @@ use crate::{metrics, ClusterId};
 
 /// The alter table procedure
 pub struct AlterTableProcedure {
-    /// The runtime context.
+    // The runtime context.
     context: DdlContext,
-    /// The serialized data.
+    // The serialized data.
     data: AlterTableData,
-    /// Cached new table metadata in the prepare step.
-    /// If we recover the procedure from json, then the table info value is not cached.
-    /// But we already validated it in the prepare step.
-    new_table_info: Option<TableInfo>,
 }
 
 impl AlterTableProcedure {
@@ -74,31 +70,18 @@ impl AlterTableProcedure {
         Ok(Self {
             context,
             data: AlterTableData::new(task, table_id, cluster_id),
-            new_table_info: None,
         })
     }
 
     pub fn from_json(json: &str, context: DdlContext) -> ProcedureResult<Self> {
         let data: AlterTableData = serde_json::from_str(json).context(FromJsonSnafu)?;
-        Ok(AlterTableProcedure {
-            context,
-            data,
-            new_table_info: None,
-        })
+        Ok(AlterTableProcedure { context, data })
     }
 
     // Checks whether the table exists.
     pub(crate) async fn on_prepare(&mut self) -> Result<Status> {
         self.check_alter().await?;
         self.fill_table_info().await?;
-
-        // Validates the request and builds the new table info.
-        // We need to build the new table info here because we should ensure the alteration
-        // is valid in `UpdateMeta` state as we already altered the region.
-        // Safety: `fill_table_info()` already set it.
-        let table_info_value = self.data.table_info_value.as_ref().unwrap();
-        self.new_table_info = Some(self.build_new_table_info(&table_info_value.table_info)?);
-
         // Safety: Checked in `AlterTableProcedure::new`.
         let alter_kind = self.data.task.alter_table.kind.as_ref().unwrap();
         if matches!(alter_kind, Kind::RenameTable { .. }) {
@@ -123,14 +106,6 @@ impl AlterTableProcedure {
 
         let leaders = find_leaders(&physical_table_route.region_routes);
         let mut alter_region_tasks = Vec::with_capacity(leaders.len());
-        let alter_kind = self.make_region_alter_kind()?;
-
-        info!(
-            "Submitting alter region requests for table {}, table_id: {}, alter_kind: {:?}",
-            self.data.table_ref(),
-            table_id,
-            alter_kind,
-        );
 
         for datanode in leaders {
             let requester = self.context.node_manager.datanode(&datanode).await;
@@ -138,7 +113,7 @@ impl AlterTableProcedure {
 
             for region in regions {
                 let region_id = RegionId::new(table_id, region);
-                let request = self.make_alter_region_request(region_id, alter_kind.clone())?;
+                let request = self.make_alter_region_request(region_id)?;
                 debug!("Submitting {request:?} to {datanode}");
 
                 let datanode = datanode.clone();
@@ -175,15 +150,7 @@ impl AlterTableProcedure {
         let table_ref = self.data.table_ref();
         // Safety: checked before.
         let table_info_value = self.data.table_info_value.as_ref().unwrap();
-        // Gets the table info from the cache or builds it.
-        let new_info = match &self.new_table_info {
-            Some(cached) => cached.clone(),
-            None => self.build_new_table_info(&table_info_value.table_info)
-                .inspect_err(|e| {
-                    // We already check the table info in the prepare step so this should not happen.
-                    error!(e; "Unable to build info for table {} in update metadata step, table_id: {}", table_ref, table_id);
-                })?,
-        };
+        let new_info = self.build_new_table_info(&table_info_value.table_info)?;
 
         debug!(
             "Starting update table: {} metadata, new table info {:?}",
@@ -207,7 +174,7 @@ impl AlterTableProcedure {
             .await?;
         }
 
-        info!("Updated table metadata for table {table_ref}, table_id: {table_id}, kind: {alter_kind:?}");
+        info!("Updated table metadata for table {table_ref}, table_id: {table_id}");
         self.data.state = AlterTableState::InvalidateTableCache;
         Ok(Status::executing(true))
     }

src/common/meta/src/ddl/alter_table/region_request.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::collections::HashSet;
-
 use api::v1::alter_table_expr::Kind;
 use api::v1::region::region_request::Body;
 use api::v1::region::{
@@ -29,15 +27,13 @@ use crate::ddl::alter_table::AlterTableProcedure;
 use crate::error::{InvalidProtoMsgSnafu, Result};
 
 impl AlterTableProcedure {
-    /// Makes alter region request from existing an alter kind.
-    /// Region alter request always add columns if not exist.
-    pub(crate) fn make_alter_region_request(
-        &self,
-        region_id: RegionId,
-        kind: Option<alter_request::Kind>,
-    ) -> Result<RegionRequest> {
+    /// Makes alter region request.
+    pub(crate) fn make_alter_region_request(&self, region_id: RegionId) -> Result<RegionRequest> {
+        // Safety: Checked in `AlterTableProcedure::new`.
+        let alter_kind = self.data.task.alter_table.kind.as_ref().unwrap();
         // Safety: checked
         let table_info = self.data.table_info().unwrap();
+        let kind = create_proto_alter_kind(table_info, alter_kind)?;
 
         Ok(RegionRequest {
             header: Some(RegionRequestHeader {
@@ -51,66 +47,45 @@ impl AlterTableProcedure {
             })),
         })
     }
-
-    /// Makes alter kind proto that all regions can reuse.
-    /// Region alter request always add columns if not exist.
-    pub(crate) fn make_region_alter_kind(&self) -> Result<Option<alter_request::Kind>> {
-        // Safety: Checked in `AlterTableProcedure::new`.
-        let alter_kind = self.data.task.alter_table.kind.as_ref().unwrap();
-        // Safety: checked
-        let table_info = self.data.table_info().unwrap();
-        let kind = create_proto_alter_kind(table_info, alter_kind)?;
-
-        Ok(kind)
-    }
 }
 
 /// Creates region proto alter kind from `table_info` and `alter_kind`.
 ///
-/// It always adds column if not exists and drops column if exists.
-/// It skips the column if it already exists in the table.
+/// Returns the kind and next column id if it adds new columns.
 fn create_proto_alter_kind(
     table_info: &RawTableInfo,
     alter_kind: &Kind,
 ) -> Result<Option<alter_request::Kind>> {
     match alter_kind {
         Kind::AddColumns(x) => {
-            // Construct a set of existing columns in the table.
-            let existing_columns: HashSet<_> = table_info
-                .meta
-                .schema
-                .column_schemas
-                .iter()
-                .map(|col| &col.name)
-                .collect();
             let mut next_column_id = table_info.meta.next_column_id;
 
-            let mut add_columns = Vec::with_capacity(x.add_columns.len());
-            for add_column in &x.add_columns {
-                let column_def = add_column
-                    .column_def
-                    .as_ref()
-                    .context(InvalidProtoMsgSnafu {
-                        err_msg: "'column_def' is absent",
-                    })?;
+            let add_columns = x
+                .add_columns
+                .iter()
+                .map(|add_column| {
+                    let column_def =
+                        add_column
+                            .column_def
+                            .as_ref()
+                            .context(InvalidProtoMsgSnafu {
+                                err_msg: "'column_def' is absent",
+                            })?;
 
-                // Skips existing columns.
-                if existing_columns.contains(&column_def.name) {
-                    continue;
-                }
+                    let column_id = next_column_id;
+                    next_column_id += 1;
 
-                let column_id = next_column_id;
-                next_column_id += 1;
-                let column_def = RegionColumnDef {
-                    column_def: Some(column_def.clone()),
-                    column_id,
-                };
+                    let column_def = RegionColumnDef {
+                        column_def: Some(column_def.clone()),
+                        column_id,
+                    };
 
-                add_columns.push(AddColumn {
-                    column_def: Some(column_def),
-                    location: add_column.location.clone(),
-                });
-            }
+                    Ok(AddColumn {
+                        column_def: Some(column_def),
+                        location: add_column.location.clone(),
+                    })
+                })
+                .collect::<Result<Vec<_>>>()?;
 
             Ok(Some(alter_request::Kind::AddColumns(AddColumns {
                 add_columns,
@@ -168,7 +143,6 @@ mod tests {
     use crate::rpc::router::{Region, RegionRoute};
     use crate::test_util::{new_ddl_context, MockDatanodeManager};
 
-    /// Prepares a region with schema `[ts: Timestamp, host: Tag, cpu: Field]`.
     async fn prepare_ddl_context() -> (DdlContext, u64, TableId, RegionId, String) {
         let datanode_manager = Arc::new(MockDatanodeManager::new(()));
         let ddl_context = new_ddl_context(datanode_manager);
@@ -197,7 +171,6 @@ mod tests {
                     .name("cpu")
                     .data_type(ColumnDataType::Float64)
                     .semantic_type(SemanticType::Field)
-                    .is_nullable(true)
                     .build()
                     .unwrap()
                     .into(),
@@ -252,16 +225,15 @@ mod tests {
                             name: "my_tag3".to_string(),
                             data_type: ColumnDataType::String as i32,
                             is_nullable: true,
-                            default_constraint: Vec::new(),
+                            default_constraint: b"hello".to_vec(),
                             semantic_type: SemanticType::Tag as i32,
                             comment: String::new(),
                             ..Default::default()
                         }),
                         location: Some(AddColumnLocation {
                             location_type: LocationType::After as i32,
-                            after_column_name: "host".to_string(),
+                            after_column_name: "my_tag2".to_string(),
                         }),
-                        add_if_not_exists: false,
                     }],
                 })),
             },
@@ -270,11 +242,8 @@ mod tests {
         let mut procedure =
             AlterTableProcedure::new(cluster_id, table_id, task, ddl_context).unwrap();
         procedure.on_prepare().await.unwrap();
-        let alter_kind = procedure.make_region_alter_kind().unwrap();
-        let Some(Body::Alter(alter_region_request)) = procedure
-            .make_alter_region_request(region_id, alter_kind)
-            .unwrap()
-            .body
+        let Some(Body::Alter(alter_region_request)) =
+            procedure.make_alter_region_request(region_id).unwrap().body
         else {
             unreachable!()
         };
@@ -290,7 +259,7 @@ mod tests {
                                 name: "my_tag3".to_string(),
                                 data_type: ColumnDataType::String as i32,
                                 is_nullable: true,
-                                default_constraint: Vec::new(),
+                                default_constraint: b"hello".to_vec(),
                                 semantic_type: SemanticType::Tag as i32,
                                 comment: String::new(),
                                 ..Default::default()
@@ -299,7 +268,7 @@ mod tests {
                         }),
                         location: Some(AddColumnLocation {
                             location_type: LocationType::After as i32,
-                            after_column_name: "host".to_string(),
+                            after_column_name: "my_tag2".to_string(),
                         }),
                     }]
                 }
@@ -330,11 +299,8 @@ mod tests {
         let mut procedure =
             AlterTableProcedure::new(cluster_id, table_id, task, ddl_context).unwrap();
         procedure.on_prepare().await.unwrap();
-        let alter_kind = procedure.make_region_alter_kind().unwrap();
-        let Some(Body::Alter(alter_region_request)) = procedure
-            .make_alter_region_request(region_id, alter_kind)
-            .unwrap()
-            .body
+        let Some(Body::Alter(alter_region_request)) =
+            procedure.make_alter_region_request(region_id).unwrap().body
         else {
             unreachable!()
         };

src/common/meta/src/ddl/alter_table/update_metadata.rs

@@ -23,9 +23,7 @@ use crate::key::table_info::TableInfoValue;
 use crate::key::{DeserializedValueWithBytes, RegionDistribution};
 
 impl AlterTableProcedure {
-    /// Builds new table info after alteration.
-    /// It bumps the column id of the table by the number of the add column requests.
-    /// So there may be holes in the column id sequence.
+    /// Builds new_meta
     pub(crate) fn build_new_table_info(&self, table_info: &RawTableInfo) -> Result<TableInfo> {
         let table_info =
             TableInfo::try_from(table_info.clone()).context(error::ConvertRawTableInfoSnafu)?;
@@ -36,7 +34,7 @@ impl AlterTableProcedure {
 
         let new_meta = table_info
             .meta
-            .builder_with_alter_kind(table_ref.table, &request.alter_kind)
+            .builder_with_alter_kind(table_ref.table, &request.alter_kind, false)
             .context(error::TableSnafu)?
             .build()
             .with_context(|_| error::BuildTableMetaSnafu {
@@ -48,9 +46,6 @@ impl AlterTableProcedure {
         new_info.ident.version = table_info.ident.version + 1;
         match request.alter_kind {
             AlterKind::AddColumns { columns } => {
-                // Bumps the column id for the new columns.
-                // It may bump more than the actual number of columns added if there are
-                // existing columns, but it's fine.
                 new_info.meta.next_column_id += columns.len() as u32;
             }
             AlterKind::RenameTable { new_table_name } => {

src/common/meta/src/ddl/test_util/alter_table.rs

@@ -30,8 +30,6 @@ pub struct TestAlterTableExpr {
     add_columns: Vec<ColumnDef>,
     #[builder(setter(into, strip_option))]
     new_table_name: Option<String>,
-    #[builder(setter)]
-    add_if_not_exists: bool,
 }
 
 impl From<TestAlterTableExpr> for AlterTableExpr {
@@ -55,7 +53,6 @@ impl From<TestAlterTableExpr> for AlterTableExpr {
                         .map(|col| AddColumn {
                             column_def: Some(col),
                             location: None,
-                            add_if_not_exists: value.add_if_not_exists,
                         })
                         .collect(),
                 })),

src/common/meta/src/ddl/tests/alter_logical_tables.rs

@@ -56,7 +56,6 @@ fn make_alter_logical_table_add_column_task(
     let alter_table = alter_table
         .table_name(table.to_string())
         .add_columns(add_columns)
-        .add_if_not_exists(true)
         .build()
         .unwrap();
 

src/common/meta/src/ddl/tests/alter_table.rs

@@ -139,7 +139,7 @@ async fn test_on_submit_alter_request() {
             table_name: table_name.to_string(),
             kind: Some(Kind::DropColumns(DropColumns {
                 drop_columns: vec![DropColumn {
-                    name: "cpu".to_string(),
+                    name: "my_field_column".to_string(),
                 }],
             })),
         },
@@ -225,7 +225,7 @@ async fn test_on_submit_alter_request_with_outdated_request() {
             table_name: table_name.to_string(),
             kind: Some(Kind::DropColumns(DropColumns {
                 drop_columns: vec![DropColumn {
-                    name: "cpu".to_string(),
+                    name: "my_field_column".to_string(),
                 }],
             })),
         },
@@ -330,7 +330,6 @@ async fn test_on_update_metadata_add_columns() {
                         ..Default::default()
                     }),
                     location: None,
-                    add_if_not_exists: false,
                 }],
             })),
         },

src/common/meta/src/error.rs

@@ -639,6 +639,15 @@ pub enum Error {
         location: Location,
     },
 
+    #[snafu(display("Failed to parse {} from str to utf8", name))]
+    StrFromUtf8 {
+        name: String,
+        #[snafu(source)]
+        error: std::str::Utf8Error,
+        #[snafu(implicit)]
+        location: Location,
+    },
+
     #[snafu(display("Value not exists"))]
     ValueNotExist {
         #[snafu(implicit)]
@@ -649,9 +658,8 @@ pub enum Error {
     GetCache { source: Arc<Error> },
 
     #[cfg(feature = "pg_kvbackend")]
-    #[snafu(display("Failed to execute via Postgres, sql: {}", sql))]
+    #[snafu(display("Failed to execute via Postgres"))]
     PostgresExecution {
-        sql: String,
         #[snafu(source)]
         error: tokio_postgres::Error,
         #[snafu(implicit)]
@@ -659,37 +667,12 @@ pub enum Error {
     },
 
     #[cfg(feature = "pg_kvbackend")]
-    #[snafu(display("Failed to create connection pool for Postgres"))]
-    CreatePostgresPool {
-        #[snafu(source)]
-        error: deadpool_postgres::CreatePoolError,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[cfg(feature = "pg_kvbackend")]
-    #[snafu(display("Failed to get Postgres connection from pool: {}", reason))]
-    GetPostgresConnection {
-        reason: String,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[cfg(feature = "pg_kvbackend")]
-    #[snafu(display("Failed to {} Postgres transaction", operation))]
-    PostgresTransaction {
+    #[snafu(display("Failed to connect to Postgres"))]
+    ConnectPostgres {
         #[snafu(source)]
         error: tokio_postgres::Error,
         #[snafu(implicit)]
         location: Location,
-        operation: String,
-    },
-
-    #[cfg(feature = "pg_kvbackend")]
-    #[snafu(display("Postgres transaction retry failed"))]
-    PostgresTransactionRetryFailed {
-        #[snafu(implicit)]
-        location: Location,
     },
 
     #[snafu(display(
@@ -755,7 +738,8 @@ impl ErrorExt for Error {
             | UnexpectedLogicalRouteTable { .. }
             | ProcedureOutput { .. }
             | FromUtf8 { .. }
-            | MetadataCorruption { .. } => StatusCode::Unexpected,
+            | MetadataCorruption { .. }
+            | StrFromUtf8 { .. } => StatusCode::Unexpected,
 
             SendMessage { .. } | GetKvCache { .. } | CacheNotGet { .. } => StatusCode::Internal,
 
@@ -802,11 +786,9 @@ impl ErrorExt for Error {
             | EmptyDdlTasks { .. } => StatusCode::InvalidArguments,
 
             #[cfg(feature = "pg_kvbackend")]
-            PostgresExecution { .. }
-            | CreatePostgresPool { .. }
-            | GetPostgresConnection { .. }
-            | PostgresTransaction { .. }
-            | PostgresTransactionRetryFailed { .. } => StatusCode::Internal,
+            PostgresExecution { .. } => StatusCode::Internal,
+            #[cfg(feature = "pg_kvbackend")]
+            ConnectPostgres { .. } => StatusCode::Internal,
             Error::DatanodeTableInfoNotFound { .. } => StatusCode::Internal,
         }
     }
@@ -817,20 +799,6 @@ impl ErrorExt for Error {
 }
 
 impl Error {
-    #[cfg(feature = "pg_kvbackend")]
-    /// Check if the error is a serialization error.
-    pub fn is_serialization_error(&self) -> bool {
-        match self {
-            Error::PostgresTransaction { error, .. } => {
-                error.code() == Some(&tokio_postgres::error::SqlState::T_R_SERIALIZATION_FAILURE)
-            }
-            Error::PostgresExecution { error, .. } => {
-                error.code() == Some(&tokio_postgres::error::SqlState::T_R_SERIALIZATION_FAILURE)
-            }
-            _ => false,
-        }
-    }
-
     /// Creates a new [Error::RetryLater] error from source `err`.
     pub fn retry_later<E: ErrorExt + Send + Sync + 'static>(err: E) -> Error {
         Error::RetryLater {

src/common/meta/src/key/schema_metadata_manager.rs

@@ -28,10 +28,13 @@ pub type SchemaMetadataManagerRef = Arc<SchemaMetadataManager>;
 pub struct SchemaMetadataManager {
     table_id_schema_cache: TableSchemaCacheRef,
     schema_cache: SchemaCacheRef,
+    #[cfg(any(test, feature = "testing"))]
+    kv_backend: crate::kv_backend::KvBackendRef,
 }
 
 impl SchemaMetadataManager {
     /// Creates a new database meta
+    #[cfg(not(any(test, feature = "testing")))]
     pub fn new(table_id_schema_cache: TableSchemaCacheRef, schema_cache: SchemaCacheRef) -> Self {
         Self {
             table_id_schema_cache,
@@ -39,6 +42,20 @@ impl SchemaMetadataManager {
         }
     }
 
+    /// Creates a new database meta
+    #[cfg(any(test, feature = "testing"))]
+    pub fn new(
+        kv_backend: crate::kv_backend::KvBackendRef,
+        table_id_schema_cache: TableSchemaCacheRef,
+        schema_cache: SchemaCacheRef,
+    ) -> Self {
+        Self {
+            table_id_schema_cache,
+            schema_cache,
+            kv_backend,
+        }
+    }
+
     /// Gets schema options by table id.
     pub async fn get_schema_options_by_table_id(
         &self,
@@ -63,7 +80,6 @@ impl SchemaMetadataManager {
         schema_name: &str,
         catalog_name: &str,
         schema_value: Option<crate::key::schema_name::SchemaNameValue>,
-        kv_backend: crate::kv_backend::KvBackendRef,
     ) {
         use table::metadata::{RawTableInfo, TableType};
         let value = crate::key::table_info::TableInfoValue::new(RawTableInfo {
@@ -75,18 +91,19 @@ impl SchemaMetadataManager {
             meta: Default::default(),
             table_type: TableType::Base,
         });
-        let table_info_manager = crate::key::table_info::TableInfoManager::new(kv_backend.clone());
+        let table_info_manager =
+            crate::key::table_info::TableInfoManager::new(self.kv_backend.clone());
         let (txn, _) = table_info_manager
             .build_create_txn(table_id, &value)
             .unwrap();
-        let resp = kv_backend.txn(txn).await.unwrap();
+        let resp = self.kv_backend.txn(txn).await.unwrap();
         assert!(resp.succeeded, "Failed to create table metadata");
         let key = crate::key::schema_name::SchemaNameKey {
             catalog: catalog_name,
             schema: schema_name,
         };
 
-        crate::key::schema_name::SchemaManager::new(kv_backend.clone())
+        crate::key::schema_name::SchemaManager::new(self.kv_backend.clone())
             .create(key, schema_value, false)
             .await
             .expect("Failed to create schema metadata");

src/common/meta/src/key/table_info.rs

@@ -190,13 +190,6 @@ impl TableInfoManager {
         ))
     }
 
-    /// Checks if the table exists.
-    pub async fn exists(&self, table_id: TableId) -> Result<bool> {
-        let key = TableInfoKey::new(table_id);
-        let raw_key = key.to_bytes();
-        self.kv_backend.exists(&raw_key).await
-    }
-
     pub async fn get(
         &self,
         table_id: TableId,

src/common/meta/src/kv_backend/etcd.rs

@@ -542,8 +542,6 @@ mod tests {
         prepare_kv_with_prefix, test_kv_batch_delete_with_prefix, test_kv_batch_get_with_prefix,
         test_kv_compare_and_put_with_prefix, test_kv_delete_range_with_prefix,
         test_kv_put_with_prefix, test_kv_range_2_with_prefix, test_kv_range_with_prefix,
-        test_txn_compare_equal, test_txn_compare_greater, test_txn_compare_less,
-        test_txn_compare_not_equal, test_txn_one_compare_op, text_txn_multi_compare_op,
         unprepare_kv,
     };
 
@@ -591,7 +589,7 @@ mod tests {
     #[tokio::test]
     async fn test_range_2() {
         if let Some(kv_backend) = build_kv_backend().await {
-            test_kv_range_2_with_prefix(&kv_backend, b"range2/".to_vec()).await;
+            test_kv_range_2_with_prefix(kv_backend, b"range2/".to_vec()).await;
         }
     }
 
@@ -618,8 +616,7 @@ mod tests {
         if let Some(kv_backend) = build_kv_backend().await {
             let prefix = b"deleteRange/";
             prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
-            test_kv_delete_range_with_prefix(&kv_backend, prefix.to_vec()).await;
-            unprepare_kv(&kv_backend, prefix).await;
+            test_kv_delete_range_with_prefix(kv_backend, prefix.to_vec()).await;
         }
     }
 
@@ -628,20 +625,7 @@ mod tests {
         if let Some(kv_backend) = build_kv_backend().await {
             let prefix = b"batchDelete/";
             prepare_kv_with_prefix(&kv_backend, prefix.to_vec()).await;
-            test_kv_batch_delete_with_prefix(&kv_backend, prefix.to_vec()).await;
-            unprepare_kv(&kv_backend, prefix).await;
-        }
-    }
-
-    #[tokio::test]
-    async fn test_etcd_txn() {
-        if let Some(kv_backend) = build_kv_backend().await {
-            test_txn_one_compare_op(&kv_backend).await;
-            text_txn_multi_compare_op(&kv_backend).await;
-            test_txn_compare_equal(&kv_backend).await;
-            test_txn_compare_greater(&kv_backend).await;
-            test_txn_compare_less(&kv_backend).await;
-            test_txn_compare_not_equal(&kv_backend).await;
+            test_kv_batch_delete_with_prefix(kv_backend, prefix.to_vec()).await;
         }
     }
 }

src/common/meta/src/kv_backend/memory.rs

@@ -325,9 +325,7 @@ mod tests {
     use crate::error::Error;
     use crate::kv_backend::test::{
         prepare_kv, test_kv_batch_delete, test_kv_batch_get, test_kv_compare_and_put,
-        test_kv_delete_range, test_kv_put, test_kv_range, test_kv_range_2, test_txn_compare_equal,
-        test_txn_compare_greater, test_txn_compare_less, test_txn_compare_not_equal,
-        test_txn_one_compare_op, text_txn_multi_compare_op,
+        test_kv_delete_range, test_kv_put, test_kv_range, test_kv_range_2,
     };
 
     async fn mock_mem_store_with_data() -> MemoryKvBackend<Error> {
@@ -355,7 +353,7 @@ mod tests {
     async fn test_range_2() {
         let kv = MemoryKvBackend::<Error>::new();
 
-        test_kv_range_2(&kv).await;
+        test_kv_range_2(kv).await;
     }
 
     #[tokio::test]
@@ -376,24 +374,13 @@ mod tests {
     async fn test_delete_range() {
         let kv_backend = mock_mem_store_with_data().await;
 
-        test_kv_delete_range(&kv_backend).await;
+        test_kv_delete_range(kv_backend).await;
     }
 
     #[tokio::test]
     async fn test_batch_delete() {
         let kv_backend = mock_mem_store_with_data().await;
 
-        test_kv_batch_delete(&kv_backend).await;
-    }
-
-    #[tokio::test]
-    async fn test_memory_txn() {
-        let kv_backend = MemoryKvBackend::<Error>::new();
-        test_txn_one_compare_op(&kv_backend).await;
-        text_txn_multi_compare_op(&kv_backend).await;
-        test_txn_compare_equal(&kv_backend).await;
-        test_txn_compare_greater(&kv_backend).await;
-        test_txn_compare_less(&kv_backend).await;
-        test_txn_compare_not_equal(&kv_backend).await;
+        test_kv_batch_delete(kv_backend).await;
     }
 }

src/common/meta/src/kv_backend/test.rs

@@ -15,8 +15,6 @@
 use std::sync::atomic::{AtomicU8, Ordering};
 use std::sync::Arc;
 
-use txn::{Compare, CompareOp, TxnOp};
-
 use super::{KvBackend, *};
 use crate::error::Error;
 use crate::rpc::store::{BatchGetRequest, PutRequest};
@@ -61,18 +59,14 @@ pub async fn prepare_kv_with_prefix(kv_backend: &impl KvBackend, prefix: Vec<u8>
 
 pub async fn unprepare_kv(kv_backend: &impl KvBackend, prefix: &[u8]) {
     let range_end = util::get_prefix_end_key(prefix);
-    assert!(
-        kv_backend
-            .delete_range(DeleteRangeRequest {
-                key: prefix.to_vec(),
-                range_end,
-                ..Default::default()
-            })
-            .await
-            .is_ok(),
-        "prefix: {:?}",
-        std::str::from_utf8(prefix).unwrap()
-    );
+    assert!(kv_backend
+        .delete_range(DeleteRangeRequest {
+            key: prefix.to_vec(),
+            range_end,
+            ..Default::default()
+        })
+        .await
+        .is_ok());
 }
 
 pub async fn test_kv_put(kv_backend: &impl KvBackend) {
@@ -174,11 +168,11 @@ pub async fn test_kv_range_with_prefix(kv_backend: &impl KvBackend, prefix: Vec<
     assert_eq!(b"val1", resp.kvs[0].value());
 }
 
-pub async fn test_kv_range_2(kv_backend: &impl KvBackend) {
+pub async fn test_kv_range_2(kv_backend: impl KvBackend) {
     test_kv_range_2_with_prefix(kv_backend, vec![]).await;
 }
 
-pub async fn test_kv_range_2_with_prefix(kv_backend: &impl KvBackend, prefix: Vec<u8>) {
+pub async fn test_kv_range_2_with_prefix(kv_backend: impl KvBackend, prefix: Vec<u8>) {
     let atest = [prefix.clone(), b"atest".to_vec()].concat();
     let test = [prefix.clone(), b"test".to_vec()].concat();
 
@@ -352,11 +346,11 @@ pub async fn test_kv_compare_and_put_with_prefix(
     assert!(resp.is_none());
 }
 
-pub async fn test_kv_delete_range(kv_backend: &impl KvBackend) {
+pub async fn test_kv_delete_range(kv_backend: impl KvBackend) {
     test_kv_delete_range_with_prefix(kv_backend, vec![]).await;
 }
 
-pub async fn test_kv_delete_range_with_prefix(kv_backend: &impl KvBackend, prefix: Vec<u8>) {
+pub async fn test_kv_delete_range_with_prefix(kv_backend: impl KvBackend, prefix: Vec<u8>) {
     let key3 = [prefix.clone(), b"key3".to_vec()].concat();
     let req = DeleteRangeRequest {
         key: key3.clone(),
@@ -407,11 +401,11 @@ pub async fn test_kv_delete_range_with_prefix(kv_backend: &impl KvBackend, prefi
     assert!(resp.kvs.is_empty());
 }
 
-pub async fn test_kv_batch_delete(kv_backend: &impl KvBackend) {
+pub async fn test_kv_batch_delete(kv_backend: impl KvBackend) {
     test_kv_batch_delete_with_prefix(kv_backend, vec![]).await;
 }
 
-pub async fn test_kv_batch_delete_with_prefix(kv_backend: &impl KvBackend, prefix: Vec<u8>) {
+pub async fn test_kv_batch_delete_with_prefix(kv_backend: impl KvBackend, prefix: Vec<u8>) {
     let key1 = [prefix.clone(), b"key1".to_vec()].concat();
     let key100 = [prefix.clone(), b"key100".to_vec()].concat();
     assert!(kv_backend.get(&key1).await.unwrap().is_some());
@@ -450,207 +444,3 @@ pub async fn test_kv_batch_delete_with_prefix(kv_backend: &impl KvBackend, prefi
     assert!(kv_backend.get(&key3).await.unwrap().is_none());
     assert!(kv_backend.get(&key11).await.unwrap().is_none());
 }
-
-pub async fn test_txn_one_compare_op(kv_backend: &impl KvBackend) {
-    let _ = kv_backend
-        .put(PutRequest {
-            key: vec![11],
-            value: vec![3],
-            ..Default::default()
-        })
-        .await
-        .unwrap();
-
-    let txn = Txn::new()
-        .when(vec![Compare::with_value(
-            vec![11],
-            CompareOp::Greater,
-            vec![1],
-        )])
-        .and_then(vec![TxnOp::Put(vec![11], vec![1])])
-        .or_else(vec![TxnOp::Put(vec![11], vec![2])]);
-
-    let txn_response = kv_backend.txn(txn).await.unwrap();
-
-    assert!(txn_response.succeeded);
-    assert_eq!(txn_response.responses.len(), 1);
-}
-
-pub async fn text_txn_multi_compare_op(kv_backend: &impl KvBackend) {
-    for i in 1..3 {
-        let _ = kv_backend
-            .put(PutRequest {
-                key: vec![i],
-                value: vec![i],
-                ..Default::default()
-            })
-            .await
-            .unwrap();
-    }
-
-    let when: Vec<_> = (1..3u8)
-        .map(|i| Compare::with_value(vec![i], CompareOp::Equal, vec![i]))
-        .collect();
-
-    let txn = Txn::new()
-        .when(when)
-        .and_then(vec![
-            TxnOp::Put(vec![1], vec![10]),
-            TxnOp::Put(vec![2], vec![20]),
-        ])
-        .or_else(vec![TxnOp::Put(vec![1], vec![11])]);
-
-    let txn_response = kv_backend.txn(txn).await.unwrap();
-
-    assert!(txn_response.succeeded);
-    assert_eq!(txn_response.responses.len(), 2);
-}
-
-pub async fn test_txn_compare_equal(kv_backend: &impl KvBackend) {
-    let key = vec![101u8];
-    kv_backend.delete(&key, false).await.unwrap();
-
-    let txn = Txn::new()
-        .when(vec![Compare::with_value_not_exists(
-            key.clone(),
-            CompareOp::Equal,
-        )])
-        .and_then(vec![TxnOp::Put(key.clone(), vec![1])])
-        .or_else(vec![TxnOp::Put(key.clone(), vec![2])]);
-    let txn_response = kv_backend.txn(txn.clone()).await.unwrap();
-    assert!(txn_response.succeeded);
-
-    let txn_response = kv_backend.txn(txn).await.unwrap();
-    assert!(!txn_response.succeeded);
-
-    let txn = Txn::new()
-        .when(vec![Compare::with_value(
-            key.clone(),
-            CompareOp::Equal,
-            vec![2],
-        )])
-        .and_then(vec![TxnOp::Put(key.clone(), vec![3])])
-        .or_else(vec![TxnOp::Put(key, vec![4])]);
-    let txn_response = kv_backend.txn(txn).await.unwrap();
-    assert!(txn_response.succeeded);
-}
-
-pub async fn test_txn_compare_greater(kv_backend: &impl KvBackend) {
-    let key = vec![102u8];
-    kv_backend.delete(&key, false).await.unwrap();
-
-    let txn = Txn::new()
-        .when(vec![Compare::with_value_not_exists(
-            key.clone(),
-            CompareOp::Greater,
-        )])
-        .and_then(vec![TxnOp::Put(key.clone(), vec![1])])
-        .or_else(vec![TxnOp::Put(key.clone(), vec![2])]);
-    let txn_response = kv_backend.txn(txn.clone()).await.unwrap();
-    assert!(!txn_response.succeeded);
-
-    let txn_response = kv_backend.txn(txn).await.unwrap();
-    assert!(txn_response.succeeded);
-
-    let txn = Txn::new()
-        .when(vec![Compare::with_value(
-            key.clone(),
-            CompareOp::Greater,
-            vec![1],
-        )])
-        .and_then(vec![TxnOp::Put(key.clone(), vec![3])])
-        .or_else(vec![TxnOp::Get(key.clone())]);
-    let mut txn_response = kv_backend.txn(txn).await.unwrap();
-    assert!(!txn_response.succeeded);
-    let res = txn_response.responses.pop().unwrap();
-    assert_eq!(
-        res,
-        TxnOpResponse::ResponseGet(RangeResponse {
-            kvs: vec![KeyValue {
-                key,
-                value: vec![1]
-            }],
-            more: false,
-        })
-    );
-}
-
-pub async fn test_txn_compare_less(kv_backend: &impl KvBackend) {
-    let key = vec![103u8];
-    kv_backend.delete(&[3], false).await.unwrap();
-
-    let txn = Txn::new()
-        .when(vec![Compare::with_value_not_exists(
-            key.clone(),
-            CompareOp::Less,
-        )])
-        .and_then(vec![TxnOp::Put(key.clone(), vec![1])])
-        .or_else(vec![TxnOp::Put(key.clone(), vec![2])]);
-    let txn_response = kv_backend.txn(txn.clone()).await.unwrap();
-    assert!(!txn_response.succeeded);
-
-    let txn_response = kv_backend.txn(txn).await.unwrap();
-    assert!(!txn_response.succeeded);
-
-    let txn = Txn::new()
-        .when(vec![Compare::with_value(
-            key.clone(),
-            CompareOp::Less,
-            vec![2],
-        )])
-        .and_then(vec![TxnOp::Put(key.clone(), vec![3])])
-        .or_else(vec![TxnOp::Get(key.clone())]);
-    let mut txn_response = kv_backend.txn(txn).await.unwrap();
-    assert!(!txn_response.succeeded);
-    let res = txn_response.responses.pop().unwrap();
-    assert_eq!(
-        res,
-        TxnOpResponse::ResponseGet(RangeResponse {
-            kvs: vec![KeyValue {
-                key,
-                value: vec![2]
-            }],
-            more: false,
-        })
-    );
-}
-
-pub async fn test_txn_compare_not_equal(kv_backend: &impl KvBackend) {
-    let key = vec![104u8];
-    kv_backend.delete(&key, false).await.unwrap();
-
-    let txn = Txn::new()
-        .when(vec![Compare::with_value_not_exists(
-            key.clone(),
-            CompareOp::NotEqual,
-        )])
-        .and_then(vec![TxnOp::Put(key.clone(), vec![1])])
-        .or_else(vec![TxnOp::Put(key.clone(), vec![2])]);
-    let txn_response = kv_backend.txn(txn.clone()).await.unwrap();
-    assert!(!txn_response.succeeded);
-
-    let txn_response = kv_backend.txn(txn).await.unwrap();
-    assert!(txn_response.succeeded);
-
-    let txn = Txn::new()
-        .when(vec![Compare::with_value(
-            key.clone(),
-            CompareOp::Equal,
-            vec![2],
-        )])
-        .and_then(vec![TxnOp::Put(key.clone(), vec![3])])
-        .or_else(vec![TxnOp::Get(key.clone())]);
-    let mut txn_response = kv_backend.txn(txn).await.unwrap();
-    assert!(!txn_response.succeeded);
-    let res = txn_response.responses.pop().unwrap();
-    assert_eq!(
-        res,
-        TxnOpResponse::ResponseGet(RangeResponse {
-            kvs: vec![KeyValue {
-                key,
-                value: vec![1]
-            }],
-            more: false,
-        })
-    );
-}

src/common/meta/src/kv_backend/txn.rs

@@ -131,9 +131,9 @@ pub struct TxnResponse {
 pub struct Txn {
     // HACK - chroot would modify this field
     pub(super) req: TxnRequest,
-    pub(super) c_when: bool,
-    pub(super) c_then: bool,
-    pub(super) c_else: bool,
+    c_when: bool,
+    c_then: bool,
+    c_else: bool,
 }
 
 #[cfg(any(test, feature = "testing"))]
@@ -241,7 +241,14 @@ impl From<Txn> for TxnRequest {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::Arc;
+
     use super::*;
+    use crate::error::Error;
+    use crate::kv_backend::memory::MemoryKvBackend;
+    use crate::kv_backend::KvBackendRef;
+    use crate::rpc::store::PutRequest;
+    use crate::rpc::KeyValue;
 
     #[test]
     fn test_compare() {
@@ -303,4 +310,232 @@ mod tests {
             }
         );
     }
+
+    #[tokio::test]
+    async fn test_txn_one_compare_op() {
+        let kv_backend = create_kv_backend().await;
+
+        let _ = kv_backend
+            .put(PutRequest {
+                key: vec![11],
+                value: vec![3],
+                ..Default::default()
+            })
+            .await
+            .unwrap();
+
+        let txn = Txn::new()
+            .when(vec![Compare::with_value(
+                vec![11],
+                CompareOp::Greater,
+                vec![1],
+            )])
+            .and_then(vec![TxnOp::Put(vec![11], vec![1])])
+            .or_else(vec![TxnOp::Put(vec![11], vec![2])]);
+
+        let txn_response = kv_backend.txn(txn).await.unwrap();
+
+        assert!(txn_response.succeeded);
+        assert_eq!(txn_response.responses.len(), 1);
+    }
+
+    #[tokio::test]
+    async fn test_txn_multi_compare_op() {
+        let kv_backend = create_kv_backend().await;
+
+        for i in 1..3 {
+            let _ = kv_backend
+                .put(PutRequest {
+                    key: vec![i],
+                    value: vec![i],
+                    ..Default::default()
+                })
+                .await
+                .unwrap();
+        }
+
+        let when: Vec<_> = (1..3u8)
+            .map(|i| Compare::with_value(vec![i], CompareOp::Equal, vec![i]))
+            .collect();
+
+        let txn = Txn::new()
+            .when(when)
+            .and_then(vec![
+                TxnOp::Put(vec![1], vec![10]),
+                TxnOp::Put(vec![2], vec![20]),
+            ])
+            .or_else(vec![TxnOp::Put(vec![1], vec![11])]);
+
+        let txn_response = kv_backend.txn(txn).await.unwrap();
+
+        assert!(txn_response.succeeded);
+        assert_eq!(txn_response.responses.len(), 2);
+    }
+
+    #[tokio::test]
+    async fn test_txn_compare_equal() {
+        let kv_backend = create_kv_backend().await;
+        let key = vec![101u8];
+        kv_backend.delete(&key, false).await.unwrap();
+
+        let txn = Txn::new()
+            .when(vec![Compare::with_value_not_exists(
+                key.clone(),
+                CompareOp::Equal,
+            )])
+            .and_then(vec![TxnOp::Put(key.clone(), vec![1])])
+            .or_else(vec![TxnOp::Put(key.clone(), vec![2])]);
+        let txn_response = kv_backend.txn(txn.clone()).await.unwrap();
+        assert!(txn_response.succeeded);
+
+        let txn_response = kv_backend.txn(txn).await.unwrap();
+        assert!(!txn_response.succeeded);
+
+        let txn = Txn::new()
+            .when(vec![Compare::with_value(
+                key.clone(),
+                CompareOp::Equal,
+                vec![2],
+            )])
+            .and_then(vec![TxnOp::Put(key.clone(), vec![3])])
+            .or_else(vec![TxnOp::Put(key, vec![4])]);
+        let txn_response = kv_backend.txn(txn).await.unwrap();
+        assert!(txn_response.succeeded);
+    }
+
+    #[tokio::test]
+    async fn test_txn_compare_greater() {
+        let kv_backend = create_kv_backend().await;
+        let key = vec![102u8];
+        kv_backend.delete(&key, false).await.unwrap();
+
+        let txn = Txn::new()
+            .when(vec![Compare::with_value_not_exists(
+                key.clone(),
+                CompareOp::Greater,
+            )])
+            .and_then(vec![TxnOp::Put(key.clone(), vec![1])])
+            .or_else(vec![TxnOp::Put(key.clone(), vec![2])]);
+        let txn_response = kv_backend.txn(txn.clone()).await.unwrap();
+        assert!(!txn_response.succeeded);
+
+        let txn_response = kv_backend.txn(txn).await.unwrap();
+        assert!(txn_response.succeeded);
+
+        let txn = Txn::new()
+            .when(vec![Compare::with_value(
+                key.clone(),
+                CompareOp::Greater,
+                vec![1],
+            )])
+            .and_then(vec![TxnOp::Put(key.clone(), vec![3])])
+            .or_else(vec![TxnOp::Get(key.clone())]);
+        let mut txn_response = kv_backend.txn(txn).await.unwrap();
+        assert!(!txn_response.succeeded);
+        let res = txn_response.responses.pop().unwrap();
+        assert_eq!(
+            res,
+            TxnOpResponse::ResponseGet(RangeResponse {
+                kvs: vec![KeyValue {
+                    key,
+                    value: vec![1]
+                }],
+                more: false,
+            })
+        );
+    }
+
+    #[tokio::test]
+    async fn test_txn_compare_less() {
+        let kv_backend = create_kv_backend().await;
+        let key = vec![103u8];
+        kv_backend.delete(&[3], false).await.unwrap();
+
+        let txn = Txn::new()
+            .when(vec![Compare::with_value_not_exists(
+                key.clone(),
+                CompareOp::Less,
+            )])
+            .and_then(vec![TxnOp::Put(key.clone(), vec![1])])
+            .or_else(vec![TxnOp::Put(key.clone(), vec![2])]);
+        let txn_response = kv_backend.txn(txn.clone()).await.unwrap();
+        assert!(!txn_response.succeeded);
+
+        let txn_response = kv_backend.txn(txn).await.unwrap();
+        assert!(!txn_response.succeeded);
+
+        let txn = Txn::new()
+            .when(vec![Compare::with_value(
+                key.clone(),
+                CompareOp::Less,
+                vec![2],
+            )])
+            .and_then(vec![TxnOp::Put(key.clone(), vec![3])])
+            .or_else(vec![TxnOp::Get(key.clone())]);
+        let mut txn_response = kv_backend.txn(txn).await.unwrap();
+        assert!(!txn_response.succeeded);
+        let res = txn_response.responses.pop().unwrap();
+        assert_eq!(
+            res,
+            TxnOpResponse::ResponseGet(RangeResponse {
+                kvs: vec![KeyValue {
+                    key,
+                    value: vec![2]
+                }],
+                more: false,
+            })
+        );
+    }
+
+    #[tokio::test]
+    async fn test_txn_compare_not_equal() {
+        let kv_backend = create_kv_backend().await;
+        let key = vec![104u8];
+        kv_backend.delete(&key, false).await.unwrap();
+
+        let txn = Txn::new()
+            .when(vec![Compare::with_value_not_exists(
+                key.clone(),
+                CompareOp::NotEqual,
+            )])
+            .and_then(vec![TxnOp::Put(key.clone(), vec![1])])
+            .or_else(vec![TxnOp::Put(key.clone(), vec![2])]);
+        let txn_response = kv_backend.txn(txn.clone()).await.unwrap();
+        assert!(!txn_response.succeeded);
+
+        let txn_response = kv_backend.txn(txn).await.unwrap();
+        assert!(txn_response.succeeded);
+
+        let txn = Txn::new()
+            .when(vec![Compare::with_value(
+                key.clone(),
+                CompareOp::Equal,
+                vec![2],
+            )])
+            .and_then(vec![TxnOp::Put(key.clone(), vec![3])])
+            .or_else(vec![TxnOp::Get(key.clone())]);
+        let mut txn_response = kv_backend.txn(txn).await.unwrap();
+        assert!(!txn_response.succeeded);
+        let res = txn_response.responses.pop().unwrap();
+        assert_eq!(
+            res,
+            TxnOpResponse::ResponseGet(RangeResponse {
+                kvs: vec![KeyValue {
+                    key,
+                    value: vec![1]
+                }],
+                more: false,
+            })
+        );
+    }
+
+    async fn create_kv_backend() -> KvBackendRef {
+        Arc::new(MemoryKvBackend::<Error>::new())
+        // TODO(jiachun): Add a feature to test against etcd in github CI
+        //
+        // The same test can be run against etcd by uncommenting the following line
+        // crate::service::store::etcd::EtcdStore::with_endpoints(["127.0.0.1:2379"])
+        //     .await
+        //     .unwrap()
+    }
 }

src/common/meta/src/rpc/store.rs

@@ -266,7 +266,7 @@ impl PutRequest {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Default)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct PutResponse {
     pub prev_kv: Option<KeyValue>,
 }
@@ -425,7 +425,7 @@ impl BatchPutRequest {
     }
 }
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone)]
 pub struct BatchPutResponse {
     pub prev_kvs: Vec<KeyValue>,
 }
@@ -509,7 +509,7 @@ impl BatchDeleteRequest {
     }
 }
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone)]
 pub struct BatchDeleteResponse {
     pub prev_kvs: Vec<KeyValue>,
 }
@@ -754,19 +754,6 @@ impl TryFrom<PbDeleteRangeResponse> for DeleteRangeResponse {
 }
 
 impl DeleteRangeResponse {
-    /// Creates a new [`DeleteRangeResponse`] with the given deleted count.
-    pub fn new(deleted: i64) -> Self {
-        Self {
-            deleted,
-            prev_kvs: vec![],
-        }
-    }
-
-    /// Creates a new [`DeleteRangeResponse`] with the given deleted count and previous key-value pairs.
-    pub fn with_prev_kvs(&mut self, prev_kvs: Vec<KeyValue>) {
-        self.prev_kvs = prev_kvs;
-    }
-
     pub fn to_proto_resp(self, header: PbResponseHeader) -> PbDeleteRangeResponse {
         PbDeleteRangeResponse {
             header: Some(header),

src/common/procedure/Cargo.toml

@@ -13,7 +13,7 @@ workspace = true
 [dependencies]
 async-stream.workspace = true
 async-trait.workspace = true
-backon.workspace = true
+backon = "1"
 common-base.workspace = true
 common-error.workspace = true
 common-macro.workspace = true

src/common/query/src/error.rs

@@ -18,6 +18,7 @@ use arrow::error::ArrowError;
 use common_error::ext::{BoxedError, ErrorExt};
 use common_error::status_code::StatusCode;
 use common_macro::stack_trace_debug;
+use common_recordbatch::error::Error as RecordbatchError;
 use datafusion_common::DataFusionError;
 use datatypes::arrow;
 use datatypes::arrow::datatypes::DataType as ArrowDatatype;
@@ -30,6 +31,21 @@ use statrs::StatsError;
 #[snafu(visibility(pub))]
 #[stack_trace_debug]
 pub enum Error {
+    #[snafu(display("Failed to execute Python UDF: {}", msg))]
+    PyUdf {
+        // TODO(discord9): find a way that prevent circle depend(query<-script<-query) and can use script's error type
+        msg: String,
+        #[snafu(implicit)]
+        location: Location,
+    },
+
+    #[snafu(display("Failed to create temporary recordbatch when eval Python UDF"))]
+    UdfTempRecordBatch {
+        #[snafu(implicit)]
+        location: Location,
+        source: RecordbatchError,
+    },
+
     #[snafu(display("Failed to execute function"))]
     ExecuteFunction {
         #[snafu(source)]
@@ -244,7 +260,9 @@ pub type Result<T> = std::result::Result<T, Error>;
 impl ErrorExt for Error {
     fn status_code(&self) -> StatusCode {
         match self {
-            Error::CreateAccumulator { .. }
+            Error::UdfTempRecordBatch { .. }
+            | Error::PyUdf { .. }
+            | Error::CreateAccumulator { .. }
             | Error::DowncastVector { .. }
             | Error::InvalidInputState { .. }
             | Error::InvalidInputCol { .. }

src/common/recordbatch/src/recordbatch.rs

@@ -35,7 +35,7 @@ use crate::DfRecordBatch;
 #[derive(Clone, Debug, PartialEq)]
 pub struct RecordBatch {
     pub schema: SchemaRef,
-    pub columns: Vec<VectorRef>,
+    columns: Vec<VectorRef>,
     df_record_batch: DfRecordBatch,
 }
 

src/common/runtime/Cargo.toml

@@ -39,7 +39,3 @@ tokio-util.workspace = true
 
 [dev-dependencies]
 tokio-test = "0.4"
-
-[target.'cfg(tokio_unstable)'.dependencies]
-tokio-metrics = { version = "0.3" }
-tokio-metrics-collector = { version = "0.2" }

src/common/wal/Cargo.toml

@@ -19,7 +19,7 @@ futures-util.workspace = true
 humantime-serde.workspace = true
 num_cpus.workspace = true
 rskafka.workspace = true
-rustls = { workspace = true, default-features = false, features = ["ring", "logging", "std", "tls12"] }
+rustls = { version = "0.23", default-features = false, features = ["ring", "logging", "std", "tls12"] }
 rustls-native-certs = "0.7"
 rustls-pemfile = "2.1"
 serde.workspace = true

src/datanode/src/datanode.rs

@@ -224,6 +224,7 @@ impl DatanodeBuilder {
             cache_registry.get().context(MissingCacheSnafu)?;
 
         let schema_metadata_manager = Arc::new(SchemaMetadataManager::new(
+            kv_backend.clone(),
             table_id_schema_cache,
             schema_cache,
         ));
@@ -433,8 +434,8 @@ impl DatanodeBuilder {
     ) -> Result<MitoEngine> {
         if opts.storage.is_object_storage() {
             // Enable the write cache when setting object storage
-            config.enable_write_cache = true;
-            info!("Configured 'enable_write_cache=true' for mito engine.");
+            config.enable_experimental_write_cache = true;
+            info!("Configured 'enable_experimental_write_cache=true' for mito engine.");
         }
 
         let mito_engine = match &opts.wal {

src/datanode/src/store.rs

@@ -28,7 +28,7 @@ use common_telemetry::{info, warn};
 use object_store::layers::{LruCacheLayer, RetryInterceptor, RetryLayer};
 use object_store::services::Fs;
 use object_store::util::{join_dir, normalize_dir, with_instrument_layers};
-use object_store::{Access, Error, HttpClient, ObjectStore, ObjectStoreBuilder};
+use object_store::{Access, Error, HttpClient, ObjectStore, ObjectStoreBuilder, OBJECT_CACHE_DIR};
 use snafu::prelude::*;
 
 use crate::config::{HttpClientConfig, ObjectStoreConfig, DEFAULT_OBJECT_STORE_CACHE_SIZE};
@@ -147,10 +147,12 @@ async fn build_cache_layer(
     };
 
     // Enable object cache by default
-    // Set the cache_path to be `${data_home}` by default
+    // Set the cache_path to be `${data_home}/object_cache/read/{name}` by default
     // if it's not present
     if cache_path.is_none() {
-        let read_cache_path = data_home.to_string();
+        let object_cache_path = join_dir(data_home, OBJECT_CACHE_DIR);
+        let read_cache_path = join_dir(&object_cache_path, "read");
+        let read_cache_path = join_dir(&read_cache_path, &name.to_lowercase());
         tokio::fs::create_dir_all(Path::new(&read_cache_path))
             .await
             .context(CreateDirSnafu {

src/datatypes/src/schema.rs

@@ -29,7 +29,7 @@ use crate::error::{self, DuplicateColumnSnafu, Error, ProjectArrowSchemaSnafu, R
 use crate::prelude::ConcreteDataType;
 pub use crate::schema::column_schema::{
     ColumnSchema, FulltextAnalyzer, FulltextOptions, Metadata, SkippingIndexOptions,
-    SkippingIndexType, COLUMN_FULLTEXT_CHANGE_OPT_KEY_ENABLE, COLUMN_FULLTEXT_OPT_KEY_ANALYZER,
+    COLUMN_FULLTEXT_CHANGE_OPT_KEY_ENABLE, COLUMN_FULLTEXT_OPT_KEY_ANALYZER,
     COLUMN_FULLTEXT_OPT_KEY_CASE_SENSITIVE, COLUMN_SKIPPING_INDEX_OPT_KEY_GRANULARITY,
     COLUMN_SKIPPING_INDEX_OPT_KEY_TYPE, COMMENT_KEY, FULLTEXT_KEY, INVERTED_INDEX_KEY,
     SKIPPING_INDEX_KEY, TIME_INDEX_KEY,

src/datatypes/src/schema/column_schema.rs

@@ -164,15 +164,8 @@ impl ColumnSchema {
             .unwrap_or(false)
     }
 
-    pub fn is_fulltext_indexed(&self) -> bool {
-        self.fulltext_options()
-            .unwrap_or_default()
-            .map(|option| option.enable)
-            .unwrap_or_default()
-    }
-
-    pub fn is_skipping_indexed(&self) -> bool {
-        self.skipping_index_options().unwrap_or_default().is_some()
+    pub fn has_fulltext_index_key(&self) -> bool {
+        self.metadata.contains_key(FULLTEXT_KEY)
     }
 
     pub fn has_inverted_index_key(&self) -> bool {
@@ -550,7 +543,7 @@ pub struct SkippingIndexOptions {
     pub granularity: u32,
     /// The type of the skip index.
     #[serde(default)]
-    pub index_type: SkippingIndexType,
+    pub index_type: SkipIndexType,
 }
 
 impl fmt::Display for SkippingIndexOptions {
@@ -563,15 +556,15 @@ impl fmt::Display for SkippingIndexOptions {
 
 /// Skip index types.
 #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize, Visit, VisitMut)]
-pub enum SkippingIndexType {
+pub enum SkipIndexType {
     #[default]
     BloomFilter,
 }
 
-impl fmt::Display for SkippingIndexType {
+impl fmt::Display for SkipIndexType {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            SkippingIndexType::BloomFilter => write!(f, "BLOOM"),
+            SkipIndexType::BloomFilter => write!(f, "BLOOM"),
         }
     }
 }
@@ -594,7 +587,7 @@ impl TryFrom<HashMap<String, String>> for SkippingIndexOptions {
         // Parse index type with default value BloomFilter
         let index_type = match options.get(COLUMN_SKIPPING_INDEX_OPT_KEY_TYPE) {
             Some(typ) => match typ.to_ascii_uppercase().as_str() {
-                "BLOOM" => SkippingIndexType::BloomFilter,
+                "BLOOM" => SkipIndexType::BloomFilter,
                 _ => {
                     return error::InvalidSkippingIndexOptionSnafu {
                         msg: format!("Invalid index type: {typ}, expected: 'BLOOM'"),
@@ -602,7 +595,7 @@ impl TryFrom<HashMap<String, String>> for SkippingIndexOptions {
                     .fail();
                 }
             },
-            None => SkippingIndexType::default(),
+            None => SkipIndexType::default(),
         };
 
         Ok(SkippingIndexOptions {

src/flow/Cargo.toml

@@ -40,11 +40,11 @@ datatypes.workspace = true
 enum-as-inner = "0.6.0"
 enum_dispatch = "0.3"
 futures = "0.3"
+get-size-derive2 = "0.1.2"
 get-size2 = "0.1.2"
 greptime-proto.workspace = true
 # This fork of hydroflow is simply for keeping our dependency in our org, and pin the version
 # otherwise it is the same with upstream repo
-http.workspace = true
 hydroflow = { git = "https://github.com/GreptimeTeam/hydroflow.git", branch = "main" }
 itertools.workspace = true
 lazy_static.workspace = true

src/flow/src/adapter.rs

@@ -30,7 +30,7 @@ use common_telemetry::{debug, info, trace};
 use datatypes::schema::ColumnSchema;
 use datatypes::value::Value;
 use greptime_proto::v1;
-use itertools::{EitherOrBoth, Itertools};
+use itertools::Itertools;
 use meta_client::MetaClientOptions;
 use query::QueryEngine;
 use serde::{Deserialize, Serialize};
@@ -45,15 +45,18 @@ use tokio::sync::broadcast::error::TryRecvError;
 use tokio::sync::{broadcast, watch, Mutex, RwLock};
 
 pub(crate) use crate::adapter::node_context::FlownodeContext;
-use crate::adapter::table_source::ManagedTableSource;
-use crate::adapter::util::relation_desc_to_column_schemas_with_fallback;
+use crate::adapter::table_source::TableSource;
+use crate::adapter::util::column_schemas_to_proto;
 use crate::adapter::worker::{create_worker, Worker, WorkerHandle};
 use crate::compute::ErrCollector;
 use crate::df_optimizer::sql_to_flow_plan;
-use crate::error::{EvalSnafu, ExternalSnafu, InternalSnafu, InvalidQuerySnafu, UnexpectedSnafu};
-use crate::expr::Batch;
-use crate::metrics::{METRIC_FLOW_INSERT_ELAPSED, METRIC_FLOW_ROWS, METRIC_FLOW_RUN_INTERVAL_MS};
-use crate::repr::{self, DiffRow, RelationDesc, Row, BATCH_SIZE};
+use crate::error::{
+    EvalSnafu, ExternalSnafu, FlowAlreadyExistSnafu, InternalSnafu, TableNotFoundSnafu,
+    UnexpectedSnafu,
+};
+use crate::expr::{Batch, GlobalId};
+use crate::metrics::{METRIC_FLOW_INSERT_ELAPSED, METRIC_FLOW_RUN_INTERVAL_MS};
+use crate::repr::{self, DiffRow, Row, BATCH_SIZE};
 
 mod flownode_impl;
 mod parse_expr;
@@ -64,7 +67,7 @@ mod util;
 mod worker;
 
 pub(crate) mod node_context;
-pub(crate) mod table_source;
+mod table_source;
 
 use crate::error::Error;
 use crate::utils::StateReportHandler;
@@ -124,7 +127,7 @@ pub struct FlowWorkerManager {
     /// The query engine that will be used to parse the query and convert it to a dataflow plan
     pub query_engine: Arc<dyn QueryEngine>,
     /// Getting table name and table schema from table info manager
-    table_info_source: ManagedTableSource,
+    table_info_source: TableSource,
     frontend_invoker: RwLock<Option<FrontendInvoker>>,
     /// contains mapping from table name to global id, and table schema
     node_context: RwLock<FlownodeContext>,
@@ -153,11 +156,11 @@ impl FlowWorkerManager {
         query_engine: Arc<dyn QueryEngine>,
         table_meta: TableMetadataManagerRef,
     ) -> Self {
-        let srv_map = ManagedTableSource::new(
+        let srv_map = TableSource::new(
             table_meta.table_info_manager().clone(),
             table_meta.table_name_manager().clone(),
         );
-        let node_context = FlownodeContext::new(Box::new(srv_map.clone()) as _);
+        let node_context = FlownodeContext::default();
         let tick_manager = FlowTickManager::new();
         let worker_handles = Vec::new();
         FlowWorkerManager {
@@ -242,26 +245,16 @@ impl FlowWorkerManager {
             let (catalog, schema) = (table_name[0].clone(), table_name[1].clone());
             let ctx = Arc::new(QueryContext::with(&catalog, &schema));
 
-            let (is_ts_placeholder, proto_schema) = self
-                .try_fetch_existing_table(&table_name)
-                .await?
-                .context(UnexpectedSnafu {
-                    reason: format!("Table not found: {}", table_name.join(".")),
-                })?;
+            let (is_ts_placeholder, proto_schema) =
+                self.try_fetch_or_create_table(&table_name).await?;
             let schema_len = proto_schema.len();
 
-            let total_rows = reqs.iter().map(|r| r.len()).sum::<usize>();
             trace!(
                 "Sending {} writeback requests to table {}, reqs total rows={}",
                 reqs.len(),
                 table_name.join("."),
                 reqs.iter().map(|r| r.len()).sum::<usize>()
             );
-
-            METRIC_FLOW_ROWS
-                .with_label_values(&["out"])
-                .inc_by(total_rows as u64);
-
             let now = self.tick_manager.tick();
             for req in reqs {
                 match req {
@@ -397,14 +390,16 @@ impl FlowWorkerManager {
         Ok(output)
     }
 
-    /// Fetch table schema and primary key from table info source, if table not exist return None
-    async fn fetch_table_pk_schema(
+    /// Fetch table info or create table from flow's schema if not exist
+    async fn try_fetch_or_create_table(
         &self,
         table_name: &TableName,
-    ) -> Result<Option<(Vec<String>, Option<usize>, Vec<ColumnSchema>)>, Error> {
-        if let Some(table_id) = self
+    ) -> Result<(bool, Vec<api::v1::ColumnSchema>), Error> {
+        // TODO(discord9): instead of auto build table from request schema, actually build table
+        // before `create flow` to be able to assign pk and ts etc.
+        let (primary_keys, schema, is_ts_placeholder) = if let Some(table_id) = self
             .table_info_source
-            .get_opt_table_id_from_name(table_name)
+            .get_table_id_from_name(table_name)
             .await?
         {
             let table_info = self
@@ -419,64 +414,97 @@ impl FlowWorkerManager {
                 .map(|i| meta.schema.column_schemas[i].name.clone())
                 .collect_vec();
             let schema = meta.schema.column_schemas;
-            let time_index = meta.schema.timestamp_index;
-            Ok(Some((primary_keys, time_index, schema)))
+            // check if the last column is the auto created timestamp column, hence the table is auto created from
+            // flow's plan type
+            let is_auto_create = {
+                let correct_name = schema
+                    .last()
+                    .map(|s| s.name == AUTO_CREATED_PLACEHOLDER_TS_COL)
+                    .unwrap_or(false);
+                let correct_time_index = meta.schema.timestamp_index == Some(schema.len() - 1);
+                correct_name && correct_time_index
+            };
+            (primary_keys, schema, is_auto_create)
         } else {
-            Ok(None)
-        }
-    }
+            // TODO(discord9): condiser remove buggy auto create by schema
 
-    /// return (primary keys, schema and if the table have a placeholder timestamp column)
-    /// schema of the table comes from flow's output plan
-    ///
-    /// adjust to add `update_at` column and ts placeholder if needed
-    async fn adjust_auto_created_table_schema(
-        &self,
-        schema: &RelationDesc,
-    ) -> Result<(Vec<String>, Vec<ColumnSchema>, bool), Error> {
-        // TODO(discord9): condiser remove buggy auto create by schema
-
-        // TODO(discord9): use default key from schema
-        let primary_keys = schema
-            .typ()
-            .keys
-            .first()
-            .map(|v| {
-                v.column_indices
-                    .iter()
-                    .map(|i| {
-                        schema
-                            .get_name(*i)
-                            .clone()
-                            .unwrap_or_else(|| format!("col_{i}"))
-                    })
-                    .collect_vec()
-            })
-            .unwrap_or_default();
-        let update_at = ColumnSchema::new(
-            UPDATE_AT_TS_COL,
-            ConcreteDataType::timestamp_millisecond_datatype(),
-            true,
-        );
-
-        let original_schema = relation_desc_to_column_schemas_with_fallback(schema);
-
-        let mut with_auto_added_col = original_schema.clone();
-        with_auto_added_col.push(update_at);
-
-        // if no time index, add one as placeholder
-        let no_time_index = schema.typ().time_index.is_none();
-        if no_time_index {
-            let ts_col = ColumnSchema::new(
-                AUTO_CREATED_PLACEHOLDER_TS_COL,
+            let node_ctx = self.node_context.read().await;
+            let gid: GlobalId = node_ctx
+                .table_repr
+                .get_by_name(table_name)
+                .map(|x| x.1)
+                .unwrap();
+            let schema = node_ctx
+                .schema
+                .get(&gid)
+                .with_context(|| TableNotFoundSnafu {
+                    name: format!("Table name = {:?}", table_name),
+                })?
+                .clone();
+            // TODO(discord9): use default key from schema
+            let primary_keys = schema
+                .typ()
+                .keys
+                .first()
+                .map(|v| {
+                    v.column_indices
+                        .iter()
+                        .map(|i| {
+                            schema
+                                .get_name(*i)
+                                .clone()
+                                .unwrap_or_else(|| format!("col_{i}"))
+                        })
+                        .collect_vec()
+                })
+                .unwrap_or_default();
+            let update_at = ColumnSchema::new(
+                UPDATE_AT_TS_COL,
                 ConcreteDataType::timestamp_millisecond_datatype(),
                 true,
-            )
-            .with_time_index(true);
-            with_auto_added_col.push(ts_col);
-        }
+            );
 
-        Ok((primary_keys, with_auto_added_col, no_time_index))
+            let original_schema = schema
+                .typ()
+                .column_types
+                .clone()
+                .into_iter()
+                .enumerate()
+                .map(|(idx, typ)| {
+                    let name = schema
+                        .names
+                        .get(idx)
+                        .cloned()
+                        .flatten()
+                        .unwrap_or(format!("col_{}", idx));
+                    let ret = ColumnSchema::new(name, typ.scalar_type, typ.nullable);
+                    if schema.typ().time_index == Some(idx) {
+                        ret.with_time_index(true)
+                    } else {
+                        ret
+                    }
+                })
+                .collect_vec();
+
+            let mut with_auto_added_col = original_schema.clone();
+            with_auto_added_col.push(update_at);
+
+            // if no time index, add one as placeholder
+            let no_time_index = schema.typ().time_index.is_none();
+            if no_time_index {
+                let ts_col = ColumnSchema::new(
+                    AUTO_CREATED_PLACEHOLDER_TS_COL,
+                    ConcreteDataType::timestamp_millisecond_datatype(),
+                    true,
+                )
+                .with_time_index(true);
+                with_auto_added_col.push(ts_col);
+            }
+
+            (primary_keys, with_auto_added_col, no_time_index)
+        };
+        let proto_schema = column_schemas_to_proto(schema, &primary_keys)?;
+        Ok((is_ts_placeholder, proto_schema))
     }
 }
 
@@ -724,6 +752,43 @@ impl FlowWorkerManager {
             query_ctx,
         } = args;
 
+        let already_exist = {
+            let mut flag = false;
+
+            // check if the task already exists
+            for handle in self.worker_handles.iter() {
+                if handle.lock().await.contains_flow(flow_id).await? {
+                    flag = true;
+                    break;
+                }
+            }
+            flag
+        };
+        match (create_if_not_exists, or_replace, already_exist) {
+            // do replace
+            (_, true, true) => {
+                info!("Replacing flow with id={}", flow_id);
+                self.remove_flow(flow_id).await?;
+            }
+            (false, false, true) => FlowAlreadyExistSnafu { id: flow_id }.fail()?,
+            // do nothing if exists
+            (true, false, true) => {
+                info!("Flow with id={} already exists, do nothing", flow_id);
+                return Ok(None);
+            }
+            // create if not exists
+            (_, _, false) => (),
+        }
+
+        if create_if_not_exists {
+            // check if the task already exists
+            for handle in self.worker_handles.iter() {
+                if handle.lock().await.contains_flow(flow_id).await? {
+                    return Ok(None);
+                }
+            }
+        }
+
         let mut node_ctx = self.node_context.write().await;
         // assign global id to source and sink table
         for source in &source_table_ids {
@@ -742,69 +807,7 @@ impl FlowWorkerManager {
         let flow_plan = sql_to_flow_plan(&mut node_ctx, &self.query_engine, &sql).await?;
 
         debug!("Flow {:?}'s Plan is {:?}", flow_id, flow_plan);
-
-        // check schema against actual table schema if exists
-        // if not exist create sink table immediately
-        if let Some((_, _, real_schema)) = self.fetch_table_pk_schema(&sink_table_name).await? {
-            let auto_schema = relation_desc_to_column_schemas_with_fallback(&flow_plan.schema);
-
-            // for column schema, only `data_type` need to be check for equality
-            // since one can omit flow's column name when write flow query
-            // print a user friendly error message about mismatch and how to correct them
-            for (idx, zipped) in auto_schema
-                .iter()
-                .zip_longest(real_schema.iter())
-                .enumerate()
-            {
-                match zipped {
-                    EitherOrBoth::Both(auto, real) => {
-                        if auto.data_type != real.data_type {
-                            InvalidQuerySnafu {
-                                    reason: format!(
-                                        "Column {}(name is '{}', flow inferred name is '{}')'s data type mismatch, expect {:?} got {:?}",
-                                        idx,
-                                        real.name,
-                                        auto.name,
-                                        real.data_type,
-                                        auto.data_type
-                                    ),
-                                }
-                                .fail()?;
-                        }
-                    }
-                    EitherOrBoth::Right(real) if real.data_type.is_timestamp() => {
-                        // if table is auto created, the last one or two column should be timestamp(update at and ts placeholder)
-                        continue;
-                    }
-                    _ => InvalidQuerySnafu {
-                        reason: format!(
-                            "schema length mismatched, expected {} found {}",
-                            real_schema.len(),
-                            auto_schema.len()
-                        ),
-                    }
-                    .fail()?,
-                }
-            }
-        } else {
-            // assign inferred schema to sink table
-            // create sink table
-            let did_create = self
-                .create_table_from_relation(
-                    &format!("flow-id={flow_id}"),
-                    &sink_table_name,
-                    &flow_plan.schema,
-                )
-                .await?;
-            if !did_create {
-                UnexpectedSnafu {
-                    reason: format!("Failed to create table {:?}", sink_table_name),
-                }
-                .fail()?;
-            }
-        }
-
-        node_ctx.add_flow_plan(flow_id, flow_plan.clone());
+        node_ctx.assign_table_schema(&sink_table_name, flow_plan.schema.clone())?;
 
         let _ = comment;
         let _ = flow_options;
@@ -839,11 +842,9 @@ impl FlowWorkerManager {
             source_ids,
             src_recvs: source_receivers,
             expire_after,
-            or_replace,
             create_if_not_exists,
             err_collector,
         };
-
         handle.create_flow(create_request).await?;
         info!("Successfully create flow with id={}", flow_id);
         Ok(Some(flow_id))

src/flow/src/adapter/flownode_impl.rs

@@ -25,24 +25,20 @@ use common_meta::error::{ExternalSnafu, Result, UnexpectedSnafu};
 use common_meta::node_manager::Flownode;
 use common_telemetry::{debug, trace};
 use itertools::Itertools;
-use snafu::{IntoError, OptionExt, ResultExt};
+use snafu::{OptionExt, ResultExt};
 use store_api::storage::RegionId;
 
+use super::util::from_proto_to_data_type;
 use crate::adapter::{CreateFlowArgs, FlowWorkerManager};
-use crate::error::{CreateFlowSnafu, InsertIntoFlowSnafu, InternalSnafu};
+use crate::error::InternalSnafu;
 use crate::metrics::METRIC_FLOW_TASK_COUNT;
 use crate::repr::{self, DiffRow};
 
-/// return a function to convert `crate::error::Error` to `common_meta::error::Error`
-fn to_meta_err(
-    location: snafu::Location,
-) -> impl FnOnce(crate::error::Error) -> common_meta::error::Error {
-    move |err: crate::error::Error| -> common_meta::error::Error {
-        common_meta::error::Error::External {
-            location,
-            source: BoxedError::new(err),
-        }
-    }
+fn to_meta_err(err: crate::error::Error) -> common_meta::error::Error {
+    // TODO(discord9): refactor this
+    Err::<(), _>(BoxedError::new(err))
+        .with_context(|_| ExternalSnafu)
+        .unwrap_err()
 }
 
 #[async_trait::async_trait]
@@ -79,16 +75,11 @@ impl Flownode for FlowWorkerManager {
                     or_replace,
                     expire_after,
                     comment: Some(comment),
-                    sql: sql.clone(),
+                    sql,
                     flow_options,
                     query_ctx,
                 };
-                let ret = self
-                    .create_flow(args)
-                    .await
-                    .map_err(BoxedError::new)
-                    .with_context(|_| CreateFlowSnafu { sql: sql.clone() })
-                    .map_err(to_meta_err(snafu::location!()))?;
+                let ret = self.create_flow(args).await.map_err(to_meta_err)?;
                 METRIC_FLOW_TASK_COUNT.inc();
                 Ok(FlowResponse {
                     affected_flows: ret
@@ -103,7 +94,7 @@ impl Flownode for FlowWorkerManager {
             })) => {
                 self.remove_flow(flow_id.id as u64)
                     .await
-                    .map_err(to_meta_err(snafu::location!()))?;
+                    .map_err(to_meta_err)?;
                 METRIC_FLOW_TASK_COUNT.dec();
                 Ok(Default::default())
             }
@@ -121,15 +112,9 @@ impl Flownode for FlowWorkerManager {
                     .await
                     .flush_all_sender()
                     .await
-                    .map_err(to_meta_err(snafu::location!()))?;
-                let rows_send = self
-                    .run_available(true)
-                    .await
-                    .map_err(to_meta_err(snafu::location!()))?;
-                let row = self
-                    .send_writeback_requests()
-                    .await
-                    .map_err(to_meta_err(snafu::location!()))?;
+                    .map_err(to_meta_err)?;
+                let rows_send = self.run_available(true).await.map_err(to_meta_err)?;
+                let row = self.send_writeback_requests().await.map_err(to_meta_err)?;
 
                 debug!(
                     "Done to flush flow_id={:?} with {} input rows flushed, {} rows sended and {} output rows flushed",
@@ -153,7 +138,7 @@ impl Flownode for FlowWorkerManager {
     }
 
     async fn handle_inserts(&self, request: InsertRequests) -> Result<FlowResponse> {
-        // using try_read to ensure two things:
+        // using try_read makesure two things:
         // 1. flush wouldn't happen until inserts before it is inserted
         // 2. inserts happening concurrently with flush wouldn't be block by flush
         let _flush_lock = self.flush_lock.try_read();
@@ -169,23 +154,17 @@ impl Flownode for FlowWorkerManager {
             // TODO(discord9): reconsider time assignment mechanism
             let now = self.tick_manager.tick();
 
-            let (table_types, fetch_order) = {
+            let fetch_order = {
                 let ctx = self.node_context.read().await;
-
-                // TODO(discord9): also check schema version so that altered table can be reported
-                let table_schema = ctx
-                    .table_source
-                    .table_from_id(&table_id)
-                    .await
-                    .map_err(to_meta_err(snafu::location!()))?;
-                let table_types = table_schema
-                    .typ()
-                    .column_types
-                    .clone()
-                    .into_iter()
-                    .map(|t| t.scalar_type)
-                    .collect_vec();
-                let table_col_names = table_schema.names;
+                let table_col_names = ctx
+                    .table_repr
+                    .get_by_table_id(&table_id)
+                    .map(|r| r.1)
+                    .and_then(|id| ctx.schema.get(&id))
+                    .map(|desc| &desc.names)
+                    .context(UnexpectedSnafu {
+                        err_msg: format!("Table not found: {}", table_id),
+                    })?;
                 let table_col_names = table_col_names
                     .iter().enumerate()
                     .map(|(idx,name)| match name {
@@ -204,19 +183,16 @@ impl Flownode for FlowWorkerManager {
                 );
                 let fetch_order: Vec<usize> = table_col_names
                     .iter()
-                    .map(|col_name| {
-                        name_to_col
-                            .get(col_name)
-                            .copied()
-                            .with_context(|| UnexpectedSnafu {
-                                err_msg: format!("Column not found: {}", col_name),
-                            })
+                    .map(|names| {
+                        name_to_col.get(names).copied().context(UnexpectedSnafu {
+                            err_msg: format!("Column not found: {}", names),
+                        })
                     })
                     .try_collect()?;
                 if !fetch_order.iter().enumerate().all(|(i, &v)| i == v) {
                     trace!("Reordering columns: {:?}", fetch_order)
                 }
-                (table_types, fetch_order)
+                fetch_order
             };
 
             let rows: Vec<DiffRow> = rows_proto
@@ -231,29 +207,17 @@ impl Flownode for FlowWorkerManager {
                 })
                 .map(|r| (r, now, 1))
                 .collect_vec();
-            if let Err(err) = self
-                .handle_write_request(region_id.into(), rows, &table_types)
+            let batch_datatypes = insert_schema
+                .iter()
+                .map(from_proto_to_data_type)
+                .collect::<std::result::Result<Vec<_>, _>>()
+                .map_err(to_meta_err)?;
+            self.handle_write_request(region_id.into(), rows, &batch_datatypes)
                 .await
-            {
-                let err = BoxedError::new(err);
-                let flow_ids = self
-                    .node_context
-                    .read()
-                    .await
-                    .get_flow_ids(table_id)
-                    .into_iter()
-                    .flatten()
-                    .cloned()
-                    .collect_vec();
-                let err = InsertIntoFlowSnafu {
-                    region_id,
-                    flow_ids,
-                }
-                .into_error(err);
-                common_telemetry::error!(err; "Failed to handle write request");
-                let err = to_meta_err(snafu::location!())(err);
-                return Err(err);
-            }
+                .map_err(|err| {
+                    common_telemetry::error!(err;"Failed to handle write request");
+                    to_meta_err(err)
+                })?;
         }
         Ok(Default::default())
     }

src/flow/src/adapter/node_context.rs

@@ -18,7 +18,6 @@ use std::collections::{BTreeMap, BTreeSet, HashMap};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
-use common_recordbatch::RecordBatch;
 use common_telemetry::trace;
 use datatypes::prelude::ConcreteDataType;
 use session::context::QueryContext;
@@ -26,23 +25,20 @@ use snafu::{OptionExt, ResultExt};
 use table::metadata::TableId;
 use tokio::sync::{broadcast, mpsc, RwLock};
 
-use crate::adapter::table_source::FlowTableSource;
-use crate::adapter::{FlowId, ManagedTableSource, TableName};
+use crate::adapter::{FlowId, TableName, TableSource};
 use crate::error::{Error, EvalSnafu, TableNotFoundSnafu};
 use crate::expr::error::InternalSnafu;
 use crate::expr::{Batch, GlobalId};
 use crate::metrics::METRIC_FLOW_INPUT_BUF_SIZE;
-use crate::plan::TypedPlan;
 use crate::repr::{DiffRow, RelationDesc, BATCH_SIZE, BROADCAST_CAP, SEND_BUF_CAP};
 
 /// A context that holds the information of the dataflow
-#[derive(Debug)]
+#[derive(Default, Debug)]
 pub struct FlownodeContext {
     /// mapping from source table to tasks, useful for schedule which task to run when a source table is updated
     pub source_to_tasks: BTreeMap<TableId, BTreeSet<FlowId>>,
     /// mapping from task to sink table, useful for sending data back to the client when a task is done running
     pub flow_to_sink: BTreeMap<FlowId, TableName>,
-    pub flow_plans: BTreeMap<FlowId, TypedPlan>,
     pub sink_to_flow: BTreeMap<TableName, FlowId>,
     /// broadcast sender for source table, any incoming write request will be sent to the source table's corresponding sender
     ///
@@ -54,33 +50,13 @@ pub struct FlownodeContext {
     /// note that the sink receiver should only have one, and we are using broadcast as mpsc channel here
     pub sink_receiver:
         BTreeMap<TableName, (mpsc::UnboundedSender<Batch>, mpsc::UnboundedReceiver<Batch>)>,
-    /// can query the schema of the table source, from metasrv with local cache
-    pub table_source: Box<dyn FlowTableSource>,
+    /// the schema of the table, query from metasrv or inferred from TypedPlan
+    pub schema: HashMap<GlobalId, RelationDesc>,
     /// All the tables that have been registered in the worker
     pub table_repr: IdToNameMap,
     pub query_context: Option<Arc<QueryContext>>,
 }
 
-impl FlownodeContext {
-    pub fn new(table_source: Box<dyn FlowTableSource>) -> Self {
-        Self {
-            source_to_tasks: Default::default(),
-            flow_to_sink: Default::default(),
-            flow_plans: Default::default(),
-            sink_to_flow: Default::default(),
-            source_sender: Default::default(),
-            sink_receiver: Default::default(),
-            table_source,
-            table_repr: Default::default(),
-            query_context: Default::default(),
-        }
-    }
-
-    pub fn get_flow_ids(&self, table_id: TableId) -> Option<&BTreeSet<FlowId>> {
-        self.source_to_tasks.get(&table_id)
-    }
-}
-
 /// a simple broadcast sender with backpressure, bounded capacity and blocking on send when send buf is full
 /// note that it wouldn't evict old data, so it's possible to block forever if the receiver is slow
 ///
@@ -183,22 +159,6 @@ impl SourceSender {
 
         Ok(0)
     }
-
-    /// send record batch
-    pub async fn send_record_batch(&self, batch: RecordBatch) -> Result<usize, Error> {
-        let row_cnt = batch.num_rows();
-        let batch = Batch::from(batch);
-
-        self.send_buf_row_cnt.fetch_add(row_cnt, Ordering::SeqCst);
-
-        self.send_buf_tx.send(batch).await.map_err(|e| {
-            crate::error::InternalSnafu {
-                reason: format!("Failed to send batch, error = {:?}", e),
-            }
-            .build()
-        })?;
-        Ok(row_cnt)
-    }
 }
 
 impl FlownodeContext {
@@ -220,16 +180,6 @@ impl FlownodeContext {
         sender.send_rows(rows, batch_datatypes).await
     }
 
-    pub async fn send_rb(&self, table_id: TableId, batch: RecordBatch) -> Result<usize, Error> {
-        let sender = self
-            .source_sender
-            .get(&table_id)
-            .with_context(|| TableNotFoundSnafu {
-                name: table_id.to_string(),
-            })?;
-        sender.send_record_batch(batch).await
-    }
-
     /// flush all sender's buf
     ///
     /// return numbers being sent
@@ -265,15 +215,6 @@ impl FlownodeContext {
         self.sink_to_flow.insert(sink_table_name, task_id);
     }
 
-    /// add flow plan to worker context
-    pub fn add_flow_plan(&mut self, task_id: FlowId, plan: TypedPlan) {
-        self.flow_plans.insert(task_id, plan);
-    }
-
-    pub fn get_flow_plan(&self, task_id: &FlowId) -> Option<TypedPlan> {
-        self.flow_plans.get(task_id).cloned()
-    }
-
     /// remove flow from worker context
     pub fn remove_flow(&mut self, task_id: FlowId) {
         if let Some(sink_table_name) = self.flow_to_sink.remove(&task_id) {
@@ -285,7 +226,6 @@ impl FlownodeContext {
                 self.source_sender.remove(source_table_id);
             }
         }
-        self.flow_plans.remove(&task_id);
     }
 
     /// try add source sender, if already exist, do nothing
@@ -344,7 +284,7 @@ impl FlownodeContext {
     /// Retrieves a GlobalId and table schema representing a table previously registered by calling the [register_table] function.
     ///
     /// Returns an error if no table has been registered with the provided names
-    pub async fn table(&self, name: &TableName) -> Result<(GlobalId, RelationDesc), Error> {
+    pub fn table(&self, name: &TableName) -> Result<(GlobalId, RelationDesc), Error> {
         let id = self
             .table_repr
             .get_by_name(name)
@@ -352,7 +292,13 @@ impl FlownodeContext {
             .with_context(|| TableNotFoundSnafu {
                 name: name.join("."),
             })?;
-        let schema = self.table_source.table(name).await?;
+        let schema = self
+            .schema
+            .get(&id)
+            .cloned()
+            .with_context(|| TableNotFoundSnafu {
+                name: name.join("."),
+            })?;
         Ok((id, schema))
     }
 
@@ -366,7 +312,7 @@ impl FlownodeContext {
     /// merely creating a mapping from table id to global id
     pub async fn assign_global_id_to_table(
         &mut self,
-        srv_map: &ManagedTableSource,
+        srv_map: &TableSource,
         mut table_name: Option<TableName>,
         table_id: Option<TableId>,
     ) -> Result<GlobalId, Error> {
@@ -385,18 +331,36 @@ impl FlownodeContext {
         } else {
             let global_id = self.new_global_id();
 
-            // table id is Some meaning db must have created the table
             if let Some(table_id) = table_id {
-                let known_table_name = srv_map.get_table_name(&table_id).await?;
+                let (known_table_name, schema) = srv_map.get_table_name_schema(&table_id).await?;
                 table_name = table_name.or(Some(known_table_name));
-            } // if we don't have table id, it means database haven't assign one yet or we don't need it
+                self.schema.insert(global_id, schema);
+            } // if we don't have table id, it means database havn't assign one yet or we don't need it
 
-            // still update the mapping with new global id
             self.table_repr.insert(table_name, table_id, global_id);
             Ok(global_id)
         }
     }
 
+    /// Assign a schema to a table
+    ///
+    pub fn assign_table_schema(
+        &mut self,
+        table_name: &TableName,
+        schema: RelationDesc,
+    ) -> Result<(), Error> {
+        let gid = self
+            .table_repr
+            .get_by_name(table_name)
+            .map(|(_, gid)| gid)
+            .context(TableNotFoundSnafu {
+                name: format!("Table not found: {:?} in flownode cache", table_name),
+            })?;
+
+        self.schema.insert(gid, schema);
+        Ok(())
+    }
+
     /// Get a new global id
     pub fn new_global_id(&self) -> GlobalId {
         GlobalId::User(self.table_repr.global_id_to_name_id.len() as u64)

src/flow/src/adapter/table_source.rs

@@ -20,93 +20,27 @@ use common_meta::key::table_name::{TableNameKey, TableNameManager};
 use snafu::{OptionExt, ResultExt};
 use table::metadata::TableId;
 
-use crate::adapter::util::table_info_value_to_relation_desc;
 use crate::adapter::TableName;
 use crate::error::{
     Error, ExternalSnafu, TableNotFoundMetaSnafu, TableNotFoundSnafu, UnexpectedSnafu,
 };
-use crate::repr::RelationDesc;
+use crate::repr::{self, ColumnType, RelationDesc, RelationType};
 
-/// Table source but for flow, provide table schema by table name/id
-#[async_trait::async_trait]
-pub trait FlowTableSource: Send + Sync + std::fmt::Debug {
-    async fn table_name_from_id(&self, table_id: &TableId) -> Result<TableName, Error>;
-    async fn table_id_from_name(&self, name: &TableName) -> Result<TableId, Error>;
-
-    /// Get the table schema by table name
-    async fn table(&self, name: &TableName) -> Result<RelationDesc, Error> {
-        let id = self.table_id_from_name(name).await?;
-        self.table_from_id(&id).await
-    }
-    async fn table_from_id(&self, table_id: &TableId) -> Result<RelationDesc, Error>;
-}
-
-/// managed table source information, query from table info manager and table name manager
-#[derive(Clone)]
-pub struct ManagedTableSource {
+/// mapping of table name <-> table id should be query from tableinfo manager
+pub struct TableSource {
     /// for query `TableId -> TableName` mapping
     table_info_manager: TableInfoManager,
     table_name_manager: TableNameManager,
 }
 
-#[async_trait::async_trait]
-impl FlowTableSource for ManagedTableSource {
-    async fn table_from_id(&self, table_id: &TableId) -> Result<RelationDesc, Error> {
-        let table_info_value = self
-            .get_table_info_value(table_id)
-            .await?
-            .with_context(|| TableNotFoundSnafu {
-                name: format!("TableId = {:?}, Can't found table info", table_id),
-            })?;
-        let desc = table_info_value_to_relation_desc(table_info_value)?;
-
-        Ok(desc)
-    }
-    async fn table_name_from_id(&self, table_id: &TableId) -> Result<TableName, Error> {
-        self.get_table_name(table_id).await
-    }
-    async fn table_id_from_name(&self, name: &TableName) -> Result<TableId, Error> {
-        self.get_opt_table_id_from_name(name)
-            .await?
-            .with_context(|| TableNotFoundSnafu {
-                name: name.join("."),
-            })
-    }
-}
-
-impl ManagedTableSource {
+impl TableSource {
     pub fn new(table_info_manager: TableInfoManager, table_name_manager: TableNameManager) -> Self {
-        ManagedTableSource {
+        TableSource {
             table_info_manager,
             table_name_manager,
         }
     }
 
-    /// Get the time index column from table id
-    pub async fn get_time_index_column_from_table_id(
-        &self,
-        table_id: TableId,
-    ) -> Result<(usize, datatypes::schema::ColumnSchema), Error> {
-        let info = self
-            .table_info_manager
-            .get(table_id)
-            .await
-            .map_err(BoxedError::new)
-            .context(ExternalSnafu)?
-            .context(UnexpectedSnafu {
-                reason: format!("Table id = {:?}, couldn't found table info", table_id),
-            })?;
-        let raw_schema = &info.table_info.meta.schema;
-        let Some(ts_index) = raw_schema.timestamp_index else {
-            UnexpectedSnafu {
-                reason: format!("Table id = {:?}, couldn't found timestamp index", table_id),
-            }
-            .fail()?
-        };
-        let col_schema = raw_schema.column_schemas[ts_index].clone();
-        Ok((ts_index, col_schema))
-    }
-
     pub async fn get_table_id_from_proto_name(
         &self,
         name: &greptime_proto::v1::TableName,
@@ -127,11 +61,8 @@ impl ManagedTableSource {
             .map(|id| id.table_id())
     }
 
-    /// If the table haven't been created in database, the tableId returned would be null
-    pub async fn get_opt_table_id_from_name(
-        &self,
-        name: &TableName,
-    ) -> Result<Option<TableId>, Error> {
+    /// If the table havn't been created in database, the tableId returned would be null
+    pub async fn get_table_id_from_name(&self, name: &TableName) -> Result<Option<TableId>, Error> {
         let ret = self
             .table_name_manager
             .get(TableNameKey::new(&name[0], &name[1], &name[2]))
@@ -190,129 +121,38 @@ impl ManagedTableSource {
             table_name.table_name,
         ];
 
-        let desc = table_info_value_to_relation_desc(table_info_value)?;
-        Ok((table_name, desc))
-    }
-
-    pub async fn check_table_exist(&self, table_id: &TableId) -> Result<bool, Error> {
-        self.table_info_manager
-            .exists(*table_id)
-            .await
-            .map_err(BoxedError::new)
-            .context(ExternalSnafu)
-    }
-}
-
-impl std::fmt::Debug for ManagedTableSource {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("KvBackendTableSource").finish()
-    }
-}
-
-#[cfg(test)]
-pub(crate) mod test {
-    use std::collections::HashMap;
-
-    use datatypes::data_type::ConcreteDataType as CDT;
-
-    use super::*;
-    use crate::repr::{ColumnType, RelationType};
-
-    pub struct FlowDummyTableSource {
-        pub id_names_to_desc: Vec<(TableId, TableName, RelationDesc)>,
-        id_to_idx: HashMap<TableId, usize>,
-        name_to_idx: HashMap<TableName, usize>,
-    }
-
-    impl Default for FlowDummyTableSource {
-        fn default() -> Self {
-            let id_names_to_desc = vec![
+        let raw_schema = table_info_value.table_info.meta.schema;
+        let (column_types, col_names): (Vec<_>, Vec<_>) = raw_schema
+            .column_schemas
+            .clone()
+            .into_iter()
+            .map(|col| {
                 (
-                    1024,
-                    [
-                        "greptime".to_string(),
-                        "public".to_string(),
-                        "numbers".to_string(),
-                    ],
-                    RelationType::new(vec![ColumnType::new(CDT::uint32_datatype(), false)])
-                        .into_named(vec![Some("number".to_string())]),
-                ),
-                (
-                    1025,
-                    [
-                        "greptime".to_string(),
-                        "public".to_string(),
-                        "numbers_with_ts".to_string(),
-                    ],
-                    RelationType::new(vec![
-                        ColumnType::new(CDT::uint32_datatype(), false),
-                        ColumnType::new(CDT::timestamp_millisecond_datatype(), false),
-                    ])
-                    .into_named(vec![Some("number".to_string()), Some("ts".to_string())]),
-                ),
-            ];
-            let id_to_idx = id_names_to_desc
-                .iter()
-                .enumerate()
-                .map(|(idx, (id, _name, _desc))| (*id, idx))
-                .collect();
-            let name_to_idx = id_names_to_desc
-                .iter()
-                .enumerate()
-                .map(|(idx, (_id, name, _desc))| (name.clone(), idx))
-                .collect();
-            Self {
-                id_names_to_desc,
-                id_to_idx,
-                name_to_idx,
-            }
-        }
-    }
+                    ColumnType {
+                        nullable: col.is_nullable(),
+                        scalar_type: col.data_type,
+                    },
+                    Some(col.name),
+                )
+            })
+            .unzip();
 
-    #[async_trait::async_trait]
-    impl FlowTableSource for FlowDummyTableSource {
-        async fn table_from_id(&self, table_id: &TableId) -> Result<RelationDesc, Error> {
-            let idx = self.id_to_idx.get(table_id).context(TableNotFoundSnafu {
-                name: format!("Table id = {:?}, couldn't found table desc", table_id),
-            })?;
-            let desc = self
-                .id_names_to_desc
-                .get(*idx)
-                .map(|x| x.2.clone())
-                .context(TableNotFoundSnafu {
-                    name: format!("Table id = {:?}, couldn't found table desc", table_id),
-                })?;
-            Ok(desc)
-        }
+        let key = table_info_value.table_info.meta.primary_key_indices;
+        let keys = vec![repr::Key::from(key)];
 
-        async fn table_name_from_id(&self, table_id: &TableId) -> Result<TableName, Error> {
-            let idx = self.id_to_idx.get(table_id).context(TableNotFoundSnafu {
-                name: format!("Table id = {:?}, couldn't found table desc", table_id),
-            })?;
-            self.id_names_to_desc
-                .get(*idx)
-                .map(|x| x.1.clone())
-                .context(TableNotFoundSnafu {
-                    name: format!("Table id = {:?}, couldn't found table desc", table_id),
-                })
-        }
-
-        async fn table_id_from_name(&self, name: &TableName) -> Result<TableId, Error> {
-            for (id, table_name, _desc) in &self.id_names_to_desc {
-                if name == table_name {
-                    return Ok(*id);
-                }
-            }
-            TableNotFoundSnafu {
-                name: format!("Table name = {:?}, couldn't found table id", name),
-            }
-            .fail()?
-        }
-    }
-
-    impl std::fmt::Debug for FlowDummyTableSource {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            f.debug_struct("DummyTableSource").finish()
-        }
+        let time_index = raw_schema.timestamp_index;
+        Ok((
+            table_name,
+            RelationDesc {
+                typ: RelationType {
+                    column_types,
+                    keys,
+                    time_index,
+                    // by default table schema's column are all non-auto
+                    auto_columns: vec![],
+                },
+                names: col_names,
+            },
+        ))
     }
 }

src/flow/src/adapter/util.rs

@@ -12,153 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::sync::Arc;
-
 use api::helper::ColumnDataTypeWrapper;
 use api::v1::column_def::options_from_column_schema;
-use api::v1::{ColumnDataType, ColumnDataTypeExtension, CreateTableExpr, SemanticType};
+use api::v1::{ColumnDataType, ColumnDataTypeExtension, SemanticType};
 use common_error::ext::BoxedError;
-use common_meta::key::table_info::TableInfoValue;
 use datatypes::prelude::ConcreteDataType;
 use datatypes::schema::ColumnSchema;
 use itertools::Itertools;
-use operator::expr_factory::CreateExprFactory;
-use session::context::QueryContextBuilder;
-use snafu::{OptionExt, ResultExt};
-use table::table_reference::TableReference;
+use snafu::ResultExt;
 
-use crate::adapter::{TableName, AUTO_CREATED_PLACEHOLDER_TS_COL};
-use crate::error::{Error, ExternalSnafu, UnexpectedSnafu};
-use crate::repr::{ColumnType, RelationDesc, RelationType};
-use crate::FlowWorkerManager;
-
-impl FlowWorkerManager {
-    /// Create table from given schema(will adjust to add auto column if needed), return true if table is created
-    pub(crate) async fn create_table_from_relation(
-        &self,
-        flow_name: &str,
-        table_name: &TableName,
-        relation_desc: &RelationDesc,
-    ) -> Result<bool, Error> {
-        if self.fetch_table_pk_schema(table_name).await?.is_some() {
-            return Ok(false);
-        }
-        let (pks, tys, _) = self.adjust_auto_created_table_schema(relation_desc).await?;
-
-        //create sink table using pks, column types and is_ts_auto
-
-        let proto_schema = column_schemas_to_proto(tys.clone(), &pks)?;
-
-        // create sink table
-        let create_expr = CreateExprFactory {}
-            .create_table_expr_by_column_schemas(
-                &TableReference {
-                    catalog: &table_name[0],
-                    schema: &table_name[1],
-                    table: &table_name[2],
-                },
-                &proto_schema,
-                "mito",
-                Some(&format!("Sink table for flow {}", flow_name)),
-            )
-            .map_err(BoxedError::new)
-            .context(ExternalSnafu)?;
-
-        self.submit_create_sink_table_ddl(create_expr).await?;
-        Ok(true)
-    }
-
-    /// Try fetch table with adjusted schema(added auto column if needed)
-    pub(crate) async fn try_fetch_existing_table(
-        &self,
-        table_name: &TableName,
-    ) -> Result<Option<(bool, Vec<api::v1::ColumnSchema>)>, Error> {
-        if let Some((primary_keys, time_index, schema)) =
-            self.fetch_table_pk_schema(table_name).await?
-        {
-            // check if the last column is the auto created timestamp column, hence the table is auto created from
-            // flow's plan type
-            let is_auto_create = {
-                let correct_name = schema
-                    .last()
-                    .map(|s| s.name == AUTO_CREATED_PLACEHOLDER_TS_COL)
-                    .unwrap_or(false);
-                let correct_time_index = time_index == Some(schema.len() - 1);
-                correct_name && correct_time_index
-            };
-            let proto_schema = column_schemas_to_proto(schema, &primary_keys)?;
-            Ok(Some((is_auto_create, proto_schema)))
-        } else {
-            Ok(None)
-        }
-    }
-
-    /// submit a create table ddl
-    pub(crate) async fn submit_create_sink_table_ddl(
-        &self,
-        mut create_table: CreateTableExpr,
-    ) -> Result<(), Error> {
-        let stmt_exec = {
-            self.frontend_invoker
-                .read()
-                .await
-                .as_ref()
-                .map(|f| f.statement_executor())
-        }
-        .context(UnexpectedSnafu {
-            reason: "Failed to get statement executor",
-        })?;
-        let ctx = Arc::new(
-            QueryContextBuilder::default()
-                .current_catalog(create_table.catalog_name.clone())
-                .current_schema(create_table.schema_name.clone())
-                .build(),
-        );
-        stmt_exec
-            .create_table_inner(&mut create_table, None, ctx)
-            .await
-            .map_err(BoxedError::new)
-            .context(ExternalSnafu)?;
-
-        Ok(())
-    }
-}
-
-pub fn table_info_value_to_relation_desc(
-    table_info_value: TableInfoValue,
-) -> Result<RelationDesc, Error> {
-    let raw_schema = table_info_value.table_info.meta.schema;
-    let (column_types, col_names): (Vec<_>, Vec<_>) = raw_schema
-        .column_schemas
-        .clone()
-        .into_iter()
-        .map(|col| {
-            (
-                ColumnType {
-                    nullable: col.is_nullable(),
-                    scalar_type: col.data_type,
-                },
-                Some(col.name),
-            )
-        })
-        .unzip();
-
-    let key = table_info_value.table_info.meta.primary_key_indices;
-    let keys = vec![crate::repr::Key::from(key)];
-
-    let time_index = raw_schema.timestamp_index;
-
-    Ok(RelationDesc {
-        typ: RelationType {
-            column_types,
-            keys,
-            time_index,
-            // by default table schema's column are all non-auto
-            auto_columns: vec![],
-        },
-        names: col_names,
-    })
-}
+use crate::error::{Error, ExternalSnafu};
 
 pub fn from_proto_to_data_type(
     column_schema: &api::v1::ColumnSchema,
@@ -212,29 +75,3 @@ pub fn column_schemas_to_proto(
         .collect();
     Ok(ret)
 }
-
-/// Convert `RelationDesc` to `ColumnSchema` list,
-/// if the column name is not present, use `col_{idx}` as the column name
-pub fn relation_desc_to_column_schemas_with_fallback(schema: &RelationDesc) -> Vec<ColumnSchema> {
-    schema
-        .typ()
-        .column_types
-        .clone()
-        .into_iter()
-        .enumerate()
-        .map(|(idx, typ)| {
-            let name = schema
-                .names
-                .get(idx)
-                .cloned()
-                .flatten()
-                .unwrap_or(format!("col_{}", idx));
-            let ret = ColumnSchema::new(name, typ.scalar_type, typ.nullable);
-            if schema.typ().time_index == Some(idx) {
-                ret.with_time_index(true)
-            } else {
-                ret
-            }
-        })
-        .collect_vec()
-}

src/flow/src/adapter/worker.rs

@@ -247,25 +247,15 @@ impl<'s> Worker<'s> {
         src_recvs: Vec<broadcast::Receiver<Batch>>,
         // TODO(discord9): set expire duration for all arrangement and compare to sys timestamp instead
         expire_after: Option<repr::Duration>,
-        or_replace: bool,
         create_if_not_exists: bool,
         err_collector: ErrCollector,
     ) -> Result<Option<FlowId>, Error> {
-        let already_exist = self.task_states.contains_key(&flow_id);
-        match (create_if_not_exists, or_replace, already_exist) {
-            // if replace, ignore that old flow exists
-            (_, true, true) => {
-                info!("Replacing flow with id={}", flow_id);
-            }
-            (false, false, true) => FlowAlreadyExistSnafu { id: flow_id }.fail()?,
-            // already exists, and not replace, return None
-            (true, false, true) => {
-                info!("Flow with id={} already exists, do nothing", flow_id);
-                return Ok(None);
-            }
-            // continue as normal
-            (_, _, false) => (),
-        }
+        let already_exists = self.task_states.contains_key(&flow_id);
+        match (already_exists, create_if_not_exists) {
+            (true, true) => return Ok(None),
+            (true, false) => FlowAlreadyExistSnafu { id: flow_id }.fail()?,
+            (false, _) => (),
+        };
 
         let mut cur_task_state = ActiveDataflowState::<'s> {
             err_collector,
@@ -351,7 +341,6 @@ impl<'s> Worker<'s> {
                 source_ids,
                 src_recvs,
                 expire_after,
-                or_replace,
                 create_if_not_exists,
                 err_collector,
             } => {
@@ -363,7 +352,6 @@ impl<'s> Worker<'s> {
                     &source_ids,
                     src_recvs,
                     expire_after,
-                    or_replace,
                     create_if_not_exists,
                     err_collector,
                 );
@@ -410,7 +398,6 @@ pub enum Request {
         source_ids: Vec<GlobalId>,
         src_recvs: Vec<broadcast::Receiver<Batch>>,
         expire_after: Option<repr::Duration>,
-        or_replace: bool,
         create_if_not_exists: bool,
         err_collector: ErrCollector,
     },
@@ -560,7 +547,6 @@ mod test {
             source_ids: src_ids,
             src_recvs: vec![rx],
             expire_after: None,
-            or_replace: false,
             create_if_not_exists: true,
             err_collector: ErrCollector::default(),
         };

src/flow/src/compute/render/reduce.rs

@@ -16,7 +16,6 @@ use std::collections::{BTreeMap, BTreeSet};
 use std::ops::Range;
 use std::sync::Arc;
 
-use arrow::array::new_null_array;
 use common_telemetry::trace;
 use datatypes::data_type::ConcreteDataType;
 use datatypes::prelude::DataType;
@@ -399,54 +398,20 @@ fn reduce_batch_subgraph(
                 }
             }
 
-            let key_data_types = output_type
-                .column_types
-                .iter()
-                .map(|t| t.scalar_type.clone())
-                .collect_vec();
-
-            // TODO(discord9): here reduce numbers of eq to minimal by keeping slicing key/val batch
+            // TODO: here reduce numbers of eq to minimal by keeping slicing key/val batch
             for key_row in distinct_keys {
                 let key_scalar_value = {
                     let mut key_scalar_value = Vec::with_capacity(key_row.len());
-                    for (key_idx, key) in key_row.iter().enumerate() {
+                    for key in key_row.iter() {
                         let v =
                             key.try_to_scalar_value(&key.data_type())
                                 .context(DataTypeSnafu {
                                     msg: "can't convert key values to datafusion value",
                                 })?;
-
-                        let key_data_type = key_data_types.get(key_idx).context(InternalSnafu {
-                            reason: format!(
-                                "Key index out of bound, expected at most {} but got {}",
-                                output_type.column_types.len(),
-                                key_idx
-                            ),
-                        })?;
-
-                        // if incoming value's datatype is null, it need to be handled specially, see below
-                        if key_data_type.as_arrow_type() != v.data_type()
-                            && !v.data_type().is_null()
-                        {
-                            crate::expr::error::InternalSnafu {
-                                reason: format!(
-                                    "Key data type mismatch, expected {:?} but got {:?}",
-                                    key_data_type.as_arrow_type(),
-                                    v.data_type()
-                                ),
-                            }
-                            .fail()?
-                        }
-
-                        // handle single null key
-                        let arrow_value = if v.data_type().is_null() {
-                            let ret = new_null_array(&arrow::datatypes::DataType::Null, 1);
-                            arrow::array::Scalar::new(ret)
-                        } else {
+                        let arrow_value =
                             v.to_scalar().context(crate::expr::error::DatafusionSnafu {
                                 context: "can't convert key values to arrow value",
-                            })?
-                        };
+                            })?;
                         key_scalar_value.push(arrow_value);
                     }
                     key_scalar_value
@@ -458,19 +423,7 @@ fn reduce_batch_subgraph(
                     .zip(key_batch.batch().iter())
                     .map(|(key, col)| {
                         // TODO(discord9): this takes half of the cpu! And this is redundant amount of `eq`!
-
-                        // note that if lhs is a null, we still need to get all rows that are null! But can't use `eq` since
-                        // it will return null if input have null, so we need to use `is_null` instead
-                        if arrow::array::Datum::get(&key).0.data_type().is_null() {
-                            arrow::compute::kernels::boolean::is_null(
-                                col.to_arrow_array().as_ref() as _
-                            )
-                        } else {
-                            arrow::compute::kernels::cmp::eq(
-                                &key,
-                                &col.to_arrow_array().as_ref() as _,
-                            )
-                        }
+                        arrow::compute::kernels::cmp::eq(&key, &col.to_arrow_array().as_ref() as _)
                     })
                     .try_collect::<_, Vec<_>, _>()
                     .context(ArrowSnafu {

src/flow/src/compute/types.rs

@@ -17,7 +17,6 @@ use std::collections::{BTreeMap, VecDeque};
 use std::rc::Rc;
 use std::sync::Arc;
 
-use common_error::ext::ErrorExt;
 use hydroflow::scheduled::graph::Hydroflow;
 use hydroflow::scheduled::handoff::TeeingHandoff;
 use hydroflow::scheduled::port::RecvPort;
@@ -26,7 +25,6 @@ use itertools::Itertools;
 use tokio::sync::Mutex;
 
 use crate::expr::{Batch, EvalError, ScalarExpr};
-use crate::metrics::METRIC_FLOW_ERRORS;
 use crate::repr::DiffRow;
 use crate::utils::ArrangeHandler;
 
@@ -187,9 +185,6 @@ impl ErrCollector {
     }
 
     pub fn push_err(&self, err: EvalError) {
-        METRIC_FLOW_ERRORS
-            .with_label_values(&[err.status_code().as_ref()])
-            .inc();
         self.inner.blocking_lock().push_back(err)
     }
 

src/flow/src/df_optimizer.rs

@@ -492,7 +492,7 @@ impl ScalarUDFImpl for TumbleExpand {
                 if let Some(start_time) = opt{
                     if !matches!(start_time,  Utf8 | Date32 | Date64 | Timestamp(_, _)){
                         return Err(DataFusionError::Plan(
-                            format!("Expect start_time to either be date, timestamp or string, found {:?}", start_time)
+                            format!("Expect start_time to either be date, timestampe or string, found {:?}", start_time)
                         ));
                     }
                 }

src/flow/src/error.rs

@@ -16,13 +16,12 @@
 
 use std::any::Any;
 
+use common_error::define_into_tonic_status;
 use common_error::ext::BoxedError;
-use common_error::{define_into_tonic_status, from_err_code_msg_to_header};
 use common_macro::stack_trace_debug;
 use common_telemetry::common_error::ext::ErrorExt;
 use common_telemetry::common_error::status_code::StatusCode;
-use snafu::{Location, ResultExt, Snafu};
-use tonic::metadata::MetadataMap;
+use snafu::{Location, Snafu};
 
 use crate::adapter::FlowId;
 use crate::expr::EvalError;
@@ -32,27 +31,6 @@ use crate::expr::EvalError;
 #[snafu(visibility(pub))]
 #[stack_trace_debug]
 pub enum Error {
-    #[snafu(display(
-        "Failed to insert into flow: region_id={}, flow_ids={:?}",
-        region_id,
-        flow_ids
-    ))]
-    InsertIntoFlow {
-        region_id: u64,
-        flow_ids: Vec<u64>,
-        source: BoxedError,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Error encountered while creating flow: {sql}"))]
-    CreateFlow {
-        sql: String,
-        source: BoxedError,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
     #[snafu(display("External error"))]
     External {
         source: BoxedError,
@@ -208,37 +186,23 @@ pub enum Error {
     },
 }
 
-/// the outer message is the full error stack, and inner message in header is the last error message that can be show directly to user
-pub fn to_status_with_last_err(err: impl ErrorExt) -> tonic::Status {
-    let msg = err.to_string();
-    let last_err_msg = common_error::ext::StackError::last(&err).to_string();
-    let code = err.status_code() as u32;
-    let header = from_err_code_msg_to_header(code, &last_err_msg);
-
-    tonic::Status::with_metadata(
-        tonic::Code::InvalidArgument,
-        msg,
-        MetadataMap::from_headers(header),
-    )
-}
-
 /// Result type for flow module
 pub type Result<T> = std::result::Result<T, Error>;
 
 impl ErrorExt for Error {
     fn status_code(&self) -> StatusCode {
         match self {
-            Self::Eval { .. }
-            | Self::JoinTask { .. }
-            | Self::Datafusion { .. }
-            | Self::InsertIntoFlow { .. } => StatusCode::Internal,
+            Self::Eval { .. } | Self::JoinTask { .. } | Self::Datafusion { .. } => {
+                StatusCode::Internal
+            }
             Self::FlowAlreadyExist { .. } => StatusCode::TableAlreadyExists,
             Self::TableNotFound { .. }
             | Self::TableNotFoundMeta { .. }
             | Self::FlowNotFound { .. }
             | Self::ListFlows { .. } => StatusCode::TableNotFound,
-            Self::Plan { .. } | Self::Datatypes { .. } => StatusCode::PlanQuery,
-            Self::InvalidQuery { .. } | Self::CreateFlow { .. } => StatusCode::EngineExecuteQuery,
+            Self::InvalidQuery { .. } | Self::Plan { .. } | Self::Datatypes { .. } => {
+                StatusCode::PlanQuery
+            }
             Self::Unexpected { .. } => StatusCode::Unexpected,
             Self::NotImplemented { .. } | Self::UnsupportedTemporalFilter { .. } => {
                 StatusCode::Unsupported
@@ -259,9 +223,3 @@ impl ErrorExt for Error {
 }
 
 define_into_tonic_status!(Error);
-
-impl From<EvalError> for Error {
-    fn from(e: EvalError) -> Self {
-        Err::<(), _>(e).context(EvalSnafu).unwrap_err()
-    }
-}

src/flow/src/expr.rs

@@ -22,7 +22,6 @@ mod linear;
 pub(crate) mod relation;
 mod scalar;
 mod signature;
-pub(crate) mod utils;
 
 use arrow::compute::FilterBuilder;
 use datatypes::prelude::{ConcreteDataType, DataType};
@@ -55,16 +54,6 @@ pub struct Batch {
     diffs: Option<VectorRef>,
 }
 
-impl From<common_recordbatch::RecordBatch> for Batch {
-    fn from(value: common_recordbatch::RecordBatch) -> Self {
-        Self {
-            row_count: value.num_rows(),
-            batch: value.columns,
-            diffs: None,
-        }
-    }
-}
-
 impl PartialEq for Batch {
     fn eq(&self, other: &Self) -> bool {
         let mut batch_eq = true;

src/flow/src/expr/error.rs

@@ -14,11 +14,8 @@
 
 //! Error handling for expression evaluation.
 
-use std::any::Any;
-
 use arrow_schema::ArrowError;
-use common_error::ext::{BoxedError, ErrorExt};
-use common_error::status_code::StatusCode;
+use common_error::ext::BoxedError;
 use common_macro::stack_trace_debug;
 use datafusion_common::DataFusionError;
 use datatypes::data_type::ConcreteDataType;
@@ -129,29 +126,3 @@ pub enum EvalError {
         source: BoxedError,
     },
 }
-
-impl ErrorExt for EvalError {
-    fn status_code(&self) -> StatusCode {
-        use EvalError::*;
-        match self {
-            DivisionByZero { .. }
-            | TypeMismatch { .. }
-            | TryFromValue { .. }
-            | DataAlreadyExpired { .. }
-            | InvalidArgument { .. }
-            | Overflow { .. } => StatusCode::InvalidArguments,
-
-            CastValue { source, .. } | DataType { source, .. } => source.status_code(),
-
-            Internal { .. }
-            | Optimize { .. }
-            | Arrow { .. }
-            | Datafusion { .. }
-            | External { .. } => StatusCode::Internal,
-        }
-    }
-
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-}