chore: bump version to 0.14.1 (#6006 )

* feat: remove own greatest fn (#5994) * fix: prune primary key with multiple columns may use default value as statistics (#5996) * test: incorrect test result when filtering pk with multiple columns * fix: prune non first tag correctly Distinguish no column and no stats and only use default value when no column * test: update test result * refactor: rename test file * test: add test for null filter * fix: use StatValues for null counts * test: drop table * test: fix unstable flow test * fix: check if memtable is empty by stats (#5989) fix/checking-memtable-empty-and-stats: - **Refactor timestamp updates**: Simplified timestamp range updates in `PartitionTreeMemtable` and `TimeSeriesMemtable` by replacing `update_timestamp_range` with `fetch_max` and `fetch_min` methods for `max_timestamp` and `min_timestamp`. - Affected files: `partition_tree.rs`, `time_series.rs` - **Remove unused code**: Deleted the `update_timestamp_range` method from `WriteMetrics` and removed unnecessary imports. - Affected file: `stats.rs` - **Optimize memtable filtering**: Streamlined the check for empty memtables in `ScanRegion` by directly using `time_range`. - Affected file: `scan_region.rs` * chore: bump version to 0.14.1 Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> --------- Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> Co-authored-by: dennis zhuang <killme2008@gmail.com> Co-authored-by: Yingwen <realevenyag@gmail.com> Co-authored-by: Lei, HUANG <6406592+v0y4g3r@users.noreply.github.com>
2025-12-26 16:10:02 +00:00 · 2025-04-28 07:39:49 +00:00
80 changed files with 880 additions and 1778 deletions
--- a/.github/scripts/create-version.sh
+++ b/.github/scripts/create-version.sh
@@ -10,17 +10,17 @@ set -e
 function create_version() {
  # Read from envrionment variables.
  if [ -z "$GITHUB_EVENT_NAME" ]; then
-      echo "GITHUB_EVENT_NAME is empty" >&2
+      echo "GITHUB_EVENT_NAME is empty"
      exit 1
  fi

  if [ -z "$NEXT_RELEASE_VERSION" ]; then
-      echo "NEXT_RELEASE_VERSION is empty, use version from Cargo.toml" >&2
-      export NEXT_RELEASE_VERSION=$(grep '^version = ' Cargo.toml | cut -d '"' -f 2 | head -n 1)
+      echo "NEXT_RELEASE_VERSION is empty"
+      exit 1
  fi

  if [ -z "$NIGHTLY_RELEASE_PREFIX" ]; then
-      echo "NIGHTLY_RELEASE_PREFIX is empty" >&2
+      echo "NIGHTLY_RELEASE_PREFIX is empty"
      exit 1
  fi

@@ -35,7 +35,7 @@ function create_version() {
  # It will be like 'dev-2023080819-f0e7216c'.
  if [ "$NEXT_RELEASE_VERSION" = dev ]; then
    if [ -z "$COMMIT_SHA" ]; then
-      echo "COMMIT_SHA is empty in dev build" >&2
+      echo "COMMIT_SHA is empty in dev build"
      exit 1
    fi
    echo "dev-$(date "+%Y%m%d-%s")-$(echo "$COMMIT_SHA" | cut -c1-8)"
@@ -45,7 +45,7 @@ function create_version() {
  # Note: Only output 'version=xxx' to stdout when everything is ok, so that it can be used in GitHub Actions Outputs.
  if [ "$GITHUB_EVENT_NAME" = push ]; then
    if [ -z "$GITHUB_REF_NAME" ]; then
-      echo "GITHUB_REF_NAME is empty in push event" >&2
+      echo "GITHUB_REF_NAME is empty in push event"
      exit 1
    fi
    echo "$GITHUB_REF_NAME"
@@ -54,7 +54,7 @@ function create_version() {
  elif [ "$GITHUB_EVENT_NAME" = schedule ]; then
    echo "$NEXT_RELEASE_VERSION-$NIGHTLY_RELEASE_PREFIX-$(date "+%Y%m%d")"
  else
-    echo "Unsupported GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME" >&2
+    echo "Unsupported GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME"
    exit 1
  fi
 }
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -90,6 +90,8 @@ 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.14.0

 jobs:
  allocate-runners:
@@ -133,6 +135,7 @@ jobs:
        env:
          GITHUB_EVENT_NAME: ${{ github.event_name }}
          GITHUB_REF_NAME: ${{ github.ref_name }}
+          NEXT_RELEASE_VERSION: ${{ env.NEXT_RELEASE_VERSION }}
          NIGHTLY_RELEASE_PREFIX: ${{ env.NIGHTLY_RELEASE_PREFIX }}

      - name: Allocate linux-amd64 runner
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -173,9 +173,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.98"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"

 [[package]]
 name = "anymap2"
@@ -185,7 +185,7 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"

 [[package]]
 name = "api"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "common-base",
 "common-decimal",
@@ -915,7 +915,7 @@ dependencies = [

 [[package]]
 name = "auth"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "async-trait",
@@ -1537,7 +1537,7 @@ dependencies = [

 [[package]]
 name = "cache"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "catalog",
 "common-error",
@@ -1561,7 +1561,7 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "catalog"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "arrow 54.2.1",
@@ -1597,7 +1597,7 @@ dependencies = [
 "partition",
 "paste",
 "prometheus",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.0.0",
 "serde_json",
 "session",
 "snafu 0.8.5",
@@ -1874,7 +1874,7 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"

 [[package]]
 name = "cli"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-trait",
 "auth",
@@ -1917,7 +1917,7 @@ dependencies = [
 "session",
 "snafu 0.8.5",
 "store-api",
- "substrait 0.15.0",
+ "substrait 0.14.1",
 "table",
 "tempfile",
 "tokio",
@@ -1926,7 +1926,7 @@ dependencies = [

 [[package]]
 name = "client"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "arc-swap",
@@ -1955,7 +1955,7 @@ dependencies = [
 "rand 0.9.0",
 "serde_json",
 "snafu 0.8.5",
- "substrait 0.15.0",
+ "substrait 0.14.1",
 "substrait 0.37.3",
 "tokio",
 "tokio-stream",
@@ -1996,7 +1996,7 @@ dependencies = [

 [[package]]
 name = "cmd"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-trait",
 "auth",
@@ -2056,7 +2056,7 @@ dependencies = [
 "similar-asserts",
 "snafu 0.8.5",
 "store-api",
- "substrait 0.15.0",
+ "substrait 0.14.1",
 "table",
 "temp-env",
 "tempfile",
@@ -2102,7 +2102,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"

 [[package]]
 name = "common-base"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "anymap2",
 "async-trait",
@@ -2124,11 +2124,11 @@ dependencies = [

 [[package]]
 name = "common-catalog"
-version = "0.15.0"
+version = "0.14.1"

 [[package]]
 name = "common-config"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "common-base",
 "common-error",
@@ -2153,7 +2153,7 @@ dependencies = [

 [[package]]
 name = "common-datasource"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "arrow 54.2.1",
 "arrow-schema 54.3.1",
@@ -2190,7 +2190,7 @@ dependencies = [

 [[package]]
 name = "common-decimal"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "bigdecimal 0.4.8",
 "common-error",
@@ -2203,7 +2203,7 @@ dependencies = [

 [[package]]
 name = "common-error"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "common-macro",
 "http 1.1.0",
@@ -2214,7 +2214,7 @@ dependencies = [

 [[package]]
 name = "common-frontend"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-trait",
 "common-error",
@@ -2224,7 +2224,7 @@ dependencies = [

 [[package]]
 name = "common-function"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -2277,7 +2277,7 @@ dependencies = [

 [[package]]
 name = "common-greptimedb-telemetry"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-trait",
 "common-runtime",
@@ -2294,7 +2294,7 @@ dependencies = [

 [[package]]
 name = "common-grpc"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "arrow-flight",
@@ -2325,7 +2325,7 @@ dependencies = [

 [[package]]
 name = "common-grpc-expr"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "common-base",
@@ -2344,7 +2344,7 @@ dependencies = [

 [[package]]
 name = "common-macro"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "arc-swap",
 "common-query",
@@ -2358,7 +2358,7 @@ dependencies = [

 [[package]]
 name = "common-mem-prof"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "common-error",
 "common-macro",
@@ -2371,7 +2371,7 @@ dependencies = [

 [[package]]
 name = "common-meta"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "anymap2",
 "api",
@@ -2432,7 +2432,7 @@ dependencies = [

 [[package]]
 name = "common-options"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "common-grpc",
 "humantime-serde",
@@ -2441,11 +2441,11 @@ dependencies = [

 [[package]]
 name = "common-plugins"
-version = "0.15.0"
+version = "0.14.1"

 [[package]]
 name = "common-pprof"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "common-error",
 "common-macro",
@@ -2457,7 +2457,7 @@ dependencies = [

 [[package]]
 name = "common-procedure"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -2484,7 +2484,7 @@ dependencies = [

 [[package]]
 name = "common-procedure-test"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-trait",
 "common-procedure",
@@ -2493,7 +2493,7 @@ dependencies = [

 [[package]]
 name = "common-query"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "async-trait",
@@ -2519,7 +2519,7 @@ dependencies = [

 [[package]]
 name = "common-recordbatch"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "arc-swap",
 "common-error",
@@ -2539,7 +2539,7 @@ dependencies = [

 [[package]]
 name = "common-runtime"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-trait",
 "clap 4.5.19",
@@ -2569,14 +2569,14 @@ dependencies = [

 [[package]]
 name = "common-session"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "strum 0.27.1",
 ]

 [[package]]
 name = "common-telemetry"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "atty",
 "backtrace",
@@ -2604,7 +2604,7 @@ dependencies = [

 [[package]]
 name = "common-test-util"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "client",
 "common-query",
@@ -2616,7 +2616,7 @@ dependencies = [

 [[package]]
 name = "common-time"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "arrow 54.2.1",
 "chrono",
@@ -2634,7 +2634,7 @@ dependencies = [

 [[package]]
 name = "common-version"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "build-data",
 "const_format",
@@ -2644,7 +2644,7 @@ dependencies = [

 [[package]]
 name = "common-wal"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "common-base",
 "common-error",
@@ -3110,9 +3110,9 @@ dependencies = [

 [[package]]
 name = "data-encoding"
-version = "2.9.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"

 [[package]]
 name = "datafusion"
@@ -3572,7 +3572,7 @@ dependencies = [

 [[package]]
 name = "datanode"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "arrow-flight",
@@ -3624,7 +3624,7 @@ dependencies = [
 "session",
 "snafu 0.8.5",
 "store-api",
- "substrait 0.15.0",
+ "substrait 0.14.1",
 "table",
 "tokio",
 "toml 0.8.19",
@@ -3633,7 +3633,7 @@ dependencies = [

 [[package]]
 name = "datatypes"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "arrow 54.2.1",
 "arrow-array 54.2.1",
@@ -4259,7 +4259,7 @@ dependencies = [

 [[package]]
 name = "file-engine"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "async-trait",
@@ -4382,7 +4382,7 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"

 [[package]]
 name = "flow"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "arrow 54.2.1",
@@ -4444,7 +4444,7 @@ dependencies = [
 "snafu 0.8.5",
 "store-api",
 "strum 0.27.1",
- "substrait 0.15.0",
+ "substrait 0.14.1",
 "table",
 "tokio",
 "tonic 0.12.3",
@@ -4499,7 +4499,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"

 [[package]]
 name = "frontend"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "arc-swap",
@@ -4556,7 +4556,7 @@ dependencies = [
 "sqlparser 0.54.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=0cf6c04490d59435ee965edd2078e8855bd8471e)",
 "store-api",
 "strfmt",
- "substrait 0.15.0",
+ "substrait 0.14.1",
 "table",
 "tokio",
 "toml 0.8.19",
@@ -5795,7 +5795,7 @@ dependencies = [

 [[package]]
 name = "index"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-trait",
 "asynchronous-codec",
@@ -6509,7 +6509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
 "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]

 [[package]]
@@ -6599,13 +6599,13 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

 [[package]]
 name = "log-query"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "chrono",
 "common-error",
@@ -6617,7 +6617,7 @@ dependencies = [

 [[package]]
 name = "log-store"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-stream",
 "async-trait",
@@ -6911,7 +6911,7 @@ dependencies = [

 [[package]]
 name = "meta-client"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "async-trait",
@@ -6939,7 +6939,7 @@ dependencies = [

 [[package]]
 name = "meta-srv"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "async-trait",
@@ -7029,7 +7029,7 @@ dependencies = [

 [[package]]
 name = "metric-engine"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "aquamarine",
@@ -7118,7 +7118,7 @@ dependencies = [

 [[package]]
 name = "mito2"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "aquamarine",
@@ -7780,7 +7780,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 1.3.1",
 "proc-macro2",
 "quote",
 "syn 2.0.100",
@@ -7824,7 +7824,7 @@ dependencies = [

 [[package]]
 name = "object-store"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "anyhow",
 "bytes",
@@ -8119,7 +8119,7 @@ dependencies = [

 [[package]]
 name = "operator"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -8168,7 +8168,7 @@ dependencies = [
 "sql",
 "sqlparser 0.54.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=0cf6c04490d59435ee965edd2078e8855bd8471e)",
 "store-api",
- "substrait 0.15.0",
+ "substrait 0.14.1",
 "table",
 "tokio",
 "tokio-util",
@@ -8423,7 +8423,7 @@ dependencies = [

 [[package]]
 name = "partition"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "async-trait",
@@ -8705,7 +8705,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pipeline"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -8847,7 +8847,7 @@ dependencies = [

 [[package]]
 name = "plugins"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "auth",
 "clap 4.5.19",
@@ -9127,7 +9127,7 @@ dependencies = [

 [[package]]
 name = "promql"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "ahash 0.8.11",
 "async-trait",
@@ -9373,7 +9373,7 @@ dependencies = [

 [[package]]
 name = "puffin"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-compression 0.4.13",
 "async-trait",
@@ -9414,7 +9414,7 @@ dependencies = [

 [[package]]
 name = "query"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -9480,7 +9480,7 @@ dependencies = [
 "sqlparser 0.54.0 (git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=0cf6c04490d59435ee965edd2078e8855bd8471e)",
 "statrs",
 "store-api",
- "substrait 0.15.0",
+ "substrait 0.14.1",
 "table",
 "tokio",
 "tokio-stream",
@@ -9527,7 +9527,7 @@ dependencies = [
 "pin-project-lite",
 "quinn-proto",
 "quinn-udp",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.0.0",
 "rustls",
 "socket2",
 "thiserror 1.0.64",
@@ -9544,7 +9544,7 @@ dependencies = [
 "bytes",
 "rand 0.8.5",
 "ring",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.0.0",
 "rustls",
 "slab",
 "thiserror 1.0.64",
@@ -9821,9 +9821,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -10333,9 +10333,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"

 [[package]]
 name = "rustc_version"
@@ -10830,7 +10830,7 @@ dependencies = [

 [[package]]
 name = "servers"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "ahash 0.8.11",
 "api",
@@ -10950,7 +10950,7 @@ dependencies = [

 [[package]]
 name = "session"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "arc-swap",
@@ -11158,9 +11158,9 @@ dependencies = [

 [[package]]
 name = "smallbitvec"
-version = "2.6.0"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d31d263dd118560e1a492922182ab6ca6dc1d03a3bf54e7699993f31a4150e3f"
+checksum = "fcc3fc564a4b53fd1e8589628efafe57602d91bde78be18186b5f61e8faea470"

 [[package]]
 name = "smallvec"
@@ -11275,7 +11275,7 @@ dependencies = [

 [[package]]
 name = "sql"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "chrono",
@@ -11330,7 +11330,7 @@ dependencies = [

 [[package]]
 name = "sqlness-runner"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-trait",
 "clap 4.5.19",
@@ -11649,7 +11649,7 @@ dependencies = [

 [[package]]
 name = "store-api"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "aquamarine",
@@ -11798,7 +11798,7 @@ dependencies = [

 [[package]]
 name = "substrait"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "async-trait",
 "bytes",
@@ -11978,7 +11978,7 @@ dependencies = [

 [[package]]
 name = "table"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "async-trait",
@@ -12229,7 +12229,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"

 [[package]]
 name = "tests-fuzz"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "arbitrary",
 "async-trait",
@@ -12273,7 +12273,7 @@ dependencies = [

 [[package]]
 name = "tests-integration"
-version = "0.15.0"
+version = "0.14.1"
 dependencies = [
 "api",
 "arrow-flight",
@@ -12340,7 +12340,7 @@ dependencies = [
 "sql",
 "sqlx",
 "store-api",
- "substrait 0.15.0",
+ "substrait 0.14.1",
 "table",
 "tempfile",
 "time",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,16 +68,15 @@ members = [
 resolver = "2"

 [workspace.package]
-version = "0.15.0"
+version = "0.14.1"
 edition = "2021"
 license = "Apache-2.0"

 [workspace.lints]
+clippy.print_stdout = "warn"
+clippy.print_stderr = "warn"
 clippy.dbg_macro = "warn"
 clippy.implicit_clone = "warn"
-clippy.result_large_err = "allow"
-clippy.large_enum_variant = "allow"
-clippy.doc_overindented_list_items = "allow"
 rust.unknown_lints = "deny"
 rust.unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }

@@ -163,7 +162,7 @@ paste = "1.0"
 pin-project = "1.0"
 prometheus = { version = "0.13.3", features = ["process"] }
 promql-parser = { version = "0.5.1", features = ["ser"] }
-prost = { version = "0.13", features = ["no-recursion-limit"] }
+prost = "0.13"
 raft-engine = { version = "0.4.1", default-features = false }
 rand = "0.9"
 ratelimit = "0.10"
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1742452566,
-        "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=",
+        "lastModified": 1737613896,
+        "narHash": "sha256-ldqXIglq74C7yKMFUzrS9xMT/EVs26vZpOD68Sh7OcU=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06",
+        "rev": "303a062fdd8e89f233db05868468975d17855d80",
        "type": "github"
      },
      "original": {
@@ -41,11 +41,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1743576891,
-        "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
+        "lastModified": 1737569578,
+        "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
+        "rev": "47addd76727f42d351590c905d9d1905ca895b82",
        "type": "github"
      },
      "original": {
@@ -65,11 +65,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1742296961,
-        "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=",
+        "lastModified": 1737581772,
+        "narHash": "sha256-t1P2Pe3FAX9TlJsCZbmJ3wn+C4qr6aSMypAOu8WNsN0=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4",
+        "rev": "582af7ee9c8d84f5d534272fc7de9f292bd849be",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
        lib = nixpkgs.lib;
        rustToolchain = fenix.packages.${system}.fromToolchainName {
          name = (lib.importTOML ./rust-toolchain.toml).toolchain.channel;
-          sha256 = "sha256-i0Sh/ZFFsHlZ3oFZFc24qdk6Cd8Do8OPU4HJQsrKOeM=";
+          sha256 = "sha256-f/CVA1EC61EWbh0SjaRNhLL0Ypx2ObupbzigZp8NmL4=";
        };
      in
      {
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2025-04-15"
+channel = "nightly-2024-12-25"
--- a/src/catalog/src/system_schema/pg_catalog/pg_namespace/oid_map.rs
+++ b/src/catalog/src/system_schema/pg_catalog/pg_namespace/oid_map.rs
@@ -84,6 +84,12 @@ mod tests {
        let key1 = "3178510";
        let key2 = "4215648";

+        // have collision
+        assert_eq!(
+            oid_map.hasher.hash_one(key1) as u32,
+            oid_map.hasher.hash_one(key2) as u32
+        );
+
        // insert them into oid_map
        let oid1 = oid_map.get_oid(key1);
        let oid2 = oid_map.get_oid(key2);
--- a/src/common/function/src/scalars/matches_term.rs
+++ b/src/common/function/src/scalars/matches_term.rs
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::fmt;
-use std::iter::repeat_n;
 use std::sync::Arc;
+use std::{fmt, iter};

 use common_query::error::{InvalidFuncArgsSnafu, Result};
 use common_query::prelude::Volatility;
@@ -127,10 +126,9 @@ impl Function for MatchesTermFunction {
            let term = term_column.get_ref(0).as_string().unwrap();
            match term {
                None => {
-                    return Ok(Arc::new(BooleanVector::from_iter(repeat_n(
-                        None,
-                        text_column.len(),
-                    ))));
+                    return Ok(Arc::new(BooleanVector::from_iter(
+                        iter::repeat(None).take(text_column.len()),
+                    )));
                }
                Some(term) => Some(MatchesTermFinder::new(term)),
            }
@@ -219,7 +217,7 @@ impl MatchesTermFinder {
        }

        let mut pos = 0;
-        while let Some(found_pos) = self.finder.find(&text.as_bytes()[pos..]) {
+        while let Some(found_pos) = self.finder.find(text[pos..].as_bytes()) {
            let actual_pos = pos + found_pos;

            let prev_ok = self.starts_with_non_alnum
--- a/src/common/function/src/scalars/math/rate.rs
+++ b/src/common/function/src/scalars/math/rate.rs
@@ -37,7 +37,7 @@ impl fmt::Display for RateFunction {

 impl Function for RateFunction {
    fn name(&self) -> &str {
-        "rate"
+        "prom_rate"
    }

    fn return_type(&self, _input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
@@ -82,7 +82,7 @@ mod tests {
    #[test]
    fn test_rate_function() {
        let rate = RateFunction;
-        assert_eq!("rate", rate.name());
+        assert_eq!("prom_rate", rate.name());
        assert_eq!(
            ConcreteDataType::float64_datatype(),
            rate.return_type(&[]).unwrap()
--- a/src/common/function/src/scalars/timestamp.rs
+++ b/src/common/function/src/scalars/timestamp.rs
@@ -13,10 +13,8 @@
 // limitations under the License.

 use std::sync::Arc;
-mod greatest;
 mod to_unixtime;

-use greatest::GreatestFunction;
 use to_unixtime::ToUnixtimeFunction;

 use crate::function_registry::FunctionRegistry;
@@ -26,6 +24,5 @@ pub(crate) struct TimestampFunction;
 impl TimestampFunction {
    pub fn register(registry: &FunctionRegistry) {
        registry.register(Arc::new(ToUnixtimeFunction));
-        registry.register(Arc::new(GreatestFunction));
    }
 }
--- a/src/common/function/src/scalars/timestamp/greatest.rs
+++ b/src/common/function/src/scalars/timestamp/greatest.rs
@@ -1,328 +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::fmt::{self};
-
-use common_query::error::{
-    self, ArrowComputeSnafu, InvalidFuncArgsSnafu, Result, UnsupportedInputDataTypeSnafu,
-};
-use common_query::prelude::{Signature, Volatility};
-use datafusion::arrow::compute::kernels::cmp::gt;
-use datatypes::arrow::array::AsArray;
-use datatypes::arrow::compute::cast;
-use datatypes::arrow::compute::kernels::zip;
-use datatypes::arrow::datatypes::{
-    DataType as ArrowDataType, Date32Type, TimeUnit, TimestampMicrosecondType,
-    TimestampMillisecondType, TimestampNanosecondType, TimestampSecondType,
-};
-use datatypes::prelude::ConcreteDataType;
-use datatypes::types::TimestampType;
-use datatypes::vectors::{Helper, VectorRef};
-use snafu::{ensure, ResultExt};
-
-use crate::function::{Function, FunctionContext};
-
-#[derive(Clone, Debug, Default)]
-pub struct GreatestFunction;
-
-const NAME: &str = "greatest";
-
-macro_rules! gt_time_types {
-    ($ty: ident, $columns:expr) => {{
-        let column1 = $columns[0].to_arrow_array();
-        let column2 = $columns[1].to_arrow_array();
-
-        let column1 = column1.as_primitive::<$ty>();
-        let column2 = column2.as_primitive::<$ty>();
-        let boolean_array = gt(&column1, &column2).context(ArrowComputeSnafu)?;
-
-        let result = zip::zip(&boolean_array, &column1, &column2).context(ArrowComputeSnafu)?;
-        Helper::try_into_vector(&result).context(error::FromArrowArraySnafu)
-    }};
-}
-
-impl Function for GreatestFunction {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn return_type(&self, input_types: &[ConcreteDataType]) -> Result<ConcreteDataType> {
-        ensure!(
-            input_types.len() == 2,
-            InvalidFuncArgsSnafu {
-                err_msg: format!(
-                    "The length of the args is not correct, expect exactly two, have: {}",
-                    input_types.len()
-                )
-            }
-        );
-
-        match &input_types[0] {
-            ConcreteDataType::String(_) => Ok(ConcreteDataType::timestamp_millisecond_datatype()),
-            ConcreteDataType::Date(_) => Ok(ConcreteDataType::date_datatype()),
-            ConcreteDataType::Timestamp(ts_type) => Ok(ConcreteDataType::Timestamp(*ts_type)),
-            _ => UnsupportedInputDataTypeSnafu {
-                function: NAME,
-                datatypes: input_types,
-            }
-            .fail(),
-        }
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::uniform(
-            2,
-            vec![
-                ConcreteDataType::string_datatype(),
-                ConcreteDataType::date_datatype(),
-                ConcreteDataType::timestamp_nanosecond_datatype(),
-                ConcreteDataType::timestamp_microsecond_datatype(),
-                ConcreteDataType::timestamp_millisecond_datatype(),
-                ConcreteDataType::timestamp_second_datatype(),
-            ],
-            Volatility::Immutable,
-        )
-    }
-
-    fn eval(&self, _func_ctx: &FunctionContext, columns: &[VectorRef]) -> Result<VectorRef> {
-        ensure!(
-            columns.len() == 2,
-            InvalidFuncArgsSnafu {
-                err_msg: format!(
-                    "The length of the args is not correct, expect exactly two, have: {}",
-                    columns.len()
-                ),
-            }
-        );
-        match columns[0].data_type() {
-            ConcreteDataType::String(_) => {
-                let column1 = cast(
-                    &columns[0].to_arrow_array(),
-                    &ArrowDataType::Timestamp(TimeUnit::Millisecond, None),
-                )
-                .context(ArrowComputeSnafu)?;
-                let column1 = column1.as_primitive::<TimestampMillisecondType>();
-                let column2 = cast(
-                    &columns[1].to_arrow_array(),
-                    &ArrowDataType::Timestamp(TimeUnit::Millisecond, None),
-                )
-                .context(ArrowComputeSnafu)?;
-                let column2 = column2.as_primitive::<TimestampMillisecondType>();
-                let boolean_array = gt(&column1, &column2).context(ArrowComputeSnafu)?;
-                let result =
-                    zip::zip(&boolean_array, &column1, &column2).context(ArrowComputeSnafu)?;
-                Ok(Helper::try_into_vector(&result).context(error::FromArrowArraySnafu)?)
-            }
-            ConcreteDataType::Date(_) => gt_time_types!(Date32Type, columns),
-            ConcreteDataType::Timestamp(ts_type) => match ts_type {
-                TimestampType::Second(_) => gt_time_types!(TimestampSecondType, columns),
-                TimestampType::Millisecond(_) => {
-                    gt_time_types!(TimestampMillisecondType, columns)
-                }
-                TimestampType::Microsecond(_) => {
-                    gt_time_types!(TimestampMicrosecondType, columns)
-                }
-                TimestampType::Nanosecond(_) => {
-                    gt_time_types!(TimestampNanosecondType, columns)
-                }
-            },
-            _ => UnsupportedInputDataTypeSnafu {
-                function: NAME,
-                datatypes: columns.iter().map(|c| c.data_type()).collect::<Vec<_>>(),
-            }
-            .fail(),
-        }
-    }
-}
-
-impl fmt::Display for GreatestFunction {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "GREATEST")
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use common_time::timestamp::TimeUnit;
-    use common_time::{Date, Timestamp};
-    use datatypes::types::{
-        DateType, TimestampMicrosecondType, TimestampMillisecondType, TimestampNanosecondType,
-        TimestampSecondType,
-    };
-    use datatypes::value::Value;
-    use datatypes::vectors::{
-        DateVector, StringVector, TimestampMicrosecondVector, TimestampMillisecondVector,
-        TimestampNanosecondVector, TimestampSecondVector, Vector,
-    };
-    use paste::paste;
-
-    use super::*;
-    #[test]
-    fn test_greatest_takes_string_vector() {
-        let function = GreatestFunction;
-        assert_eq!(
-            function
-                .return_type(&[
-                    ConcreteDataType::string_datatype(),
-                    ConcreteDataType::string_datatype()
-                ])
-                .unwrap(),
-            ConcreteDataType::timestamp_millisecond_datatype()
-        );
-        let columns = vec![
-            Arc::new(StringVector::from(vec![
-                "1970-01-01".to_string(),
-                "2012-12-23".to_string(),
-            ])) as _,
-            Arc::new(StringVector::from(vec![
-                "2001-02-01".to_string(),
-                "1999-01-01".to_string(),
-            ])) as _,
-        ];
-
-        let result = function
-            .eval(&FunctionContext::default(), &columns)
-            .unwrap();
-        let result = result
-            .as_any()
-            .downcast_ref::<TimestampMillisecondVector>()
-            .unwrap();
-        assert_eq!(result.len(), 2);
-        assert_eq!(
-            result.get(0),
-            Value::Timestamp(Timestamp::from_str("2001-02-01 00:00:00", None).unwrap())
-        );
-        assert_eq!(
-            result.get(1),
-            Value::Timestamp(Timestamp::from_str("2012-12-23 00:00:00", None).unwrap())
-        );
-    }
-
-    #[test]
-    fn test_greatest_takes_date_vector() {
-        let function = GreatestFunction;
-        assert_eq!(
-            function
-                .return_type(&[
-                    ConcreteDataType::date_datatype(),
-                    ConcreteDataType::date_datatype()
-                ])
-                .unwrap(),
-            ConcreteDataType::Date(DateType)
-        );
-
-        let columns = vec![
-            Arc::new(DateVector::from_slice(vec![-1, 2])) as _,
-            Arc::new(DateVector::from_slice(vec![0, 1])) as _,
-        ];
-
-        let result = function
-            .eval(&FunctionContext::default(), &columns)
-            .unwrap();
-        let result = result.as_any().downcast_ref::<DateVector>().unwrap();
-        assert_eq!(result.len(), 2);
-        assert_eq!(
-            result.get(0),
-            Value::Date(Date::from_str_utc("1970-01-01").unwrap())
-        );
-        assert_eq!(
-            result.get(1),
-            Value::Date(Date::from_str_utc("1970-01-03").unwrap())
-        );
-    }
-
-    #[test]
-    fn test_greatest_takes_datetime_vector() {
-        let function = GreatestFunction;
-        assert_eq!(
-            function
-                .return_type(&[
-                    ConcreteDataType::timestamp_millisecond_datatype(),
-                    ConcreteDataType::timestamp_millisecond_datatype()
-                ])
-                .unwrap(),
-            ConcreteDataType::timestamp_millisecond_datatype()
-        );
-
-        let columns = vec![
-            Arc::new(TimestampMillisecondVector::from_slice(vec![-1, 2])) as _,
-            Arc::new(TimestampMillisecondVector::from_slice(vec![0, 1])) as _,
-        ];
-
-        let result = function
-            .eval(&FunctionContext::default(), &columns)
-            .unwrap();
-        let result = result
-            .as_any()
-            .downcast_ref::<TimestampMillisecondVector>()
-            .unwrap();
-        assert_eq!(result.len(), 2);
-        assert_eq!(
-            result.get(0),
-            Value::Timestamp(Timestamp::from_str("1970-01-01 00:00:00", None).unwrap())
-        );
-        assert_eq!(
-            result.get(1),
-            Value::Timestamp(Timestamp::from_str("1970-01-01 00:00:00.002", None).unwrap())
-        );
-    }
-
-    macro_rules! test_timestamp {
-        ($type: expr,$unit: ident) => {
-            paste! {
-                #[test]
-                fn [<test_greatest_takes_ $unit:lower _vector>]() {
-                    let function = GreatestFunction;
-                    assert_eq!(
-                        function.return_type(&[$type, $type]).unwrap(),
-                        ConcreteDataType::Timestamp(TimestampType::$unit([<Timestamp $unit Type>]))
-                    );
-
-                    let columns = vec![
-                        Arc::new([<Timestamp $unit Vector>]::from_slice(vec![-1, 2])) as _,
-                        Arc::new([<Timestamp $unit Vector>]::from_slice(vec![0, 1])) as _,
-                    ];
-
-                    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!(
-                        result.get(0),
-                        Value::Timestamp(Timestamp::new(0, TimeUnit::$unit))
-                    );
-                    assert_eq!(
-                        result.get(1),
-                        Value::Timestamp(Timestamp::new(2, TimeUnit::$unit))
-                    );
-                }
-            }
-        }
-    }
-
-    test_timestamp!(
-        ConcreteDataType::timestamp_nanosecond_datatype(),
-        Nanosecond
-    );
-    test_timestamp!(
-        ConcreteDataType::timestamp_microsecond_datatype(),
-        Microsecond
-    );
-    test_timestamp!(
-        ConcreteDataType::timestamp_millisecond_datatype(),
-        Millisecond
-    );
-    test_timestamp!(ConcreteDataType::timestamp_second_datatype(), Second);
-}
--- a/src/common/meta/src/lib.rs
+++ b/src/common/meta/src/lib.rs
@@ -15,6 +15,8 @@
 #![feature(assert_matches)]
 #![feature(btree_extract_if)]
 #![feature(let_chains)]
+#![feature(extract_if)]
+#![feature(hash_extract_if)]

 pub mod cache;
 pub mod cache_invalidator;
--- a/src/common/meta/src/rpc/router.rs
+++ b/src/common/meta/src/rpc/router.rs
@@ -176,12 +176,15 @@ impl TableRoute {
                })?
                .into();

-            let leader_peer = peers.get(region_route.leader_peer_index as usize).cloned();
+            let leader_peer = peers
+                .get(region_route.leader_peer_index as usize)
+                .cloned()
+                .map(Into::into);

            let follower_peers = region_route
                .follower_peer_indexes
                .into_iter()
-                .filter_map(|x| peers.get(x as usize).cloned())
+                .filter_map(|x| peers.get(x as usize).cloned().map(Into::into))
                .collect::<Vec<_>>();

            region_routes.push(RegionRoute {
--- a/src/common/query/src/logical_plan/accumulator.rs
+++ b/src/common/query/src/logical_plan/accumulator.rs
@@ -24,7 +24,7 @@ use datatypes::prelude::*;
 use datatypes::vectors::{Helper as VectorHelper, VectorRef};
 use snafu::ResultExt;

-use crate::error::{self, FromScalarValueSnafu, IntoVectorSnafu, Result};
+use crate::error::{self, Error, FromScalarValueSnafu, IntoVectorSnafu, Result};
 use crate::prelude::*;

 pub type AggregateFunctionCreatorRef = Arc<dyn AggregateFunctionCreator>;
@@ -166,7 +166,8 @@ impl DfAccumulator for DfAccumulatorAdaptor {
        let output_type = self.creator.output_type()?;
        let scalar_value = value
            .try_to_scalar_value(&output_type)
-            .context(error::ToScalarValueSnafu)?;
+            .context(error::ToScalarValueSnafu)
+            .map_err(Error::from)?;
        Ok(scalar_value)
    }

--- a/src/datatypes/src/schema/constraint.rs
+++ b/src/datatypes/src/schema/constraint.rs
@@ -253,10 +253,9 @@ fn create_current_timestamp_vector(
    data_type: &ConcreteDataType,
    num_rows: usize,
 ) -> Result<VectorRef> {
-    let current_timestamp_vector = TimestampMillisecondVector::from_values(std::iter::repeat_n(
-        util::current_time_millis(),
-        num_rows,
-    ));
+    let current_timestamp_vector = TimestampMillisecondVector::from_values(
+        std::iter::repeat(util::current_time_millis()).take(num_rows),
+    );
    if data_type.is_timestamp() {
        current_timestamp_vector.cast(data_type)
    } else {
--- a/src/datatypes/src/vectors/constant.rs
+++ b/src/datatypes/src/vectors/constant.rs
@@ -198,7 +198,8 @@ impl fmt::Debug for ConstantVector {

 impl Serializable for ConstantVector {
    fn serialize_to_json(&self) -> Result<Vec<serde_json::Value>> {
-        std::iter::repeat_n(self.get(0), self.len())
+        std::iter::repeat(self.get(0))
+            .take(self.len())
            .map(serde_json::Value::try_from)
            .collect::<serde_json::Result<_>>()
            .context(SerializeSnafu)
--- a/src/datatypes/src/vectors/decimal.rs
+++ b/src/datatypes/src/vectors/decimal.rs
@@ -412,7 +412,7 @@ pub(crate) fn replicate_decimal128(
                    // Safety: std::iter::Repeat and std::iter::Take implement TrustedLen.
                    builder
                        .mutable_array
-                        .append_trusted_len_iter(std::iter::repeat_n(data, repeat_times));
+                        .append_trusted_len_iter(std::iter::repeat(data).take(repeat_times));
                }
            }
            None => {
--- a/src/datatypes/src/vectors/dictionary.rs
+++ b/src/datatypes/src/vectors/dictionary.rs
@@ -16,8 +16,8 @@ use std::any::Any;
 use std::sync::Arc;

 use arrow::array::Array;
-use arrow::datatypes::Int64Type;
-use arrow_array::{ArrayRef, DictionaryArray, Int64Array};
+use arrow::datatypes::Int32Type;
+use arrow_array::{ArrayRef, DictionaryArray, Int32Array};
 use serde_json::Value as JsonValue;
 use snafu::ResultExt;

@@ -32,7 +32,7 @@ use crate::vectors::{self, Helper, Validity, Vector, VectorRef};
 /// Vector of dictionaries, basically backed by Arrow's `DictionaryArray`.
 #[derive(Debug, PartialEq)]
 pub struct DictionaryVector {
-    array: DictionaryArray<Int64Type>,
+    array: DictionaryArray<Int32Type>,
    /// The datatype of the items in the dictionary.
    item_type: ConcreteDataType,
    /// The vector of items in the dictionary.
@@ -41,7 +41,7 @@ pub struct DictionaryVector {

 impl DictionaryVector {
    /// Create a new instance of `DictionaryVector` from a dictionary array and item type
-    pub fn new(array: DictionaryArray<Int64Type>, item_type: ConcreteDataType) -> Result<Self> {
+    pub fn new(array: DictionaryArray<Int32Type>, item_type: ConcreteDataType) -> Result<Self> {
        let item_vector = Helper::try_into_vector(array.values())?;

        Ok(Self {
@@ -52,12 +52,12 @@ impl DictionaryVector {
    }

    /// Returns the underlying Arrow dictionary array
-    pub fn array(&self) -> &DictionaryArray<Int64Type> {
+    pub fn array(&self) -> &DictionaryArray<Int32Type> {
        &self.array
    }

    /// Returns the keys array of this dictionary
-    pub fn keys(&self) -> &arrow_array::PrimitiveArray<Int64Type> {
+    pub fn keys(&self) -> &arrow_array::PrimitiveArray<Int32Type> {
        self.array.keys()
    }

@@ -74,7 +74,7 @@ impl DictionaryVector {
 impl Vector for DictionaryVector {
    fn data_type(&self) -> ConcreteDataType {
        ConcreteDataType::Dictionary(DictionaryType::new(
-            ConcreteDataType::int64_datatype(),
+            ConcreteDataType::int32_datatype(),
            self.item_type.clone(),
        ))
    }
@@ -163,10 +163,10 @@ impl Serializable for DictionaryVector {
    }
 }

-impl TryFrom<DictionaryArray<Int64Type>> for DictionaryVector {
+impl TryFrom<DictionaryArray<Int32Type>> for DictionaryVector {
    type Error = crate::error::Error;

-    fn try_from(array: DictionaryArray<Int64Type>) -> Result<Self> {
+    fn try_from(array: DictionaryArray<Int32Type>) -> Result<Self> {
        let item_type = ConcreteDataType::from_arrow_type(array.values().data_type());
        let item_vector = Helper::try_into_vector(array.values())?;

@@ -243,7 +243,7 @@ impl VectorOp for DictionaryVector {
            previous_offset = offset;
        }

-        let new_keys = Int64Array::from(replicated_keys);
+        let new_keys = Int32Array::from(replicated_keys);
        let new_array = DictionaryArray::try_new(new_keys, self.values().clone())
            .expect("Failed to create replicated dictionary array");

@@ -261,7 +261,7 @@ impl VectorOp for DictionaryVector {
        let filtered_key_array = filtered_key_vector.to_arrow_array();
        let filtered_key_array = filtered_key_array
            .as_any()
-            .downcast_ref::<Int64Array>()
+            .downcast_ref::<Int32Array>()
            .unwrap();

        let new_array = DictionaryArray::try_new(filtered_key_array.clone(), self.values().clone())
@@ -291,7 +291,7 @@ impl VectorOp for DictionaryVector {
        let key_vector = Helper::try_into_vector(&key_array)?;
        let new_key_vector = key_vector.take(indices)?;
        let new_key_array = new_key_vector.to_arrow_array();
-        let new_key_array = new_key_array.as_any().downcast_ref::<Int64Array>().unwrap();
+        let new_key_array = new_key_array.as_any().downcast_ref::<Int32Array>().unwrap();

        let new_array = DictionaryArray::try_new(new_key_array.clone(), self.values().clone())
            .expect("Failed to create filtered dictionary array");
@@ -318,7 +318,7 @@ mod tests {
        // Keys: [0, 1, 2, null, 1, 3]
        // Resulting in: ["a", "b", "c", null, "b", "d"]
        let values = StringArray::from(vec!["a", "b", "c", "d"]);
-        let keys = Int64Array::from(vec![Some(0), Some(1), Some(2), None, Some(1), Some(3)]);
+        let keys = Int32Array::from(vec![Some(0), Some(1), Some(2), None, Some(1), Some(3)]);
        let dict_array = DictionaryArray::new(keys, Arc::new(values));
        DictionaryVector::try_from(dict_array).unwrap()
    }
@@ -404,7 +404,7 @@ mod tests {
        assert_eq!(
            casted.data_type(),
            ConcreteDataType::Dictionary(DictionaryType::new(
-                ConcreteDataType::int64_datatype(),
+                ConcreteDataType::int32_datatype(),
                ConcreteDataType::string_datatype(),
            ))
        );
--- a/src/datatypes/src/vectors/helper.rs
+++ b/src/datatypes/src/vectors/helper.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use arrow::array::{Array, ArrayRef, StringArray};
 use arrow::compute;
 use arrow::compute::kernels::comparison;
-use arrow::datatypes::{DataType as ArrowDataType, Int64Type, TimeUnit};
+use arrow::datatypes::{DataType as ArrowDataType, Int32Type, TimeUnit};
 use arrow_array::DictionaryArray;
 use arrow_schema::IntervalUnit;
 use datafusion_common::ScalarValue;
@@ -348,11 +348,11 @@ impl Helper {
            ArrowDataType::Decimal128(_, _) => {
                Arc::new(Decimal128Vector::try_from_arrow_array(array)?)
            }
-            ArrowDataType::Dictionary(key, value) if matches!(&**key, ArrowDataType::Int64) => {
+            ArrowDataType::Dictionary(key, value) if matches!(&**key, ArrowDataType::Int32) => {
                let array = array
                    .as_ref()
                    .as_any()
-                    .downcast_ref::<DictionaryArray<Int64Type>>()
+                    .downcast_ref::<DictionaryArray<Int32Type>>()
                    .unwrap(); // Safety: the type is guarded by match arm condition
                Arc::new(DictionaryVector::new(
                    array.clone(),
--- a/src/datatypes/src/vectors/null.rs
+++ b/src/datatypes/src/vectors/null.rs
@@ -120,7 +120,9 @@ impl fmt::Debug for NullVector {

 impl Serializable for NullVector {
    fn serialize_to_json(&self) -> Result<Vec<serde_json::Value>> {
-        Ok(std::iter::repeat_n(serde_json::Value::Null, self.len()).collect())
+        Ok(std::iter::repeat(serde_json::Value::Null)
+            .take(self.len())
+            .collect())
    }
 }

--- a/src/datatypes/src/vectors/primitive.rs
+++ b/src/datatypes/src/vectors/primitive.rs
@@ -388,7 +388,7 @@ pub(crate) fn replicate_primitive<T: LogicalPrimitiveType>(
                    // Safety: std::iter::Repeat and std::iter::Take implement TrustedLen.
                    builder
                        .mutable_array
-                        .append_trusted_len_iter(std::iter::repeat_n(data, repeat_times));
+                        .append_trusted_len_iter(std::iter::repeat(data).take(repeat_times));
                }
            }
            None => {
--- a/src/index/src/inverted_index/create/sort/external_sort.rs
+++ b/src/index/src/inverted_index/create/sort/external_sort.rs
@@ -481,7 +481,7 @@ mod tests {

        let mock_values = dic_values
            .iter()
-            .flat_map(|(value, size)| std::iter::repeat_n(value.clone(), *size))
+            .flat_map(|(value, size)| iter::repeat(value.clone()).take(*size))
            .collect::<Vec<_>>();

        let sorted_result = sorted_result(&mock_values, segment_row_count);
--- a/src/meta-srv/src/lib.rs
+++ b/src/meta-srv/src/lib.rs
@@ -14,6 +14,7 @@

 #![feature(result_flattening)]
 #![feature(assert_matches)]
+#![feature(extract_if)]
 #![feature(hash_set_entry)]

 pub mod bootstrap;
--- a/src/meta-srv/src/mocks.rs
+++ b/src/meta-srv/src/mocks.rs
@@ -141,7 +141,10 @@ pub async fn mock(
                if let Some(client) = client {
                    Ok(TokioIo::new(client))
                } else {
-                    Err(std::io::Error::other("Client already taken"))
+                    Err(std::io::Error::new(
+                        std::io::ErrorKind::Other,
+                        "Client already taken",
+                    ))
                }
            }
        }),
--- a/src/meta-srv/src/service/store/cached_kv.rs
+++ b/src/meta-srv/src/service/store/cached_kv.rs
@@ -278,7 +278,7 @@ impl KvBackend for LeaderCachedKvBackend {

        let remote_res = self.store.batch_get(remote_req).await?;
        let put_req = BatchPutRequest {
-            kvs: remote_res.kvs.clone().into_iter().collect(),
+            kvs: remote_res.kvs.clone().into_iter().map(Into::into).collect(),
            ..Default::default()
        };
        let _ = self.cache.batch_put(put_req).await?;
--- a/src/mito2/src/error.rs
+++ b/src/mito2/src/error.rs
@@ -710,8 +710,8 @@ pub enum Error {
        error: std::io::Error,
    },

-    #[snafu(display("Record batch error"))]
-    RecordBatch {
+    #[snafu(display("Failed to filter record batch"))]
+    FilterRecordBatch {
        source: common_recordbatch::error::Error,
        #[snafu(implicit)]
        location: Location,
@@ -1032,20 +1032,6 @@ pub enum Error {
        #[snafu(implicit)]
        location: Location,
    },
-
-    #[snafu(display("Failed to scan series"))]
-    ScanSeries {
-        #[snafu(implicit)]
-        location: Location,
-        source: Arc<Error>,
-    },
-
-    #[snafu(display("Partition {} scan multiple times", partition))]
-    ScanMultiTimes {
-        partition: usize,
-        #[snafu(implicit)]
-        location: Location,
-    },
 }

 pub type Result<T, E = Error> = std::result::Result<T, E>;
@@ -1168,7 +1154,7 @@ impl ErrorExt for Error {

            External { source, .. } => source.status_code(),

-            RecordBatch { source, .. } => source.status_code(),
+            FilterRecordBatch { source, .. } => source.status_code(),

            Download { .. } | Upload { .. } => StatusCode::StorageUnavailable,
            ChecksumMismatch { .. } => StatusCode::Unexpected,
@@ -1197,12 +1183,7 @@ impl ErrorExt for Error {
            ManualCompactionOverride {} => StatusCode::Cancelled,

            IncompatibleWalProviderChange { .. } => StatusCode::InvalidArguments,
-
            ConvertDataType { .. } => StatusCode::Internal,
-
-            ScanSeries { source, .. } => source.status_code(),
-
-            ScanMultiTimes { .. } => StatusCode::InvalidArguments,
        }
    }

--- a/src/mito2/src/memtable/partition_tree.rs
+++ b/src/mito2/src/memtable/partition_tree.rs
@@ -302,7 +302,10 @@ impl PartitionTreeMemtable {
    fn update_stats(&self, metrics: &WriteMetrics) {
        // Only let the tracker tracks value bytes.
        self.alloc_tracker.on_allocation(metrics.value_bytes);
-        metrics.update_timestamp_range(&self.max_timestamp, &self.min_timestamp);
+        self.max_timestamp
+            .fetch_max(metrics.max_ts, Ordering::SeqCst);
+        self.min_timestamp
+            .fetch_min(metrics.min_ts, Ordering::SeqCst);
    }
 }

--- a/src/mito2/src/memtable/stats.rs
+++ b/src/mito2/src/memtable/stats.rs
@@ -14,8 +14,6 @@

 //! Internal metrics of the memtable.

-use std::sync::atomic::{AtomicI64, Ordering};
-
 /// Metrics of writing memtables.
 pub(crate) struct WriteMetrics {
    /// Size allocated by keys.
@@ -28,51 +26,6 @@ pub(crate) struct WriteMetrics {
    pub(crate) max_ts: i64,
 }

-impl WriteMetrics {
-    /// Update the min/max timestamp range according to current write metric.
-    pub(crate) fn update_timestamp_range(&self, prev_max_ts: &AtomicI64, prev_min_ts: &AtomicI64) {
-        loop {
-            let current_min = prev_min_ts.load(Ordering::Relaxed);
-            if self.min_ts >= current_min {
-                break;
-            }
-
-            let Err(updated) = prev_min_ts.compare_exchange(
-                current_min,
-                self.min_ts,
-                Ordering::Relaxed,
-                Ordering::Relaxed,
-            ) else {
-                break;
-            };
-
-            if updated == self.min_ts {
-                break;
-            }
-        }
-
-        loop {
-            let current_max = prev_max_ts.load(Ordering::Relaxed);
-            if self.max_ts <= current_max {
-                break;
-            }
-
-            let Err(updated) = prev_max_ts.compare_exchange(
-                current_max,
-                self.max_ts,
-                Ordering::Relaxed,
-                Ordering::Relaxed,
-            ) else {
-                break;
-            };
-
-            if updated == self.max_ts {
-                break;
-            }
-        }
-    }
-}
-
 impl Default for WriteMetrics {
    fn default() -> Self {
        Self {
--- a/src/mito2/src/memtable/time_series.rs
+++ b/src/mito2/src/memtable/time_series.rs
@@ -147,7 +147,8 @@ impl TimeSeriesMemtable {
    fn update_stats(&self, stats: WriteMetrics) {
        self.alloc_tracker
            .on_allocation(stats.key_bytes + stats.value_bytes);
-        stats.update_timestamp_range(&self.max_timestamp, &self.min_timestamp);
+        self.max_timestamp.fetch_max(stats.max_ts, Ordering::SeqCst);
+        self.min_timestamp.fetch_min(stats.min_ts, Ordering::SeqCst);
    }

    fn write_key_value(&self, kv: KeyValue, stats: &mut WriteMetrics) -> Result<()> {
--- a/src/mito2/src/read.rs
+++ b/src/mito2/src/read.rs
@@ -24,7 +24,6 @@ pub(crate) mod range;
 pub(crate) mod scan_region;
 pub(crate) mod scan_util;
 pub(crate) mod seq_scan;
-pub(crate) mod series_scan;
 pub(crate) mod unordered_scan;

 use std::collections::{HashMap, HashSet};
--- a/src/mito2/src/read/projection.rs
+++ b/src/mito2/src/read/projection.rs
@@ -363,9 +363,9 @@ mod tests {
            builder
                .push_field_array(
                    *column_id,
-                    Arc::new(Int64Array::from_iter_values(std::iter::repeat_n(
-                        *field, num_rows,
-                    ))),
+                    Arc::new(Int64Array::from_iter_values(
+                        std::iter::repeat(*field).take(num_rows),
+                    )),
                )
                .unwrap();
        }
--- a/src/mito2/src/read/prune.rs
+++ b/src/mito2/src/read/prune.rs
@@ -21,7 +21,7 @@ use datatypes::arrow::array::BooleanArray;
 use datatypes::arrow::buffer::BooleanBuffer;
 use snafu::ResultExt;

-use crate::error::{RecordBatchSnafu, Result};
+use crate::error::{FilterRecordBatchSnafu, Result};
 use crate::memtable::BoxedBatchIterator;
 use crate::read::last_row::RowGroupLastRowCachedReader;
 use crate::read::{Batch, BatchReader};
@@ -201,7 +201,7 @@ impl PruneTimeIterator {
            for filter in filters.iter() {
                let result = filter
                    .evaluate_vector(batch.timestamps())
-                    .context(RecordBatchSnafu)?;
+                    .context(FilterRecordBatchSnafu)?;
                mask = mask.bitand(&result);
            }

--- a/src/mito2/src/read/scan_region.rs
+++ b/src/mito2/src/read/scan_region.rs
@@ -46,7 +46,6 @@ use crate::read::compat::{self, CompatBatch};
 use crate::read::projection::ProjectionMapper;
 use crate::read::range::{FileRangeBuilder, MemRangeBuilder, RangeMeta, RowGroupIndex};
 use crate::read::seq_scan::SeqScan;
-use crate::read::series_scan::SeriesScan;
 use crate::read::unordered_scan::UnorderedScan;
 use crate::read::{Batch, Source};
 use crate::region::options::MergeMode;
@@ -67,8 +66,6 @@ pub(crate) enum Scanner {
    Seq(SeqScan),
    /// Unordered scan.
    Unordered(UnorderedScan),
-    /// Per-series scan.
-    Series(SeriesScan),
 }

 impl Scanner {
@@ -78,7 +75,6 @@ impl Scanner {
        match self {
            Scanner::Seq(seq_scan) => seq_scan.build_stream(),
            Scanner::Unordered(unordered_scan) => unordered_scan.build_stream().await,
-            Scanner::Series(series_scan) => series_scan.build_stream().await,
        }
    }
 }
@@ -90,7 +86,6 @@ impl Scanner {
        match self {
            Scanner::Seq(seq_scan) => seq_scan.input().num_files(),
            Scanner::Unordered(unordered_scan) => unordered_scan.input().num_files(),
-            Scanner::Series(series_scan) => series_scan.input().num_files(),
        }
    }

@@ -99,7 +94,6 @@ impl Scanner {
        match self {
            Scanner::Seq(seq_scan) => seq_scan.input().num_memtables(),
            Scanner::Unordered(unordered_scan) => unordered_scan.input().num_memtables(),
-            Scanner::Series(series_scan) => series_scan.input().num_memtables(),
        }
    }

@@ -108,7 +102,6 @@ impl Scanner {
        match self {
            Scanner::Seq(seq_scan) => seq_scan.input().file_ids(),
            Scanner::Unordered(unordered_scan) => unordered_scan.input().file_ids(),
-            Scanner::Series(series_scan) => series_scan.input().file_ids(),
        }
    }

@@ -120,7 +113,6 @@ impl Scanner {
        match self {
            Scanner::Seq(seq_scan) => seq_scan.prepare(request).unwrap(),
            Scanner::Unordered(unordered_scan) => unordered_scan.prepare(request).unwrap(),
-            Scanner::Series(series_scan) => series_scan.prepare(request).unwrap(),
        }
    }
 }
@@ -256,9 +248,7 @@ impl ScanRegion {

    /// Returns a [Scanner] to scan the region.
    pub(crate) fn scanner(self) -> Result<Scanner> {
-        if self.use_series_scan() {
-            self.series_scan().map(Scanner::Series)
-        } else if self.use_unordered_scan() {
+        if self.use_unordered_scan() {
            // If table is append only and there is no series row selector, we use unordered scan in query.
            // We still use seq scan in compaction.
            self.unordered_scan().map(Scanner::Unordered)
@@ -270,9 +260,7 @@ impl ScanRegion {
    /// Returns a [RegionScanner] to scan the region.
    #[tracing::instrument(level = tracing::Level::DEBUG, skip_all)]
    pub(crate) fn region_scanner(self) -> Result<RegionScannerRef> {
-        if self.use_series_scan() {
-            self.series_scan().map(|scanner| Box::new(scanner) as _)
-        } else if self.use_unordered_scan() {
+        if self.use_unordered_scan() {
            self.unordered_scan().map(|scanner| Box::new(scanner) as _)
        } else {
            self.seq_scan().map(|scanner| Box::new(scanner) as _)
@@ -291,12 +279,6 @@ impl ScanRegion {
        Ok(UnorderedScan::new(input))
    }

-    /// Scans by series.
-    pub(crate) fn series_scan(self) -> Result<SeriesScan> {
-        let input = self.scan_input(true)?;
-        Ok(SeriesScan::new(input))
-    }
-
    #[cfg(test)]
    pub(crate) fn scan_without_filter_deleted(self) -> Result<SeqScan> {
        let input = self.scan_input(false)?;
@@ -317,11 +299,6 @@ impl ScanRegion {
                || self.request.distribution == Some(TimeSeriesDistribution::TimeWindowed))
    }

-    /// Returns true if the region can use series scan for current request.
-    fn use_series_scan(&self) -> bool {
-        self.request.distribution == Some(TimeSeriesDistribution::PerSeries)
-    }
-
    /// Creates a scan input.
    fn scan_input(mut self, filter_deleted: bool) -> Result<ScanInput> {
        let time_range = self.build_time_range_predicate();
@@ -345,13 +322,10 @@ impl ScanRegion {
        let memtables: Vec<_> = memtables
            .into_iter()
            .filter(|mem| {
-                if mem.is_empty() {
+                // check if memtable is empty by reading stats.
+                let Some((start, end)) = mem.stats().time_range() else {
                    return false;
-                }
-                let stats = mem.stats();
-                // Safety: the memtable is not empty.
-                let (start, end) = stats.time_range().unwrap();
-
+                };
                // The time range of the memtable is inclusive.
                let memtable_range = TimestampRange::new_inclusive(Some(start), Some(end));
                memtable_range.intersects(&time_range)
--- a/src/mito2/src/read/scan_util.rs
+++ b/src/mito2/src/read/scan_util.rs
@@ -92,8 +92,6 @@ struct ScanMetricsSet {

    /// Elapsed time before the first poll operation.
    first_poll: Duration,
-    /// Number of send timeout in SeriesScan.
-    num_series_send_timeout: usize,
 }

 impl fmt::Debug for ScanMetricsSet {
@@ -124,7 +122,6 @@ impl fmt::Debug for ScanMetricsSet {
            num_sst_batches,
            num_sst_rows,
            first_poll,
-            num_series_send_timeout,
        } = self;

        write!(
@@ -153,8 +150,7 @@ impl fmt::Debug for ScanMetricsSet {
            num_sst_record_batches={num_sst_record_batches}, \
            num_sst_batches={num_sst_batches}, \
            num_sst_rows={num_sst_rows}, \
-            first_poll={first_poll:?}, \
-            num_series_send_timeout={num_series_send_timeout}}}"
+            first_poll={first_poll:?}}}"
        )
    }
 }
@@ -443,12 +439,6 @@ impl PartitionMetrics {
    pub(crate) fn on_finish(&self) {
        self.0.on_finish();
    }
-
-    /// Sets the `num_series_send_timeout`.
-    pub(crate) fn set_num_series_send_timeout(&self, num_timeout: usize) {
-        let mut metrics = self.0.metrics.lock().unwrap();
-        metrics.num_series_send_timeout = num_timeout;
-    }
 }

 impl fmt::Debug for PartitionMetrics {
--- a/src/mito2/src/read/seq_scan.rs
+++ b/src/mito2/src/read/seq_scan.rs
@@ -30,7 +30,7 @@ use datatypes::schema::SchemaRef;
 use snafu::ResultExt;
 use store_api::metadata::RegionMetadataRef;
 use store_api::region_engine::{PartitionRange, PrepareRequest, RegionScanner, ScannerProperties};
-use store_api::storage::TimeSeriesRowSelector;
+use store_api::storage::{TimeSeriesDistribution, TimeSeriesRowSelector};
 use tokio::sync::Semaphore;

 use crate::error::{PartitionOutOfRangeSnafu, Result};
@@ -149,7 +149,7 @@ impl SeqScan {
    /// Builds a reader to read sources. If `semaphore` is provided, reads sources in parallel
    /// if possible.
    #[tracing::instrument(level = tracing::Level::DEBUG, skip_all)]
-    pub(crate) async fn build_reader_from_sources(
+    async fn build_reader_from_sources(
        stream_ctx: &StreamContext,
        mut sources: Vec<Source>,
        semaphore: Option<Arc<Semaphore>>,
@@ -206,13 +206,9 @@ impl SeqScan {
                .build(),
            ));
        }
-        if self.properties.partitions[partition].is_empty() {
-            return Ok(Box::pin(RecordBatchStreamWrapper::new(
-                self.stream_ctx.input.mapper.output_schema(),
-                common_recordbatch::EmptyRecordBatchStream::new(
-                    self.stream_ctx.input.mapper.output_schema(),
-                ),
-            )));
+
+        if self.stream_ctx.input.distribution == Some(TimeSeriesDistribution::PerSeries) {
+            return self.scan_partition_by_series(metrics_set, partition);
        }

        let stream_ctx = self.stream_ctx.clone();
@@ -241,14 +237,14 @@ impl SeqScan {
                    &mut sources,
                );

-                let mut metrics = ScannerMetrics::default();
-                let mut fetch_start = Instant::now();
                let mut reader =
                    Self::build_reader_from_sources(&stream_ctx, sources, semaphore.clone())
                        .await
                        .map_err(BoxedError::new)
                        .context(ExternalSnafu)?;
                let cache = &stream_ctx.input.cache_strategy;
+                let mut metrics = ScannerMetrics::default();
+                let mut fetch_start = Instant::now();
                #[cfg(debug_assertions)]
                let mut checker = crate::read::BatchChecker::default()
                    .with_start(Some(part_range.start))
@@ -311,6 +307,97 @@ impl SeqScan {
        Ok(stream)
    }

+    /// Scans all ranges in the given partition and merge by time series.
+    /// Otherwise the returned stream might not contains any data.
+    fn scan_partition_by_series(
+        &self,
+        metrics_set: &ExecutionPlanMetricsSet,
+        partition: usize,
+    ) -> Result<SendableRecordBatchStream, BoxedError> {
+        let stream_ctx = self.stream_ctx.clone();
+        let semaphore = self.new_semaphore();
+        let partition_ranges = self.properties.partitions[partition].clone();
+        let distinguish_range = self.properties.distinguish_partition_range;
+        let part_metrics = self.new_partition_metrics(metrics_set, partition);
+        debug_assert!(!self.compaction);
+
+        let stream = try_stream! {
+            part_metrics.on_first_poll();
+
+            let range_builder_list = Arc::new(RangeBuilderList::new(
+                stream_ctx.input.num_memtables(),
+                stream_ctx.input.num_files(),
+            ));
+            // Scans all parts.
+            let mut sources = Vec::with_capacity(partition_ranges.len());
+            for part_range in partition_ranges {
+                build_sources(
+                    &stream_ctx,
+                    &part_range,
+                    false,
+                    &part_metrics,
+                    range_builder_list.clone(),
+                    &mut sources,
+                );
+            }
+
+            // Builds a reader that merge sources from all parts.
+            let mut reader =
+                Self::build_reader_from_sources(&stream_ctx, sources, semaphore.clone())
+                    .await
+                    .map_err(BoxedError::new)
+                    .context(ExternalSnafu)?;
+            let cache = &stream_ctx.input.cache_strategy;
+            let mut metrics = ScannerMetrics::default();
+            let mut fetch_start = Instant::now();
+
+            while let Some(batch) = reader
+                .next_batch()
+                .await
+                .map_err(BoxedError::new)
+                .context(ExternalSnafu)?
+            {
+                metrics.scan_cost += fetch_start.elapsed();
+                metrics.num_batches += 1;
+                metrics.num_rows += batch.num_rows();
+
+                debug_assert!(!batch.is_empty());
+                if batch.is_empty() {
+                    continue;
+                }
+
+                let convert_start = Instant::now();
+                let record_batch = stream_ctx.input.mapper.convert(&batch, cache)?;
+                metrics.convert_cost += convert_start.elapsed();
+                let yield_start = Instant::now();
+                yield record_batch;
+                metrics.yield_cost += yield_start.elapsed();
+
+                fetch_start = Instant::now();
+            }
+
+            // Yields an empty part to indicate this range is terminated.
+            // The query engine can use this to optimize some queries.
+            if distinguish_range {
+                let yield_start = Instant::now();
+                yield stream_ctx.input.mapper.empty_record_batch();
+                metrics.yield_cost += yield_start.elapsed();
+            }
+
+            metrics.scan_cost += fetch_start.elapsed();
+            part_metrics.merge_metrics(&metrics);
+
+            part_metrics.on_finish();
+        };
+
+        let stream = Box::pin(RecordBatchStreamWrapper::new(
+            self.stream_ctx.input.mapper.output_schema(),
+            Box::pin(stream),
+        ));
+
+        Ok(stream)
+    }
+
    fn new_semaphore(&self) -> Option<Arc<Semaphore>> {
        if self.properties.target_partitions() > self.properties.num_partitions() {
            // We can use additional tasks to read the data if we have more target partitions than actual partitions.
@@ -411,7 +498,7 @@ impl fmt::Debug for SeqScan {
 }

 /// Builds sources for the partition range and push them to the `sources` vector.
-pub(crate) fn build_sources(
+fn build_sources(
    stream_ctx: &Arc<StreamContext>,
    part_range: &PartitionRange,
    compaction: bool,
@@ -422,8 +509,8 @@ pub(crate) fn build_sources(
    // Gets range meta.
    let range_meta = &stream_ctx.ranges[part_range.identifier];
    #[cfg(debug_assertions)]
-    if compaction {
-        // Compaction expects input sources are not been split.
+    if compaction || stream_ctx.input.distribution == Some(TimeSeriesDistribution::PerSeries) {
+        // Compaction or per series distribution expects input sources are not been split.
        debug_assert_eq!(range_meta.indices.len(), range_meta.row_group_indices.len());
        for (i, row_group_idx) in range_meta.row_group_indices.iter().enumerate() {
            // It should scan all row groups.
--- a/src/mito2/src/read/series_scan.rs
+++ b/src/mito2/src/read/series_scan.rs
@@ -1,547 +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.
-
-//! Per-series scan implementation.
-
-use std::fmt;
-use std::sync::{Arc, Mutex};
-use std::time::{Duration, Instant};
-
-use async_stream::try_stream;
-use common_error::ext::BoxedError;
-use common_recordbatch::error::ExternalSnafu;
-use common_recordbatch::util::ChainedRecordBatchStream;
-use common_recordbatch::{RecordBatch, RecordBatchStreamWrapper, SendableRecordBatchStream};
-use datafusion::physical_plan::metrics::ExecutionPlanMetricsSet;
-use datafusion::physical_plan::{DisplayAs, DisplayFormatType};
-use datatypes::compute::concat_batches;
-use datatypes::schema::SchemaRef;
-use smallvec::{smallvec, SmallVec};
-use snafu::{ensure, OptionExt, ResultExt};
-use store_api::metadata::RegionMetadataRef;
-use store_api::region_engine::{PartitionRange, PrepareRequest, RegionScanner, ScannerProperties};
-use tokio::sync::mpsc::error::{SendTimeoutError, TrySendError};
-use tokio::sync::mpsc::{self, Receiver, Sender};
-use tokio::sync::Semaphore;
-
-use crate::error::{
-    ComputeArrowSnafu, Error, InvalidSenderSnafu, PartitionOutOfRangeSnafu, Result,
-    ScanMultiTimesSnafu, ScanSeriesSnafu,
-};
-use crate::read::range::RangeBuilderList;
-use crate::read::scan_region::{ScanInput, StreamContext};
-use crate::read::scan_util::{PartitionMetrics, PartitionMetricsList};
-use crate::read::seq_scan::{build_sources, SeqScan};
-use crate::read::{Batch, ScannerMetrics};
-
-/// Timeout to send a batch to a sender.
-const SEND_TIMEOUT: Duration = Duration::from_millis(10);
-
-/// List of receivers.
-type ReceiverList = Vec<Option<Receiver<Result<SeriesBatch>>>>;
-
-/// Scans a region and returns sorted rows of a series in the same partition.
-///
-/// The output order is always order by `(primary key, time index)` inside every
-/// partition.
-/// Always returns the same series (primary key) to the same partition.
-pub struct SeriesScan {
-    /// Properties of the scanner.
-    properties: ScannerProperties,
-    /// Context of streams.
-    stream_ctx: Arc<StreamContext>,
-    /// Receivers of each partition.
-    receivers: Mutex<ReceiverList>,
-    /// Metrics for each partition.
-    /// The scanner only sets in query and keeps it empty during compaction.
-    metrics_list: Arc<PartitionMetricsList>,
-}
-
-impl SeriesScan {
-    /// Creates a new [SeriesScan].
-    pub(crate) fn new(input: ScanInput) -> Self {
-        let mut properties = ScannerProperties::default()
-            .with_append_mode(input.append_mode)
-            .with_total_rows(input.total_rows());
-        let stream_ctx = Arc::new(StreamContext::seq_scan_ctx(input, false));
-        properties.partitions = vec![stream_ctx.partition_ranges()];
-
-        Self {
-            properties,
-            stream_ctx,
-            receivers: Mutex::new(Vec::new()),
-            metrics_list: Arc::new(PartitionMetricsList::default()),
-        }
-    }
-
-    fn scan_partition_impl(
-        &self,
-        metrics_set: &ExecutionPlanMetricsSet,
-        partition: usize,
-    ) -> Result<SendableRecordBatchStream, BoxedError> {
-        if partition >= self.properties.num_partitions() {
-            return Err(BoxedError::new(
-                PartitionOutOfRangeSnafu {
-                    given: partition,
-                    all: self.properties.num_partitions(),
-                }
-                .build(),
-            ));
-        }
-
-        self.maybe_start_distributor(metrics_set, &self.metrics_list);
-
-        let part_metrics =
-            new_partition_metrics(&self.stream_ctx, metrics_set, partition, &self.metrics_list);
-        let mut receiver = self.take_receiver(partition).map_err(BoxedError::new)?;
-        let stream_ctx = self.stream_ctx.clone();
-
-        let stream = try_stream! {
-            part_metrics.on_first_poll();
-
-            let cache = &stream_ctx.input.cache_strategy;
-            let mut df_record_batches = Vec::new();
-            let mut fetch_start = Instant::now();
-            while let Some(result) = receiver.recv().await {
-                let mut metrics = ScannerMetrics::default();
-                let series = result.map_err(BoxedError::new).context(ExternalSnafu)?;
-                metrics.scan_cost += fetch_start.elapsed();
-                fetch_start = Instant::now();
-
-                let convert_start = Instant::now();
-                df_record_batches.reserve(series.batches.len());
-                for batch in series.batches {
-                    metrics.num_batches += 1;
-                    metrics.num_rows += batch.num_rows();
-
-                    let record_batch = stream_ctx.input.mapper.convert(&batch, cache)?;
-                    df_record_batches.push(record_batch.into_df_record_batch());
-                }
-
-                let output_schema = stream_ctx.input.mapper.output_schema();
-                let df_record_batch =
-                    concat_batches(output_schema.arrow_schema(), &df_record_batches)
-                        .context(ComputeArrowSnafu)
-                        .map_err(BoxedError::new)
-                        .context(ExternalSnafu)?;
-                df_record_batches.clear();
-                let record_batch =
-                    RecordBatch::try_from_df_record_batch(output_schema, df_record_batch)?;
-                metrics.convert_cost += convert_start.elapsed();
-
-                let yield_start = Instant::now();
-                yield record_batch;
-                metrics.yield_cost += yield_start.elapsed();
-
-                part_metrics.merge_metrics(&metrics);
-            }
-        };
-
-        let stream = Box::pin(RecordBatchStreamWrapper::new(
-            self.stream_ctx.input.mapper.output_schema(),
-            Box::pin(stream),
-        ));
-
-        Ok(stream)
-    }
-
-    /// Takes the receiver for the partition.
-    fn take_receiver(&self, partition: usize) -> Result<Receiver<Result<SeriesBatch>>> {
-        let mut rx_list = self.receivers.lock().unwrap();
-        rx_list[partition]
-            .take()
-            .context(ScanMultiTimesSnafu { partition })
-    }
-
-    /// Starts the distributor if the receiver list is empty.
-    fn maybe_start_distributor(
-        &self,
-        metrics_set: &ExecutionPlanMetricsSet,
-        metrics_list: &Arc<PartitionMetricsList>,
-    ) {
-        let mut rx_list = self.receivers.lock().unwrap();
-        if !rx_list.is_empty() {
-            return;
-        }
-
-        let (senders, receivers) = new_channel_list(self.properties.num_partitions());
-        let mut distributor = SeriesDistributor {
-            stream_ctx: self.stream_ctx.clone(),
-            semaphore: Some(Arc::new(Semaphore::new(self.properties.num_partitions()))),
-            partitions: self.properties.partitions.clone(),
-            senders,
-            metrics_set: metrics_set.clone(),
-            metrics_list: metrics_list.clone(),
-        };
-        common_runtime::spawn_global(async move {
-            distributor.execute().await;
-        });
-
-        *rx_list = receivers;
-    }
-
-    /// Scans the region and returns a stream.
-    pub(crate) async fn build_stream(&self) -> Result<SendableRecordBatchStream, BoxedError> {
-        let part_num = self.properties.num_partitions();
-        let metrics_set = ExecutionPlanMetricsSet::default();
-        let streams = (0..part_num)
-            .map(|i| self.scan_partition(&metrics_set, i))
-            .collect::<Result<Vec<_>, BoxedError>>()?;
-        let chained_stream = ChainedRecordBatchStream::new(streams).map_err(BoxedError::new)?;
-        Ok(Box::pin(chained_stream))
-    }
-}
-
-fn new_channel_list(num_partitions: usize) -> (SenderList, ReceiverList) {
-    let (senders, receivers): (Vec<_>, Vec<_>) = (0..num_partitions)
-        .map(|_| {
-            let (sender, receiver) = mpsc::channel(1);
-            (Some(sender), Some(receiver))
-        })
-        .unzip();
-    (SenderList::new(senders), receivers)
-}
-
-impl RegionScanner for SeriesScan {
-    fn properties(&self) -> &ScannerProperties {
-        &self.properties
-    }
-
-    fn schema(&self) -> SchemaRef {
-        self.stream_ctx.input.mapper.output_schema()
-    }
-
-    fn metadata(&self) -> RegionMetadataRef {
-        self.stream_ctx.input.mapper.metadata().clone()
-    }
-
-    fn scan_partition(
-        &self,
-        metrics_set: &ExecutionPlanMetricsSet,
-        partition: usize,
-    ) -> Result<SendableRecordBatchStream, BoxedError> {
-        self.scan_partition_impl(metrics_set, partition)
-    }
-
-    fn prepare(&mut self, request: PrepareRequest) -> Result<(), BoxedError> {
-        self.properties.prepare(request);
-        Ok(())
-    }
-
-    fn has_predicate(&self) -> bool {
-        let predicate = self.stream_ctx.input.predicate();
-        predicate.map(|p| !p.exprs().is_empty()).unwrap_or(false)
-    }
-
-    fn set_logical_region(&mut self, logical_region: bool) {
-        self.properties.set_logical_region(logical_region);
-    }
-}
-
-impl DisplayAs for SeriesScan {
-    fn fmt_as(&self, t: DisplayFormatType, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "SeriesScan: region={}, ",
-            self.stream_ctx.input.mapper.metadata().region_id
-        )?;
-        match t {
-            DisplayFormatType::Default => self.stream_ctx.format_for_explain(false, f),
-            DisplayFormatType::Verbose => {
-                self.stream_ctx.format_for_explain(true, f)?;
-                self.metrics_list.format_verbose_metrics(f)
-            }
-        }
-    }
-}
-
-impl fmt::Debug for SeriesScan {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("SeriesScan")
-            .field("num_ranges", &self.stream_ctx.ranges.len())
-            .finish()
-    }
-}
-
-#[cfg(test)]
-impl SeriesScan {
-    /// Returns the input.
-    pub(crate) fn input(&self) -> &ScanInput {
-        &self.stream_ctx.input
-    }
-}
-
-/// The distributor scans series and distributes them to different partitions.
-struct SeriesDistributor {
-    /// Context for the scan stream.
-    stream_ctx: Arc<StreamContext>,
-    /// Optional semaphore for limiting the number of concurrent scans.
-    semaphore: Option<Arc<Semaphore>>,
-    /// Partition ranges to scan.
-    partitions: Vec<Vec<PartitionRange>>,
-    /// Senders of all partitions.
-    senders: SenderList,
-    /// Metrics set to report.
-    /// The distributor report the metrics as an additional partition.
-    /// This may double the scan cost of the [SeriesScan] metrics. We can
-    /// get per-partition metrics in verbose mode to see the metrics of the
-    /// distributor.
-    metrics_set: ExecutionPlanMetricsSet,
-    metrics_list: Arc<PartitionMetricsList>,
-}
-
-impl SeriesDistributor {
-    /// Executes the distributor.
-    async fn execute(&mut self) {
-        if let Err(e) = self.scan_partitions().await {
-            self.senders.send_error(e).await;
-        }
-    }
-
-    /// Scans all parts.
-    async fn scan_partitions(&mut self) -> Result<()> {
-        let part_metrics = new_partition_metrics(
-            &self.stream_ctx,
-            &self.metrics_set,
-            self.partitions.len(),
-            &self.metrics_list,
-        );
-        part_metrics.on_first_poll();
-
-        let range_builder_list = Arc::new(RangeBuilderList::new(
-            self.stream_ctx.input.num_memtables(),
-            self.stream_ctx.input.num_files(),
-        ));
-        // Scans all parts.
-        let mut sources = Vec::with_capacity(self.partitions.len());
-        for partition in &self.partitions {
-            sources.reserve(partition.len());
-            for part_range in partition {
-                build_sources(
-                    &self.stream_ctx,
-                    part_range,
-                    false,
-                    &part_metrics,
-                    range_builder_list.clone(),
-                    &mut sources,
-                );
-            }
-        }
-
-        // Builds a reader that merge sources from all parts.
-        let mut reader =
-            SeqScan::build_reader_from_sources(&self.stream_ctx, sources, self.semaphore.clone())
-                .await?;
-        let mut metrics = ScannerMetrics::default();
-        let mut fetch_start = Instant::now();
-
-        let mut current_series = SeriesBatch::default();
-        while let Some(batch) = reader.next_batch().await? {
-            metrics.scan_cost += fetch_start.elapsed();
-            fetch_start = Instant::now();
-            metrics.num_batches += 1;
-            metrics.num_rows += batch.num_rows();
-
-            debug_assert!(!batch.is_empty());
-            if batch.is_empty() {
-                continue;
-            }
-
-            let Some(last_key) = current_series.current_key() else {
-                current_series.push(batch);
-                continue;
-            };
-
-            if last_key == batch.primary_key() {
-                current_series.push(batch);
-                continue;
-            }
-
-            // We find a new series, send the current one.
-            let to_send = std::mem::replace(&mut current_series, SeriesBatch::single(batch));
-            let yield_start = Instant::now();
-            self.senders.send_batch(to_send).await?;
-            metrics.yield_cost += yield_start.elapsed();
-        }
-
-        if !current_series.is_empty() {
-            let yield_start = Instant::now();
-            self.senders.send_batch(current_series).await?;
-            metrics.yield_cost += yield_start.elapsed();
-        }
-
-        metrics.scan_cost += fetch_start.elapsed();
-        part_metrics.merge_metrics(&metrics);
-        part_metrics.set_num_series_send_timeout(self.senders.num_timeout);
-
-        part_metrics.on_finish();
-
-        Ok(())
-    }
-}
-
-/// Batches of the same series.
-#[derive(Default)]
-struct SeriesBatch {
-    batches: SmallVec<[Batch; 4]>,
-}
-
-impl SeriesBatch {
-    /// Creates a new [SeriesBatch] from a single [Batch].
-    fn single(batch: Batch) -> Self {
-        Self {
-            batches: smallvec![batch],
-        }
-    }
-
-    fn current_key(&self) -> Option<&[u8]> {
-        self.batches.first().map(|batch| batch.primary_key())
-    }
-
-    fn push(&mut self, batch: Batch) {
-        self.batches.push(batch);
-    }
-
-    /// Returns true if there is no batch.
-    fn is_empty(&self) -> bool {
-        self.batches.is_empty()
-    }
-}
-
-/// List of senders.
-struct SenderList {
-    senders: Vec<Option<Sender<Result<SeriesBatch>>>>,
-    /// Number of None senders.
-    num_nones: usize,
-    /// Index of the current partition to send.
-    sender_idx: usize,
-    /// Number of timeout.
-    num_timeout: usize,
-}
-
-impl SenderList {
-    fn new(senders: Vec<Option<Sender<Result<SeriesBatch>>>>) -> Self {
-        let num_nones = senders.iter().filter(|sender| sender.is_none()).count();
-        Self {
-            senders,
-            num_nones,
-            sender_idx: 0,
-            num_timeout: 0,
-        }
-    }
-
-    /// Finds a partition and tries to send the batch to the partition.
-    /// Returns None if it sends successfully.
-    fn try_send_batch(&mut self, mut batch: SeriesBatch) -> Result<Option<SeriesBatch>> {
-        for _ in 0..self.senders.len() {
-            ensure!(self.num_nones < self.senders.len(), InvalidSenderSnafu);
-
-            let sender_idx = self.fetch_add_sender_idx();
-            let Some(sender) = &self.senders[sender_idx] else {
-                continue;
-            };
-
-            match sender.try_send(Ok(batch)) {
-                Ok(()) => return Ok(None),
-                Err(TrySendError::Full(res)) => {
-                    // Safety: we send Ok.
-                    batch = res.unwrap();
-                }
-                Err(TrySendError::Closed(res)) => {
-                    self.senders[sender_idx] = None;
-                    self.num_nones += 1;
-                    // Safety: we send Ok.
-                    batch = res.unwrap();
-                }
-            }
-        }
-
-        Ok(Some(batch))
-    }
-
-    /// Finds a partition and sends the batch to the partition.
-    async fn send_batch(&mut self, mut batch: SeriesBatch) -> Result<()> {
-        // Sends the batch without blocking first.
-        match self.try_send_batch(batch)? {
-            Some(b) => {
-                // Unable to send batch to partition.
-                batch = b;
-            }
-            None => {
-                return Ok(());
-            }
-        }
-
-        loop {
-            ensure!(self.num_nones < self.senders.len(), InvalidSenderSnafu);
-
-            let sender_idx = self.fetch_add_sender_idx();
-            let Some(sender) = &self.senders[sender_idx] else {
-                continue;
-            };
-            // Adds a timeout to avoid blocking indefinitely and sending
-            // the batch in a round-robin fashion when some partitions
-            // don't poll their inputs. This may happen if we have a
-            // node like sort merging. But it is rare when we are using SeriesScan.
-            match sender.send_timeout(Ok(batch), SEND_TIMEOUT).await {
-                Ok(()) => break,
-                Err(SendTimeoutError::Timeout(res)) => {
-                    self.num_timeout += 1;
-                    // Safety: we send Ok.
-                    batch = res.unwrap();
-                }
-                Err(SendTimeoutError::Closed(res)) => {
-                    self.senders[sender_idx] = None;
-                    self.num_nones += 1;
-                    // Safety: we send Ok.
-                    batch = res.unwrap();
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn send_error(&self, error: Error) {
-        let error = Arc::new(error);
-        for sender in self.senders.iter().flatten() {
-            let result = Err(error.clone()).context(ScanSeriesSnafu);
-            let _ = sender.send(result).await;
-        }
-    }
-
-    fn fetch_add_sender_idx(&mut self) -> usize {
-        let sender_idx = self.sender_idx;
-        self.sender_idx = (self.sender_idx + 1) % self.senders.len();
-        sender_idx
-    }
-}
-
-fn new_partition_metrics(
-    stream_ctx: &StreamContext,
-    metrics_set: &ExecutionPlanMetricsSet,
-    partition: usize,
-    metrics_list: &PartitionMetricsList,
-) -> PartitionMetrics {
-    let metrics = PartitionMetrics::new(
-        stream_ctx.input.mapper.metadata().region_id,
-        partition,
-        "SeriesScan",
-        stream_ctx.query_start,
-        metrics_set,
-    );
-
-    metrics_list.set(partition, metrics.clone());
-    metrics
-}
--- a/src/mito2/src/sst/index/bloom_filter/creator.rs
+++ b/src/mito2/src/sst/index/bloom_filter/creator.rs
@@ -346,6 +346,7 @@ impl BloomFilterIndexer {

 #[cfg(test)]
 pub(crate) mod tests {
+    use std::iter;

    use api::v1::SemanticType;
    use datatypes::data_type::ConcreteDataType;
@@ -460,15 +461,15 @@ pub(crate) mod tests {

        Batch::new(
            primary_key,
-            Arc::new(UInt64Vector::from_iter_values(std::iter::repeat_n(
-                0, num_rows,
-            ))),
-            Arc::new(UInt64Vector::from_iter_values(std::iter::repeat_n(
-                0, num_rows,
-            ))),
-            Arc::new(UInt8Vector::from_iter_values(std::iter::repeat_n(
-                1, num_rows,
-            ))),
+            Arc::new(UInt64Vector::from_iter_values(
+                iter::repeat(0).take(num_rows),
+            )),
+            Arc::new(UInt64Vector::from_iter_values(
+                iter::repeat(0).take(num_rows),
+            )),
+            Arc::new(UInt8Vector::from_iter_values(
+                iter::repeat(1).take(num_rows),
+            )),
            vec![u64_field],
        )
        .unwrap()
--- a/src/mito2/src/sst/index/fulltext_index/creator.rs
+++ b/src/mito2/src/sst/index/fulltext_index/creator.rs
@@ -489,12 +489,12 @@ mod tests {
            Arc::new(UInt64Vector::from_iter_values(
                (0..num_rows).map(|n| n as u64),
            )),
-            Arc::new(UInt64Vector::from_iter_values(std::iter::repeat_n(
-                0, num_rows,
-            ))),
-            Arc::new(UInt8Vector::from_iter_values(std::iter::repeat_n(
-                1, num_rows,
-            ))),
+            Arc::new(UInt64Vector::from_iter_values(
+                std::iter::repeat(0).take(num_rows),
+            )),
+            Arc::new(UInt8Vector::from_iter_values(
+                std::iter::repeat(1).take(num_rows),
+            )),
            vec![
                BatchColumn {
                    column_id: 1,
--- a/src/mito2/src/sst/index/inverted_index/creator.rs
+++ b/src/mito2/src/sst/index/inverted_index/creator.rs
@@ -326,6 +326,7 @@ impl InvertedIndexer {
 #[cfg(test)]
 mod tests {
    use std::collections::BTreeSet;
+    use std::iter;

    use api::v1::SemanticType;
    use datafusion_expr::{binary_expr, col, lit, Expr as DfExpr, Operator};
@@ -423,15 +424,15 @@ mod tests {

        Batch::new(
            primary_key,
-            Arc::new(UInt64Vector::from_iter_values(std::iter::repeat_n(
-                0, num_rows,
-            ))),
-            Arc::new(UInt64Vector::from_iter_values(std::iter::repeat_n(
-                0, num_rows,
-            ))),
-            Arc::new(UInt8Vector::from_iter_values(std::iter::repeat_n(
-                1, num_rows,
-            ))),
+            Arc::new(UInt64Vector::from_iter_values(
+                iter::repeat(0).take(num_rows),
+            )),
+            Arc::new(UInt64Vector::from_iter_values(
+                iter::repeat(0).take(num_rows),
+            )),
+            Arc::new(UInt8Vector::from_iter_values(
+                iter::repeat(1).take(num_rows),
+            )),
            vec![u64_field],
        )
        .unwrap()
--- a/src/mito2/src/sst/parquet/file_range.rs
+++ b/src/mito2/src/sst/parquet/file_range.rs
@@ -27,7 +27,7 @@ use snafu::{OptionExt, ResultExt};
 use store_api::storage::TimeSeriesRowSelector;

 use crate::error::{
-    DecodeStatsSnafu, FieldTypeMismatchSnafu, RecordBatchSnafu, Result, StatsNotPresentSnafu,
+    DecodeStatsSnafu, FieldTypeMismatchSnafu, FilterRecordBatchSnafu, Result, StatsNotPresentSnafu,
 };
 use crate::read::compat::CompatBatch;
 use crate::read::last_row::RowGroupLastRowCachedReader;
@@ -294,7 +294,7 @@ impl RangeBase {
                    };
                    if filter
                        .evaluate_scalar(&pk_value)
-                        .context(RecordBatchSnafu)?
+                        .context(FilterRecordBatchSnafu)?
                    {
                        continue;
                    } else {
@@ -311,11 +311,11 @@ impl RangeBase {
                    let field_col = &input.fields()[field_index].data;
                    filter
                        .evaluate_vector(field_col)
-                        .context(RecordBatchSnafu)?
+                        .context(FilterRecordBatchSnafu)?
                }
                SemanticType::Timestamp => filter
                    .evaluate_vector(input.timestamps())
-                    .context(RecordBatchSnafu)?,
+                    .context(FilterRecordBatchSnafu)?,
            };

            mask = mask.bitand(&result);
--- a/src/mito2/src/sst/parquet/format.rs
+++ b/src/mito2/src/sst/parquet/format.rs
@@ -134,6 +134,7 @@ impl WriteFormat {

 /// Helper for reading the SST format.
 pub struct ReadFormat {
+    /// The metadata stored in the SST.
    metadata: RegionMetadataRef,
    /// SST file schema.
    arrow_schema: SchemaRef,
@@ -305,17 +306,23 @@ impl ReadFormat {
        &self,
        row_groups: &[impl Borrow<RowGroupMetaData>],
        column_id: ColumnId,
-    ) -> Option<ArrayRef> {
-        let column = self.metadata.column_by_id(column_id)?;
+    ) -> StatValues {
+        let Some(column) = self.metadata.column_by_id(column_id) else {
+            // No such column in the SST.
+            return StatValues::NoColumn;
+        };
        match column.semantic_type {
            SemanticType::Tag => self.tag_values(row_groups, column, true),
            SemanticType::Field => {
-                let index = self.field_id_to_index.get(&column_id)?;
-                Self::column_values(row_groups, column, *index, true)
+                // Safety: `field_id_to_index` is initialized by the semantic type.
+                let index = self.field_id_to_index.get(&column_id).unwrap();
+                let stats = Self::column_values(row_groups, column, *index, true);
+                StatValues::from_stats_opt(stats)
            }
            SemanticType::Timestamp => {
                let index = self.time_index_position();
-                Self::column_values(row_groups, column, index, true)
+                let stats = Self::column_values(row_groups, column, index, true);
+                StatValues::from_stats_opt(stats)
            }
        }
    }
@@ -325,17 +332,23 @@ impl ReadFormat {
        &self,
        row_groups: &[impl Borrow<RowGroupMetaData>],
        column_id: ColumnId,
-    ) -> Option<ArrayRef> {
-        let column = self.metadata.column_by_id(column_id)?;
+    ) -> StatValues {
+        let Some(column) = self.metadata.column_by_id(column_id) else {
+            // No such column in the SST.
+            return StatValues::NoColumn;
+        };
        match column.semantic_type {
            SemanticType::Tag => self.tag_values(row_groups, column, false),
            SemanticType::Field => {
-                let index = self.field_id_to_index.get(&column_id)?;
-                Self::column_values(row_groups, column, *index, false)
+                // Safety: `field_id_to_index` is initialized by the semantic type.
+                let index = self.field_id_to_index.get(&column_id).unwrap();
+                let stats = Self::column_values(row_groups, column, *index, false);
+                StatValues::from_stats_opt(stats)
            }
            SemanticType::Timestamp => {
                let index = self.time_index_position();
-                Self::column_values(row_groups, column, index, false)
+                let stats = Self::column_values(row_groups, column, index, false);
+                StatValues::from_stats_opt(stats)
            }
        }
    }
@@ -345,17 +358,23 @@ impl ReadFormat {
        &self,
        row_groups: &[impl Borrow<RowGroupMetaData>],
        column_id: ColumnId,
-    ) -> Option<ArrayRef> {
-        let column = self.metadata.column_by_id(column_id)?;
+    ) -> StatValues {
+        let Some(column) = self.metadata.column_by_id(column_id) else {
+            // No such column in the SST.
+            return StatValues::NoColumn;
+        };
        match column.semantic_type {
-            SemanticType::Tag => None,
+            SemanticType::Tag => StatValues::NoStats,
            SemanticType::Field => {
-                let index = self.field_id_to_index.get(&column_id)?;
-                Self::column_null_counts(row_groups, *index)
+                // Safety: `field_id_to_index` is initialized by the semantic type.
+                let index = self.field_id_to_index.get(&column_id).unwrap();
+                let stats = Self::column_null_counts(row_groups, *index);
+                StatValues::from_stats_opt(stats)
            }
            SemanticType::Timestamp => {
                let index = self.time_index_position();
-                Self::column_null_counts(row_groups, index)
+                let stats = Self::column_null_counts(row_groups, index);
+                StatValues::from_stats_opt(stats)
            }
        }
    }
@@ -390,8 +409,7 @@ impl ReadFormat {
        row_groups: &[impl Borrow<RowGroupMetaData>],
        column: &ColumnMetadata,
        is_min: bool,
-    ) -> Option<ArrayRef> {
-        let primary_key_encoding = self.metadata.primary_key_encoding;
+    ) -> StatValues {
        let is_first_tag = self
            .metadata
            .primary_key
@@ -400,9 +418,28 @@ impl ReadFormat {
            .unwrap_or(false);
        if !is_first_tag {
            // Only the min-max of the first tag is available in the primary key.
-            return None;
+            return StatValues::NoStats;
        }

+        StatValues::from_stats_opt(self.first_tag_values(row_groups, column, is_min))
+    }
+
+    /// Returns min/max values of the first tag.
+    /// Returns None if the tag does not have statistics.
+    fn first_tag_values(
+        &self,
+        row_groups: &[impl Borrow<RowGroupMetaData>],
+        column: &ColumnMetadata,
+        is_min: bool,
+    ) -> Option<ArrayRef> {
+        debug_assert!(self
+            .metadata
+            .primary_key
+            .first()
+            .map(|id| *id == column.column_id)
+            .unwrap_or(false));
+
+        let primary_key_encoding = self.metadata.primary_key_encoding;
        let converter = build_primary_key_codec_with_fields(
            primary_key_encoding,
            [(
@@ -452,6 +489,7 @@ impl ReadFormat {
    }

    /// Returns min/max values of specific non-tag columns.
+    /// Returns None if the column does not have statistics.
    fn column_values(
        row_groups: &[impl Borrow<RowGroupMetaData>],
        column: &ColumnMetadata,
@@ -544,6 +582,29 @@ impl ReadFormat {
    }
 }

+/// Values of column statistics of the SST.
+///
+/// It also distinguishes the case that a column is not found and
+/// the column exists but has no statistics.
+pub enum StatValues {
+    /// Values of each row group.
+    Values(ArrayRef),
+    /// No such column.
+    NoColumn,
+    /// Column exists but has no statistics.
+    NoStats,
+}
+
+impl StatValues {
+    /// Creates a new `StatValues` instance from optional statistics.
+    pub fn from_stats_opt(stats: Option<ArrayRef>) -> Self {
+        match stats {
+            Some(stats) => StatValues::Values(stats),
+            None => StatValues::NoStats,
+        }
+    }
+}
+
 #[cfg(test)]
 impl ReadFormat {
    /// Creates a helper with existing `metadata` and all columns.
@@ -755,7 +816,7 @@ mod tests {
        ));
        let mut keys = vec![];
        for (index, num_rows) in pk_row_nums.iter().map(|v| v.1).enumerate() {
-            keys.extend(std::iter::repeat_n(index as u32, num_rows));
+            keys.extend(std::iter::repeat(index as u32).take(num_rows));
        }
        let keys = UInt32Array::from(keys);
        Arc::new(DictionaryArray::new(keys, values))
--- a/src/mito2/src/sst/parquet/stats.rs
+++ b/src/mito2/src/sst/parquet/stats.rs
@@ -25,7 +25,7 @@ use parquet::file::metadata::RowGroupMetaData;
 use store_api::metadata::RegionMetadataRef;
 use store_api::storage::ColumnId;

-use crate::sst::parquet::format::ReadFormat;
+use crate::sst::parquet::format::{ReadFormat, StatValues};

 /// Statistics for pruning row groups.
 pub(crate) struct RowGroupPruningStats<'a, T> {
@@ -100,16 +100,18 @@ impl<T: Borrow<RowGroupMetaData>> PruningStatistics for RowGroupPruningStats<'_,
    fn min_values(&self, column: &Column) -> Option<ArrayRef> {
        let column_id = self.column_id_to_prune(&column.name)?;
        match self.read_format.min_values(self.row_groups, column_id) {
-            Some(values) => Some(values),
-            None => self.compat_default_value(&column.name),
+            StatValues::Values(values) => Some(values),
+            StatValues::NoColumn => self.compat_default_value(&column.name),
+            StatValues::NoStats => None,
        }
    }

    fn max_values(&self, column: &Column) -> Option<ArrayRef> {
        let column_id = self.column_id_to_prune(&column.name)?;
        match self.read_format.max_values(self.row_groups, column_id) {
-            Some(values) => Some(values),
-            None => self.compat_default_value(&column.name),
+            StatValues::Values(values) => Some(values),
+            StatValues::NoColumn => self.compat_default_value(&column.name),
+            StatValues::NoStats => None,
        }
    }

@@ -118,10 +120,12 @@ impl<T: Borrow<RowGroupMetaData>> PruningStatistics for RowGroupPruningStats<'_,
    }

    fn null_counts(&self, column: &Column) -> Option<ArrayRef> {
-        let Some(column_id) = self.column_id_to_prune(&column.name) else {
-            return self.compat_null_count(&column.name);
-        };
-        self.read_format.null_counts(self.row_groups, column_id)
+        let column_id = self.column_id_to_prune(&column.name)?;
+        match self.read_format.null_counts(self.row_groups, column_id) {
+            StatValues::Values(values) => Some(values),
+            StatValues::NoColumn => self.compat_null_count(&column.name),
+            StatValues::NoStats => None,
+        }
    }

    fn row_counts(&self, _column: &Column) -> Option<ArrayRef> {
--- a/src/operator/src/req_convert/insert/fill_impure_default.rs
+++ b/src/operator/src/req_convert/insert/fill_impure_default.rs
@@ -85,9 +85,11 @@ impl ImpureDefaultFiller {
            .schema
            .iter()
            .filter_map(|schema| {
-                self.impure_columns
-                    .contains_key(&schema.column_name)
-                    .then_some(&schema.column_name)
+                if self.impure_columns.contains_key(&schema.column_name) {
+                    Some(&schema.column_name)
+                } else {
+                    None
+                }
            })
            .collect();

--- a/src/pipeline/src/etl/processor/dissect.rs
+++ b/src/pipeline/src/etl/processor/dissect.rs
@@ -325,7 +325,7 @@ impl std::str::FromStr for Pattern {

 impl Pattern {
    fn check(&self) -> Result<()> {
-        if self.is_empty() {
+        if self.len() == 0 {
            return DissectEmptyPatternSnafu.fail();
        }

--- a/src/promql/src/extension_plan/instant_manipulate.rs
+++ b/src/promql/src/extension_plan/instant_manipulate.rs
@@ -91,9 +91,9 @@ impl UserDefinedLogicalNodeCore for InstantManipulate {
        _exprs: Vec<Expr>,
        inputs: Vec<LogicalPlan>,
    ) -> DataFusionResult<Self> {
-        if inputs.len() != 1 {
+        if inputs.is_empty() {
            return Err(DataFusionError::Internal(
-                "InstantManipulate should have exact one input".to_string(),
+                "InstantManipulate should have at least one input".to_string(),
            ));
        }

@@ -354,9 +354,6 @@ impl Stream for InstantManipulateStream {
    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
        let poll = match ready!(self.input.poll_next_unpin(cx)) {
            Some(Ok(batch)) => {
-                if batch.num_rows() == 0 {
-                    return Poll::Pending;
-                }
                let timer = std::time::Instant::now();
                self.num_series.add(1);
                let result = Ok(batch).and_then(|batch| self.manipulate(batch));
--- a/src/promql/src/extension_plan/range_manipulate.rs
+++ b/src/promql/src/extension_plan/range_manipulate.rs
@@ -42,7 +42,7 @@ use greptime_proto::substrait_extension as pb;
 use prost::Message;
 use snafu::ResultExt;

-use crate::error::{DeserializeSnafu, Result};
+use crate::error::{DataFusionPlanningSnafu, DeserializeSnafu, Result};
 use crate::extension_plan::{Millisecond, METRIC_NUM_SERIES};
 use crate::metrics::PROMQL_SERIES_COUNT;
 use crate::range_array::RangeArray;
@@ -194,26 +194,20 @@ impl RangeManipulate {

    pub fn deserialize(bytes: &[u8]) -> Result<Self> {
        let pb_range_manipulate = pb::RangeManipulate::decode(bytes).context(DeserializeSnafu)?;
-        let empty_schema = Arc::new(DFSchema::empty());
        let placeholder_plan = LogicalPlan::EmptyRelation(EmptyRelation {
            produce_one_row: false,
-            schema: empty_schema.clone(),
+            schema: Arc::new(DFSchema::empty()),
        });
-
-        // Unlike `Self::new()`, this method doesn't check the input schema as it will fail
-        // because the input schema is empty.
-        // But this is Ok since datafusion guarantees to call `with_exprs_and_inputs` for the
-        // deserialized plan.
-        Ok(Self {
-            start: pb_range_manipulate.start,
-            end: pb_range_manipulate.end,
-            interval: pb_range_manipulate.interval,
-            range: pb_range_manipulate.range,
-            time_index: pb_range_manipulate.time_index,
-            field_columns: pb_range_manipulate.tag_columns,
-            input: placeholder_plan,
-            output_schema: empty_schema,
-        })
+        Self::new(
+            pb_range_manipulate.start,
+            pb_range_manipulate.end,
+            pb_range_manipulate.interval,
+            pb_range_manipulate.range,
+            pb_range_manipulate.time_index,
+            pb_range_manipulate.tag_columns,
+            placeholder_plan,
+        )
+        .context(DataFusionPlanningSnafu)
    }
 }

@@ -276,19 +270,14 @@ impl UserDefinedLogicalNodeCore for RangeManipulate {
    fn with_exprs_and_inputs(
        &self,
        _exprs: Vec<Expr>,
-        mut inputs: Vec<LogicalPlan>,
+        inputs: Vec<LogicalPlan>,
    ) -> DataFusionResult<Self> {
-        if inputs.len() != 1 {
+        if inputs.is_empty() {
            return Err(DataFusionError::Internal(
-                "RangeManipulate should have at exact one input".to_string(),
+                "RangeManipulate should have at least one input".to_string(),
            ));
        }

-        let input: LogicalPlan = inputs.pop().unwrap();
-        let input_schema = input.schema();
-        let output_schema =
-            Self::calculate_output_schema(input_schema, &self.time_index, &self.field_columns)?;
-
        Ok(Self {
            start: self.start,
            end: self.end,
@@ -296,8 +285,8 @@ impl UserDefinedLogicalNodeCore for RangeManipulate {
            range: self.range,
            time_index: self.time_index.clone(),
            field_columns: self.field_columns.clone(),
-            input,
-            output_schema,
+            input: inputs.into_iter().next().unwrap(),
+            output_schema: self.output_schema.clone(),
        })
    }
 }
--- a/src/promql/src/extension_plan/series_divide.rs
+++ b/src/promql/src/extension_plan/series_divide.rs
@@ -106,10 +106,6 @@ impl SeriesDivide {
        })
    }

-    pub fn tags(&self) -> &[String] {
-        &self.tag_columns
-    }
-
    pub fn serialize(&self) -> Vec<u8> {
        pb::SeriesDivide {
            tag_columns: self.tag_columns.clone(),
@@ -319,9 +315,7 @@ impl Stream for SeriesDivideStream {
                    let next_batch = ready!(self.as_mut().fetch_next_batch(cx)).transpose()?;
                    let timer = std::time::Instant::now();
                    if let Some(next_batch) = next_batch {
-                        if next_batch.num_rows() != 0 {
-                            self.buffer.push(next_batch);
-                        }
+                        self.buffer.push(next_batch);
                        continue;
                    } else {
                        // input stream is ended
--- a/src/promql/src/functions.rs
+++ b/src/promql/src/functions.rs
@@ -40,7 +40,7 @@ pub use holt_winters::HoltWinters;
 pub use idelta::IDelta;
 pub use predict_linear::PredictLinear;
 pub use quantile::QuantileOverTime;
-pub use quantile_aggr::{quantile_udaf, QUANTILE_NAME};
+pub use quantile_aggr::quantile_udaf;
 pub use resets::Resets;
 pub use round::Round;

--- a/src/promql/src/functions/extrapolate_rate.rs
+++ b/src/promql/src/functions/extrapolate_rate.rs
@@ -228,7 +228,7 @@ impl<const IS_COUNTER: bool, const IS_RATE: bool> ExtrapolatedRate<IS_COUNTER, I

 // delta
 impl ExtrapolatedRate<false, false> {
-    pub const fn name() -> &'static str {
+    pub fn name() -> &'static str {
        "prom_delta"
    }

@@ -239,7 +239,7 @@ impl ExtrapolatedRate<false, false> {

 // rate
 impl ExtrapolatedRate<true, true> {
-    pub const fn name() -> &'static str {
+    pub fn name() -> &'static str {
        "prom_rate"
    }

@@ -250,7 +250,7 @@ impl ExtrapolatedRate<true, true> {

 // increase
 impl ExtrapolatedRate<true, false> {
-    pub const fn name() -> &'static str {
+    pub fn name() -> &'static str {
        "prom_increase"
    }

--- a/src/promql/src/functions/quantile_aggr.rs
+++ b/src/promql/src/functions/quantile_aggr.rs
@@ -27,7 +27,7 @@ use datatypes::arrow::datatypes::{DataType, Field, Float64Type};

 use crate::functions::quantile::quantile_impl;

-pub const QUANTILE_NAME: &str = "quantile";
+const QUANTILE_NAME: &str = "quantile";

 const VALUES_FIELD_NAME: &str = "values";
 const DEFAULT_LIST_FIELD_NAME: &str = "item";
--- a/src/query/src/dist_plan/commutativity.rs
+++ b/src/query/src/dist_plan/commutativity.rs
@@ -55,16 +55,12 @@ impl Categorizer {
            LogicalPlan::Filter(filter) => Self::check_expr(&filter.predicate),
            LogicalPlan::Window(_) => Commutativity::Unimplemented,
            LogicalPlan::Aggregate(aggr) => {
-                if !Self::check_partition(&aggr.group_expr, &partition_cols) {
-                    return Commutativity::NonCommutative;
+                if Self::check_partition(&aggr.group_expr, &partition_cols) {
+                    return Commutativity::Commutative;
                }
-                for expr in &aggr.aggr_expr {
-                    let commutativity = Self::check_expr(expr);
-                    if !matches!(commutativity, Commutativity::Commutative) {
-                        return commutativity;
-                    }
-                }
-                Commutativity::Commutative
+
+                // check all children exprs and uses the strictest level
+                Commutativity::Unimplemented
            }
            LogicalPlan::Sort(_) => {
                if partition_cols.is_empty() {
@@ -98,7 +94,7 @@ impl Categorizer {
                }
            }
            LogicalPlan::Extension(extension) => {
-                Self::check_extension_plan(extension.node.as_ref() as _, &partition_cols)
+                Self::check_extension_plan(extension.node.as_ref() as _)
            }
            LogicalPlan::Distinct(_) => {
                if partition_cols.is_empty() {
@@ -120,30 +116,13 @@ impl Categorizer {
        }
    }

-    pub fn check_extension_plan(
-        plan: &dyn UserDefinedLogicalNode,
-        partition_cols: &[String],
-    ) -> Commutativity {
+    pub fn check_extension_plan(plan: &dyn UserDefinedLogicalNode) -> Commutativity {
        match plan.name() {
-            name if name == SeriesDivide::name() => {
-                let series_divide = plan.as_any().downcast_ref::<SeriesDivide>().unwrap();
-                let tags = series_divide.tags().iter().collect::<HashSet<_>>();
-                for partition_col in partition_cols {
-                    if !tags.contains(partition_col) {
-                        return Commutativity::NonCommutative;
-                    }
-                }
-                Commutativity::Commutative
-            }
-            name if name == SeriesNormalize::name()
-                || name == InstantManipulate::name()
-                || name == RangeManipulate::name() =>
-            {
-                // They should always follows Series Divide.
-                // Either all commutative or all non-commutative (which will be blocked by SeriesDivide).
-                Commutativity::Commutative
-            }
            name if name == EmptyMetric::name()
+                || name == InstantManipulate::name()
+                || name == SeriesNormalize::name()
+                || name == RangeManipulate::name()
+                || name == SeriesDivide::name()
                || name == MergeScanLogicalPlan::name()
                || name == MergeSortLogicalPlan::name() =>
            {
@@ -169,9 +148,8 @@ impl Categorizer {
            | Expr::Negative(_)
            | Expr::Between(_)
            | Expr::Exists(_)
-            | Expr::InList(_) => Commutativity::Commutative,
-            Expr::ScalarFunction(_udf) => Commutativity::Commutative,
-            Expr::AggregateFunction(_udaf) => Commutativity::Commutative,
+            | Expr::InList(_)
+            | Expr::ScalarFunction(_) => Commutativity::Commutative,

            Expr::Like(_)
            | Expr::SimilarTo(_)
@@ -180,6 +158,7 @@ impl Categorizer {
            | Expr::Case(_)
            | Expr::Cast(_)
            | Expr::TryCast(_)
+            | Expr::AggregateFunction(_)
            | Expr::WindowFunction(_)
            | Expr::InSubquery(_)
            | Expr::ScalarSubquery(_)
--- a/src/query/src/lib.rs
+++ b/src/query/src/lib.rs
@@ -14,6 +14,7 @@

 #![feature(let_chains)]
 #![feature(int_roundings)]
+#![feature(trait_upcasting)]
 #![feature(try_blocks)]
 #![feature(stmt_expr_attributes)]
 #![feature(iterator_try_collect)]
--- a/src/query/src/optimizer/parallelize_scan.rs
+++ b/src/query/src/optimizer/parallelize_scan.rs
@@ -62,28 +62,21 @@ impl ParallelizeScan {
                } else if let Some(region_scan_exec) =
                    plan.as_any().downcast_ref::<RegionScanExec>()
                {
-                    let expected_partition_num = config.execution.target_partitions;
                    if region_scan_exec.is_partition_set() {
                        return Ok(Transformed::no(plan));
                    }

+                    // don't parallelize if we want per series distribution
                    if matches!(
                        region_scan_exec.distribution(),
                        Some(TimeSeriesDistribution::PerSeries)
                    ) {
-                        let partition_range = region_scan_exec.get_partition_ranges();
-                        // HACK: Allocate expected_partition_num empty partitions to indicate
-                        // the expected partition number.
-                        let mut new_partitions = vec![vec![]; expected_partition_num];
-                        new_partitions[0] = partition_range;
-                        let new_plan = region_scan_exec
-                            .with_new_partitions(new_partitions, expected_partition_num)
-                            .map_err(|e| DataFusionError::External(e.into_inner()))?;
-                        return Ok(Transformed::yes(Arc::new(new_plan)));
+                        return Ok(Transformed::no(plan));
                    }

                    let ranges = region_scan_exec.get_partition_ranges();
                    let total_range_num = ranges.len();
+                    let expected_partition_num = config.execution.target_partitions;

                    // assign ranges to each partition
                    let mut partition_ranges =
@@ -138,18 +131,26 @@ impl ParallelizeScan {
    ) -> Vec<Vec<PartitionRange>> {
        if ranges.is_empty() {
            // Returns a single partition with no range.
-            return vec![vec![]; expected_partition_num];
+            return vec![vec![]];
        }

        if ranges.len() == 1 {
-            let mut vec = vec![vec![]; expected_partition_num];
-            vec[0] = ranges;
-            return vec;
+            return vec![ranges];
        }

        // Sort ranges by number of rows in descending order.
        ranges.sort_by(|a, b| b.num_rows.cmp(&a.num_rows));
-        let mut partition_ranges = vec![vec![]; expected_partition_num];
+        // Get the max row number of the ranges. Note that the number of rows may be 0 if statistics are not available.
+        let max_rows = ranges[0].num_rows;
+        let total_rows = ranges.iter().map(|range| range.num_rows).sum::<usize>();
+        // Computes the partition num by the max row number. This eliminates the unbalance of the partitions.
+        let balanced_partition_num = if max_rows > 0 {
+            total_rows.div_ceil(max_rows)
+        } else {
+            ranges.len()
+        };
+        let actual_partition_num = expected_partition_num.min(balanced_partition_num).max(1);
+        let mut partition_ranges = vec![vec![]; actual_partition_num];

        #[derive(Eq, PartialEq)]
        struct HeapNode {
@@ -171,7 +172,7 @@ impl ParallelizeScan {
        }

        let mut part_heap =
-            BinaryHeap::from_iter((0..expected_partition_num).map(|partition_idx| HeapNode {
+            BinaryHeap::from_iter((0..actual_partition_num).map(|partition_idx| HeapNode {
                num_rows: 0,
                partition_idx,
            }));
@@ -262,7 +263,7 @@ mod test {
        ];
        assert_eq!(result, expected);

-        // assign 4 ranges to 5 partitions.
+        // assign 4 ranges to 5 partitions. Only 4 partitions are returned.
        let expected_partition_num = 5;
        let result = ParallelizeScan::assign_partition_range(ranges, expected_partition_num);
        let expected = vec![
@@ -272,31 +273,32 @@ mod test {
                num_rows: 250,
                identifier: 4,
            }],
-            vec![PartitionRange {
-                start: Timestamp::new(0, TimeUnit::Second),
-                end: Timestamp::new(10, TimeUnit::Second),
-                num_rows: 100,
-                identifier: 1,
-            }],
            vec![PartitionRange {
                start: Timestamp::new(10, TimeUnit::Second),
                end: Timestamp::new(20, TimeUnit::Second),
                num_rows: 200,
                identifier: 2,
            }],
-            vec![],
-            vec![PartitionRange {
-                start: Timestamp::new(20, TimeUnit::Second),
-                end: Timestamp::new(30, TimeUnit::Second),
-                num_rows: 150,
-                identifier: 3,
-            }],
+            vec![
+                PartitionRange {
+                    start: Timestamp::new(20, TimeUnit::Second),
+                    end: Timestamp::new(30, TimeUnit::Second),
+                    num_rows: 150,
+                    identifier: 3,
+                },
+                PartitionRange {
+                    start: Timestamp::new(0, TimeUnit::Second),
+                    end: Timestamp::new(10, TimeUnit::Second),
+                    num_rows: 100,
+                    identifier: 1,
+                },
+            ],
        ];
        assert_eq!(result, expected);

-        // assign 0 ranges to 5 partitions. Should return 5 empty ranges.
+        // assign 0 ranges to 5 partitions. Only 1 partition is returned.
        let result = ParallelizeScan::assign_partition_range(vec![], 5);
-        assert_eq!(result.len(), 5);
+        assert_eq!(result.len(), 1);
    }

    #[test]
--- a/src/query/src/part_sort.rs
+++ b/src/query/src/part_sort.rs
@@ -348,7 +348,7 @@ impl PartSortStream {
        &self,
        sort_column: &ArrayRef,
    ) -> datafusion_common::Result<Option<usize>> {
-        if sort_column.is_empty() {
+        if sort_column.len() == 0 {
            return Ok(Some(0));
        }

--- a/src/query/src/query_engine/default_serializer.rs
+++ b/src/query/src/query_engine/default_serializer.rs
@@ -29,11 +29,6 @@ use datafusion::execution::{FunctionRegistry, SessionStateBuilder};
 use datafusion::logical_expr::LogicalPlan;
 use datafusion_expr::UserDefinedLogicalNode;
 use greptime_proto::substrait_extension::MergeScan as PbMergeScan;
-use promql::functions::{
-    AbsentOverTime, AvgOverTime, Changes, CountOverTime, Delta, Deriv, IDelta, Increase,
-    LastOverTime, MaxOverTime, MinOverTime, PresentOverTime, Rate, Resets, StddevOverTime,
-    StdvarOverTime, SumOverTime,
-};
 use prost::Message;
 use session::context::QueryContextRef;
 use snafu::ResultExt;
@@ -137,26 +132,6 @@ impl SubstraitPlanDecoder for DefaultPlanDecoder {
            let _ = session_state.register_udaf(Arc::new(HllState::state_udf_impl()));
            let _ = session_state.register_udaf(Arc::new(HllState::merge_udf_impl()));
            let _ = session_state.register_udaf(Arc::new(GeoPathAccumulator::udf_impl()));
-
-            let _ = session_state.register_udf(Arc::new(IDelta::<false>::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(IDelta::<true>::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(Rate::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(Increase::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(Delta::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(Resets::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(Changes::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(Deriv::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(AvgOverTime::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(MinOverTime::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(MaxOverTime::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(SumOverTime::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(CountOverTime::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(LastOverTime::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(AbsentOverTime::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(PresentOverTime::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(StddevOverTime::scalar_udf()));
-            let _ = session_state.register_udf(Arc::new(StdvarOverTime::scalar_udf()));
-            // TODO(ruihang): add quantile_over_time, predict_linear, holt_winters, round
        }
        let logical_plan = DFLogicalSubstraitConvertor
            .decode(message, session_state)
--- a/src/query/src/query_engine/state.rs
+++ b/src/query/src/query_engine/state.rs
@@ -31,7 +31,6 @@ use datafusion::error::Result as DfResult;
 use datafusion::execution::context::{QueryPlanner, SessionConfig, SessionContext, SessionState};
 use datafusion::execution::runtime_env::RuntimeEnv;
 use datafusion::execution::SessionStateBuilder;
-use datafusion::physical_optimizer::enforce_sorting::EnforceSorting;
 use datafusion::physical_optimizer::optimizer::PhysicalOptimizer;
 use datafusion::physical_optimizer::sanity_checker::SanityCheckPlan;
 use datafusion::physical_optimizer::PhysicalOptimizerRule;
@@ -143,9 +142,6 @@ impl QueryEngineState {
        physical_optimizer
            .rules
            .insert(1, Arc::new(PassDistribution));
-        physical_optimizer
-            .rules
-            .insert(2, Arc::new(EnforceSorting {}));
        // Add rule for windowed sort
        physical_optimizer
            .rules
--- a/src/servers/src/http/timeout.rs
+++ b/src/servers/src/http/timeout.rs
@@ -117,7 +117,7 @@ where
    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
        match self.inner.poll_ready(cx) {
            Poll::Pending => Poll::Pending,
-            Poll::Ready(r) => Poll::Ready(r),
+            Poll::Ready(r) => Poll::Ready(r.map_err(Into::into)),
        }
    }

--- a/src/servers/src/lib.rs
+++ b/src/servers/src/lib.rs
@@ -17,6 +17,7 @@
 #![feature(exclusive_wrapper)]
 #![feature(let_chains)]
 #![feature(if_let_guard)]
+#![feature(trait_upcasting)]

 use datafusion_expr::LogicalPlan;
 use datatypes::schema::Schema;
--- a/src/sql/src/statements/transform.rs
+++ b/src/sql/src/statements/transform.rs
@@ -55,7 +55,7 @@ pub fn transform_statements(stmts: &mut Vec<Statement>) -> Result<()> {
        }
    }

-    let _ = visit_expressions_mut(stmts, |expr| {
+    visit_expressions_mut(stmts, |expr| {
        for rule in RULES.iter() {
            rule.visit_expr(expr)?;
        }
--- a/src/store-api/src/metadata.rs
+++ b/src/store-api/src/metadata.rs
@@ -290,7 +290,7 @@ impl RegionMetadata {
    pub fn project(&self, projection: &[ColumnId]) -> Result<RegionMetadata> {
        // check time index
        ensure!(
-            projection.contains(&self.time_index),
+            projection.iter().any(|id| *id == self.time_index),
            TimeIndexNotFoundSnafu
        );

--- a/src/table/src/lib.rs
+++ b/src/table/src/lib.rs
@@ -14,7 +14,6 @@

 #![feature(assert_matches)]
 #![feature(try_blocks)]
-#![feature(let_chains)]

 pub mod dist_table;
 pub mod error;
--- a/src/table/src/table/adapter.rs
+++ b/src/table/src/table/adapter.rs
@@ -95,7 +95,7 @@ impl TableProvider for DfTableProviderAdapter {
        filters: &[Expr],
        limit: Option<usize>,
    ) -> DfResult<Arc<dyn ExecutionPlan>> {
-        let filters: Vec<Expr> = filters.iter().map(Clone::clone).collect();
+        let filters: Vec<Expr> = filters.iter().map(Clone::clone).map(Into::into).collect();
        let request = {
            let mut request = self.scan_req.lock().unwrap();
            request.filters = filters;
--- a/src/table/src/table/scan.rs
+++ b/src/table/src/table/scan.rs
@@ -82,17 +82,11 @@ impl RegionScanExec {
        if scanner.properties().is_logical_region() {
            pk_names.sort_unstable();
        }
-        let pk_columns = pk_names
-            .iter()
-            .filter_map(
-                |col| Some(Arc::new(Column::new_with_schema(col, &arrow_schema).ok()?) as _),
-            )
-            .collect::<Vec<_>>();
-        let mut pk_sort_columns: Vec<PhysicalSortExpr> = pk_names
-            .iter()
+        let mut pk_columns: Vec<PhysicalSortExpr> = pk_names
+            .into_iter()
            .filter_map(|col| {
                Some(PhysicalSortExpr::new(
-                    Arc::new(Column::new_with_schema(col, &arrow_schema).ok()?) as _,
+                    Arc::new(Column::new_with_schema(&col, &arrow_schema).ok()?) as _,
                    SortOptions {
                        descending: false,
                        nulls_first: true,
@@ -119,37 +113,28 @@ impl RegionScanExec {
        let eq_props = match request.distribution {
            Some(TimeSeriesDistribution::PerSeries) => {
                if let Some(ts) = ts_col {
-                    pk_sort_columns.push(ts);
+                    pk_columns.push(ts);
                }
                EquivalenceProperties::new_with_orderings(
                    arrow_schema.clone(),
-                    &[LexOrdering::new(pk_sort_columns)],
+                    &[LexOrdering::new(pk_columns)],
                )
            }
            Some(TimeSeriesDistribution::TimeWindowed) => {
                if let Some(ts_col) = ts_col {
-                    pk_sort_columns.insert(0, ts_col);
+                    pk_columns.insert(0, ts_col);
                }
                EquivalenceProperties::new_with_orderings(
                    arrow_schema.clone(),
-                    &[LexOrdering::new(pk_sort_columns)],
+                    &[LexOrdering::new(pk_columns)],
                )
            }
            None => EquivalenceProperties::new(arrow_schema.clone()),
        };

-        let partitioning = match request.distribution {
-            Some(TimeSeriesDistribution::PerSeries) => {
-                Partitioning::Hash(pk_columns.clone(), num_output_partition)
-            }
-            Some(TimeSeriesDistribution::TimeWindowed) | None => {
-                Partitioning::UnknownPartitioning(num_output_partition)
-            }
-        };
-
        let properties = PlanProperties::new(
            eq_props,
-            partitioning,
+            Partitioning::UnknownPartitioning(num_output_partition),
            EmissionType::Incremental,
            Boundedness::Bounded,
        );
@@ -203,14 +188,9 @@ impl RegionScanExec {
            warn!("Setting partition ranges more than once for RegionScanExec");
        }

+        let num_partitions = partitions.len();
        let mut properties = self.properties.clone();
-        let new_partitioning = match properties.partitioning {
-            Partitioning::Hash(ref columns, _) => {
-                Partitioning::Hash(columns.clone(), target_partitions)
-            }
-            _ => Partitioning::UnknownPartitioning(target_partitions),
-        };
-        properties.partitioning = new_partitioning;
+        properties.partitioning = Partitioning::UnknownPartitioning(num_partitions);

        {
            let mut scanner = self.scanner.lock().unwrap();
--- a/tests-fuzz/src/utils.rs
+++ b/tests-fuzz/src/utils.rs
@@ -85,7 +85,11 @@ pub struct UnstableTestVariables {
 pub fn load_unstable_test_env_variables() -> UnstableTestVariables {
    let _ = dotenv::dotenv();
    let binary_path = env::var(GT_FUZZ_BINARY_PATH).expect("GT_FUZZ_BINARY_PATH not found");
-    let root_dir = env::var(GT_FUZZ_INSTANCE_ROOT_DIR).ok();
+    let root_dir = if let Ok(root) = env::var(GT_FUZZ_INSTANCE_ROOT_DIR) {
+        Some(root)
+    } else {
+        None
+    };

    UnstableTestVariables {
        binary_path,
--- a/tests-fuzz/targets/unstable/fuzz_create_table_standalone.rs
+++ b/tests-fuzz/targets/unstable/fuzz_create_table_standalone.rs
@@ -157,7 +157,7 @@ async fn execute_unstable_create_table(
            }
            Err(err) => {
                // FIXME(weny): support to retry it later.
-                if matches!(err, sqlx::Error::PoolTimedOut) {
+                if matches!(err, sqlx::Error::PoolTimedOut { .. }) {
                    warn!("ignore pool timeout, sql: {sql}");
                    continue;
                }
--- a/tests-integration/src/cluster.rs
+++ b/tests-integration/src/cluster.rs
@@ -489,7 +489,10 @@ async fn create_datanode_client(datanode: &Datanode) -> (String, Client) {
                    if let Some(client) = client {
                        Ok(TokioIo::new(client))
                    } else {
-                        Err(std::io::Error::other("Client already taken"))
+                        Err(std::io::Error::new(
+                            std::io::ErrorKind::Other,
+                            "Client already taken",
+                        ))
                    }
                }
            }),
--- a/tests/cases/standalone/common/flow/flow_step_aggr.result
+++ b/tests/cases/standalone/common/flow/flow_step_aggr.result
@@ -50,6 +50,7 @@ ADMIN FLUSH_FLOW('calc_access_log_10s');
 +-----------------------------------------+

 -- query should return 3 rows
+-- SQLNESS SORT_RESULT 3 1
 SELECT "url", time_window FROM access_log_10s
 ORDER BY
    time_window;
@@ -63,6 +64,7 @@ ORDER BY
 +------------+---------------------+

 -- use hll_count to query the approximate data in access_log_10s
+-- SQLNESS SORT_RESULT 3 1
 SELECT "url", time_window, hll_count(state) FROM access_log_10s
 ORDER BY
    time_window;
@@ -76,6 +78,7 @@ ORDER BY
 +------------+---------------------+---------------------------------+

 -- further, we can aggregate 10 seconds of data to every minute, by using hll_merge to merge 10 seconds of hyperloglog state
+-- SQLNESS SORT_RESULT 3 1
 SELECT
    "url",
    date_bin('1 minute'::INTERVAL, time_window) AS time_window_1m,
@@ -91,8 +94,8 @@ ORDER BY
 +------------+---------------------+------------+
 | url        | time_window_1m      | uv_per_min |
 +------------+---------------------+------------+
-| /not_found | 2025-03-04T00:00:00 | 1          |
 | /dashboard | 2025-03-04T00:00:00 | 3          |
+| /not_found | 2025-03-04T00:00:00 | 1          |
 +------------+---------------------+------------+

 DROP FLOW calc_access_log_10s;
--- a/tests/cases/standalone/common/flow/flow_step_aggr.sql
+++ b/tests/cases/standalone/common/flow/flow_step_aggr.sql
@@ -36,16 +36,19 @@ INSERT INTO access_log VALUES
 ADMIN FLUSH_FLOW('calc_access_log_10s');

 -- query should return 3 rows
+-- SQLNESS SORT_RESULT 3 1
 SELECT "url", time_window FROM access_log_10s
 ORDER BY
    time_window;

 -- use hll_count to query the approximate data in access_log_10s
+-- SQLNESS SORT_RESULT 3 1
 SELECT "url", time_window, hll_count(state) FROM access_log_10s
 ORDER BY
    time_window;

 -- further, we can aggregate 10 seconds of data to every minute, by using hll_merge to merge 10 seconds of hyperloglog state
+-- SQLNESS SORT_RESULT 3 1
 SELECT
    "url",
    date_bin('1 minute'::INTERVAL, time_window) AS time_window_1m,
--- a/tests/cases/standalone/common/function/time.result
+++ b/tests/cases/standalone/common/function/time.result
@@ -9,7 +9,7 @@ select GREATEST('1999-01-30', '2023-03-01');
 +-------------------------------------------------+
 | greatest(Utf8("1999-01-30"),Utf8("2023-03-01")) |
 +-------------------------------------------------+
-| 2023-03-01T00:00:00                             |
+| 2023-03-01                                      |
 +-------------------------------------------------+

 select GREATEST('2000-02-11'::Date, '2020-12-30'::Date);
--- a/tests/cases/standalone/common/promql/simple_histogram.result
+++ b/tests/cases/standalone/common/promql/simple_histogram.result
@@ -130,7 +130,8 @@ tql eval (3000, 3000, '1s') label_replace(histogram_quantile(0.8, histogram_buck
 -- quantile with rate is covered in other cases
 tql eval (3000, 3000, '1s') histogram_quantile(0.2, rate(histogram_bucket[5m]));

-Error: 3001(EngineExecuteQuery), Unsupported arrow data type, type: Dictionary(Int64, Float64)
++
++

 drop table histogram_bucket;

--- a/tests/cases/standalone/common/select/prune_pk.result
+++ b/tests/cases/standalone/common/select/prune_pk.result
@@ -0,0 +1,158 @@
+CREATE TABLE IF NOT EXISTS `test_multi_pk_filter` ( `namespace` STRING NULL, `env` STRING NULL DEFAULT 'NULL', `flag` INT NULL, `total` BIGINT NULL, `greptime_timestamp` TIMESTAMP(9) NOT NULL, TIME INDEX (`greptime_timestamp`), PRIMARY KEY (`namespace`, `env`, `flag`) ) ENGINE=mito;
+
+Affected Rows: 0
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 1, 5289, '2023-05-15 10:00:00');
+
+Affected Rows: 1
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 0, 421, '2023-05-15 10:05:00');
+
+Affected Rows: 1
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'dev', 1, 356, '2023-05-15 10:10:00');
+
+Affected Rows: 1
+
+ADMIN FLUSH_TABLE('test_multi_pk_filter');
+
+-------------------------------------------+
+| ADMIN FLUSH_TABLE('test_multi_pk_filter') |
+-------------------------------------------+
+| 0                                         |
+-------------------------------------------+
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'dev', 1, 412, '2023-05-15 10:15:00');
+
+Affected Rows: 1
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'dev', 1, 298, '2023-05-15 10:20:00');
+
+Affected Rows: 1
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 1, 5289, '2023-05-15 10:25:00');
+
+Affected Rows: 1
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 1, 5874, '2023-05-15 10:30:00');
+
+Affected Rows: 1
+
+ADMIN FLUSH_TABLE('test_multi_pk_filter');
+
+-------------------------------------------+
+| ADMIN FLUSH_TABLE('test_multi_pk_filter') |
+-------------------------------------------+
+| 0                                         |
+-------------------------------------------+
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 1, 6132, '2023-05-15 10:35:00');
+
+Affected Rows: 1
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'testing', 1, 1287, '2023-05-15 10:40:00');
+
+Affected Rows: 1
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'testing', 1, 1432, '2023-05-15 10:45:00');
+
+Affected Rows: 1
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'testing', 1, 1056, '2023-05-15 10:50:00');
+
+Affected Rows: 1
+
+SELECT greptime_timestamp, namespace, env, total FROM test_multi_pk_filter WHERE
+    greptime_timestamp BETWEEN '2023-05-15 10:00:00' AND '2023-05-15 11:00:00' AND flag = 1 AND namespace = 'thermostat_v2'
+    ORDER BY greptime_timestamp;
+
+---------------------+---------------+------------+-------+
+| greptime_timestamp  | namespace     | env        | total |
+---------------------+---------------+------------+-------+
+| 2023-05-15T10:00:00 | thermostat_v2 | production | 5289  |
+| 2023-05-15T10:10:00 | thermostat_v2 | dev        | 356   |
+| 2023-05-15T10:15:00 | thermostat_v2 | dev        | 412   |
+| 2023-05-15T10:20:00 | thermostat_v2 | dev        | 298   |
+| 2023-05-15T10:25:00 | thermostat_v2 | production | 5289  |
+| 2023-05-15T10:30:00 | thermostat_v2 | production | 5874  |
+| 2023-05-15T10:35:00 | thermostat_v2 | production | 6132  |
+| 2023-05-15T10:40:00 | thermostat_v2 | testing    | 1287  |
+| 2023-05-15T10:45:00 | thermostat_v2 | testing    | 1432  |
+| 2023-05-15T10:50:00 | thermostat_v2 | testing    | 1056  |
+---------------------+---------------+------------+-------+
+
+SELECT greptime_timestamp, namespace, env, total FROM test_multi_pk_filter WHERE
+    greptime_timestamp BETWEEN '2023-05-15 10:00:00' AND '2023-05-15 11:00:00' AND flag = 1 AND namespace = 'thermostat_v2' AND env='dev'
+    ORDER BY greptime_timestamp;
+
+---------------------+---------------+-----+-------+
+| greptime_timestamp  | namespace     | env | total |
+---------------------+---------------+-----+-------+
+| 2023-05-15T10:10:00 | thermostat_v2 | dev | 356   |
+| 2023-05-15T10:15:00 | thermostat_v2 | dev | 412   |
+| 2023-05-15T10:20:00 | thermostat_v2 | dev | 298   |
+---------------------+---------------+-----+-------+
+
+DROP TABLE test_multi_pk_filter;
+
+Affected Rows: 0
+
+CREATE TABLE IF NOT EXISTS `test_multi_pk_null` ( `namespace` STRING NULL, `env` STRING NULL DEFAULT 'NULL', `total` BIGINT NULL, `greptime_timestamp` TIMESTAMP(9) NOT NULL, TIME INDEX (`greptime_timestamp`), PRIMARY KEY (`namespace`, `env`) ) ENGINE=mito;
+
+Affected Rows: 0
+
+INSERT INTO test_multi_pk_null
+    (namespace, env, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 5289, '2023-05-15 10:00:00');
+
+Affected Rows: 1
+
+INSERT INTO test_multi_pk_null
+    (namespace, env, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 421, '2023-05-15 10:05:00');
+
+Affected Rows: 1
+
+ADMIN FLUSH_TABLE('test_multi_pk_null');
+
+-----------------------------------------+
+| ADMIN FLUSH_TABLE('test_multi_pk_null') |
+-----------------------------------------+
+| 0                                       |
+-----------------------------------------+
+
+SELECT * FROM test_multi_pk_null WHERE env IS NOT NULL;
+
+---------------+------------+-------+---------------------+
+| namespace     | env        | total | greptime_timestamp  |
+---------------+------------+-------+---------------------+
+| thermostat_v2 | production | 5289  | 2023-05-15T10:00:00 |
+| thermostat_v2 | production | 421   | 2023-05-15T10:05:00 |
+---------------+------------+-------+---------------------+
+
+DROP TABLE test_multi_pk_null;
+
+Affected Rows: 0
+
--- a/tests/cases/standalone/common/select/prune_pk.sql
+++ b/tests/cases/standalone/common/select/prune_pk.sql
@@ -0,0 +1,66 @@
+CREATE TABLE IF NOT EXISTS `test_multi_pk_filter` ( `namespace` STRING NULL, `env` STRING NULL DEFAULT 'NULL', `flag` INT NULL, `total` BIGINT NULL, `greptime_timestamp` TIMESTAMP(9) NOT NULL, TIME INDEX (`greptime_timestamp`), PRIMARY KEY (`namespace`, `env`, `flag`) ) ENGINE=mito;
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 1, 5289, '2023-05-15 10:00:00');
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 0, 421, '2023-05-15 10:05:00');
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'dev', 1, 356, '2023-05-15 10:10:00');
+
+ADMIN FLUSH_TABLE('test_multi_pk_filter');
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'dev', 1, 412, '2023-05-15 10:15:00');
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'dev', 1, 298, '2023-05-15 10:20:00');
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 1, 5289, '2023-05-15 10:25:00');
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 1, 5874, '2023-05-15 10:30:00');
+
+ADMIN FLUSH_TABLE('test_multi_pk_filter');
+
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 1, 6132, '2023-05-15 10:35:00');
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'testing', 1, 1287, '2023-05-15 10:40:00');
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'testing', 1, 1432, '2023-05-15 10:45:00');
+INSERT INTO test_multi_pk_filter
+    (namespace, env, flag, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'testing', 1, 1056, '2023-05-15 10:50:00');
+
+SELECT greptime_timestamp, namespace, env, total FROM test_multi_pk_filter WHERE
+    greptime_timestamp BETWEEN '2023-05-15 10:00:00' AND '2023-05-15 11:00:00' AND flag = 1 AND namespace = 'thermostat_v2'
+    ORDER BY greptime_timestamp;
+
+SELECT greptime_timestamp, namespace, env, total FROM test_multi_pk_filter WHERE
+    greptime_timestamp BETWEEN '2023-05-15 10:00:00' AND '2023-05-15 11:00:00' AND flag = 1 AND namespace = 'thermostat_v2' AND env='dev'
+    ORDER BY greptime_timestamp;
+
+DROP TABLE test_multi_pk_filter;
+
+CREATE TABLE IF NOT EXISTS `test_multi_pk_null` ( `namespace` STRING NULL, `env` STRING NULL DEFAULT 'NULL', `total` BIGINT NULL, `greptime_timestamp` TIMESTAMP(9) NOT NULL, TIME INDEX (`greptime_timestamp`), PRIMARY KEY (`namespace`, `env`) ) ENGINE=mito;
+
+INSERT INTO test_multi_pk_null
+    (namespace, env, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 5289, '2023-05-15 10:00:00');
+INSERT INTO test_multi_pk_null
+    (namespace, env, total, greptime_timestamp)
+    VALUES ('thermostat_v2', 'production', 421, '2023-05-15 10:05:00');
+
+ADMIN FLUSH_TABLE('test_multi_pk_null');
+
+SELECT * FROM test_multi_pk_null WHERE env IS NOT NULL;
+
+DROP TABLE test_multi_pk_null;
--- a/tests/cases/standalone/common/select/tql_filter.result
+++ b/tests/cases/standalone/common/select/tql_filter.result
@@ -17,14 +17,11 @@ tql analyze (1, 3, '1s') t1{ a = "a" };
 +-+-+-+
 | stage | node | plan_|
 +-+-+-+
-| 0_| 0_|_MergeScanExec: REDACTED
-|_|_|_|
-| 1_| 0_|_PromInstantManipulateExec: range=[1000..3000], lookback=[300000], interval=[1000], time index=[b] REDACTED
+| 0_| 0_|_PromInstantManipulateExec: range=[1000..3000], lookback=[300000], interval=[1000], time index=[b] REDACTED
 |_|_|_PromSeriesDivideExec: tags=["a"] REDACTED
-|_|_|_SortExec: expr=[a@0 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([a@0], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
+|_|_|_MergeScanExec: REDACTED
+|_|_|_|
+| 1_| 0_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
 |_|_|_|
 |_|_| Total rows: 3_|
 +-+-+-+
@@ -40,14 +37,11 @@ tql analyze (1, 3, '1s') t1{ a =~ ".*" };
 +-+-+-+
 | stage | node | plan_|
 +-+-+-+
-| 0_| 0_|_MergeScanExec: REDACTED
-|_|_|_|
-| 1_| 0_|_PromInstantManipulateExec: range=[1000..3000], lookback=[300000], interval=[1000], time index=[b] REDACTED
+| 0_| 0_|_PromInstantManipulateExec: range=[1000..3000], lookback=[300000], interval=[1000], time index=[b] REDACTED
 |_|_|_PromSeriesDivideExec: tags=["a"] REDACTED
-|_|_|_SortExec: expr=[a@0 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([a@0], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
+|_|_|_MergeScanExec: REDACTED
+|_|_|_|
+| 1_| 0_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
 |_|_|_|
 |_|_| Total rows: 6_|
 +-+-+-+
@@ -63,14 +57,11 @@ tql analyze (1, 3, '1s') t1{ a =~ "a.*" };
 +-+-+-+
 | stage | node | plan_|
 +-+-+-+
-| 0_| 0_|_MergeScanExec: REDACTED
-|_|_|_|
-| 1_| 0_|_PromInstantManipulateExec: range=[1000..3000], lookback=[300000], interval=[1000], time index=[b] REDACTED
+| 0_| 0_|_PromInstantManipulateExec: range=[1000..3000], lookback=[300000], interval=[1000], time index=[b] REDACTED
 |_|_|_PromSeriesDivideExec: tags=["a"] REDACTED
-|_|_|_SortExec: expr=[a@0 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([a@0], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
+|_|_|_MergeScanExec: REDACTED
+|_|_|_|
+| 1_| 0_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
 |_|_|_|
 |_|_| Total rows: 3_|
 +-+-+-+
--- a/tests/cases/standalone/common/system/pg_catalog.result
+++ b/tests/cases/standalone/common/system/pg_catalog.result
@@ -3,7 +3,7 @@ create database pg_catalog;

 Error: 1004(InvalidArguments), Schema pg_catalog already exists

-- session_user because session_user is based on the current user so is not null is for test
+-- session_user because session_user is based on the current user so is not null is for test 
 -- SQLNESS PROTOCOL POSTGRES
 SELECT session_user is not null;

@@ -107,13 +107,12 @@ select * from pg_catalog.pg_type order by oid;
 +-----+-----------+--------+

 -- SQLNESS PROTOCOL POSTGRES
-- SQLNESS REPLACE (\d+\s*) OID
 select * from pg_catalog.pg_database where datname = 'public';

 +------------+---------+
 | oid        | datname |
 +------------+---------+
-| OID| public  |
+| 3927743705 | public  |
 +------------+---------+

 -- \d
@@ -160,16 +159,15 @@ ORDER BY 1,2;

 -- make sure oid of namespace keep stable
 -- SQLNESS PROTOCOL POSTGRES
-- SQLNESS REPLACE (\d+\s*) OID
-SELECT * FROM pg_namespace ORDER BY nspname;
+SELECT * FROM pg_namespace ORDER BY oid;

 +------------+--------------------+
 | oid        | nspname            |
 +------------+--------------------+
-| OID| greptime_private   |
-| OID| information_schema |
-| OID| pg_catalog         |
-| OID| public             |
+| 667359454  | pg_catalog         |
+| 3174397350 | information_schema |
+| 3338153620 | greptime_private   |
+| 3927743705 | public             |
 +------------+--------------------+

 -- SQLNESS PROTOCOL POSTGRES
@@ -262,7 +260,6 @@ where relnamespace in (
 +---------+

 -- SQLNESS PROTOCOL POSTGRES
-- SQLNESS REPLACE (\d+\s*) OID
 select relnamespace, relname, relkind
 from pg_catalog.pg_class
 where relnamespace in (
@@ -277,7 +274,7 @@ order by relnamespace, relname;
 +--------------+---------+---------+
 | relnamespace | relname | relkind |
 +--------------+---------+---------+
-| OID| foo     | r       |
+| 434869349    | foo     | r       |
 +--------------+---------+---------+

 -- SQLNESS PROTOCOL POSTGRES
--- a/tests/cases/standalone/common/system/pg_catalog.sql
+++ b/tests/cases/standalone/common/system/pg_catalog.sql
@@ -1,7 +1,7 @@
 -- should not able to create pg_catalog
 create database pg_catalog;

-- session_user because session_user is based on the current user so is not null is for test
+-- session_user because session_user is based on the current user so is not null is for test 
 -- SQLNESS PROTOCOL POSTGRES
 SELECT session_user is not null;

@@ -34,7 +34,6 @@ select * from pg_catalog.pg_database;
 select * from pg_catalog.pg_type order by oid;

 -- SQLNESS PROTOCOL POSTGRES
-- SQLNESS REPLACE (\d+\s*) OID
 select * from pg_catalog.pg_database where datname = 'public';

 -- \d
@@ -69,8 +68,7 @@ ORDER BY 1,2;

 -- make sure oid of namespace keep stable
 -- SQLNESS PROTOCOL POSTGRES
-- SQLNESS REPLACE (\d+\s*) OID
-SELECT * FROM pg_namespace ORDER BY nspname;
+SELECT * FROM pg_namespace ORDER BY oid;

 -- SQLNESS PROTOCOL POSTGRES
 create database my_db;
@@ -130,7 +128,6 @@ where relnamespace in (
 );

 -- SQLNESS PROTOCOL POSTGRES
-- SQLNESS REPLACE (\d+\s*) OID
 select relnamespace, relname, relkind
 from pg_catalog.pg_class
 where relnamespace in (
--- a/tests/cases/standalone/common/tql-explain-analyze/analyze.result
+++ b/tests/cases/standalone/common/tql-explain-analyze/analyze.result
@@ -19,14 +19,11 @@ TQL ANALYZE (0, 10, '5s') test;
 +-+-+-+
 | stage | node | plan_|
 +-+-+-+
-| 0_| 0_|_MergeScanExec: REDACTED
-|_|_|_|
-| 1_| 0_|_PromInstantManipulateExec: range=[0..10000], lookback=[300000], interval=[5000], time index=[j] REDACTED
+| 0_| 0_|_PromInstantManipulateExec: range=[0..10000], lookback=[300000], interval=[5000], time index=[j] REDACTED
 |_|_|_PromSeriesDivideExec: tags=["k"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
+|_|_|_MergeScanExec: REDACTED
+|_|_|_|
+| 1_| 0_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
 |_|_|_|
 |_|_| Total rows: 4_|
 +-+-+-+
@@ -44,14 +41,11 @@ TQL ANALYZE (0, 10, '1s', '2s') test;
 +-+-+-+
 | stage | node | plan_|
 +-+-+-+
-| 0_| 0_|_MergeScanExec: REDACTED
-|_|_|_|
-| 1_| 0_|_PromInstantManipulateExec: range=[0..10000], lookback=[2000], interval=[1000], time index=[j] REDACTED
+| 0_| 0_|_PromInstantManipulateExec: range=[0..10000], lookback=[2000], interval=[1000], time index=[j] REDACTED
 |_|_|_PromSeriesDivideExec: tags=["k"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
+|_|_|_MergeScanExec: REDACTED
+|_|_|_|
+| 1_| 0_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
 |_|_|_|
 |_|_| Total rows: 4_|
 +-+-+-+
@@ -68,14 +62,11 @@ TQL ANALYZE ('1970-01-01T00:00:00'::timestamp, '1970-01-01T00:00:00'::timestamp
 +-+-+-+
 | stage | node | plan_|
 +-+-+-+
-| 0_| 0_|_MergeScanExec: REDACTED
-|_|_|_|
-| 1_| 0_|_PromInstantManipulateExec: range=[0..10000], lookback=[300000], interval=[5000], time index=[j] REDACTED
+| 0_| 0_|_PromInstantManipulateExec: range=[0..10000], lookback=[300000], interval=[5000], time index=[j] REDACTED
 |_|_|_PromSeriesDivideExec: tags=["k"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
+|_|_|_MergeScanExec: REDACTED
+|_|_|_|
+| 1_| 0_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
 |_|_|_|
 |_|_| Total rows: 4_|
 +-+-+-+
@@ -94,14 +85,11 @@ TQL ANALYZE VERBOSE (0, 10, '5s') test;
 +-+-+-+
 | stage | node | plan_|
 +-+-+-+
-| 0_| 0_|_MergeScanExec: REDACTED
-|_|_|_|
-| 1_| 0_|_PromInstantManipulateExec: range=[0..10000], lookback=[300000], interval=[5000], time index=[j] REDACTED
+| 0_| 0_|_PromInstantManipulateExec: range=[0..10000], lookback=[300000], interval=[5000], time index=[j] REDACTED
 |_|_|_PromSeriesDivideExec: tags=["k"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries, projection=["i", "j", "k"], filters=[j >= TimestampMillisecond(-300000, None), j <= TimestampMillisecond(310000, None)], REDACTED
+|_|_|_MergeScanExec: REDACTED
+|_|_|_|
+| 1_| 0_|_SeqScan: region=REDACTED, partition_count=1 (1 memtable ranges, 0 file 0 ranges), distribution=PerSeries, projection=["i", "j", "k"], filters=[j >= TimestampMillisecond(-300000, None), j <= TimestampMillisecond(310000, None)], REDACTED
 |_|_|_|
 |_|_| Total rows: 4_|
 +-+-+-+
@@ -126,23 +114,13 @@ TQL ANALYZE (0, 10, '5s') test;
 +-+-+-+
 | stage | node | plan_|
 +-+-+-+
-| 0_| 0_|_SortPreservingMergeExec: [k@2 ASC, l@3 ASC, j@1 ASC] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC, l@3 ASC, j@1 ASC], preserve_partitioning=[true] REDACTED
+| 0_| 0_|_PromInstantManipulateExec: range=[0..10000], lookback=[300000], interval=[5000], time index=[j] REDACTED
+|_|_|_PromSeriesDivideExec: tags=["k", "l"] REDACTED
 |_|_|_MergeScanExec: REDACTED
 |_|_|_|
-| 1_| 0_|_PromInstantManipulateExec: range=[0..10000], lookback=[300000], interval=[5000], time index=[j] REDACTED
-|_|_|_PromSeriesDivideExec: tags=["k", "l"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC, l@3 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2, l@3], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
+| 1_| 0_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
 |_|_|_|
-| 1_| 1_|_PromInstantManipulateExec: range=[0..10000], lookback=[300000], interval=[5000], time index=[j] REDACTED
-|_|_|_PromSeriesDivideExec: tags=["k", "l"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC, l@3 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2, l@3], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
+| 1_| 1_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
 |_|_|_|
 |_|_| Total rows: 0_|
 +-+-+-+
@@ -166,21 +144,9 @@ TQL ANALYZE (0, 10, '5s') rate(test[10s]);
 |_|_|_PromSeriesDivideExec: tags=["k", "l"] REDACTED
 |_|_|_MergeScanExec: REDACTED
 |_|_|_|
-| 1_| 0_|_PromRangeManipulateExec: req range=[0..10000], interval=[5000], eval range=[10000], time index=[j] REDACTED
-|_|_|_PromSeriesNormalizeExec: offset=[0], time index=[j], filter NaN: [true] REDACTED
-|_|_|_PromSeriesDivideExec: tags=["k", "l"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC, l@3 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2, l@3], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
+| 1_| 0_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
 |_|_|_|
-| 1_| 1_|_PromRangeManipulateExec: req range=[0..10000], interval=[5000], eval range=[10000], time index=[j] REDACTED
-|_|_|_PromSeriesNormalizeExec: offset=[0], time index=[j], filter NaN: [true] REDACTED
-|_|_|_PromSeriesDivideExec: tags=["k", "l"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC, l@3 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2, l@3], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
+| 1_| 1_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
 |_|_|_|
 |_|_| Total rows: 0_|
 +-+-+-+
--- a/tests/cases/standalone/common/tql-explain-analyze/explain.result
+++ b/tests/cases/standalone/common/tql-explain-analyze/explain.result
@@ -12,13 +12,18 @@ Affected Rows: 3
 -- SQLNESS REPLACE (peers.*) REDACTED
 TQL EXPLAIN (0, 10, '5s') test;

-+---------------+-------------------------------------------------+
-| plan_type     | plan                                            |
-+---------------+-------------------------------------------------+
-| logical_plan  | MergeScan [is_placeholder=false]                |
-| physical_plan | MergeScanExec: REDACTED
-|               |                                                 |
-+---------------+-------------------------------------------------+
+---------------+-----------------------------------------------------------------------------------------------+
+| plan_type     | plan                                                                                          |
+---------------+-----------------------------------------------------------------------------------------------+
+| logical_plan  | PromInstantManipulate: range=[0..0], lookback=[300000], interval=[300000], time index=[j]     |
+|               |   PromSeriesDivide: tags=["k"]                                                                |
+|               |     Projection: test.i, test.j, test.k                                                        |
+|               |       MergeScan [is_placeholder=false]                                                        |
+| physical_plan | PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j] |
+|               |   PromSeriesDivideExec: tags=["k"]                                                            |
+|               |     MergeScanExec: REDACTED
+|               |                                                                                               |
+---------------+-----------------------------------------------------------------------------------------------+

 -- 'lookback' parameter is not fully supported, the test has to be updated
 -- explain at 0s, 5s and 10s. No point at 0s.
@@ -26,26 +31,36 @@ TQL EXPLAIN (0, 10, '5s') test;
 -- SQLNESS REPLACE (peers.*) REDACTED
 TQL EXPLAIN (0, 10, '1s', '2s') test;

-+---------------+-------------------------------------------------+
-| plan_type     | plan                                            |
-+---------------+-------------------------------------------------+
-| logical_plan  | MergeScan [is_placeholder=false]                |
-| physical_plan | MergeScanExec: REDACTED
-|               |                                                 |
-+---------------+-------------------------------------------------+
+---------------+---------------------------------------------------------------------------------------------+
+| plan_type     | plan                                                                                        |
+---------------+---------------------------------------------------------------------------------------------+
+| logical_plan  | PromInstantManipulate: range=[0..0], lookback=[2000], interval=[300000], time index=[j]     |
+|               |   PromSeriesDivide: tags=["k"]                                                              |
+|               |     Projection: test.i, test.j, test.k                                                      |
+|               |       MergeScan [is_placeholder=false]                                                      |
+| physical_plan | PromInstantManipulateExec: range=[0..0], lookback=[2000], interval=[300000], time index=[j] |
+|               |   PromSeriesDivideExec: tags=["k"]                                                          |
+|               |     MergeScanExec: REDACTED
+|               |                                                                                             |
+---------------+---------------------------------------------------------------------------------------------+

 -- explain at 0s, 5s and 10s. No point at 0s.
 -- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED
 -- SQLNESS REPLACE (peers.*) REDACTED
 TQL EXPLAIN ('1970-01-01T00:00:00'::timestamp, '1970-01-01T00:00:00'::timestamp + '10 seconds'::interval, '5s') test;

-+---------------+-------------------------------------------------+
-| plan_type     | plan                                            |
-+---------------+-------------------------------------------------+
-| logical_plan  | MergeScan [is_placeholder=false]                |
-| physical_plan | MergeScanExec: REDACTED
-|               |                                                 |
-+---------------+-------------------------------------------------+
+---------------+-----------------------------------------------------------------------------------------------+
+| plan_type     | plan                                                                                          |
+---------------+-----------------------------------------------------------------------------------------------+
+| logical_plan  | PromInstantManipulate: range=[0..0], lookback=[300000], interval=[300000], time index=[j]     |
+|               |   PromSeriesDivide: tags=["k"]                                                                |
+|               |     Projection: test.i, test.j, test.k                                                        |
+|               |       MergeScan [is_placeholder=false]                                                        |
+| physical_plan | PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j] |
+|               |   PromSeriesDivideExec: tags=["k"]                                                            |
+|               |     MergeScanExec: REDACTED
+|               |                                                                                               |
+---------------+-----------------------------------------------------------------------------------------------+

 -- explain verbose at 0s, 5s and 10s. No point at 0s.
 -- SQLNESS REPLACE (-+) -
@@ -70,7 +85,9 @@ TQL EXPLAIN VERBOSE (0, 10, '5s') test;
 | logical_plan after expand_wildcard_rule_| SAME TEXT AS ABOVE_|
 | logical_plan after resolve_grouping_function_| SAME TEXT AS ABOVE_|
 | logical_plan after type_coercion_| SAME TEXT AS ABOVE_|
-| logical_plan after DistPlannerAnalyzer_| Projection: test.i, test.j, test.k_|
+| logical_plan after DistPlannerAnalyzer_| PromInstantManipulate: range=[0..0], lookback=[300000], interval=[300000], time index=[j]_|
+|_|_PromSeriesDivide: tags=["k"]_|
+|_|_Projection: test.i, test.j, test.k_|
 |_|_MergeScan [is_placeholder=false]_|
 | analyzed_logical_plan_| SAME TEXT AS ABOVE_|
 | logical_plan after eliminate_nested_union_| SAME TEXT AS ABOVE_|
@@ -97,45 +114,37 @@ TQL EXPLAIN VERBOSE (0, 10, '5s') test;
 | logical_plan after unwrap_cast_in_comparison_| SAME TEXT AS ABOVE_|
 | logical_plan after common_sub_expression_eliminate_| SAME TEXT AS ABOVE_|
 | logical_plan after eliminate_group_by_constant_| SAME TEXT AS ABOVE_|
-| logical_plan after optimize_projections_| MergeScan [is_placeholder=false]_|
-| logical_plan after ScanHintRule_| SAME TEXT AS ABOVE_|
-| logical_plan after eliminate_nested_union_| SAME TEXT AS ABOVE_|
-| logical_plan after simplify_expressions_| SAME TEXT AS ABOVE_|
-| logical_plan after unwrap_cast_in_comparison_| SAME TEXT AS ABOVE_|
-| logical_plan after replace_distinct_aggregate_| SAME TEXT AS ABOVE_|
-| logical_plan after eliminate_join_| SAME TEXT AS ABOVE_|
-| logical_plan after decorrelate_predicate_subquery_| SAME TEXT AS ABOVE_|
-| logical_plan after scalar_subquery_to_join_| SAME TEXT AS ABOVE_|
-| logical_plan after extract_equijoin_predicate_| SAME TEXT AS ABOVE_|
-| logical_plan after eliminate_duplicated_expr_| SAME TEXT AS ABOVE_|
-| logical_plan after eliminate_filter_| SAME TEXT AS ABOVE_|
-| logical_plan after eliminate_cross_join_| SAME TEXT AS ABOVE_|
-| logical_plan after common_sub_expression_eliminate_| SAME TEXT AS ABOVE_|
-| logical_plan after eliminate_limit_| SAME TEXT AS ABOVE_|
-| logical_plan after propagate_empty_relation_| SAME TEXT AS ABOVE_|
-| logical_plan after eliminate_one_union_| SAME TEXT AS ABOVE_|
-| logical_plan after filter_null_join_keys_| SAME TEXT AS ABOVE_|
-| logical_plan after eliminate_outer_join_| SAME TEXT AS ABOVE_|
-| logical_plan after push_down_limit_| SAME TEXT AS ABOVE_|
-| logical_plan after push_down_filter_| SAME TEXT AS ABOVE_|
-| logical_plan after single_distinct_aggregation_to_group_by | SAME TEXT AS ABOVE_|
-| logical_plan after simplify_expressions_| SAME TEXT AS ABOVE_|
-| logical_plan after unwrap_cast_in_comparison_| SAME TEXT AS ABOVE_|
-| logical_plan after common_sub_expression_eliminate_| SAME TEXT AS ABOVE_|
-| logical_plan after eliminate_group_by_constant_| SAME TEXT AS ABOVE_|
 | logical_plan after optimize_projections_| SAME TEXT AS ABOVE_|
 | logical_plan after ScanHintRule_| SAME TEXT AS ABOVE_|
-| logical_plan_| MergeScan [is_placeholder=false]_|
-| initial_physical_plan_| MergeScanExec: REDACTED
+| logical_plan_| PromInstantManipulate: range=[0..0], lookback=[300000], interval=[300000], time index=[j]_|
+|_|_PromSeriesDivide: tags=["k"]_|
+|_|_Projection: test.i, test.j, test.k_|
+|_|_MergeScan [is_placeholder=false]_|
+| initial_physical_plan_| PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j]_|
+|_|_PromSeriesDivideExec: tags=["k"]_|
+|_|_ProjectionExec: expr=[i@0 as i, j@1 as j, k@2 as k]_|
+|_|_MergeScanExec: REDACTED
 |_|_|
-| initial_physical_plan_with_stats_| MergeScanExec: REDACTED
+| initial_physical_plan_with_stats_| PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j], statistics=[Rows=Inexact(0), Bytes=Absent, [(Col[0]:),(Col[1]:),(Col[2]:)]] |
+|_|_PromSeriesDivideExec: tags=["k"], statistics=[Rows=Absent, Bytes=Absent, [(Col[0]:),(Col[1]:),(Col[2]:)]]_|
+|_|_ProjectionExec: expr=[i@0 as i, j@1 as j, k@2 as k], statistics=[Rows=Absent, Bytes=Absent, [(Col[0]:),(Col[1]:),(Col[2]:)]]_|
+|_|_MergeScanExec: REDACTED
 |_|_|
-| initial_physical_plan_with_schema_| MergeScanExec: REDACTED
+| initial_physical_plan_with_schema_| PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j], schema=[i:Float64;N, j:Timestamp(Millisecond, None), k:Utf8;N]_|
+|_|_PromSeriesDivideExec: tags=["k"], schema=[i:Float64;N, j:Timestamp(Millisecond, None), k:Utf8;N]_|
+|_|_ProjectionExec: expr=[i@0 as i, j@1 as j, k@2 as k], schema=[i:Float64;N, j:Timestamp(Millisecond, None), k:Utf8;N]_|
+|_|_MergeScanExec: REDACTED
 |_|_|
-| physical_plan after parallelize_scan_| MergeScanExec: REDACTED
+| physical_plan after parallelize_scan_| PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j]_|
+|_|_PromSeriesDivideExec: tags=["k"]_|
+|_|_ProjectionExec: expr=[i@0 as i, j@1 as j, k@2 as k]_|
+|_|_MergeScanExec: REDACTED
 |_|_|
 | physical_plan after PassDistributionRule_| SAME TEXT AS ABOVE_|
 | physical_plan after OutputRequirements_| OutputRequirementExec_|
+|_|_PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j]_|
+|_|_PromSeriesDivideExec: tags=["k"]_|
+|_|_ProjectionExec: expr=[i@0 as i, j@1 as j, k@2 as k]_|
 |_|_MergeScanExec: REDACTED
 |_|_|
 | physical_plan after aggregate_statistics_| SAME TEXT AS ABOVE_|
@@ -145,9 +154,15 @@ TQL EXPLAIN VERBOSE (0, 10, '5s') test;
 | physical_plan after CombinePartialFinalAggregate_| SAME TEXT AS ABOVE_|
 | physical_plan after EnforceSorting_| SAME TEXT AS ABOVE_|
 | physical_plan after OptimizeAggregateOrder_| SAME TEXT AS ABOVE_|
-| physical_plan after ProjectionPushdown_| SAME TEXT AS ABOVE_|
+| physical_plan after ProjectionPushdown_| OutputRequirementExec_|
+|_|_PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j]_|
+|_|_PromSeriesDivideExec: tags=["k"]_|
+|_|_MergeScanExec: REDACTED
+|_|_|
 | physical_plan after coalesce_batches_| SAME TEXT AS ABOVE_|
-| physical_plan after OutputRequirements_| MergeScanExec: REDACTED
+| physical_plan after OutputRequirements_| PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j]_|
+|_|_PromSeriesDivideExec: tags=["k"]_|
+|_|_MergeScanExec: REDACTED
 |_|_|
 | physical_plan after LimitAggregation_| SAME TEXT AS ABOVE_|
 | physical_plan after ProjectionPushdown_| SAME TEXT AS ABOVE_|
@@ -156,11 +171,17 @@ TQL EXPLAIN VERBOSE (0, 10, '5s') test;
 | physical_plan after MatchesConstantTerm_| SAME TEXT AS ABOVE_|
 | physical_plan after RemoveDuplicateRule_| SAME TEXT AS ABOVE_|
 | physical_plan after SanityCheckPlan_| SAME TEXT AS ABOVE_|
-| physical_plan_| MergeScanExec: REDACTED
+| physical_plan_| PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j]_|
+|_|_PromSeriesDivideExec: tags=["k"]_|
+|_|_MergeScanExec: REDACTED
 |_|_|
-| physical_plan_with_stats_| MergeScanExec: REDACTED
+| physical_plan_with_stats_| PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j], statistics=[Rows=Inexact(0), Bytes=Absent, [(Col[0]:),(Col[1]:),(Col[2]:)]] |
+|_|_PromSeriesDivideExec: tags=["k"], statistics=[Rows=Absent, Bytes=Absent, [(Col[0]:),(Col[1]:),(Col[2]:)]]_|
+|_|_MergeScanExec: REDACTED
 |_|_|
-| physical_plan_with_schema_| MergeScanExec: REDACTED
+| physical_plan_with_schema_| PromInstantManipulateExec: range=[0..0], lookback=[300000], interval=[300000], time index=[j], schema=[i:Float64;N, j:Timestamp(Millisecond, None), k:Utf8;N]_|
+|_|_PromSeriesDivideExec: tags=["k"], schema=[i:Float64;N, j:Timestamp(Millisecond, None), k:Utf8;N]_|
+|_|_MergeScanExec: REDACTED
 |_|_|
 +-+-+

--- a/tests/cases/standalone/common/tql/partition.result
+++ b/tests/cases/standalone/common/tql/partition.result
@@ -1,164 +0,0 @@
-- no partition
-create table t (
-    i double,
-    j timestamp time index,
-    k string primary key
-);
-
-Affected Rows: 0
-
-- SQLNESS REPLACE (metrics.*) REDACTED
-- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED
-- SQLNESS REPLACE (-+) -
-- SQLNESS REPLACE (\s\s+) _
-- SQLNESS REPLACE (peers.*) REDACTED
-- SQLNESS REPLACE region=\d+\(\d+,\s+\d+\) region=REDACTED
-tql analyze (0, 10, '1s') 100 - (avg by (k) (irate(t[1m])) * 100);
-
-+-+-+-+
-| stage | node | plan_|
-+-+-+-+
-| 0_| 0_|_MergeScanExec: REDACTED
-|_|_|_|
-| 1_| 0_|_ProjectionExec: expr=[k@0 as k, j@1 as j, 100 - avg(prom_irate(j_range,i))@2 * 100 as Float64(100) - avg(prom_irate(j_range,i)) * Float64(100)] REDACTED
-|_|_|_RepartitionExec: partitioning=REDACTED
-|_|_|_SortPreservingMergeExec: [k@0 ASC NULLS LAST, j@1 ASC NULLS LAST] REDACTED
-|_|_|_SortExec: expr=[k@0 ASC NULLS LAST, j@1 ASC NULLS LAST], preserve_partitioning=[true] REDACTED
-|_|_|_AggregateExec: mode=FinalPartitioned, gby=[k@0 as k, j@1 as j], aggr=[avg(prom_irate(j_range,i))] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@0, j@1], 32), input_partitions=32 REDACTED
-|_|_|_AggregateExec: mode=Partial, gby=[k@2 as k, j@0 as j], aggr=[avg(prom_irate(j_range,i))] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_FilterExec: prom_irate(j_range,i)@1 IS NOT NULL REDACTED
-|_|_|_ProjectionExec: expr=[j@1 as j, prom_irate(j_range@3, i@0) as prom_irate(j_range,i), k@2 as k] REDACTED
-|_|_|_PromRangeManipulateExec: req range=[0..10000], interval=[1000], eval range=[60000], time index=[j] REDACTED
-|_|_|_PromSeriesNormalizeExec: offset=[0], time index=[j], filter NaN: [true] REDACTED
-|_|_|_PromSeriesDivideExec: tags=["k"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
-|_|_|_|
-|_|_| Total rows: 0_|
-+-+-+-+
-
-drop table t;
-
-Affected Rows: 0
-
-- partition on tag
-create table t (
-    i double,
-    j timestamp time index,
-    k string,
-    l string,
-    primary key (k, l)
-) partition on columns (k, l) (k < 'a', k >= 'a');
-
-Affected Rows: 0
-
-- SQLNESS REPLACE (metrics.*) REDACTED
-- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED
-- SQLNESS REPLACE (-+) -
-- SQLNESS REPLACE (\s\s+) _
-- SQLNESS REPLACE (peers.*) REDACTED
-- SQLNESS REPLACE region=\d+\(\d+,\s+\d+\) region=REDACTED
-tql analyze (0, 10, '1s') 100 - (avg by (k) (irate(t[1m])) * 100);
-
-+-+-+-+
-| stage | node | plan_|
-+-+-+-+
-| 0_| 0_|_ProjectionExec: expr=[k@0 as k, j@1 as j, 100 - avg(prom_irate(j_range,i))@2 * 100 as Float64(100) - avg(prom_irate(j_range,i)) * Float64(100)] REDACTED
-|_|_|_RepartitionExec: partitioning=REDACTED
-|_|_|_SortPreservingMergeExec: [k@0 ASC NULLS LAST, j@1 ASC NULLS LAST] REDACTED
-|_|_|_SortExec: expr=[k@0 ASC NULLS LAST, j@1 ASC NULLS LAST], preserve_partitioning=[true] REDACTED
-|_|_|_AggregateExec: mode=FinalPartitioned, gby=[k@0 as k, j@1 as j], aggr=[avg(prom_irate(j_range,i))], ordering_mode=PartiallySorted([0]) REDACTED
-|_|_|_SortExec: expr=[k@0 ASC NULLS LAST], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@0, j@1], 32), input_partitions=32 REDACTED
-|_|_|_AggregateExec: mode=Partial, gby=[k@2 as k, j@0 as j], aggr=[avg(prom_irate(j_range,i))], ordering_mode=PartiallySorted([0]) REDACTED
-|_|_|_ProjectionExec: expr=[j@0 as j, prom_irate(j_range,i)@1 as prom_irate(j_range,i), k@2 as k] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC, l@3 ASC, j@0 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_MergeScanExec: REDACTED
-|_|_|_|
-| 1_| 0_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_FilterExec: prom_irate(j_range,i)@1 IS NOT NULL REDACTED
-|_|_|_ProjectionExec: expr=[j@1 as j, prom_irate(j_range@4, i@0) as prom_irate(j_range,i), k@2 as k, l@3 as l] REDACTED
-|_|_|_PromRangeManipulateExec: req range=[0..10000], interval=[1000], eval range=[60000], time index=[j] REDACTED
-|_|_|_PromSeriesNormalizeExec: offset=[0], time index=[j], filter NaN: [true] REDACTED
-|_|_|_PromSeriesDivideExec: tags=["k", "l"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC, l@3 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2, l@3], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
-|_|_|_|
-| 1_| 1_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_FilterExec: prom_irate(j_range,i)@1 IS NOT NULL REDACTED
-|_|_|_ProjectionExec: expr=[j@1 as j, prom_irate(j_range@4, i@0) as prom_irate(j_range,i), k@2 as k, l@3 as l] REDACTED
-|_|_|_PromRangeManipulateExec: req range=[0..10000], interval=[1000], eval range=[60000], time index=[j] REDACTED
-|_|_|_PromSeriesNormalizeExec: offset=[0], time index=[j], filter NaN: [true] REDACTED
-|_|_|_PromSeriesDivideExec: tags=["k", "l"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC, l@3 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2, l@3], 32), input_partitions=1 REDACTED
-|_|_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
-|_|_|_|
-|_|_| Total rows: 0_|
-+-+-+-+
-
-drop table t;
-
-Affected Rows: 0
-
-- partition on value
-create table t (
-    i double,
-    j timestamp time index,
-    k string,
-    l string,
-    primary key (k, l)
-) partition on columns (i) (i < 1.0, i >= 1.0);
-
-Affected Rows: 0
-
-- SQLNESS REPLACE (metrics.*) REDACTED
-- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED
-- SQLNESS REPLACE (-+) -
-- SQLNESS REPLACE (\s\s+) _
-- SQLNESS REPLACE (peers.*) REDACTED
-- SQLNESS REPLACE region=\d+\(\d+,\s+\d+\) region=REDACTED
-tql analyze (0, 10, '1s') 100 - (avg by (k) (irate(t[1m])) * 100);
-
-+-+-+-+
-| stage | node | plan_|
-+-+-+-+
-| 0_| 0_|_ProjectionExec: expr=[k@0 as k, j@1 as j, 100 - avg(prom_irate(j_range,i))@2 * 100 as Float64(100) - avg(prom_irate(j_range,i)) * Float64(100)] REDACTED
-|_|_|_RepartitionExec: partitioning=REDACTED
-|_|_|_SortPreservingMergeExec: [k@0 ASC NULLS LAST, j@1 ASC NULLS LAST] REDACTED
-|_|_|_SortExec: expr=[k@0 ASC NULLS LAST, j@1 ASC NULLS LAST], preserve_partitioning=[true] REDACTED
-|_|_|_AggregateExec: mode=FinalPartitioned, gby=[k@0 as k, j@1 as j], aggr=[avg(prom_irate(j_range,i))] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@0, j@1], 32), input_partitions=32 REDACTED
-|_|_|_AggregateExec: mode=Partial, gby=[k@2 as k, j@0 as j], aggr=[avg(prom_irate(j_range,i))] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_FilterExec: prom_irate(j_range,i)@1 IS NOT NULL REDACTED
-|_|_|_ProjectionExec: expr=[j@1 as j, prom_irate(j_range@4, i@0) as prom_irate(j_range,i), k@2 as k] REDACTED
-|_|_|_PromRangeManipulateExec: req range=[0..10000], interval=[1000], eval range=[60000], time index=[j] REDACTED
-|_|_|_PromSeriesNormalizeExec: offset=[0], time index=[j], filter NaN: [true] REDACTED
-|_|_|_PromSeriesDivideExec: tags=["k", "l"] REDACTED
-|_|_|_SortExec: expr=[k@2 ASC, l@3 ASC], preserve_partitioning=[true] REDACTED
-|_|_|_CoalesceBatchesExec: target_batch_size=8192 REDACTED
-|_|_|_RepartitionExec: partitioning=Hash([k@2, l@3], 32), input_partitions=32 REDACTED
-|_|_|_MergeScanExec: REDACTED
-|_|_|_|
-| 1_| 0_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
-|_|_|_|
-| 1_| 1_|_SeqScan: region=REDACTED, partition_count=0 (0 memtable ranges, 0 file 0 ranges), distribution=PerSeries REDACTED
-|_|_|_|
-|_|_| Total rows: 0_|
-+-+-+-+
-
-drop table t;
-
-Affected Rows: 0
-
--- a/tests/cases/standalone/common/tql/partition.sql
+++ b/tests/cases/standalone/common/tql/partition.sql
@@ -1,54 +0,0 @@
-- no partition
-create table t (
-    i double,
-    j timestamp time index,
-    k string primary key
-);
-
-- SQLNESS REPLACE (metrics.*) REDACTED
-- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED
-- SQLNESS REPLACE (-+) -
-- SQLNESS REPLACE (\s\s+) _
-- SQLNESS REPLACE (peers.*) REDACTED
-- SQLNESS REPLACE region=\d+\(\d+,\s+\d+\) region=REDACTED
-tql analyze (0, 10, '1s') 100 - (avg by (k) (irate(t[1m])) * 100);
-
-drop table t;
-
-- partition on tag
-create table t (
-    i double,
-    j timestamp time index,
-    k string,
-    l string,
-    primary key (k, l)
-) partition on columns (k, l) (k < 'a', k >= 'a');
-
-- SQLNESS REPLACE (metrics.*) REDACTED
-- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED
-- SQLNESS REPLACE (-+) -
-- SQLNESS REPLACE (\s\s+) _
-- SQLNESS REPLACE (peers.*) REDACTED
-- SQLNESS REPLACE region=\d+\(\d+,\s+\d+\) region=REDACTED
-tql analyze (0, 10, '1s') 100 - (avg by (k) (irate(t[1m])) * 100);
-
-drop table t;
-
-- partition on value
-create table t (
-    i double,
-    j timestamp time index,
-    k string,
-    l string,
-    primary key (k, l)
-) partition on columns (i) (i < 1.0, i >= 1.0);
-
-- SQLNESS REPLACE (metrics.*) REDACTED
-- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED
-- SQLNESS REPLACE (-+) -
-- SQLNESS REPLACE (\s\s+) _
-- SQLNESS REPLACE (peers.*) REDACTED
-- SQLNESS REPLACE region=\d+\(\d+,\s+\d+\) region=REDACTED
-tql analyze (0, 10, '1s') 100 - (avg by (k) (irate(t[1m])) * 100);
-
-drop table t;