fix: show tables too slow cherry pick (#7244 )

v0.12.1 fix: `show tables` is too slow under large tables Signed-off-by: luofucong <luofc@foxmail.com>
ci: update github runner on old branch (#7249 )
2025-12-26 16:10:02 +00:00 · 2025-11-18 12:29:40 +00:00 · 2025-11-18 19:52:03 +08:00 · 2025-06-04 11:36:42 +08:00
272 changed files with 2513 additions and 9554 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -3,12 +3,3 @@ linker = "aarch64-linux-gnu-gcc"

 [alias]
 sqlness = "run --bin sqlness-runner --"
-
-[unstable.git]
-shallow_index = true
-shallow_deps = true
-[unstable.gitoxide]
-fetch = true
-checkout = true
-list_files = true
-internal_use_git2 = false
--- a/.github/actions/build-dev-builder-images/action.yml
+++ b/.github/actions/build-dev-builder-images/action.yml
@@ -41,13 +41,6 @@ runs:
        username: ${{ inputs.dockerhub-image-registry-username }}
        password: ${{ inputs.dockerhub-image-registry-token }}

-    - name: Set up qemu for multi-platform builds
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: linux/amd64,linux/arm64
-        # The latest version will lead to segmentation fault.
-        image: tonistiigi/binfmt:qemu-v7.0.0-28
-
    - name: Build and push dev-builder-ubuntu image
      shell: bash
      if: ${{ inputs.build-dev-builder-ubuntu == 'true' }}
@@ -76,8 +69,8 @@ runs:
      run: |
        make dev-builder \
          BASE_IMAGE=android \
-          BUILDX_MULTI_PLATFORM_BUILD=amd64 \
          IMAGE_REGISTRY=${{ inputs.dockerhub-image-registry }} \
          IMAGE_NAMESPACE=${{ inputs.dockerhub-image-namespace }} \
-          DEV_BUILDER_IMAGE_TAG=${{ inputs.version }}
+          DEV_BUILDER_IMAGE_TAG=${{ inputs.version }} && \

+        docker push ${{ inputs.dockerhub-image-registry }}/${{ inputs.dockerhub-image-namespace }}/dev-builder-android:${{ inputs.version }}
--- a/.github/actions/setup-etcd-cluster/action.yml
+++ b/.github/actions/setup-etcd-cluster/action.yml
@@ -24,4 +24,9 @@ runs:
        --set auth.rbac.token.enabled=false \
        --set persistence.size=2Gi \
        --create-namespace \
+        --set global.security.allowInsecureImages=true \
+        --set image.registry=docker.io \
+        --set image.repository=greptime/etcd \
+        --set image.tag=3.6.1-debian-12-r3 \
+        --version 12.0.8 \
        -n ${{ inputs.namespace }}
--- a/.github/actions/setup-greptimedb-cluster/action.yml
+++ b/.github/actions/setup-greptimedb-cluster/action.yml
@@ -51,7 +51,7 @@ runs:
    run: | 
      helm upgrade \
        --install my-greptimedb \
-        --set meta.etcdEndpoints=${{ inputs.etcd-endpoints }} \
+        --set meta.backendStorage.etcd.endpoints=${{ inputs.etcd-endpoints }} \
        --set meta.enableRegionFailover=${{ inputs.enable-region-failover }} \
        --set image.registry=${{ inputs.image-registry }} \
        --set image.repository=${{ inputs.image-repository }}  \
--- a/.github/actions/setup-kafka-cluster/action.yml
+++ b/.github/actions/setup-kafka-cluster/action.yml
@@ -23,4 +23,8 @@ runs:
        --set listeners.controller.protocol=PLAINTEXT \
        --set listeners.client.protocol=PLAINTEXT \
        --create-namespace \
+        --set image.registry=docker.io \
+        --set image.repository=greptime/kafka \
+        --set image.tag=3.9.0-debian-12-r1 \
+        --version 31.0.0 \
        -n ${{ inputs.namespace }}
--- a/.github/scripts/pull-test-deps-images.sh
+++ b/.github/scripts/pull-test-deps-images.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# This script is used to pull the test dependency images that are stored in public ECR one by one to avoid rate limiting.
+
+set -e
+
+MAX_RETRIES=3
+
+IMAGES=(
+  "greptime/zookeeper:3.7"
+  "greptime/kafka:3.9.0-debian-12-r1"
+  "greptime/etcd:3.6.1-debian-12-r3"
+  "greptime/minio:2024"
+  "greptime/mysql:5.7"
+)
+
+for image in "${IMAGES[@]}"; do
+  for ((attempt=1; attempt<=MAX_RETRIES; attempt++)); do
+    if docker pull "$image"; then
+      # Successfully pulled the image.
+      break
+    else
+      # Use some simple exponential backoff to avoid rate limiting.
+      if [ $attempt -lt $MAX_RETRIES ]; then
+        sleep_seconds=$((attempt * 5))
+        echo "Attempt $attempt failed for $image, waiting $sleep_seconds seconds"
+        sleep $sleep_seconds  # 5s, 10s delays
+      else
+        echo "Failed to pull $image after $MAX_RETRIES attempts"
+        exit 1
+      fi
+    fi
+  done
+done
--- a/.github/workflows/apidoc.yml
+++ b/.github/workflows/apidoc.yml
@@ -14,7 +14,7 @@ name: Build API docs

 jobs:
  apidoc:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
    - uses: actions/checkout@v4
      with:
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -16,11 +16,11 @@ on:
        description: The runner uses to build linux-amd64 artifacts
        default: ec2-c6i.4xlarge-amd64
        options:
-          - ubuntu-20.04
-          - ubuntu-20.04-8-cores
-          - ubuntu-20.04-16-cores
-          - ubuntu-20.04-32-cores
-          - ubuntu-20.04-64-cores
+          - ubuntu-22.04
+          - ubuntu-22.04-8-cores
+          - ubuntu-22.04-16-cores
+          - ubuntu-22.04-32-cores
+          - ubuntu-22.04-64-cores
          - ec2-c6i.xlarge-amd64 # 4C8G
          - ec2-c6i.2xlarge-amd64 # 8C16G
          - ec2-c6i.4xlarge-amd64 # 16C32G
@@ -83,7 +83,7 @@ jobs:
  allocate-runners:
    name: Allocate runners
    if: ${{ github.repository == 'GreptimeTeam/greptimedb' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    outputs:
      linux-amd64-runner: ${{ steps.start-linux-amd64-runner.outputs.label }}
      linux-arm64-runner: ${{ steps.start-linux-arm64-runner.outputs.label }}
@@ -218,7 +218,7 @@ jobs:
      build-linux-amd64-artifacts,
      build-linux-arm64-artifacts,
    ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    outputs:
      build-result: ${{ steps.set-build-result.outputs.build-result }}
    steps:
@@ -251,7 +251,7 @@ jobs:
      allocate-runners,
      release-images-to-dockerhub,
    ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    continue-on-error: true
    steps:
      - uses: actions/checkout@v4
@@ -283,7 +283,7 @@ jobs:
    name: Stop linux-amd64 runner
    # Only run this job when the runner is allocated.
    if: ${{ always() }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    needs: [
      allocate-runners,
      build-linux-amd64-artifacts,
@@ -309,7 +309,7 @@ jobs:
    name: Stop linux-arm64 runner
    # Only run this job when the runner is allocated.
    if: ${{ always() }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    needs: [
      allocate-runners,
      build-linux-arm64-artifacts,
@@ -337,7 +337,7 @@ jobs:
    needs: [
      release-images-to-dockerhub
    ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    permissions:
      issues: write

--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -21,14 +21,13 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  check-typos-and-docs:
-    name: Check typos and docs
-    runs-on: ubuntu-20.04
+  check-docs:
+    name: Check docs
+    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v4
        with:
          persist-credentials: false
-      - uses: crate-ci/typos@master
      - name: Check the config docs
        run: |
          make config-docs && \
@@ -36,7 +35,7 @@ jobs:
          || (echo "'config/config.md' is not up-to-date, please run 'make config-docs'." && exit 1)

  license-header-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    name: Check License Header
    steps:
      - uses: actions/checkout@v4
@@ -49,7 +48,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ ubuntu-20.04 ]
+        os: [ ubuntu-22.04 ]
    timeout-minutes: 60
    steps:
      - uses: actions/checkout@v4
@@ -72,7 +71,7 @@ jobs:

  toml:
    name: Toml Check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    timeout-minutes: 60
    steps:
      - uses: actions/checkout@v4
@@ -89,7 +88,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ ubuntu-20.04 ]
+        os: [ ubuntu-22.04 ]
    timeout-minutes: 60
    steps:
      - uses: actions/checkout@v4
@@ -248,7 +247,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ ubuntu-20.04 ]
+        os: [ ubuntu-22.04 ]
    timeout-minutes: 60
    steps:
      - uses: actions/checkout@v4
@@ -568,7 +567,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ ubuntu-20.04 ]
+        os: [ ubuntu-22.04 ]
        mode:
          - name: "Basic"
            opts: ""
@@ -587,7 +586,8 @@ jobs:
      - if: matrix.mode.kafka
        name: Setup kafka server
        working-directory: tests-integration/fixtures
-        run: docker compose up -d --wait kafka
+        run:  ../../.github/scripts/pull-test-deps-images.sh && docker compose up -d --wait kafka
+
      - name: Download pre-built binaries
        uses: actions/download-artifact@v4
        with:
@@ -607,7 +607,7 @@ jobs:

  fmt:
    name: Rustfmt
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    timeout-minutes: 60
    steps:
      - uses: actions/checkout@v4
@@ -624,7 +624,7 @@ jobs:

  clippy:
    name: Clippy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    timeout-minutes: 60
    steps:
      - uses: actions/checkout@v4
@@ -685,7 +685,8 @@ jobs:
        uses: taiki-e/install-action@nextest
      - name: Setup external services
        working-directory: tests-integration/fixtures
-        run: docker compose up -d --wait
+        run: ../../.github/scripts/pull-test-deps-images.sh && docker compose up -d --wait
+
      - name: Run nextest cases
        run: cargo nextest run --workspace -F dashboard -F pg_kvbackend
        env:
@@ -710,7 +711,7 @@ jobs:

  coverage:
    if: github.event_name == 'merge_group'
-    runs-on: ubuntu-20.04-8-cores
+    runs-on: ubuntu-22.04-8-cores
    timeout-minutes: 60
    steps:
      - uses: actions/checkout@v4
@@ -737,7 +738,8 @@ jobs:
        uses: taiki-e/install-action@cargo-llvm-cov
      - name: Setup external services
        working-directory: tests-integration/fixtures
-        run: docker compose up -d --wait
+        run: ../../.github/scripts/pull-test-deps-images.sh && docker compose up -d --wait
+
      - name: Run nextest cases
        run: cargo llvm-cov nextest --workspace --lcov --output-path lcov.info -F dashboard -F pg_kvbackend
        env:
@@ -770,7 +772,7 @@ jobs:
  # compat:
  #   name: Compatibility Test
  #   needs: build
-  #   runs-on: ubuntu-20.04
+  #   runs-on: ubuntu-22.04
  #   timeout-minutes: 60
  #   steps:
  #     - uses: actions/checkout@v4
--- a/.github/workflows/docbot.yml
+++ b/.github/workflows/docbot.yml
@@ -3,13 +3,9 @@ on:
  pull_request_target:
    types: [opened, edited]

-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
  docbot:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    permissions:
      pull-requests: write
      contents: read
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -31,7 +31,7 @@ name: CI
 jobs:
  typos:
    name: Spell Check with Typos
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v4
        with:
@@ -39,7 +39,7 @@ jobs:
      - uses: crate-ci/typos@master

  license-header-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    name: Check License Header
    steps:
      - uses: actions/checkout@v4
@@ -49,29 +49,29 @@ jobs:

  check:
    name: Check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - run: 'echo "No action required"'

  fmt:
    name: Rustfmt
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - run: 'echo "No action required"'

  clippy:
    name: Clippy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - run: 'echo "No action required"'

  coverage:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - run: 'echo "No action required"'

  test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - run: 'echo "No action required"'

@@ -80,7 +80,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ ubuntu-20.04 ]
+        os: [ ubuntu-22.04 ]
        mode:
          - name: "Basic"
          - name: "Remote WAL"
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -14,11 +14,11 @@ on:
        description: The runner uses to build linux-amd64 artifacts
        default: ec2-c6i.4xlarge-amd64
        options:
-          - ubuntu-20.04
-          - ubuntu-20.04-8-cores
-          - ubuntu-20.04-16-cores
-          - ubuntu-20.04-32-cores
-          - ubuntu-20.04-64-cores
+          - ubuntu-22.04
+          - ubuntu-22.04-8-cores
+          - ubuntu-22.04-16-cores
+          - ubuntu-22.04-32-cores
+          - ubuntu-22.04-64-cores
          - ec2-c6i.xlarge-amd64 # 4C8G
          - ec2-c6i.2xlarge-amd64 # 8C16G
          - ec2-c6i.4xlarge-amd64 # 16C32G
@@ -70,7 +70,7 @@ jobs:
  allocate-runners:
    name: Allocate runners
    if: ${{ github.repository == 'GreptimeTeam/greptimedb' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    outputs:
      linux-amd64-runner: ${{ steps.start-linux-amd64-runner.outputs.label }}
      linux-arm64-runner: ${{ steps.start-linux-arm64-runner.outputs.label }}
@@ -182,7 +182,7 @@ jobs:
      build-linux-amd64-artifacts,
      build-linux-arm64-artifacts,
    ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    outputs:
      nightly-build-result: ${{ steps.set-nightly-build-result.outputs.nightly-build-result }}
    steps:
@@ -214,7 +214,7 @@ jobs:
      allocate-runners,
      release-images-to-dockerhub,
    ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    # When we push to ACR, it's easy to fail due to some unknown network issues.
    # However, we don't want to fail the whole workflow because of this.
    # The ACR have daily sync with DockerHub, so don't worry about the image not being updated.
@@ -249,7 +249,7 @@ jobs:
    name: Stop linux-amd64 runner
    # Only run this job when the runner is allocated.
    if: ${{ always() }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    needs: [
      allocate-runners,
      build-linux-amd64-artifacts,
@@ -275,7 +275,7 @@ jobs:
    name: Stop linux-arm64 runner
    # Only run this job when the runner is allocated.
    if: ${{ always() }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    needs: [
      allocate-runners,
      build-linux-arm64-artifacts,
@@ -303,7 +303,7 @@ jobs:
    needs: [
      release-images-to-dockerhub
    ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    permissions:
      issues: write
    env:
--- a/.github/workflows/nightly-ci.yml
+++ b/.github/workflows/nightly-ci.yml
@@ -133,7 +133,7 @@ jobs:
    name: Check status
    needs: [sqlness-test, sqlness-windows, test-on-windows]
    if: ${{ github.repository == 'GreptimeTeam/greptimedb' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    outputs:
      check-result: ${{ steps.set-check-result.outputs.check-result }}
    steps:
@@ -146,7 +146,7 @@ jobs:
    if: ${{ github.repository == 'GreptimeTeam/greptimedb' && always() }} # Not requiring successful dependent jobs, always run.
    name: Send notification to Greptime team
    needs: [check-status]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    env:
      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_DEVELOP_CHANNEL }}
    steps:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,11 +18,11 @@ on:
        description: The runner uses to build linux-amd64 artifacts
        default: ec2-c6i.4xlarge-amd64
        options:
-          - ubuntu-20.04
-          - ubuntu-20.04-8-cores
-          - ubuntu-20.04-16-cores
-          - ubuntu-20.04-32-cores
-          - ubuntu-20.04-64-cores
+          - ubuntu-22.04
+          - ubuntu-22.04-8-cores
+          - ubuntu-22.04-16-cores
+          - ubuntu-22.04-32-cores
+          - ubuntu-22.04-64-cores
          - ec2-c6i.xlarge-amd64 # 4C8G
          - ec2-c6i.2xlarge-amd64 # 8C16G
          - ec2-c6i.4xlarge-amd64 # 16C32G
@@ -91,13 +91,13 @@ env:
  # The scheduled version is '${{ env.NEXT_RELEASE_VERSION }}-nightly-YYYYMMDD', like v0.2.0-nigthly-20230313;
  NIGHTLY_RELEASE_PREFIX: nightly
  # Note: The NEXT_RELEASE_VERSION should be modified manually by every formal release.
-  NEXT_RELEASE_VERSION: v0.13.0
+  NEXT_RELEASE_VERSION: v0.12.0

 jobs:
  allocate-runners:
    name: Allocate runners
    if: ${{ github.repository == 'GreptimeTeam/greptimedb' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    outputs:
      linux-amd64-runner: ${{ steps.start-linux-amd64-runner.outputs.label }}
      linux-arm64-runner: ${{ steps.start-linux-arm64-runner.outputs.label }}
@@ -335,7 +335,7 @@ jobs:
      build-windows-artifacts,
      release-images-to-dockerhub,
    ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    # When we push to ACR, it's easy to fail due to some unknown network issues.
    # However, we don't want to fail the whole workflow because of this.
    # The ACR have daily sync with DockerHub, so don't worry about the image not being updated.
@@ -377,7 +377,7 @@ jobs:
      build-windows-artifacts,
      release-images-to-dockerhub,
    ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v4
        with:
@@ -396,7 +396,7 @@ jobs:
    name: Stop linux-amd64 runner
    # Only run this job when the runner is allocated.
    if: ${{ always() }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    needs: [
      allocate-runners,
      build-linux-amd64-artifacts,
@@ -422,7 +422,7 @@ jobs:
    name: Stop linux-arm64 runner
    # Only run this job when the runner is allocated.
    if: ${{ always() }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    needs: [
      allocate-runners,
      build-linux-arm64-artifacts,
@@ -448,7 +448,7 @@ jobs:
    name: Bump doc version
    if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
    needs: [allocate-runners]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    # Permission reference: https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
    permissions:
      issues: write # Allows the action to create issues for cyborg.
@@ -475,7 +475,7 @@ jobs:
      build-macos-artifacts,
      build-windows-artifacts,
    ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    # Permission reference: https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
    permissions:
      issues: write # Allows the action to create issues for cyborg.
--- a/.github/workflows/semantic-pull-request.yml
+++ b/.github/workflows/semantic-pull-request.yml
@@ -7,13 +7,9 @@ on:
      - reopened
      - edited

-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
  check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v4
--- a/AUTHOR.md
+++ b/AUTHOR.md
@@ -3,28 +3,30 @@
 ## Individual Committers (in alphabetical order)

 * [CookiePieWw](https://github.com/CookiePieWw)
+* [KKould](https://github.com/KKould)
+* [NiwakaDev](https://github.com/NiwakaDev)
 * [etolbakov](https://github.com/etolbakov)
 * [irenjj](https://github.com/irenjj)
-* [KKould](https://github.com/KKould)
-* [Lanqing Yang](https://github.com/lyang24)
-* [NiwakaDev](https://github.com/NiwakaDev)
 * [tisonkun](https://github.com/tisonkun)
-
+* [Lanqing Yang](https://github.com/lyang24)

 ## Team Members (in alphabetical order)

+* [Breeze-P](https://github.com/Breeze-P)
+* [GrepTime](https://github.com/GrepTime)
+* [MichaelScofield](https://github.com/MichaelScofield)
+* [Wenjie0329](https://github.com/Wenjie0329)
+* [WenyXu](https://github.com/WenyXu)
+* [ZonaHex](https://github.com/ZonaHex)
 * [apdong2022](https://github.com/apdong2022)
 * [beryl678](https://github.com/beryl678)
-* [Breeze-P](https://github.com/Breeze-P)
 * [daviderli614](https://github.com/daviderli614)
 * [discord9](https://github.com/discord9)
 * [evenyag](https://github.com/evenyag)
 * [fengjiachun](https://github.com/fengjiachun)
 * [fengys1996](https://github.com/fengys1996)
-* [GrepTime](https://github.com/GrepTime)
 * [holalengyu](https://github.com/holalengyu)
 * [killme2008](https://github.com/killme2008)
-* [MichaelScofield](https://github.com/MichaelScofield)
 * [nicecui](https://github.com/nicecui)
 * [paomian](https://github.com/paomian)
 * [shuiyisong](https://github.com/shuiyisong)
@@ -32,14 +34,11 @@
 * [sunng87](https://github.com/sunng87)
 * [v0y4g3r](https://github.com/v0y4g3r)
 * [waynexia](https://github.com/waynexia)
-* [Wenjie0329](https://github.com/Wenjie0329)
-* [WenyXu](https://github.com/WenyXu)
 * [xtang](https://github.com/xtang)
 * [zhaoyingnan01](https://github.com/zhaoyingnan01)
 * [zhongzc](https://github.com/zhongzc)
-* [ZonaHex](https://github.com/ZonaHex)
 * [zyy17](https://github.com/zyy17)

 ## All Contributors

-To see the full list of contributors, please visit our [Contributors page](https://github.com/GreptimeTeam/greptimedb/graphs/contributors)
+[![All Contributors](https://contrib.rocks/image?repo=GreptimeTeam/greptimedb)](https://github.com/GreptimeTeam/greptimedb/graphs/contributors)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -185,7 +185,7 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"

 [[package]]
 name = "api"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "common-base",
 "common-decimal",
@@ -432,7 +432,7 @@ dependencies = [
 "arrow-schema",
 "chrono",
 "half",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "lexical-core",
 "num",
 "serde",
@@ -710,7 +710,7 @@ dependencies = [

 [[package]]
 name = "auth"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "async-trait",
@@ -1324,7 +1324,7 @@ dependencies = [

 [[package]]
 name = "cache"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "catalog",
 "common-error",
@@ -1348,7 +1348,7 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "catalog"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "arrow",
@@ -1475,7 +1475,7 @@ version = "0.13.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6026d8cd82ada8bbcfe337805dd1eb6afdc9e80fa4d57e977b3a36315e0c5525"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "lazy_static",
 "num-traits",
 "regex",
@@ -1661,7 +1661,7 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"

 [[package]]
 name = "cli"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-trait",
 "auth",
@@ -1703,7 +1703,7 @@ dependencies = [
 "session",
 "snafu 0.8.5",
 "store-api",
- "substrait 0.13.0",
+ "substrait 0.12.1",
 "table",
 "tempfile",
 "tokio",
@@ -1712,7 +1712,7 @@ dependencies = [

 [[package]]
 name = "client"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "arc-swap",
@@ -1739,7 +1739,7 @@ dependencies = [
 "rand",
 "serde_json",
 "snafu 0.8.5",
- "substrait 0.13.0",
+ "substrait 0.12.1",
 "substrait 0.37.3",
 "tokio",
 "tokio-stream",
@@ -1780,7 +1780,7 @@ dependencies = [

 [[package]]
 name = "cmd"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-trait",
 "auth",
@@ -1841,7 +1841,7 @@ dependencies = [
 "similar-asserts",
 "snafu 0.8.5",
 "store-api",
- "substrait 0.13.0",
+ "substrait 0.12.1",
 "table",
 "temp-env",
 "tempfile",
@@ -1887,7 +1887,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"

 [[package]]
 name = "common-base"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "anymap2",
 "async-trait",
@@ -1909,11 +1909,11 @@ dependencies = [

 [[package]]
 name = "common-catalog"
-version = "0.13.0"
+version = "0.12.1"

 [[package]]
 name = "common-config"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "common-base",
 "common-error",
@@ -1938,7 +1938,7 @@ dependencies = [

 [[package]]
 name = "common-datasource"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "arrow",
 "arrow-schema",
@@ -1974,7 +1974,7 @@ dependencies = [

 [[package]]
 name = "common-decimal"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "bigdecimal 0.4.5",
 "common-error",
@@ -1987,7 +1987,7 @@ dependencies = [

 [[package]]
 name = "common-error"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "http 1.1.0",
 "snafu 0.8.5",
@@ -1997,7 +1997,7 @@ dependencies = [

 [[package]]
 name = "common-frontend"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-trait",
 "common-error",
@@ -2007,14 +2007,12 @@ dependencies = [

 [[package]]
 name = "common-function"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
- "ahash 0.8.11",
 "api",
 "approx 0.5.1",
 "arc-swap",
 "async-trait",
- "bincode",
 "common-base",
 "common-catalog",
 "common-error",
@@ -2026,15 +2024,12 @@ dependencies = [
 "common-time",
 "common-version",
 "datafusion",
- "datafusion-common",
- "datafusion-expr",
 "datatypes",
 "derive_more",
 "geo",
 "geo-types",
 "geohash",
 "h3o",
- "hyperloglogplus",
 "jsonb",
 "nalgebra 0.33.2",
 "num",
@@ -2051,13 +2046,12 @@ dependencies = [
 "store-api",
 "table",
 "tokio",
- "uddsketch",
 "wkt",
 ]

 [[package]]
 name = "common-greptimedb-telemetry"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-trait",
 "common-runtime",
@@ -2074,7 +2068,7 @@ dependencies = [

 [[package]]
 name = "common-grpc"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "arrow-flight",
@@ -2102,7 +2096,7 @@ dependencies = [

 [[package]]
 name = "common-grpc-expr"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "common-base",
@@ -2121,7 +2115,7 @@ dependencies = [

 [[package]]
 name = "common-macro"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "arc-swap",
 "common-query",
@@ -2135,7 +2129,7 @@ dependencies = [

 [[package]]
 name = "common-mem-prof"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "common-error",
 "common-macro",
@@ -2148,7 +2142,7 @@ dependencies = [

 [[package]]
 name = "common-meta"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "anymap2",
 "api",
@@ -2208,7 +2202,7 @@ dependencies = [

 [[package]]
 name = "common-options"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "common-grpc",
 "humantime-serde",
@@ -2217,11 +2211,11 @@ dependencies = [

 [[package]]
 name = "common-plugins"
-version = "0.13.0"
+version = "0.12.1"

 [[package]]
 name = "common-pprof"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "common-error",
 "common-macro",
@@ -2233,7 +2227,7 @@ dependencies = [

 [[package]]
 name = "common-procedure"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -2260,7 +2254,7 @@ dependencies = [

 [[package]]
 name = "common-procedure-test"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-trait",
 "common-procedure",
@@ -2268,7 +2262,7 @@ dependencies = [

 [[package]]
 name = "common-query"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "async-trait",
@@ -2294,7 +2288,7 @@ dependencies = [

 [[package]]
 name = "common-recordbatch"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "arc-swap",
 "common-error",
@@ -2313,7 +2307,7 @@ dependencies = [

 [[package]]
 name = "common-runtime"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-trait",
 "clap 4.5.19",
@@ -2343,7 +2337,7 @@ dependencies = [

 [[package]]
 name = "common-telemetry"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "atty",
 "backtrace",
@@ -2371,7 +2365,7 @@ dependencies = [

 [[package]]
 name = "common-test-util"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "client",
 "common-query",
@@ -2383,7 +2377,7 @@ dependencies = [

 [[package]]
 name = "common-time"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "arrow",
 "chrono",
@@ -2401,7 +2395,7 @@ dependencies = [

 [[package]]
 name = "common-version"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "build-data",
 "const_format",
@@ -2411,7 +2405,7 @@ dependencies = [

 [[package]]
 name = "common-wal"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "common-base",
 "common-error",
@@ -2978,7 +2972,7 @@ dependencies = [
 "chrono",
 "half",
 "hashbrown 0.14.5",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "libc",
 "object_store",
 "parquet",
@@ -3038,7 +3032,7 @@ dependencies = [
 "datafusion-functions-aggregate-common",
 "datafusion-functions-window-common",
 "datafusion-physical-expr-common",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "paste",
 "recursive",
 "serde_json",
@@ -3160,7 +3154,7 @@ dependencies = [
 "datafusion-physical-expr-common",
 "datafusion-physical-plan",
 "half",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "log",
 "parking_lot 0.12.3",
 "paste",
@@ -3211,7 +3205,7 @@ dependencies = [
 "datafusion-common",
 "datafusion-expr",
 "datafusion-physical-expr",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "itertools 0.13.0",
 "log",
 "recursive",
@@ -3236,7 +3230,7 @@ dependencies = [
 "datafusion-physical-expr-common",
 "half",
 "hashbrown 0.14.5",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "itertools 0.13.0",
 "log",
 "paste",
@@ -3295,7 +3289,7 @@ dependencies = [
 "futures",
 "half",
 "hashbrown 0.14.5",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "itertools 0.13.0",
 "log",
 "once_cell",
@@ -3315,7 +3309,7 @@ dependencies = [
 "arrow-schema",
 "datafusion-common",
 "datafusion-expr",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "log",
 "recursive",
 "regex",
@@ -3342,7 +3336,7 @@ dependencies = [

 [[package]]
 name = "datanode"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "arrow-flight",
@@ -3394,7 +3388,7 @@ dependencies = [
 "session",
 "snafu 0.8.5",
 "store-api",
- "substrait 0.13.0",
+ "substrait 0.12.1",
 "table",
 "tokio",
 "toml 0.8.19",
@@ -3403,7 +3397,7 @@ dependencies = [

 [[package]]
 name = "datatypes"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "arrow",
 "arrow-array",
@@ -4047,7 +4041,7 @@ dependencies = [

 [[package]]
 name = "file-engine"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "async-trait",
@@ -4157,7 +4151,7 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"

 [[package]]
 name = "flow"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "arrow",
@@ -4218,7 +4212,7 @@ dependencies = [
 "snafu 0.8.5",
 "store-api",
 "strum 0.25.0",
- "substrait 0.13.0",
+ "substrait 0.12.1",
 "table",
 "tokio",
 "tonic 0.12.3",
@@ -4273,7 +4267,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"

 [[package]]
 name = "frontend"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "arc-swap",
@@ -4701,7 +4695,7 @@ dependencies = [
 [[package]]
 name = "greptime-proto"
 version = "0.1.0"
-source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=072ce580502e015df1a6b03a185b60309a7c2a7a#072ce580502e015df1a6b03a185b60309a7c2a7a"
+source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=a25adc8a01340231121646d8f0a29d0e92f45461#a25adc8a01340231121646d8f0a29d0e92f45461"
 dependencies = [
 "prost 0.13.3",
 "serde",
@@ -4724,7 +4718,7 @@ dependencies = [
 "futures-sink",
 "futures-util",
 "http 0.2.12",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "slab",
 "tokio",
 "tokio-util",
@@ -4743,7 +4737,7 @@ dependencies = [
 "futures-core",
 "futures-sink",
 "http 1.1.0",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "slab",
 "tokio",
 "tokio-util",
@@ -5293,15 +5287,6 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "hyperloglogplus"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "621debdf94dcac33e50475fdd76d34d5ea9c0362a834b9db08c3024696c1fbe3"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "i_float"
 version = "1.3.1"
@@ -5541,7 +5526,7 @@ dependencies = [

 [[package]]
 name = "index"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-trait",
 "asynchronous-codec",
@@ -5590,9 +5575,9 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
 "equivalent",
 "hashbrown 0.15.2",
@@ -5606,7 +5591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88"
 dependencies = [
 "ahash 0.8.11",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "is-terminal",
 "itoa",
 "log",
@@ -5953,7 +5938,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 ]

 [[package]]
@@ -6333,7 +6318,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

 [[package]]
 name = "log-query"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "chrono",
 "common-error",
@@ -6345,7 +6330,7 @@ dependencies = [

 [[package]]
 name = "log-store"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -6436,7 +6421,7 @@ dependencies = [
 "cactus",
 "cfgrammar",
 "filetime",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "lazy_static",
 "lrtable",
 "num-traits",
@@ -6638,7 +6623,7 @@ dependencies = [

 [[package]]
 name = "meta-client"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "async-trait",
@@ -6665,7 +6650,7 @@ dependencies = [

 [[package]]
 name = "meta-srv"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "async-trait",
@@ -6751,7 +6736,7 @@ dependencies = [

 [[package]]
 name = "metric-engine"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "aquamarine",
@@ -6849,7 +6834,7 @@ dependencies = [

 [[package]]
 name = "mito2"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "aquamarine",
@@ -7546,7 +7531,7 @@ dependencies = [

 [[package]]
 name = "object-store"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "anyhow",
 "bytes",
@@ -7677,7 +7662,7 @@ checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a"
 dependencies = [
 "futures-core",
 "futures-sink",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "js-sys",
 "once_cell",
 "pin-project-lite",
@@ -7795,7 +7780,7 @@ dependencies = [

 [[package]]
 name = "operator"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -7843,7 +7828,7 @@ dependencies = [
 "sql",
 "sqlparser 0.52.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=71dd86058d2af97b9925093d40c4e03360403170)",
 "store-api",
- "substrait 0.13.0",
+ "substrait 0.12.1",
 "table",
 "tokio",
 "tokio-util",
@@ -8080,7 +8065,7 @@ dependencies = [

 [[package]]
 name = "partition"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "async-trait",
@@ -8249,7 +8234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
 "fixedbitset",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 ]

 [[package]]
@@ -8348,7 +8333,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pipeline"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -8488,7 +8473,7 @@ dependencies = [

 [[package]]
 name = "plugins"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "auth",
 "clap 4.5.19",
@@ -8750,7 +8735,7 @@ dependencies = [

 [[package]]
 name = "promql"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "ahash 0.8.11",
 "async-trait",
@@ -8995,7 +8980,7 @@ dependencies = [

 [[package]]
 name = "puffin"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-compression 0.4.13",
 "async-trait",
@@ -9036,7 +9021,7 @@ dependencies = [

 [[package]]
 name = "query"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -9101,7 +9086,7 @@ dependencies = [
 "sqlparser 0.52.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=71dd86058d2af97b9925093d40c4e03360403170)",
 "statrs",
 "store-api",
- "substrait 0.13.0",
+ "substrait 0.12.1",
 "table",
 "tokio",
 "tokio-stream",
@@ -10340,7 +10325,7 @@ version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "itoa",
 "memchr",
 "ryu",
@@ -10411,7 +10396,7 @@ dependencies = [
 "chrono",
 "hex",
 "indexmap 1.9.3",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "serde",
 "serde_derive",
 "serde_json",
@@ -10437,7 +10422,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "itoa",
 "ryu",
 "serde",
@@ -10446,7 +10431,7 @@ dependencies = [

 [[package]]
 name = "servers"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -10498,7 +10483,6 @@ dependencies = [
 "humantime",
 "humantime-serde",
 "hyper 1.4.1",
- "indexmap 2.7.1",
 "influxdb_line_protocol",
 "itertools 0.10.5",
 "json5",
@@ -10563,7 +10547,7 @@ dependencies = [

 [[package]]
 name = "session"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "arc-swap",
@@ -10872,7 +10856,7 @@ dependencies = [

 [[package]]
 name = "sql"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "chrono",
@@ -10909,12 +10893,12 @@ dependencies = [
 [[package]]
 name = "sqlness"
 version = "0.6.1"
-source = "git+https://github.com/CeresDB/sqlness.git?rev=bb91f31ff58993e07ea89845791235138283a24c#bb91f31ff58993e07ea89845791235138283a24c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "308a7338f2211813d6e9da117e9b9b7aee5d072872d11a934002fd2bd4ab5276"
 dependencies = [
 "async-trait",
 "derive_builder 0.11.2",
 "duration-str",
- "futures",
 "minijinja",
 "prettydiff",
 "regex",
@@ -10926,7 +10910,7 @@ dependencies = [

 [[package]]
 name = "sqlness-runner"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-trait",
 "clap 4.5.19",
@@ -10940,7 +10924,6 @@ dependencies = [
 "hex",
 "local-ip-address",
 "mysql",
- "num_cpus",
 "reqwest",
 "serde",
 "serde_json",
@@ -11040,7 +11023,7 @@ dependencies = [
 "futures-util",
 "hashbrown 0.15.2",
 "hashlink",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "log",
 "memchr",
 "once_cell",
@@ -11243,7 +11226,7 @@ dependencies = [

 [[package]]
 name = "store-api"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "aquamarine",
@@ -11373,7 +11356,7 @@ dependencies = [

 [[package]]
 name = "substrait"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "async-trait",
 "bytes",
@@ -11554,7 +11537,7 @@ dependencies = [

 [[package]]
 name = "table"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "async-trait",
@@ -11805,7 +11788,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"

 [[package]]
 name = "tests-fuzz"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "arbitrary",
 "async-trait",
@@ -11849,7 +11832,7 @@ dependencies = [

 [[package]]
 name = "tests-integration"
-version = "0.13.0"
+version = "0.12.1"
 dependencies = [
 "api",
 "arrow-flight",
@@ -11915,7 +11898,7 @@ dependencies = [
 "sql",
 "sqlx",
 "store-api",
- "substrait 0.13.0",
+ "substrait 0.12.1",
 "table",
 "tempfile",
 "time",
@@ -12336,7 +12319,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "toml_datetime",
 "winnow 0.5.40",
 ]
@@ -12347,7 +12330,7 @@ version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "serde",
 "serde_spanned",
 "toml_datetime",
@@ -12485,7 +12468,7 @@ dependencies = [
 "futures-core",
 "futures-util",
 "hdrhistogram",
- "indexmap 2.7.1",
+ "indexmap 2.6.0",
 "pin-project-lite",
 "slab",
 "sync_wrapper 1.0.1",
@@ -12973,14 +12956,6 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"

-[[package]]
-name = "uddsketch"
-version = "0.1.0"
-source = "git+https://github.com/GreptimeTeam/timescaledb-toolkit.git?rev=84828fe8fb494a6a61412a3da96517fc80f7bb20#84828fe8fb494a6a61412a3da96517fc80f7bb20"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "unescaper"
 version = "0.1.5"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,7 +67,7 @@ members = [
 resolver = "2"

 [workspace.package]
-version = "0.13.0"
+version = "0.12.1"
 edition = "2021"
 license = "Apache-2.0"

@@ -129,7 +129,7 @@ etcd-client = "0.14"
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "072ce580502e015df1a6b03a185b60309a7c2a7a" }
+greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "a25adc8a01340231121646d8f0a29d0e92f45461" }
 hex = "0.4"
 http = "1"
 humantime = "2.1"
--- a/2
+++ b/2
@@ -60,8 +60,6 @@ ifeq ($(BUILDX_MULTI_PLATFORM_BUILD), all)
 	BUILDX_MULTI_PLATFORM_BUILD_OPTS := --platform linux/amd64,linux/arm64 --push
 else ifeq ($(BUILDX_MULTI_PLATFORM_BUILD), amd64)
 	BUILDX_MULTI_PLATFORM_BUILD_OPTS := --platform linux/amd64 --push
-else ifeq ($(BUILDX_MULTI_PLATFORM_BUILD), arm64)
-        BUILDX_MULTI_PLATFORM_BUILD_OPTS := --platform linux/arm64 --push
 else
 	BUILDX_MULTI_PLATFORM_BUILD_OPTS := -o type=docker
 endif
--- a/config/config.md
+++ b/config/config.md
@@ -319,7 +319,6 @@
 | `selector` | String | `round_robin` | Datanode selector type.<br/>- `round_robin` (default value)<br/>- `lease_based`<br/>- `load_based`<br/>For details, please see "https://docs.greptime.com/developer-guide/metasrv/selector". |
 | `use_memory_store` | Bool | `false` | Store data in memory. |
 | `enable_region_failover` | Bool | `false` | Whether to enable region failover.<br/>This feature is only available on GreptimeDB running on cluster mode and<br/>- Using Remote WAL<br/>- Using shared storage (e.g., s3). |
-| `node_max_idle_time` | String | `24hours` | Max allowed idle time before removing node info from metasrv memory. |
 | `enable_telemetry` | Bool | `true` | Whether to enable greptimedb telemetry. Enabled by default. |
 | `runtime` | -- | -- | The runtime options. |
 | `runtime.global_rt_size` | Integer | `8` | The number of threads to execute the runtime for global read operations. |
--- a/config/metasrv.example.toml
+++ b/config/metasrv.example.toml
@@ -50,9 +50,6 @@ use_memory_store = false
 ## - Using shared storage (e.g., s3).
 enable_region_failover = false

-## Max allowed idle time before removing node info from metasrv memory.
-node_max_idle_time = "24hours"
-
 ## Whether to enable greptimedb telemetry. Enabled by default.
 #+ enable_telemetry = true

--- a/docker/dev-builder/ubuntu/Dockerfile
+++ b/docker/dev-builder/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:20.04

 # The root path under which contains all the dependencies to build this Dockerfile.
 ARG DOCKER_BUILD_ROOT=.
@@ -41,7 +41,7 @@ RUN mv protoc3/include/* /usr/local/include/
 # and the repositories are pulled from trusted sources (still us, of course). Doing so does not violate the intention
 # of the Git's addition to the "safe.directory" at the first place (see the commit message here:
 # https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9).
-# There's also another solution to this, that we add the desired submodules to the safe directory, instead of using
+# There's also another solution to this, that we add the desired submodules to the safe directory, instead of using 
 # wildcard here. However, that requires the git's config files and the submodules all owned by the very same user.
 # It's troublesome to do this since the dev build runs in Docker, which is under user "root"; while outside the Docker,
 # it can be a different user that have prepared the submodules.
--- a/docker/dev-builder/ubuntu/Dockerfile-18.10
+++ b/docker/dev-builder/ubuntu/Dockerfile-18.10
@@ -0,0 +1,51 @@
+# Use the legacy glibc 2.28.
+FROM ubuntu:18.10
+
+ENV LANG en_US.utf8
+WORKDIR /greptimedb
+
+# Use old-releases.ubuntu.com to avoid 404s: https://help.ubuntu.com/community/EOLUpgrades.
+RUN echo "deb http://old-releases.ubuntu.com/ubuntu/ cosmic main restricted universe multiverse\n\
+deb http://old-releases.ubuntu.com/ubuntu/ cosmic-updates main restricted universe multiverse\n\
+deb http://old-releases.ubuntu.com/ubuntu/ cosmic-security main restricted universe multiverse" > /etc/apt/sources.list
+
+# Install dependencies.
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    libssl-dev \
+    tzdata \
+    curl \
+    ca-certificates \
+    git \
+    build-essential \
+    unzip \
+    pkg-config
+
+# Install protoc.
+ENV PROTOC_VERSION=29.3
+RUN if [ "$(uname -m)" = "x86_64" ]; then \
+        PROTOC_ZIP=protoc-${PROTOC_VERSION}-linux-x86_64.zip; \
+    elif [ "$(uname -m)" = "aarch64" ]; then \
+        PROTOC_ZIP=protoc-${PROTOC_VERSION}-linux-aarch_64.zip; \
+    else \
+        echo "Unsupported architecture"; exit 1; \
+    fi && \
+    curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/${PROTOC_ZIP} && \
+    unzip -o ${PROTOC_ZIP} -d /usr/local bin/protoc && \
+    unzip -o ${PROTOC_ZIP} -d /usr/local 'include/*' && \
+    rm -f ${PROTOC_ZIP}
+
+# Install Rust.
+SHELL ["/bin/bash", "-c"]
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain none -y
+ENV PATH /root/.cargo/bin/:$PATH
+
+# Install Rust toolchains.
+ARG RUST_TOOLCHAIN
+RUN rustup toolchain install ${RUST_TOOLCHAIN}
+
+# Install cargo-binstall with a specific version to adapt the current rust toolchain.
+# Note: if we use the latest version, we may encounter the following `use of unstable library feature 'io_error_downcast'` error.
+RUN cargo install cargo-binstall --version 1.6.6 --locked
+
+# Install nextest.
+RUN cargo binstall cargo-nextest --no-confirm
--- a/docker/dev-builder/ubuntu/Dockerfile-20.04
+++ b/docker/dev-builder/ubuntu/Dockerfile-20.04
@@ -1,66 +0,0 @@
-FROM ubuntu:20.04
-
-# The root path under which contains all the dependencies to build this Dockerfile.
-ARG DOCKER_BUILD_ROOT=.
-
-ENV LANG en_US.utf8
-WORKDIR /greptimedb
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common
-# Install dependencies.
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    libssl-dev \
-    tzdata \
-    curl \
-    unzip \
-    ca-certificates \
-    git \
-    build-essential \
-    pkg-config
-
-ARG TARGETPLATFORM
-RUN echo "target platform: $TARGETPLATFORM"
-
-ARG PROTOBUF_VERSION=29.3
-
-# Install protobuf, because the one in the apt is too old (v3.12).
-RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
-    curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-aarch_64.zip && \
-    unzip protoc-${PROTOBUF_VERSION}-linux-aarch_64.zip -d protoc3; \
-elif [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
-    curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip && \
-    unzip protoc-${PROTOBUF_VERSION}-linux-x86_64.zip -d protoc3; \
-fi
-RUN mv protoc3/bin/* /usr/local/bin/
-RUN mv protoc3/include/* /usr/local/include/
-
-# 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),
-# and the repositories are pulled from trusted sources (still us, of course). Doing so does not violate the intention
-# of the Git's addition to the "safe.directory" at the first place (see the commit message here:
-# https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9).
-# There's also another solution to this, that we add the desired submodules to the safe directory, instead of using
-# wildcard here. However, that requires the git's config files and the submodules all owned by the very same user.
-# It's troublesome to do this since the dev build runs in Docker, which is under user "root"; while outside the Docker,
-# it can be a different user that have prepared the submodules.
-RUN git config --global --add safe.directory '*'
-
-# Install Rust.
-SHELL ["/bin/bash", "-c"]
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain none -y
-ENV PATH /root/.cargo/bin/:$PATH
-
-# Install Rust toolchains.
-ARG RUST_TOOLCHAIN
-RUN rustup toolchain install ${RUST_TOOLCHAIN}
-
-# Install cargo-binstall with a specific version to adapt the current rust toolchain.
-# Note: if we use the latest version, we may encounter the following `use of unstable library feature 'io_error_downcast'` error.
-# compile from source take too long, so we use the precompiled binary instead
-COPY $DOCKER_BUILD_ROOT/docker/dev-builder/binstall/pull_binstall.sh /usr/local/bin/pull_binstall.sh
-RUN chmod +x /usr/local/bin/pull_binstall.sh && /usr/local/bin/pull_binstall.sh
-
-# Install nextest.
-RUN cargo binstall cargo-nextest --no-confirm
--- a/docs/benchmarks/tsbs/v0.12.0.md
+++ b/docs/benchmarks/tsbs/v0.12.0.md
@@ -1,40 +0,0 @@
-# TSBS benchmark - v0.12.0
-
-## Environment
-
-### Amazon EC2
-
-|         |                         |
-|---------|-------------------------|
-| Machine | c5d.2xlarge             |
-| CPU     | 8 core                  |
-| Memory  | 16GB                    |
-| Disk    | 100GB (GP3)             |
-| OS      | Ubuntu Server 24.04 LTS |
-
-## Write performance
-
-| Environment     | Ingest rate (rows/s) |
-|-----------------|----------------------|
-| EC2 c5d.2xlarge | 326839.28            |
-
-## Query performance
-
-| Query type            | EC2 c5d.2xlarge (ms) |
-|-----------------------|----------------------|
-| cpu-max-all-1         | 12.46                |
-| cpu-max-all-8         | 24.20                |
-| double-groupby-1      | 673.08               |
-| double-groupby-5      | 963.99               |
-| double-groupby-all    | 1330.05              |
-| groupby-orderby-limit | 952.46               |
-| high-cpu-1            | 5.08                 |
-| high-cpu-all          | 4638.57              |
-| lastpoint             | 591.02               |
-| single-groupby-1-1-1  | 4.06                 |
-| single-groupby-1-1-12 | 4.73                 |
-| single-groupby-1-8-1  | 8.23                 |
-| single-groupby-5-1-1  | 4.61                 |
-| single-groupby-5-1-12 | 5.61                 |
-| single-groupby-5-8-1  | 9.74                 |
-
--- a/src/api/src/v1/column_def.rs
+++ b/src/api/src/v1/column_def.rs
@@ -15,8 +15,8 @@
 use std::collections::HashMap;

 use datatypes::schema::{
-    ColumnDefaultConstraint, ColumnSchema, FulltextAnalyzer, FulltextOptions, SkippingIndexOptions,
-    SkippingIndexType, COMMENT_KEY, FULLTEXT_KEY, INVERTED_INDEX_KEY, SKIPPING_INDEX_KEY,
+    ColumnDefaultConstraint, ColumnSchema, FulltextAnalyzer, FulltextOptions, SkippingIndexType,
+    COMMENT_KEY, FULLTEXT_KEY, INVERTED_INDEX_KEY, SKIPPING_INDEX_KEY,
 };
 use greptime_proto::v1::{Analyzer, SkippingIndexType as PbSkippingIndexType};
 use snafu::ResultExt;
@@ -103,13 +103,6 @@ pub fn contains_fulltext(options: &Option<ColumnOptions>) -> bool {
        .is_some_and(|o| o.options.contains_key(FULLTEXT_GRPC_KEY))
 }

-/// Checks if the `ColumnOptions` contains skipping index options.
-pub fn contains_skipping(options: &Option<ColumnOptions>) -> bool {
-    options
-        .as_ref()
-        .is_some_and(|o| o.options.contains_key(SKIPPING_INDEX_GRPC_KEY))
-}
-
 /// Tries to construct a `ColumnOptions` from the given `FulltextOptions`.
 pub fn options_from_fulltext(fulltext: &FulltextOptions) -> Result<Option<ColumnOptions>> {
    let mut options = ColumnOptions::default();
@@ -120,18 +113,6 @@ pub fn options_from_fulltext(fulltext: &FulltextOptions) -> Result<Option<Column
    Ok((!options.options.is_empty()).then_some(options))
 }

-/// Tries to construct a `ColumnOptions` from the given `SkippingIndexOptions`.
-pub fn options_from_skipping(skipping: &SkippingIndexOptions) -> Result<Option<ColumnOptions>> {
-    let mut options = ColumnOptions::default();
-
-    let v = serde_json::to_string(skipping).context(error::SerializeJsonSnafu)?;
-    options
-        .options
-        .insert(SKIPPING_INDEX_GRPC_KEY.to_string(), v);
-
-    Ok((!options.options.is_empty()).then_some(options))
-}
-
 /// Tries to construct a `FulltextAnalyzer` from the given analyzer.
 pub fn as_fulltext_option(analyzer: Analyzer) -> FulltextAnalyzer {
    match analyzer {
--- a/src/catalog/src/system_schema/information_schema/tables.rs
+++ b/src/catalog/src/system_schema/information_schema/tables.rs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::collections::HashSet;
 use std::sync::{Arc, Weak};

 use arrow_schema::SchemaRef as ArrowSchemaRef;
@@ -244,14 +243,17 @@ impl InformationSchemaTablesBuilder {
        // TODO(dennis): `region_stats` API is not stable in distributed cluster because of network issue etc.
        // But we don't want the statements such as `show tables` fail,
        // so using `unwrap_or_else` here instead of `?` operator.
-        let region_stats = information_extension
-            .region_stats()
-            .await
-            .map_err(|e| {
-                error!(e; "Failed to call region_stats");
-                e
-            })
-            .unwrap_or_else(|_| vec![]);
+        let region_stats = {
+            let mut x = information_extension
+                .region_stats()
+                .await
+                .unwrap_or_else(|e| {
+                    error!(e; "Failed to find region stats in information_schema, fallback to all empty");
+                    vec![]
+                });
+            x.sort_unstable_by_key(|x| x.id);
+            x
+        };

        for schema_name in catalog_manager.schema_names(&catalog_name, None).await? {
            let mut stream = catalog_manager.tables(&catalog_name, &schema_name, None);
@@ -262,16 +264,16 @@ impl InformationSchemaTablesBuilder {
                // TODO(dennis): make it working for metric engine
                let table_region_stats =
                    if table_info.meta.engine == MITO_ENGINE || table_info.is_physical_table() {
-                        let region_ids = table_info
+                        table_info
                            .meta
                            .region_numbers
                            .iter()
                            .map(|n| RegionId::new(table_info.ident.table_id, *n))
-                            .collect::<HashSet<_>>();
-
-                        region_stats
-                            .iter()
-                            .filter(|stat| region_ids.contains(&stat.id))
+                            .flat_map(|region_id| {
+                                region_stats
+                                    .binary_search_by_key(&region_id, |x| x.id)
+                                    .map(|i| &region_stats[i])
+                            })
                            .collect::<Vec<_>>()
                    } else {
                        vec![]
--- a/src/common/function/Cargo.toml
+++ b/src/common/function/Cargo.toml
@@ -12,11 +12,9 @@ default = ["geo"]
 geo = ["geohash", "h3o", "s2", "wkt", "geo-types", "dep:geo"]

 [dependencies]
-ahash = "0.8"
 api.workspace = true
 arc-swap = "1.0"
 async-trait.workspace = true
-bincode = "1.3"
 common-base.workspace = true
 common-catalog.workspace = true
 common-error.workspace = true
@@ -28,15 +26,12 @@ common-telemetry.workspace = true
 common-time.workspace = true
 common-version.workspace = true
 datafusion.workspace = true
-datafusion-common.workspace = true
-datafusion-expr.workspace = true
 datatypes.workspace = true
 derive_more = { version = "1", default-features = false, features = ["display"] }
 geo = { version = "0.29", optional = true }
 geo-types = { version = "0.7", optional = true }
 geohash = { version = "0.13", optional = true }
 h3o = { version = "0.6", optional = true }
-hyperloglogplus = "0.4"
 jsonb.workspace = true
 nalgebra.workspace = true
 num = "0.4"
@@ -52,7 +47,6 @@ sql.workspace = true
 statrs = "0.16"
 store-api.workspace = true
 table.workspace = true
-uddsketch = { git = "https://github.com/GreptimeTeam/timescaledb-toolkit.git", rev = "84828fe8fb494a6a61412a3da96517fc80f7bb20" }
 wkt = { version = "0.11", optional = true }

 [dev-dependencies]
--- a/src/common/function/src/aggr.rs
+++ b/src/common/function/src/aggr.rs
@@ -1,22 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-mod geo_path;
-mod hll;
-mod uddsketch_state;
-
-pub use geo_path::{GeoPathAccumulator, GEO_PATH_NAME};
-pub(crate) use hll::HllStateType;
-pub use hll::{HllState, HLL_MERGE_NAME, HLL_NAME};
-pub use uddsketch_state::{UddSketchState, UDDSKETCH_STATE_NAME};
--- a/src/common/function/src/aggr/geo_path.rs
+++ b/src/common/function/src/aggr/geo_path.rs
@@ -1,433 +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 datafusion::arrow::array::{Array, ArrayRef};
-use datafusion::common::cast::as_primitive_array;
-use datafusion::error::{DataFusionError, Result as DfResult};
-use datafusion::logical_expr::{Accumulator as DfAccumulator, AggregateUDF, Volatility};
-use datafusion::prelude::create_udaf;
-use datafusion_common::cast::{as_list_array, as_struct_array};
-use datafusion_common::utils::SingleRowListArrayBuilder;
-use datafusion_common::ScalarValue;
-use datatypes::arrow::array::{Float64Array, Int64Array, ListArray, StructArray};
-use datatypes::arrow::datatypes::{
-    DataType, Field, Float64Type, Int64Type, TimeUnit, TimestampNanosecondType,
-};
-use datatypes::compute::{self, sort_to_indices};
-
-pub const GEO_PATH_NAME: &str = "geo_path";
-
-const LATITUDE_FIELD: &str = "lat";
-const LONGITUDE_FIELD: &str = "lng";
-const TIMESTAMP_FIELD: &str = "timestamp";
-const DEFAULT_LIST_FIELD_NAME: &str = "item";
-
-#[derive(Debug, Default)]
-pub struct GeoPathAccumulator {
-    lat: Vec<Option<f64>>,
-    lng: Vec<Option<f64>>,
-    timestamp: Vec<Option<i64>>,
-}
-
-impl GeoPathAccumulator {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn udf_impl() -> AggregateUDF {
-        create_udaf(
-            GEO_PATH_NAME,
-            // Input types: lat, lng, timestamp
-            vec![
-                DataType::Float64,
-                DataType::Float64,
-                DataType::Timestamp(TimeUnit::Nanosecond, None),
-            ],
-            // Output type: list of points {[lat], [lng]}
-            Arc::new(DataType::Struct(
-                vec![
-                    Field::new(
-                        LATITUDE_FIELD,
-                        DataType::List(Arc::new(Field::new(
-                            DEFAULT_LIST_FIELD_NAME,
-                            DataType::Float64,
-                            true,
-                        ))),
-                        false,
-                    ),
-                    Field::new(
-                        LONGITUDE_FIELD,
-                        DataType::List(Arc::new(Field::new(
-                            DEFAULT_LIST_FIELD_NAME,
-                            DataType::Float64,
-                            true,
-                        ))),
-                        false,
-                    ),
-                ]
-                .into(),
-            )),
-            Volatility::Immutable,
-            // Create the accumulator
-            Arc::new(|_| Ok(Box::new(GeoPathAccumulator::new()))),
-            // Intermediate state types
-            Arc::new(vec![DataType::Struct(
-                vec![
-                    Field::new(
-                        LATITUDE_FIELD,
-                        DataType::List(Arc::new(Field::new(
-                            DEFAULT_LIST_FIELD_NAME,
-                            DataType::Float64,
-                            true,
-                        ))),
-                        false,
-                    ),
-                    Field::new(
-                        LONGITUDE_FIELD,
-                        DataType::List(Arc::new(Field::new(
-                            DEFAULT_LIST_FIELD_NAME,
-                            DataType::Float64,
-                            true,
-                        ))),
-                        false,
-                    ),
-                    Field::new(
-                        TIMESTAMP_FIELD,
-                        DataType::List(Arc::new(Field::new(
-                            DEFAULT_LIST_FIELD_NAME,
-                            DataType::Int64,
-                            true,
-                        ))),
-                        false,
-                    ),
-                ]
-                .into(),
-            )]),
-        )
-    }
-}
-
-impl DfAccumulator for GeoPathAccumulator {
-    fn update_batch(&mut self, values: &[ArrayRef]) -> datafusion::error::Result<()> {
-        if values.len() != 3 {
-            return Err(DataFusionError::Internal(format!(
-                "Expected 3 columns for geo_path, got {}",
-                values.len()
-            )));
-        }
-
-        let lat_array = as_primitive_array::<Float64Type>(&values[0])?;
-        let lng_array = as_primitive_array::<Float64Type>(&values[1])?;
-        let ts_array = as_primitive_array::<TimestampNanosecondType>(&values[2])?;
-
-        let size = lat_array.len();
-        self.lat.reserve(size);
-        self.lng.reserve(size);
-
-        for idx in 0..size {
-            self.lat.push(if lat_array.is_null(idx) {
-                None
-            } else {
-                Some(lat_array.value(idx))
-            });
-
-            self.lng.push(if lng_array.is_null(idx) {
-                None
-            } else {
-                Some(lng_array.value(idx))
-            });
-
-            self.timestamp.push(if ts_array.is_null(idx) {
-                None
-            } else {
-                Some(ts_array.value(idx))
-            });
-        }
-
-        Ok(())
-    }
-
-    fn evaluate(&mut self) -> DfResult<ScalarValue> {
-        let unordered_lng_array = Float64Array::from(self.lng.clone());
-        let unordered_lat_array = Float64Array::from(self.lat.clone());
-        let ts_array = Int64Array::from(self.timestamp.clone());
-
-        let ordered_indices = sort_to_indices(&ts_array, None, None)?;
-        let lat_array = compute::take(&unordered_lat_array, &ordered_indices, None)?;
-        let lng_array = compute::take(&unordered_lng_array, &ordered_indices, None)?;
-
-        let lat_list = Arc::new(SingleRowListArrayBuilder::new(lat_array).build_list_array());
-        let lng_list = Arc::new(SingleRowListArrayBuilder::new(lng_array).build_list_array());
-
-        let result = ScalarValue::Struct(Arc::new(StructArray::new(
-            vec![
-                Field::new(
-                    LATITUDE_FIELD,
-                    DataType::List(Arc::new(Field::new("item", DataType::Float64, true))),
-                    false,
-                ),
-                Field::new(
-                    LONGITUDE_FIELD,
-                    DataType::List(Arc::new(Field::new("item", DataType::Float64, true))),
-                    false,
-                ),
-            ]
-            .into(),
-            vec![lat_list, lng_list],
-            None,
-        )));
-
-        Ok(result)
-    }
-
-    fn size(&self) -> usize {
-        // Base size of GeoPathAccumulator struct fields
-        let mut total_size = std::mem::size_of::<Self>();
-
-        // Size of vectors (approximation)
-        total_size += self.lat.capacity() * std::mem::size_of::<Option<f64>>();
-        total_size += self.lng.capacity() * std::mem::size_of::<Option<f64>>();
-        total_size += self.timestamp.capacity() * std::mem::size_of::<Option<i64>>();
-
-        total_size
-    }
-
-    fn state(&mut self) -> datafusion::error::Result<Vec<ScalarValue>> {
-        let lat_array = Arc::new(ListArray::from_iter_primitive::<Float64Type, _, _>(vec![
-            Some(self.lat.clone()),
-        ]));
-        let lng_array = Arc::new(ListArray::from_iter_primitive::<Float64Type, _, _>(vec![
-            Some(self.lng.clone()),
-        ]));
-        let ts_array = Arc::new(ListArray::from_iter_primitive::<Int64Type, _, _>(vec![
-            Some(self.timestamp.clone()),
-        ]));
-
-        let state_struct = StructArray::new(
-            vec![
-                Field::new(
-                    LATITUDE_FIELD,
-                    DataType::List(Arc::new(Field::new("item", DataType::Float64, true))),
-                    false,
-                ),
-                Field::new(
-                    LONGITUDE_FIELD,
-                    DataType::List(Arc::new(Field::new("item", DataType::Float64, true))),
-                    false,
-                ),
-                Field::new(
-                    TIMESTAMP_FIELD,
-                    DataType::List(Arc::new(Field::new("item", DataType::Int64, true))),
-                    false,
-                ),
-            ]
-            .into(),
-            vec![lat_array, lng_array, ts_array],
-            None,
-        );
-
-        Ok(vec![ScalarValue::Struct(Arc::new(state_struct))])
-    }
-
-    fn merge_batch(&mut self, states: &[ArrayRef]) -> datafusion::error::Result<()> {
-        if states.len() != 1 {
-            return Err(DataFusionError::Internal(format!(
-                "Expected 1 states for geo_path, got {}",
-                states.len()
-            )));
-        }
-
-        for state in states {
-            let state = as_struct_array(state)?;
-            let lat_list = as_list_array(state.column(0))?.value(0);
-            let lat_array = as_primitive_array::<Float64Type>(&lat_list)?;
-            let lng_list = as_list_array(state.column(1))?.value(0);
-            let lng_array = as_primitive_array::<Float64Type>(&lng_list)?;
-            let ts_list = as_list_array(state.column(2))?.value(0);
-            let ts_array = as_primitive_array::<Int64Type>(&ts_list)?;
-
-            self.lat.extend(lat_array);
-            self.lng.extend(lng_array);
-            self.timestamp.extend(ts_array);
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use datafusion::arrow::array::{Float64Array, TimestampNanosecondArray};
-    use datafusion::scalar::ScalarValue;
-
-    use super::*;
-
-    #[test]
-    fn test_geo_path_basic() {
-        let mut accumulator = GeoPathAccumulator::new();
-
-        // Create test data
-        let lat_array = Arc::new(Float64Array::from(vec![1.0, 2.0, 3.0]));
-        let lng_array = Arc::new(Float64Array::from(vec![4.0, 5.0, 6.0]));
-        let ts_array = Arc::new(TimestampNanosecondArray::from(vec![100, 200, 300]));
-
-        // Update batch
-        accumulator
-            .update_batch(&[lat_array, lng_array, ts_array])
-            .unwrap();
-
-        // Evaluate
-        let result = accumulator.evaluate().unwrap();
-        if let ScalarValue::Struct(struct_array) = result {
-            // Verify structure
-            let fields = struct_array.fields().clone();
-            assert_eq!(fields.len(), 2);
-            assert_eq!(fields[0].name(), LATITUDE_FIELD);
-            assert_eq!(fields[1].name(), LONGITUDE_FIELD);
-
-            // Verify data
-            let columns = struct_array.columns();
-            assert_eq!(columns.len(), 2);
-
-            // Check latitude values
-            let lat_list = as_list_array(&columns[0]).unwrap().value(0);
-            let lat_array = as_primitive_array::<Float64Type>(&lat_list).unwrap();
-            assert_eq!(lat_array.len(), 3);
-            assert_eq!(lat_array.value(0), 1.0);
-            assert_eq!(lat_array.value(1), 2.0);
-            assert_eq!(lat_array.value(2), 3.0);
-
-            // Check longitude values
-            let lng_list = as_list_array(&columns[1]).unwrap().value(0);
-            let lng_array = as_primitive_array::<Float64Type>(&lng_list).unwrap();
-            assert_eq!(lng_array.len(), 3);
-            assert_eq!(lng_array.value(0), 4.0);
-            assert_eq!(lng_array.value(1), 5.0);
-            assert_eq!(lng_array.value(2), 6.0);
-        } else {
-            panic!("Expected Struct scalar value");
-        }
-    }
-
-    #[test]
-    fn test_geo_path_sort_by_timestamp() {
-        let mut accumulator = GeoPathAccumulator::new();
-
-        // Create test data with unordered timestamps
-        let lat_array = Arc::new(Float64Array::from(vec![1.0, 2.0, 3.0]));
-        let lng_array = Arc::new(Float64Array::from(vec![4.0, 5.0, 6.0]));
-        let ts_array = Arc::new(TimestampNanosecondArray::from(vec![300, 100, 200]));
-
-        // Update batch
-        accumulator
-            .update_batch(&[lat_array, lng_array, ts_array])
-            .unwrap();
-
-        // Evaluate
-        let result = accumulator.evaluate().unwrap();
-        if let ScalarValue::Struct(struct_array) = result {
-            // Extract arrays
-            let columns = struct_array.columns();
-
-            // Check latitude values
-            let lat_list = as_list_array(&columns[0]).unwrap().value(0);
-            let lat_array = as_primitive_array::<Float64Type>(&lat_list).unwrap();
-            assert_eq!(lat_array.len(), 3);
-            assert_eq!(lat_array.value(0), 2.0); // timestamp 100
-            assert_eq!(lat_array.value(1), 3.0); // timestamp 200
-            assert_eq!(lat_array.value(2), 1.0); // timestamp 300
-
-            // Check longitude values (should be sorted by timestamp)
-            let lng_list = as_list_array(&columns[1]).unwrap().value(0);
-            let lng_array = as_primitive_array::<Float64Type>(&lng_list).unwrap();
-            assert_eq!(lng_array.len(), 3);
-            assert_eq!(lng_array.value(0), 5.0); // timestamp 100
-            assert_eq!(lng_array.value(1), 6.0); // timestamp 200
-            assert_eq!(lng_array.value(2), 4.0); // timestamp 300
-        } else {
-            panic!("Expected Struct scalar value");
-        }
-    }
-
-    #[test]
-    fn test_geo_path_merge() {
-        let mut accumulator1 = GeoPathAccumulator::new();
-        let mut accumulator2 = GeoPathAccumulator::new();
-
-        // Create test data for first accumulator
-        let lat_array1 = Arc::new(Float64Array::from(vec![1.0]));
-        let lng_array1 = Arc::new(Float64Array::from(vec![4.0]));
-        let ts_array1 = Arc::new(TimestampNanosecondArray::from(vec![100]));
-
-        // Create test data for second accumulator
-        let lat_array2 = Arc::new(Float64Array::from(vec![2.0]));
-        let lng_array2 = Arc::new(Float64Array::from(vec![5.0]));
-        let ts_array2 = Arc::new(TimestampNanosecondArray::from(vec![200]));
-
-        // Update batches
-        accumulator1
-            .update_batch(&[lat_array1, lng_array1, ts_array1])
-            .unwrap();
-        accumulator2
-            .update_batch(&[lat_array2, lng_array2, ts_array2])
-            .unwrap();
-
-        // Get states
-        let state1 = accumulator1.state().unwrap();
-        let state2 = accumulator2.state().unwrap();
-
-        // Create a merged accumulator
-        let mut merged = GeoPathAccumulator::new();
-
-        // Extract the struct arrays from the states
-        let state_array1 = match &state1[0] {
-            ScalarValue::Struct(array) => array.clone(),
-            _ => panic!("Expected Struct scalar value"),
-        };
-
-        let state_array2 = match &state2[0] {
-            ScalarValue::Struct(array) => array.clone(),
-            _ => panic!("Expected Struct scalar value"),
-        };
-
-        // Merge state arrays
-        merged.merge_batch(&[state_array1]).unwrap();
-        merged.merge_batch(&[state_array2]).unwrap();
-
-        // Evaluate merged result
-        let result = merged.evaluate().unwrap();
-        if let ScalarValue::Struct(struct_array) = result {
-            // Extract arrays
-            let columns = struct_array.columns();
-
-            // Check latitude values
-            let lat_list = as_list_array(&columns[0]).unwrap().value(0);
-            let lat_array = as_primitive_array::<Float64Type>(&lat_list).unwrap();
-            assert_eq!(lat_array.len(), 2);
-            assert_eq!(lat_array.value(0), 1.0); // timestamp 100
-            assert_eq!(lat_array.value(1), 2.0); // timestamp 200
-
-            // Check longitude values (should be sorted by timestamp)
-            let lng_list = as_list_array(&columns[1]).unwrap().value(0);
-            let lng_array = as_primitive_array::<Float64Type>(&lng_list).unwrap();
-            assert_eq!(lng_array.len(), 2);
-            assert_eq!(lng_array.value(0), 4.0); // timestamp 100
-            assert_eq!(lng_array.value(1), 5.0); // timestamp 200
-        } else {
-            panic!("Expected Struct scalar value");
-        }
-    }
-}
--- a/src/common/function/src/aggr/hll.rs
+++ b/src/common/function/src/aggr/hll.rs
@@ -1,319 +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_query::prelude::*;
-use common_telemetry::trace;
-use datafusion::arrow::array::ArrayRef;
-use datafusion::common::cast::{as_binary_array, as_string_array};
-use datafusion::common::not_impl_err;
-use datafusion::error::{DataFusionError, Result as DfResult};
-use datafusion::logical_expr::function::AccumulatorArgs;
-use datafusion::logical_expr::{Accumulator as DfAccumulator, AggregateUDF};
-use datafusion::prelude::create_udaf;
-use datatypes::arrow::datatypes::DataType;
-use hyperloglogplus::{HyperLogLog, HyperLogLogPlus};
-
-use crate::utils::FixedRandomState;
-
-pub const HLL_NAME: &str = "hll";
-pub const HLL_MERGE_NAME: &str = "hll_merge";
-
-const DEFAULT_PRECISION: u8 = 14;
-
-pub(crate) type HllStateType = HyperLogLogPlus<String, FixedRandomState>;
-
-pub struct HllState {
-    hll: HllStateType,
-}
-
-impl std::fmt::Debug for HllState {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "HllState<Opaque>")
-    }
-}
-
-impl Default for HllState {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl HllState {
-    pub fn new() -> Self {
-        Self {
-            // Safety: the DEFAULT_PRECISION is fixed and valid
-            hll: HllStateType::new(DEFAULT_PRECISION, FixedRandomState::new()).unwrap(),
-        }
-    }
-
-    /// Create a UDF for the `hll` function.
-    ///
-    /// `hll` accepts a string column and aggregates the
-    /// values into a HyperLogLog state.
-    pub fn state_udf_impl() -> AggregateUDF {
-        create_udaf(
-            HLL_NAME,
-            vec![DataType::Utf8],
-            Arc::new(DataType::Binary),
-            Volatility::Immutable,
-            Arc::new(Self::create_accumulator),
-            Arc::new(vec![DataType::Binary]),
-        )
-    }
-
-    /// Create a UDF for the `hll_merge` function.
-    ///
-    /// `hll_merge` accepts a binary column of states generated by `hll`
-    /// and merges them into a single state.
-    pub fn merge_udf_impl() -> AggregateUDF {
-        create_udaf(
-            HLL_MERGE_NAME,
-            vec![DataType::Binary],
-            Arc::new(DataType::Binary),
-            Volatility::Immutable,
-            Arc::new(Self::create_merge_accumulator),
-            Arc::new(vec![DataType::Binary]),
-        )
-    }
-
-    fn update(&mut self, value: &str) {
-        self.hll.insert(value);
-    }
-
-    fn merge(&mut self, raw: &[u8]) {
-        if let Ok(serialized) = bincode::deserialize::<HllStateType>(raw) {
-            if let Ok(()) = self.hll.merge(&serialized) {
-                return;
-            }
-        }
-        trace!("Warning: Failed to merge HyperLogLog from {:?}", raw);
-    }
-
-    fn create_accumulator(acc_args: AccumulatorArgs) -> DfResult<Box<dyn DfAccumulator>> {
-        let data_type = acc_args.exprs[0].data_type(acc_args.schema)?;
-
-        match data_type {
-            DataType::Utf8 => Ok(Box::new(HllState::new())),
-            other => not_impl_err!("{HLL_NAME} does not support data type: {other}"),
-        }
-    }
-
-    fn create_merge_accumulator(acc_args: AccumulatorArgs) -> DfResult<Box<dyn DfAccumulator>> {
-        let data_type = acc_args.exprs[0].data_type(acc_args.schema)?;
-
-        match data_type {
-            DataType::Binary => Ok(Box::new(HllState::new())),
-            other => not_impl_err!("{HLL_MERGE_NAME} does not support data type: {other}"),
-        }
-    }
-}
-
-impl DfAccumulator for HllState {
-    fn update_batch(&mut self, values: &[ArrayRef]) -> DfResult<()> {
-        let array = &values[0];
-
-        match array.data_type() {
-            DataType::Utf8 => {
-                let string_array = as_string_array(array)?;
-                for value in string_array.iter().flatten() {
-                    self.update(value);
-                }
-            }
-            DataType::Binary => {
-                let binary_array = as_binary_array(array)?;
-                for v in binary_array.iter().flatten() {
-                    self.merge(v);
-                }
-            }
-            _ => {
-                return not_impl_err!(
-                    "HLL functions do not support data type: {}",
-                    array.data_type()
-                )
-            }
-        }
-
-        Ok(())
-    }
-
-    fn evaluate(&mut self) -> DfResult<ScalarValue> {
-        Ok(ScalarValue::Binary(Some(
-            bincode::serialize(&self.hll).map_err(|e| {
-                DataFusionError::Internal(format!("Failed to serialize HyperLogLog: {}", e))
-            })?,
-        )))
-    }
-
-    fn size(&self) -> usize {
-        std::mem::size_of_val(&self.hll)
-    }
-
-    fn state(&mut self) -> DfResult<Vec<ScalarValue>> {
-        Ok(vec![ScalarValue::Binary(Some(
-            bincode::serialize(&self.hll).map_err(|e| {
-                DataFusionError::Internal(format!("Failed to serialize HyperLogLog: {}", e))
-            })?,
-        ))])
-    }
-
-    fn merge_batch(&mut self, states: &[ArrayRef]) -> DfResult<()> {
-        let array = &states[0];
-        let binary_array = as_binary_array(array)?;
-        for v in binary_array.iter().flatten() {
-            self.merge(v);
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use datafusion::arrow::array::{BinaryArray, StringArray};
-
-    use super::*;
-
-    #[test]
-    fn test_hll_basic() {
-        let mut state = HllState::new();
-        state.update("1");
-        state.update("2");
-        state.update("3");
-
-        let result = state.evaluate().unwrap();
-        if let ScalarValue::Binary(Some(bytes)) = result {
-            let mut hll: HllStateType = bincode::deserialize(&bytes).unwrap();
-            assert_eq!(hll.count().trunc() as u32, 3);
-        } else {
-            panic!("Expected binary scalar value");
-        }
-    }
-
-    #[test]
-    fn test_hll_roundtrip() {
-        let mut state = HllState::new();
-        state.update("1");
-        state.update("2");
-
-        // Serialize
-        let serialized = state.evaluate().unwrap();
-
-        // Create new state and merge the serialized data
-        let mut new_state = HllState::new();
-        if let ScalarValue::Binary(Some(bytes)) = &serialized {
-            new_state.merge(bytes);
-
-            // Verify the merged state matches original
-            let result = new_state.evaluate().unwrap();
-            if let ScalarValue::Binary(Some(new_bytes)) = result {
-                let mut original: HllStateType = bincode::deserialize(bytes).unwrap();
-                let mut merged: HllStateType = bincode::deserialize(&new_bytes).unwrap();
-                assert_eq!(original.count(), merged.count());
-            } else {
-                panic!("Expected binary scalar value");
-            }
-        } else {
-            panic!("Expected binary scalar value");
-        }
-    }
-
-    #[test]
-    fn test_hll_batch_update() {
-        let mut state = HllState::new();
-
-        // Test string values
-        let str_values = vec!["a", "b", "c", "d", "e", "f", "g", "h", "i"];
-        let str_array = Arc::new(StringArray::from(str_values)) as ArrayRef;
-        state.update_batch(&[str_array]).unwrap();
-
-        let result = state.evaluate().unwrap();
-        if let ScalarValue::Binary(Some(bytes)) = result {
-            let mut hll: HllStateType = bincode::deserialize(&bytes).unwrap();
-            assert_eq!(hll.count().trunc() as u32, 9);
-        } else {
-            panic!("Expected binary scalar value");
-        }
-    }
-
-    #[test]
-    fn test_hll_merge_batch() {
-        let mut state1 = HllState::new();
-        state1.update("1");
-        let state1_binary = state1.evaluate().unwrap();
-
-        let mut state2 = HllState::new();
-        state2.update("2");
-        let state2_binary = state2.evaluate().unwrap();
-
-        let mut merged_state = HllState::new();
-        if let (ScalarValue::Binary(Some(bytes1)), ScalarValue::Binary(Some(bytes2))) =
-            (&state1_binary, &state2_binary)
-        {
-            let binary_array = Arc::new(BinaryArray::from(vec![
-                bytes1.as_slice(),
-                bytes2.as_slice(),
-            ])) as ArrayRef;
-            merged_state.merge_batch(&[binary_array]).unwrap();
-
-            let result = merged_state.evaluate().unwrap();
-            if let ScalarValue::Binary(Some(bytes)) = result {
-                let mut hll: HllStateType = bincode::deserialize(&bytes).unwrap();
-                assert_eq!(hll.count().trunc() as u32, 2);
-            } else {
-                panic!("Expected binary scalar value");
-            }
-        } else {
-            panic!("Expected binary scalar values");
-        }
-    }
-
-    #[test]
-    fn test_hll_merge_function() {
-        // Create two HLL states with different values
-        let mut state1 = HllState::new();
-        state1.update("1");
-        state1.update("2");
-        let state1_binary = state1.evaluate().unwrap();
-
-        let mut state2 = HllState::new();
-        state2.update("2");
-        state2.update("3");
-        let state2_binary = state2.evaluate().unwrap();
-
-        // Create a merge state and merge both states
-        let mut merge_state = HllState::new();
-        if let (ScalarValue::Binary(Some(bytes1)), ScalarValue::Binary(Some(bytes2))) =
-            (&state1_binary, &state2_binary)
-        {
-            let binary_array = Arc::new(BinaryArray::from(vec![
-                bytes1.as_slice(),
-                bytes2.as_slice(),
-            ])) as ArrayRef;
-            merge_state.update_batch(&[binary_array]).unwrap();
-
-            let result = merge_state.evaluate().unwrap();
-            if let ScalarValue::Binary(Some(bytes)) = result {
-                let mut hll: HllStateType = bincode::deserialize(&bytes).unwrap();
-                // Should have 3 unique values: "1", "2", "3"
-                assert_eq!(hll.count().trunc() as u32, 3);
-            } else {
-                panic!("Expected binary scalar value");
-            }
-        } else {
-            panic!("Expected binary scalar values");
-        }
-    }
-}
--- a/src/common/function/src/aggr/uddsketch_state.rs
+++ b/src/common/function/src/aggr/uddsketch_state.rs
@@ -1,307 +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_query::prelude::*;
-use common_telemetry::trace;
-use datafusion::common::cast::{as_binary_array, as_primitive_array};
-use datafusion::common::not_impl_err;
-use datafusion::error::{DataFusionError, Result as DfResult};
-use datafusion::logical_expr::function::AccumulatorArgs;
-use datafusion::logical_expr::{Accumulator as DfAccumulator, AggregateUDF};
-use datafusion::physical_plan::expressions::Literal;
-use datafusion::prelude::create_udaf;
-use datatypes::arrow::array::ArrayRef;
-use datatypes::arrow::datatypes::{DataType, Float64Type};
-use uddsketch::{SketchHashKey, UDDSketch};
-
-pub const UDDSKETCH_STATE_NAME: &str = "uddsketch_state";
-
-#[derive(Debug)]
-pub struct UddSketchState {
-    uddsketch: UDDSketch,
-}
-
-impl UddSketchState {
-    pub fn new(bucket_size: u64, error_rate: f64) -> Self {
-        Self {
-            uddsketch: UDDSketch::new(bucket_size, error_rate),
-        }
-    }
-
-    pub fn udf_impl() -> AggregateUDF {
-        create_udaf(
-            UDDSKETCH_STATE_NAME,
-            vec![DataType::Int64, DataType::Float64, DataType::Float64],
-            Arc::new(DataType::Binary),
-            Volatility::Immutable,
-            Arc::new(|args| {
-                let (bucket_size, error_rate) = downcast_accumulator_args(args)?;
-                Ok(Box::new(UddSketchState::new(bucket_size, error_rate)))
-            }),
-            Arc::new(vec![DataType::Binary]),
-        )
-    }
-
-    fn update(&mut self, value: f64) {
-        self.uddsketch.add_value(value);
-    }
-
-    fn merge(&mut self, raw: &[u8]) {
-        if let Ok(uddsketch) = bincode::deserialize::<UDDSketch>(raw) {
-            if uddsketch.count() != 0 {
-                self.uddsketch.merge_sketch(&uddsketch);
-            }
-        } else {
-            trace!("Warning: Failed to deserialize UDDSketch from {:?}", raw);
-        }
-    }
-}
-
-fn downcast_accumulator_args(args: AccumulatorArgs) -> DfResult<(u64, f64)> {
-    let bucket_size = match args.exprs[0]
-        .as_any()
-        .downcast_ref::<Literal>()
-        .map(|lit| lit.value())
-    {
-        Some(ScalarValue::Int64(Some(value))) => *value as u64,
-        _ => {
-            return not_impl_err!(
-                "{} not supported for bucket size: {}",
-                UDDSKETCH_STATE_NAME,
-                &args.exprs[0]
-            )
-        }
-    };
-
-    let error_rate = match args.exprs[1]
-        .as_any()
-        .downcast_ref::<Literal>()
-        .map(|lit| lit.value())
-    {
-        Some(ScalarValue::Float64(Some(value))) => *value,
-        _ => {
-            return not_impl_err!(
-                "{} not supported for error rate: {}",
-                UDDSKETCH_STATE_NAME,
-                &args.exprs[1]
-            )
-        }
-    };
-
-    Ok((bucket_size, error_rate))
-}
-
-impl DfAccumulator for UddSketchState {
-    fn update_batch(&mut self, values: &[ArrayRef]) -> DfResult<()> {
-        let array = &values[2]; // the third column is data value
-        let f64_array = as_primitive_array::<Float64Type>(array)?;
-        for v in f64_array.iter().flatten() {
-            self.update(v);
-        }
-
-        Ok(())
-    }
-
-    fn evaluate(&mut self) -> DfResult<ScalarValue> {
-        Ok(ScalarValue::Binary(Some(
-            bincode::serialize(&self.uddsketch).map_err(|e| {
-                DataFusionError::Internal(format!("Failed to serialize UDDSketch: {}", e))
-            })?,
-        )))
-    }
-
-    fn size(&self) -> usize {
-        // Base size of UDDSketch struct fields
-        let mut total_size = std::mem::size_of::<f64>() * 3 + // alpha, gamma, values_sum
-                            std::mem::size_of::<u32>() +      // compactions
-                            std::mem::size_of::<u64>() * 2; // max_buckets, num_values
-
-        // Size of buckets (SketchHashMap)
-        // Each bucket entry contains:
-        // - SketchHashKey (enum with i64/Zero/Invalid variants)
-        // - SketchHashEntry (count: u64, next: SketchHashKey)
-        let bucket_entry_size = std::mem::size_of::<SketchHashKey>() + // key
-                               std::mem::size_of::<u64>() +            // count
-                               std::mem::size_of::<SketchHashKey>(); // next
-
-        total_size += self.uddsketch.current_buckets_count() * bucket_entry_size;
-
-        total_size
-    }
-
-    fn state(&mut self) -> DfResult<Vec<ScalarValue>> {
-        Ok(vec![ScalarValue::Binary(Some(
-            bincode::serialize(&self.uddsketch).map_err(|e| {
-                DataFusionError::Internal(format!("Failed to serialize UDDSketch: {}", e))
-            })?,
-        ))])
-    }
-
-    fn merge_batch(&mut self, states: &[ArrayRef]) -> DfResult<()> {
-        let array = &states[0];
-        let binary_array = as_binary_array(array)?;
-        for v in binary_array.iter().flatten() {
-            self.merge(v);
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use datafusion::arrow::array::{BinaryArray, Float64Array};
-
-    use super::*;
-
-    #[test]
-    fn test_uddsketch_state_basic() {
-        let mut state = UddSketchState::new(10, 0.01);
-        state.update(1.0);
-        state.update(2.0);
-        state.update(3.0);
-
-        let result = state.evaluate().unwrap();
-        if let ScalarValue::Binary(Some(bytes)) = result {
-            let deserialized: UDDSketch = bincode::deserialize(&bytes).unwrap();
-            assert_eq!(deserialized.count(), 3);
-        } else {
-            panic!("Expected binary scalar value");
-        }
-    }
-
-    #[test]
-    fn test_uddsketch_state_roundtrip() {
-        let mut state = UddSketchState::new(10, 0.01);
-        state.update(1.0);
-        state.update(2.0);
-
-        // Serialize
-        let serialized = state.evaluate().unwrap();
-
-        // Create new state and merge the serialized data
-        let mut new_state = UddSketchState::new(10, 0.01);
-        if let ScalarValue::Binary(Some(bytes)) = &serialized {
-            new_state.merge(bytes);
-
-            // Verify the merged state matches original by comparing deserialized values
-            let original_sketch: UDDSketch = bincode::deserialize(bytes).unwrap();
-            let new_result = new_state.evaluate().unwrap();
-            if let ScalarValue::Binary(Some(new_bytes)) = new_result {
-                let new_sketch: UDDSketch = bincode::deserialize(&new_bytes).unwrap();
-                assert_eq!(original_sketch.count(), new_sketch.count());
-                assert_eq!(original_sketch.sum(), new_sketch.sum());
-                assert_eq!(original_sketch.mean(), new_sketch.mean());
-                assert_eq!(original_sketch.max_error(), new_sketch.max_error());
-                // Compare a few quantiles to ensure statistical equivalence
-                for q in [0.1, 0.5, 0.9].iter() {
-                    assert!(
-                        (original_sketch.estimate_quantile(*q) - new_sketch.estimate_quantile(*q))
-                            .abs()
-                            < 1e-10,
-                        "Quantile {} mismatch: original={}, new={}",
-                        q,
-                        original_sketch.estimate_quantile(*q),
-                        new_sketch.estimate_quantile(*q)
-                    );
-                }
-            } else {
-                panic!("Expected binary scalar value");
-            }
-        } else {
-            panic!("Expected binary scalar value");
-        }
-    }
-
-    #[test]
-    fn test_uddsketch_state_batch_update() {
-        let mut state = UddSketchState::new(10, 0.01);
-        let values = vec![1.0f64, 2.0, 3.0];
-        let array = Arc::new(Float64Array::from(values)) as ArrayRef;
-
-        state
-            .update_batch(&[array.clone(), array.clone(), array])
-            .unwrap();
-
-        let result = state.evaluate().unwrap();
-        if let ScalarValue::Binary(Some(bytes)) = result {
-            let deserialized: UDDSketch = bincode::deserialize(&bytes).unwrap();
-            assert_eq!(deserialized.count(), 3);
-        } else {
-            panic!("Expected binary scalar value");
-        }
-    }
-
-    #[test]
-    fn test_uddsketch_state_merge_batch() {
-        let mut state1 = UddSketchState::new(10, 0.01);
-        state1.update(1.0);
-        let state1_binary = state1.evaluate().unwrap();
-
-        let mut state2 = UddSketchState::new(10, 0.01);
-        state2.update(2.0);
-        let state2_binary = state2.evaluate().unwrap();
-
-        let mut merged_state = UddSketchState::new(10, 0.01);
-        if let (ScalarValue::Binary(Some(bytes1)), ScalarValue::Binary(Some(bytes2))) =
-            (&state1_binary, &state2_binary)
-        {
-            let binary_array = Arc::new(BinaryArray::from(vec![
-                bytes1.as_slice(),
-                bytes2.as_slice(),
-            ])) as ArrayRef;
-            merged_state.merge_batch(&[binary_array]).unwrap();
-
-            let result = merged_state.evaluate().unwrap();
-            if let ScalarValue::Binary(Some(bytes)) = result {
-                let deserialized: UDDSketch = bincode::deserialize(&bytes).unwrap();
-                assert_eq!(deserialized.count(), 2);
-            } else {
-                panic!("Expected binary scalar value");
-            }
-        } else {
-            panic!("Expected binary scalar values");
-        }
-    }
-
-    #[test]
-    fn test_uddsketch_state_size() {
-        let mut state = UddSketchState::new(10, 0.01);
-        let initial_size = state.size();
-
-        // Add some values to create buckets
-        state.update(1.0);
-        state.update(2.0);
-        state.update(3.0);
-
-        let size_with_values = state.size();
-        assert!(
-            size_with_values > initial_size,
-            "Size should increase after adding values: initial={}, with_values={}",
-            initial_size,
-            size_with_values
-        );
-
-        // Verify size increases with more buckets
-        state.update(10.0); // This should create a new bucket
-        assert!(
-            state.size() > size_with_values,
-            "Size should increase after adding new bucket: prev={}, new={}",
-            size_with_values,
-            state.size()
-        );
-    }
-}
--- a/src/common/function/src/function.rs
+++ b/src/common/function/src/function.rs
@@ -63,7 +63,7 @@ pub trait Function: fmt::Display + Sync + Send {
    fn signature(&self) -> Signature;

    /// Evaluate the function, e.g. run/execute the function.
-    fn eval(&self, ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef>;
+    fn eval(&self, _func_ctx: FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef>;
 }

 pub type FunctionRef = Arc<dyn Function>;
--- a/src/common/function/src/function_registry.rs
+++ b/src/common/function/src/function_registry.rs
@@ -18,20 +18,17 @@ use std::sync::{Arc, RwLock};

 use once_cell::sync::Lazy;

-use crate::admin::AdminFunction;
 use crate::function::{AsyncFunctionRef, FunctionRef};
 use crate::scalars::aggregate::{AggregateFunctionMetaRef, AggregateFunctions};
 use crate::scalars::date::DateFunction;
 use crate::scalars::expression::ExpressionFunction;
-use crate::scalars::hll_count::HllCalcFunction;
-use crate::scalars::ip::IpFunctions;
 use crate::scalars::json::JsonFunction;
 use crate::scalars::matches::MatchesFunction;
 use crate::scalars::math::MathFunction;
 use crate::scalars::timestamp::TimestampFunction;
-use crate::scalars::uddsketch_calc::UddSketchCalcFunction;
 use crate::scalars::vector::VectorFunction;
 use crate::system::SystemFunction;
+use crate::table::TableFunction;

 #[derive(Default)]
 pub struct FunctionRegistry {
@@ -108,8 +105,6 @@ pub static FUNCTION_REGISTRY: Lazy<Arc<FunctionRegistry>> = Lazy::new(|| {
    TimestampFunction::register(&function_registry);
    DateFunction::register(&function_registry);
    ExpressionFunction::register(&function_registry);
-    UddSketchCalcFunction::register(&function_registry);
-    HllCalcFunction::register(&function_registry);

    // Aggregate functions
    AggregateFunctions::register(&function_registry);
@@ -119,7 +114,7 @@ pub static FUNCTION_REGISTRY: Lazy<Arc<FunctionRegistry>> = Lazy::new(|| {

    // System and administration functions
    SystemFunction::register(&function_registry);
-    AdminFunction::register(&function_registry);
+    TableFunction::register(&function_registry);

    // Json related functions
    JsonFunction::register(&function_registry);
@@ -131,9 +126,6 @@ pub static FUNCTION_REGISTRY: Lazy<Arc<FunctionRegistry>> = Lazy::new(|| {
    #[cfg(feature = "geo")]
    crate::scalars::geo::GeoFunctions::register(&function_registry);

-    // Ip functions
-    IpFunctions::register(&function_registry);
-
    Arc::new(function_registry)
 });

--- a/src/common/function/src/lib.rs
+++ b/src/common/function/src/lib.rs
@@ -15,13 +15,12 @@
 #![feature(let_chains)]
 #![feature(try_blocks)]

-mod admin;
 mod flush_flow;
 mod macros;
 pub mod scalars;
 mod system;
+mod table;

-pub mod aggr;
 pub mod function;
 pub mod function_registry;
 pub mod handlers;
--- a/src/common/function/src/scalars.rs
+++ b/src/common/function/src/scalars.rs
@@ -22,10 +22,7 @@ pub mod matches;
 pub mod math;
 pub mod vector;

-pub(crate) mod hll_count;
-pub mod ip;
 #[cfg(test)]
 pub(crate) mod test;
 pub(crate) mod timestamp;
-pub(crate) mod uddsketch_calc;
 pub mod udf;
--- a/src/common/function/src/scalars/date/date_add.rs
+++ b/src/common/function/src/scalars/date/date_add.rs
@@ -58,7 +58,7 @@ impl Function for DateAddFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -146,7 +146,7 @@ mod tests {
        let time_vector = TimestampSecondVector::from(times.clone());
        let interval_vector = IntervalDayTimeVector::from_vec(intervals);
        let args: Vec<VectorRef> = vec![Arc::new(time_vector), Arc::new(interval_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();

        assert_eq!(4, vector.len());
        for (i, _t) in times.iter().enumerate() {
@@ -178,7 +178,7 @@ mod tests {
        let date_vector = DateVector::from(dates.clone());
        let interval_vector = IntervalYearMonthVector::from_vec(intervals);
        let args: Vec<VectorRef> = vec![Arc::new(date_vector), Arc::new(interval_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();

        assert_eq!(4, vector.len());
        for (i, _t) in dates.iter().enumerate() {
--- a/src/common/function/src/scalars/date/date_format.rs
+++ b/src/common/function/src/scalars/date/date_format.rs
@@ -53,7 +53,7 @@ impl Function for DateFormatFunction {
        )
    }

-    fn eval(&self, func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -202,7 +202,7 @@ mod tests {
        let time_vector = TimestampSecondVector::from(times.clone());
        let interval_vector = StringVector::from_vec(formats);
        let args: Vec<VectorRef> = vec![Arc::new(time_vector), Arc::new(interval_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();

        assert_eq!(4, vector.len());
        for (i, _t) in times.iter().enumerate() {
@@ -243,7 +243,7 @@ mod tests {
        let date_vector = DateVector::from(dates.clone());
        let interval_vector = StringVector::from_vec(formats);
        let args: Vec<VectorRef> = vec![Arc::new(date_vector), Arc::new(interval_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();

        assert_eq!(4, vector.len());
        for (i, _t) in dates.iter().enumerate() {
@@ -284,7 +284,7 @@ mod tests {
        let date_vector = DateTimeVector::from(dates.clone());
        let interval_vector = StringVector::from_vec(formats);
        let args: Vec<VectorRef> = vec![Arc::new(date_vector), Arc::new(interval_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();

        assert_eq!(4, vector.len());
        for (i, _t) in dates.iter().enumerate() {
--- a/src/common/function/src/scalars/date/date_sub.rs
+++ b/src/common/function/src/scalars/date/date_sub.rs
@@ -58,7 +58,7 @@ impl Function for DateSubFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -151,7 +151,7 @@ mod tests {
        let time_vector = TimestampSecondVector::from(times.clone());
        let interval_vector = IntervalDayTimeVector::from_vec(intervals);
        let args: Vec<VectorRef> = vec![Arc::new(time_vector), Arc::new(interval_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();

        assert_eq!(4, vector.len());
        for (i, _t) in times.iter().enumerate() {
@@ -189,7 +189,7 @@ mod tests {
        let date_vector = DateVector::from(dates.clone());
        let interval_vector = IntervalYearMonthVector::from_vec(intervals);
        let args: Vec<VectorRef> = vec![Arc::new(date_vector), Arc::new(interval_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();

        assert_eq!(4, vector.len());
        for (i, _t) in dates.iter().enumerate() {
--- a/src/common/function/src/scalars/expression/is_null.rs
+++ b/src/common/function/src/scalars/expression/is_null.rs
@@ -55,7 +55,7 @@ impl Function for IsNullFunction {

    fn eval(
        &self,
-        _func_ctx: &FunctionContext,
+        _func_ctx: FunctionContext,
        columns: &[VectorRef],
    ) -> common_query::error::Result<VectorRef> {
        ensure!(
@@ -102,7 +102,7 @@ mod tests {
        let values = vec![None, Some(3.0), None];

        let args: Vec<VectorRef> = vec![Arc::new(Float32Vector::from(values))];
-        let vector = is_null.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = is_null.eval(FunctionContext::default(), &args).unwrap();
        let expect: VectorRef = Arc::new(BooleanVector::from_vec(vec![true, false, true]));
        assert_eq!(expect, vector);
    }
--- a/src/common/function/src/scalars/geo/geohash.rs
+++ b/src/common/function/src/scalars/geo/geohash.rs
@@ -118,7 +118,7 @@ impl Function for GeohashFunction {
        Signature::one_of(signatures, Volatility::Stable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 3,
            InvalidFuncArgsSnafu {
@@ -218,7 +218,7 @@ impl Function for GeohashNeighboursFunction {
        Signature::one_of(signatures, Volatility::Stable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 3,
            InvalidFuncArgsSnafu {
--- a/src/common/function/src/scalars/geo/h3.rs
+++ b/src/common/function/src/scalars/geo/h3.rs
@@ -119,7 +119,7 @@ impl Function for H3LatLngToCell {
        Signature::one_of(signatures, Volatility::Stable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 3);

        let lat_vec = &columns[0];
@@ -191,7 +191,7 @@ impl Function for H3LatLngToCellString {
        Signature::one_of(signatures, Volatility::Stable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 3);

        let lat_vec = &columns[0];
@@ -247,7 +247,7 @@ impl Function for H3CellToString {
        signature_of_cell()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 1);

        let cell_vec = &columns[0];
@@ -285,7 +285,7 @@ impl Function for H3StringToCell {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 1);

        let string_vec = &columns[0];
@@ -337,7 +337,7 @@ impl Function for H3CellCenterLatLng {
        signature_of_cell()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 1);

        let cell_vec = &columns[0];
@@ -382,7 +382,7 @@ impl Function for H3CellResolution {
        signature_of_cell()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 1);

        let cell_vec = &columns[0];
@@ -418,7 +418,7 @@ impl Function for H3CellBase {
        signature_of_cell()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 1);

        let cell_vec = &columns[0];
@@ -454,7 +454,7 @@ impl Function for H3CellIsPentagon {
        signature_of_cell()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 1);

        let cell_vec = &columns[0];
@@ -490,7 +490,7 @@ impl Function for H3CellCenterChild {
        signature_of_cell_and_resolution()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_vec = &columns[0];
@@ -530,7 +530,7 @@ impl Function for H3CellParent {
        signature_of_cell_and_resolution()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_vec = &columns[0];
@@ -570,7 +570,7 @@ impl Function for H3CellToChildren {
        signature_of_cell_and_resolution()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_vec = &columns[0];
@@ -619,7 +619,7 @@ impl Function for H3CellToChildrenSize {
        signature_of_cell_and_resolution()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_vec = &columns[0];
@@ -656,7 +656,7 @@ impl Function for H3CellToChildPos {
        signature_of_cell_and_resolution()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_vec = &columns[0];
@@ -706,7 +706,7 @@ impl Function for H3ChildPosToCell {
        Signature::one_of(signatures, Volatility::Stable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 3);

        let pos_vec = &columns[0];
@@ -747,7 +747,7 @@ impl Function for H3GridDisk {
        signature_of_cell_and_distance()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_vec = &columns[0];
@@ -800,7 +800,7 @@ impl Function for H3GridDiskDistances {
        signature_of_cell_and_distance()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_vec = &columns[0];
@@ -850,7 +850,7 @@ impl Function for H3GridDistance {
        signature_of_double_cells()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_this_vec = &columns[0];
@@ -906,7 +906,7 @@ impl Function for H3GridPathCells {
        signature_of_double_cells()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_this_vec = &columns[0];
@@ -988,7 +988,7 @@ impl Function for H3CellContains {
        Signature::one_of(signatures, Volatility::Stable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cells_vec = &columns[0];
@@ -1042,7 +1042,7 @@ impl Function for H3CellDistanceSphereKm {
        signature_of_double_cells()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_this_vec = &columns[0];
@@ -1097,7 +1097,7 @@ impl Function for H3CellDistanceEuclideanDegree {
        signature_of_double_cells()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_this_vec = &columns[0];
--- a/src/common/function/src/scalars/geo/measure.rs
+++ b/src/common/function/src/scalars/geo/measure.rs
@@ -54,7 +54,7 @@ impl Function for STDistance {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let wkt_this_vec = &columns[0];
@@ -108,7 +108,7 @@ impl Function for STDistanceSphere {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let wkt_this_vec = &columns[0];
@@ -169,7 +169,7 @@ impl Function for STArea {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 1);

        let wkt_vec = &columns[0];
--- a/src/common/function/src/scalars/geo/relation.rs
+++ b/src/common/function/src/scalars/geo/relation.rs
@@ -51,7 +51,7 @@ impl Function for STContains {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let wkt_this_vec = &columns[0];
@@ -105,7 +105,7 @@ impl Function for STWithin {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let wkt_this_vec = &columns[0];
@@ -159,7 +159,7 @@ impl Function for STIntersects {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let wkt_this_vec = &columns[0];
--- a/src/common/function/src/scalars/geo/s2.rs
+++ b/src/common/function/src/scalars/geo/s2.rs
@@ -84,7 +84,7 @@ impl Function for S2LatLngToCell {
        Signature::one_of(signatures, Volatility::Stable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let lat_vec = &columns[0];
@@ -138,7 +138,7 @@ impl Function for S2CellLevel {
        signature_of_cell()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 1);

        let cell_vec = &columns[0];
@@ -174,7 +174,7 @@ impl Function for S2CellToToken {
        signature_of_cell()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 1);

        let cell_vec = &columns[0];
@@ -210,7 +210,7 @@ impl Function for S2CellParent {
        signature_of_cell_and_level()
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let cell_vec = &columns[0];
--- a/src/common/function/src/scalars/geo/wkt.rs
+++ b/src/common/function/src/scalars/geo/wkt.rs
@@ -63,7 +63,7 @@ impl Function for LatLngToPointWkt {
        Signature::one_of(signatures, Volatility::Stable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure_columns_n!(columns, 2);

        let lat_vec = &columns[0];
--- a/src/common/function/src/scalars/hll_count.rs
+++ b/src/common/function/src/scalars/hll_count.rs
@@ -1,175 +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.
-
-//! Implementation of the scalar function `hll_count`.
-
-use std::fmt;
-use std::fmt::Display;
-use std::sync::Arc;
-
-use common_query::error::{DowncastVectorSnafu, InvalidFuncArgsSnafu, Result};
-use common_query::prelude::{Signature, Volatility};
-use datatypes::data_type::ConcreteDataType;
-use datatypes::prelude::Vector;
-use datatypes::scalars::{ScalarVector, ScalarVectorBuilder};
-use datatypes::vectors::{BinaryVector, MutableVector, UInt64VectorBuilder, VectorRef};
-use hyperloglogplus::HyperLogLog;
-use snafu::OptionExt;
-
-use crate::aggr::HllStateType;
-use crate::function::{Function, FunctionContext};
-use crate::function_registry::FunctionRegistry;
-
-const NAME: &str = "hll_count";
-
-/// HllCalcFunction implements the scalar function `hll_count`.
-///
-/// It accepts one argument:
-/// 1. The serialized HyperLogLogPlus state, as produced by the aggregator (binary).
-///
-/// For each row, it deserializes the sketch and returns the estimated cardinality.
-#[derive(Debug, Default)]
-pub struct HllCalcFunction;
-
-impl HllCalcFunction {
-    pub fn register(registry: &FunctionRegistry) {
-        registry.register(Arc::new(HllCalcFunction));
-    }
-}
-
-impl Display for HllCalcFunction {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-impl Function for HllCalcFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::uint64_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        // Only argument: HyperLogLogPlus state (binary)
-        Signature::exact(
-            vec![ConcreteDataType::binary_datatype()],
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        if columns.len() != 1 {
-            return InvalidFuncArgsSnafu {
-                err_msg: format!("hll_count expects 1 argument, got {}", columns.len()),
-            }
-            .fail();
-        }
-
-        let hll_vec = columns[0]
-            .as_any()
-            .downcast_ref::<BinaryVector>()
-            .with_context(|| DowncastVectorSnafu {
-                err_msg: format!("expect BinaryVector, got {}", columns[0].vector_type_name()),
-            })?;
-        let len = hll_vec.len();
-        let mut builder = UInt64VectorBuilder::with_capacity(len);
-
-        for i in 0..len {
-            let hll_opt = hll_vec.get_data(i);
-
-            if hll_opt.is_none() {
-                builder.push_null();
-                continue;
-            }
-
-            let hll_bytes = hll_opt.unwrap();
-
-            // Deserialize the HyperLogLogPlus from its bincode representation
-            let mut hll: HllStateType = match bincode::deserialize(hll_bytes) {
-                Ok(h) => h,
-                Err(e) => {
-                    common_telemetry::trace!("Failed to deserialize HyperLogLogPlus: {}", e);
-                    builder.push_null();
-                    continue;
-                }
-            };
-
-            builder.push(Some(hll.count().round() as u64));
-        }
-
-        Ok(builder.to_vector())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use datatypes::vectors::BinaryVector;
-
-    use super::*;
-    use crate::utils::FixedRandomState;
-
-    #[test]
-    fn test_hll_count_function() {
-        let function = HllCalcFunction;
-        assert_eq!("hll_count", function.name());
-        assert_eq!(
-            ConcreteDataType::uint64_datatype(),
-            function
-                .return_type(&[ConcreteDataType::uint64_datatype()])
-                .unwrap()
-        );
-
-        // Create a test HLL
-        let mut hll = HllStateType::new(14, FixedRandomState::new()).unwrap();
-        for i in 1..=10 {
-            hll.insert(&i.to_string());
-        }
-
-        let serialized_bytes = bincode::serialize(&hll).unwrap();
-        let args: Vec<VectorRef> = vec![Arc::new(BinaryVector::from(vec![Some(serialized_bytes)]))];
-
-        let result = function.eval(&FunctionContext::default(), &args).unwrap();
-        assert_eq!(result.len(), 1);
-
-        // Test cardinality estimate
-        if let datatypes::value::Value::UInt64(v) = result.get(0) {
-            assert_eq!(v, 10);
-        } else {
-            panic!("Expected uint64 value");
-        }
-    }
-
-    #[test]
-    fn test_hll_count_function_errors() {
-        let function = HllCalcFunction;
-
-        // Test with invalid number of arguments
-        let args: Vec<VectorRef> = vec![];
-        let result = function.eval(&FunctionContext::default(), &args);
-        assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .to_string()
-            .contains("hll_count expects 1 argument"));
-
-        // Test with invalid binary data
-        let args: Vec<VectorRef> = vec![Arc::new(BinaryVector::from(vec![Some(vec![1, 2, 3])]))]; // Invalid binary data
-        let result = function.eval(&FunctionContext::default(), &args).unwrap();
-        assert_eq!(result.len(), 1);
-        assert!(matches!(result.get(0), datatypes::value::Value::Null));
-    }
-}
--- a/src/common/function/src/scalars/ip.rs
+++ b/src/common/function/src/scalars/ip.rs
@@ -1,45 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-mod cidr;
-mod ipv4;
-mod ipv6;
-mod range;
-
-use std::sync::Arc;
-
-use cidr::{Ipv4ToCidr, Ipv6ToCidr};
-use ipv4::{Ipv4NumToString, Ipv4StringToNum};
-use ipv6::{Ipv6NumToString, Ipv6StringToNum};
-use range::{Ipv4InRange, Ipv6InRange};
-
-use crate::function_registry::FunctionRegistry;
-
-pub(crate) struct IpFunctions;
-
-impl IpFunctions {
-    pub fn register(registry: &FunctionRegistry) {
-        // Register IPv4 functions
-        registry.register(Arc::new(Ipv4NumToString));
-        registry.register(Arc::new(Ipv4StringToNum));
-        registry.register(Arc::new(Ipv4ToCidr));
-        registry.register(Arc::new(Ipv4InRange));
-
-        // Register IPv6 functions
-        registry.register(Arc::new(Ipv6NumToString));
-        registry.register(Arc::new(Ipv6StringToNum));
-        registry.register(Arc::new(Ipv6ToCidr));
-        registry.register(Arc::new(Ipv6InRange));
-    }
-}
--- a/src/common/function/src/scalars/ip/cidr.rs
+++ b/src/common/function/src/scalars/ip/cidr.rs
@@ -1,485 +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::net::{Ipv4Addr, Ipv6Addr};
-use std::str::FromStr;
-
-use common_query::error::{InvalidFuncArgsSnafu, Result};
-use common_query::prelude::{Signature, TypeSignature};
-use datafusion::logical_expr::Volatility;
-use datatypes::prelude::{ConcreteDataType, Value};
-use datatypes::scalars::ScalarVectorBuilder;
-use datatypes::vectors::{MutableVector, StringVectorBuilder, VectorRef};
-use derive_more::Display;
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-
-/// Function that converts an IPv4 address string to CIDR notation.
-///
-/// If subnet mask is provided as second argument, uses that.
-/// Otherwise, automatically detects subnet based on trailing zeros.
-///
-/// Examples:
-/// - ipv4_to_cidr('192.168.1.0') -> '192.168.1.0/24'
-/// - ipv4_to_cidr('192.168') -> '192.168.0.0/16'
-/// - ipv4_to_cidr('192.168.1.1', 24) -> '192.168.1.0/24'
-#[derive(Clone, Debug, Default, Display)]
-#[display("{}", self.name())]
-pub struct Ipv4ToCidr;
-
-impl Function for Ipv4ToCidr {
-    fn name(&self) -> &str {
-        "ipv4_to_cidr"
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::string_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![ConcreteDataType::string_datatype()]),
-                TypeSignature::Exact(vec![
-                    ConcreteDataType::string_datatype(),
-                    ConcreteDataType::uint8_datatype(),
-                ]),
-            ],
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 1 || columns.len() == 2,
-            InvalidFuncArgsSnafu {
-                err_msg: format!("Expected 1 or 2 arguments, got {}", columns.len())
-            }
-        );
-
-        let ip_vec = &columns[0];
-        let mut results = StringVectorBuilder::with_capacity(ip_vec.len());
-
-        let has_subnet_arg = columns.len() == 2;
-        let subnet_vec = if has_subnet_arg {
-            ensure!(
-                columns[1].len() == ip_vec.len(),
-                InvalidFuncArgsSnafu {
-                    err_msg:
-                        "Subnet mask must have the same number of elements as the IP addresses"
-                            .to_string()
-                }
-            );
-            Some(&columns[1])
-        } else {
-            None
-        };
-
-        for i in 0..ip_vec.len() {
-            let ip_str = ip_vec.get(i);
-            let subnet = subnet_vec.map(|v| v.get(i));
-
-            let cidr = match (ip_str, subnet) {
-                (Value::String(s), Some(Value::UInt8(mask))) => {
-                    let ip_str = s.as_utf8().trim();
-                    if ip_str.is_empty() {
-                        return InvalidFuncArgsSnafu {
-                            err_msg: "Empty IPv4 address".to_string(),
-                        }
-                        .fail();
-                    }
-
-                    let ip_addr = complete_and_parse_ipv4(ip_str)?;
-                    // Apply the subnet mask to the IP by zeroing out the host bits
-                    let mask_bits = u32::MAX.wrapping_shl(32 - mask as u32);
-                    let masked_ip = Ipv4Addr::from(u32::from(ip_addr) & mask_bits);
-
-                    Some(format!("{}/{}", masked_ip, mask))
-                }
-                (Value::String(s), None) => {
-                    let ip_str = s.as_utf8().trim();
-                    if ip_str.is_empty() {
-                        return InvalidFuncArgsSnafu {
-                            err_msg: "Empty IPv4 address".to_string(),
-                        }
-                        .fail();
-                    }
-
-                    let ip_addr = complete_and_parse_ipv4(ip_str)?;
-
-                    // Determine the subnet mask based on trailing zeros or dots
-                    let ip_bits = u32::from(ip_addr);
-                    let dots = ip_str.chars().filter(|&c| c == '.').count();
-
-                    let subnet_mask = match dots {
-                        0 => 8,  // If just one number like "192", use /8
-                        1 => 16, // If two numbers like "192.168", use /16
-                        2 => 24, // If three numbers like "192.168.1", use /24
-                        _ => {
-                            // For complete addresses, use trailing zeros
-                            let trailing_zeros = ip_bits.trailing_zeros();
-                            // Round to 8-bit boundaries if it's not a complete mask
-                            if trailing_zeros % 8 == 0 {
-                                32 - trailing_zeros.min(32) as u8
-                            } else {
-                                32 - (trailing_zeros as u8 / 8) * 8
-                            }
-                        }
-                    };
-
-                    // Apply the subnet mask to zero out host bits
-                    let mask_bits = u32::MAX.wrapping_shl(32 - subnet_mask as u32);
-                    let masked_ip = Ipv4Addr::from(ip_bits & mask_bits);
-
-                    Some(format!("{}/{}", masked_ip, subnet_mask))
-                }
-                _ => None,
-            };
-
-            results.push(cidr.as_deref());
-        }
-
-        Ok(results.to_vector())
-    }
-}
-
-/// Function that converts an IPv6 address string to CIDR notation.
-///
-/// If subnet mask is provided as second argument, uses that.
-/// Otherwise, automatically detects subnet based on trailing zeros.
-///
-/// Examples:
-/// - ipv6_to_cidr('2001:db8::') -> '2001:db8::/32'
-/// - ipv6_to_cidr('2001:db8') -> '2001:db8::/32'
-/// - ipv6_to_cidr('2001:db8::', 48) -> '2001:db8::/48'
-#[derive(Clone, Debug, Default, Display)]
-#[display("{}", self.name())]
-pub struct Ipv6ToCidr;
-
-impl Function for Ipv6ToCidr {
-    fn name(&self) -> &str {
-        "ipv6_to_cidr"
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::string_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::one_of(
-            vec![
-                TypeSignature::Exact(vec![ConcreteDataType::string_datatype()]),
-                TypeSignature::Exact(vec![
-                    ConcreteDataType::string_datatype(),
-                    ConcreteDataType::uint8_datatype(),
-                ]),
-            ],
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 1 || columns.len() == 2,
-            InvalidFuncArgsSnafu {
-                err_msg: format!("Expected 1 or 2 arguments, got {}", columns.len())
-            }
-        );
-
-        let ip_vec = &columns[0];
-        let size = ip_vec.len();
-        let mut results = StringVectorBuilder::with_capacity(size);
-
-        let has_subnet_arg = columns.len() == 2;
-        let subnet_vec = if has_subnet_arg {
-            Some(&columns[1])
-        } else {
-            None
-        };
-
-        for i in 0..size {
-            let ip_str = ip_vec.get(i);
-            let subnet = subnet_vec.map(|v| v.get(i));
-
-            let cidr = match (ip_str, subnet) {
-                (Value::String(s), Some(Value::UInt8(mask))) => {
-                    let ip_str = s.as_utf8().trim();
-                    if ip_str.is_empty() {
-                        return InvalidFuncArgsSnafu {
-                            err_msg: "Empty IPv6 address".to_string(),
-                        }
-                        .fail();
-                    }
-
-                    let ip_addr = complete_and_parse_ipv6(ip_str)?;
-
-                    // Apply the subnet mask to the IP
-                    let masked_ip = mask_ipv6(&ip_addr, mask);
-
-                    Some(format!("{}/{}", masked_ip, mask))
-                }
-                (Value::String(s), None) => {
-                    let ip_str = s.as_utf8().trim();
-                    if ip_str.is_empty() {
-                        return InvalidFuncArgsSnafu {
-                            err_msg: "Empty IPv6 address".to_string(),
-                        }
-                        .fail();
-                    }
-
-                    let ip_addr = complete_and_parse_ipv6(ip_str)?;
-
-                    // Determine subnet based on address parts
-                    let subnet_mask = auto_detect_ipv6_subnet(&ip_addr);
-
-                    // Apply the subnet mask
-                    let masked_ip = mask_ipv6(&ip_addr, subnet_mask);
-
-                    Some(format!("{}/{}", masked_ip, subnet_mask))
-                }
-                _ => None,
-            };
-
-            results.push(cidr.as_deref());
-        }
-
-        Ok(results.to_vector())
-    }
-}
-
-// Helper functions
-
-fn complete_and_parse_ipv4(ip_str: &str) -> Result<Ipv4Addr> {
-    // Try to parse as is
-    if let Ok(addr) = Ipv4Addr::from_str(ip_str) {
-        return Ok(addr);
-    }
-
-    // Count the dots to see how many octets we have
-    let dots = ip_str.chars().filter(|&c| c == '.').count();
-
-    // Complete with zeroes
-    let completed = match dots {
-        0 => format!("{}.0.0.0", ip_str),
-        1 => format!("{}.0.0", ip_str),
-        2 => format!("{}.0", ip_str),
-        _ => ip_str.to_string(),
-    };
-
-    Ipv4Addr::from_str(&completed).map_err(|_| {
-        InvalidFuncArgsSnafu {
-            err_msg: format!("Invalid IPv4 address: {}", ip_str),
-        }
-        .build()
-    })
-}
-
-fn complete_and_parse_ipv6(ip_str: &str) -> Result<Ipv6Addr> {
-    // If it's already a valid IPv6 address, just parse it
-    if let Ok(addr) = Ipv6Addr::from_str(ip_str) {
-        return Ok(addr);
-    }
-
-    // For partial addresses, try to complete them
-    // The simplest approach is to add "::" to make it complete if needed
-    let completed = if ip_str.ends_with(':') {
-        format!("{}:", ip_str)
-    } else if !ip_str.contains("::") {
-        format!("{}::", ip_str)
-    } else {
-        ip_str.to_string()
-    };
-
-    Ipv6Addr::from_str(&completed).map_err(|_| {
-        InvalidFuncArgsSnafu {
-            err_msg: format!("Invalid IPv6 address: {}", ip_str),
-        }
-        .build()
-    })
-}
-
-fn mask_ipv6(addr: &Ipv6Addr, subnet: u8) -> Ipv6Addr {
-    let octets = addr.octets();
-    let mut result = [0u8; 16];
-
-    // For each byte in the address
-    for i in 0..16 {
-        let bit_pos = i * 8;
-        if bit_pos < subnet as usize {
-            if bit_pos + 8 <= subnet as usize {
-                // This byte is entirely within the subnet prefix
-                result[i] = octets[i];
-            } else {
-                // This byte contains the boundary between prefix and host
-                let shift = 8 - (subnet as usize - bit_pos);
-                result[i] = octets[i] & (0xFF << shift);
-            }
-        }
-        // Else this byte is entirely within the host portion, leave as 0
-    }
-
-    Ipv6Addr::from(result)
-}
-
-fn auto_detect_ipv6_subnet(addr: &Ipv6Addr) -> u8 {
-    let segments = addr.segments();
-    let str_addr = addr.to_string();
-
-    // Special cases to match expected test outputs
-    // This is to fix the test case for "2001:db8" that expects "2001:db8::/32"
-    if str_addr.starts_with("2001:db8::") || str_addr.starts_with("2001:db8:") {
-        return 32;
-    }
-
-    if str_addr == "::1" {
-        return 128; // Special case for localhost
-    }
-
-    if str_addr.starts_with("fe80::") {
-        return 16; // Special case for link-local
-    }
-
-    // Count trailing zero segments to determine subnet
-    let mut subnet = 128;
-    for i in (0..8).rev() {
-        if segments[i] != 0 {
-            // Found the last non-zero segment
-            if segments[i] & 0xFF == 0 {
-                // If the lower byte is zero, it suggests a /120 network
-                subnet = (i * 16) + 8;
-            } else {
-                // Otherwise, use a multiple of 16 bits
-                subnet = (i + 1) * 16; // Changed to include the current segment
-            }
-            break;
-        }
-    }
-
-    // Default to /64 if we couldn't determine or got less than 16
-    if subnet < 16 {
-        subnet = 64;
-    }
-
-    subnet as u8
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datatypes::scalars::ScalarVector;
-    use datatypes::vectors::{StringVector, UInt8Vector};
-
-    use super::*;
-
-    #[test]
-    fn test_ipv4_to_cidr_auto() {
-        let func = Ipv4ToCidr;
-        let ctx = FunctionContext::default();
-
-        // Test data with auto subnet detection
-        let values = vec!["192.168.1.0", "10.0.0.0", "172.16", "192"];
-        let input = Arc::new(StringVector::from_slice(&values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[input]).unwrap();
-        let result = result.as_any().downcast_ref::<StringVector>().unwrap();
-
-        assert_eq!(result.get_data(0).unwrap(), "192.168.1.0/24");
-        assert_eq!(result.get_data(1).unwrap(), "10.0.0.0/8");
-        assert_eq!(result.get_data(2).unwrap(), "172.16.0.0/16");
-        assert_eq!(result.get_data(3).unwrap(), "192.0.0.0/8");
-    }
-
-    #[test]
-    fn test_ipv4_to_cidr_with_subnet() {
-        let func = Ipv4ToCidr;
-        let ctx = FunctionContext::default();
-
-        // Test data with explicit subnet
-        let ip_values = vec!["192.168.1.1", "10.0.0.1", "172.16.5.5"];
-        let subnet_values = vec![24u8, 16u8, 12u8];
-        let ip_input = Arc::new(StringVector::from_slice(&ip_values)) as VectorRef;
-        let subnet_input = Arc::new(UInt8Vector::from_vec(subnet_values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[ip_input, subnet_input]).unwrap();
-        let result = result.as_any().downcast_ref::<StringVector>().unwrap();
-
-        assert_eq!(result.get_data(0).unwrap(), "192.168.1.0/24");
-        assert_eq!(result.get_data(1).unwrap(), "10.0.0.0/16");
-        assert_eq!(result.get_data(2).unwrap(), "172.16.0.0/12");
-    }
-
-    #[test]
-    fn test_ipv6_to_cidr_auto() {
-        let func = Ipv6ToCidr;
-        let ctx = FunctionContext::default();
-
-        // Test data with auto subnet detection
-        let values = vec!["2001:db8::", "2001:db8", "fe80::1", "::1"];
-        let input = Arc::new(StringVector::from_slice(&values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[input]).unwrap();
-        let result = result.as_any().downcast_ref::<StringVector>().unwrap();
-
-        assert_eq!(result.get_data(0).unwrap(), "2001:db8::/32");
-        assert_eq!(result.get_data(1).unwrap(), "2001:db8::/32");
-        assert_eq!(result.get_data(2).unwrap(), "fe80::/16");
-        assert_eq!(result.get_data(3).unwrap(), "::1/128"); // Special case for ::1
-    }
-
-    #[test]
-    fn test_ipv6_to_cidr_with_subnet() {
-        let func = Ipv6ToCidr;
-        let ctx = FunctionContext::default();
-
-        // Test data with explicit subnet
-        let ip_values = vec!["2001:db8::", "fe80::1", "2001:db8:1234::"];
-        let subnet_values = vec![48u8, 10u8, 56u8];
-        let ip_input = Arc::new(StringVector::from_slice(&ip_values)) as VectorRef;
-        let subnet_input = Arc::new(UInt8Vector::from_vec(subnet_values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[ip_input, subnet_input]).unwrap();
-        let result = result.as_any().downcast_ref::<StringVector>().unwrap();
-
-        assert_eq!(result.get_data(0).unwrap(), "2001:db8::/48");
-        assert_eq!(result.get_data(1).unwrap(), "fe80::/10");
-        assert_eq!(result.get_data(2).unwrap(), "2001:db8:1234::/56");
-    }
-
-    #[test]
-    fn test_invalid_inputs() {
-        let ipv4_func = Ipv4ToCidr;
-        let ipv6_func = Ipv6ToCidr;
-        let ctx = FunctionContext::default();
-
-        // Empty string should fail
-        let empty_values = vec![""];
-        let empty_input = Arc::new(StringVector::from_slice(&empty_values)) as VectorRef;
-
-        let ipv4_result = ipv4_func.eval(&ctx, &[empty_input.clone()]);
-        let ipv6_result = ipv6_func.eval(&ctx, &[empty_input.clone()]);
-
-        assert!(ipv4_result.is_err());
-        assert!(ipv6_result.is_err());
-
-        // Invalid IP formats should fail
-        let invalid_values = vec!["not an ip", "192.168.1.256", "zzzz::ffff"];
-        let invalid_input = Arc::new(StringVector::from_slice(&invalid_values)) as VectorRef;
-
-        let ipv4_result = ipv4_func.eval(&ctx, &[invalid_input.clone()]);
-
-        assert!(ipv4_result.is_err());
-    }
-}
--- a/src/common/function/src/scalars/ip/ipv4.rs
+++ b/src/common/function/src/scalars/ip/ipv4.rs
@@ -1,217 +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::net::Ipv4Addr;
-use std::str::FromStr;
-
-use common_query::error::{InvalidFuncArgsSnafu, Result};
-use common_query::prelude::{Signature, TypeSignature};
-use datafusion::logical_expr::Volatility;
-use datatypes::prelude::ConcreteDataType;
-use datatypes::scalars::ScalarVectorBuilder;
-use datatypes::vectors::{MutableVector, StringVectorBuilder, UInt32VectorBuilder, VectorRef};
-use derive_more::Display;
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-
-/// Function that converts a UInt32 number to an IPv4 address string.
-///
-/// Interprets the number as an IPv4 address in big endian and returns
-/// a string in the format A.B.C.D (dot-separated numbers in decimal form).
-///
-/// For example:
-/// - 167772160 (0x0A000000) returns "10.0.0.0"
-/// - 3232235521 (0xC0A80001) returns "192.168.0.1"
-#[derive(Clone, Debug, Default, Display)]
-#[display("{}", self.name())]
-pub struct Ipv4NumToString;
-
-impl Function for Ipv4NumToString {
-    fn name(&self) -> &str {
-        "ipv4_num_to_string"
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::string_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::new(
-            TypeSignature::Exact(vec![ConcreteDataType::uint32_datatype()]),
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 1,
-            InvalidFuncArgsSnafu {
-                err_msg: format!("Expected 1 argument, got {}", columns.len())
-            }
-        );
-
-        let uint_vec = &columns[0];
-        let size = uint_vec.len();
-        let mut results = StringVectorBuilder::with_capacity(size);
-
-        for i in 0..size {
-            let ip_num = uint_vec.get(i);
-            let ip_str = match ip_num {
-                datatypes::value::Value::UInt32(num) => {
-                    // Convert UInt32 to IPv4 string (A.B.C.D format)
-                    let a = (num >> 24) & 0xFF;
-                    let b = (num >> 16) & 0xFF;
-                    let c = (num >> 8) & 0xFF;
-                    let d = num & 0xFF;
-                    Some(format!("{}.{}.{}.{}", a, b, c, d))
-                }
-                _ => None,
-            };
-
-            results.push(ip_str.as_deref());
-        }
-
-        Ok(results.to_vector())
-    }
-}
-
-/// Function that converts a string representation of an IPv4 address to a UInt32 number.
-///
-/// For example:
-/// - "10.0.0.1" returns 167772161
-/// - "192.168.0.1" returns 3232235521
-/// - Invalid IPv4 format throws an exception
-#[derive(Clone, Debug, Default, Display)]
-#[display("{}", self.name())]
-pub struct Ipv4StringToNum;
-
-impl Function for Ipv4StringToNum {
-    fn name(&self) -> &str {
-        "ipv4_string_to_num"
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::uint32_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::new(
-            TypeSignature::Exact(vec![ConcreteDataType::string_datatype()]),
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 1,
-            InvalidFuncArgsSnafu {
-                err_msg: format!("Expected 1 argument, got {}", columns.len())
-            }
-        );
-
-        let ip_vec = &columns[0];
-        let size = ip_vec.len();
-        let mut results = UInt32VectorBuilder::with_capacity(size);
-
-        for i in 0..size {
-            let ip_str = ip_vec.get(i);
-            let ip_num = match ip_str {
-                datatypes::value::Value::String(s) => {
-                    let ip_str = s.as_utf8();
-                    let ip_addr = Ipv4Addr::from_str(ip_str).map_err(|_| {
-                        InvalidFuncArgsSnafu {
-                            err_msg: format!("Invalid IPv4 address format: {}", ip_str),
-                        }
-                        .build()
-                    })?;
-                    Some(u32::from(ip_addr))
-                }
-                _ => None,
-            };
-
-            results.push(ip_num);
-        }
-
-        Ok(results.to_vector())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datatypes::scalars::ScalarVector;
-    use datatypes::vectors::{StringVector, UInt32Vector};
-
-    use super::*;
-
-    #[test]
-    fn test_ipv4_num_to_string() {
-        let func = Ipv4NumToString;
-        let ctx = FunctionContext::default();
-
-        // Test data
-        let values = vec![167772161u32, 3232235521u32, 0u32, 4294967295u32];
-        let input = Arc::new(UInt32Vector::from_vec(values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[input]).unwrap();
-        let result = result.as_any().downcast_ref::<StringVector>().unwrap();
-
-        assert_eq!(result.get_data(0).unwrap(), "10.0.0.1");
-        assert_eq!(result.get_data(1).unwrap(), "192.168.0.1");
-        assert_eq!(result.get_data(2).unwrap(), "0.0.0.0");
-        assert_eq!(result.get_data(3).unwrap(), "255.255.255.255");
-    }
-
-    #[test]
-    fn test_ipv4_string_to_num() {
-        let func = Ipv4StringToNum;
-        let ctx = FunctionContext::default();
-
-        // Test data
-        let values = vec!["10.0.0.1", "192.168.0.1", "0.0.0.0", "255.255.255.255"];
-        let input = Arc::new(StringVector::from_slice(&values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[input]).unwrap();
-        let result = result.as_any().downcast_ref::<UInt32Vector>().unwrap();
-
-        assert_eq!(result.get_data(0).unwrap(), 167772161);
-        assert_eq!(result.get_data(1).unwrap(), 3232235521);
-        assert_eq!(result.get_data(2).unwrap(), 0);
-        assert_eq!(result.get_data(3).unwrap(), 4294967295);
-    }
-
-    #[test]
-    fn test_ipv4_conversions_roundtrip() {
-        let to_num = Ipv4StringToNum;
-        let to_string = Ipv4NumToString;
-        let ctx = FunctionContext::default();
-
-        // Test data for string to num to string
-        let values = vec!["10.0.0.1", "192.168.0.1", "0.0.0.0", "255.255.255.255"];
-        let input = Arc::new(StringVector::from_slice(&values)) as VectorRef;
-
-        let num_result = to_num.eval(&ctx, &[input]).unwrap();
-        let back_to_string = to_string.eval(&ctx, &[num_result]).unwrap();
-        let str_result = back_to_string
-            .as_any()
-            .downcast_ref::<StringVector>()
-            .unwrap();
-
-        for (i, expected) in values.iter().enumerate() {
-            assert_eq!(str_result.get_data(i).unwrap(), *expected);
-        }
-    }
-}
--- a/src/common/function/src/scalars/ip/ipv6.rs
+++ b/src/common/function/src/scalars/ip/ipv6.rs
@@ -1,366 +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::net::{Ipv4Addr, Ipv6Addr};
-use std::str::FromStr;
-
-use common_query::error::{InvalidFuncArgsSnafu, Result};
-use common_query::prelude::{Signature, TypeSignature};
-use datafusion::logical_expr::Volatility;
-use datatypes::prelude::{ConcreteDataType, Value};
-use datatypes::scalars::ScalarVectorBuilder;
-use datatypes::vectors::{BinaryVectorBuilder, MutableVector, StringVectorBuilder, VectorRef};
-use derive_more::Display;
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-
-/// Function that converts a hex string representation of an IPv6 address to a formatted string.
-///
-/// For example:
-/// - "20010DB8000000000000000000000001" returns "2001:db8::1"
-/// - "00000000000000000000FFFFC0A80001" returns "::ffff:192.168.0.1"
-#[derive(Clone, Debug, Default, Display)]
-#[display("{}", self.name())]
-pub struct Ipv6NumToString;
-
-impl Function for Ipv6NumToString {
-    fn name(&self) -> &str {
-        "ipv6_num_to_string"
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::string_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::new(
-            TypeSignature::Exact(vec![ConcreteDataType::string_datatype()]),
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 1,
-            InvalidFuncArgsSnafu {
-                err_msg: format!("Expected 1 argument, got {}", columns.len())
-            }
-        );
-
-        let hex_vec = &columns[0];
-        let size = hex_vec.len();
-        let mut results = StringVectorBuilder::with_capacity(size);
-
-        for i in 0..size {
-            let hex_str = hex_vec.get(i);
-            let ip_str = match hex_str {
-                Value::String(s) => {
-                    let hex_str = s.as_utf8().to_lowercase();
-
-                    // Validate and convert hex string to bytes
-                    let bytes = if hex_str.len() == 32 {
-                        let mut bytes = [0u8; 16];
-                        for i in 0..16 {
-                            let byte_str = &hex_str[i * 2..i * 2 + 2];
-                            bytes[i] = u8::from_str_radix(byte_str, 16).map_err(|_| {
-                                InvalidFuncArgsSnafu {
-                                    err_msg: format!("Invalid hex characters in '{}'", byte_str),
-                                }
-                                .build()
-                            })?;
-                        }
-                        bytes
-                    } else {
-                        return InvalidFuncArgsSnafu {
-                            err_msg: format!("Expected 32 hex characters, got {}", hex_str.len()),
-                        }
-                        .fail();
-                    };
-
-                    // Convert bytes to IPv6 address
-                    let addr = Ipv6Addr::from(bytes);
-
-                    // Special handling for IPv6-mapped IPv4 addresses
-                    if let Some(ipv4) = addr.to_ipv4() {
-                        if addr.octets()[0..10].iter().all(|&b| b == 0)
-                            && addr.octets()[10] == 0xFF
-                            && addr.octets()[11] == 0xFF
-                        {
-                            Some(format!("::ffff:{}", ipv4))
-                        } else {
-                            Some(addr.to_string())
-                        }
-                    } else {
-                        Some(addr.to_string())
-                    }
-                }
-                _ => None,
-            };
-
-            results.push(ip_str.as_deref());
-        }
-
-        Ok(results.to_vector())
-    }
-}
-
-/// Function that converts a string representation of an IPv6 address to its binary representation.
-///
-/// For example:
-/// - "2001:db8::1" returns its binary representation
-/// - If the input string contains a valid IPv4 address, returns its IPv6 equivalent
-/// - HEX can be uppercase or lowercase
-/// - Invalid IPv6 format throws an exception
-#[derive(Clone, Debug, Default, Display)]
-#[display("{}", self.name())]
-pub struct Ipv6StringToNum;
-
-impl Function for Ipv6StringToNum {
-    fn name(&self) -> &str {
-        "ipv6_string_to_num"
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::binary_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::new(
-            TypeSignature::Exact(vec![ConcreteDataType::string_datatype()]),
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 1,
-            InvalidFuncArgsSnafu {
-                err_msg: format!("Expected 1 argument, got {}", columns.len())
-            }
-        );
-
-        let ip_vec = &columns[0];
-        let size = ip_vec.len();
-        let mut results = BinaryVectorBuilder::with_capacity(size);
-
-        for i in 0..size {
-            let ip_str = ip_vec.get(i);
-            let ip_binary = match ip_str {
-                Value::String(s) => {
-                    let addr_str = s.as_utf8();
-
-                    let addr = if let Ok(ipv6) = Ipv6Addr::from_str(addr_str) {
-                        // Direct IPv6 address
-                        ipv6
-                    } else if let Ok(ipv4) = Ipv4Addr::from_str(addr_str) {
-                        // IPv4 address to be converted to IPv6
-                        ipv4.to_ipv6_mapped()
-                    } else {
-                        // Invalid format
-                        return InvalidFuncArgsSnafu {
-                            err_msg: format!("Invalid IPv6 address format: {}", addr_str),
-                        }
-                        .fail();
-                    };
-
-                    // Convert IPv6 address to binary (16 bytes)
-                    let octets = addr.octets();
-                    Some(octets.to_vec())
-                }
-                _ => None,
-            };
-
-            results.push(ip_binary.as_deref());
-        }
-
-        Ok(results.to_vector())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::fmt::Write;
-    use std::sync::Arc;
-
-    use datatypes::scalars::ScalarVector;
-    use datatypes::vectors::{BinaryVector, StringVector, Vector};
-
-    use super::*;
-
-    #[test]
-    fn test_ipv6_num_to_string() {
-        let func = Ipv6NumToString;
-        let ctx = FunctionContext::default();
-
-        // Hex string for "2001:db8::1"
-        let hex_str1 = "20010db8000000000000000000000001";
-
-        // Hex string for IPv4-mapped IPv6 address "::ffff:192.168.0.1"
-        let hex_str2 = "00000000000000000000ffffc0a80001";
-
-        let values = vec![hex_str1, hex_str2];
-        let input = Arc::new(StringVector::from_slice(&values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[input]).unwrap();
-        let result = result.as_any().downcast_ref::<StringVector>().unwrap();
-
-        assert_eq!(result.get_data(0).unwrap(), "2001:db8::1");
-        assert_eq!(result.get_data(1).unwrap(), "::ffff:192.168.0.1");
-    }
-
-    #[test]
-    fn test_ipv6_num_to_string_uppercase() {
-        let func = Ipv6NumToString;
-        let ctx = FunctionContext::default();
-
-        // Uppercase hex string for "2001:db8::1"
-        let hex_str = "20010DB8000000000000000000000001";
-
-        let values = vec![hex_str];
-        let input = Arc::new(StringVector::from_slice(&values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[input]).unwrap();
-        let result = result.as_any().downcast_ref::<StringVector>().unwrap();
-
-        assert_eq!(result.get_data(0).unwrap(), "2001:db8::1");
-    }
-
-    #[test]
-    fn test_ipv6_num_to_string_error() {
-        let func = Ipv6NumToString;
-        let ctx = FunctionContext::default();
-
-        // Invalid hex string - wrong length
-        let hex_str = "20010db8";
-
-        let values = vec![hex_str];
-        let input = Arc::new(StringVector::from_slice(&values)) as VectorRef;
-
-        // Should return an error
-        let result = func.eval(&ctx, &[input]);
-        assert!(result.is_err());
-
-        // Check that the error message contains expected text
-        let error_msg = result.unwrap_err().to_string();
-        assert!(error_msg.contains("Expected 32 hex characters"));
-    }
-
-    #[test]
-    fn test_ipv6_string_to_num() {
-        let func = Ipv6StringToNum;
-        let ctx = FunctionContext::default();
-
-        let values = vec!["2001:db8::1", "::ffff:192.168.0.1", "192.168.0.1"];
-        let input = Arc::new(StringVector::from_slice(&values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[input]).unwrap();
-        let result = result.as_any().downcast_ref::<BinaryVector>().unwrap();
-
-        // Expected binary for "2001:db8::1"
-        let expected_1 = [
-            0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01,
-        ];
-
-        // Expected binary for "::ffff:192.168.0.1" or "192.168.0.1" (IPv4-mapped)
-        let expected_2 = [
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0xC0, 0xA8, 0, 0x01,
-        ];
-
-        assert_eq!(result.get_data(0).unwrap(), &expected_1);
-        assert_eq!(result.get_data(1).unwrap(), &expected_2);
-        assert_eq!(result.get_data(2).unwrap(), &expected_2);
-    }
-
-    #[test]
-    fn test_ipv6_conversions_roundtrip() {
-        let to_num = Ipv6StringToNum;
-        let to_string = Ipv6NumToString;
-        let ctx = FunctionContext::default();
-
-        // Test data
-        let values = vec!["2001:db8::1", "::ffff:192.168.0.1"];
-        let input = Arc::new(StringVector::from_slice(&values)) as VectorRef;
-
-        // Convert IPv6 addresses to binary
-        let binary_result = to_num.eval(&ctx, &[input.clone()]).unwrap();
-
-        // Convert binary to hex string representation (for ipv6_num_to_string)
-        let mut hex_strings = Vec::new();
-        let binary_vector = binary_result
-            .as_any()
-            .downcast_ref::<BinaryVector>()
-            .unwrap();
-
-        for i in 0..binary_vector.len() {
-            let bytes = binary_vector.get_data(i).unwrap();
-            let hex = bytes.iter().fold(String::new(), |mut acc, b| {
-                write!(&mut acc, "{:02x}", b).unwrap();
-                acc
-            });
-            hex_strings.push(hex);
-        }
-
-        let hex_str_refs: Vec<&str> = hex_strings.iter().map(|s| s.as_str()).collect();
-        let hex_input = Arc::new(StringVector::from_slice(&hex_str_refs)) as VectorRef;
-
-        // Now convert hex to formatted string
-        let string_result = to_string.eval(&ctx, &[hex_input]).unwrap();
-        let str_result = string_result
-            .as_any()
-            .downcast_ref::<StringVector>()
-            .unwrap();
-
-        // Compare with original input
-        assert_eq!(str_result.get_data(0).unwrap(), values[0]);
-        assert_eq!(str_result.get_data(1).unwrap(), values[1]);
-    }
-
-    #[test]
-    fn test_ipv6_conversions_hex_roundtrip() {
-        // Create a new test to verify that the string output from ipv6_num_to_string
-        // can be converted back using ipv6_string_to_num
-        let to_string = Ipv6NumToString;
-        let to_binary = Ipv6StringToNum;
-        let ctx = FunctionContext::default();
-
-        // Hex representation of IPv6 addresses
-        let hex_values = vec![
-            "20010db8000000000000000000000001",
-            "00000000000000000000ffffc0a80001",
-        ];
-        let hex_input = Arc::new(StringVector::from_slice(&hex_values)) as VectorRef;
-
-        // Convert hex to string representation
-        let string_result = to_string.eval(&ctx, &[hex_input]).unwrap();
-
-        // Then convert string representation back to binary
-        let binary_result = to_binary.eval(&ctx, &[string_result]).unwrap();
-        let bin_result = binary_result
-            .as_any()
-            .downcast_ref::<BinaryVector>()
-            .unwrap();
-
-        // Expected binary values
-        let expected_bin1 = [
-            0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01,
-        ];
-        let expected_bin2 = [
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0xC0, 0xA8, 0, 0x01,
-        ];
-
-        assert_eq!(bin_result.get_data(0).unwrap(), &expected_bin1);
-        assert_eq!(bin_result.get_data(1).unwrap(), &expected_bin2);
-    }
-}
--- a/src/common/function/src/scalars/ip/range.rs
+++ b/src/common/function/src/scalars/ip/range.rs
@@ -1,473 +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::net::{Ipv4Addr, Ipv6Addr};
-use std::str::FromStr;
-
-use common_query::error::{InvalidFuncArgsSnafu, Result};
-use common_query::prelude::{Signature, TypeSignature};
-use datafusion::logical_expr::Volatility;
-use datatypes::prelude::{ConcreteDataType, Value};
-use datatypes::scalars::ScalarVectorBuilder;
-use datatypes::vectors::{BooleanVectorBuilder, MutableVector, VectorRef};
-use derive_more::Display;
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-
-/// Function that checks if an IPv4 address is within a specified CIDR range.
-///
-/// Both the IP address and the CIDR range are provided as strings.
-/// Returns boolean result indicating whether the IP is in the range.
-///
-/// Examples:
-/// - ipv4_in_range('192.168.1.5', '192.168.1.0/24') -> true
-/// - ipv4_in_range('192.168.2.1', '192.168.1.0/24') -> false
-/// - ipv4_in_range('10.0.0.1', '10.0.0.0/8') -> true
-#[derive(Clone, Debug, Default, Display)]
-#[display("{}", self.name())]
-pub struct Ipv4InRange;
-
-impl Function for Ipv4InRange {
-    fn name(&self) -> &str {
-        "ipv4_in_range"
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::boolean_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::new(
-            TypeSignature::Exact(vec![
-                ConcreteDataType::string_datatype(),
-                ConcreteDataType::string_datatype(),
-            ]),
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 2,
-            InvalidFuncArgsSnafu {
-                err_msg: format!("Expected 2 arguments, got {}", columns.len())
-            }
-        );
-
-        let ip_vec = &columns[0];
-        let range_vec = &columns[1];
-        let size = ip_vec.len();
-
-        ensure!(
-            range_vec.len() == size,
-            InvalidFuncArgsSnafu {
-                err_msg: "IP addresses and CIDR ranges must have the same number of rows"
-                    .to_string()
-            }
-        );
-
-        let mut results = BooleanVectorBuilder::with_capacity(size);
-
-        for i in 0..size {
-            let ip = ip_vec.get(i);
-            let range = range_vec.get(i);
-
-            let in_range = match (ip, range) {
-                (Value::String(ip_str), Value::String(range_str)) => {
-                    let ip_str = ip_str.as_utf8().trim();
-                    let range_str = range_str.as_utf8().trim();
-
-                    if ip_str.is_empty() || range_str.is_empty() {
-                        return InvalidFuncArgsSnafu {
-                            err_msg: "IP address and CIDR range cannot be empty".to_string(),
-                        }
-                        .fail();
-                    }
-
-                    // Parse the IP address
-                    let ip_addr = Ipv4Addr::from_str(ip_str).map_err(|_| {
-                        InvalidFuncArgsSnafu {
-                            err_msg: format!("Invalid IPv4 address: {}", ip_str),
-                        }
-                        .build()
-                    })?;
-
-                    // Parse the CIDR range
-                    let (cidr_ip, cidr_prefix) = parse_ipv4_cidr(range_str)?;
-
-                    // Check if the IP is in the CIDR range
-                    is_ipv4_in_range(&ip_addr, &cidr_ip, cidr_prefix)
-                }
-                _ => None,
-            };
-
-            results.push(in_range);
-        }
-
-        Ok(results.to_vector())
-    }
-}
-
-/// Function that checks if an IPv6 address is within a specified CIDR range.
-///
-/// Both the IP address and the CIDR range are provided as strings.
-/// Returns boolean result indicating whether the IP is in the range.
-///
-/// Examples:
-/// - ipv6_in_range('2001:db8::1', '2001:db8::/32') -> true
-/// - ipv6_in_range('2001:db8:1::', '2001:db8::/32') -> true
-/// - ipv6_in_range('2001:db9::1', '2001:db8::/32') -> false
-/// - ipv6_in_range('::1', '::1/128') -> true
-#[derive(Clone, Debug, Default, Display)]
-#[display("{}", self.name())]
-pub struct Ipv6InRange;
-
-impl Function for Ipv6InRange {
-    fn name(&self) -> &str {
-        "ipv6_in_range"
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::boolean_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::new(
-            TypeSignature::Exact(vec![
-                ConcreteDataType::string_datatype(),
-                ConcreteDataType::string_datatype(),
-            ]),
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 2,
-            InvalidFuncArgsSnafu {
-                err_msg: format!("Expected 2 arguments, got {}", columns.len())
-            }
-        );
-
-        let ip_vec = &columns[0];
-        let range_vec = &columns[1];
-        let size = ip_vec.len();
-
-        ensure!(
-            range_vec.len() == size,
-            InvalidFuncArgsSnafu {
-                err_msg: "IP addresses and CIDR ranges must have the same number of rows"
-                    .to_string()
-            }
-        );
-
-        let mut results = BooleanVectorBuilder::with_capacity(size);
-
-        for i in 0..size {
-            let ip = ip_vec.get(i);
-            let range = range_vec.get(i);
-
-            let in_range = match (ip, range) {
-                (Value::String(ip_str), Value::String(range_str)) => {
-                    let ip_str = ip_str.as_utf8().trim();
-                    let range_str = range_str.as_utf8().trim();
-
-                    if ip_str.is_empty() || range_str.is_empty() {
-                        return InvalidFuncArgsSnafu {
-                            err_msg: "IP address and CIDR range cannot be empty".to_string(),
-                        }
-                        .fail();
-                    }
-
-                    // Parse the IP address
-                    let ip_addr = Ipv6Addr::from_str(ip_str).map_err(|_| {
-                        InvalidFuncArgsSnafu {
-                            err_msg: format!("Invalid IPv6 address: {}", ip_str),
-                        }
-                        .build()
-                    })?;
-
-                    // Parse the CIDR range
-                    let (cidr_ip, cidr_prefix) = parse_ipv6_cidr(range_str)?;
-
-                    // Check if the IP is in the CIDR range
-                    is_ipv6_in_range(&ip_addr, &cidr_ip, cidr_prefix)
-                }
-                _ => None,
-            };
-
-            results.push(in_range);
-        }
-
-        Ok(results.to_vector())
-    }
-}
-
-// Helper functions
-
-fn parse_ipv4_cidr(cidr: &str) -> Result<(Ipv4Addr, u8)> {
-    // Split the CIDR string into IP and prefix parts
-    let parts: Vec<&str> = cidr.split('/').collect();
-    ensure!(
-        parts.len() == 2,
-        InvalidFuncArgsSnafu {
-            err_msg: format!("Invalid CIDR notation: {}", cidr),
-        }
-    );
-
-    // Parse the IP address part
-    let ip = Ipv4Addr::from_str(parts[0]).map_err(|_| {
-        InvalidFuncArgsSnafu {
-            err_msg: format!("Invalid IPv4 address in CIDR: {}", parts[0]),
-        }
-        .build()
-    })?;
-
-    // Parse the prefix length
-    let prefix = parts[1].parse::<u8>().map_err(|_| {
-        InvalidFuncArgsSnafu {
-            err_msg: format!("Invalid prefix length: {}", parts[1]),
-        }
-        .build()
-    })?;
-
-    ensure!(
-        prefix <= 32,
-        InvalidFuncArgsSnafu {
-            err_msg: format!("IPv4 prefix length must be <= 32, got {}", prefix),
-        }
-    );
-
-    Ok((ip, prefix))
-}
-
-fn parse_ipv6_cidr(cidr: &str) -> Result<(Ipv6Addr, u8)> {
-    // Split the CIDR string into IP and prefix parts
-    let parts: Vec<&str> = cidr.split('/').collect();
-    ensure!(
-        parts.len() == 2,
-        InvalidFuncArgsSnafu {
-            err_msg: format!("Invalid CIDR notation: {}", cidr),
-        }
-    );
-
-    // Parse the IP address part
-    let ip = Ipv6Addr::from_str(parts[0]).map_err(|_| {
-        InvalidFuncArgsSnafu {
-            err_msg: format!("Invalid IPv6 address in CIDR: {}", parts[0]),
-        }
-        .build()
-    })?;
-
-    // Parse the prefix length
-    let prefix = parts[1].parse::<u8>().map_err(|_| {
-        InvalidFuncArgsSnafu {
-            err_msg: format!("Invalid prefix length: {}", parts[1]),
-        }
-        .build()
-    })?;
-
-    ensure!(
-        prefix <= 128,
-        InvalidFuncArgsSnafu {
-            err_msg: format!("IPv6 prefix length must be <= 128, got {}", prefix),
-        }
-    );
-
-    Ok((ip, prefix))
-}
-
-fn is_ipv4_in_range(ip: &Ipv4Addr, cidr_base: &Ipv4Addr, prefix_len: u8) -> Option<bool> {
-    // Convert both IPs to integers
-    let ip_int = u32::from(*ip);
-    let cidr_int = u32::from(*cidr_base);
-
-    // Calculate the mask from the prefix length
-    let mask = if prefix_len == 0 {
-        0
-    } else {
-        u32::MAX << (32 - prefix_len)
-    };
-
-    // Apply the mask to both IPs and see if they match
-    let ip_network = ip_int & mask;
-    let cidr_network = cidr_int & mask;
-
-    Some(ip_network == cidr_network)
-}
-
-fn is_ipv6_in_range(ip: &Ipv6Addr, cidr_base: &Ipv6Addr, prefix_len: u8) -> Option<bool> {
-    // Get the octets (16 bytes) of both IPs
-    let ip_octets = ip.octets();
-    let cidr_octets = cidr_base.octets();
-
-    // Calculate how many full bytes to compare
-    let full_bytes = (prefix_len / 8) as usize;
-
-    // First, check full bytes for equality
-    for i in 0..full_bytes {
-        if ip_octets[i] != cidr_octets[i] {
-            return Some(false);
-        }
-    }
-
-    // If there's a partial byte to check
-    if prefix_len % 8 != 0 && full_bytes < 16 {
-        let bits_to_check = prefix_len % 8;
-        let mask = 0xFF_u8 << (8 - bits_to_check);
-
-        if (ip_octets[full_bytes] & mask) != (cidr_octets[full_bytes] & mask) {
-            return Some(false);
-        }
-    }
-
-    // If we got here, everything matched
-    Some(true)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datatypes::scalars::ScalarVector;
-    use datatypes::vectors::{BooleanVector, StringVector};
-
-    use super::*;
-
-    #[test]
-    fn test_ipv4_in_range() {
-        let func = Ipv4InRange;
-        let ctx = FunctionContext::default();
-
-        // Test IPs
-        let ip_values = vec![
-            "192.168.1.5",
-            "192.168.2.1",
-            "10.0.0.1",
-            "10.1.0.1",
-            "172.16.0.1",
-        ];
-
-        // Corresponding CIDR ranges
-        let cidr_values = vec![
-            "192.168.1.0/24",
-            "192.168.1.0/24",
-            "10.0.0.0/8",
-            "10.0.0.0/8",
-            "172.16.0.0/16",
-        ];
-
-        let ip_input = Arc::new(StringVector::from_slice(&ip_values)) as VectorRef;
-        let cidr_input = Arc::new(StringVector::from_slice(&cidr_values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[ip_input, cidr_input]).unwrap();
-        let result = result.as_any().downcast_ref::<BooleanVector>().unwrap();
-
-        // Expected results
-        assert!(result.get_data(0).unwrap()); // 192.168.1.5 is in 192.168.1.0/24
-        assert!(!result.get_data(1).unwrap()); // 192.168.2.1 is not in 192.168.1.0/24
-        assert!(result.get_data(2).unwrap()); // 10.0.0.1 is in 10.0.0.0/8
-        assert!(result.get_data(3).unwrap()); // 10.1.0.1 is in 10.0.0.0/8
-        assert!(result.get_data(4).unwrap()); // 172.16.0.1 is in 172.16.0.0/16
-    }
-
-    #[test]
-    fn test_ipv6_in_range() {
-        let func = Ipv6InRange;
-        let ctx = FunctionContext::default();
-
-        // Test IPs
-        let ip_values = vec![
-            "2001:db8::1",
-            "2001:db8:1::",
-            "2001:db9::1",
-            "::1",
-            "fe80::1",
-        ];
-
-        // Corresponding CIDR ranges
-        let cidr_values = vec![
-            "2001:db8::/32",
-            "2001:db8::/32",
-            "2001:db8::/32",
-            "::1/128",
-            "fe80::/16",
-        ];
-
-        let ip_input = Arc::new(StringVector::from_slice(&ip_values)) as VectorRef;
-        let cidr_input = Arc::new(StringVector::from_slice(&cidr_values)) as VectorRef;
-
-        let result = func.eval(&ctx, &[ip_input, cidr_input]).unwrap();
-        let result = result.as_any().downcast_ref::<BooleanVector>().unwrap();
-
-        // Expected results
-        assert!(result.get_data(0).unwrap()); // 2001:db8::1 is in 2001:db8::/32
-        assert!(result.get_data(1).unwrap()); // 2001:db8:1:: is in 2001:db8::/32
-        assert!(!result.get_data(2).unwrap()); // 2001:db9::1 is not in 2001:db8::/32
-        assert!(result.get_data(3).unwrap()); // ::1 is in ::1/128
-        assert!(result.get_data(4).unwrap()); // fe80::1 is in fe80::/16
-    }
-
-    #[test]
-    fn test_invalid_inputs() {
-        let ipv4_func = Ipv4InRange;
-        let ipv6_func = Ipv6InRange;
-        let ctx = FunctionContext::default();
-
-        // Invalid IPv4 address
-        let invalid_ip_values = vec!["not-an-ip", "192.168.1.300"];
-        let cidr_values = vec!["192.168.1.0/24", "192.168.1.0/24"];
-
-        let invalid_ip_input = Arc::new(StringVector::from_slice(&invalid_ip_values)) as VectorRef;
-        let cidr_input = Arc::new(StringVector::from_slice(&cidr_values)) as VectorRef;
-
-        let result = ipv4_func.eval(&ctx, &[invalid_ip_input, cidr_input]);
-        assert!(result.is_err());
-
-        // Invalid CIDR notation
-        let ip_values = vec!["192.168.1.1", "2001:db8::1"];
-        let invalid_cidr_values = vec!["192.168.1.0", "2001:db8::/129"];
-
-        let ip_input = Arc::new(StringVector::from_slice(&ip_values)) as VectorRef;
-        let invalid_cidr_input =
-            Arc::new(StringVector::from_slice(&invalid_cidr_values)) as VectorRef;
-
-        let ipv4_result = ipv4_func.eval(&ctx, &[ip_input.clone(), invalid_cidr_input.clone()]);
-        let ipv6_result = ipv6_func.eval(&ctx, &[ip_input, invalid_cidr_input]);
-
-        assert!(ipv4_result.is_err());
-        assert!(ipv6_result.is_err());
-    }
-
-    #[test]
-    fn test_edge_cases() {
-        let ipv4_func = Ipv4InRange;
-        let ctx = FunctionContext::default();
-
-        // Edge cases like prefix length 0 (matches everything) and 32 (exact match)
-        let ip_values = vec!["8.8.8.8", "192.168.1.1", "192.168.1.1"];
-        let cidr_values = vec!["0.0.0.0/0", "192.168.1.1/32", "192.168.1.0/32"];
-
-        let ip_input = Arc::new(StringVector::from_slice(&ip_values)) as VectorRef;
-        let cidr_input = Arc::new(StringVector::from_slice(&cidr_values)) as VectorRef;
-
-        let result = ipv4_func.eval(&ctx, &[ip_input, cidr_input]).unwrap();
-        let result = result.as_any().downcast_ref::<BooleanVector>().unwrap();
-
-        assert!(result.get_data(0).unwrap()); // 8.8.8.8 is in 0.0.0.0/0 (matches everything)
-        assert!(result.get_data(1).unwrap()); // 192.168.1.1 is in 192.168.1.1/32 (exact match)
-        assert!(!result.get_data(2).unwrap()); // 192.168.1.1 is not in 192.168.1.0/32 (no match)
-    }
-}
--- a/src/common/function/src/scalars/json/json_get.rs
+++ b/src/common/function/src/scalars/json/json_get.rs
@@ -72,7 +72,7 @@ macro_rules! json_get {
                    )
                }

-                fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+                fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
                    ensure!(
                        columns.len() == 2,
                        InvalidFuncArgsSnafu {
@@ -175,7 +175,7 @@ impl Function for JsonGetString {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -282,7 +282,7 @@ mod tests {
        let path_vector = StringVector::from_vec(paths);
        let args: Vec<VectorRef> = vec![Arc::new(json_vector), Arc::new(path_vector)];
        let vector = json_get_int
-            .eval(&FunctionContext::default(), &args)
+            .eval(FunctionContext::default(), &args)
            .unwrap();

        assert_eq!(3, vector.len());
@@ -335,7 +335,7 @@ mod tests {
        let path_vector = StringVector::from_vec(paths);
        let args: Vec<VectorRef> = vec![Arc::new(json_vector), Arc::new(path_vector)];
        let vector = json_get_float
-            .eval(&FunctionContext::default(), &args)
+            .eval(FunctionContext::default(), &args)
            .unwrap();

        assert_eq!(3, vector.len());
@@ -388,7 +388,7 @@ mod tests {
        let path_vector = StringVector::from_vec(paths);
        let args: Vec<VectorRef> = vec![Arc::new(json_vector), Arc::new(path_vector)];
        let vector = json_get_bool
-            .eval(&FunctionContext::default(), &args)
+            .eval(FunctionContext::default(), &args)
            .unwrap();

        assert_eq!(3, vector.len());
@@ -441,7 +441,7 @@ mod tests {
        let path_vector = StringVector::from_vec(paths);
        let args: Vec<VectorRef> = vec![Arc::new(json_vector), Arc::new(path_vector)];
        let vector = json_get_string
-            .eval(&FunctionContext::default(), &args)
+            .eval(FunctionContext::default(), &args)
            .unwrap();

        assert_eq!(3, vector.len());
--- a/src/common/function/src/scalars/json/json_is.rs
+++ b/src/common/function/src/scalars/json/json_is.rs
@@ -45,7 +45,7 @@ macro_rules! json_is {
                    Signature::exact(vec![ConcreteDataType::json_datatype()], Volatility::Immutable)
                }

-                fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+                fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
                    ensure!(
                        columns.len() == 1,
                        InvalidFuncArgsSnafu {
@@ -202,7 +202,7 @@ mod tests {
        let args: Vec<VectorRef> = vec![Arc::new(json_vector)];

        for (func, expected_result) in json_is_functions.iter().zip(expected_results.iter()) {
-            let vector = func.eval(&FunctionContext::default(), &args).unwrap();
+            let vector = func.eval(FunctionContext::default(), &args).unwrap();
            assert_eq!(vector.len(), json_strings.len());

            for (i, expected) in expected_result.iter().enumerate() {
--- a/src/common/function/src/scalars/json/json_path_exists.rs
+++ b/src/common/function/src/scalars/json/json_path_exists.rs
@@ -64,7 +64,7 @@ impl Function for JsonPathExistsFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -204,7 +204,7 @@ mod tests {
        let path_vector = StringVector::from_vec(paths);
        let args: Vec<VectorRef> = vec![Arc::new(json_vector), Arc::new(path_vector)];
        let vector = json_path_exists
-            .eval(&FunctionContext::default(), &args)
+            .eval(FunctionContext::default(), &args)
            .unwrap();

        // Test for non-nulls.
@@ -222,7 +222,7 @@ mod tests {
        let illegal_path = StringVector::from_vec(vec!["$..a"]);

        let args: Vec<VectorRef> = vec![Arc::new(json), Arc::new(illegal_path)];
-        let err = json_path_exists.eval(&FunctionContext::default(), &args);
+        let err = json_path_exists.eval(FunctionContext::default(), &args);
        assert!(err.is_err());

        // Test for nulls.
@@ -235,11 +235,11 @@ mod tests {

        let args: Vec<VectorRef> = vec![Arc::new(null_json), Arc::new(path)];
        let result1 = json_path_exists
-            .eval(&FunctionContext::default(), &args)
+            .eval(FunctionContext::default(), &args)
            .unwrap();
        let args: Vec<VectorRef> = vec![Arc::new(json), Arc::new(null_path)];
        let result2 = json_path_exists
-            .eval(&FunctionContext::default(), &args)
+            .eval(FunctionContext::default(), &args)
            .unwrap();

        assert_eq!(result1.len(), 1);
--- a/src/common/function/src/scalars/json/json_path_match.rs
+++ b/src/common/function/src/scalars/json/json_path_match.rs
@@ -50,7 +50,7 @@ impl Function for JsonPathMatchFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -180,7 +180,7 @@ mod tests {
        let path_vector = StringVector::from(paths);
        let args: Vec<VectorRef> = vec![Arc::new(json_vector), Arc::new(path_vector)];
        let vector = json_path_match
-            .eval(&FunctionContext::default(), &args)
+            .eval(FunctionContext::default(), &args)
            .unwrap();

        assert_eq!(7, vector.len());
--- a/src/common/function/src/scalars/json/json_to_string.rs
+++ b/src/common/function/src/scalars/json/json_to_string.rs
@@ -47,7 +47,7 @@ impl Function for JsonToStringFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 1,
            InvalidFuncArgsSnafu {
@@ -154,7 +154,7 @@ mod tests {
        let json_vector = BinaryVector::from_vec(jsonbs);
        let args: Vec<VectorRef> = vec![Arc::new(json_vector)];
        let vector = json_to_string
-            .eval(&FunctionContext::default(), &args)
+            .eval(FunctionContext::default(), &args)
            .unwrap();

        assert_eq!(3, vector.len());
@@ -168,7 +168,7 @@ mod tests {
        let invalid_jsonb = vec![b"invalid json"];
        let invalid_json_vector = BinaryVector::from_vec(invalid_jsonb);
        let args: Vec<VectorRef> = vec![Arc::new(invalid_json_vector)];
-        let vector = json_to_string.eval(&FunctionContext::default(), &args);
+        let vector = json_to_string.eval(FunctionContext::default(), &args);
        assert!(vector.is_err());
    }
 }
--- a/src/common/function/src/scalars/json/parse_json.rs
+++ b/src/common/function/src/scalars/json/parse_json.rs
@@ -47,7 +47,7 @@ impl Function for ParseJsonFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 1,
            InvalidFuncArgsSnafu {
@@ -152,7 +152,7 @@ mod tests {

        let json_string_vector = StringVector::from_vec(json_strings.to_vec());
        let args: Vec<VectorRef> = vec![Arc::new(json_string_vector)];
-        let vector = parse_json.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = parse_json.eval(FunctionContext::default(), &args).unwrap();

        assert_eq!(3, vector.len());
        for (i, gt) in jsonbs.iter().enumerate() {
--- a/src/common/function/src/scalars/matches.rs
+++ b/src/common/function/src/scalars/matches.rs
@@ -72,7 +72,7 @@ impl Function for MatchesFunction {
    }

    // TODO: read case-sensitive config
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -82,12 +82,6 @@ impl Function for MatchesFunction {
                ),
            }
        );
-
-        let data_column = &columns[0];
-        if data_column.is_empty() {
-            return Ok(Arc::new(BooleanVector::from(Vec::<bool>::with_capacity(0))));
-        }
-
        let pattern_vector = &columns[1]
            .cast(&ConcreteDataType::string_datatype())
            .context(InvalidInputTypeSnafu {
@@ -95,12 +89,12 @@ impl Function for MatchesFunction {
            })?;
        // Safety: both length and type are checked before
        let pattern = pattern_vector.get(0).as_string().unwrap();
-        self.eval(data_column, pattern)
+        self.eval(columns[0].clone(), pattern)
    }
 }

 impl MatchesFunction {
-    fn eval(&self, data: &VectorRef, pattern: String) -> Result<VectorRef> {
+    fn eval(&self, data: VectorRef, pattern: String) -> Result<VectorRef> {
        let col_name = "data";
        let parser_context = ParserContext::default();
        let raw_ast = parser_context.parse_pattern(&pattern)?;
@@ -1315,7 +1309,7 @@ mod test {
            "The quick brown fox jumps over          dog",
            "The quick brown fox jumps over the      dog",
        ];
-        let input_vector: VectorRef = Arc::new(StringVector::from(input_data));
+        let input_vector = Arc::new(StringVector::from(input_data));
        let cases = [
            // basic cases
            ("quick", vec![true, false, true, true, true, true, true]),
@@ -1406,7 +1400,7 @@ mod test {

        let f = MatchesFunction;
        for (pattern, expected) in cases {
-            let actual: VectorRef = f.eval(&input_vector, pattern.to_string()).unwrap();
+            let actual: VectorRef = f.eval(input_vector.clone(), pattern.to_string()).unwrap();
            let expected: VectorRef = Arc::new(BooleanVector::from(expected)) as _;
            assert_eq!(expected, actual, "{pattern}");
        }
--- a/src/common/function/src/scalars/math.rs
+++ b/src/common/function/src/scalars/math.rs
@@ -80,7 +80,7 @@ impl Function for RangeFunction {
        Signature::variadic_any(Volatility::Immutable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
        Err(DataFusionError::Internal(
            "range_fn just a empty function used in range select, It should not be eval!".into(),
        ))
--- a/src/common/function/src/scalars/math/clamp.rs
+++ b/src/common/function/src/scalars/math/clamp.rs
@@ -27,7 +27,7 @@ use datatypes::vectors::PrimitiveVector;
 use datatypes::with_match_primitive_type_id;
 use snafu::{ensure, OptionExt};

-use crate::function::{Function, FunctionContext};
+use crate::function::Function;

 #[derive(Clone, Debug, Default)]
 pub struct ClampFunction;
@@ -49,7 +49,11 @@ impl Function for ClampFunction {
        Signature::uniform(3, ConcreteDataType::numerics(), Volatility::Immutable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(
+        &self,
+        _func_ctx: crate::function::FunctionContext,
+        columns: &[VectorRef],
+    ) -> Result<VectorRef> {
        ensure!(
            columns.len() == 3,
            InvalidFuncArgsSnafu {
@@ -205,7 +209,7 @@ mod test {
                Arc::new(Int64Vector::from_vec(vec![max])) as _,
            ];
            let result = func
-                .eval(&FunctionContext::default(), args.as_slice())
+                .eval(FunctionContext::default(), args.as_slice())
                .unwrap();
            let expected: VectorRef = Arc::new(Int64Vector::from(expected));
            assert_eq!(expected, result);
@@ -249,7 +253,7 @@ mod test {
                Arc::new(UInt64Vector::from_vec(vec![max])) as _,
            ];
            let result = func
-                .eval(&FunctionContext::default(), args.as_slice())
+                .eval(FunctionContext::default(), args.as_slice())
                .unwrap();
            let expected: VectorRef = Arc::new(UInt64Vector::from(expected));
            assert_eq!(expected, result);
@@ -293,7 +297,7 @@ mod test {
                Arc::new(Float64Vector::from_vec(vec![max])) as _,
            ];
            let result = func
-                .eval(&FunctionContext::default(), args.as_slice())
+                .eval(FunctionContext::default(), args.as_slice())
                .unwrap();
            let expected: VectorRef = Arc::new(Float64Vector::from(expected));
            assert_eq!(expected, result);
@@ -313,7 +317,7 @@ mod test {
            Arc::new(Int64Vector::from_vec(vec![max])) as _,
        ];
        let result = func
-            .eval(&FunctionContext::default(), args.as_slice())
+            .eval(FunctionContext::default(), args.as_slice())
            .unwrap();
        let expected: VectorRef = Arc::new(Int64Vector::from(vec![Some(4)]));
        assert_eq!(expected, result);
@@ -331,7 +335,7 @@ mod test {
            Arc::new(Float64Vector::from_vec(vec![min])) as _,
            Arc::new(Float64Vector::from_vec(vec![max])) as _,
        ];
-        let result = func.eval(&FunctionContext::default(), args.as_slice());
+        let result = func.eval(FunctionContext::default(), args.as_slice());
        assert!(result.is_err());
    }

@@ -347,7 +351,7 @@ mod test {
            Arc::new(Int64Vector::from_vec(vec![min])) as _,
            Arc::new(UInt64Vector::from_vec(vec![max])) as _,
        ];
-        let result = func.eval(&FunctionContext::default(), args.as_slice());
+        let result = func.eval(FunctionContext::default(), args.as_slice());
        assert!(result.is_err());
    }

@@ -363,7 +367,7 @@ mod test {
            Arc::new(Float64Vector::from_vec(vec![min, min])) as _,
            Arc::new(Float64Vector::from_vec(vec![max])) as _,
        ];
-        let result = func.eval(&FunctionContext::default(), args.as_slice());
+        let result = func.eval(FunctionContext::default(), args.as_slice());
        assert!(result.is_err());
    }

@@ -377,7 +381,7 @@ mod test {
            Arc::new(Float64Vector::from(input)) as _,
            Arc::new(Float64Vector::from_vec(vec![min])) as _,
        ];
-        let result = func.eval(&FunctionContext::default(), args.as_slice());
+        let result = func.eval(FunctionContext::default(), args.as_slice());
        assert!(result.is_err());
    }

@@ -391,7 +395,7 @@ mod test {
            Arc::new(StringVector::from_vec(vec!["bar"])) as _,
            Arc::new(StringVector::from_vec(vec!["baz"])) as _,
        ];
-        let result = func.eval(&FunctionContext::default(), args.as_slice());
+        let result = func.eval(FunctionContext::default(), args.as_slice());
        assert!(result.is_err());
    }
 }
--- a/src/common/function/src/scalars/math/modulo.rs
+++ b/src/common/function/src/scalars/math/modulo.rs
@@ -58,7 +58,7 @@ impl Function for ModuloFunction {
        Signature::uniform(2, ConcreteDataType::numerics(), Volatility::Immutable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -126,7 +126,7 @@ mod tests {
            Arc::new(Int32Vector::from_vec(nums.clone())),
            Arc::new(Int32Vector::from_vec(divs.clone())),
        ];
-        let result = function.eval(&FunctionContext::default(), &args).unwrap();
+        let result = function.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(result.len(), 4);
        for i in 0..4 {
            let p: i64 = (nums[i] % divs[i]) as i64;
@@ -158,7 +158,7 @@ mod tests {
            Arc::new(UInt32Vector::from_vec(nums.clone())),
            Arc::new(UInt32Vector::from_vec(divs.clone())),
        ];
-        let result = function.eval(&FunctionContext::default(), &args).unwrap();
+        let result = function.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(result.len(), 4);
        for i in 0..4 {
            let p: u64 = (nums[i] % divs[i]) as u64;
@@ -190,7 +190,7 @@ mod tests {
            Arc::new(Float64Vector::from_vec(nums.clone())),
            Arc::new(Float64Vector::from_vec(divs.clone())),
        ];
-        let result = function.eval(&FunctionContext::default(), &args).unwrap();
+        let result = function.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(result.len(), 4);
        for i in 0..4 {
            let p: f64 = nums[i] % divs[i];
@@ -209,7 +209,7 @@ mod tests {
            Arc::new(Int32Vector::from_vec(nums.clone())),
            Arc::new(Int32Vector::from_vec(divs.clone())),
        ];
-        let result = function.eval(&FunctionContext::default(), &args);
+        let result = function.eval(FunctionContext::default(), &args);
        assert!(result.is_err());
        let err_msg = result.unwrap_err().output_msg();
        assert_eq!(
@@ -220,7 +220,7 @@ mod tests {
        let nums = vec![27];

        let args: Vec<VectorRef> = vec![Arc::new(Int32Vector::from_vec(nums.clone()))];
-        let result = function.eval(&FunctionContext::default(), &args);
+        let result = function.eval(FunctionContext::default(), &args);
        assert!(result.is_err());
        let err_msg = result.unwrap_err().output_msg();
        assert!(
@@ -233,7 +233,7 @@ mod tests {
            Arc::new(StringVector::from(nums.clone())),
            Arc::new(StringVector::from(divs.clone())),
        ];
-        let result = function.eval(&FunctionContext::default(), &args);
+        let result = function.eval(FunctionContext::default(), &args);
        assert!(result.is_err());
        let err_msg = result.unwrap_err().output_msg();
        assert!(err_msg.contains("Invalid arithmetic operation"));
--- a/src/common/function/src/scalars/math/pow.rs
+++ b/src/common/function/src/scalars/math/pow.rs
@@ -44,7 +44,7 @@ impl Function for PowFunction {
        Signature::uniform(2, ConcreteDataType::numerics(), Volatility::Immutable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        with_match_primitive_type_id!(columns[0].data_type().logical_type_id(), |$S| {
            with_match_primitive_type_id!(columns[1].data_type().logical_type_id(), |$T| {
                let col = scalar_binary_op::<<$S as LogicalPrimitiveType>::Native, <$T as LogicalPrimitiveType>::Native, f64, _>(&columns[0], &columns[1], scalar_pow, &mut EvalContext::default())?;
@@ -109,7 +109,7 @@ mod tests {
            Arc::new(Int8Vector::from_vec(bases.clone())),
        ];

-        let vector = pow.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = pow.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(3, vector.len());

        for i in 0..3 {
--- a/src/common/function/src/scalars/math/rate.rs
+++ b/src/common/function/src/scalars/math/rate.rs
@@ -48,7 +48,7 @@ impl Function for RateFunction {
        Signature::uniform(2, ConcreteDataType::numerics(), Volatility::Immutable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        let val = &columns[0].to_arrow_array();
        let val_0 = val.slice(0, val.len() - 1);
        let val_1 = val.slice(1, val.len() - 1);
@@ -100,7 +100,7 @@ mod tests {
            Arc::new(Float32Vector::from_vec(values)),
            Arc::new(Int64Vector::from_vec(ts)),
        ];
-        let vector = rate.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = rate.eval(FunctionContext::default(), &args).unwrap();
        let expect: VectorRef = Arc::new(Float64Vector::from_vec(vec![2.0, 3.0]));
        assert_eq!(expect, vector);
    }
--- a/src/common/function/src/scalars/test.rs
+++ b/src/common/function/src/scalars/test.rs
@@ -45,7 +45,7 @@ impl Function for TestAndFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        let col = scalar_binary_op::<bool, bool, bool, _>(
            &columns[0],
            &columns[1],
--- a/src/common/function/src/scalars/timestamp/greatest.rs
+++ b/src/common/function/src/scalars/timestamp/greatest.rs
@@ -97,7 +97,7 @@ impl Function for GreatestFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -191,9 +191,7 @@ mod tests {
            ])) as _,
        ];

-        let result = function
-            .eval(&FunctionContext::default(), &columns)
-            .unwrap();
+        let result = function.eval(FunctionContext::default(), &columns).unwrap();
        let result = result.as_any().downcast_ref::<DateTimeVector>().unwrap();
        assert_eq!(result.len(), 2);
        assert_eq!(
@@ -224,9 +222,7 @@ mod tests {
            Arc::new(DateVector::from_slice(vec![0, 1])) as _,
        ];

-        let result = function
-            .eval(&FunctionContext::default(), &columns)
-            .unwrap();
+        let result = function.eval(FunctionContext::default(), &columns).unwrap();
        let result = result.as_any().downcast_ref::<DateVector>().unwrap();
        assert_eq!(result.len(), 2);
        assert_eq!(
@@ -257,9 +253,7 @@ mod tests {
            Arc::new(DateTimeVector::from_slice(vec![0, 1])) as _,
        ];

-        let result = function
-            .eval(&FunctionContext::default(), &columns)
-            .unwrap();
+        let result = function.eval(FunctionContext::default(), &columns).unwrap();
        let result = result.as_any().downcast_ref::<DateTimeVector>().unwrap();
        assert_eq!(result.len(), 2);
        assert_eq!(
@@ -288,7 +282,7 @@ mod tests {
                        Arc::new([<Timestamp $unit Vector>]::from_slice(vec![0, 1])) as _,
                    ];

-                    let result = function.eval(&FunctionContext::default(), &columns).unwrap();
+                    let result = function.eval(FunctionContext::default(), &columns).unwrap();
                    let result = result.as_any().downcast_ref::<[<Timestamp $unit Vector>]>().unwrap();
                    assert_eq!(result.len(), 2);
                    assert_eq!(
--- a/src/common/function/src/scalars/timestamp/to_unixtime.rs
+++ b/src/common/function/src/scalars/timestamp/to_unixtime.rs
@@ -92,7 +92,7 @@ impl Function for ToUnixtimeFunction {
        )
    }

-    fn eval(&self, ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 1,
            InvalidFuncArgsSnafu {
@@ -108,7 +108,7 @@ impl Function for ToUnixtimeFunction {
        match columns[0].data_type() {
            ConcreteDataType::String(_) => Ok(Arc::new(Int64Vector::from(
                (0..vector.len())
-                    .map(|i| convert_to_seconds(&vector.get(i).to_string(), ctx))
+                    .map(|i| convert_to_seconds(&vector.get(i).to_string(), &func_ctx))
                    .collect::<Vec<_>>(),
            ))),
            ConcreteDataType::Int64(_) | ConcreteDataType::Int32(_) => {
@@ -187,7 +187,7 @@ mod tests {
        ];
        let results = [Some(1677652502), None, Some(1656633600), None];
        let args: Vec<VectorRef> = vec![Arc::new(StringVector::from(times.clone()))];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(4, vector.len());
        for (i, _t) in times.iter().enumerate() {
            let v = vector.get(i);
@@ -211,7 +211,7 @@ mod tests {
        let times = vec![Some(3_i64), None, Some(5_i64), None];
        let results = [Some(3), None, Some(5), None];
        let args: Vec<VectorRef> = vec![Arc::new(Int64Vector::from(times.clone()))];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(4, vector.len());
        for (i, _t) in times.iter().enumerate() {
            let v = vector.get(i);
@@ -236,7 +236,7 @@ mod tests {
        let results = [Some(10627200), None, Some(3628800), None];
        let date_vector = DateVector::from(times.clone());
        let args: Vec<VectorRef> = vec![Arc::new(date_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(4, vector.len());
        for (i, _t) in times.iter().enumerate() {
            let v = vector.get(i);
@@ -261,7 +261,7 @@ mod tests {
        let results = [Some(123), None, Some(42), None];
        let date_vector = DateTimeVector::from(times.clone());
        let args: Vec<VectorRef> = vec![Arc::new(date_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(4, vector.len());
        for (i, _t) in times.iter().enumerate() {
            let v = vector.get(i);
@@ -286,7 +286,7 @@ mod tests {
        let results = [Some(123), None, Some(42), None];
        let ts_vector = TimestampSecondVector::from(times.clone());
        let args: Vec<VectorRef> = vec![Arc::new(ts_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(4, vector.len());
        for (i, _t) in times.iter().enumerate() {
            let v = vector.get(i);
@@ -306,7 +306,7 @@ mod tests {
        let results = [Some(123), None, Some(42), None];
        let ts_vector = TimestampMillisecondVector::from(times.clone());
        let args: Vec<VectorRef> = vec![Arc::new(ts_vector)];
-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(4, vector.len());
        for (i, _t) in times.iter().enumerate() {
            let v = vector.get(i);
--- a/src/common/function/src/scalars/uddsketch_calc.rs
+++ b/src/common/function/src/scalars/uddsketch_calc.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.
-
-//! Implementation of the scalar function `uddsketch_calc`.
-
-use std::fmt;
-use std::fmt::Display;
-use std::sync::Arc;
-
-use common_query::error::{DowncastVectorSnafu, InvalidFuncArgsSnafu, Result};
-use common_query::prelude::{Signature, Volatility};
-use datatypes::data_type::ConcreteDataType;
-use datatypes::prelude::Vector;
-use datatypes::scalars::{ScalarVector, ScalarVectorBuilder};
-use datatypes::vectors::{BinaryVector, Float64VectorBuilder, MutableVector, VectorRef};
-use snafu::OptionExt;
-use uddsketch::UDDSketch;
-
-use crate::function::{Function, FunctionContext};
-use crate::function_registry::FunctionRegistry;
-
-const NAME: &str = "uddsketch_calc";
-
-/// UddSketchCalcFunction implements the scalar function `uddsketch_calc`.
-///
-/// It accepts two arguments:
-/// 1. A percentile (as f64) for which to compute the estimated quantile (e.g. 0.95 for p95).
-/// 2. The serialized UDDSketch state, as produced by the aggregator (binary).
-///
-/// For each row, it deserializes the sketch and returns the computed quantile value.
-#[derive(Debug, Default)]
-pub struct UddSketchCalcFunction;
-
-impl UddSketchCalcFunction {
-    pub fn register(registry: &FunctionRegistry) {
-        registry.register(Arc::new(UddSketchCalcFunction));
-    }
-}
-
-impl Display for UddSketchCalcFunction {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", NAME.to_ascii_uppercase())
-    }
-}
-
-impl Function for UddSketchCalcFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        Ok(ConcreteDataType::float64_datatype())
-    }
-
-    fn signature(&self) -> Signature {
-        // First argument: percentile (float64)
-        // Second argument: UDDSketch state (binary)
-        Signature::exact(
-            vec![
-                ConcreteDataType::float64_datatype(),
-                ConcreteDataType::binary_datatype(),
-            ],
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        if columns.len() != 2 {
-            return InvalidFuncArgsSnafu {
-                err_msg: format!("uddsketch_calc expects 2 arguments, got {}", columns.len()),
-            }
-            .fail();
-        }
-
-        let perc_vec = &columns[0];
-        let sketch_vec = columns[1]
-            .as_any()
-            .downcast_ref::<BinaryVector>()
-            .with_context(|| DowncastVectorSnafu {
-                err_msg: format!("expect BinaryVector, got {}", columns[1].vector_type_name()),
-            })?;
-        let len = sketch_vec.len();
-        let mut builder = Float64VectorBuilder::with_capacity(len);
-
-        for i in 0..len {
-            let perc_opt = perc_vec.get(i).as_f64_lossy();
-            let sketch_opt = sketch_vec.get_data(i);
-
-            if sketch_opt.is_none() || perc_opt.is_none() {
-                builder.push_null();
-                continue;
-            }
-
-            let sketch_bytes = sketch_opt.unwrap();
-            let perc = perc_opt.unwrap();
-
-            // Deserialize the UDDSketch from its bincode representation
-            let sketch: UDDSketch = match bincode::deserialize(sketch_bytes) {
-                Ok(s) => s,
-                Err(e) => {
-                    common_telemetry::trace!("Failed to deserialize UDDSketch: {}", e);
-                    builder.push_null();
-                    continue;
-                }
-            };
-
-            // Compute the estimated quantile from the sketch
-            let result = sketch.estimate_quantile(perc);
-            builder.push(Some(result));
-        }
-
-        Ok(builder.to_vector())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use datatypes::vectors::{BinaryVector, Float64Vector};
-
-    use super::*;
-
-    #[test]
-    fn test_uddsketch_calc_function() {
-        let function = UddSketchCalcFunction;
-        assert_eq!("uddsketch_calc", function.name());
-        assert_eq!(
-            ConcreteDataType::float64_datatype(),
-            function
-                .return_type(&[ConcreteDataType::float64_datatype()])
-                .unwrap()
-        );
-
-        // Create a test sketch
-        let mut sketch = UDDSketch::new(128, 0.01);
-        sketch.add_value(10.0);
-        sketch.add_value(20.0);
-        sketch.add_value(30.0);
-        sketch.add_value(40.0);
-        sketch.add_value(50.0);
-        sketch.add_value(60.0);
-        sketch.add_value(70.0);
-        sketch.add_value(80.0);
-        sketch.add_value(90.0);
-        sketch.add_value(100.0);
-
-        // Get expected values directly from the sketch
-        let expected_p50 = sketch.estimate_quantile(0.5);
-        let expected_p90 = sketch.estimate_quantile(0.9);
-        let expected_p95 = sketch.estimate_quantile(0.95);
-
-        let serialized = bincode::serialize(&sketch).unwrap();
-        let percentiles = vec![0.5, 0.9, 0.95];
-
-        let args: Vec<VectorRef> = vec![
-            Arc::new(Float64Vector::from_vec(percentiles.clone())),
-            Arc::new(BinaryVector::from(vec![Some(serialized.clone()); 3])),
-        ];
-
-        let result = function.eval(&FunctionContext::default(), &args).unwrap();
-        assert_eq!(result.len(), 3);
-
-        // Test median (p50)
-        assert!(
-            matches!(result.get(0), datatypes::value::Value::Float64(v) if (v - expected_p50).abs() < 1e-10)
-        );
-        // Test p90
-        assert!(
-            matches!(result.get(1), datatypes::value::Value::Float64(v) if (v - expected_p90).abs() < 1e-10)
-        );
-        // Test p95
-        assert!(
-            matches!(result.get(2), datatypes::value::Value::Float64(v) if (v - expected_p95).abs() < 1e-10)
-        );
-    }
-
-    #[test]
-    fn test_uddsketch_calc_function_errors() {
-        let function = UddSketchCalcFunction;
-
-        // Test with invalid number of arguments
-        let args: Vec<VectorRef> = vec![Arc::new(Float64Vector::from_vec(vec![0.95]))];
-        let result = function.eval(&FunctionContext::default(), &args);
-        assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .to_string()
-            .contains("uddsketch_calc expects 2 arguments"));
-
-        // Test with invalid binary data
-        let args: Vec<VectorRef> = vec![
-            Arc::new(Float64Vector::from_vec(vec![0.95])),
-            Arc::new(BinaryVector::from(vec![Some(vec![1, 2, 3])])), // Invalid binary data
-        ];
-        let result = function.eval(&FunctionContext::default(), &args).unwrap();
-        assert_eq!(result.len(), 1);
-        assert!(matches!(result.get(0), datatypes::value::Value::Null));
-    }
-}
--- a/src/common/function/src/scalars/udf.rs
+++ b/src/common/function/src/scalars/udf.rs
@@ -12,15 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::any::Any;
-use std::fmt::{Debug, Formatter};
 use std::sync::Arc;

 use common_query::error::FromScalarValueSnafu;
-use common_query::prelude::ColumnarValue;
-use datafusion::logical_expr::{ScalarFunctionArgs, ScalarUDFImpl};
-use datafusion_expr::ScalarUDF;
-use datatypes::data_type::DataType;
+use common_query::prelude::{
+    ColumnarValue, ReturnTypeFunction, ScalarFunctionImplementation, ScalarUdf,
+};
+use datatypes::error::Error as DataTypeError;
 use datatypes::prelude::*;
 use datatypes::vectors::Helper;
 use session::context::QueryContextRef;
@@ -29,92 +27,58 @@ use snafu::ResultExt;
 use crate::function::{FunctionContext, FunctionRef};
 use crate::state::FunctionState;

-struct ScalarUdf {
-    function: FunctionRef,
-    signature: datafusion_expr::Signature,
-    context: FunctionContext,
-}
-
-impl Debug for ScalarUdf {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("ScalarUdf")
-            .field("function", &self.function.name())
-            .field("signature", &self.signature)
-            .finish()
-    }
-}
-
-impl ScalarUDFImpl for ScalarUdf {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn name(&self) -> &str {
-        self.function.name()
-    }
-
-    fn signature(&self) -> &datafusion_expr::Signature {
-        &self.signature
-    }
-
-    fn return_type(
-        &self,
-        arg_types: &[datatypes::arrow::datatypes::DataType],
-    ) -> datafusion_common::Result<datatypes::arrow::datatypes::DataType> {
-        let arg_types = arg_types
-            .iter()
-            .map(ConcreteDataType::from_arrow_type)
-            .collect::<Vec<_>>();
-        let t = self.function.return_type(&arg_types)?;
-        Ok(t.as_arrow_type())
-    }
-
-    fn invoke_with_args(
-        &self,
-        args: ScalarFunctionArgs,
-    ) -> datafusion_common::Result<datafusion_expr::ColumnarValue> {
-        let columns = args
-            .args
-            .iter()
-            .map(|x| {
-                ColumnarValue::try_from(x).and_then(|y| match y {
-                    ColumnarValue::Vector(z) => Ok(z),
-                    ColumnarValue::Scalar(z) => Helper::try_from_scalar_value(z, args.number_rows)
-                        .context(FromScalarValueSnafu),
-                })
-            })
-            .collect::<common_query::error::Result<Vec<_>>>()?;
-        let v = self
-            .function
-            .eval(&self.context, &columns)
-            .map(ColumnarValue::Vector)?;
-        Ok(v.into())
-    }
-}
-
 /// Create a ScalarUdf from function, query context and state.
 pub fn create_udf(
    func: FunctionRef,
    query_ctx: QueryContextRef,
    state: Arc<FunctionState>,
-) -> ScalarUDF {
-    let signature = func.signature().into();
-    let udf = ScalarUdf {
-        function: func,
-        signature,
-        context: FunctionContext { query_ctx, state },
-    };
-    ScalarUDF::new_from_impl(udf)
+) -> ScalarUdf {
+    let func_cloned = func.clone();
+    let return_type: ReturnTypeFunction = Arc::new(move |input_types: &[ConcreteDataType]| {
+        Ok(Arc::new(func_cloned.return_type(input_types)?))
+    });
+
+    let func_cloned = func.clone();
+
+    let fun: ScalarFunctionImplementation = Arc::new(move |args: &[ColumnarValue]| {
+        let func_ctx = FunctionContext {
+            query_ctx: query_ctx.clone(),
+            state: state.clone(),
+        };
+
+        let len = args
+            .iter()
+            .fold(Option::<usize>::None, |acc, arg| match arg {
+                ColumnarValue::Scalar(_) => acc,
+                ColumnarValue::Vector(v) => Some(v.len()),
+            });
+
+        let rows = len.unwrap_or(1);
+
+        let args: Result<Vec<_>, DataTypeError> = args
+            .iter()
+            .map(|arg| match arg {
+                ColumnarValue::Scalar(v) => Helper::try_from_scalar_value(v.clone(), rows),
+                ColumnarValue::Vector(v) => Ok(v.clone()),
+            })
+            .collect();
+
+        let result = func_cloned.eval(func_ctx, &args.context(FromScalarValueSnafu)?);
+        let udf_result = result.map(ColumnarValue::Vector)?;
+        Ok(udf_result)
+    });
+
+    ScalarUdf::new(func.name(), &func.signature(), &return_type, &fun)
 }

 #[cfg(test)]
 mod tests {
    use std::sync::Arc;

-    use common_query::prelude::ScalarValue;
-    use datafusion::arrow::array::BooleanArray;
+    use common_query::prelude::{ColumnarValue, ScalarValue};
    use datatypes::data_type::ConcreteDataType;
-    use datatypes::prelude::VectorRef;
+    use datatypes::prelude::{ScalarVector, Vector, VectorRef};
+    use datatypes::value::Value;
    use datatypes::vectors::{BooleanVector, ConstantVector};
    use session::context::QueryContextBuilder;

@@ -135,7 +99,7 @@ mod tests {
            Arc::new(BooleanVector::from(vec![true, false, true])),
        ];

-        let vector = f.eval(&FunctionContext::default(), &args).unwrap();
+        let vector = f.eval(FunctionContext::default(), &args).unwrap();
        assert_eq!(3, vector.len());

        for i in 0..3 {
@@ -145,36 +109,30 @@ mod tests {
        // create a udf and test it again
        let udf = create_udf(f.clone(), query_ctx, Arc::new(FunctionState::default()));

-        assert_eq!("test_and", udf.name());
-        let expected_signature: datafusion_expr::Signature = f.signature().into();
-        assert_eq!(udf.signature(), &expected_signature);
+        assert_eq!("test_and", udf.name);
+        assert_eq!(f.signature(), udf.signature);
        assert_eq!(
-            ConcreteDataType::boolean_datatype(),
-            udf.return_type(&[])
-                .map(|x| ConcreteDataType::from_arrow_type(&x))
-                .unwrap()
+            Arc::new(ConcreteDataType::boolean_datatype()),
+            ((udf.return_type)(&[])).unwrap()
        );

        let args = vec![
-            datafusion_expr::ColumnarValue::Scalar(ScalarValue::Boolean(Some(true))),
-            datafusion_expr::ColumnarValue::Array(Arc::new(BooleanArray::from(vec![
+            ColumnarValue::Scalar(ScalarValue::Boolean(Some(true))),
+            ColumnarValue::Vector(Arc::new(BooleanVector::from(vec![
                true, false, false, true,
            ]))),
        ];

-        let args = ScalarFunctionArgs {
-            args: &args,
-            number_rows: 4,
-            return_type: &ConcreteDataType::boolean_datatype().as_arrow_type(),
-        };
-        match udf.invoke_with_args(args).unwrap() {
-            datafusion_expr::ColumnarValue::Array(x) => {
-                let x = x.as_any().downcast_ref::<BooleanArray>().unwrap();
-                assert_eq!(x.len(), 4);
-                assert_eq!(
-                    x.iter().flatten().collect::<Vec<bool>>(),
-                    vec![true, false, false, true]
-                );
+        let vec = (udf.fun)(&args).unwrap();
+
+        match vec {
+            ColumnarValue::Vector(vec) => {
+                let vec = vec.as_any().downcast_ref::<BooleanVector>().unwrap();
+
+                assert_eq!(4, vec.len());
+                for i in 0..4 {
+                    assert_eq!(i == 0 || i == 3, vec.get_data(i).unwrap(), "Failed at {i}",)
+                }
            }
            _ => unreachable!(),
        }
--- a/src/common/function/src/scalars/vector.rs
+++ b/src/common/function/src/scalars/vector.rs
@@ -22,7 +22,6 @@ mod scalar_add;
 mod scalar_mul;
 pub(crate) mod sum;
 mod vector_add;
-mod vector_dim;
 mod vector_div;
 mod vector_mul;
 mod vector_norm;
@@ -55,7 +54,6 @@ impl VectorFunction {
        registry.register(Arc::new(vector_mul::VectorMulFunction));
        registry.register(Arc::new(vector_div::VectorDivFunction));
        registry.register(Arc::new(vector_norm::VectorNormFunction));
-        registry.register(Arc::new(vector_dim::VectorDimFunction));
        registry.register(Arc::new(elem_sum::ElemSumFunction));
        registry.register(Arc::new(elem_product::ElemProductFunction));
    }
--- a/src/common/function/src/scalars/vector/convert/parse_vector.rs
+++ b/src/common/function/src/scalars/vector/convert/parse_vector.rs
@@ -45,7 +45,7 @@ impl Function for ParseVectorFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 1,
            InvalidFuncArgsSnafu {
@@ -101,7 +101,7 @@ mod tests {
            None,
        ]));

-        let result = func.eval(&FunctionContext::default(), &[input]).unwrap();
+        let result = func.eval(FunctionContext::default(), &[input]).unwrap();

        let result = result.as_ref();
        assert_eq!(result.len(), 3);
@@ -136,7 +136,7 @@ mod tests {
            Some("[7.0,8.0,9.0".to_string()),
        ]));

-        let result = func.eval(&FunctionContext::default(), &[input]);
+        let result = func.eval(FunctionContext::default(), &[input]);
        assert!(result.is_err());

        let input = Arc::new(StringVector::from(vec![
@@ -145,7 +145,7 @@ mod tests {
            Some("7.0,8.0,9.0]".to_string()),
        ]));

-        let result = func.eval(&FunctionContext::default(), &[input]);
+        let result = func.eval(FunctionContext::default(), &[input]);
        assert!(result.is_err());

        let input = Arc::new(StringVector::from(vec![
@@ -154,7 +154,7 @@ mod tests {
            Some("[7.0,hello,9.0]".to_string()),
        ]));

-        let result = func.eval(&FunctionContext::default(), &[input]);
+        let result = func.eval(FunctionContext::default(), &[input]);
        assert!(result.is_err());
    }
 }
--- a/src/common/function/src/scalars/vector/convert/vector_to_string.rs
+++ b/src/common/function/src/scalars/vector/convert/vector_to_string.rs
@@ -46,7 +46,7 @@ impl Function for VectorToStringFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 1,
            InvalidFuncArgsSnafu {
@@ -129,7 +129,7 @@ mod tests {
        builder.push_null();
        let vector = builder.to_vector();

-        let result = func.eval(&FunctionContext::default(), &[vector]).unwrap();
+        let result = func.eval(FunctionContext::default(), &[vector]).unwrap();

        assert_eq!(result.len(), 3);
        assert_eq!(result.get(0), Value::String("[1,2,3]".to_string().into()));
--- a/src/common/function/src/scalars/vector/distance.rs
+++ b/src/common/function/src/scalars/vector/distance.rs
@@ -60,7 +60,7 @@ macro_rules! define_distance_function {
                )
            }

-            fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+            fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
                ensure!(
                    columns.len() == 2,
                    InvalidFuncArgsSnafu {
@@ -159,7 +159,7 @@ mod tests {
            ])) as VectorRef;

            let result = func
-                .eval(&FunctionContext::default(), &[vec1.clone(), vec2.clone()])
+                .eval(FunctionContext::default(), &[vec1.clone(), vec2.clone()])
                .unwrap();

            assert!(!result.get(0).is_null());
@@ -168,7 +168,7 @@ mod tests {
            assert!(result.get(3).is_null());

            let result = func
-                .eval(&FunctionContext::default(), &[vec2, vec1])
+                .eval(FunctionContext::default(), &[vec2, vec1])
                .unwrap();

            assert!(!result.get(0).is_null());
@@ -202,7 +202,7 @@ mod tests {
            ])) as VectorRef;

            let result = func
-                .eval(&FunctionContext::default(), &[vec1.clone(), vec2.clone()])
+                .eval(FunctionContext::default(), &[vec1.clone(), vec2.clone()])
                .unwrap();

            assert!(!result.get(0).is_null());
@@ -211,7 +211,7 @@ mod tests {
            assert!(result.get(3).is_null());

            let result = func
-                .eval(&FunctionContext::default(), &[vec2, vec1])
+                .eval(FunctionContext::default(), &[vec2, vec1])
                .unwrap();

            assert!(!result.get(0).is_null());
@@ -245,7 +245,7 @@ mod tests {
            ])) as VectorRef;

            let result = func
-                .eval(&FunctionContext::default(), &[vec1.clone(), vec2.clone()])
+                .eval(FunctionContext::default(), &[vec1.clone(), vec2.clone()])
                .unwrap();

            assert!(!result.get(0).is_null());
@@ -254,7 +254,7 @@ mod tests {
            assert!(result.get(3).is_null());

            let result = func
-                .eval(&FunctionContext::default(), &[vec2, vec1])
+                .eval(FunctionContext::default(), &[vec2, vec1])
                .unwrap();

            assert!(!result.get(0).is_null());
@@ -294,7 +294,7 @@ mod tests {

            let result = func
                .eval(
-                    &FunctionContext::default(),
+                    FunctionContext::default(),
                    &[const_str.clone(), vec1.clone()],
                )
                .unwrap();
@@ -306,7 +306,7 @@ mod tests {

            let result = func
                .eval(
-                    &FunctionContext::default(),
+                    FunctionContext::default(),
                    &[vec1.clone(), const_str.clone()],
                )
                .unwrap();
@@ -318,7 +318,7 @@ mod tests {

            let result = func
                .eval(
-                    &FunctionContext::default(),
+                    FunctionContext::default(),
                    &[const_str.clone(), vec2.clone()],
                )
                .unwrap();
@@ -330,7 +330,7 @@ mod tests {

            let result = func
                .eval(
-                    &FunctionContext::default(),
+                    FunctionContext::default(),
                    &[vec2.clone(), const_str.clone()],
                )
                .unwrap();
@@ -353,13 +353,13 @@ mod tests {
        for func in funcs {
            let vec1 = Arc::new(StringVector::from(vec!["[1.0]"])) as VectorRef;
            let vec2 = Arc::new(StringVector::from(vec!["[1.0, 1.0]"])) as VectorRef;
-            let result = func.eval(&FunctionContext::default(), &[vec1, vec2]);
+            let result = func.eval(FunctionContext::default(), &[vec1, vec2]);
            assert!(result.is_err());

            let vec1 = Arc::new(BinaryVector::from(vec![vec![0, 0, 128, 63]])) as VectorRef;
            let vec2 =
                Arc::new(BinaryVector::from(vec![vec![0, 0, 128, 63, 0, 0, 0, 64]])) as VectorRef;
-            let result = func.eval(&FunctionContext::default(), &[vec1, vec2]);
+            let result = func.eval(FunctionContext::default(), &[vec1, vec2]);
            assert!(result.is_err());
        }
    }
--- a/src/common/function/src/scalars/vector/elem_product.rs
+++ b/src/common/function/src/scalars/vector/elem_product.rs
@@ -68,7 +68,7 @@ impl Function for ElemProductFunction {

    fn eval(
        &self,
-        _func_ctx: &FunctionContext,
+        _func_ctx: FunctionContext,
        columns: &[VectorRef],
    ) -> common_query::error::Result<VectorRef> {
        ensure!(
@@ -131,7 +131,7 @@ mod tests {
            None,
        ]));

-        let result = func.eval(&FunctionContext::default(), &[input0]).unwrap();
+        let result = func.eval(FunctionContext::default(), &[input0]).unwrap();

        let result = result.as_ref();
        assert_eq!(result.len(), 3);
--- a/src/common/function/src/scalars/vector/elem_sum.rs
+++ b/src/common/function/src/scalars/vector/elem_sum.rs
@@ -55,7 +55,7 @@ impl Function for ElemSumFunction {

    fn eval(
        &self,
-        _func_ctx: &FunctionContext,
+        _func_ctx: FunctionContext,
        columns: &[VectorRef],
    ) -> common_query::error::Result<VectorRef> {
        ensure!(
@@ -118,7 +118,7 @@ mod tests {
            None,
        ]));

-        let result = func.eval(&FunctionContext::default(), &[input0]).unwrap();
+        let result = func.eval(FunctionContext::default(), &[input0]).unwrap();

        let result = result.as_ref();
        assert_eq!(result.len(), 3);
--- a/src/common/function/src/scalars/vector/scalar_add.rs
+++ b/src/common/function/src/scalars/vector/scalar_add.rs
@@ -73,7 +73,7 @@ impl Function for ScalarAddFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -154,7 +154,7 @@ mod tests {
        ]));

        let result = func
-            .eval(&FunctionContext::default(), &[input0, input1])
+            .eval(FunctionContext::default(), &[input0, input1])
            .unwrap();

        let result = result.as_ref();
--- a/src/common/function/src/scalars/vector/scalar_mul.rs
+++ b/src/common/function/src/scalars/vector/scalar_mul.rs
@@ -73,7 +73,7 @@ impl Function for ScalarMulFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -154,7 +154,7 @@ mod tests {
        ]));

        let result = func
-            .eval(&FunctionContext::default(), &[input0, input1])
+            .eval(FunctionContext::default(), &[input0, input1])
            .unwrap();

        let result = result.as_ref();
--- a/src/common/function/src/scalars/vector/vector_add.rs
+++ b/src/common/function/src/scalars/vector/vector_add.rs
@@ -72,7 +72,7 @@ impl Function for VectorAddFunction {

    fn eval(
        &self,
-        _func_ctx: &FunctionContext,
+        _func_ctx: FunctionContext,
        columns: &[VectorRef],
    ) -> common_query::error::Result<VectorRef> {
        ensure!(
@@ -166,7 +166,7 @@ mod tests {
        ]));

        let result = func
-            .eval(&FunctionContext::default(), &[input0, input1])
+            .eval(FunctionContext::default(), &[input0, input1])
            .unwrap();

        let result = result.as_ref();
@@ -199,7 +199,7 @@ mod tests {
            Some("[3.0,2.0,2.0]".to_string()),
        ]));

-        let result = func.eval(&FunctionContext::default(), &[input0, input1]);
+        let result = func.eval(FunctionContext::default(), &[input0, input1]);

        match result {
            Err(Error::InvalidFuncArgs { err_msg, .. }) => {
--- a/src/common/function/src/scalars/vector/vector_dim.rs
+++ b/src/common/function/src/scalars/vector/vector_dim.rs
@@ -1,172 +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::{MutableVector, UInt64VectorBuilder, VectorRef};
-use snafu::ensure;
-
-use crate::function::{Function, FunctionContext};
-use crate::scalars::vector::impl_conv::{as_veclit, as_veclit_if_const};
-
-const NAME: &str = "vec_dim";
-
-/// Returns the dimension of the vector.
-///
-/// # Example
-///
-/// ```sql
-/// SELECT vec_dim('[7.0, 8.0, 9.0, 10.0]');
-///
-/// +---------------------------------------------------------------+
-/// | vec_dim(Utf8("[7.0, 8.0, 9.0, 10.0]"))                        |
-/// +---------------------------------------------------------------+
-/// | 4                                                             |
-/// +---------------------------------------------------------------+
-///
-#[derive(Debug, Clone, Default)]
-pub struct VectorDimFunction;
-
-impl Function for VectorDimFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(
-        &self,
-        _input_types: &[ConcreteDataType],
-    ) -> common_query::error::Result<ConcreteDataType> {
-        Ok(ConcreteDataType::uint64_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 = UInt64VectorBuilder::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(arg0.len() as u64));
-        }
-
-        Ok(result.to_vector())
-    }
-}
-
-impl Display for VectorDimFunction {
-    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_vec_dim() {
-        let func = VectorDimFunction;
-
-        let input0 = Arc::new(StringVector::from(vec![
-            Some("[0.0,2.0,3.0]".to_string()),
-            Some("[1.0,2.0,3.0,4.0]".to_string()),
-            None,
-            Some("[5.0]".to_string()),
-        ]));
-
-        let result = func.eval(&FunctionContext::default(), &[input0]).unwrap();
-
-        let result = result.as_ref();
-        assert_eq!(result.len(), 4);
-        assert_eq!(result.get_ref(0).as_u64().unwrap(), Some(3));
-        assert_eq!(result.get_ref(1).as_u64().unwrap(), Some(4));
-        assert!(result.get_ref(2).is_null());
-        assert_eq!(result.get_ref(3).as_u64().unwrap(), Some(1));
-    }
-
-    #[test]
-    fn test_dim_error() {
-        let func = VectorDimFunction;
-
-        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 length of the args is not correct, expect exactly one, have: 2"
-                )
-            }
-            _ => unreachable!(),
-        }
-    }
-}
--- a/src/common/function/src/scalars/vector/vector_div.rs
+++ b/src/common/function/src/scalars/vector/vector_div.rs
@@ -68,7 +68,7 @@ impl Function for VectorDivFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -155,7 +155,7 @@ mod tests {
        let input1 = Arc::new(StringVector::from(vec![Some(format!("{vec1:?}"))]));

        let err = func
-            .eval(&FunctionContext::default(), &[input0, input1])
+            .eval(FunctionContext::default(), &[input0, input1])
            .unwrap_err();

        match err {
@@ -186,7 +186,7 @@ mod tests {
        ]));

        let result = func
-            .eval(&FunctionContext::default(), &[input0, input1])
+            .eval(FunctionContext::default(), &[input0, input1])
            .unwrap();

        let result = result.as_ref();
@@ -206,7 +206,7 @@ mod tests {
        let input1 = Arc::new(StringVector::from(vec![Some("[0.0,0.0]".to_string())]));

        let result = func
-            .eval(&FunctionContext::default(), &[input0, input1])
+            .eval(FunctionContext::default(), &[input0, input1])
            .unwrap();

        let result = result.as_ref();
--- a/src/common/function/src/scalars/vector/vector_mul.rs
+++ b/src/common/function/src/scalars/vector/vector_mul.rs
@@ -68,7 +68,7 @@ impl Function for VectorMulFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        ensure!(
            columns.len() == 2,
            InvalidFuncArgsSnafu {
@@ -155,7 +155,7 @@ mod tests {
        let input1 = Arc::new(StringVector::from(vec![Some(format!("{vec1:?}"))]));

        let err = func
-            .eval(&FunctionContext::default(), &[input0, input1])
+            .eval(FunctionContext::default(), &[input0, input1])
            .unwrap_err();

        match err {
@@ -186,7 +186,7 @@ mod tests {
        ]));

        let result = func
-            .eval(&FunctionContext::default(), &[input0, input1])
+            .eval(FunctionContext::default(), &[input0, input1])
            .unwrap();

        let result = result.as_ref();
--- a/src/common/function/src/scalars/vector/vector_norm.rs
+++ b/src/common/function/src/scalars/vector/vector_norm.rs
@@ -67,7 +67,7 @@ impl Function for VectorNormFunction {

    fn eval(
        &self,
-        _func_ctx: &FunctionContext,
+        _func_ctx: FunctionContext,
        columns: &[VectorRef],
    ) -> common_query::error::Result<VectorRef> {
        ensure!(
@@ -143,7 +143,7 @@ mod tests {
            None,
        ]));

-        let result = func.eval(&FunctionContext::default(), &[input0]).unwrap();
+        let result = func.eval(FunctionContext::default(), &[input0]).unwrap();

        let result = result.as_ref();
        assert_eq!(result.len(), 5);
--- a/src/common/function/src/scalars/vector/vector_sub.rs
+++ b/src/common/function/src/scalars/vector/vector_sub.rs
@@ -72,7 +72,7 @@ impl Function for VectorSubFunction {

    fn eval(
        &self,
-        _func_ctx: &FunctionContext,
+        _func_ctx: FunctionContext,
        columns: &[VectorRef],
    ) -> common_query::error::Result<VectorRef> {
        ensure!(
@@ -166,7 +166,7 @@ mod tests {
        ]));

        let result = func
-            .eval(&FunctionContext::default(), &[input0, input1])
+            .eval(FunctionContext::default(), &[input0, input1])
            .unwrap();

        let result = result.as_ref();
@@ -199,7 +199,7 @@ mod tests {
            Some("[3.0,2.0,2.0]".to_string()),
        ]));

-        let result = func.eval(&FunctionContext::default(), &[input0, input1]);
+        let result = func.eval(FunctionContext::default(), &[input0, input1]);

        match result {
            Err(Error::InvalidFuncArgs { err_msg, .. }) => {
--- a/src/common/function/src/system/build.rs
+++ b/src/common/function/src/system/build.rs
@@ -45,7 +45,7 @@ impl Function for BuildFunction {
        Signature::nullary(Volatility::Immutable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
        let build_info = common_version::build_info().to_string();
        let v = Arc::new(StringVector::from(vec![build_info]));
        Ok(v)
@@ -67,7 +67,7 @@ mod tests {
        );
        assert_eq!(build.signature(), Signature::nullary(Volatility::Immutable));
        let build_info = common_version::build_info().to_string();
-        let vector = build.eval(&FunctionContext::default(), &[]).unwrap();
+        let vector = build.eval(FunctionContext::default(), &[]).unwrap();
        let expect: VectorRef = Arc::new(StringVector::from(vec![build_info]));
        assert_eq!(expect, vector);
    }
--- a/src/common/function/src/system/database.rs
+++ b/src/common/function/src/system/database.rs
@@ -47,7 +47,7 @@ impl Function for DatabaseFunction {
        Signature::nullary(Volatility::Immutable)
    }

-    fn eval(&self, func_ctx: &FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, func_ctx: FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
        let db = func_ctx.query_ctx.current_schema();

        Ok(Arc::new(StringVector::from_slice(&[&db])) as _)
@@ -67,7 +67,7 @@ impl Function for CurrentSchemaFunction {
        Signature::uniform(0, vec![], Volatility::Immutable)
    }

-    fn eval(&self, func_ctx: &FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, func_ctx: FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
        let db = func_ctx.query_ctx.current_schema();

        Ok(Arc::new(StringVector::from_slice(&[&db])) as _)
@@ -87,7 +87,7 @@ impl Function for SessionUserFunction {
        Signature::uniform(0, vec![], Volatility::Immutable)
    }

-    fn eval(&self, func_ctx: &FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
+    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 _)
@@ -138,7 +138,7 @@ mod tests {
            query_ctx,
            ..Default::default()
        };
-        let vector = build.eval(&func_ctx, &[]).unwrap();
+        let vector = build.eval(func_ctx, &[]).unwrap();
        let expect: VectorRef = Arc::new(StringVector::from(vec!["test_db"]));
        assert_eq!(expect, vector);
    }
--- a/src/common/function/src/system/pg_catalog/pg_get_userbyid.rs
+++ b/src/common/function/src/system/pg_catalog/pg_get_userbyid.rs
@@ -53,7 +53,7 @@ impl Function for PGGetUserByIdFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        with_match_primitive_type_id!(columns[0].data_type().logical_type_id(), |$T| {
            let col = scalar_unary_op::<<$T as LogicalPrimitiveType>::Native, String, _>(&columns[0], pg_get_user_by_id, &mut EvalContext::default())?;
            Ok(Arc::new(col))
--- a/src/common/function/src/system/pg_catalog/table_is_visible.rs
+++ b/src/common/function/src/system/pg_catalog/table_is_visible.rs
@@ -53,7 +53,7 @@ impl Function for PGTableIsVisibleFunction {
        )
    }

-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
        with_match_primitive_type_id!(columns[0].data_type().logical_type_id(), |$T| {
            let col = scalar_unary_op::<<$T as LogicalPrimitiveType>::Native, bool, _>(&columns[0], pg_table_is_visible, &mut EvalContext::default())?;
            Ok(Arc::new(col))
--- a/src/common/function/src/system/pg_catalog/version.rs
+++ b/src/common/function/src/system/pg_catalog/version.rs
@@ -44,7 +44,7 @@ impl Function for PGVersionFunction {
        Signature::exact(vec![], Volatility::Immutable)
    }

-    fn eval(&self, _func_ctx: &FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, _func_ctx: FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
        let result = StringVector::from(vec![format!(
            "PostgreSQL 16.3 GreptimeDB {}",
            env!("CARGO_PKG_VERSION")
--- a/src/common/function/src/system/timezone.rs
+++ b/src/common/function/src/system/timezone.rs
@@ -41,7 +41,7 @@ impl Function for TimezoneFunction {
        Signature::nullary(Volatility::Immutable)
    }

-    fn eval(&self, func_ctx: &FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, func_ctx: FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
        let tz = func_ctx.query_ctx.timezone().to_string();

        Ok(Arc::new(StringVector::from_slice(&[&tz])) as _)
@@ -77,7 +77,7 @@ mod tests {
            query_ctx,
            ..Default::default()
        };
-        let vector = build.eval(&func_ctx, &[]).unwrap();
+        let vector = build.eval(func_ctx, &[]).unwrap();
        let expect: VectorRef = Arc::new(StringVector::from(vec!["UTC"]));
        assert_eq!(expect, vector);
    }
--- a/src/common/function/src/system/version.rs
+++ b/src/common/function/src/system/version.rs
@@ -45,7 +45,7 @@ impl Function for VersionFunction {
        Signature::nullary(Volatility::Immutable)
    }

-    fn eval(&self, func_ctx: &FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
+    fn eval(&self, func_ctx: FunctionContext, _columns: &[VectorRef]) -> Result<VectorRef> {
        let version = match func_ctx.query_ctx.channel() {
            Channel::Mysql => {
                format!(
--- a/src/common/function/src/table.rs
+++ b/src/common/function/src/table.rs
@@ -26,9 +26,9 @@ use crate::flush_flow::FlushFlowFunction;
 use crate::function_registry::FunctionRegistry;

 /// Table functions
-pub(crate) struct AdminFunction;
+pub(crate) struct TableFunction;

-impl AdminFunction {
+impl TableFunction {
    /// Register all table functions to [`FunctionRegistry`].
    pub fn register(registry: &FunctionRegistry) {
        registry.register_async(Arc::new(MigrateRegionFunction));
--- a/src/common/function/src/table/flush_compact_region.rs
+++ b/src/common/function/src/table/flush_compact_region.rs
--- a/src/common/function/src/table/flush_compact_table.rs
+++ b/src/common/function/src/table/flush_compact_table.rs
--- a/src/common/function/src/table/migrate_region.rs
+++ b/src/common/function/src/table/migrate_region.rs
--- a/src/common/function/src/utils.rs
+++ b/src/common/function/src/utils.rs
@@ -12,11 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::hash::BuildHasher;
-
-use ahash::RandomState;
-use serde::{Deserialize, Serialize};
-
 /// Escapes special characters in the provided pattern string for `LIKE`.
 ///
 /// Specifically, it prefixes the backslash (`\`), percent (`%`), and underscore (`_`)
@@ -37,71 +32,6 @@ pub fn escape_like_pattern(pattern: &str) -> String {
        })
        .collect::<String>()
 }
-
-/// A random state with fixed seeds.
-///
-/// This is used to ensure that the hash values are consistent across
-/// different processes, and easy to serialize and deserialize.
-#[derive(Debug)]
-pub struct FixedRandomState {
-    state: RandomState,
-}
-
-impl FixedRandomState {
-    // some random seeds
-    const RANDOM_SEED_0: u64 = 0x517cc1b727220a95;
-    const RANDOM_SEED_1: u64 = 0x428a2f98d728ae22;
-    const RANDOM_SEED_2: u64 = 0x7137449123ef65cd;
-    const RANDOM_SEED_3: u64 = 0xb5c0fbcfec4d3b2f;
-
-    pub fn new() -> Self {
-        Self {
-            state: ahash::RandomState::with_seeds(
-                Self::RANDOM_SEED_0,
-                Self::RANDOM_SEED_1,
-                Self::RANDOM_SEED_2,
-                Self::RANDOM_SEED_3,
-            ),
-        }
-    }
-}
-
-impl Default for FixedRandomState {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl BuildHasher for FixedRandomState {
-    type Hasher = ahash::AHasher;
-
-    fn build_hasher(&self) -> Self::Hasher {
-        self.state.build_hasher()
-    }
-
-    fn hash_one<T: std::hash::Hash>(&self, x: T) -> u64 {
-        self.state.hash_one(x)
-    }
-}
-
-impl Serialize for FixedRandomState {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_unit()
-    }
-}
-
-impl<'de> Deserialize<'de> for FixedRandomState {
-    fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        Ok(Self::new())
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
--- a/src/common/grpc-expr/src/error.rs
+++ b/src/common/grpc-expr/src/error.rs
@@ -111,9 +111,9 @@ pub enum Error {
    },

    #[snafu(display(
-        "Fulltext or Skipping index only supports string type, column: {column_name}, unexpected type: {column_type:?}"
+        "Fulltext index only supports string type, column: {column_name}, unexpected type: {column_type:?}"
    ))]
-    InvalidStringIndexColumnType {
+    InvalidFulltextColumnType {
        column_name: String,
        column_type: ColumnDataType,
        #[snafu(implicit)]
@@ -173,7 +173,7 @@ impl ErrorExt for Error {
                StatusCode::InvalidArguments
            }

-            Error::UnknownColumnDataType { .. } | Error::InvalidStringIndexColumnType { .. } => {
+            Error::UnknownColumnDataType { .. } | Error::InvalidFulltextColumnType { .. } => {
                StatusCode::InvalidArguments
            }
            Error::InvalidSetTableOptionRequest { .. }
--- a/src/common/grpc-expr/src/util.rs
+++ b/src/common/grpc-expr/src/util.rs
@@ -15,7 +15,7 @@
 use std::collections::HashSet;

 use api::v1::column_data_type_extension::TypeExt;
-use api::v1::column_def::{contains_fulltext, contains_skipping};
+use api::v1::column_def::contains_fulltext;
 use api::v1::{
    AddColumn, AddColumns, Column, ColumnDataType, ColumnDataTypeExtension, ColumnDef,
    ColumnOptions, ColumnSchema, CreateTableExpr, JsonTypeExtension, SemanticType,
@@ -27,7 +27,7 @@ use table::table_reference::TableReference;

 use crate::error::{
    self, DuplicatedColumnNameSnafu, DuplicatedTimestampColumnSnafu,
-    InvalidStringIndexColumnTypeSnafu, MissingTimestampColumnSnafu, Result,
+    InvalidFulltextColumnTypeSnafu, MissingTimestampColumnSnafu, Result,
    UnknownColumnDataTypeSnafu,
 };
 pub struct ColumnExpr<'a> {
@@ -152,9 +152,8 @@ pub fn build_create_table_expr(
        let column_type = infer_column_datatype(datatype, datatype_extension)?;

        ensure!(
-            (!contains_fulltext(options) && !contains_skipping(options))
-                || column_type == ColumnDataType::String,
-            InvalidStringIndexColumnTypeSnafu {
+            !contains_fulltext(options) || column_type == ColumnDataType::String,
+            InvalidFulltextColumnTypeSnafu {
                column_name,
                column_type,
            }
--- a/src/common/meta/src/cache/flow/table_flownode.rs
+++ b/src/common/meta/src/cache/flow/table_flownode.rs
@@ -16,6 +16,7 @@ use std::collections::HashMap;
 use std::sync::Arc;

 use futures::future::BoxFuture;
+use futures::TryStreamExt;
 use moka::future::Cache;
 use moka::ops::compute::Op;
 use table::metadata::TableId;
@@ -53,13 +54,9 @@ fn init_factory(table_flow_manager: TableFlowManagerRef) -> Initializer<TableId,
        Box::pin(async move {
            table_flow_manager
                .flows(table_id)
+                .map_ok(|(key, value)| (key.flownode_id(), value.peer))
+                .try_collect::<HashMap<_, _>>()
                .await
-                .map(|flows| {
-                    flows
-                        .into_iter()
-                        .map(|(key, value)| (key.flownode_id(), value.peer))
-                        .collect::<HashMap<_, _>>()
-                })
                // We must cache the `HashSet` even if it's empty,
                // to avoid future requests to the remote storage next time;
                // If the value is added to the remote storage,
--- a/src/common/meta/src/cluster.rs
+++ b/src/common/meta/src/cluster.rs
@@ -57,10 +57,12 @@ pub trait ClusterInfo {
 }

 /// The key of [NodeInfo] in the storage. The format is `__meta_cluster_node_info-{cluster_id}-{role}-{node_id}`.
+///
+/// This key cannot be used to describe the `Metasrv` because the `Metasrv` does not have
+/// a `cluster_id`, it serves multiple clusters.
 #[derive(Debug, Clone, Copy, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct NodeInfoKey {
    /// The cluster id.
-    // todo(hl): remove cluster_id as it is not assigned anywhere.
    pub cluster_id: ClusterId,
    /// The role of the node. It can be `[Role::Datanode]` or `[Role::Frontend]`.
    pub role: Role,
@@ -230,8 +232,8 @@ impl TryFrom<Vec<u8>> for NodeInfoKey {
    }
 }

-impl From<&NodeInfoKey> for Vec<u8> {
-    fn from(key: &NodeInfoKey) -> Self {
+impl From<NodeInfoKey> for Vec<u8> {
+    fn from(key: NodeInfoKey) -> Self {
        format!(
            "{}-{}-{}-{}",
            CLUSTER_NODE_INFO_PREFIX,
@@ -313,7 +315,7 @@ mod tests {
            node_id: 2,
        };

-        let key_bytes: Vec<u8> = (&key).into();
+        let key_bytes: Vec<u8> = key.into();
        let new_key: NodeInfoKey = key_bytes.try_into().unwrap();

        assert_eq!(1, new_key.cluster_id);
--- a/src/common/meta/src/ddl/create_flow.rs
+++ b/src/common/meta/src/ddl/create_flow.rs
@@ -15,7 +15,6 @@
 mod metadata;

 use std::collections::BTreeMap;
-use std::fmt;

 use api::v1::flow::flow_request::Body as PbFlowRequest;
 use api::v1::flow::{CreateRequest, FlowRequest, FlowRequestHeader};
@@ -29,6 +28,7 @@ use common_procedure::{
 use common_telemetry::info;
 use common_telemetry::tracing_context::TracingContext;
 use futures::future::join_all;
+use futures::TryStreamExt;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use snafu::{ensure, ResultExt};
@@ -77,7 +77,6 @@ impl CreateFlowProcedure {
                query_context,
                state: CreateFlowState::Prepare,
                prev_flow_info_value: None,
-                flow_type: None,
            },
        }
    }
@@ -105,7 +104,7 @@ impl CreateFlowProcedure {
        if create_if_not_exists && or_replace {
            // this is forbidden because not clear what does that mean exactly
            return error::UnsupportedSnafu {
-                operation: "Create flow with both `IF NOT EXISTS` and `OR REPLACE`",
+                operation: "Create flow with both `IF NOT EXISTS` and `OR REPLACE`".to_string(),
            }
            .fail();
        }
@@ -130,10 +129,9 @@ impl CreateFlowProcedure {
                .flow_metadata_manager
                .flow_route_manager()
                .routes(flow_id)
-                .await?
-                .into_iter()
-                .map(|(_, value)| value.peer)
-                .collect::<Vec<_>>();
+                .map_ok(|(_, value)| value.peer)
+                .try_collect::<Vec<_>>()
+                .await?;
            self.data.flow_id = Some(flow_id);
            self.data.peers = peers;
            info!("Replacing flow, flow_id: {}", flow_id);
@@ -177,8 +175,6 @@ impl CreateFlowProcedure {
            self.allocate_flow_id().await?;
        }
        self.data.state = CreateFlowState::CreateFlows;
-        // determine flow type
-        self.data.flow_type = Some(determine_flow_type(&self.data.task));

        Ok(Status::executing(true))
    }
@@ -313,11 +309,6 @@ impl Procedure for CreateFlowProcedure {
    }
 }

-pub fn determine_flow_type(_flow_task: &CreateFlowTask) -> FlowType {
-    // TODO(discord9): determine flow type
-    FlowType::RecordingRule
-}
-
 /// The state of [CreateFlowProcedure].
 #[derive(Debug, Clone, Serialize, Deserialize, AsRefStr, PartialEq)]
 pub enum CreateFlowState {
@@ -331,35 +322,6 @@ pub enum CreateFlowState {
    CreateMetadata,
 }

-/// The type of flow.
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
-pub enum FlowType {
-    /// The flow is a recording rule task.
-    RecordingRule,
-    /// The flow is a streaming task.
-    Streaming,
-}
-
-impl FlowType {
-    pub const RECORDING_RULE: &str = "recording_rule";
-    pub const STREAMING: &str = "streaming";
-}
-
-impl Default for FlowType {
-    fn default() -> Self {
-        Self::RecordingRule
-    }
-}
-
-impl fmt::Display for FlowType {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            FlowType::RecordingRule => write!(f, "{}", FlowType::RECORDING_RULE),
-            FlowType::Streaming => write!(f, "{}", FlowType::STREAMING),
-        }
-    }
-}
-
 /// The serializable data.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct CreateFlowData {
@@ -373,7 +335,6 @@ pub struct CreateFlowData {
    /// For verify if prev value is consistent when need to update flow metadata.
    /// only set when `or_replace` is true.
    pub(crate) prev_flow_info_value: Option<DeserializedValueWithBytes<FlowInfoValue>>,
-    pub(crate) flow_type: Option<FlowType>,
 }

 impl From<&CreateFlowData> for CreateRequest {
@@ -381,7 +342,7 @@ impl From<&CreateFlowData> for CreateRequest {
        let flow_id = value.flow_id.unwrap();
        let source_table_ids = &value.source_table_ids;

-        let mut req = CreateRequest {
+        CreateRequest {
            flow_id: Some(api::v1::FlowId { id: flow_id }),
            source_table_ids: source_table_ids
                .iter()
@@ -395,11 +356,7 @@ impl From<&CreateFlowData> for CreateRequest {
            comment: value.task.comment.clone(),
            sql: value.task.sql.clone(),
            flow_options: value.task.flow_options.clone(),
-        };
-
-        let flow_type = value.flow_type.unwrap_or_default().to_string();
-        req.flow_options.insert("flow_type".to_string(), flow_type);
-        req
+        }
    }
 }

@@ -412,7 +369,7 @@ impl From<&CreateFlowData> for (FlowInfoValue, Vec<(FlowPartitionId, FlowRouteVa
            expire_after,
            comment,
            sql,
-            flow_options: mut options,
+            flow_options: options,
            ..
        } = value.task.clone();

@@ -429,21 +386,19 @@ impl From<&CreateFlowData> for (FlowInfoValue, Vec<(FlowPartitionId, FlowRouteVa
            .map(|(idx, peer)| (idx as u32, FlowRouteValue { peer: peer.clone() }))
            .collect::<Vec<_>>();

-        let flow_type = value.flow_type.unwrap_or_default().to_string();
-        options.insert("flow_type".to_string(), flow_type);
-
-        let flow_info = FlowInfoValue {
-            source_table_ids: value.source_table_ids.clone(),
-            sink_table_name,
-            flownode_ids,
-            catalog_name,
-            flow_name,
-            raw_sql: sql,
-            expire_after,
-            comment,
-            options,
-        };
-
-        (flow_info, flow_routes)
+        (
+            FlowInfoValue {
+                source_table_ids: value.source_table_ids.clone(),
+                sink_table_name,
+                flownode_ids,
+                catalog_name,
+                flow_name,
+                raw_sql: sql,
+                expire_after,
+                comment,
+                options,
+            },
+            flow_routes,
+        )
    }
 }
--- a/Show More
+++ b/Show More